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

SerVitasik · SerVitasik · commit eae9b8a87d95 · 2025-10-24T14:11:46.000+03:00
diff --git a/adminforth/documentation/docs/tutorial/03-Customization/15-afcl.md b/adminforth/documentation/docs/tutorial/03-Customization/15-afcl.md
@@ -1967,10 +1967,10 @@ import { MixedChart } from '@/afcl'
   </div>
 </div>
 
-## Json Viever
+## Json Viewer
 
 ```ts
-import { JsonViever } from '@/afcl'
+import { JsonViewer } from '@/afcl'
 ```
 
 ### Basic
diff --git a/adminforth/spa/src/components/Toast.vue b/adminforth/spa/src/components/Toast.vue
@@ -1,32 +1,22 @@
 <template>
     
 
-<div class="afcl-toast flex items-center w-full p-4 rounded-lg shadow-lg dark:text-darkToastText dark:bg-darkToastBackground bg-lightToastBackground text-lightToastText"
+<div class="afcl-toast flex items-center w-full p-4 rounded-lg shadow-lg dark:text-darkToastText dark:bg-darkToastBackground bg-lightToastBackground text-lightToastText border-r-4"
+    :class="toast.variant == 'info' ? 'border-lightPrimary dark:border-darkPrimary' : toast.variant == 'danger' ? 'border-red-500 dark:border-red-800' : toast.variant == 'warning' ? 'border-orange-500 dark:border-orange-700' : 'border-green-500 dark:border-green-800'"
     role="alert"
 >
-    <div v-if="toast.variant == 'info'" class="inline-flex items-center justify-center flex-shrink-0 w-8 h-8 text-lightPrimary dark:text-darkPrimary bg-lightPrimaryOpacity rounded-lg dark:bg-blue-800 dark:text-blue-200">
-        <svg class="w-4 h-4"  xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 18 20">
-            <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15.147 15.085a7.159 7.159 0 0 1-6.189 3.307A6.713 6.713 0 0 1 3.1 15.444c-2.679-4.513.287-8.737.888-9.548A4.373 4.373 0 0 0 5 1.608c1.287.953 6.445 3.218 5.537 10.5 1.5-1.122 2.706-3.01 2.853-6.14 1.433 1.049 3.993 5.395 1.757 9.117Z"/>
-        </svg>
-        <span class="sr-only">{{ $t('Fire icon') }}</span>
+    <div v-if="toast.variant == 'info'" class=" inline-flex items-center justify-center flex-shrink-0 w-8 h-8 text-lightPrimary dark:text-darkPrimary bg-lightPrimaryOpacity rounded-lg dark:bg-darkPrimary dark:!text-blue-100">
+        <IconInfoCircleSolid class="w-5 h-5" aria-hidden="true" />
     </div>
     <div v-else-if="toast.variant == 'danger'" class="inline-flex items-center justify-center flex-shrink-0 w-8 h-8 text-red-500 bg-red-100 rounded-lg dark:bg-red-800 dark:text-red-200">
-        <svg class="w-5 h-5" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 20 20">
-            <path d="M10 .5a9.5 9.5 0 1 0 9.5 9.5A9.51 9.51 0 0 0 10 .5Zm3.707 11.793a1 1 0 1 1-1.414 1.414L10 11.414l-2.293 2.293a1 1 0 0 1-1.414-1.414L8.586 10 6.293 7.707a1 1 0 0 1 1.414-1.414L10 8.586l2.293-2.293a1 1 0 0 1 1.414 1.414L11.414 10l2.293 2.293Z"/>
-        </svg>
-        <span class="sr-only">{{ $t('Error icon') }}</span>
+        <IconCloseCircleSolid class="w-5 h-5" aria-hidden="true" />
     </div>
     <div v-else-if="toast.variant == 'warning'"class="inline-flex items-center justify-center flex-shrink-0 w-8 h-8 text-orange-500 bg-orange-100 rounded-lg dark:bg-orange-700 dark:text-orange-200">
