diff --git a/apps/red-ui/src/app/models/file/file.ts b/apps/red-ui/src/app/models/file/file.ts index 718a951f7..56a80bb4e 100644 --- a/apps/red-ui/src/app/models/file/file.ts +++ b/apps/red-ui/src/app/models/file/file.ts @@ -87,7 +87,7 @@ export class File implements IFile, IListable { this.lastUploaded = file.lastUploaded; this.legalBasisVersion = file.legalBasisVersion; this.numberOfAnalyses = file.numberOfAnalyses; - this.status = ['REPROCESS', 'FULLREPROCESS'].includes(file.status) ? FileStatuses.PROCESSING : file.status; + this.status = ['REPROCESS', 'FULLREPROCESS', 'INDEXING'].includes(file.status) ? FileStatuses.PROCESSING : file.status; this.isError = this.status === FileStatuses.ERROR; this.numberOfPages = this.isError ? 0 : file.numberOfPages ?? 0; this.rulesVersion = file.rulesVersion; diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/assign-reviewer-approver-dialog/assign-reviewer-approver-dialog.component.ts b/apps/red-ui/src/app/modules/dossier/dialogs/assign-reviewer-approver-dialog/assign-reviewer-approver-dialog.component.ts index 468379ba0..2a5e8f849 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/assign-reviewer-approver-dialog/assign-reviewer-approver-dialog.component.ts +++ b/apps/red-ui/src/app/modules/dossier/dialogs/assign-reviewer-approver-dialog/assign-reviewer-approver-dialog.component.ts @@ -82,8 +82,8 @@ export class AssignReviewerApproverDialogComponent { await this._filesService .setUnderApprovalFor( this.data.files.map(f => f.fileId), - selectedUser, this._dossiersService.activeDossierId, + selectedUser, ) .toPromise(); } diff --git a/apps/red-ui/src/app/modules/dossier/services/files.service.ts b/apps/red-ui/src/app/modules/dossier/services/files.service.ts index 5e95f8b99..136afe1f1 100644 --- a/apps/red-ui/src/app/modules/dossier/services/files.service.ts +++ b/apps/red-ui/src/app/modules/dossier/services/files.service.ts @@ -49,8 +49,8 @@ export class FilesService extends EntitiesService { } @Validate() - setUnderApprovalFor(@RequiredParam() body: List, @RequiredParam() approverId: string, @RequiredParam() dossierId: string) { - const url = `${this._defaultModelPath}/underapproval/${dossierId}/bulk`; + setUnderApprovalFor(@RequiredParam() body: List, @RequiredParam() dossierId: string, approverId: string) { + const url = `${this._defaultModelPath}/under-approval/${dossierId}/bulk`; return this._post(body, url, [{ key: 'approverId', value: approverId }]); } @@ -58,8 +58,9 @@ export class FilesService extends EntitiesService { * Assigns a reviewer for a list of files. */ @Validate() - setReviewerFor(@RequiredParam() filesIds: List, @RequiredParam() dossierId: string, @RequiredParam() reviewerId: string) { - return this._post(filesIds, `${this._defaultModelPath}/${dossierId}/bulk/${reviewerId}`); + setReviewerFor(@RequiredParam() filesIds: List, @RequiredParam() dossierId: string, reviewerId: string) { + const url = `${this._defaultModelPath}/set-reviewer/${dossierId}/bulk`; + return this._post(filesIds, url, [{ key: 'reviewerId', value: reviewerId }]); } /** @@ -75,7 +76,7 @@ export class FilesService extends EntitiesService { */ @Validate() setUnderReviewFor(@RequiredParam() filesIds: List, @RequiredParam() dossierId: string) { - return this._post(filesIds, `${this._defaultModelPath}/underreview/${dossierId}/bulk`); + return this._post(filesIds, `${this._defaultModelPath}/under-review/${dossierId}/bulk`); } /** diff --git a/apps/red-ui/src/app/modules/dossier/shared/services/file-action.service.ts b/apps/red-ui/src/app/modules/dossier/shared/services/file-action.service.ts index 2def31856..2f2c1d5b9 100644 --- a/apps/red-ui/src/app/modules/dossier/shared/services/file-action.service.ts +++ b/apps/red-ui/src/app/modules/dossier/shared/services/file-action.service.ts @@ -58,8 +58,8 @@ export class FileActionService { return this._fileService.setUnderApprovalFor( files.map(f => f.fileId), - approverId, this._dossiersService.activeDossierId, + approverId, ); }