[DURACOM-453] port metadata security update, init and administrate

FrancescoMolinaro · FrancescoMolinaro · commit c35253427784 · 2026-03-10T17:45:45.000+01:00
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.ts
@@ -89,6 +89,8 @@ export class DsoEditMetadataValue {
       if (this.originalValue.value !== this.newValue.value || this.originalValue.language !== this.newValue.language
         || this.originalValue.authority !== this.newValue.authority || this.originalValue.confidence !== this.newValue.confidence) {
         this.change = DsoEditMetadataChangeType.UPDATE;
+      } else if (!hasValue(this.originalValue.authority) && hasValue(this.newValue.authority)) {
+        this.change = DsoEditMetadataChangeType.ADD;
       } else {
         this.change = undefined;
       }
@@ -362,8 +364,10 @@ export class DsoEditMetadataForm {
       });
     });
     // Reset the order of values within their fields to match their place property
+    // And reinstate the security level values
     this.fieldKeys.forEach((field: string) => {
       this.setValuesForFieldSorted(field, this.fields[field]);
+      this.reinstateSecurityLevel(field);
     });
     this.reinstatableNewValues = {};
   }
@@ -399,6 +403,19 @@ export class DsoEditMetadataForm {
     this.fields[mdField] = values.sort((a: DsoEditMetadataValue, b: DsoEditMetadataValue) => a.newValue.place - b.newValue.place);
   }
 
