refactor workflow resourceId persistence logic #6949

Author: chrabyrd

arches/app/media/js/viewmodels/workflow-step.js

@@ -29,7 +29,6 @@ define([
         this.externalStepData = {};
 
         var externalStepSourceData = ko.unwrap(config.externalstepdata) || {};
-        console.log("!!!!!!!!!", externalStepSourceData)
         Object.keys(externalStepSourceData).forEach(function(key) {
             if (key !== '__ko_mapping__') {
                 self.externalStepData[key] = {
@@ -41,6 +40,12 @@ define([
         delete config.externalstepdata;
 
         this.value = ko.observable();
+        this.value.subscribe(function(value) {
+            /* if we have defined that this is part of a single-resource workflow, and that this step creates the desired resource */ 
+            if (self.shouldtrackresource && !ko.unwrap(config.workflow.resourceId)) {
+                config.workflow.resourceId(value.resourceid)
+            }
+        });
 
         this.active = ko.computed(function() {
             return config.workflow.activeStep() === this;
@@ -95,7 +100,6 @@ define([
         };
 
         this.getExternalStepData = function() {
-            console.log(self.externalStepData)
             Object.keys(self.externalStepData).forEach(function(key) {
                 self.externalStepData[key]['data'] = config.workflow.getStepData(externalStepSourceData[key]);
             });

arches/app/media/js/viewmodels/workflow.js

@@ -106,9 +106,7 @@ define([
 
         this.getStepData = function(stepName) {
             /* ONLY to be used as intermediary for when a step needs data from a different step in the workflow */
-
             var step = self.steps.find(function(step) { return ko.unwrap(step.name) === ko.unwrap(stepName) });
-            console.log('888', step)
             if (step) { return step.value(); }
         };
 

arches/app/media/js/views/components/workflows/new-tile-step.js

@@ -14,19 +14,19 @@ define([
 
         this.resourceId = ko.observable();
 
+        var cachedValue = ko.unwrap(params.value);
+        if (cachedValue) {
+            self.resourceId(cachedValue.resourceid);
+            params.tileid(cachedValue.tileid);
+        }
+
         if (ko.unwrap(params.resourceid)) {
             self.resourceId(ko.unwrap(params.resourceid));
         } 
         else if (ko.unwrap(params.workflow.resourceId)) {
             self.resourceId(ko.unwrap(params.workflow.resourceId));
         } 
 
-        var cachedValue = ko.unwrap(params.value);
-        if (cachedValue) {
-            self.resourceId(cachedValue.resourceid);
-            params.tileid(cachedValue.tileid);
-        }
-
         this.getCardResourceIdOrGraphId = function() { // override for different cases
             return (ko.unwrap(this.resourceId) || ko.unwrap(params.graphid));
         };
@@ -157,7 +157,6 @@ define([
                         if (self.customCardLabel) item.model.name(ko.unwrap(self.customCardLabel));
                         self.card(item);
                         if (ko.unwrap(params.tileid)) {
-                            console.log(item, params)
                             ko.unwrap(item.tiles).forEach(function(tile) {
                                 if (tile.tileid === ko.unwrap(params.tileid)) {
                                     self.tile(tile);
@@ -248,13 +247,7 @@ define([
             }
 
             params.value(params.defineStateProperties());
-
-            if (params.shouldtrackresource) {
-                if (params.workflow.resourceId ) {  /* if we have defined that this is part of a single-resource workflow */ 
-                    params.workflow.resourceId(tile.resourceinstance_id);
-                }
-            }
-
+            
             if (self.completeOnSave === true) { self.complete(true); }
         };