Merged in DSC-1180 (pull request DSpace#753)

[DSC-1180] Fixed license not granted error displayed twice Approved-by: Giuseppe Digilio
4Science · Oct 12, 2023 · 9b84e0e · 9b84e0e
2 parents 076f783 + 824356b
commit 9b84e0e
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 15 deletions.
diff --git a/src/app/submission/sections/detect-duplicate/detect-duplicate.service.ts b/src/app/submission/sections/detect-duplicate/detect-duplicate.service.ts
@@ -7,7 +7,7 @@ import { SubmissionState } from '../../submission.reducers';
 import { SetDuplicateDecisionAction } from '../../objects/submission-objects.actions';
 import { submissionSectionDataFromIdSelector } from '../../selectors';
 import { WorkspaceitemSectionDetectDuplicateObject } from '../../../core/submission/models/workspaceitem-section-deduplication.model';
-import { isEmpty, isNotEmpty } from '../../../shared/empty.util';
+import { hasValue, isEmpty, isNotEmpty } from '../../../shared/empty.util';
 import { Observable } from 'rxjs';
 
 /**
@@ -62,19 +62,21 @@ export class DetectDuplicateService {
       map((item: WorkspaceitemSectionDetectDuplicateObject) => {
         const outputObject: WorkspaceitemSectionDetectDuplicateObject = {} as WorkspaceitemSectionDetectDuplicateObject;
         outputObject.matches = {};
-        Object.keys(item.matches)
-          .filter((key) => {
-            let output = false;
-            if (isWorkFlow) {
-              output = isEmpty(item.matches[key].workflowDecision);
-            } else {
-              output = isEmpty(item.matches[key].submitterDecision);
-            }
-            return output;
-          })
-          .forEach((key) => {
-            outputObject.matches[key] = item.matches[key];
-          });
+        if (hasValue(item)) {
+          Object.keys(item.matches)
+            .filter((key) => {
+              let output = false;
+              if (isWorkFlow) {
+                output = isEmpty(item.matches[key].workflowDecision);
+              } else {
+                output = isEmpty(item.matches[key].submitterDecision);
+              }
+              return output;
+            })
+            .forEach((key) => {
+              outputObject.matches[key] = item.matches[key];
+            });
+        }
         return outputObject;
       })
     );

diff --git a/src/app/submission/sections/license/section-license.model.ts b/src/app/submission/sections/license/section-license.model.ts
@@ -20,7 +20,6 @@ export const SECTION_LICENSE_FORM_MODEL = [
       required: null
     },
     errorMessages: {
-      required: 'submission.sections.license.required',
       notgranted: 'submission.sections.license.notgranted'
     },
     type: 'CHECKBOX',