From 30ba9def1db2fb3f46237abf27f0974185cd51f8 Mon Sep 17 00:00:00 2001 From: Dan Percic Date: Mon, 4 Oct 2021 17:58:58 +0300 Subject: [PATCH] fix RED-2329 --- .../assign-reviewer-approver-dialog.component.ts | 2 +- .../dossier-overview-bulk-actions.component.ts | 6 +++--- .../components/table-item/table-item.component.html | 2 +- .../components/table-item/table-item.component.ts | 2 +- .../screen/dossier-overview-screen.component.html | 2 +- .../screen/dossier-overview-screen.component.ts | 8 ++++++-- apps/red-ui/src/app/state/app-state.service.ts | 4 ---- 7 files changed, 13 insertions(+), 13 deletions(-) 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 4f2a2dabb..63bd76f2a 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 @@ -32,7 +32,7 @@ export class AssignReviewerApproverDialogComponent { private readonly _appStateService: AppStateService, private readonly _dossiersService: DossiersService, private readonly _filesService: FilesService, - private readonly _dialogRef: MatDialogRef, + private readonly _dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) readonly data: DialogData ) { this._loadData(); diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/bulk-actions/dossier-overview-bulk-actions.component.ts b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/bulk-actions/dossier-overview-bulk-actions.component.ts index 58d55bdb5..edf5951e8 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/bulk-actions/dossier-overview-bulk-actions.component.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/bulk-actions/dossier-overview-bulk-actions.component.ts @@ -1,8 +1,8 @@ import { Component, EventEmitter, Input, Output } from '@angular/core'; -import { AppStateService } from '../../../../../../state/app-state.service'; +import { AppStateService } from '@state/app-state.service'; import { FileManagementControllerService, ReanalysisControllerService } from '@redaction/red-ui-http'; -import { PermissionsService } from '../../../../../../services/permissions.service'; -import { File } from '../../../../../../models/file/file'; +import { PermissionsService } from '@services/permissions.service'; +import { File } from '@models/file/file'; import { FileActionService } from '../../../../shared/services/file-action.service'; import { Observable } from 'rxjs'; import { DossiersDialogService } from '../../../../services/dossiers-dialog.service'; diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/table-item/table-item.component.html b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/table-item/table-item.component.html index 43de75f4a..0901befe5 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/table-item/table-item.component.html +++ b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/table-item/table-item.component.html @@ -61,7 +61,7 @@ > ; @Input() @Required() displayedAttributes!: IFileAttributeConfig[]; - @Output() readonly calculateData = new EventEmitter(); + @Output() readonly calculateData = new EventEmitter(); } diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/screen/dossier-overview-screen.component.html b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/screen/dossier-overview-screen.component.html index 7dc4f46f6..7f3e38fbf 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/screen/dossier-overview-screen.component.html +++ b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/screen/dossier-overview-screen.component.html @@ -114,7 +114,7 @@ imple return this.displayedInFileListAttributes.filter(c => c.displayedInFileList); } - actionPerformed(action?: string, file?: File) { + async actionPerformed(action?: string, file?: File) { + if (action === 'assign-reviewer') { + return await this.reloadDossiers(); + } + this.calculateData(); if (action === 'navigate') { - this._router.navigate([file.routerLink]); + await this._router.navigate([file.routerLink]); } } diff --git a/apps/red-ui/src/app/state/app-state.service.ts b/apps/red-ui/src/app/state/app-state.service.ts index 0209fc320..9d91b6165 100644 --- a/apps/red-ui/src/app/state/app-state.service.ts +++ b/apps/red-ui/src/app/state/app-state.service.ts @@ -1,7 +1,5 @@ import { Injectable } from '@angular/core'; import { Colors, IFile, ReanalysisControllerService } from '@redaction/red-ui-http'; -import { Toaster } from '@iqser/common-ui'; -import { TranslateService } from '@ngx-translate/core'; import { ActivationEnd, Event, ResolveStart, Router } from '@angular/router'; import { UserService } from '@services/user.service'; import { forkJoin, Observable, of, Subject } from 'rxjs'; @@ -43,9 +41,7 @@ export class AppStateService { private readonly _userService: UserService, private readonly _dossiersService: DossiersService, private readonly _filesService: FilesService, - private readonly _toaster: Toaster, private readonly _reanalysisControllerService: ReanalysisControllerService, - private readonly _translateService: TranslateService, private readonly _dictionaryService: DictionaryService, private readonly _dossierTemplatesService: DossierTemplatesService, private readonly _fileAttributesService: FileAttributesService,