fixed xls import in maximized bulk publish modal

public/mix-manifest.json

@@ -1,10 +1,10 @@
 {
-    "/js/app.js": "/js/app.js?id=4f6e0ffe6c0d8dc814a6ca7ab2c2cd2c",
+    "/js/app.js": "/js/app.js?id=f4ad863e5f6e8f2fd0309ff4afe6d68e",
     "/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=85537cfbc99853ea9793f54c417c10f9",
     "/manifest.js": "/manifest.js?id=3ed1124c8f4dcb98acc36de67cb80349",
-    "/css/webportal-app.css": "/css/webportal-app.css?id=adf7341f839de37a534011a906ba0d3f",
-    "/css/app.css": "/css/app.css?id=47ba95be7ce52d1c1abeb3771d376b5f",
-    "/js/vendor.js": "/js/vendor.js?id=f5b6df2a08df1db55bad9b73494fb5e8"
+    "/css/webportal-app.css": "/css/webportal-app.css?id=0ac002f4707a4f5402e58386ba1f29e8",
+    "/css/app.css": "/css/app.css?id=6b49962c127a5441852e844920450a13",
+    "/js/vendor.js": "/js/vendor.js?id=fd88a53589d5bef5911c2bfa2da9fc92"
 }

resources/assets/js/components/XlsUploadIndicator.vue

@@ -2,7 +2,8 @@
   <div
     v-show="
       (downloading && !downloadCompleted && !cancelDownload) ||
-      store.state.isPublishedModalMinimized
+      store.state.isPublishedModalMinimized ||
+      (xlsData && showXlsStatus)
     "
   >
     <div

resources/assets/js/views/activity/bulk-publish/bulkPublishModal/BulkPublish.vue

@@ -301,7 +301,6 @@ watchEffect(() => {
     store.state.isPublishedModalMinimized = sharedMinimize.value;
   }
 });
-
 </script>
 
 <style scoped></style>

resources/assets/js/views/activity/bulk-publish/bulkPublishModal/iatiValidate/IatiValidate.vue

@@ -56,7 +56,9 @@
         @active-tab="handleActiveTab"
       >
         <template #tabOne>
-          <ul class="space-y-2 max-h-[50vh] overflow-auto divide-y divide-n-20 pb-4 duration-200">
+          <ul
+            class="max-h-[50vh] space-y-2 divide-y divide-n-20 overflow-auto pb-4 duration-200"
+          >
             <template v-if="Object.keys(validActivities).length > 0">
               <li
                 v-for="(value, key) in validActivities"
@@ -99,7 +101,9 @@
         </template>
 
         <template #tabTwo>
-          <ul class="space-y-2 max-h-[50vh] overflow-auto divide-y divide-n-20 pb-4 duration-200">
+          <ul
+            class="max-h-[50vh] space-y-2 divide-y divide-n-20 overflow-auto pb-4 duration-200"
+          >
             <template v-if="Object.keys(inValidedActivities).length > 0">
               <li
                 v-for="(value, key) in inValidedActivities"
@@ -146,7 +150,9 @@
             activities. You can still continue to publish
           </span>
         </div>
-        <ul class="space-y-2 overflow-auto max-h-[50vh] divide-y divide-n-20 px-4 pb-4 duration-200">
+        <ul
+          class="max-h-[50vh] space-y-2 divide-y divide-n-20 overflow-auto px-4 pb-4 duration-200"
+        >
           <template v-if="Object.keys(validActivities).length > 0">
             <li
               v-for="(value, key) in validActivities"
@@ -211,15 +217,7 @@
   </div>
 </template>
 <script setup lang="ts">
-import {
-  watch,
-  defineProps,
-  ref,
-  onMounted,
-  inject,
-  Ref,
-  computed,
-} from 'vue';
+import { watch, defineProps, ref, onMounted, inject, Ref, computed } from 'vue';
 
 import { useStore } from 'Store/activities/index';
 import RollingLoader from '../RollingLoaderComponent.vue';

resources/assets/js/views/activity/bulk-publish/bulkPublishModal/publishingActivity/PublishingActivity.vue

@@ -15,7 +15,7 @@
         Activity
       </div>
       <ul
-        class="space-y-4 max-h-[50vh] overflow-auto divide-y divide-n-20 px-6 pb-4 text-sm leading-[22px] tracking-normal text-n-50"
+        class="max-h-[50vh] space-y-4 divide-y divide-n-20 overflow-auto px-6 pb-4 text-sm leading-[22px] tracking-normal text-n-50"
       >
         <li
           v-for="(value, name, index) in store.state.bulkActivityPublishStatus

