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

Merge branch 'master' into VM/RED-3332

Browse Source
This commit is contained in:
Valentin Mihai 2022-02-07 12:21:54 +02:00
commit a33be9aadc
11 changed files with 60 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/download-package/edit-dossier-download-package.component.ts
View File

@ -74,7 +74,7 @@ export class EditDossierDownloadPackageComponent implements OnInit, EditDossierS
(await firstValueFrom(this._reportTemplateController.getAvailableReportTemplates(this.dossier.dossierTemplateId))) || [];
this.form = this._getForm();
if (!this._permissionsService.canEditDossier()) {
if (!this._permissionsService.canEditDossier(this.dossier)) {
this.form.disable();
}
}

26
apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-dialog.component.ts
View File

@ -1,4 +1,4 @@
import { ChangeDetectorRef, Component, Inject, Injector, ViewChild } from '@angular/core';
import { AfterViewInit, ChangeDetectorRef, Component, Inject, Injector, ViewChild } from '@angular/core';
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
import { Dossier } from '@red/domain';
import { EditDossierGeneralInfoComponent } from './general-info/edit-dossier-general-info.component';
@ -15,6 +15,7 @@ import { Observable } from 'rxjs';
import { tap } from 'rxjs/operators';
import { EditDossierTeamComponent } from './edit-dossier-team/edit-dossier-team.component';
import { PermissionsService } from '@services/permissions.service';
import { UserService } from '@services/user.service';
type Section = 'dossierInfo' | 'downloadPackage' | 'dossierDictionary' | 'members' | 'dossierAttributes' | 'deletedDocuments';
@ -22,7 +23,7 @@ type Section = 'dossierInfo' | 'downloadPackage' | 'dossierDictionary' | 'member
templateUrl: './edit-dossier-dialog.component.html',
styleUrls: ['./edit-dossier-dialog.component.scss'],
})
export class EditDossierDialogComponent extends BaseDialogComponent {
export class EditDossierDialogComponent extends BaseDialogComponent implements AfterViewInit {
readonly navItems: { key: Section; title?: string; sideNavTitle?: string }[];
readonly iconButtonTypes = IconButtonTypes;
activeNav: Section;
@ -34,7 +35,8 @@ export class EditDossierDialogComponent extends BaseDialogComponent {
@ViewChild(EditDossierTeamComponent) membersComponent: EditDossierTeamComponent;
@ViewChild(EditDossierAttributesComponent) attributesComponent: EditDossierAttributesComponent;
@ViewChild(EditDossierDeletedDocumentsComponent) deletedDocumentsComponent: EditDossierDeletedDocumentsComponent;
private _dossierName: string;
private _dossier: Dossier;
constructor(
private readonly _toaster: Toaster,
@ -42,6 +44,7 @@ export class EditDossierDialogComponent extends BaseDialogComponent {
private readonly _changeRef: ChangeDetectorRef,
private readonly _loadingService: LoadingService,
private readonly _permissionsService: PermissionsService,
private readonly _userService: UserService,
protected readonly _injector: Injector,
protected readonly _dialogRef: MatDialogRef<EditDossierDialogComponent>,
@Inject(MAT_DIALOG_DATA)
@ -82,12 +85,16 @@ export class EditDossierDialogComponent extends BaseDialogComponent {
},
];
this.dossier$ = this._dossiersService
.getEntityChanged$(_data.dossierId)
.pipe(tap(dossier => (this._dossierName = dossier.dossierName)));
this.dossier$ = this._dossiersService.getEntityChanged$(_data.dossierId).pipe(tap(dossier => (this._dossier = dossier)));
this.activeNav = _data.section || 'dossierInfo';
}
ngAfterViewInit() {
if (!this._dossier.ownerId) {
this._toaster.error(_('edit-dossier-dialog.missing-owner'));
}
}
get activeNavItem(): { key: string; title?: string } {
return this.navItems.find(item => item.key === this.activeNav);
}
@ -112,7 +119,10 @@ export class EditDossierDialogComponent extends BaseDialogComponent {
}
get showActionButtons(): boolean {
return !['deletedDocuments'].includes(this.activeNav) && this._permissionsService.canEditDossier();
return (
(['members'].includes(this.activeNav) && this._userService.currentUser.isManager) ||
(!['deletedDocuments'].includes(this.activeNav) && this._permissionsService.canEditDossier(this._dossier))
);
}
get changed(): boolean {
@ -133,7 +143,7 @@ export class EditDossierDialogComponent extends BaseDialogComponent {
this._loadingService.stop();
if (result.success) {
this._toaster.success(_('edit-dossier-dialog.change-successful'), { params: { dossierName: this._dossierName } });
this._toaster.success(_('edit-dossier-dialog.change-successful'), { params: { dossierName: this._dossier.dossierName } });
}
if (result.success && options?.closeAfterSave) {

52
apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-team/edit-dossier-team.component.html
View File

@ -9,33 +9,37 @@
</mat-select>
</mat-form-field>
</div>
<div class="all-caps-label mt-16" translate="assign-dossier-owner.dialog.approvers"></div>
<redaction-team-members
(remove)="toggleSelected($event)"
[canAdd]="false"
[canRemove]="!disabled"
[dossierId]="dossier.dossierId"
[largeSpacing]="true"
[memberIds]="selectedApproversList"
[perLine]="13"
[unremovableMembers]="[selectedOwnerId]"
></redaction-team-members>
<div class="all-caps-label mt-16" translate="assign-dossier-owner.dialog.reviewers"></div>
<redaction-team-members
(remove)="toggleSelected($event)"
[canAdd]="false"
[canRemove]="!disabled"
[dossierId]="dossier.dossierId"
[largeSpacing]="true"
[memberIds]="selectedReviewers$ | async"
[perLine]="13"
[unremovableMembers]="[selectedOwnerId]"
></redaction-team-members>
<ng-container *ngIf="selectedApproversList.length">
<div class="all-caps-label mt-16" translate="assign-dossier-owner.dialog.approvers"></div>
<redaction-team-members
(remove)="toggleSelected($event)"
[canAdd]="false"
[canRemove]="!disabled"
[dossierId]="dossier.dossierId"
[largeSpacing]="true"
[memberIds]="selectedApproversList"
[perLine]="13"
[unremovableMembers]="[selectedOwnerId]"
></redaction-team-members>
</ng-container>
<ng-container *ngIf="(selectedReviewers$ | async).length === 0">
<ng-container *ngIf="(selectedReviewers$ | async)?.length">
<div class="all-caps-label mt-16" translate="assign-dossier-owner.dialog.reviewers"></div>
<redaction-team-members
(remove)="toggleSelected($event)"
[canAdd]="false"
[canRemove]="!disabled"
[dossierId]="dossier.dossierId"
[largeSpacing]="true"
[memberIds]="selectedReviewers$ | async"
[perLine]="13"
[unremovableMembers]="[selectedOwnerId]"
></redaction-team-members>
</ng-container>
<ng-container *ngIf="!userService.currentUser.isManager">
<div class="info mt-4">{{ 'assign-dossier-owner.dialog.no-reviewers' | translate }}</div>
<div *ngIf="!disabled" class="info">{{ 'assign-dossier-owner.dialog.select-below' | translate }}</div>
</ng-container>
<ng-container *ngIf="!disabled">

9
apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-team/edit-dossier-team.component.ts
View File

@ -6,6 +6,7 @@ import { Dossier, IDossierRequest } from '@red/domain';
import { AutoUnsubscribe } from '@iqser/common-ui';
import { EditDossierSaveResult, EditDossierSectionInterface } from '../edit-dossier-section.interface';
import { BehaviorSubject, firstValueFrom } from 'rxjs';
import { PermissionsService } from '@services/permissions.service';
@Component({
selector: 'redaction-edit-dossier-team',
@ -19,14 +20,16 @@ export class EditDossierTeamComponent extends AutoUnsubscribe implements EditDos
@Input() dossier: Dossier;
readonly ownersSelectOptions = this.userService.managerUsers.map(m => m.id);
membersSelectOptions: string[] = [];
readonly ownersSelectOptions = this.userService.managerUsers.map(m => m.id);
readonly selectedReviewers$ = new BehaviorSubject<string[]>([]);
constructor(
readonly userService: UserService,
private readonly _formBuilder: FormBuilder,
private readonly _dossiersService: DossiersService,
private readonly _permissionsService: PermissionsService,
) {
super();
}
@ -48,7 +51,7 @@ export class EditDossierTeamComponent extends AutoUnsubscribe implements EditDos
}
get disabled() {
return !this.userService.currentUser.isManager;
return !this.userService.currentUser.isManager || !this.form.get('owner').value;
}
get changed() {
@ -149,7 +152,7 @@ export class EditDossierTeamComponent extends AutoUnsubscribe implements EditDos
owner: [
{
value: this.dossier?.ownerId,
disabled: this.disabled,
disabled: !this.userService.currentUser.isManager,
},
Validators.required,
],

2
apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.html
View File

@ -53,7 +53,7 @@
<mat-checkbox
(change)="hasDueDate = !hasDueDate"
[checked]="hasDueDate"
[disabled]="!permissionsService.canEditDossier()"
[disabled]="!permissionsService.canEditDossier(dossier)"
class="filter-menu-checkbox"
color="primary"
>

2
apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.ts
View File

@ -69,7 +69,7 @@ export class EditDossierGeneralInfoComponent implements OnInit, EditDossierSecti
ngOnInit() {
this._filterInvalidDossierTemplates();
this.form = this._getForm();
if (!this.permissionsService.canEditDossier()) {
if (!this.permissionsService.canEditDossier(this.dossier)) {
this.form.disable();
}
this.hasDueDate = !!this.dossier.dueDate;

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

@ -128,8 +128,8 @@ export class PermissionsService {
return dossier.ownerId === this._userService.currentUser.id;
}
canEditDossier(user = this._userService.currentUser) {
return user.isManager;
canEditDossier(dossier: Dossier, user = this._userService.currentUser): boolean {
return user.isManager && !!dossier?.ownerId;
}
isAdmin(user = this._userService.currentUser): boolean {

10
apps/red-ui/src/assets/i18n/de.json
View File

@ -146,15 +146,6 @@
"plural": ""
},
"annotation-actions": {
"resize": {
"label": "Größe ändern"
},
"resize-accept": {
"label": "Größe speichern"
},
"resize-cancel": {
"label": "Größenänderung abbrechen"
},
"accept-recommendation": {
"label": "Empfehlung annehmen"
},
@ -959,6 +950,7 @@
}
},
"header": "{dossierName} bearbeiten",
"missing-owner": "",
"nav-items": {
"choose-download": "Wählen Sie die Dokumente für Ihr Download-Paket aus:",
"deleted-documents": "Gelöschte Dokumente",

2
apps/red-ui/src/assets/i18n/en.json
View File

@ -296,7 +296,6 @@
"suggestion-add": "Suggested redaction",
"suggestion-add-dictionary": "Suggested dictionary add",
"suggestion-change-legal-basis": "Suggested change legal basis",
"suggestion-force-redaction": "Suggestion force redaction",
"suggestion-force-redaction": "Suggestion force hint",
"suggestion-recategorize-image": "Suggested recategorize image",
"suggestion-remove": "Suggested local removal",
@ -970,6 +969,7 @@
}
},
"header": "Edit {dossierName}",
"missing-owner": "You cannot edit the dossier because the owner is missing!",
"nav-items": {
"choose-download": "Choose what is included at download:",
"deleted-documents": "Deleted Documents",

2
package.json
View File

@ -1,6 +1,6 @@
{
"name": "redaction",
"version": "3.204.0",
"version": "3.205.0",
"private": true,
"license": "MIT",
"scripts": {

BIN
paligo-theme.tar.gz
View File

Binary file not shown.