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

fix RED-2329

Browse Source
This commit is contained in:
Dan Percic 2021-10-04 17:58:58 +03:00
parent 8cf5c91e6b
commit 30ba9def1d
7 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/red-ui/src/app/modules/dossier/dialogs/assign-reviewer-approver-dialog/assign-reviewer-approver-dialog.component.ts
View File

@ -32,7 +32,7 @@ export class AssignReviewerApproverDialogComponent {
private readonly _appStateService: AppStateService,
private readonly _dossiersService: DossiersService,
private readonly _filesService: FilesService,
private readonly _dialogRef: MatDialogRef<AssignReviewerApproverDialogComponent>,
private readonly _dialogRef: MatDialogRef<AssignReviewerApproverDialogComponent, boolean>,
@Inject(MAT_DIALOG_DATA) readonly data: DialogData
) {
this._loadData();

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

@ -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';

2
apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/table-item/table-item.component.html
View File

@ -61,7 +61,7 @@
></iqser-status-bar>
<redaction-file-actions
(actionPerformed)="calculateData.emit()"
(actionPerformed)="calculateData.emit($event)"
*ngIf="!file.isProcessing"
[file]="file"
class="mr-4"

2
apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/table-item/table-item.component.ts
View File

@ -13,5 +13,5 @@ export class TableItemComponent {
@Input() @Required() file!: File;
@Input() @Required() statsTemplate!: TemplateRef<unknown>;
@Input() @Required() displayedAttributes!: IFileAttributeConfig[];
@Output() readonly calculateData = new EventEmitter<void>();
@Output() readonly calculateData = new EventEmitter<string>();
}

2
apps/red-ui/src/app/modules/dossier/screens/dossier-overview/screen/dossier-overview-screen.component.html
View File

@ -114,7 +114,7 @@
<ng-template #tableItemTemplate let-file="entity">
<redaction-table-item
(calculateData)="calculateData()"
(calculateData)="actionPerformed($event)"
[displayedAttributes]="displayedAttributes"
[file]="file"
[statsTemplate]="statsTemplate"

8
apps/red-ui/src/app/modules/dossier/screens/dossier-overview/screen/dossier-overview-screen.component.ts
View File

@ -116,11 +116,15 @@ export class DossierOverviewScreenComponent extends ListingComponent<File> 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]);
}
}

4
apps/red-ui/src/app/state/app-state.service.ts
View File

@ -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,