resources/assets/js/views/import/ActivityXlsUpload.vue

@@ -281,6 +281,7 @@
       :completed="uploadComplete"
       :publishing-activities="publishingActivities"
     />
+    <PublishSelected />
   </div>
   <Loader
     v-if="loader"
@@ -500,6 +501,7 @@ import dateFormat from 'Composable/dateFormat';
 import Pagination from 'Components/TablePagination.vue';
 import { useStore } from 'Store/activities/index';
 import { useStorage } from '@vueuse/core';
+import PublishSelected from 'Activity/bulk-publish/PublishSelected.vue';
 
 interface ActivitiesInterface {
   last_page: number;

resources/assets/sass/component/_input.scss

@@ -256,41 +256,41 @@ label {
 }
 
 select.select2.default-value-indicator
-+ .select2
-.selection
-.select2-selection:not(:focus) {
+  + .select2
+  .selection
+  .select2-selection:not(:focus) {
   border: 2px solid #3f9a7c;
   background-color: #3f9a7c15;
 }
 
 select.select2.default-value-indicator
-+ .select2
-.selection
-.select2-selection:not(:focus) {
+  + .select2
+  .selection
+  .select2-selection:not(:focus) {
   border: 2px solid #3f9a7c;
   background-color: #3f9a7c15;
 }
 
 select.select2.default-value-indicator
-+ .select2
-.selection
-.select2-selection
-.select2-selection__placeholder {
+  + .select2
+  .selection
+  .select2-selection
+  .select2-selection__placeholder {
   color: var(--bluecoral-50);
 }
 
 select.select2.default-value-indicator
-+ .select2.select2-container--open
-.selection
-.select2-selection {
+  + .select2.select2-container--open
+  .selection
+  .select2-selection {
   border: 1px solid #a6b5ba;
   background-color: transparent;
 }
 
 select.select2.default-value-indicator
-+ .select2
-.selection
-.select2-selection.select2-selection--clearable {
+  + .select2
+  .selection
+  .select2-selection.select2-selection--clearable {
   border: 1px solid #a6b5ba;
   background-color: transparent;
 }

storage/test.xml

@@ -1,40 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<iati-activities version="2.03" generated-datetime="2024-09-04T08:54:03+00:00">
-  <iati-activity last-updated-datetime="2024-09-04T08:54:03+00:00" xml:lang="aa">
-    <iati-identifier>AF-CBR-8888-test1</iati-identifier>
-    <reporting-org type="11" ref="AF-CBR-8888" secondary-reporter="0">
+<iati-activities version="2.03" generated-datetime="2024-09-10T06:38:45+00:00">
+  <iati-activity last-updated-datetime="2024-09-10T06:38:45+00:00" xml:lang="aa">
+    <iati-identifier>AF-CBR-8888-12313</iati-identifier>
+    <reporting-org type="11" ref="AF-CBR-8888" secondary-reporter="1">
       <narrative xml:lang="aa">My org's name - editted</narrative>
     </reporting-org>
     <title>
-      <narrative xml:lang="aa">yipl-test-1</narrative>
+      <narrative xml:lang="aa">yipl testing-edit</narrative>
     </title>
-    <description type="1">
-      <narrative xml:lang="ab">test</narrative>
-    </description>
-    <participating-org ref="123" type="11" role="1" activity-id="123">
-      <narrative xml:lang="ae">123</narrative>
-    </participating-org>
-    <activity-status code="2"/>
-    <activity-date type="2" iso-date="2024-06-22">
-      <narrative xml:lang="aa">123</narrative>
-    </activity-date>
-    <recipient-country code="AX" percentage="100">
-      <narrative xml:lang="ab">123</narrative>
-    </recipient-country>
-    <sector code="1"/>
-    <default-flow-type code="22"/>
-    <default-finance-type code="1100"/>
-    <default-aid-type code="1" vocabulary="2"/>
-    <default-tied-status code="5"/>
-    <budget type="1" status="1">
-      <period-start iso-date="2024-06-28"/>
-      <period-end iso-date="2024-07-06"/>
-      <value value-date="2024-06-22">1</value>
-    </budget>
-    <transaction>
-      <transaction-type code="3"/>
-      <transaction-date iso-date="2024-06-22"/>
-      <value currency="ANG" value-date="2024-06-06">1</value>
-    </transaction>
   </iati-activity>
 </iati-activities>