+  /**
+   * Set the change property of each value within a metadata field,
+   * in case the security level has been changed and we are trying to reinstate the changes
+   * @param mdField
+   */
+  private reinstateSecurityLevel(mdField: string){
+    this.fields[mdField].forEach((value: DsoEditMetadataValue) => {
+      if (hasValue(value.newValue.securityLevel) && value.newValue.securityLevel !== value.originalValue.securityLevel) {
+        value.change = DsoEditMetadataChangeType.UPDATE;
+      }
+    });
+  }
+
   /**
    * Get the json PATCH operations for the current changes within this form
    * For each metadata field, it'll return operations in the following order: replace, remove (from last to first place), add and move
@@ -423,6 +440,17 @@ export class DsoEditMetadataForm {
                   language: value.newValue.language,
                   authority: value.newValue.authority,
                   confidence: value.newValue.confidence,
+                  securityLevel: value.originalValue.securityLevel,
+                }));
+              }
+              // "replace" the security level value
+              if (value.originalValue.securityLevel !== value.newValue.securityLevel) {
+                replaceOperations.push(new MetadataPatchReplaceOperation(field, value.originalValue.place, {
+                  securityLevel: value.newValue.securityLevel,
+                  value: value.newValue.value,
+                  language: value.newValue.language,
+                  authority: value.newValue.authority,
+                  confidence: value.newValue.confidence,
                 }));
               }
             } else if (value.change === DsoEditMetadataChangeType.REMOVE) {
@@ -433,6 +461,7 @@ export class DsoEditMetadataForm {
                 language: value.newValue.language,
                 authority: value.newValue.authority,
                 confidence: value.newValue.confidence,
+                securityLevel: value.newValue.securityLevel,
               }));
             } else {
               console.warn('Illegal metadata change state detected for', value);
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-headers/dso-edit-metadata-headers.component.html b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-headers/dso-edit-metadata-headers.component.html
@@ -5,6 +5,7 @@
       <div class="flex-grow-1 ds-flex-cell ds-value-cell"><b class="dont-break-out preserve-line-breaks">{{ dsoType + '.edit.metadata.headers.value' | translate }}</b></div>
       <div class="ds-flex-cell ds-lang-cell"><b>{{ dsoType + '.edit.metadata.headers.language' | translate }}</b></div>
       <div class="ds-flex-cell ds-authority-cell"><b>{{ dsoType + '.edit.metadata.headers.authority' | translate }}</b></div>
+      <div class="ds-flex-cell ds-security-cell"><b>{{'item.edit.metadata.headers.security'| translate}}</b></div>
       <div class="text-center ds-flex-cell ds-edit-cell"><b>{{ dsoType + '.edit.metadata.headers.edit' | translate }}</b></div>
     </div>
   </div>
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-headers/dso-edit-metadata-headers.component.spec.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-headers/dso-edit-metadata-headers.component.spec.ts
@@ -29,7 +29,7 @@ describe('DsoEditMetadataHeadersComponent', () => {
     fixture.detectChanges();
   });
 
-  it('should display four headers', () => {
-    expect(fixture.debugElement.queryAll(By.css('.ds-flex-cell')).length).toEqual(4);
+  it('should display five headers', () => {
+    expect(fixture.debugElement.queryAll(By.css('.ds-flex-cell')).length).toEqual(5);
   });
 });
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-shared/dso-edit-metadata-cells.scss b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-shared/dso-edit-metadata-cells.scss
@@ -17,9 +17,18 @@
   max-width: var(--ds-dso-edit-authority-width);
 }
 
+.ds-security-cell {
+  min-width: var(--ds-dso-edit-security-width);
+  max-width: var(--ds-dso-edit-security-width);
+}
 
 .ds-edit-cell {
   min-width: var(--ds-dso-edit-actions-width);
+  max-width: var(--ds-dso-edit-actions-width);
+}
+
+.ds-value-cell {
+  max-width: var(--ds-dso-edit-value-max-width);
 }
 
 .ds-value-row {
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value-headers/dso-edit-metadata-value-headers.component.html b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value-headers/dso-edit-metadata-value-headers.component.html
@@ -1,5 +1,6 @@
 <div role="row" class="visually-hidden">
   <div role="columnheader">{{ dsoType + '.edit.metadata.headers.value' | translate }}</div>
   <div role="columnheader">{{ dsoType + '.edit.metadata.headers.language' | translate }}</div>
+  <div role="columnheader">{{ dsoType + '.edit.metadata.headers.authority' | translate }}</div>
   <div role="columnheader">{{ dsoType + '.edit.metadata.headers.edit' | translate }}</div>
 </div>
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.ts
@@ -62,6 +62,7 @@ import {
 } from 'rxjs';
 import {
   distinctUntilChanged,
+  filter,
   map,
   shareReplay,
   switchMap,
@@ -274,7 +275,7 @@ export class DsoEditMetadataValueComponent implements OnInit, OnChanges, OnDestr
 
     this.sub = combineLatest([
       this._mdField$,
-      this._metadataSecurityConfiguration$,
+      this._metadataSecurityConfiguration$.pipe(filter(config => !!config)),
     ]).subscribe(([mdField, metadataSecurityConfig]) => this.initSecurityLevel(mdField, metadataSecurityConfig));
 
     this.canShowMetadataSecurity$ =
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html
@@ -1,4 +1,4 @@
-@if (form) {
+@if (isFormInitialized$ | async) {
   <div class="item-metadata">
     <div class="button-row top d-flex my-2 space-children-mr ms-gap">
       <button class="me-auto btn btn-success" id="dso-add-btn" [dsBtnDisabled]="form.newValue || (saving$ | async)"
@@ -79,6 +79,7 @@
                                              [form]="form"
                                              [dsoType]="dsoType"
                                              [saving$]="saving$"
+                                             [metadataSecurityConfiguration]="(securitySettings$ | async)"
                                              [draggingMdField$]="draggingMdField$"
                                              [mdField]="mdField"
                                              (valueSaved)="onValueSaved()">
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts
@@ -243,7 +243,7 @@ export class DsoEditMetadataComponent implements OnInit, OnDestroy {
         }),
       );
     } else {
-      of(null);
+      return of(null);
     }
   }
 
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.html
@@ -44,7 +44,7 @@
 
     </div>
     @if (model.languageCodes && model.languageCodes.length > 0) {
-      <div class="col-2" >
+      <div class="col-sm-2" >
         <select
           #language="ngModel"
           [disabled]="model.readOnly"
@@ -61,7 +61,7 @@
       </div>
     }
     @if (model.hasSecurityToggle) {
-      <div class="col-xs-2" [class.date-field-security]="model.type === 'DATE'">
+      <div class="col-sm-2" [class.date-field-security]="model.type === 'DATE'">
         @if (model.toggleSecurityVisibility) {
           <ds-edit-metadata-security [readOnly]="model.readOnly"
                                      [securityConfigLevel]="model.securityConfigLevel"
diff --git a/src/app/submission/objects/submission-objects.effects.ts b/src/app/submission/objects/submission-objects.effects.ts
@@ -160,6 +160,7 @@ export class SubmissionObjectEffects {
         action.payload.sections,
         action.payload.item,
         null,
+        action.payload.metadataSecurityConfiguration,
       ))));
 
   /**
diff --git a/src/app/submission/objects/submission-objects.reducer.spec.ts b/src/app/submission/objects/submission-objects.reducer.spec.ts
@@ -55,6 +55,20 @@ describe('submissionReducer test suite', () => {
   const submissionId = mockSubmissionId;
   const submissionDefinition = mockSubmissionDefinitionResponse;
   const selfUrl = mockSubmissionSelfUrl;
+  const metadataSecurityConfiguration = {
+    'uuid': null,
+    'metadataSecurityDefault': [
+      0,
+      1,
+    ],
+    'metadataCustomSecurity': {},
+    'type': 'securitysetting',
+    '_links': {
+      'self': {
+        'href': 'http://localhost:8080/server/api/core/securitysettings',
+      },
+    },
+  };
 
   let initState: any;
 
@@ -75,10 +89,11 @@ describe('submissionReducer test suite', () => {
         savePending: false,
         saveDecisionPending: false,
         depositPending: false,
+        metadataSecurityConfiguration: metadataSecurityConfiguration as any,
       },
     };
 
-    const action = new InitSubmissionFormAction(collectionId, submissionId, selfUrl, submissionDefinition, {}, new Item(), null);
+    const action = new InitSubmissionFormAction(collectionId, submissionId, selfUrl, submissionDefinition, {}, new Item(), null, metadataSecurityConfiguration as any);
     const newState = submissionObjectReducer({}, action);
 
     expect(newState).toEqual(expectedState);
@@ -112,9 +127,8 @@ describe('submissionReducer test suite', () => {
       },
     };
 
-    const action = new ResetSubmissionFormAction(collectionId, submissionId, selfUrl, {}, submissionDefinition, new Item());
+    const action = new ResetSubmissionFormAction(collectionId, submissionId, selfUrl, {}, submissionDefinition, new Item(), metadataSecurityConfiguration);
     const newState = submissionObjectReducer(initState, action);
-    console.log('NEW STATE ', newState);
     expect(newState).toEqual(expectedState);
   });
 
diff --git a/src/app/submission/objects/submission-objects.reducer.ts b/src/app/submission/objects/submission-objects.reducer.ts
@@ -1,3 +1,4 @@
+import { MetadataSecurityConfiguration } from '@dspace/core/submission/models/metadata-security-configuration';
 import { SubmissionSectionObject } from '@dspace/core/submission/models/submission-section-object.model';
 import { WorkspaceitemSectionUploadObject } from '@dspace/core/submission/models/workspaceitem-section-upload.model';
 import {
@@ -108,10 +109,15 @@ export interface SubmissionObjectEntry {
    * A boolean representing if a submission deposit operation is pending
    */
   depositPending?: boolean;
