DigitaleBibliothek / Frontend / 6b0f76c0123

Commits

Art Lowel authored 6b0f76c0123 09 Apr 2020

fix nullpointer

src/app/submission/objects/submission-objects.effects.ts

Modified

-5
+import { union } from 'lodash';
-6
-7
+import { from as observableFrom, Observable, of as observableOf } from 'rxjs';
-8
+import { catchError, map, mergeMap, switchMap, take, tap, withLatestFrom } from 'rxjs/operators';
-9
+import { SubmissionObject } from '../../core/submission/models/submission-object.model';
-10
+import { WorkflowItem } from '../../core/submission/models/workflowitem.model';
-11
+import { WorkspaceitemSectionUploadObject } from '../../core/submission/models/workspaceitem-section-upload.model';
-12
+import { WorkspaceitemSectionsObject } from '../../core/submission/models/workspaceitem-sections.model';
-13
+import { WorkspaceItem } from '../../core/submission/models/workspaceitem.model';
-14
+import { SubmissionJsonPatchOperationsService } from '../../core/submission/submission-json-patch-operations.service';
--
+import { isEmpty, isNotEmpty, isNotUndefined } from '../../shared/empty.util';
-+
+import { isEmpty, isNotEmpty, isNotUndefined, hasValue } from '../../shared/empty.util';
-16
+import { NotificationsService } from '../../shared/notifications/notifications.service';
-17
+import { SectionsType } from '../sections/sections-type';
-18
+import { SectionsService } from '../sections/sections.service';
-19
+import { SubmissionState } from '../submission.reducers';
-20
+import { SubmissionService } from '../submission.service';
-21
+import parseSectionErrors from '../utils/parseSectionErrors';
-22
-23
+import {
-24
+  CompleteInitSubmissionFormAction,
-25
+  DepositSubmissionAction,
-322
+          // to avoid dispatching an action for every error, create an array of errors per section
-323
+          errorsList = parseSectionErrors(errors);
-324
+          if (notify) {
-325
+            this.notificationsService.warning(null, this.translate.get('submission.sections.general.sections_not_valid'));
-326
+          }
-327
+        }
-328
-329
+        const sections: WorkspaceitemSectionsObject = (item.sections && isNotEmpty(item.sections)) ? item.sections : {};
-330
+        const sectionsKeys: string[] = union(Object.keys(sections), Object.keys(errorsList));
-331
+        const metadata = (item.item as Item).metadata;
--
+        const metadataKeys = Object.keys(metadata);
-+
+        const metadataKeys = hasValue(metadata) ? Object.keys(metadata) : undefined;
-333
-334
+        for (const sectionId of sectionsKeys) {
-335
+          const sectionErrors = errorsList[sectionId] || [];
-336
+          let sectionData = sections[sectionId] || {};
-337
-338
+          // When Upload section is disabled, add to submission only if there are files
-339
+          if (currentState.sections[sectionId].sectionType === SectionsType.Upload
-340
+            && isEmpty((sectionData as WorkspaceitemSectionUploadObject).files)
-341
+            && !currentState.sections[sectionId].enabled) {
-342
+            continue;
-343
+          }
-344
--
+          const sectionKeys = Object.keys(sectionData);
--
+          if (sectionKeys.every((key: string) => metadataKeys.includes(key))) {
--
+            sectionData = metadata as any;
--
+          }
--
--
+          console.log('sectionData', sectionData);
-+
+          if (isNotEmpty(metadataKeys)) {
-+
+            const sectionKeys = Object.keys(sectionData);
-+
+            if (sectionKeys.every((key: string) => metadataKeys.includes(key))) {
-+
+              sectionData = metadata as any;
-+
+              console.log('sectionData', sectionData);
-+
+              //TODO het werkt op deze branch dus ook niet voor andere relaties, zorg er dus voor dat de state opnieuw wordt opgehaald na een change
-+
+              // of gewoon rechtstreeks naar het submission item kijkt.
-352
-+
+            }
-+
+          }
-355
-356
+          if (notify && !currentState.sections[sectionId].enabled) {
-357
+            this.submissionService.notifyNewSection(submissionId, sectionId, currentState.sections[sectionId].sectionType);
-358
+          }
-359
+          mappedActions.push(new UpdateSectionDataAction(submissionId, sectionId, sectionData, sectionErrors));
-360
+        }
-361
+      });
-362
+    }
-363
+    return mappedActions;
-364
+  }

Frontend

Commits

Jira Issues

Add shortcut