Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,17 @@ <h2 class="flex align-items-center gap-2">
}
</div>
}

@if (hasMoreComponents()) {
<div class="flex justify-content-center">
<p-button
(onClick)="loadMoreComponents()"
severity="secondary"
[label]="'common.buttons.loadMore' | translate"
[loading]="isComponentsLoading()"
/>
</div>
}
} @else {
<div [innerHtml]="'project.overview.components.noComponentsMessage' | translate"></div>
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import { CustomDialogService, LoaderService } from '@osf/shared/services';
import { GetResourceWithChildren } from '@osf/shared/stores';
import { ComponentOverview } from '@shared/models';

import { ProjectOverviewSelectors } from '../../store';
import { LoadMoreComponents, ProjectOverviewSelectors } from '../../store';
import { AddComponentDialogComponent } from '../add-component-dialog/add-component-dialog.component';
import { DeleteComponentDialogComponent } from '../delete-component-dialog/delete-component-dialog.component';

Expand All @@ -36,9 +36,13 @@ export class OverviewComponentsComponent {

components = select(ProjectOverviewSelectors.getComponents);
isComponentsLoading = select(ProjectOverviewSelectors.getComponentsLoading);
hasMoreComponents = select(ProjectOverviewSelectors.hasMoreComponents);
project = select(ProjectOverviewSelectors.getProject);

actions = createDispatchMap({ getComponentsTree: GetResourceWithChildren });
actions = createDispatchMap({
getComponentsTree: GetResourceWithChildren,
loadMoreComponents: LoadMoreComponents,
});

readonly UserPermissions = UserPermissions;

Expand Down Expand Up @@ -96,6 +100,13 @@ export class OverviewComponentsComponent {
window.open(url, '_self');
}

loadMoreComponents(): void {
const project = this.project();
if (!project) return;

this.actions.loadMoreComponents(project.id);
}

private handleDeleteComponent(componentId: string): void {
const project = this.project();
if (!project) return;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ import {
ComponentGetResponseJsonApi,
ComponentOverview,
JsonApiResponse,
PaginatedData,
ResponseJsonApi,
} from '@osf/shared/models';
import { JsonApiService } from '@osf/shared/services';

Expand Down Expand Up @@ -153,15 +155,23 @@ export class ProjectOverviewService {
return this.jsonApiService.delete(`${this.apiUrl}/nodes/${componentId}/`);
}

getComponents(projectId: string): Observable<ComponentOverview[]> {
getComponents(projectId: string, page = 1, pageSize = 10): Observable<PaginatedData<ComponentOverview[]>> {
const params: Record<string, unknown> = {
embed: 'bibliographic_contributors',
'fields[users]': 'family_name,full_name,given_name,middle_name',
page: page,
'page[size]': pageSize,
};

return this.jsonApiService
.get<JsonApiResponse<ComponentGetResponseJsonApi[], null>>(`${this.apiUrl}/nodes/${projectId}/children/`, params)
.pipe(map((response) => response.data.map((item) => ComponentsMapper.fromGetComponentResponse(item))));
.get<ResponseJsonApi<ComponentGetResponseJsonApi[]>>(`${this.apiUrl}/nodes/${projectId}/children/`, params)
.pipe(
map((response) => ({
data: response.data.map((item) => ComponentsMapper.fromGetComponentResponse(item)),
totalCount: response.meta?.total || 0,
pageSize: response.meta?.per_page || pageSize,
}))
);
}

getParentProject(projectId: string): Observable<ProjectOverviewWithMeta> {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { DEFAULT_TABLE_PARAMS } from '@osf/shared/constants';
import { ResourceType } from '@shared/enums';

import { PrivacyStatusModel } from '../models';
Expand Down Expand Up @@ -69,6 +70,16 @@ export class DeleteComponent {
export class GetComponents {
static readonly type = '[Project Overview] Get Components';

constructor(
public projectId: string,
public page = 1,
public pageSize = DEFAULT_TABLE_PARAMS.rows
) {}
}

export class LoadMoreComponents {
static readonly type = '[Project Overview] Load More Components';

constructor(public projectId: string) {}
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
import { AsyncStateModel, BaseNodeModel, ComponentOverview } from '@osf/shared/models';
import { AsyncStateModel, AsyncStateWithTotalCount, BaseNodeModel, ComponentOverview } from '@osf/shared/models';

import { ProjectOverview } from '../models';

export interface ProjectOverviewStateModel {
project: AsyncStateModel<ProjectOverview | null>;
components: AsyncStateModel<ComponentOverview[]>;
components: AsyncStateWithTotalCount<ComponentOverview[]> & {
currentPage: number;
};
isAnonymous: boolean;
duplicatedProject: BaseNodeModel | null;
parentProject: AsyncStateModel<ProjectOverview | null>;
Expand All @@ -22,6 +24,8 @@ export const PROJECT_OVERVIEW_DEFAULTS: ProjectOverviewStateModel = {
isLoading: false,
isSubmitting: false,
error: null,
currentPage: 0,
totalCount: 0,
},
isAnonymous: false,
duplicatedProject: null,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,4 +85,9 @@ export class ProjectOverviewSelectors {
static getParentProjectLoading(state: ProjectOverviewStateModel) {
return state.parentProject.isLoading;
}

@Selector([ProjectOverviewState])
static hasMoreComponents(state: ProjectOverviewStateModel) {
return state.components.data.length < state.components.totalCount && !state.components.isLoading;
}
}
19 changes: 16 additions & 3 deletions src/app/features/project/overview/store/project-overview.state.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import {
GetComponents,
GetParentProject,
GetProjectById,
LoadMoreComponents,
SetProjectCustomCitation,
UpdateProjectPublicStatus,
} from './project-overview.actions';
Expand Down Expand Up @@ -253,20 +254,32 @@ export class ProjectOverviewState {
},
});

return this.projectOverviewService.getComponents(action.projectId).pipe(
tap((components) => {
return this.projectOverviewService.getComponents(action.projectId, action.page, action.pageSize).pipe(
tap((response) => {
const data = action.page === 1 ? response.data : [...state.components.data, ...response.data];

ctx.patchState({
components: {
data: components,
data,
isLoading: false,
error: null,
currentPage: action.page,
totalCount: response.totalCount,
},
});
}),
catchError((error) => handleSectionError(ctx, 'components', error))
);
}

@Action(LoadMoreComponents)
loadMoreComponents(ctx: StateContext<ProjectOverviewStateModel>, action: LoadMoreComponents) {
const state = ctx.getState();
const nextPage = state.components.currentPage + 1;

return ctx.dispatch(new GetComponents(action.projectId, nextPage, 10));
}

@Action(GetParentProject)
getParentProject(ctx: StateContext<ProjectOverviewStateModel>, action: GetParentProject) {
const state = ctx.getState();
Expand Down
Loading