+  /**
+   * Configurations of security levels for metadatas of an entity type
+   */
+  metadataSecurityConfiguration?: MetadataSecurityConfiguration;
+
   /**
    * A boolean representing if a submission is discarded or not
    */
-   isDiscarding?: boolean;
+  isDiscarding?: boolean;
 }
 
 /**
@@ -372,6 +378,7 @@ function initSubmission(state: SubmissionObjectState, action: InitSubmissionForm
     savePending: false,
     saveDecisionPending: false,
     depositPending: false,
+    metadataSecurityConfiguration: action.payload.metadataSecurityConfiguration,
     isDiscarding: false,
   };
   return newState;
diff --git a/src/app/submission/sections/form/section-form-operations.service.ts b/src/app/submission/sections/form/section-form-operations.service.ts
@@ -81,6 +81,9 @@ export class SectionFormOperationsService {
       case 'move':
         this.dispatchOperationsFromMoveEvent(pathCombiner, event, previousValue);
         break;
+      case 'changeSecurityLevel':
+        this.changeSecurityLevel(pathCombiner, event, previousValue);
+        break;
       default:
         break;
     }
@@ -259,15 +262,31 @@ export class SectionFormOperationsService {
         }
       } else {
         // Language without Authority (input, textArea)
-        fieldValue = new FormFieldMetadataValueObject(value, language);
+        if ((event.model as any).hasSecurityLevel) {
+          const securityLevel = (event.model as any).securityLevel;
+          fieldValue = new FormFieldMetadataValueObject(value, language, securityLevel);
+        } else {
+          fieldValue = new FormFieldMetadataValueObject(value, language);
+        }
+
       }
     } else if (isNgbDateStruct(value)) {
-      fieldValue = new FormFieldMetadataValueObject(dateToString(value));
+      if ((event.model as any).hasSecurityLevel) {
+        const securityLevel = (event.model as any).metadataValue.securityLevel;
+        fieldValue = new FormFieldMetadataValueObject(value, undefined, securityLevel);
+      } else {
+        fieldValue = new FormFieldMetadataValueObject(dateToString(value));
+      }
     } else if (value instanceof FormFieldLanguageValueObject || value instanceof VocabularyEntry
       || value instanceof VocabularyEntryDetail || isObject(value)) {
       fieldValue = value;
     } else {
-      fieldValue = new FormFieldMetadataValueObject(value);
+      if ((event.model as any).hasSecurityLevel) {
+        const securityLevel = (event.model as any).securityLevel;
+        fieldValue = new FormFieldMetadataValueObject(value, undefined, securityLevel);
+      } else {
+        fieldValue = new FormFieldMetadataValueObject(value);
+      }
     }
 
     return fieldValue;
@@ -385,6 +404,11 @@ export class SectionFormOperationsService {
     const path = this.getFieldPathFromEvent(event);
     const segmentedPath = this.getFieldPathSegmentedFromChangeEvent(event);
     const value = this.getFieldValueFromChangeEvent(event);
+    if ((event.model as any).securityLevel !== null && (event.model as any).securityLevel !== undefined) {
+      if (typeof value !== 'string') {
+        value.securityLevel = (event.model as any).securityLevel;
+      }
+    }
     // Detect which operation must be dispatched
     if (this.formBuilder.isQualdropGroup(event.model.parent as DynamicFormControlModel)
       || this.formBuilder.isQualdropGroup(event.model as DynamicFormControlModel)) {
@@ -543,6 +567,36 @@ export class SectionFormOperationsService {
     } else if (previousValue.isPathEqual(this.formBuilder.getPath(event.model))) {
       this.operationsBuilder.remove(pathCombiner.getPath(segmentedPath));
     }
+  }
 
+  protected changeSecurityLevel(pathCombiner: JsonPatchOperationPathCombiner,
+    event: DynamicFormControlEvent,
+    previousValue: FormFieldPreviousValueObject): void {
+    if (event.context && event.context instanceof DynamicFormArrayGroupModel) {
+      // Model is a DynamicRowArrayModel
+      this.handleArrayGroupPatch(pathCombiner, event, (event as any).context.context, previousValue);
+      return;
+    }
+    // Detect which operation must be dispatched
+    if (this.formBuilder.isQualdropGroup(event.model.parent as DynamicFormControlModel)
+      || this.formBuilder.isQualdropGroup(event.model as DynamicFormControlModel)) {
+      // It's a qualdrup model
+      this.dispatchOperationsFromMap(this.getQualdropValueMap(event), pathCombiner, event, previousValue);
+    } else {
+      const path = this.getFieldPathFromEvent(event);
+      const value = this.getFieldValueFromChangeEvent(event);
+      if ((event.model as any).securityLevel != null && (event.model as any).securityLevel !== undefined) {
+        if (value && typeof value === 'string') {
+          this.operationsBuilder.replace(
+            pathCombiner.getPath(path),
+            value, false, (event.model as any).securityLevel);
+        } else {
+          this.operationsBuilder.replace(
+            pathCombiner.getPath(path),
+            value, false, (event.model as any).securityLevel);
+        }
+        previousValue.delete();
+      }
+    }
   }
 }
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
@@ -2693,6 +2693,8 @@
 
   "item.edit.metadata.headers.language": "Lang",
 
+  "item.edit.metadata.headers.security": "Security level",
+
   "item.edit.metadata.headers.authority": "Authority",
 
   "item.edit.metadata.headers.value": "Value",
diff --git a/src/styles/_custom_variables.scss b/src/styles/_custom_variables.scss
@@ -125,8 +125,10 @@
 
   --ds-dso-edit-field-width: 210px;
   --ds-dso-edit-lang-width: 90px;
+  --ds-dso-edit-security-width: 136px;
   --ds-dso-edit-authority-width: 150px;
   --ds-dso-edit-actions-width: 173px;
+  --ds-dso-edit-value-max-width: 360px;
   --ds-dso-edit-virtual-tooltip-min-width: 300px;
 
   --ds-comcol-logo-max-width: 500px;

Original file line number	Diff line number	Diff line change
`@@ -243,7 +243,7 @@ export class DsoEditMetadataComponent implements OnInit, OnDestroy {`
`243`	`243`	`}),`
`244`	`244`	`);`
`245`	`245`	`} else {`
`246`		`- of(null);`
	`246`	`+ return of(null);`
`247`	`247`	`}`
`248`	`248`	`}`
`249`	`249`