Merge pull request #548 from europeana/feat/MET-3379-Temporarily-Remove-Incremental-Harvesting

Comment out incremental harvest functionality

Author: andyjmaclean

projects/metis/cypress/integration/dataset.spec.ts

@@ -75,7 +75,8 @@ context('metis-ui', () => {
 
   describe('dataset workflow', () => {
     const fieldsOnlyHTTP = ['#url'];
-    const fieldsOnlyOAI = ['#incremental-harvest', '#harvest-url', '#setspec', '#metadata-format'];
+    //const fieldsOnlyOAI = ['#incremental-harvest', '#harvest-url', '#setspec', '#metadata-format'];
+    const fieldsOnlyOAI = ['#harvest-url', '#setspec', '#metadata-format'];
 
     beforeEach(() => {
       setupDatasetPage('workflow', 1);

projects/metis/src/app/_models/workflow-form.ts

@@ -68,7 +68,7 @@ const parameterFieldPresets = Object.assign(
     if (pType === 'HARVEST') {
       paramField = [
         ParameterFieldName.harvestUrl,
-        ParameterFieldName.incrementalHarvest,
+        //ParameterFieldName.incrementalHarvest,
         ParameterFieldName.metadataFormat,
         ParameterFieldName.pluginType,
         ParameterFieldName.setSpec,

projects/metis/src/app/dataset/workflow/workflow-form-field/workflow-form-field.component.html

@@ -28,8 +28,10 @@
         </ng-container>
         <ng-container *ngIf="workflowForm.value.pluginType === EnumProtocolType.OAIPMH_HARVEST">
           {{ workflowForm.value.harvestUrl }}
+          <!--
           <br />
           Incremental harvest: {{ workflowForm.value.incrementalHarvest }}
+          -->
           <br />
           Setspec: {{ workflowForm.value.setSpec }}
           <ng-container *ngIf="workflowForm.value.metadataFormat">

projects/metis/src/app/dataset/workflow/workflow.component.spec.ts

@@ -1,7 +1,7 @@
 import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
 import { async, ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing';
 import { FormControl, ReactiveFormsModule } from '@angular/forms';
-import { of } from 'rxjs';
+//import { of } from 'rxjs';
 
 import {
   createMockPipe,
@@ -19,7 +19,7 @@ import {
   PluginMetadata,
   PluginType,
   successNotification,
-  Workflow,
+  //Workflow,
   WorkflowExecution,
   WorkflowFieldData,
   workflowFormFieldConf,
@@ -249,6 +249,7 @@ describe('WorkflowComponent', () => {
       expect(fields[1].conf.currentlyViewed).toBeFalsy();
     });
 
+    /*
     it('should enable the incremental-harvesting field', fakeAsync(() => {
       const getField = (): FormControl => {
         return component.workflowForm.get('incrementalHarvest') as FormControl;
@@ -285,6 +286,7 @@ describe('WorkflowComponent', () => {
       component.enableIncrementalHarvestingFieldIfAvailable(component.workflowData as Workflow);
       expect(getField().disabled).toBeFalsy();
     }));
+    */
 
     it('should format the form values', () => {
       let result: { metisPluginsMetadata: PluginMetadata[] } = component.formatFormValues();

projects/metis/src/app/dataset/workflow/workflow.component.ts

@@ -199,6 +199,7 @@ export class WorkflowComponent extends SubscriptionManager implements OnInit {
    *
    * @param {Workflow} workflowData
    **/
+  /*
   enableIncrementalHarvestingFieldIfAvailable(workflowData: Workflow): void {
     this.subs.push(
       this.workflows
@@ -212,6 +213,7 @@ export class WorkflowComponent extends SubscriptionManager implements OnInit {
         })
     );
   }
+  */
 
   /** buildForm
   /* set up a reactive form for creating and editing a workflow
@@ -385,10 +387,10 @@ export class WorkflowComponent extends SubscriptionManager implements OnInit {
         this.workflowForm.controls.harvestUrl.setValue(thisWorkflow.url.trim().split('?')[0]);
         this.workflowForm.controls.setSpec.setValue(thisWorkflow.setSpec);
         this.workflowForm.controls.metadataFormat.setValue(thisWorkflow.metadataFormat);
-        this.workflowForm.controls.incrementalHarvest.setValue(thisWorkflow.incrementalHarvest);
+        //this.workflowForm.controls.incrementalHarvest.setValue(thisWorkflow.incrementalHarvest);
       }
     }
-    this.enableIncrementalHarvestingFieldIfAvailable(workflow);
+    //this.enableIncrementalHarvestingFieldIfAvailable(workflow);
   }
 
   /** extractPluginParamsExtra
@@ -496,7 +498,7 @@ export class WorkflowComponent extends SubscriptionManager implements OnInit {
         if (conf.name === 'pluginHARVEST') {
           const paramsOAIPMH: ParameterField = [
             ParameterFieldName.harvestUrl,
-            ParameterFieldName.incrementalHarvest,
+            //ParameterFieldName.incrementalHarvest,
             ParameterFieldName.metadataFormat,
             ParameterFieldName.setSpec
           ];

projects/shared/src/lib/form/protocol-field-set/protocol-field-set.component.html

@@ -43,6 +43,7 @@
   </div>
 </div>
 
+<!--
 <div class="form-group" *ngIf="isProtocolOAIPMH()" [formGroup]="form">
   <input type="checkbox" id="incremental-harvest" formControlName="incrementalHarvest" />
   <label
@@ -52,6 +53,7 @@
     Incremental Harvest
   </label>
 </div>
+-->
 
 <div class="form-group" *ngIf="isProtocolOAIPMH()" [formGroup]="form">
   <label for="harvest-url" i18n="protocol label harvest url@@protocolLabelHarvestUrl">