Merge pull request #108 from LCOGT/update/hackathon-feedback

Hackathon Feedback Changes
LCOGT · Oct 4, 2024 · 71cb857 · 71cb857
2 parents b90778f + cd4ba9d
commit 71cb857
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 11 deletions.
diff --git a/src/components/DataSession/OperationPipeline.vue b/src/components/DataSession/OperationPipeline.vue
@@ -45,14 +45,11 @@ async function pollOperationCompletion(operationID) {
   // Success Callback for checking operation status
   const updateOperationStatus = (response) => {
     if(response){
-      const operationStatus = response.status
-      const percentCompletion = response.percent_completion
-
-      switch(operationStatus){
+      switch(response.status){
       case 'PENDING':
         break
       case 'IN_PROGRESS':
-        operationPercentages.value[operationID] = percentCompletion * DEC_TO_PERCENT
+        operationPercentages.value[operationID] = response.operation_progress * DEC_TO_PERCENT
         break
       case 'COMPLETED':
         operationPercentages.value[operationID] = COMPLETE_PERCENT
@@ -66,7 +63,7 @@ async function pollOperationCompletion(operationID) {
         clearPolling(operationID)
         break
       default:
-        console.error('Unknown Operation Status:', operationStatus)
+        console.error('Unknown Operation Status:', response.status)
       }
     }
     else{

diff --git a/src/components/Global/AlertToast.vue b/src/components/Global/AlertToast.vue
@@ -5,7 +5,7 @@ import { useAlertsStore } from '../../stores/alerts'
 const alertStore = useAlertsStore()
 const showAlert = ref(false)
 
-watch(() => alertStore.alertText, () => {
+watch(() => alertStore.alertTimeStamp, () => {
   showAlert.value = true
   setTimeout(() => {
     showAlert.value = false

diff --git a/src/stores/alerts.js b/src/stores/alerts.js
@@ -8,16 +8,16 @@ import { defineStore } from 'pinia'
 export const useAlertsStore = defineStore('alerts', {
   state() {
     return{
-      // The type of alert to display ('success', 'error', 'warning', 'info')
-      alertType: 'warning',
-      // The text to display in the alert
-      alertText: 'default alert text',
+      alertType: 'default', // alert type to display ('success', 'error', 'warning', 'info', 'loading')
+      alertText: 'default alert text', // text displayed in alert
+      alertTimeStamp: '0' // timestamp of the last alert, used for watching in AlertToast.vue
     }
   },
   actions: {
     setAlert(type, text, prefix = '') {
       this.alertType = type
       this.alertText = prefix ? prefix + ' ' + text : text
+      this.alertTimeStamp = Date.now()
     }
   }
 })