Merge branch '1299-single-file-bulk-publish' into develop

IATI · Jan 18, 2024 · 91a2dbb · 91a2dbb
2 parents 2c2df21 + 6b20706
commit 91a2dbb
Show file tree

Hide file tree

Showing 23 changed files with 18,311 additions and 8,599 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/js/formbuilder.js b/public/js/formbuilder.js
diff --git a/public/js/script.js b/public/js/script.js
diff --git a/public/js/vendor.js b/public/js/vendor.js
diff --git a/public/js/webportal-script.js b/public/js/webportal-script.js
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
@@ -1,10 +1,10 @@
 {
-    "/js/app.js": "/js/app.js?id=a5b20453d79b831b6727390134d8e28c",
-    "/js/script.js": "/js/script.js?id=486f329f14e1f080305e7c109ca928ac",
-    "/js/webportal-script.js": "/js/webportal-script.js?id=fd5980061c5c73a9d216570039251afa",
-    "/js/formbuilder.js": "/js/formbuilder.js?id=24413ce3f74f3596ccaa1c4ade59f901",
+    "/js/app.js": "/js/app.js?id=1d621e2b98c8fdf348ed198b8abdd1ad",
+    "/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=d7a1ea82f55a40a6b85fd3f4ec0f7f4c",
-    "/css/app.css": "/css/app.css?id=08925c8b40a60e425cd8838689896325",
-    "/js/vendor.js": "/js/vendor.js?id=217ccbf7991cab71072e36f016dae36e"
+    "/css/webportal-app.css": "/css/webportal-app.css?id=eb6b291271352b3f4efede68dafb8c7d",
+    "/css/app.css": "/css/app.css?id=a48c028f3dfe5a338c8d2314f5f5e168",
+    "/js/vendor.js": "/js/vendor.js?id=edbcebc1c4b7cc56d663ef3d704d7655"
 }
diff --git a/resources/assets/js/components/ActivityDownload.vue b/resources/assets/js/components/ActivityDownload.vue
@@ -84,7 +84,7 @@
   </Modal>
 </template>
 <script setup lang="ts">
-import { inject, computed, onMounted, ref, Ref } from 'vue';
+import { inject, computed, ref, Ref } from 'vue';
 import spinnerLoader from './spinnerLoader.vue';
 import Modal from 'Components/PopupModal.vue';
 

diff --git a/resources/assets/js/components/ActivityValidation.vue b/resources/assets/js/components/ActivityValidation.vue
@@ -133,13 +133,15 @@ const props = defineProps({
 });
 
 const emit = defineEmits(['stopValidation', 'proceed']);
+
+//setting percentage of validation progressbar , to maintain consistency when page is reloaded or navigated
 const localStoragePercent = ref(localStorage.getItem('validationPercent'));
 const showValidatingList = ref(false);
 const hasError = ref(false);
 
 //setting data from local storage to vuex ,to preserve state when window is reloaded
 onMounted(() => {
-  console.log(props.errorTab, 'errortab mounted');
+  //to check if validation need to be show of not when navigated or refreshed
   let showPopup = Boolean(localStorage.getItem('activityValidating'));
   if (showPopup) {
     store.dispatch('updateStartValidation', true);