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

backend/core/src/main/java/org/opencdmp/service/prefillingsource/PrefillingSourceServiceImpl.java

@@ -476,6 +476,7 @@ public class PrefillingSourceServiceImpl implements PrefillingSourceService {
                     Tag tag = new Tag();
                     tag.setLabel(tagString.trim());
                     descriptionTag.setTag(tag);
+                    descriptionTag.setIsActive(IsActive.Active);
                     description.getDescriptionTags().add(descriptionTag);
                 }
             }

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

@@ -403,12 +403,6 @@ permissions:
       allowAuthenticated: false
     # Dmp
     BrowseDmp:
-      roles:
-        - TenantAdmin
-      clients: [ ]
-      allowAnonymous: false
-      allowAuthenticated: false
-    EditDmp:
       roles:
         - TenantAdmin
       dmp:
@@ -420,7 +414,7 @@ permissions:
       clients: [ ]
       allowAnonymous: false
       allowAuthenticated: false
-    ReviewDmp:
+    EditDmp:
       roles:
         - TenantAdmin
       dmp:

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

@@ -71,7 +71,6 @@ export enum AppPermission {
 	//Dmp
 	BrowseDmp = "BrowseDmp",
 	EditDmp = "EditDmp",
-	ReviewDmp = "ReviewDmp",
 	NewDmp = "NewDmp",
 	DepositDmp = "DepositDmp",
 	DeleteDmp = "DeleteDmp",

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

@@ -17,7 +17,7 @@
 									<button [disabled]="saving" *ngIf="isNew" mat-raised-button type="button" (click)="formSubmit()" class="save-btn">
 										{{'DMP-EDITOR.ACTIONS.SAVE' | translate}}
 									</button>
-									<div *ngIf="!isNew && formGroup.enabled && !lockStatus">
+									<div *ngIf="!isNew && formGroup.enabled && !lockStatus && canSave">
 										<button [disabled]="saving" *ngIf="!isFinalized" mat-raised-button (click)="formSubmit()" class="save-btn">
 											{{'DMP-EDITOR.ACTIONS.SAVE' | translate}}
 										</button>
@@ -162,7 +162,7 @@
 															</mat-form-field>
 														</div>
 														<div *ngIf="field.systemFieldType == dmpBlueprintSystemFieldTypeEnum.Description">
-															<rich-text-editor-component [form]="formGroup.get('description')" [placeholder]="field.placeholder ?? 'DMP-EDITOR.PLACEHOLDER.DESCRIPTION'" [required]="field.required">
+															<rich-text-editor-component [form]="formGroup.get('description')" [editable]="formGroup.get('description').status !== 'DISABLED'" [placeholder]="field.placeholder ?? 'DMP-EDITOR.PLACEHOLDER.DESCRIPTION'" [required]="field.required">
 															</rich-text-editor-component>
 														</div>
 														<div *ngIf="field.systemFieldType == dmpBlueprintSystemFieldTypeEnum.Language">
@@ -228,8 +228,8 @@
 																			</ng-container>
 																		</div>
 																	</div>
-																	<div class="col-12 col-xl-auto">
+																	<div *ngIf="canSave" class="col-12 col-xl-auto">
-																		<button [disabled]="formGroup.disabled" mat-icon-button class="action-list-icon" matTooltip="{{'DMP-EDITOR.ACTIONS.REMOVE-CONTACT' | translate}}" (click)="removeContact(contactIndex)" [disabled]="formGroup.disabled">
+																		<button [disabled]="!this.canSave" mat-icon-button class="action-list-icon" matTooltip="{{'DMP-EDITOR.ACTIONS.REMOVE-CONTACT' | translate}}" (click)="removeContact(contactIndex)" [disabled]="formGroup.disabled">
 																			<mat-icon>delete</mat-icon>
 																		</button>
 																	</div>
@@ -239,7 +239,7 @@
 															</div>
 															<div class="row">
 																<div class="col">
-																	<button mat-icon-button (click)="addContact()" [disabled]="formGroup.disabled">
+																	<button mat-icon-button (click)="addContact()" [disabled]="!this.canSave">
 																		<mat-icon>add</mat-icon>
 																	</button>
 																</div>
@@ -263,6 +263,7 @@
 														</div>
 													</div>
 													<div *ngIf="field.category === dmpBlueprintSectionFieldCategoryEnum.ReferenceType">
+														{{formGroup.get('properties').get('dmpBlueprintValues').get(field.id)?.get('reference')?.status }}
 														<ng-container *ngIf="field.multipleSelect">
 															<app-reference-field-component [form]="formGroup.get('properties').get('dmpBlueprintValues').get(field.id).get('references')" [dependencies]="formGroup.get('properties').get('dmpBlueprintValues')" [label]= "field.label" [placeholder]="field.placeholder ?? field.label" [referenceType]="field.referenceType" [multiple]="true"></app-reference-field-component>
 														</ng-container>

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

@@ -224,7 +224,7 @@ export class DmpEditorComponent extends BaseEditor<DmpEditorModel, Dmp> implemen
 					.pipe(takeUntil(this._destroyed)).subscribe(
 						complete => {
 							this.permissionPerSection = complete,
-								this.buildForm();
+							this.buildForm();
 						},
 						error => this.onCallbackError(error)
 					);

dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor.model.ts

@@ -87,7 +87,8 @@ export class DmpEditorModel extends BaseEditorModel implements DmpPersist {
 			label: [{ value: this.label, disabled: disabled }, context.getValidation('label').validators],
 			status: [{ value: this.status, disabled: disabled }, context.getValidation('status').validators],
 			properties: this.properties.buildForm({
-				rootPath: `properties.`
+				rootPath: `properties.`,
+				disabled: disabled
 			}),
 			users: this.formBuilder.array(
 				(this.users ?? []).map(
@@ -242,7 +243,8 @@ export class DmpPropertiesEditorModel implements DmpPropertiesPersist {
 			contacts: this.formBuilder.array(
 				(this.contacts ?? []).map(
 					(item, index) => item.buildForm({
-						rootPath: `${rootPath}contacts[${index}].`
+						rootPath: `${rootPath}contacts[${index}].`,
+						disabled: disabled
 					})
 				), context.getValidation('contacts').validators
 			),
@@ -252,7 +254,8 @@ export class DmpPropertiesEditorModel implements DmpPropertiesPersist {
 
 		const dmpBlueprintValuesFormGroup = this.formBuilder.group({});
 		this.dmpBlueprintValues.forEach((value, key) => dmpBlueprintValuesFormGroup.addControl(key.toString(), value.buildForm({
-			rootPath: `${rootPath}dmpBlueprintValues[${key}].`
+			rootPath: `${rootPath}dmpBlueprintValues[${key}].`,
+			disabled: disabled
 		})), context.getValidation('dmpBlueprintValues')
 		)
 		formGroup.addControl('dmpBlueprintValues', dmpBlueprintValuesFormGroup);

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

@@ -43,9 +43,9 @@
 							</div>
 						</div>
 					</div>
-					<div class="row" *ngIf="(canEditDmp() && !isLocked) || canCloneDmp() || (canDeleteDmp() && !isLocked)">
+					<div class="row" *ngIf="(isDraftDmp(dmp) && !lockStatus) || canCloneDmp() || (canDeleteDmp() && !isLocked)">
 						<!-- <button *ngIf="isDraftDmp(dmp) && isDmpOwner(dmp) && !isLocked" (click)="editClicked(dmp)" mat-mini-fab class="mr-3 d-flex justify-content-center align-items-center" matTooltip="{{'DMP-OVERVIEW.ACTIONS.EDIT' | translate}}" matTooltipPosition="above"> -->
-						<div *ngIf="canEditDmp() && !isLocked" class="col-auto pr-0">
+						<div *ngIf="isDraftDmp(dmp) && !lockStatus" class="col-auto pr-0">
 							<button (click)="editClicked()" mat-mini-fab class="d-flex justify-content-center align-items-center" matTooltip="{{'DMP-OVERVIEW.ACTIONS.EDIT' | translate}}" matTooltipPosition="above">
 								<mat-icon class="mat-mini-fab-icon">create</mat-icon>
 							</button>

dmp-frontend/src/app/ui/external-fetcher/external-fetcher-source-editor.model.ts

@@ -313,7 +313,7 @@ export class ResultFieldsMappingConfigurationEditorModel implements ResultFields
 		}
 
 		return this.formBuilder.group({
-			code: [{ value: this.code, disabled: true }, context.getValidation('code').validators],
+			code: [{ value: this.code, disabled: disabled }, context.getValidation('code').validators],
 			responsePath: [{ value: this.responsePath, disabled: disabled }, context.getValidation('responsePath').validators],
 		});
 	}
@@ -722,7 +722,7 @@ export class StaticOptionEditorModel implements StaticOptionPersist {
 		}
 
 		return this.formBuilder.group({
-			code: [{ value: this.code, disabled: true }, context.getValidation('code').validators],
+			code: [{ value: this.code, disabled: disabled }, context.getValidation('code').validators],
 			value: [{ value: this.value, disabled: disabled }, context.getValidation('value').validators],
 		});
 	}

dmp-frontend/src/app/ui/external-fetcher/external-fetcher-source.component.html

@@ -141,7 +141,7 @@
 								<div class="col">
 									<mat-form-field class="w-100">
 										<mat-label>{{'EXTERNAL-FETCHER-SOURCE-EDITOR.FIELDS.CODE' | translate}}</mat-label>
-										<input matInput type="text" [readonly]="field.get('code').disabled" name="code" [formControl]="field.get('code')" [readOnly]="true">
+										<input matInput type="text" [readonly]="true" name="code" [formControl]="field.get('code')">
 										<mat-error *ngIf="field.get('code').hasError('backendError')">{{field.get('code').getError('backendError').message}}</mat-error>
 										<mat-error *ngIf="field.get('code').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
 									</mat-form-field>
@@ -372,7 +372,7 @@
 												<div class="col-6">
 													<mat-form-field class="w-100">
 														<mat-label>{{'EXTERNAL-FETCHER-SOURCE-EDITOR.FIELDS.CODE' | translate}}</mat-label>
-														<input matInput type="text" [readonly]="option.get('code').disabled" name="code" [formControl]="option.get('code')">
+														<input matInput type="text" [readonly]="true" name="code" [formControl]="option.get('code')">
 														<mat-error *ngIf="option.get('code').hasError('backendError')">{{option.get('code').getError('backendError').message}}</mat-error>
 														<mat-error *ngIf="option.get('code').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
 													</mat-form-field>

dmp-frontend/src/app/ui/tag/tags-field/tags-field.component.ts

@@ -1,5 +1,5 @@
 import { COMMA, ENTER } from '@angular/cdk/keycodes';
-import { Component, ElementRef, Input, OnInit, ViewChild } from '@angular/core';
+import { Component, ElementRef, Input, OnInit, SimpleChanges, ViewChild } from '@angular/core';
 import { UntypedFormControl } from '@angular/forms';
 import { MatAutocompleteSelectedEvent } from '@angular/material/autocomplete';
 import { MatChipInputEvent } from '@angular/material/chips';
@@ -30,8 +30,15 @@ export class TagsComponent extends BaseComponent implements OnInit {
 	) {
 		super();
 	}
+	ngOnChanges(changes: SimpleChanges) {
+		if(changes['form']) this.applyTags();
+	}
 
 	ngOnInit(): void {
+		this.applyTags();
+	}
+
+	applyTags(){
 		this.tags = this.form.value || [];
 		this.filteredTags = this.form.valueChanges.pipe(
 			startWith(null),