113996: Support for extending submission steps

atmire · Apr 11, 2024 · 072ea80 · 072ea80
1 parent 404ccd9
commit 072ea80
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 7 deletions.
diff --git a/src/app/core/config/models/config-submission-section.model.ts b/src/app/core/config/models/config-submission-section.model.ts
@@ -36,6 +36,12 @@ export class SubmissionSectionModel extends ConfigObject {
   @autoserialize
   sectionType: SectionsType;
 
+  /**
+   * A string representing the type this section extends
+   */
+  @autoserialize
+  extendsSectionType: SectionsType;
+
   /**
    * The [SubmissionSectionVisibility] object for this section
    */

diff --git a/src/app/core/submission/submission-response-parsing.service.ts b/src/app/core/submission/submission-response-parsing.service.ts
@@ -137,10 +137,7 @@ export class SubmissionResponseParsingService extends BaseResponseParsingService
           // Iterate over all workspaceitem's sections
           Object.keys(item.sections)
             .forEach((sectionId) => {
-              if (typeof item.sections[sectionId] === 'object' && (isNotEmpty(item.sections[sectionId]) &&
-                // When Upload section is disabled, add to submission only if there are files
-                (!item.sections[sectionId].hasOwnProperty('files') || isNotEmpty((item.sections[sectionId] as any).files)))) {
-
+              if (typeof item.sections[sectionId] === 'object' && (isNotEmpty(item.sections[sectionId]))) {
                 const sectiondata = Object.create({});
                 // Iterate over all sections property
                 Object.keys(item.sections[sectionId])

diff --git a/src/app/submission/objects/submission-objects.actions.ts b/src/app/submission/objects/submission-objects.actions.ts
@@ -117,6 +117,7 @@ export class InitSectionAction implements Action {
     config: string;
     mandatory: boolean;
     sectionType: SectionsType;
+    extendsSectionType: SectionsType;
     visibility: SectionVisibility;
     enabled: boolean;
     data: WorkspaceitemSectionDataType;
@@ -138,6 +139,8 @@ export class InitSectionAction implements Action {
    *    the section's mandatory
    * @param sectionType
    *    the section's type
+   * @param extendsSectionType
+   *    the type of the section it extends
    * @param visibility
    *    the section's visibility
    * @param enabled
@@ -153,11 +156,12 @@ export class InitSectionAction implements Action {
               config: string,
               mandatory: boolean,
               sectionType: SectionsType,
+              extendsSectionType: SectionsType,
               visibility: SectionVisibility,
               enabled: boolean,
               data: WorkspaceitemSectionDataType,
               errors: SubmissionSectionError[]) {
-    this.payload = { submissionId, sectionId, header, config, mandatory, sectionType, visibility, enabled, data, errors };
+    this.payload = { submissionId, sectionId, header, config, mandatory, sectionType, extendsSectionType, visibility, enabled, data, errors };
   }
 }
 

diff --git a/src/app/submission/objects/submission-objects.effects.ts b/src/app/submission/objects/submission-objects.effects.ts
@@ -87,6 +87,7 @@ export class SubmissionObjectEffects {
             config,
             sectionDefinition.mandatory,
             sectionDefinition.sectionType,
+            sectionDefinition.extendsSectionType,
             sectionDefinition.visibility,
             enabled,
             sectionData,

diff --git a/src/app/submission/objects/submission-objects.reducer.ts b/src/app/submission/objects/submission-objects.reducer.ts
@@ -549,6 +549,7 @@ function initSection(state: SubmissionObjectState, action: InitSectionAction): S
             config: action.payload.config,
             mandatory: action.payload.mandatory,
             sectionType: action.payload.sectionType,
+            extendsSectionType: action.payload.extendsSectionType,
             visibility: action.payload.visibility,
             collapsed: false,
             enabled: action.payload.enabled,

diff --git a/src/app/submission/objects/submission-section-object.model.ts b/src/app/submission/objects/submission-section-object.model.ts
@@ -27,6 +27,11 @@ export interface SubmissionSectionObject {
    */
   sectionType: SectionsType;
 
+  /**
+   * The type this section extends
+   */
+  extendsSectionType: SectionsType;
+
   /**
    * The section visibility
    */

diff --git a/src/app/submission/sections/models/section-data.model.ts b/src/app/submission/sections/models/section-data.model.ts
@@ -47,6 +47,11 @@ export interface SectionDataObject {
    */
   sectionType: SectionsType;
 
+  /**
+   * The type this section extends
+   */
+  extendsSectionType: SectionsType;
+
   /**
    * Eventually additional fields
    */

diff --git a/src/app/submission/sections/sections.service.ts b/src/app/submission/sections/sections.service.ts
@@ -374,7 +374,9 @@ export class SectionsService {
     return this.store.select(submissionObjectFromIdSelector(submissionId)).pipe(
       filter((submissionState: SubmissionObjectEntry) => isNotUndefined(submissionState)),
       map((submissionState: SubmissionObjectEntry) => {
-        return isNotUndefined(submissionState.sections) && isNotUndefined(findKey(submissionState.sections, { sectionType: sectionType }));
+        return isNotUndefined(submissionState.sections) &&
+          (isNotUndefined(findKey(submissionState.sections, { sectionType: sectionType })) ||
+            isNotUndefined(findKey(submissionState.sections, { extendsSectionType: sectionType })));
       }),
       distinctUntilChanged());
   }
@@ -390,7 +392,7 @@ export class SectionsService {
       filter((submissionState: SubmissionObjectEntry) => isNotUndefined(submissionState)),
       map((submissionState: SubmissionObjectEntry) => {
         return isNotUndefined(submissionState.sections) && isNotUndefined(submissionState.sections[sectionId])
-          && submissionState.sections[sectionId].sectionType === sectionType;
+          && (submissionState.sections[sectionId].sectionType === sectionType || submissionState.sections[sectionId].extendsSectionType === sectionType);
       }),
       distinctUntilChanged());
   }

diff --git a/src/app/submission/submission.service.ts b/src/app/submission/submission.service.ts
@@ -297,6 +297,7 @@ export class SubmissionService {
             sectionObject.header = sections[sectionId].header;
             sectionObject.id = sectionId;
             sectionObject.sectionType = sections[sectionId].sectionType;
+            sectionObject.extendsSectionType = sections[sectionId].extendsSectionType;
             availableSections.push(sectionObject);
           });
         return availableSections;