Marmelator/red-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1.4k Wiki Activity

Removed set under review / approve methods from file action service

Browse Source
This commit is contained in:
Adina Țeudan 2021-11-22 17:49:34 +02:00
parent 4fde66ae89
commit ea0eaab218
4 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/bulk-actions/dossier-overview-bulk-actions.component.ts
View File

@ -12,6 +12,7 @@ import { LongPressEvent } from '@shared/directives/long-press.directive';
import { UserPreferenceService } from '@services/user-preference.service'; import { UserPreferenceService } from '@services/user-preference.service';
import { FileManagementService } from '../../../../shared/services/file-management.service'; import { FileManagementService } from '../../../../shared/services/file-management.service';
import { ReanalysisService } from '@services/reanalysis.service'; import { ReanalysisService } from '@services/reanalysis.service';
import { FilesService } from '@services/entity-services/files.service';
@Component({ @Component({
selector: 'redaction-dossier-overview-bulk-actions', selector: 'redaction-dossier-overview-bulk-actions',
@ -38,6 +39,7 @@ export class DossierOverviewBulkActionsComponent {
private readonly _translateService: TranslateService, private readonly _translateService: TranslateService,
readonly listingService: ListingService<File>, readonly listingService: ListingService<File>,
private readonly _userPreferenceService: UserPreferenceService, private readonly _userPreferenceService: UserPreferenceService,
private readonly _filesService: FilesService,
) {} ) {}
get selectedFiles(): File[] { get selectedFiles(): File[] {
@ -159,7 +161,12 @@ export class DossierOverviewBulkActionsComponent {
} }
setToUnderReview() { setToUnderReview() {
this._performBulkAction(this._fileActionService.setFilesUnderReview(this.selectedFiles)); this._performBulkAction(
this._filesService.setUnderReviewFor(
this.selectedFiles.map(f => f.id),
this.dossier.id,
),
);
} }
approveDocuments() { approveDocuments() {
@ -173,11 +180,21 @@ export class DossierOverviewBulkActionsComponent {
question: _('confirmation-dialog.approve-multiple-files.question'), question: _('confirmation-dialog.approve-multiple-files.question'),
}), }),
() => { () => {
this._performBulkAction(this._fileActionService.setFilesApproved(this.selectedFiles)); this._performBulkAction(
this._filesService.setApprovedFor(
this.selectedFiles.map(f => f.id),
this.dossier.id,
),
);
}, },
); );
} else { } else {
this._performBulkAction(this._fileActionService.setFilesApproved(this.selectedFiles)); this._performBulkAction(
this._filesService.setApprovedFor(
this.selectedFiles.map(f => f.id),
this.dossier.id,
),
);
} }
} }

2
apps/red-ui/src/app/modules/dossier/screens/dossier-overview/config.service.ts
View File

@ -391,7 +391,7 @@ export class ConfigService {
private _approveFn = (reloadDossiers: () => Promise<void>) => async (file: File) => { private _approveFn = (reloadDossiers: () => Promise<void>) => async (file: File) => {
this._loadingService.start(); this._loadingService.start();
await this._fileActionService.setFilesApproved([file]).toPromise(); await this._filesService.setApprovedFor([file.id], file.dossierId).toPromise();
await reloadDossiers(); await reloadDossiers();
this._loadingService.stop(); this._loadingService.stop();
}; };

2
apps/red-ui/src/app/modules/dossier/shared/components/file-actions/file-actions.component.ts
View File

@ -251,7 +251,7 @@ export class FileActionsComponent extends AutoUnsubscribe implements OnDestroy,
} }
private async _setFileApproved() { private async _setFileApproved() {
await this._fileActionService.setFilesApproved([this.file]).toPromise(); await this._filesService.setApprovedFor([this.file.id], this.file.dossierId).toPromise();
this.reloadFiles('set-approved'); this.reloadFiles('set-approved');
} }
} }

14
apps/red-ui/src/app/modules/dossier/shared/services/file-action.service.ts
View File

@ -52,20 +52,6 @@ export class FileActionService {
); );
} }
setFilesApproved(files: File[]) {
return this._filesService.setApprovedFor(
files.map(f => f.fileId),
files[0].dossierId,
);
}
setFilesUnderReview(files: File[]) {
return this._filesService.setUnderReviewFor(
files.map(f => f.fileId),
files[0].dossierId,
);
}
assignFile(mode: 'reviewer' | 'approver', $event: MouseEvent, file: File, callback?: Function, ignoreChanged = false) { assignFile(mode: 'reviewer' | 'approver', $event: MouseEvent, file: File, callback?: Function, ignoreChanged = false) {
const dossier = this._dossiersService.find(file.dossierId); const dossier = this._dossiersService.find(file.dossierId);
const userIds = this._getUserIds(mode, dossier); const userIds = this._getUserIds(mode, dossier);