-        <svg class="w-5 h-5" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 20 20">
-            <path d="M10 .5a9.5 9.5 0 1 0 9.5 9.5A9.51 9.51 0 0 0 10 .5ZM10 15a1 1 0 1 1 0-2 1 1 0 0 1 0 2Zm1-4a1 1 0 0 1-2 0V6a1 1 0 0 1 2 0v5Z"/>
-        </svg>
-        <span class="sr-only">{{ $t('Warning icon') }}</span>
+        <IconExclamationCircleSolid class="w-5 h-5" aria-hidden="true" />
+
     </div>
     <div v-else class="inline-flex items-center justify-center flex-shrink-0 w-8 h-8 text-green-500 bg-green-100 rounded-lg dark:bg-green-800 dark:text-green-200">
-        <svg class="w-5 h-5" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 20 20">
-            <path d="M10 .5a9.5 9.5 0 1 0 9.5 9.5A9.51 9.51 0 0 0 10 .5Zm3.707 8.207-4 4a1 1 0 0 1-1.414 0l-2-2a1 1 0 0 1 1.414-1.414L9 10.586l3.293-3.293a1 1 0 0 1 1.414 1.414Z"/>
-        </svg>
-        <span class="sr-only">{{ $t('Check icon') }}</span>
+        <IconCheckCircleSolid class="w-5 h-5" aria-hidden="true" />
     </div>
 
     <div class="ms-3 text-sm font-normal max-w-xs pr-2" v-if="toast.messageHtml" v-html="toast.messageHtml"></div>
@@ -47,6 +37,7 @@
             <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="m1 1 6 6m0 0 6 6M7 7l6-6M7 7l-6 6"/>
         </svg>
     </button>
+    <!-- <div class="h-full ml-3 w-1 rounded-r-lg" :class="toast.variant == 'info' ? 'bg-lightPrimary dark:bg-darkPrimary' : toast.variant == 'danger' ? 'bg-red-500 dark:bg-red-800' : toast.variant == 'warning' ? 'bg-orange-500 dark:bg-orange-700' : 'bg-green-500 dark:bg-green-800'"></div> -->
 </div>
 
 
@@ -55,6 +46,8 @@
 <script setup lang="ts">
 import { onMounted } from 'vue';
 import { useToastStore } from '@/stores/toast';
+import { IconInfoCircleSolid, IconCloseCircleSolid, IconExclamationCircleSolid, IconCheckCircleSolid } from '@iconify-prerendered/vue-flowbite';
+
 const toastStore = useToastStore();
 const emit = defineEmits(['close']);
 const props = defineProps<{
diff --git a/adminforth/spa/src/views/ListView.vue b/adminforth/spa/src/views/ListView.vue
@@ -100,7 +100,7 @@
       </button>
 
       <ThreeDotsMenu 
-        v-if="!coreStore.isResourceFetching && !initInProcess"
+        v-if="!coreStore.isResourceFetching"
         :threeDotsDropdownItems="(coreStore.resourceOptions?.pageInjections?.list?.threeDotsDropdownItems as [])"
         :bulkActions="coreStore.resource?.options?.bulkActions"
         :checkboxes="checkboxes"
@@ -412,7 +412,7 @@ async function init() {
     return {
       field,
       operator,
-      value: JSON.parse(decodeURIComponent(route.query[k] as string))
+      value: JSON.parse((route.query[k] as string))
     }
   });
   if (filters.length) {
@@ -494,7 +494,7 @@ watch(() => filtersStore.filters, async (to, from) => {
   const currentQ = currentQuery();
   filtersStore.filters.forEach(f => {
     if (f.value !== undefined && f.value !== null && f.value !== '') {
-      query[`filter__${f.field}__${f.operator}`] = encodeURIComponent(JSON.stringify(f.value));
+      query[`filter__${f.field}__${f.operator}`] = (JSON.stringify(f.value));
     }
   });
   // set every key in currentQ which starts with filter_ to undefined if it is not in query
diff --git a/live-demo/app/package-lock.json b/live-demo/app/package-lock.json
diff --git a/live-demo/app/package.json b/live-demo/app/package.json
@@ -32,7 +32,7 @@
     "@adminforth/two-factors-auth": "^1.1.2",
     "@adminforth/upload": "^2.3.6",
     "@prisma/client": "^6.6.0",
-    "adminforth": "^2.4.0-next.247",
+    "adminforth": "^2.4.0-next.262",
     "better-sqlite3": "^10.0.0",
     "express": "^4.19.2"
   },
