Merge pull request #2464 from marklogic/bugfix/dhfprod-2407

DHFPROD-2407: Add default properties to steps if they don't exist

Author: aebadirad

web/src/main/ui/app/components/flows-new/edit-flow/edit-flow.component.ts

@@ -1,7 +1,7 @@
 import {Component, OnInit, OnDestroy} from '@angular/core';
 import {ActivatedRoute, Router} from '@angular/router';
-import {timer} from 'rxjs';
 import {Flow} from "../models/flow.model";
+import {Step} from '../models/step.model';
 import {StepType} from '../models/step.model';
 import {ProjectService} from '../../../services/projects';
 import {ManageFlowsService} from "../services/manage-flows.service";
@@ -89,11 +89,16 @@ export class EditFlowComponent implements OnInit, OnDestroy {
   }
   getSteps() {
     this.manageFlowsService.getSteps(this.flowId).subscribe( resp => {
-      console.log('steps', resp);
-      const newArray = [];
-      this.flow.steps.map(step => {
-        newArray.push(resp.find(item => item.id === step.id));
+
+      const newArray = resp.map( step => {
+        const newStep = Step.fromJSON(step, this.projectDirectory, this.databases);
+        // No Target Entity from default mapping step created by gradle
+        // if (newStep.stepDefinitionType === this.stepType.MAPPING) {
+        //   this.createMapping(newStep);
+        // }
+        return newStep;
       });
+      console.log('steps', newArray);
       this.stepsArray = newArray;
       this.selectedStepId = (this.stepsArray.length > 0) ? this.stepsArray[0].id : null;
     });

web/src/main/ui/app/components/flows-new/models/mapping-options.model.ts

@@ -1,7 +1,9 @@
 export class MappingOptions {
+  public collections: string[] = [];
   public sourceQuery: string = '';
   public sourceCollection: string = '';
   public sourceDatabase: string = '';
   public targetDatabase: string;
   public mapping: any;
+  public targetEntity: string;
 }

web/src/main/ui/app/components/flows-new/models/step.model.ts

@@ -42,20 +42,88 @@ export class Step {
     step.options.outputFormat = 'json';
     return step;
   }
+
   static createMappingStep(): Step {
     const step = new Step();
     step.options = new MappingOptions();
     return step;
   }
+
   static createMasteringStep(): Step {
     const step = new Step();
     step.options = new MasteringOptions();
     return step;
   }
+
   static createCustomStep(): Step {
     const step = new Step();
     step.modulePath = '';
     step.options = new CustomOptions();
     return step;
   }
+
+  static fromJSON(json, projectDirectory, databases) {
+    const newStep = new Step();
+    if (json.id) {
+      newStep.id = json.id;
+    }
+    if (json.name) {
+      newStep.name = json.name;
+    }
+    if (json.selectedSource) {
+      newStep.selectedSource = json.selectedSource;
+    }
+    if (json.stepDefinitionName) {
+      newStep.stepDefinitionName = json.stepDefinitionName;
+    }
+    if (json.stepDefinitionType) {
+      newStep.stepDefinitionType = json.stepDefinitionType;
+    }
+    if (json.fileLocations) {
+      newStep.fileLocations = json.fileLocations;
+    }
+    if (json.isValid) {
+      newStep.isValid = json.isValid;
+    }
+    if (json.modulePath) {
+      newStep.modulePath = json.modulePath;
+    }
+    // Check options
+    if (json.options) {
+      // set defaults for each step type
+      if (json.stepDefinitionType === StepType.INGESTION) {
+        // Hard check to see if it's default gradle step
+        if (json.fileLocations.inputFilePath === 'path/to/folder') {
+          const fileLocations = {
+            inputFilePath: projectDirectory,
+            inputFileType: 'json',
+            outputURIReplacement: ''
+          };
+          newStep.fileLocations = fileLocations;
+        }
+        newStep.options = new IngestionOptions();
+        newStep.options.permissions = 'rest-reader,read,rest-writer,update';
+        newStep.options.outputFormat = 'json';
+        newStep.options.targetDatabase = databases.staging;
+      }
+      if (json.stepDefinitionType === StepType.MAPPING) {
+        newStep.options = new MappingOptions();
+        newStep.options.sourceDatabase = databases.staging;
+        newStep.options.targetDatabase = databases.final;
+      }
+      if (json.stepDefinitionType === StepType.MASTERING) {
+        newStep.options = new MasteringOptions();
+        newStep.options.sourceDatabase = databases.final;
+        newStep.options.targetDatabase = databases.final;
+      }
+      if (json.stepDefinitionType === StepType.CUSTOM) {
+        newStep.options = new CustomOptions();
+        newStep.options.sourceDatabase = databases.staging;
+        newStep.options.targetDatabase = databases.final;
+      }
+      const newOptions = Object.assign(newStep.options, json.options);
+      newStep.options = newOptions;
+    }
+    return newStep;
+  }
 }