From f464c5e1fe5c4ad1d89a9645e52f088f8a21d50a Mon Sep 17 00:00:00 2001 From: Valentin Mihai Date: Mon, 7 Feb 2022 13:43:34 +0200 Subject: [PATCH] used bulk api for both requests(toggle one file or bulk files) --- .../dossier-overview/services/bulk-actions.service.ts | 2 +- .../components/file-actions/file-actions.component.ts | 2 +- apps/red-ui/src/app/services/reanalysis.service.ts | 10 +--------- 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/services/bulk-actions.service.ts b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/services/bulk-actions.service.ts index 9ca37fb01..59b7c76cb 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/services/bulk-actions.service.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/services/bulk-actions.service.ts @@ -88,7 +88,7 @@ export class BulkActionsService { async toggleAutomaticAnalysis(files: File[], excluded?: boolean) { this._loadingService.start(); const fileIds = files.map(file => file.fileId); - await firstValueFrom(this._reanalysisService.toggleAutomaticAnalysisBulk(files[0].dossierId, fileIds, excluded)); + await firstValueFrom(this._reanalysisService.toggleAutomaticAnalysis(files[0].dossierId, fileIds, excluded)); this._loadingService.stop(); } diff --git a/apps/red-ui/src/app/modules/dossier/shared/components/file-actions/file-actions.component.ts b/apps/red-ui/src/app/modules/dossier/shared/components/file-actions/file-actions.component.ts index 215427cc3..242360812 100644 --- a/apps/red-ui/src/app/modules/dossier/shared/components/file-actions/file-actions.component.ts +++ b/apps/red-ui/src/app/modules/dossier/shared/components/file-actions/file-actions.component.ts @@ -326,7 +326,7 @@ export class FileActionsComponent extends AutoUnsubscribe implements OnDestroy, await firstValueFrom( this._reanalysisService.toggleAutomaticAnalysis( this.file.dossierId, - this.file.fileId, + [this.file.fileId], !this.file.excludedFromAutomaticAnalysis, ), ); diff --git a/apps/red-ui/src/app/services/reanalysis.service.ts b/apps/red-ui/src/app/services/reanalysis.service.ts index 68607bb79..479cd0ee2 100644 --- a/apps/red-ui/src/app/services/reanalysis.service.ts +++ b/apps/red-ui/src/app/services/reanalysis.service.ts @@ -53,15 +53,7 @@ export class ReanalysisService extends GenericService { } @Validate() - toggleAutomaticAnalysis(@RequiredParam() dossierId: string, @RequiredParam() fileId: string, excluded?: boolean) { - const queryParams: QueryParam[] = [{ key: 'excluded', value: !!excluded }]; - return this._post({}, `toggle-automatic-analysis/${dossierId}/${fileId}`, queryParams).pipe( - switchMap(() => this._filesService.loadAll(dossierId)), - ); - } - - @Validate() - toggleAutomaticAnalysisBulk(@RequiredParam() dossierId: string, @RequiredParam() fileIds: string[], excluded?: boolean) { + toggleAutomaticAnalysis(@RequiredParam() dossierId: string, @RequiredParam() fileIds: string[], excluded?: boolean) { const queryParams: QueryParam[] = [{ key: 'excluded', value: !!excluded }]; return this._post(fileIds, 'toggle-automatic-analysis/bulk', queryParams).pipe( switchMap(() => this._filesService.loadAll(dossierId)),