[DURACOM-453] add metadata security and finilize edit mode

Author: FrancescoMolinaro

src/app/collection-page/collection-form/collection-form.component.ts

@@ -10,6 +10,9 @@ import {
 } from '@angular/core';
 import { AuthService } from '@dspace/core/auth/auth.service';
 import { ObjectCacheService } from '@dspace/core/cache/object-cache.service';
+import { ConfigObject } from '@dspace/core/config/models/config.model';
+import { SubmissionDefinitionModel } from '@dspace/core/config/models/config-submission-definition.model';
+import { SubmissionDefinitionsConfigDataService } from '@dspace/core/config/submission-definitions-config-data.service';
 import { CollectionDataService } from '@dspace/core/data/collection-data.service';
 import { EntityTypeDataService } from '@dspace/core/data/entity-type-data.service';
 import { RequestService } from '@dspace/core/data/request.service';
@@ -25,6 +28,7 @@ import {
 } from '@dspace/shared/utils/empty.util';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import {
+  DynamicCheckboxModel,
   DynamicFormControlModel,
   DynamicFormOptionConfig,
   DynamicFormService,
@@ -34,16 +38,24 @@ import {
   TranslateModule,
   TranslateService,
 } from '@ngx-translate/core';
-import { Observable } from 'rxjs';
+import {
+  catchError,
+  combineLatest,
+  Observable,
+  of,
+} from 'rxjs';
 
 import { ComColFormComponent } from '../../shared/comcol/comcol-forms/comcol-form/comcol-form.component';
 import { ComcolPageLogoComponent } from '../../shared/comcol/comcol-page-logo/comcol-page-logo.component';
 import { FormComponent } from '../../shared/form/form.component';
 import { UploaderComponent } from '../../shared/upload/uploader/uploader.component';
 import { VarDirective } from '../../shared/utils/var.directive';
 import {
+  collectionFormCorrectionSubmissionDefinitionSelectionConfig,
   collectionFormEntityTypeSelectionConfig,
   collectionFormModels,
+  collectionFormSharedWorkspaceCheckboxConfig,
+  collectionFormSubmissionDefinitionSelectionConfig,
 } from './collection-form.models';
 
 /**
@@ -79,6 +91,20 @@ export class CollectionFormComponent extends ComColFormComponent<Collection> imp
    */
   entityTypeSelection: DynamicSelectModel<string> = new DynamicSelectModel(collectionFormEntityTypeSelectionConfig);
 
+  /**
+   * The dynamic form field used for submission definition selection
+   * @type {DynamicSelectModel<string>}
+   */
+  submissionDefinitionSelection: DynamicSelectModel<string> = new DynamicSelectModel(collectionFormSubmissionDefinitionSelectionConfig);
+
+  /**
+   * The dynamic form field used for correction submission definition selection
+   * @type {DynamicSelectModel<string>}
+   */
+  correctionSubmissionDefinitionSelection: DynamicSelectModel<string> = new DynamicSelectModel(collectionFormCorrectionSubmissionDefinitionSelectionConfig);
+
+  sharedWorkspaceChekbox: DynamicCheckboxModel = new DynamicCheckboxModel(collectionFormSharedWorkspaceCheckboxConfig);
+
   /**
    * The dynamic form fields used for creating/editing a collection
    * @type {DynamicFormControlModel[]}
@@ -94,6 +120,7 @@ export class CollectionFormComponent extends ComColFormComponent<Collection> imp
                      protected objectCache: ObjectCacheService,
                      protected entityTypeService: EntityTypeDataService,
                      protected chd: ChangeDetectorRef,
+                     protected submissionDefinitionService: SubmissionDefinitionsConfigDataService,
                      protected modalService: NgbModal) {
     super(formService, translate, notificationsService, authService, requestService, objectCache, modalService);
   }
@@ -117,35 +144,76 @@ export class CollectionFormComponent extends ComColFormComponent<Collection> imp
 
   initializeForm() {
     let currentRelationshipValue: MetadataValue[];
+    let currentDefinitionValue: MetadataValue[];
+    let currentCorrectionDefinitionValue: MetadataValue[];
+    let currentSharedWorkspaceValue: MetadataValue[];
     if (this.dso && this.dso.metadata) {
       currentRelationshipValue = this.dso.metadata['dspace.entity.type'];
+      currentDefinitionValue = this.dso.metadata['cris.submission.definition'];
+      currentCorrectionDefinitionValue = this.dso.metadata['cris.submission.definition-correction'];
+      currentSharedWorkspaceValue = this.dso.metadata['cris.workspace.shared'];
     }
 
     const entities$: Observable<ItemType[]> = this.entityTypeService.findAll({ elementsPerPage: 100, currentPage: 1 }).pipe(
       getFirstSucceededRemoteListPayload(),
     );
 
-    // retrieve all entity types to populate the dropdowns selection
-    entities$.subscribe((entityTypes: ItemType[]) => {
-
-      entityTypes = entityTypes.filter((type: ItemType) => type.label !== NONE_ENTITY_TYPE);
-      entityTypes.forEach((type: ItemType, index: number) => {
-        this.entityTypeSelection.add({
-          disabled: false,
-          label: type.label,
-          value: type.label,
-        } as DynamicFormOptionConfig<string>);
-        if (currentRelationshipValue && currentRelationshipValue.length > 0 && currentRelationshipValue[0].value === type.label) {
-          this.entityTypeSelection.select(index);
-          this.entityTypeSelection.disabled = true;
-        }
-      });
+    const definitions$: Observable<ConfigObject[]> = this.submissionDefinitionService
+      .findAll({ elementsPerPage: 100, currentPage: 1 }).pipe(
+        getFirstSucceededRemoteListPayload(),
+        catchError(() => of([])),
+      );
+
+    // retrieve all entity types and submission definitions to populate the dropdowns selection
+    combineLatest([entities$, definitions$])
+      .subscribe(([entityTypes, definitions]: [ItemType[], SubmissionDefinitionModel[]]) => {
+
+        const sortedEntityTypes = entityTypes
+          .filter((type: ItemType) => type.label !== NONE_ENTITY_TYPE)
+          .sort((a, b) => a.label.localeCompare(b.label));
+
+        sortedEntityTypes.forEach((type: ItemType, index: number) => {
+          this.entityTypeSelection.add({
+            disabled: false,
+            label: type.label,
+            value: type.label,
+          } as DynamicFormOptionConfig<string>);
+          if (currentRelationshipValue && currentRelationshipValue.length > 0 && currentRelationshipValue[0].value === type.label) {
+            this.entityTypeSelection.select(index);
+            this.entityTypeSelection.disabled = true;
+          }
+        });
 
-      this.formModel = entityTypes.length === 0 ? collectionFormModels : [...collectionFormModels, this.entityTypeSelection];
+        definitions.forEach((definition: SubmissionDefinitionModel, index: number) => {
+          this.submissionDefinitionSelection.add({
+            disabled: false,
+            label: definition.name,
+            value: definition.name,
+          } as DynamicFormOptionConfig<string>);
+          this.correctionSubmissionDefinitionSelection.add({
+            disabled: false,
+            label: definition.name,
+            value: definition.name,
+          } as DynamicFormOptionConfig<string>);
+          if (currentDefinitionValue && currentDefinitionValue.length > 0 && currentDefinitionValue[0].value === definition.name) {
+            this.submissionDefinitionSelection.select(index);
+          }
+          if (currentCorrectionDefinitionValue && currentCorrectionDefinitionValue.length > 0 && currentCorrectionDefinitionValue[0].value === definition.name) {
+            this.correctionSubmissionDefinitionSelection.select(index);
+          }
+        });
 
-      super.ngOnInit();
-      this.chd.detectChanges();
-    });
+        this.formModel = entityTypes.length === 0 ?
+          [...collectionFormModels, this.submissionDefinitionSelection, this.correctionSubmissionDefinitionSelection, this.sharedWorkspaceChekbox] :
+          [...collectionFormModels, this.entityTypeSelection, this.submissionDefinitionSelection, this.correctionSubmissionDefinitionSelection, this.sharedWorkspaceChekbox];
+
+        super.ngOnInit();
+
+        if (currentSharedWorkspaceValue && currentSharedWorkspaceValue.length > 0) {
+          this.sharedWorkspaceChekbox.value = currentSharedWorkspaceValue[0].value === 'true';
+        }
+        this.chd.detectChanges();
+      });
 
   }
 }

src/app/collection-page/collection-form/collection-form.models.ts

@@ -1,4 +1,5 @@
 import {
+  DynamicCheckboxModelConfig,
   DynamicFormControlModel,
   DynamicInputModel,
   DynamicSelectModelConfig,
@@ -10,6 +11,38 @@ import { environment } from '../../../environments/environment';
 export const collectionFormEntityTypeSelectionConfig: DynamicSelectModelConfig<string> = {
   id: 'entityType',
   name: 'dspace.entity.type',
+  required: true,
+  disabled: false,
+  validators: {
+    required: null,
+  },
+  errorMessages: {
+    required: 'collection.form.errors.entityType.required',
+  },
+};
+
+export const collectionFormSubmissionDefinitionSelectionConfig: DynamicSelectModelConfig<string> = {
+  id: 'submissionDefinition',
+  name: 'cris.submission.definition',
+  required: true,
+  disabled: false,
+  validators: {
+    required: null,
+  },
+  errorMessages: {
+    required: 'collection.form.errors.submissionDefinition.required',
+  },
+};
+export const collectionFormCorrectionSubmissionDefinitionSelectionConfig: DynamicSelectModelConfig<string> = {
+  id: 'correctionSubmissionDefinition',
+  name: 'cris.submission.definition-correction',
+  required: false,
+  disabled: false,
+};
+
+export const collectionFormSharedWorkspaceCheckboxConfig: DynamicCheckboxModelConfig = {
+  id: 'sharedWorkspace',
+  name: 'cris.workspace.shared',
   disabled: false,
 };
 

src/app/core/config/submission-definitions-config-data.service.ts

@@ -0,0 +1,36 @@
+import { Injectable } from '@angular/core';
+import { FollowLinkConfig } from '@dspace/core/shared/follow-link-config.model';
+import { Observable } from 'rxjs';
+import {
+  mergeMap,
+  take,
+} from 'rxjs/operators';
+
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { ObjectCacheService } from '../cache/object-cache.service';
+import { FindListOptions } from '../data/find-list-options.model';
+import { PaginatedList } from '../data/paginated-list.model';
+import { RemoteData } from '../data/remote-data';
+import { RequestService } from '../data/request.service';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { ConfigDataService } from './config-data.service';
+import { ConfigObject } from './models/config.model';
+
+@Injectable({ providedIn: 'root' })
+export class SubmissionDefinitionsConfigDataService extends ConfigDataService {
+  constructor(
+    protected requestService: RequestService,
+    protected rdbService: RemoteDataBuildService,
+    protected objectCache: ObjectCacheService,
+    protected halService: HALEndpointService,
+  ) {
+    super('submissiondefinitions', requestService, rdbService, objectCache, halService);
+  }
+
+  findAll(options: FindListOptions = {}, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig<ConfigObject>[]): Observable<RemoteData<PaginatedList<ConfigObject>>> {
+    return this.getBrowseEndpoint(options).pipe(
+      take(1),
+      mergeMap((href: string) => super.findListByHref(href, options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow)),
+    );
+  }
+}

src/app/core/data-services-map.ts

@@ -59,6 +59,7 @@ import { VERSION_HISTORY } from './shared/version-history.resource-type';
 import { USAGE_REPORT } from './statistics/models/usage-report.resource-type';
 import { CorrectionType } from './submission/models/correctiontype.model';
 import { EditItem } from './submission/models/edititem.model';
+import { METADATA_SECURITY_TYPE } from './submission/models/metadata-security-config.resource-type';
 import { SUBMISSION_CC_LICENSE } from './submission/models/submission-cc-licence.resource-type';
 import { SUBMISSION_CC_LICENSE_URL } from './submission/models/submission-cc-licence-link.resource-type';
 import {
@@ -140,4 +141,5 @@ export const LAZY_DATA_SERVICES: LazyDataServicesMap = new Map([
   [CorrectionType.type.value, () => import('./submission/correctiontype-data.service').then(m => m.CorrectionTypeDataService)],
   [AUDIT.value, () => import('./data/audit-data.service').then(m => m.AuditDataService)],
   [EditItem.type.value, () => import('./submission/edititem-data.service').then(m => m.EditItemDataService)],
+  [METADATA_SECURITY_TYPE.value, () => import('./submission/metadatasecurityconfig-data.service').then(m => m.MetadataSecurityConfigurationService)],
 ]);

src/app/core/shared/form/models/form-field-metadata-value.model.ts

@@ -33,21 +33,26 @@ export class FormFieldMetadataValueObject implements MetadataValueInterface {
   confidence: ConfidenceType;
   place: number;
   label: string;
+  securityLevel: number;
+  source: string;
   otherInformation: OtherInformation;
 
   constructor(value: any = null,
     language: any = null,
+    securityLevel: any = null,
     authority: string = null,
     display: string = null,
     place: number = 0,
     confidence: number = null,
     otherInformation: any = null,
-    metadata: string = null) {
+    source: string = null,
+    metadata: string = null,
+  ) {
     this.value = isNotNull(value) ? ((typeof value === 'string') ? value.trim() : value) : null;
     this.language = language;
     this.authority = authority;
     this.display = display || value;
-
+    this.securityLevel = securityLevel;
     this.confidence = confidence;
     if (Metadata.hasValidAuthority(authority) && (isEmpty(confidence) || confidence === -1)) {
       this.confidence = ConfidenceType.CF_ACCEPTED;
@@ -61,7 +66,7 @@ export class FormFieldMetadataValueObject implements MetadataValueInterface {
     if (isNotEmpty(metadata)) {
       this.metadata = metadata;
     }
-
+    this.source = source;
     this.otherInformation = otherInformation;
   }
 
@@ -100,6 +105,14 @@ export class FormFieldMetadataValueObject implements MetadataValueInterface {
     return this.hasValue() && this.value === PLACEHOLDER_PARENT_METADATA;
   }
 
+  /**
+   * Returns true if this object value contains a placeholder
+   */
+  hasSecurityLevel() {
+    return isNotEmpty(this.securityLevel);
+  }
+
+
   /**
    * Returns true if this Metadatum's authority key starts with 'virtual::'
    */

src/app/core/shared/metadata.models.ts

@@ -56,6 +56,10 @@ export class MetadataValue implements MetadataValueInterface {
   /** The authority confidence value */
   @autoserialize
   confidence: number;
+
+  /** The security level value */
+  @autoserialize
+  securityLevel: number;
 }
 
 /** Constraints for matching metadata values. */
@@ -104,6 +108,9 @@ export class MetadatumViewModel {
 
   /** The authority confidence value */
   confidence: number;
+
+  /** The security level value */
+  securityLevel: number;
 }
 
 /** Serializer used for MetadataMaps.

src/app/core/submission/metadatasecurityconfig-data.service.ts

@@ -0,0 +1,37 @@
+import { Injectable } from '@angular/core';
+import { Observable } from 'rxjs';
+
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { ObjectCacheService } from '../cache/object-cache.service';
+import { IdentifiableDataService } from '../data/base/identifiable-data.service';
+import { RemoteData } from '../data/remote-data';
+import { RequestService } from '../data/request.service';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { MetadataSecurityConfiguration } from './models/metadata-security-configuration';
+
+/**
+ * A service that provides methods to make REST requests with securitysettings endpoint.
+ */
+@Injectable({
+  providedIn: 'root',
+})
+export class MetadataSecurityConfigurationService extends IdentifiableDataService<MetadataSecurityConfiguration> {
+
+  constructor(
+    protected requestService: RequestService,
+    protected rdbService: RemoteDataBuildService,
+    protected objectCache: ObjectCacheService,
+    protected halService: HALEndpointService,
+  ) {
+    super('securitysettings', requestService, rdbService, objectCache, halService);
+  }
+
+  /**
+   * It provides the configuration for metadata security
+   * @param entityType
+   */
+  findById(entityType: string): Observable<RemoteData<MetadataSecurityConfiguration>> {
+    return super.findById(entityType);
+  }
+}
+

src/app/core/submission/models/metadata-security-config.resource-type.ts

@@ -0,0 +1,4 @@
+import { ResourceType } from '../../shared/resource-type';
+
+
+export const METADATA_SECURITY_TYPE = new ResourceType('securitysetting');