Merge pull request #135 from AD-SDL/aileen_dev

- Support Workflow Admin Actions
- Add Events to Dashboard
- Other miscellaneous tweaks and improvements to dashboard

Author: RyanTheRobothead

Dockerfile

@@ -49,6 +49,7 @@ RUN --mount=type=cache,target=/root/.cache \
     pip install ./wei
 
 COPY wei-entrypoint.sh /wei-entrypoint.sh
+RUN ls -l /wei-entrypoint.sh
 RUN chmod +x /wei-entrypoint.sh
 ENTRYPOINT [ "/wei-entrypoint.sh" ]
 

package-lock.json

@@ -1,5 +1,10 @@
 {
   "dependencies": {
-    "prettier": "^3.3.2"
+    "prettier": "^3.3.2",
+    "vue": "^3.5.12"
+  },
+  "devDependencies": {
+    "@types/vue": "^1.0.31",
+    "@vue/compiler-sfc": "^3.5.12"
   }
 }

package.json

@@ -1,6 +1,6 @@
 [project]
 name = "ad_sdl.wei"
-version = "0.7.3"
+version = "0.7.4"
 description = "The Rapid Prototyping Laboratory's Workflow Execution Interface."
 authors = [
     {name = "Rafael Vescovi", email = "ravescovi@anl.gov"},

pyproject.toml

@@ -22,12 +22,19 @@
 </template>
 
 <script setup lang="ts">
-import { main_url } from "@/store";
-import { ref, watchEffect } from 'vue';
+import {
+  ref,
+  watchEffect,
+} from 'vue';
+
+import { main_url } from '@/store';
 
 const props = defineProps<{
     module?: string;
     module_status?: string;
+    wf_run_id?: string;
+    wf_status?: string;
+    can_Cancel?: boolean;
 }>();
 
 const cancel_url = ref('')
@@ -39,10 +46,17 @@ watchEffect(() => {
     if (props.module) {
         cancel_url.value = main_url.value.concat('/admin/cancel/'.concat(props.module))
         hoverText.value = "Cancel Module Action"
+        console.log(cancel_url.value)
+    }
+    else if (props.wf_run_id) {
+        cancel_url.value = main_url.value.concat('/admin/cancel_wf/'.concat(props.wf_run_id))
+        hoverText.value = "Cancel Workflow"
+        console.log(cancel_url.value)
     }
     else {
         cancel_url.value = main_url.value.concat('/admin/cancel')
-        hoverText.value = "Cancel All Workflows"
+        hoverText.value = "Cancel Workcell"
+        console.log(cancel_url.value)
     }
 })
 
@@ -56,6 +70,9 @@ watchEffect(() => {
             canCancel.value = false
         }
     }
+    else if (props.wf_run_id) {
+        canCancel.value = ["running", "queued", "in_progress"].includes(props.wf_status || "") && props.can_Cancel === true;
+    }
     else {
         // TODO: Allow cancel if there's an actively running workflow
         canCancel.value = true
@@ -66,13 +83,12 @@ watchEffect(() => {
 const sendCancelCommand = async () => {
     try {
         const response = await fetch(cancel_url.value, {
-            method: 'POST',
+            method: "POST",
         });
         if (!response.ok) {
             throw new Error(`HTTP error! status: ${response.status}`);
         }
         console.log('Cancel successful');
-
     } catch (error) {
         console.error('Error in cancel:', error);
     }