Issue #504

CenturyLinkCloud · Sep 17, 2018 · f46192f · f46192f
1 parent 20e73bb
commit f46192f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/mdw-services/src/com/centurylink/mdw/service/rest/Processes.java b/mdw-services/src/com/centurylink/mdw/service/rest/Processes.java
@@ -267,10 +267,7 @@ else if ("designer".equals(query.getFilter("mdw-app"))) {
                         // retrieving summary for activity instance
                         if (processList.getCount() == 0)
                             throw new ServiceException(ServiceException.NOT_FOUND, "Process instance not found: " + query);
-                        JSONObject json = processList.getProcesses().get(0).getJson();
-                        json.put("definitionId", json.getLong("processId"));
-                        json.put("name", json.getString("processName"));
-                        return json;
+                        return getSummaryJson(processList.getProcesses().get(0));
                     }
                     else {
                         return processList.getJson();
@@ -299,7 +296,8 @@ protected JSONObject getSummaryJson(ProcessInstance process) {
             summary.put("templatePackage", process.getTemplatePackage());
             summary.put("templateVersion", process.getTemplateVersion());
             Process latestTemplate = ProcessCache.getProcess(process.getTemplatePackage() + "/" + process.getTemplate());
-            if (latestTemplate != null && !latestTemplate.getId().equals(process.getProcessId()))
+            // If null it means it is archived but was renamed or removed from current assets
+            if (latestTemplate == null || !latestTemplate.getId().equals(process.getProcessId()))
                 summary.put("archived", true);
         }
         else {

diff --git a/mdw-workflow/assets/com/centurylink/mdw/react/process.js b/mdw-workflow/assets/com/centurylink/mdw/react/process.js
@@ -14,6 +14,8 @@ const process = {
     else if (instanceId) {
       this.getInstance(serviceBase, instanceId, null, instance => {
         var path = instance.packageName + '/' + instance.processName;
+        if (instance.processVersion)
+           path += "/v" + instance.processVersion;
         this.getProcess(serviceBase, path, process => {
           process.packageName = instance.packageName;
           process.instance = instance;