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

Merge branch 'VM/RED-8382' into 'master'

Browse Source 
RED-8382 - Missing Restore/Hard Delete button for trashed dossier without owner

Closes RED-8382

See merge request redactmanager/red-ui!274
This commit is contained in:
Dan Percic 2024-01-29 14:52:11 +01:00
commit 89037fcd5c
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/red-ui/src/app/modules/trash/trash-screen/trash-table-item/trash-table-item.component.html
View File

@ -40,14 +40,14 @@
<div class="action-buttons"> <div class="action-buttons">
<iqser-circle-button <iqser-circle-button
(action)="restore.emit([item])" (action)="restore.emit([item])"
*ngIf="(item.canRestore && item.hasRestoreRights) || !item.ownerId" *ngIf="(item.canRestore && item.hasRestoreRights) || canUserUpdateUnassignedDossier"
[tooltip]="'trash.action.restore' | translate" [tooltip]="'trash.action.restore' | translate"
icon="red:put-back" icon="red:put-back"
></iqser-circle-button> ></iqser-circle-button>
<iqser-circle-button <iqser-circle-button
(action)="hardDelete.emit([item])" (action)="hardDelete.emit([item])"
*ngIf="item.hasHardDeleteRights || !item.ownerId" *ngIf="item.hasHardDeleteRights || canUserUpdateUnassignedDossier"
[tooltip]="'trash.action.delete' | translate" [tooltip]="'trash.action.delete' | translate"
icon="iqser:trash" icon="iqser:trash"
></iqser-circle-button> ></iqser-circle-button>

8
apps/red-ui/src/app/modules/trash/trash-screen/trash-table-item/trash-table-item.component.ts
View File

@ -1,9 +1,10 @@
import { ChangeDetectionStrategy, Component, EventEmitter, Input, OnChanges, Output } from '@angular/core'; import { ChangeDetectionStrategy, Component, EventEmitter, Input, OnChanges, Output } from '@angular/core';
import { Dossier, DossierStats, TrashFile, TrashItem } from '@red/domain'; import { Dossier, DossierStats, TrashFile, TrashItem, User } from '@red/domain';
import { ActiveDossiersService } from '@services/dossiers/active-dossiers.service'; import { ActiveDossiersService } from '@services/dossiers/active-dossiers.service';
import { DossierStatsService } from '@services/dossiers/dossier-stats.service'; import { DossierStatsService } from '@services/dossiers/dossier-stats.service';
import { PartialDossier } from '@shared/components/dossier-name-column/dossier-name-column.component'; import { PartialDossier } from '@shared/components/dossier-name-column/dossier-name-column.component';
import { Observable } from 'rxjs'; import { Observable } from 'rxjs';
import { getCurrentUser } from '@common-ui/users';
@Component({ @Component({
selector: 'redaction-trash-table-item [item]', selector: 'redaction-trash-table-item [item]',
@ -17,6 +18,7 @@ export class TrashTableItemComponent implements OnChanges {
@Output() hardDelete = new EventEmitter<TrashItem[]>(); @Output() hardDelete = new EventEmitter<TrashItem[]>();
fileDossier$: Observable<Dossier>; fileDossier$: Observable<Dossier>;
dossierStats$: Observable<DossierStats>; dossierStats$: Observable<DossierStats>;
readonly #currentUser = getCurrentUser<User>();
constructor( constructor(
private readonly _activeDossiersService: ActiveDossiersService, private readonly _activeDossiersService: ActiveDossiersService,
@ -39,4 +41,8 @@ export class TrashTableItemComponent implements OnChanges {
this.dossierStats$ = this.dossierStatsService.watch$(this.item.id); this.dossierStats$ = this.dossierStatsService.watch$(this.item.id);
} }
} }
get canUserUpdateUnassignedDossier() {
return this.#currentUser.isManager && !this.item.ownerId;
}
} }