diff --git a/backend/web/src/main/resources/config/permissions.yml b/backend/web/src/main/resources/config/permissions.yml index 476f465f6..783899a01 100644 --- a/backend/web/src/main/resources/config/permissions.yml +++ b/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: diff --git a/dmp-frontend/src/app/core/common/enum/permission.enum.ts b/dmp-frontend/src/app/core/common/enum/permission.enum.ts index c0e3a1c2f..07ef9f662 100644 --- a/dmp-frontend/src/app/core/common/enum/permission.enum.ts +++ b/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", diff --git a/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor.component.html b/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor.component.html index 42c8a4757..c6d36e197 100644 --- a/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor.component.html +++ b/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor.component.html @@ -17,7 +17,7 @@ -
+
@@ -162,7 +162,7 @@
- +
@@ -228,8 +228,8 @@
-
-
@@ -239,7 +239,7 @@
-
@@ -263,6 +263,7 @@
+ {{formGroup.get('properties').get('dmpBlueprintValues').get(field.id)?.get('reference')?.status }} diff --git a/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor.component.ts b/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor.component.ts index bead0e5fc..18de61f5c 100644 --- a/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor.component.ts +++ b/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor.component.ts @@ -224,7 +224,7 @@ export class DmpEditorComponent extends BaseEditor implemen .pipe(takeUntil(this._destroyed)).subscribe( complete => { this.permissionPerSection = complete, - this.buildForm(); + this.buildForm(); }, error => this.onCallbackError(error) ); diff --git a/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor.model.ts b/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor.model.ts index 7035e0a32..3203fce13 100644 --- a/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor.model.ts +++ b/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); @@ -734,7 +737,7 @@ export class DmpDescriptionTemplateEditorModel implements DmpDescriptionTemplate } export class DmpFieldIndicator { - + private _fieldControlNames; get fieldControlNames(): string[] { @@ -747,7 +750,7 @@ export class DmpFieldIndicator { if (section.hasTemplates) { this._fieldControlNames.push(`descriptionTemplates.${section.id}`); } else { - section.fields.forEach((field: FieldInSection) => { + section.fields.forEach((field: FieldInSection) => { switch (field.category) { case DmpBlueprintFieldCategory.System: this.buildSystemField(field as SystemFieldInSection); @@ -785,7 +788,7 @@ export class DmpFieldIndicator { break; } } - + buildReferenceTypeField(field: ReferenceTypeFieldInSection): void { if (field.multipleSelect) { this._fieldControlNames.push(`properties.dmpBlueprintValues.${field.id}.references`); @@ -793,7 +796,7 @@ export class DmpFieldIndicator { this._fieldControlNames.push(`properties.dmpBlueprintValues.${field.id}.reference`); } } - + buildExtraField(field: ExtraFieldInSection): void { this._fieldControlNames.push(`properties.dmpBlueprintValues.${field.id}.fieldValue`); } diff --git a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.html b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.html index c41fbc125..b3404cd99 100644 --- a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.html +++ b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.html @@ -43,9 +43,9 @@
-
+
-
+