xls upload model open after cancelling fix

younginnovations · Jul 21, 2023 · 4f541d7 · 4f541d7
1 parent 38aeb27
commit 4f541d7
Show file tree

Hide file tree

Showing 7 changed files with 391 additions and 622 deletions.
diff --git a/public/css/app.css b/public/css/app.css
diff --git a/public/css/webportal-app.css b/public/css/webportal-app.css
diff --git a/public/js/app.js b/public/js/app.js
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
@@ -1,10 +1,10 @@
 {
-    "/js/app.js": "/js/app.js?id=69f72a34b0e75deb97fe45610c1a1d76",
+    "/js/app.js": "/js/app.js?id=8f25e8b20042f5c51c54dfb294d75cd9",
     "/js/script.js": "/js/script.js?id=4920eb85d84da1e87cb71769c04a12a2",
     "/js/webportal-script.js": "/js/webportal-script.js?id=f9c23d4bccd261db9414465886315f45",
     "/js/formbuilder.js": "/js/formbuilder.js?id=96f1b9dd5890b8ff09e613117dd94592",
     "/manifest.js": "/manifest.js?id=3ed1124c8f4dcb98acc36de67cb80349",
-    "/css/webportal-app.css": "/css/webportal-app.css?id=ab1aac667c4b171aa29f4b0619fcb6b8",
-    "/css/app.css": "/css/app.css?id=e58bd60373508a4612d9d9149b69e595",
+    "/css/webportal-app.css": "/css/webportal-app.css?id=b49ed37aa1e8d8613f0ef78ed77b24bf",
+    "/css/app.css": "/css/app.css?id=53f31f275bde982d3e827d95e30e86bd",
     "/js/vendor.js": "/js/vendor.js?id=194c3b42d9401448499518726b5ee17b"
 }
diff --git a/resources/assets/js/components/XlsUploadIndicator.vue b/resources/assets/js/components/XlsUploadIndicator.vue
@@ -121,6 +121,15 @@ watch(
   { deep: true }
 );
 
+watch(
+  () => props.xlsData,
+  (value) => {
+    if (value) {
+      showXlsStatus.value = true;
+    }
+  }
+);
+
 watch(
   () => [
     props.xlsData,
@@ -139,6 +148,7 @@ watch(
     const supportButton: HTMLElement = document.querySelector(
       '#launcher'
     ) as HTMLElement;
+
     if (
       !(xlsData && showXlsStatus) &&
       !(downloading && !downloadCompleted && !cancelDownload) &&

diff --git a/resources/assets/js/views/activity/ActivityIndex.vue b/resources/assets/js/views/activity/ActivityIndex.vue
@@ -188,6 +188,7 @@ export default defineComponent({
     watch(
       () => store.state.startXlsDownload,
       (value) => {
+        console.log('polling watcher triggered');
         if (value) {
           checkDownloadStatus();
         }

diff --git a/resources/assets/js/views/import/ActivityXlsUpload.vue b/resources/assets/js/views/import/ActivityXlsUpload.vue
@@ -273,7 +273,7 @@
       v-if="
         xlsData || (downloading && !downloadCompleted) || publishingActivities
       "
-      :total-count="totalCount"
+      :total-count="(totalCount as number)"
       :processed-count="processedCount"
       :xls-failed="xlsFailed"
       :activity-name="activityName"
@@ -564,11 +564,6 @@ const pa: Ref<paType> = useStorage('vue-use-local-storage', {
   publishingActivities: localStorage.getItem('publishingActivities') ?? {},
 });
 
-onMounted(() => {
-  fetchActivities(1);
-  checkXlsstatus();
-});
-
 watch(
   () => store.state.selectedActivities,
   (value) => {
@@ -791,6 +786,7 @@ const cancelImport = () => {
 
 const pollingForXlsStatus = () => {
   const checkStatus = setInterval(function () {
+    console.log('polling', xlsData);
     axios.get('/import/xls/status').then((res) => {
       if (res.data.data?.message === 'Started') {
         //reset