[DURACOM-453] remove opened property, fix cache issue for bitstreams, refactor

Author: FrancescoMolinaro

src/app/core/config/models/config-submission-section.model.ts

@@ -6,25 +6,14 @@ import {
 
 import { typedObject } from '../../cache/builders/build-decorators';
 import { HALLink } from '../../shared/hal-link.model';
-import { SectionScope } from '../../submission/models/section-visibility.model';
+import {
+  SectionScope,
+  SubmissionVisibilityType,
+} from '../../submission/models/section-visibility.model';
 import { SectionsType } from '../../submission/sections-type';
 import { ConfigObject } from './config.model';
 import { SUBMISSION_SECTION_TYPE } from './config-type';
 
-/**
- * An Enum defining the possible visibility values
- */
-export enum SubmissionVisibilityValue {
-  ReadOnly = 'read-only',
-  Hidden = 'hidden'
-}
-
-/**
- * An interface that define section visibility and its properties.
- */
-export interface SubmissionVisibilityType {
-  [scope: string]: SubmissionVisibilityValue;
-}
 
 @typedObject
 @inheritSerialization(ConfigObject)
@@ -43,12 +32,6 @@ export class SubmissionSectionModel extends ConfigObject {
   @autoserialize
   mandatory: boolean;
 
-  /**
-   * A boolean representing if this submission section is opened or collapsed by default
-   */
-  @autoserialize
-  opened: boolean;
-
   /**
    * The submission scope for this section
    */

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

@@ -1,4 +1,4 @@
-import { SubmissionVisibilityType } from '@dspace/core/config/models/config-submission-section.model';
+import { SubmissionVisibilityType } from '@dspace/core/submission/models/section-visibility.model';
 import { autoserialize } from 'cerialize';
 
 import { FormRowModel } from '../../../config/models/config-submission-form.model';

src/app/core/submission/models/section-visibility.model.ts

@@ -1,11 +1,23 @@
 /**
- * An interface to represent section visibility
+ * An Enum defining the possible visibility values
  */
-export interface SectionVisibility {
-  main: any;
-  other: any;
+export enum SubmissionVisibilityValue {
+  ReadOnly = 'read-only',
+  Hidden = 'hidden'
 }
 
+/**
+ * Types of possible section's visibility
+ */
+export type SectionVisibilityType = 'main' | 'other' | 'submission' | 'workspace' | 'workflow';
+
+/**
+ * An interface that define section visibility and its properties.
+ */
+export type SubmissionVisibilityType = {
+  [key in SectionVisibilityType]: SubmissionVisibilityValue;
+};;
+
 
 export enum SectionScope {
   Submission = 'SUBMISSION',

src/app/core/submission/models/submission-section-object.model.ts

@@ -1,6 +1,9 @@
-import { SubmissionVisibilityType } from '@dspace/core/config/models/config-submission-section.model';
 
 import { SectionsType } from '../sections-type';
+import {
+  SectionScope,
+  SubmissionVisibilityType,
+} from './section-visibility.model';
 import { SubmissionSectionError } from './submission-section-error.model';
 import { WorkspaceitemSectionDataType } from './workspaceitem-sections.model';
 
@@ -24,9 +27,9 @@ export interface SubmissionSectionObject {
   mandatory: boolean;
 
   /**
-   * A boolean representing if this section is opened or collapsed by default
+   * The submission scope for this section
    */
-  opened: boolean;
+  scope: SectionScope;
 
   /**
    * The section type

src/app/item-page/simple/field-components/specific-field/license/item-page-license-field.component.ts

@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgClass,
-  NgStyle,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Input,
@@ -34,8 +30,6 @@ import { MetadataFieldWrapperComponent } from 'src/app/shared/metadata-field-wra
     AsyncPipe,
     ItemPageCcLicenseFieldComponent,
     MetadataFieldWrapperComponent,
-    NgClass,
-    NgStyle,
     TranslateModule,
   ],
 })

src/app/shared/form/builder/parsers/field-parser.ts

@@ -2,13 +2,13 @@ import {
   Inject,
   InjectionToken,
 } from '@angular/core';
-import { SubmissionVisibilityType } from '@dspace/core/config/models/config-submission-section.model';
 import { FormFieldModel } from '@dspace/core/shared/form/models/form-field.model';
 import { FormFieldMetadataValueObject } from '@dspace/core/shared/form/models/form-field-metadata-value.model';
 import { MetadataValue } from '@dspace/core/shared/metadata.models';
 import { Metadata } from '@dspace/core/shared/metadata.utils';
 import { RelationshipOptions } from '@dspace/core/shared/relationship-options.model';
 import { MetadataSecurityConfiguration } from '@dspace/core/submission/models/metadata-security-configuration';
+import { SubmissionVisibilityType } from '@dspace/core/submission/models/section-visibility.model';
 import { VocabularyOptions } from '@dspace/core/submission/vocabularies/models/vocabulary-options.model';
 import { isNgbDateStruct } from '@dspace/shared/utils/date.util';
 import {

src/app/shared/form/builder/parsers/row-parser.spec.ts

@@ -1,10 +1,10 @@
 import { Injector } from '@angular/core';
 import { FormRowModel } from '@dspace/core/config/models/config-submission-form.model';
+import { FormFieldModel } from '@dspace/core/shared/form/models/form-field.model';
 import {
   SubmissionVisibilityType,
   SubmissionVisibilityValue,
-} from '@dspace/core/config/models/config-submission-section.model';
-import { FormFieldModel } from '@dspace/core/shared/form/models/form-field.model';
+} from '@dspace/core/submission/models/section-visibility.model';
 import { SubmissionScopeType } from '@dspace/core/submission/submission-scope-type';
 import { getMockTranslateService } from '@dspace/core/testing/translate.service.mock';
 import { TranslateService } from '@ngx-translate/core';

src/app/shared/form/builder/parsers/row-parser.ts

@@ -2,9 +2,9 @@ import {
   Injectable,
   Injector,
 } from '@angular/core';
-import { SubmissionVisibilityType } from '@dspace/core/config/models/config-submission-section.model';
 import { DYNAMIC_FORM_CONTROL_TYPE_RELATION_GROUP } from '@dspace/core/shared/form/ds-dynamic-form-constants';
 import { FormFieldModel } from '@dspace/core/shared/form/models/form-field.model';
+import { SubmissionVisibilityType } from '@dspace/core/submission/models/section-visibility.model';
 import { isEmpty } from '@dspace/shared/utils/empty.util';
 import {
   DYNAMIC_FORM_CONTROL_TYPE_ARRAY,

src/app/submission/edit/submission-edit.component.ts

@@ -230,7 +230,7 @@ export class SubmissionEditComponent implements OnDestroy, OnInit {
             const { errors } = submissionObjectRD.payload;
             this.submissionErrors = parseSectionErrors(errors);
             this.submissionId = submissionObjectRD.payload.id.toString();
-            this.collectionId = (submissionObjectRD.payload.collection as Collection).id;
+            this.collectionId = collection.id;
             this.selfUrl = submissionObjectRD.payload._links.self.href;
             this.sections = submissionObjectRD.payload.sections;
             this.itemLink$.next(submissionObjectRD.payload._links.item.href);

src/app/submission/form/submission-form.component.spec.ts

@@ -10,10 +10,10 @@ import {
   waitForAsync,
 } from '@angular/core/testing';
 import { AuthService } from '@dspace/core/auth/auth.service';
-import { SubmissionVisibilityValue } from '@dspace/core/config/models/config-submission-section.model';
 import { HALEndpointService } from '@dspace/core/shared/hal-endpoint.service';
 import { Item } from '@dspace/core/shared/item.model';
 import { MetadataSecurityConfigurationService } from '@dspace/core/submission/metadatasecurityconfig-data.service';
+import { SubmissionVisibilityValue } from '@dspace/core/submission/models/section-visibility.model';
 import { SubmissionScopeType } from '@dspace/core/submission/submission-scope-type';
 import { AuthServiceStub } from '@dspace/core/testing/auth-service.stub';
 import { HALEndpointServiceStub } from '@dspace/core/testing/hal-endpoint-service.stub';