Merge pull request #2467 from marklogic/bugfix/dhfprod-2461-experimental

DHFPROD-2461: reset runningFlow when flow has 'completed'

Author: aebadirad

marklogic-data-hub/src/main/java/com/marklogic/hub/flow/impl/FlowRunnerImpl.java

@@ -384,6 +384,7 @@ else if (!isJobSuccess.get()) {
                 stepsMap.remove(jobId);
                 flowMap.remove(jobId);
                 flowResp.remove(runningJobId);
+                runningFlow = null;
                 if (!jobQueue.isEmpty()) {
                     initializeFlow((String) jobQueue.peek());
                 } else {
@@ -435,6 +436,7 @@ public void afterExecute(Runnable r, Throwable t) {
                 //Run the next queued flow if stop-on-error is set or if the step queue is empty
                 if(((FlowRunnerTask)r).getStepQueue().isEmpty() || runningFlow.isStopOnError()) {
                     jobQueue.remove();
+                    runningFlow = null;
                     if (!jobQueue.isEmpty()) {
                         initializeFlow((String) jobQueue.peek());
                     } else {

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

@@ -94,6 +94,9 @@ export class MappingComponent implements OnInit {
       } else if (this.step.options.sourceDatabase === this.envService.settings.finalDbName) {
         this.sourceDbType = 'FINAL';
       }
+      if(!this.step.options.collections || this.step.options.collections.length === 0){
+        this.step.options.collections = [`${this.step.name}`];
+      }
       this.loadEntity();
       this.loadMap();
     }