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 @@ -308,12 +308,12 @@ export class PreprintStepperState {
getProjectFilesByLink(ctx: StateContext<PreprintStepperStateModel>, action: FetchProjectFilesByLink) {
ctx.setState(patch({ projectFiles: patch({ isLoading: true }) }));

return this.fileService.getFilesWithoutFiltering(action.filesLink).pipe(
tap((files: FileModel[]) => {
return this.fileService.getFilesWithoutFiltering(action.filesLink, 1).pipe(
tap((response) => {
ctx.setState(
patch({
projectFiles: patch({
data: files,
data: response.data,
isLoading: false,
}),
})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
[storage]="null"
[currentFolder]="currentFolder()!"
[isLoading]="isFilesLoading()"
[scrollHeight]="'500px'"
[viewOnly]="filesViewOnly()"
[resourceId]="projectId()"
[provider]="provider()"
Expand Down
12 changes: 8 additions & 4 deletions src/app/features/registries/store/handlers/files.handlers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,23 +34,27 @@ export class FilesHandlers {
);
}

getProjectFiles(ctx: StateContext<RegistriesStateModel>, { filesLink }: GetFiles) {
getProjectFiles(ctx: StateContext<RegistriesStateModel>, { filesLink, page }: GetFiles) {
const state = ctx.getState();
ctx.patchState({
files: {
...state.files,
isLoading: true,
error: null,
totalCount: 0,
},
});

return this.filesService.getFilesWithoutFiltering(filesLink).pipe(
return this.filesService.getFilesWithoutFiltering(filesLink, page).pipe(
tap((response) => {
const newData = page === 1 ? response.data : [...(state.files.data ?? []), ...response.data];

ctx.patchState({
files: {
data: response,
data: newData,
isLoading: false,
error: null,
totalCount: response.length,
totalCount: response.totalCount,
},
});
}),
Expand Down
16 changes: 12 additions & 4 deletions src/app/shared/services/files.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import {
OsfFileRevision,
PatchFileMetadata,
} from '@osf/features/files/models';
import { PaginatedData } from '@osf/shared/models/paginated-data.model';

import { FileKind } from '../enums/file-kind.enum';
import { AddonMapper } from '../mappers/addon.mapper';
Expand Down Expand Up @@ -85,10 +86,17 @@ export class FilesService {
.pipe(map((response) => ({ files: FilesMapper.getFileFolders(response.data), meta: response.meta })));
}

getFilesWithoutFiltering(filesLink: string): Observable<FileModel[]> {
return this.jsonApiService
.get<FilesResponseJsonApi>(filesLink)
.pipe(map((response) => FilesMapper.getFiles(response.data)));
getFilesWithoutFiltering(filesLink: string, page = 1): Observable<PaginatedData<FileModel[]>> {
const params: Record<string, string> = {
page: page.toString(),
};
return this.jsonApiService.get<FilesResponseJsonApi>(filesLink, params).pipe(
map((response) => ({
data: FilesMapper.getFiles(response.data),
totalCount: response.meta.total,
pageSize: response.meta.per_page,
}))
);
}

uploadFile(
Expand Down