Merge branch 'main' of github.com:devforth/adminforth into main

Author: ivictbor

adminforth/plugins/foreign-inline-list/Changelog.md

@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.0.27]
+
+### Fixed
+
+- Modify InlineList add loading state for bulk actions
+
 ## [1.0.26]
 
 ### Fixed

adminforth/plugins/foreign-inline-list/custom/InlineList.vue

@@ -45,9 +45,27 @@
         }"
       >
         <component
-          v-if="action.icon"
+          v-if="action.icon && !bulkActionLoadingStates[action.id]"
           :is="getIcon(action.icon)"
-          class="w-5 h-5 text-gray-500 transition duration-75 dark:text-gray-400 group-hover:text-gray-900 dark:group-hover:text-white"></component>
+          class="w-5 h-5 text-gray-500 transition duration-75 dark:text-gray-400 group-hover:text-gray-900 dark:group-hover:text-white">
+        </component>
+        <div v-if="bulkActionLoadingStates[action.id]">
+          <svg 
+            aria-hidden="true" 
+            class="w-5 h-5 animate-spin" 
+            :class="{
+              'text-gray-200 dark:text-gray-500 fill-gray-500 dark:fill-gray-300': action.state !== 'danger',
+              'text-red-200 dark:text-red-800 fill-red-600 dark:fill-red-500': action.state === 'danger'
+            }"
+            viewBox="0 0 100 101" 
+            fill="none" 
+            xmlns="http://www.w3.org/2000/svg"
+          >
+            <path d="M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z" fill="currentColor"/>
+            <path d="M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z" fill="currentFill"/>
+          </svg>
+          <span class="sr-only">Loading...</span>
+        </div>
 
         {{ `${action.label} (${checkboxes.length})` }}
       </button>
@@ -179,8 +197,20 @@ watch([filters], async () => {
   await getList();
 }, {deep: true});
 
+const bulkActionLoadingStates = ref({});
 
 async function startBulkAction(actionId) {
+  const action = listResource.value.options.bulkActions.find(a => a.id === actionId);
+  if (action.confirm) {
+    const confirmed = await adminforth.confirm({
+      message: action.confirm,
+    });
+    if (!confirmed) {
+      return;
+    }
+  }
+  bulkActionLoadingStates.value[actionId] = true;
+
   const data = await callAdminForthApi({
     path: `/plugin/${props.meta.pluginInstanceId}/start_bulk_action`,
     method: 'POST',
@@ -190,9 +220,18 @@ async function startBulkAction(actionId) {
       recordIds: checkboxes.value
     }
   });
+  bulkActionLoadingStates.value[actionId] = false;
+  
   if (data?.ok) {
     checkboxes.value = [];
     await getList();
+
+    if (data.successMessage) {
+      adminforth.alert({
+        message: data.successMessage,
+        variant: 'success'
+      });
+    }
   }
   if (data?.error) {
     showErrorTost(data.error);

adminforth/spa/src/afcl/Select.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="relative inline-block afcl-select">
+  <div class="relative inline-block afcl-select" ref="internalSelect">
     <div class="relative">
       <input
         ref="inputEl"
@@ -89,7 +89,6 @@ import { ref, computed, onMounted, onUnmounted, watch, type Ref } from 'vue';
 import { IconCaretDownSolid } from '@iconify-prerendered/vue-flowbite';
 import { useElementSize } from '@vueuse/core'
 
-
 const props = defineProps({
   options: Array,
   modelValue: {
@@ -123,6 +122,7 @@ const dropdownStyle = ref<{ top?: string; }>({
 });
 
 const selectedItems: Ref<any[]> = ref([]);
+const internalSelect = ref<HTMLElement | null>(null);
 
 function inputInput() {
   if (!props.multiple && selectedItems.value.length) {
@@ -147,15 +147,12 @@ function updateFromProps() {
 }
 
 function inputClick() {
-  if (props.isReadonly) {
-    return;
-  }
-  if (!showDropdown.value) {
-    showDropdown.value = true;
-  } else {
-    if (!search.value) {
-      showDropdown.value = false;
-    }
+  if (props.isReadonly) return;
+  // Toggle local dropdown
+  showDropdown.value = !showDropdown.value;
+  // If the dropdown is about to close, reset the search
+  if (!showDropdown.value && !search.value) {
+    search.value = '';
   }
 }
 
@@ -198,10 +195,12 @@ const filteredItems = computed(() => {
   );
 });
 
-const handleClickOutside = (event) => {
-  if (!event.target.closest('.afcl-select')) {
+
+const handleClickOutside = (event: MouseEvent) => {
+  const targetEl = event.target as HTMLElement | null;
+  const closestSelect = targetEl?.closest('.afcl-select');
+  if (closestSelect !== internalSelect.value)
     showDropdown.value = false;
-  }
 };
 
 const addClickListener = () => {
@@ -228,7 +227,7 @@ const toogleItem = (item) => {
   if (!props.multiple && search.value) {
     search.value = '';
   }
-  
+
   const list = selectedItems.value.map(item => item.value);
   const updValue = list.length ? list : null;
   let emitValue;
@@ -238,13 +237,10 @@ const toogleItem = (item) => {
     emitValue = updValue;
   }
   emit('update:modelValue', emitValue);
-
 };
 
-
 onUnmounted(() => {
   removeClickListener();
 });
 
-
 </script>