Merge pull request #4909 from archesproject/4821_workflows_url_params

Final workflow step improvements
archesproject · Jun 17, 2019 · 638da86 · 638da86
2 parents d8308d8 + 639b7c4
commit 638da86
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 9 deletions.
diff --git a/arches/app/media/js/viewmodels/workflow.js b/arches/app/media/js/viewmodels/workflow.js
@@ -18,6 +18,8 @@ define([
         this.restoreStateFromURL = function(){
             var urlparams = new window.URLSearchParams(window.location.search);
             var res = {};
+            var pathArray = window.location.pathname.split('/');
+            res.workflowid = pathArray[2];
             urlparams.forEach(function(v, k){res[k] = v;});
             res.steps = res.steps ? JSON.parse(res.steps) : [];
             this.state = res;

diff --git a/arches/app/media/js/views/components/workflows/final-step.js b/arches/app/media/js/views/components/workflows/final-step.js
@@ -9,13 +9,18 @@ define([
 ], function(_, $, arches, ko, GraphModel, ReportModel, CardViewModel) {
     function viewModel(params) {
         var self = this;
+        this.urls = arches.urls;
         if (!params.resourceid() && params.requirements){
             params.resourceid(params.requirements.resourceid);
         }
-
-        var url = arches.urls.api_card + (ko.unwrap(params.resourceid));
+        this.workflowid = params.workflow.state.workflowid;
+        this.resourceid = params.resourceid();
+        var url = arches.urls.api_card + (ko.unwrap(this.resourceid));
         this.report = ko.observable();
         this.loading = ko.observable(true);
+        this.nodegroupids = params.workflow.steps
+            .filter(function(step){return ko.unwrap(step.nodegroupid);})
+            .map(function(x){return ko.unwrap(x.nodegroupid);});
 
         $.getJSON(url, function(data) {
             var displayname = ko.observable(data.displayname);
@@ -30,9 +35,9 @@ define([
 
             var topCards = _.filter(data.cards, function(card) {
                 var nodegroup = _.find(data.nodegroups, function(group) {
-                    return group.nodegroupid === card.nodegroup_id;
+                    return (group.nodegroupid === card.nodegroup_id);
                 });
-                return !nodegroup || !nodegroup.parentnodegroup_id;
+                return (!nodegroup || !nodegroup.parentnodegroup_id) && _.contains(self.nodegroupids, card.nodegroup_id);
             }).map(function(card) {
                 params.nodegroupid = params.nodegroupid || card.nodegroup_id;
                 return new CardViewModel({
@@ -51,16 +56,16 @@ define([
 
             topCards.forEach(function(topCard) {
                 topCard.topCards = topCards;
-            });
+            }, this);
 
             self.report(new ReportModel(_.extend(data, {graphModel: graphModel, cards: topCards})));
             self.loading(false);
         });
 
         params.stateProperties = function(){
-                return {}
-            };
-    };
+            return {};
+        };
+    }
     return ko.components.register('final-step', {
         viewModel: viewModel,
         template: {

diff --git a/arches/app/templates/views/components/workflows/final-step.htm b/arches/app/templates/views/components/workflows/final-step.htm
@@ -1,5 +1,19 @@
 <div class="workflows-get-tile-value">
-    <h4>Workflow Complete</h4>
+    <div style='display:flex; justify-content: space-between;'>
+        <h4>Workflow Complete</h4>
+        <div>
+            <a href="#" target="_self" type="button" class="btn btn-primary"
+                data-bind="attr: { href: urls.plugin(workflowid)}">
+                <i class="fa fa-plus"></i>
+                <span>New</span>
+            </a>
+            <a href="#" target="_self" type="button" class="btn btn-primary"
+                data-bind="attr: { href: urls.resource + '/' + resourceid}">
+                <i class="fa fa-pencil"></i>
+                <span>Edit</span>
+            </a>
+        </div>
+    </div>
     <!--ko if: report() -->
     <div class='resource-report editor-report' data-bind='component: {
         name: "default-report",