added defaults for steps in step model

Author: Bruce An

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

@@ -89,9 +89,16 @@ export class EditFlowComponent implements OnInit, OnDestroy {
   }
   getSteps() {
     this.manageFlowsService.getSteps(this.flowId).subscribe( resp => {
+
       const newArray = resp.map( step => {
-        return Step.fromJSON(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

@@ -62,7 +62,7 @@ export class Step {
     return step;
   }
 
-  static fromJSON(json) {
+  static fromJSON(json, projectDirectory, databases) {
     const newStep = new Step();
     if (json.id) {
       newStep.id = json.id;
@@ -79,28 +79,47 @@ export class Step {
     if (json.stepDefinitionType) {
       newStep.stepDefinitionType = json.stepDefinitionType;
     }
-    if (json.isValid) {
-      newStep.isValid = json.isValid;
-    }
     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.final;
       }
       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;