Fix issue where History and SubProcs buttons on Processes page were c…

…lickable when the process was otherwise pending or disabled.
NASA-AMMOS · Dec 17, 2024 · 12edaf3 · 12edaf3
1 parent be8aee7
commit 12edaf3
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/install/cws-ui/processes.ftl b/install/cws-ui/processes.ftl
@@ -328,18 +328,20 @@
                             orderable: false
                         },
                         {
-                            data: "procInstId",
+                            data: { procInstId: "procInstId", status: "status" },
                             defaultContent: '',
                             className: 'details-control',
                             orderable: false,
                             render: function (data, type) {
                                 if (type === 'display') {
-                                    if (data == null) {
-                                        return '<a onclick="viewHistory(\'' + data + '\')" href="/${base}/history?procInstId=' + data + '" ><button style=\"margin-bottom: 5px;\" class="btn btn-outline-dark btn-sm disabled">History</button></a>' +
-                                            "<a style=\"margin-bottom: 5px;\" onclick=\"viewSubProcs('" + data + "')\"><button class=\"btn btn-outline-dark btn-sm disabled\" style=\"margin-bottom: 5px\">Subprocs</button></a>";
+                                    var isDisabled = (data.status === 'pending' || data.status === 'disabled');
+                    
+                                    if (data == null || isDisabled) {
+                                        return '<a onclick="return false;"><button style=\"margin-bottom: 5px;\" class="btn btn-outline-dark btn-sm disabled">History</button></a>' +
+                                            "<a style=\"margin-bottom: 5px;\" onclick=\"return false;\"><button class=\"btn btn-outline-dark btn-sm disabled\" style=\"margin-bottom: 5px\">Subprocs</button></a>";
                                     }
-                                    return '<a onclick="viewHistory(\'' + data + '\')" href="/${base}/history?procInstId=' + data + '" ><button style=\"margin-bottom: 5px;\" class="btn btn-outline-dark btn-sm">History</button></a>' +
-                                        "<a style=\"margin-bottom: 5px;\" onclick=\"viewSubProcs('" + data + "')\"><button class=\"btn btn-outline-dark btn-sm\">Subprocs</button></a>";
+                                    return '<a onclick="viewHistory(\'' + data.procInstId + '\')" href="/${base}/history?procInstId=' + data.procInstId + '" ><button style=\"margin-bottom: 5px;\" class="btn btn-outline-dark btn-sm">History</button></a>' +
+                                        "<a style=\"margin-bottom: 5px;\" onclick=\"viewSubProcs('" + data.procInstId + "')\"><button class=\"btn btn-outline-dark btn-sm\">Subprocs</button></a>";
                                 }
                                 return data;
                             }