timeout fix from Pizzo

Author: SMacOne

src/components/mixins/toponimo.mixin.js

@@ -398,7 +398,7 @@ export default {
           return "primary";
       }
     },
-    getStatoColorScript(stato) {
+   /*  getStatoColorScript(stato) {
       switch (stato) {
         case -1:
           return "warning";
@@ -425,7 +425,7 @@ export default {
         default:
           return "";
       }
-    },
+    }, */
     getStatoString(stato, validazione) {
       switch (stato) {
         case 1:

src/services/elencoScript/elencoScript.service.js

@@ -19,6 +19,20 @@ class ElencoScriptService extends AbstractService {
         });
     }
   }
+  findScriptRunningByUser() {
+    {
+      return axiosRegedit
+        .get(this.endpoint + "/log-linkage-probabilistico-last-proc")
+        .then(res => {
+          var data = res.data ? res.data : {};
+          //console.log(data);
+          return data;
+        })
+        .catch(err => {
+          throw err;
+        });
+    }
+  }
 }
 
 export const elencoScriptService = new ElencoScriptService("/regedit");

src/store/modules/elencoScript/elencoScript.js

@@ -2,12 +2,16 @@ import { elencoScriptService } from "@/services";
 import { getUserId } from "@/common";
 
 const state = {
-  elencoScript: null
+  elencoScript: null,
+  lastScriptRunning: null
 };
 
 const mutations = {
   SET_ELENCO(state, elenco) {
     state.elencoScript = elenco;
+  },
+  SET_SCRIPTRUNNING(state, scriptRunning) {
+    state.lastScriptRunning = scriptRunning;
   }
 };
 
@@ -30,12 +34,30 @@ const actions = {
           console.log(err);
         });
     }
+  },
+  findScriptRunningByUser({ commit }) {
+    //get user from store
+    let userId = getUserId();
+    if (userId > 0) {
+      return elencoScriptService
+        .findScriptRunningByUser(userId)
+        .then(data => {
+          //console.log(data);
+          commit("SET_SCRIPTRUNNING", data);
+        })
+        .catch(err => {
+          console.log(err);
+        });
+    }
   }
 };
 
 const getters = {
   elencoScript: state => {
     return state.elencoScript;
+  },
+  lastScriptRunning: state => {
+    return state.lastScriptRunning;
   }
 };
 

src/views/catalogue/toponimo/ToponimoList.vue

@@ -285,6 +285,7 @@ export default {
       values: [],
       returnValueScript: "",
       intervalId: null,
+      intervalIdScriptRunning: null,
       btnLabel: () => "Elenco Province",
       filters: [
         {
@@ -324,6 +325,7 @@ export default {
     ...mapGetters("archivio", ["archivioCodes"]),
     ...mapGetters("tabella", ["tabellaScript"]),
     ...mapGetters("elenco", ["elencoScript"]),
+    ...mapGetters("elenco", ["lastScriptRunning"]),
 
     province: {
       get: function() {
@@ -373,13 +375,16 @@ export default {
           this.intervalId = setInterval(() => {
             this.updateElenco();
           }, 3000);
+          this.intervalIdScriptRunning = setInterval(() => {
+            this.verifyScriptRunning();
+          }, 5000);
           this.$store.dispatch("scriptRunning/setScriptRunning", true);
           await this.$store.dispatch("valueScript/execScript", payload);
           this.$store.dispatch("elenco/findElencoByUser");
           //this.spinnerVisible = false;
-          if (this.elencoScript[0].stato == 0) {
+          /* if (this.elencoScript[0].stato == 0) {
             this.$store.dispatch("scriptRunning/setScriptRunning", false);
-          }
+          } */
           this.$store.dispatch("tabella/findTabellaByUser");
         } else {
           this.$store.dispatch(
@@ -401,10 +406,47 @@ export default {
         this.$store.dispatch("elenco/findElencoByUser");
       }
     },
+    getStatoColorScript(stato) {
+      switch (stato) {
+        case -1:
+          return "warning";
+        case 0:
+          return "danger";
+        case 1:
+          return "success";
+        default:
+          return "primary";
+      }
+    },
+    getStatoStringScript(stato, indice) {
+      switch (stato) {
+        case -1:
+          return "Errore script";
+        case 0:
+          if (indice > 1) {
+            return "Esecuzione abortita";
+          }
+          return "Esecuzione in corso..";
+
+        case 1:
+          return "Completato";
+        default:
+          return "";
+      }
+    },
     updateElenco() {
       this.$store.dispatch("elenco/findElencoByUser");
       clearInterval(this.intervalId);
     },
+    async verifyScriptRunning() {
+      console.log("Verifica in Corso......");
+      await this.$store.dispatch("elenco/findScriptRunningByUser");
+      if (this.lastScriptRunning.stato && this.lastScriptRunning.stato != 0) {
+        this.$store.dispatch("scriptRunning/setScriptRunning", false);
+        this.$store.dispatch("elenco/findElencoByUser");
+        clearInterval(this.intervalIdScriptRunning);
+      }
+    },
     elencoProvince() {
       return this.values.map(val => {
         return val.name;
@@ -530,14 +572,14 @@ export default {
     this.$store.dispatch("dug/findAll");
   }
 
-  /* mounted() {
-    this.intervalId = setInterval(() => {
-      this.updateElenco();
+  /*  mounted() {
+    this.intervalIdScriptRunning = setInterval(() => {
+      this.verifyScriptRunning();
     }, 5000);
   },
   onUnmounted() {
-    clearInterval(this.intervalId);
-  }*/
+    clearInterval(this.intervalIdScriptRunning);
+  } */
 };
 </script>