-[x] Flow Change Of Critical Errors

IATI · Dec 3, 2024 · d41cff5 · d41cff5
1 parent 4a7d208
commit d41cff5
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 223 deletions.
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,5 +1,5 @@
 {
-    "/js/app.js": "/js/app.js?id=e72f8dd5f9ec5815807c6ec2f406c7eb",
+    "/js/app.js": "/js/app.js?id=805376d9aecfa9c278dea832175167bc",
     "/js/script.js": "/js/script.js?id=5664c41472ea07b11e7b9e7ad4007a4c",
     "/js/webportal-script.js": "/js/webportal-script.js?id=ec424584e8e86829641c324d807c42b5",
     "/js/formbuilder.js": "/js/formbuilder.js?id=0da9ac4d5b4cf5740657fde41069a985",

diff --git a/resources/assets/js/views/activity/bulk-publish/bulkPublishModal/BulkPublish.vue b/resources/assets/js/views/activity/bulk-publish/bulkPublishModal/BulkPublish.vue
@@ -37,7 +37,6 @@
           :permalink="permalink"
           :percentage-width="percentageWidth"
           :error-type="store.state.bulkActivityPublishStatus.error_type"
-          @has-critical-errors-selected="isAnyCriticalErrorSelected"
         />
       </div>
       <div v-else>
@@ -146,22 +145,11 @@
 
       <template v-else>
         <template v-if="!store?.state?.startBulkPublish">
-          <Transition>
-            <button
-              v-if="hasCriticalErrorsSelected"
-              class="flex items-center gap-1.5 rounded border border-bluecoral px-2.5 py-3 text-xs font-bold uppercase text-bluecoral"
-              @click="reValidateActivities"
-            >
-              Revalidate
-            </button>
-          </Transition>
           <BtnComponent
             class="bg-white px-6 uppercase"
             type="primary"
             :text="`Continue Publishing (${newSelectedActivities.length})`"
-            :disabled="
-              newSelectedActivities.length === 0 || hasCriticalErrorsSelected
-            "
+            :disabled="newSelectedActivities.length === 0"
             @click="startBulkPublish()"
           />
           <BulkPublishRevalidatePopup
@@ -242,7 +230,6 @@ const isChecking = ref(true);
 const dataChanged = ref(false);
 const showSlideIn = ref(false);
 const forceBulkPublish = ref(false);
-const hasCriticalErrorsSelected = ref(false);
 
 provide('newSelectedActivities', newSelectedActivities);
 
@@ -267,10 +254,6 @@ const percentageWidth = computed(() => {
   );
 });
 
-const isAnyCriticalErrorSelected = (value: boolean) => {
-  hasCriticalErrorsSelected.value = value;
-};
-
 watch(
   () => percentageWidth?.value,
   (value) => {

diff --git a/...rces/assets/js/views/activity/bulk-publish/bulkPublishModal/iatiValidate/IatiValidate.vue b/...rces/assets/js/views/activity/bulk-publish/bulkPublishModal/iatiValidate/IatiValidate.vue
@@ -190,8 +190,8 @@
                   </div>
                   <div v-if="value.top_level_error === 'critical'">
                     <span class="text-xs italic text-crimson-50">
-                      (The activity contains critical errors and thus cannot be
-                      published.)
+                      (The activity contains critical errors and thus won't be
+                      published. Please fix them to continue publishing.)
                     </span>
                   </div>
                 </div>
@@ -326,20 +326,6 @@ watch(
   { deep: true }
 );
 
-watchEffect(() => {
-  const criticalErrorActivities = Object.keys(props.activitiesList)
-    .map(Number)
-    .filter((id) => props.activitiesList[id].top_level_error === 'critical');
-
-  const normalizedSelectedActivities = newSelectedActivities.value.map(Number);
-
-  const hasAnyCriticalErrorSelected = criticalErrorActivities.some((id) =>
-    normalizedSelectedActivities.includes(id)
-  );
-
-  emit('hasCriticalErrorsSelected', hasAnyCriticalErrorSelected);
-});
-
 const validActivities = computed(() => {
   return Object.fromEntries(
     Object.entries(props.activitiesList).filter(