From 2d3d7ae71ee9d1bc1d6be973ab9fa556ddef8a38 Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Tue, 12 Nov 2019 11:59:44 +0100
Subject: [PATCH] 64503: Prevent submit when harvest type is NONE and not
 changed

---
 .../collection-source.component.html          |  4 +--
 .../collection-source.component.ts            | 35 ++++++++++++-------
 2 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/src/app/+collection-page/edit-collection-page/collection-source/collection-source.component.html b/src/app/+collection-page/edit-collection-page/collection-source/collection-source.component.html
index dfcd6e3166..4192922c7e 100644
--- a/src/app/+collection-page/edit-collection-page/collection-source/collection-source.component.html
+++ b/src/app/+collection-page/edit-collection-page/collection-source/collection-source.component.html
@@ -11,7 +11,7 @@
       class="fas fa-undo-alt"></i>
       <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.reinstate-button" | translate}}</span>
     </button>
-    <button class="btn btn-primary" [disabled]="!(hasChanges() | async) || !isValid()"
+    <button class="btn btn-primary" [disabled]="!(hasChanges() | async) || !isValid() || (initialHarvestType === harvestTypeNone && contentSource.harvestType === initialHarvestType)"
             (click)="onSubmit()"><i
       class="fas fa-save"></i>
       <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.save-button" | translate}}</span>
@@ -47,7 +47,7 @@
       class="fas fa-undo-alt"></i>
       <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.reinstate-button" | translate}}</span>
     </button>
-    <button class="btn btn-primary" [disabled]="!(hasChanges() | async) || !isValid()"
+    <button class="btn btn-primary" [disabled]="!(hasChanges() | async) || !isValid() || (initialHarvestType === harvestTypeNone && contentSource.harvestType === initialHarvestType)"
             (click)="onSubmit()"><i
       class="fas fa-save"></i>
       <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.save-button" | translate}}</span>
diff --git a/src/app/+collection-page/edit-collection-page/collection-source/collection-source.component.ts b/src/app/+collection-page/edit-collection-page/collection-source/collection-source.component.ts
index 44fd8b673c..cc36fcab4d 100644
--- a/src/app/+collection-page/edit-collection-page/collection-source/collection-source.component.ts
+++ b/src/app/+collection-page/edit-collection-page/collection-source/collection-source.component.ts
@@ -55,6 +55,12 @@ export class CollectionSourceComponent extends AbstractTrackableComponent implem
    */
   update$: Observable<FieldUpdate>;
 
+  /**
+   * The initial harvest type we started off with
+   * Used to compare changes
+   */
+  initialHarvestType: ContentSourceHarvestType;
+
   /**
    * @type {string} Key prefix used to generate form labels
    */
@@ -268,6 +274,7 @@ export class CollectionSourceComponent extends AbstractTrackableComponent implem
    */
   initializeOriginalContentSource(contentSource: ContentSource) {
     this.contentSource = contentSource;
+    this.initialHarvestType = contentSource.harvestType;
     this.initializeMetadataConfigs();
     const initialContentSource = cloneDeep(this.contentSource);
     this.objectUpdatesService.initialize(this.url, [initialContentSource], new Date());
@@ -281,19 +288,21 @@ export class CollectionSourceComponent extends AbstractTrackableComponent implem
         if (hasValue(this.contentSource) && isNotEmpty(this.contentSource.metadataConfigs)) {
           defaultConfigId = this.contentSource.metadataConfigs[0].id;
         }
-        this.formGroup.patchValue({
-          oaiSourceContainer: {
-            oaiSource: field.oaiSource
-          },
-          oaiSetContainer: {
-            oaiSetId: field.oaiSetId,
-            metadataConfigId: field.metadataConfigId || defaultConfigId
-          },
-          harvestTypeContainer: {
-            harvestType: field.harvestType
-          }
-        });
-        this.contentSource = cloneDeep(field);
+        if (hasValue(field)) {
+          this.formGroup.patchValue({
+            oaiSourceContainer: {
+              oaiSource: field.oaiSource
+            },
+            oaiSetContainer: {
+              oaiSetId: field.oaiSetId,
+              metadataConfigId: field.metadataConfigId || defaultConfigId
+            },
+            harvestTypeContainer: {
+              harvestType: field.harvestType
+            }
+          });
+          this.contentSource = cloneDeep(field);
+        }
         this.contentSource.metadataConfigId = defaultConfigId;
       }
     });