Merge branch 'dmp-refactoring' of https://code-repo.d4science.org/MaDgiK-CITE/argos into dmp-refactoring

backend/core/src/main/java/org/opencdmp/authorization/Permission.java

@@ -73,6 +73,7 @@ public final class Permission {
 	//Dmp
 	public static String BrowseDmp = "BrowseDmp";
 	public static String EditDmp = "EditDmp";
+	public static String ReviewDmp = "ReviewDmp";
 	public static String NewDmp = "NewDmp";
 	public static String DepositDmp = "DepositDmp";
 	public static String DeleteDmp = "DeleteDmp";
@@ -105,6 +106,7 @@ public final class Permission {
 
 	//Description
 	public static String BrowseDescription = "BrowseDescription";
+	public static String ReviewDescription = "ReviewDescription";
 	public static String EditDescription = "EditDescription";
 	public static String FinalizeDescription = "FinalizeDescription";
 	public static String DeleteDescription = "DeleteDescription";

backend/web/src/main/resources/config/permissions.yml

@@ -179,6 +179,18 @@ permissions:
       clients: [ ]
       allowAnonymous: false
       allowAuthenticated: false
+    ReviewDescription:
+      roles:
+        - TenantAdmin
+      dmp:
+        roles:
+          - Owner
+          - User
+          - DescriptionContributor
+          - Reviewer
+      clients: [ ]
+      allowAnonymous: false
+      allowAuthenticated: false
     EditDescription:
       roles:
         - TenantAdmin
@@ -408,6 +420,18 @@ permissions:
       clients: [ ]
       allowAnonymous: false
       allowAuthenticated: false
+    ReviewDmp:
+      roles:
+        - TenantAdmin
+      dmp:
+        roles:
+          - Owner
+          - User
+          - DescriptionContributor
+          - Reviewer
+      clients: [ ]
+      allowAnonymous: false
+      allowAuthenticated: false
     NewDmp:
       roles:
         - TenantAdmin

dmp-frontend/src/app/core/common/enum/permission.enum.ts

@@ -71,6 +71,7 @@ export enum AppPermission {
 	//Dmp
 	BrowseDmp = "BrowseDmp",
 	EditDmp = "EditDmp",
+	ReviewDmp = "ReviewDmp",
 	NewDmp = "NewDmp",
 	DepositDmp = "DepositDmp",
 	DeleteDmp = "DeleteDmp",
@@ -103,10 +104,12 @@ export enum AppPermission {
 
 	//Description
 	BrowseDescription = "BrowseDescription",
+	ReviewDescription = "ReviewDescription",
 	EditDescription = "EditDescription",
 	FinalizeDescription = "FinalizeDescription",
 	DeleteDescription = "DeleteDescription",
 	CloneDescription = "CloneDescription",
+	ExportDescription = "ExportDescription",
 
 	//DescriptionTag
 	BrowseDescriptionTag = "BrowseDescriptionTag",

dmp-frontend/src/app/ui/admin/description-template/description-template-preview/description-template-preview-dialog.component.html

@@ -8,7 +8,7 @@
 		<mat-progress-bar color="primary" mode="indeterminate"></mat-progress-bar>
 	</div>
 	<div mat-dialog-content class="definition-content">
-		<app-description-form *ngIf="formGroup && formGroup.get('properties')" [propertiesFormGroup]="previewPropertiesFormGroup" [descriptionId]="descriptionId" [descriptionTemplate]="descriptionTemplate" [visibilityRulesService]="visibilityRulesService" [isNew]="true"></app-description-form>
+		<app-description-form *ngIf="formGroup && formGroup.get('properties')" [propertiesFormGroup]="previewPropertiesFormGroup" [descriptionId]="descriptionId" [descriptionTemplate]="descriptionTemplate" [canReview]="false" [visibilityRulesService]="visibilityRulesService" [isNew]="true"></app-description-form>
 	</div>
 	<div mat-mat-dialog-actions *ngIf="formGroup">
 		<div class="col-auto d-flex pb-4 pt-2">

dmp-frontend/src/app/ui/admin/description-template/editor/components/composite-field/description-template-editor-composite-field.component.html

@@ -104,7 +104,7 @@
 						</div>
 						<div [id]="'preview_container'+ form.get('id').value" class="row">
 							<div *ngIf="previewFieldSet && showPreview && firstField?.get('data')?.get('fieldType')?.value" class="col-12" [@fade-in-fast]>
-								<app-description-form-field-set class="w-100" [propertiesFormGroup]="previewPropertiesFormGroup" [fieldSet]="previewFieldSet" [visibilityRulesService]="visibilityRulesService" [hideAnnotations]="true"></app-description-form-field-set>
+								<app-description-form-field-set class="w-100" [canReview]="false" [propertiesFormGroup]="previewPropertiesFormGroup" [fieldSet]="previewFieldSet" [visibilityRulesService]="visibilityRulesService" [hideAnnotations]="true"></app-description-form-field-set>
 							</div>
 						</div>
 					</div>

dmp-frontend/src/app/ui/admin/description-template/editor/components/final-preview/final-preview.component.html

@@ -1 +1 @@
-<app-description-form *ngIf="previewPropertiesFormGroup" [propertiesFormGroup]="previewPropertiesFormGroup" [descriptionTemplate]="descriptionTemplate" [visibilityRulesService]="visibilityRulesService" [isNew]="true"></app-description-form>
+<app-description-form *ngIf="previewPropertiesFormGroup" [canReview]="false" [propertiesFormGroup]="previewPropertiesFormGroup" [descriptionTemplate]="descriptionTemplate" [visibilityRulesService]="visibilityRulesService" [isNew]="true"></app-description-form>

dmp-frontend/src/app/ui/description/editor/description-editor.component.html

@@ -150,6 +150,7 @@
 					[linkToScroll]="linkToScroll"
 					[validationErrorModel]="editorModel.validationErrorModel"
 					[isNew]="isNew || isCopy"
+					[canReview]="canReview"
 					(fieldsetFocusChange)="fieldsetIdWithFocus = $event"
 					></app-description-form>
 				</div>

dmp-frontend/src/app/ui/description/editor/description-editor.component.ts

@@ -63,6 +63,7 @@ export class DescriptionEditorComponent extends BaseEditor<DescriptionEditorMode
 	isNew = true;
 	isDeleted = false;
 	isCopy = false;
+	canReview = false;
 	item: Description;
 	fieldsetIdWithFocus: string;
 	fileTransformerEntityTypeEnum = FileTransformerEntityType;
@@ -582,19 +583,20 @@ export class DescriptionEditorComponent extends BaseEditor<DescriptionEditorMode
 		const descriptionSectionPermissionResolverModel: DescriptionSectionPermissionResolver = {
 			dmpId: this.item.dmp.id,
 			sectionIds: [this.item.dmpDescriptionTemplate.sectionId],
-			permissions: [AppPermission.EditDescription, AppPermission.DeleteDescription]
+			permissions: [AppPermission.EditDescription, AppPermission.DeleteDescription, AppPermission.FinalizeDescription, AppPermission.ReviewDescription]
 		}
 		this.descriptionService.getDescriptionSectionPermissions(descriptionSectionPermissionResolverModel)
 			.pipe(takeUntil(this._destroyed)).subscribe(
 				permissionPerSection => {
 					const canedit = permissionPerSection && permissionPerSection[this.item.dmpDescriptionTemplate.sectionId.toString()] && permissionPerSection[this.item.dmpDescriptionTemplate.sectionId.toString()].some(x => x === AppPermission.EditDescription);
+					this.canReview = permissionPerSection && permissionPerSection[this.item.dmpDescriptionTemplate.sectionId.toString()] && permissionPerSection[this.item.dmpDescriptionTemplate.sectionId.toString()].some(x => x === AppPermission.ReviewDescription);
 					this.formGroup = this.editorModel.buildForm(null, this.isDeleted || !canedit);
 					if (this.item.descriptionTemplate?.definition) this.visibilityRulesService.setContext(this.item.descriptionTemplate.definition, this.formGroup.get('properties'));
 					if (this.item.descriptionTemplate?.definition) this.pageToFieldSetMap = this.mapPageToFieldSet(this.item.descriptionTemplate);;
 
 					// this.selectedSystemFields = this.selectedSystemFieldDisabled();
 					this.descriptionEditorService.setValidationErrorModel(this.editorModel.validationErrorModel);
-					if (this.editorModel.status == DescriptionStatus.Finalized || this.isDeleted) {
+					if (this.editorModel.status == DescriptionStatus.Finalized || this.isDeleted || !canedit) {
 						this.viewOnly = true;
 						this.isFinalized = true;
 						this.formGroup.disable();

dmp-frontend/src/app/ui/description/editor/description-editor.resolver.ts

@@ -55,6 +55,7 @@ export class DescriptionEditorResolver extends BaseEditorResolver {
 			[nameof<Description>(x => x.authorizationFlags), AppPermission.EditDescription].join('.'),
 			[nameof<Description>(x => x.authorizationFlags), AppPermission.DeleteDescription].join('.'),
 			[nameof<Description>(x => x.authorizationFlags), AppPermission.FinalizeDescription].join('.'),
+			[nameof<Description>(x => x.authorizationFlags), AppPermission.ReviewDescription].join('.'),
 
 			[nameof<Description>(x => x.dmpDescriptionTemplate), nameof<DmpDescriptionTemplate>(x => x.id)].join('.'),
 			[nameof<Description>(x => x.dmpDescriptionTemplate), nameof<DmpDescriptionTemplate>(x => x.sectionId)].join('.'),

dmp-frontend/src/app/ui/description/editor/description-form/components/form-field-set/form-field-set.component.html

@@ -6,7 +6,7 @@
 					<app-description-form-field-set-title class="row" [fieldSet]="fieldSet" [path]="path" [isChild]="isChild"></app-description-form-field-set-title>
 				</div>
 				<div *ngIf="!hideAnnotations" class="col-auto">
-					<button mat-icon-button class="col-auto annotation-icon" (click)="showAnnotations(fieldSet.id)" [disabled]="propertiesFormGroup.disabled">
+					<button mat-icon-button class="col-auto annotation-icon" (click)="showAnnotations(fieldSet.id)" [disabled]="!canReview">
 						<mat-icon matTooltip="{{'DATASET-EDITOR.QUESTION.EXTENDED-DESCRIPTION.ANNOTATIONS' | translate}}" [matBadge]="annotationsCount" [matBadgeHidden]="annotationsCount <= 0" matBadgeColor="warn">comment</mat-icon>
 					</button>
 				</div>

dmp-frontend/src/app/ui/description/editor/description-form/components/form-field-set/form-field-set.component.ts

@@ -28,6 +28,7 @@ export class DescriptionFormFieldSetComponent extends BaseComponent {
 	@Input() propertiesFormGroup: UntypedFormGroup;
 	@Input() descriptionId: Guid;
 	@Input() hideAnnotations: boolean = false;
+	@Input() canReview: boolean = false;
 
 	get isMultiplicityEnabled() {
 		return this.fieldSet.hasMultiplicity && this.fieldSet.multiplicity != null;

dmp-frontend/src/app/ui/description/editor/description-form/components/form-section/form-section.component.html

@@ -23,6 +23,7 @@
 							[validationErrorModel]="validationErrorModel"
 							[isChild]="false"
 							[hideAnnotations]="isNew"
+							[canReview]="canReview"
 							></app-description-form-field-set>
 						</div>
 					</div>
@@ -32,7 +33,7 @@
 			<div *ngIf="section?.sections?.length > 0" class="col-12">
 				<ng-container *ngFor="let innerSection of section.sections; let j = index;">
 					<div class="row" *ngIf="visibilityRulesService.isVisibleMap[innerSection.id]">
-						<app-description-form-section class="col-12" [section]="innerSection" [path]="path+'.'+(j+1)" [pathName]="pathName+'.sections.'+j" (askedToScroll)="onAskedToScroll($event)" [propertiesFormGroup]="propertiesFormGroup" [descriptionId]="descriptionId" [visibilityRulesService]="visibilityRulesService" [linkToScroll]="subsectionLinkToScroll"></app-description-form-section>
+						<app-description-form-section class="col-12" [section]="innerSection" [canReview]="canReview" [path]="path+'.'+(j+1)" [pathName]="pathName+'.sections.'+j" (askedToScroll)="onAskedToScroll($event)" [propertiesFormGroup]="propertiesFormGroup" [descriptionId]="descriptionId" [visibilityRulesService]="visibilityRulesService" [linkToScroll]="subsectionLinkToScroll"></app-description-form-section>
 					</div>
 				</ng-container>
 			</div>

dmp-frontend/src/app/ui/description/editor/description-form/components/form-section/form-section.component.ts

@@ -19,6 +19,7 @@ import { Guid } from '@common/types/guid';
 export class DescriptionFormSectionComponent extends BaseComponent implements OnInit, OnChanges {
 
 	@Input() isNew: boolean = false;
+	@Input() canReview: boolean = false;
 	@Input() section: DescriptionTemplateSection;
 	@Input() propertiesFormGroup: UntypedFormGroup;
 	@Input() visibilityRulesService: VisibilityRulesService;

dmp-frontend/src/app/ui/description/editor/description-form/description-form.component.html

@@ -15,7 +15,7 @@
 							</mat-expansion-panel-header>
 							<ng-container *ngFor="let section of page.sections; let i = index;">
 								<div class="row" *ngIf="visibilityRulesService.isVisibleMap[section.id]">
-									<app-description-form-section class="col-12" [section]="section" [path]="(z+1)+'.'+(i+1)" [pathName]="'pages.'+z+'.sections.'+i" [propertiesFormGroup]="propertiesFormGroup" [descriptionId]="descriptionId" [visibilityRulesService]="visibilityRulesService" (askedToScroll)="onAskedToScroll(expansionPanel, $event)" [linkToScroll]="linkToScroll" [validationErrorModel]="validationErrorModel" [isNew]="isNew"></app-description-form-section>
+									<app-description-form-section class="col-12" [section]="section" [canReview]="canReview" [path]="(z+1)+'.'+(i+1)" [pathName]="'pages.'+z+'.sections.'+i" [propertiesFormGroup]="propertiesFormGroup" [descriptionId]="descriptionId" [visibilityRulesService]="visibilityRulesService" (askedToScroll)="onAskedToScroll(expansionPanel, $event)" [linkToScroll]="linkToScroll" [validationErrorModel]="validationErrorModel" [isNew]="isNew"></app-description-form-section>
 								</div>
 							</ng-container>
 						</mat-expansion-panel>

dmp-frontend/src/app/ui/description/editor/description-form/description-form.component.ts

@@ -21,6 +21,7 @@ export class DescriptionFormComponent extends BaseComponent implements OnInit, A
 	@Input() visibilityRulesService: VisibilityRulesService;
 	@Input() descriptionId: Guid;
 	@Input() isNew: boolean = false;
+	@Input() canReview: boolean = false;
 
 	// @ViewChild('stepper', { static: false }) stepper: MatStepper;
 	@Input() path: string;

dmp-frontend/src/app/ui/description/overview/description-overview.component.html

@@ -37,7 +37,7 @@
 						</div>
 					</div>
 					<div class="row mb-4 pb-3">
-            <div *ngIf="canEdit && isDraftDescription(description) && !isLocked" class="col-auto pr-0">
+            <div *ngIf="(canEdit || canReview) && isDraftDescription(description) && !isLocked" class="col-auto pr-0">
             	<button (click)="editClicked(description)" mat-mini-fab class="mr-3 actions-btn" matTooltip="{{'DESCRIPTION-OVERVIEW.ACTIONS.EDIT' | translate}}" matTooltipPosition="above">
 							<mat-icon class="mat-mini-fab-icon">create</mat-icon>
 						  </button>

dmp-frontend/src/app/ui/description/overview/description-overview.component.ts

@@ -68,6 +68,7 @@ export class DescriptionOverviewComponent extends BaseComponent implements OnIni
 	canEdit = false;
 	canDelete = false;
 	canFinalize = false;
+	canReview = false;
 	canInviteDmpUsers = false;
 
 	constructor(
@@ -123,6 +124,9 @@ export class DescriptionOverviewComponent extends BaseComponent implements OnIni
 							this.canEdit = (this.authService.hasPermission(AppPermission.EditDescription) ||
 								this.description.authorizationFlags?.some(x => x === AppPermission.EditDescription))  && this.description.belongsToCurrentTenant != false;
 
+							this.canReview = (this.authService.hasPermission(AppPermission.ReviewDescription) ||
+								this.description.authorizationFlags?.some(x => x === AppPermission.ReviewDescription))  && this.description.belongsToCurrentTenant != false;
+
 							this.canFinalize = (this.authService.hasPermission(AppPermission.FinalizeDescription) ||
 								this.description.authorizationFlags?.some(x => x === AppPermission.FinalizeDescription))  && this.description.belongsToCurrentTenant != false;
 
@@ -479,6 +483,7 @@ export class DescriptionOverviewComponent extends BaseComponent implements OnIni
 			[nameof<Description>(x => x.authorizationFlags), AppPermission.DeleteDescription].join('.'),
 			[nameof<Description>(x => x.authorizationFlags), AppPermission.FinalizeDescription].join('.'),
 			[nameof<Description>(x => x.authorizationFlags), AppPermission.InviteDmpUsers].join('.'),
+			[nameof<Description>(x => x.authorizationFlags), AppPermission.ReviewDescription].join('.'),
 
 			[nameof<Description>(x => x.descriptionTemplate), nameof<DescriptionTemplate>(x => x.id)].join('.'),
 			[nameof<Description>(x => x.descriptionTemplate), nameof<DescriptionTemplate>(x => x.label)].join('.'),