adminforth 2.4.0-next.31 → 2.4.0-next.310

package/dist/spa/src/views/ListView.vue

@@ -3,106 +3,118 @@
     <Teleport to="body">
       <Filters
         :columns="coreStore.resource?.columns"
-        :columnsMinMax="columnsMinMax" :show="filtersShow"
+        :columnsMinMax="columnsMinMax" 
+        :show="filtersShow"
         @hide="filtersShow = false"
       />
     </Teleport>
 
     <component 
+      v-if="!coreStore.isResourceFetching && !initInProcess"
       v-for="c in coreStore?.resourceOptions?.pageInjections?.list?.beforeBreadcrumbs || []"
       :is="getCustomComponent(c)"
-      :meta="c.meta"
+      :meta="(c as AdminForthComponentDeclarationFull).meta"
       :resource="coreStore.resource"
       :adminUser="coreStore.adminUser"
     />
 
     <BreadcrumbsWithButtons>
+      <component 
+        v-if="!coreStore.isResourceFetching && !initInProcess"
+        v-for="c in coreStore?.resourceOptions?.pageInjections?.list?.beforeActionButtons || []"
+        :is="getCustomComponent(c)"
+        :meta="(c as AdminForthComponentDeclarationFull).meta"
+        :resource="coreStore.resource"
+        :adminUser="coreStore.adminUser"
+      />
       <button
         @click="()=>{checkboxes = []}"
         v-if="checkboxes.length"
         data-tooltip-target="tooltip-remove-all"
-        class="flex gap-1  items-center py-1 px-3 me-2 text-sm font-medium text-gray-900 focus:outline-none bg-white rounded border border-gray-300 hover:bg-gray-100 hover:text-lightPrimary focus:z-10 focus:ring-4 focus:ring-gray-100 dark:focus:ring-gray-700 dark:bg-darkListTable dark:text-gray-400 dark:border-gray-600 dark:hover:text-white dark:hover:bg-gray-700 rounded-default"
+        class="flex gap-1  items-center py-1 px-3 me-2 text-sm font-medium text-lightListViewButtonText focus:outline-none bg-lightListViewButtonBackground rounded border border-lightListViewButtonBorder hover:bg-lightListViewButtonBackgroundHover hover:text-lightListViewButtonTextHover focus:z-10 focus:ring-4 focus:ring-lightListViewButtonFocusRing dark:focus:ring-darkListViewButtonFocusRing dark:bg-darkListViewButtonBackground dark:text-darkListViewButtonText dark:border-darkListViewButtonBorder dark:hover:text-darkListViewButtonTextHover dark:hover:bg-darkListViewButtonBackgroundHover rounded-default"
       >
-        <IconBanOutline class="w-5 h-5 "/>
-
-        <div id="tooltip-remove-all" role="tooltip"
-             class="absolute z-10 invisible inline-block px-3 py-2 text-sm font-medium text-white transition-opacity duration-300 bg-gray-900 rounded-lg shadow-sm opacity-0 tooltip dark:bg-gray-700">
-          {{ $t('Remove selection') }}
-          <div class="tooltip-arrow" data-popper-arrow></div>
-        </div>
+          <Tooltip>
+            <IconBanOutline class="w-5 h-5 "/>
+              <template #tooltip >
+                  Remove selection
+              </template>
+          </Tooltip>
       </button>
 
-      <button
-        v-if="checkboxes.length" 
+           <div 
+        v-if="checkboxes.length"
         v-for="(action,i) in coreStore.resource?.options?.bulkActions" 
-        :key="action.id"
-        @click="startBulkAction(action.id)"
-        class="flex gap-1 items-center py-1 px-3 text-sm font-medium text-gray-900 focus:outline-none bg-white rounded-default border border-gray-300 hover:bg-gray-100 hover:text-lightPrimary focus:z-10 focus:ring-4 focus:ring-gray-100 dark:focus:ring-gray-700 dark:bg-gray-800 dark:text-gray-400 dark:border-gray-600 dark:hover:text-white dark:hover:bg-gray-700"
-        :class="{
-          'bg-red-100 text-red-800 border-red-400 dark:bg-red-700 dark:text-red-400 dark:border-red-400':action.state==='danger',
-          'bg-green-100 text-green-800 border-green-400 dark:bg-green-700 dark:text-green-400 dark:border-green-400':action.state==='success',
-          'bg-lightPrimaryOpacity text-lightPrimary border-blue-400 dark:bg-blue-700 dark:text-blue-400 dark:border-blue-400':action.state==='active',
-        }"
       >
-        <component
-          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>
-        <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})` }}
-        <div v-if="action.badge" class="text-white bg-gradient-to-r from-purple-500 via-purple-600 to-purple-700 hover:bg-gradient-to-br focus:ring-4 focus:outline-none focus:ring-purple-300 dark:focus:ring-purple-800 
-          font-medium rounded-sm text-xs px-1 ml-1 text-center ">
-          {{ action.badge }}            
-        </div>
-      </button>
+        <button
+          v-if="!action.showInThreeDotsDropdown"
+          :key="action.id"
+          @click="startBulkAction(action.id!)"
+          class="flex gap-1 items-center py-1 px-3 text-sm font-medium text-lightListViewButtonText focus:outline-none bg-lightListViewButtonBackground rounded-default border border-lightListViewButtonBorder hover:bg-lightListViewButtonBackgroundHover hover:text-lightListViewButtonTextHover focus:z-10 focus:ring-4 focus:ring-lightListViewButtonFocusRing dark:focus:ring-darkListViewButtonFocusRing dark:bg-darkListViewButtonBackground dark:text-darkListViewButtonText dark:border-darkListViewButtonBorder dark:hover:text-darkListViewButtonTextHover dark:hover:bg-darkListViewButtonBackgroundHover"
+          :class="action.buttonCustomCssClass || ''"
+        >
+          <component
+            v-if="action.icon && !bulkActionLoadingStates[action.id!]"
+            :is="getIcon(action.icon)"
+            class="w-5 h-5 transition duration-75 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 text-gray-200 dark:text-gray-500 fill-gray-500 dark:fill-gray-300" 
+              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})` }}
+          <div v-if="action.badge" class="text-white bg-gradient-to-r from-purple-500 via-purple-600 to-purple-700 hover:bg-gradient-to-br focus:ring-4 focus:outline-none focus:ring-purple-300 dark:focus:ring-purple-800 
+            font-medium rounded-sm text-xs px-1 ml-1 text-center ">
+            {{ action.badge }}            
+          </div>
+        </button>
+      </div>
 
       <RouterLink v-if="coreStore.resource?.options?.allowedActions?.create"
         :to="{ name: 'resource-create', params: { resourceId: $route.params.resourceId } }"
-        class="af-create-button flex items-center py-1 px-3 text-sm font-medium text-gray-900 focus:outline-none bg-white rounded border border-gray-300 hover:bg-gray-100 hover:text-lightPrimary focus:z-10 focus:ring-4 focus:ring-gray-100 dark:focus:ring-gray-700 dark:bg-gray-800 dark:text-gray-400 dark:border-gray-600 dark:hover:text-white dark:hover:bg-gray-700 rounded-default"
+        class="af-create-button flex items-center py-1 px-3 text-sm font-medium text-lightListViewButtonText focus:outline-none bg-lightListViewButtonBackground rounded border border-lightListViewButtonBorder hover:bg-lightListViewButtonBackgroundHover hover:text-lightListViewButtonTextHover focus:z-10 focus:ring-4 focus:ring-lightListViewButtonFocusRing dark:focus:ring-darkListViewButtonFocusRing dark:bg-darkListViewButtonBackground dark:text-darkListViewButtonText dark:border-darkListViewButtonBorder dark:hover:text-darkListViewButtonTextHover dark:hover:bg-darkListViewButtonBackgroundHover rounded-default gap-1"
       >
-        <IconPlusOutline class="w-4 h-4 me-2"/>
+        <IconPlusOutline class="w-4 h-4"/>
         {{ $t('Create') }}
       </RouterLink>
 
       <button
-        class="af-filter-button flex gap-1 items-center py-1 px-3 me-2 text-sm font-medium text-gray-900 focus:outline-none bg-white rounded border border-gray-300 hover:bg-gray-100 hover:text-lightPrimary focus:z-10 focus:ring-4 focus:ring-gray-100 dark:focus:ring-gray-700 dark:bg-gray-800 dark:text-gray-400 dark:border-gray-600 dark:hover:text-white dark:hover:bg-gray-700 rounded-default"
+        class="af-filter-button flex gap-1 items-center py-1 px-3 me-2 text-sm font-medium text-lightListViewButtonText focus:outline-none bg-lightListViewButtonBackground rounded border border-lightListViewButtonBorder hover:bg-lightListViewButtonBackgroundHover hover:text-lightListViewButtonTextHover focus:z-10 focus:ring-4 focus:ring-lightListViewButtonFocusRing dark:focus:ring-darkListViewButtonFocusRing dark:bg-darkListViewButtonBackground dark:text-darkListViewButtonText dark:border-darkListViewButtonBorder dark:hover:text-darkListViewButtonTextHover dark:hover:bg-darkListViewButtonBackgroundHover rounded-default"
         @click="()=>{filtersShow = !filtersShow}"
         v-if="coreStore.resource?.options?.allowedActions?.filter"
       >
-        <IconFilterOutline class="w-4 h-4 me-2"/>
+        <IconFilterOutline class="w-4 h-4"/>
         {{ $t('Filter') }}
         <span
           class="bg-red-100 text-red-800 text-xs font-medium me-2 px-2.5 py-0.5 rounded dark:bg-gray-700 dark:text-red-400 border border-red-400"
-          v-if="filtersStore.filters.length">
-            {{ filtersStore.filters.length }}
+          v-if="filtersStore.visibleFiltersCount">
+            {{ filtersStore.visibleFiltersCount }}
         </span>
       </button>
 
       <ThreeDotsMenu 
-        :threeDotsDropdownItems="coreStore.resourceOptions?.pageInjections?.list?.threeDotsDropdownItems"
-      ></ThreeDotsMenu>
+        v-if="!coreStore.isResourceFetching"
+        :threeDotsDropdownItems="(coreStore.resourceOptions?.pageInjections?.list?.threeDotsDropdownItems as [])"
+        :bulkActions="coreStore.resource?.options?.bulkActions"
+        :checkboxes="checkboxes"
+        @startBulkAction="startBulkAction"
+        :updateList="getList"
+        :clearCheckboxes="clearCheckboxes"
+        ></ThreeDotsMenu>
     </BreadcrumbsWithButtons>
 
     <component 
+      v-if="!coreStore.isResourceFetching && !initInProcess"
       v-for="c in coreStore?.resourceOptions?.pageInjections?.list?.afterBreadcrumbs || []"
       :is="getCustomComponent(c)"
-      :meta="c.meta"
+      :meta="(c as AdminForthComponentDeclarationFull).meta"
       :resource="coreStore.resource"
       :adminUser="coreStore.adminUser"
     />
@@ -119,12 +131,23 @@
       :pageSize="pageSize"
       :totalRows="totalRows"
       :checkboxes="checkboxes"
-      :customActionsInjection="coreStore.resourceOptions?.pageInjections?.list?.customActionIcons"
-      :tableBodyStartInjection="coreStore.resourceOptions?.pageInjections?.list?.tableBodyStart"
+      :customActionsInjection="Array.isArray(coreStore.resourceOptions?.pageInjections?.list?.customActionIcons)
+        ? coreStore.resourceOptions.pageInjections.list.customActionIcons
+        : coreStore.resourceOptions?.pageInjections?.list?.customActionIcons
+          ? [coreStore.resourceOptions.pageInjections.list.customActionIcons]
+          : []
+      "
+      :tableBodyStartInjection="Array.isArray(coreStore.resourceOptions?.pageInjections?.list?.tableBodyStart)
+        ? coreStore.resourceOptions.pageInjections.list.tableBodyStart
+        : coreStore.resourceOptions?.pageInjections?.list?.tableBodyStart
+          ? [coreStore.resourceOptions.pageInjections.list.tableBodyStart]
+          : []
+      "
       :container-height="1100"
       :item-height="52.5"
       :buffer-size="listBufferSize"
     />
+
     <ResourceListTable
       v-else
       :resource="coreStore.resource"
@@ -138,14 +161,24 @@
       :pageSize="pageSize"
       :totalRows="totalRows"
       :checkboxes="checkboxes"
-      :customActionsInjection="coreStore.resourceOptions?.pageInjections?.list?.customActionIcons"
-      :tableBodyStartInjection="coreStore.resourceOptions?.pageInjections?.list?.tableBodyStart"
+      :customActionsInjection="Array.isArray(coreStore.resourceOptions?.pageInjections?.list?.customActionIcons)
+        ? coreStore.resourceOptions.pageInjections.list.customActionIcons
+        : coreStore.resourceOptions?.pageInjections?.list?.customActionIcons
+          ? [coreStore.resourceOptions.pageInjections.list.customActionIcons]
+          : []
+      "
+      :tableBodyStartInjection="Array.isArray(coreStore.resourceOptions?.pageInjections?.list?.tableBodyStart)
+        ? coreStore.resourceOptions.pageInjections.list.tableBodyStart
+        : coreStore.resourceOptions?.pageInjections?.list?.tableBodyStart
+          ? [coreStore.resourceOptions.pageInjections.list.tableBodyStart]
+          : []
+      "
     />
 
     <component 
       v-for="c in coreStore?.resourceOptions?.pageInjections?.list?.bottom || []"
       :is="getCustomComponent(c)"
-      :meta="c.meta"
+      :meta="(c as AdminForthComponentDeclarationFull).meta"
       :resource="coreStore.resource"
       :adminUser="coreStore.adminUser"
     />
@@ -160,11 +193,13 @@ import ResourceListTable from '@/components/ResourceListTable.vue';
 import { useCoreStore } from '@/stores/core';
 import { useFiltersStore } from '@/stores/filters';
 import { callAdminForthApi, currentQuery, getIcon, setQuery } from '@/utils';
-import { computed, onMounted, ref, watch, nextTick, type Ref } from 'vue';
+import { computed, onMounted, onUnmounted, ref, watch, nextTick, type Ref } from 'vue';
 import { useRoute } from 'vue-router';
 import { showErrorTost } from '@/composables/useFrontendApi'
 import { getCustomComponent, initThreeDotsDropdown } from '@/utils';
 import ThreeDotsMenu from '@/components/ThreeDotsMenu.vue';
+import { Tooltip } from '@/afcl'
+import type { AdminForthComponentDeclarationFull } from '@/types/Common';
 
 
 import {
@@ -185,7 +220,7 @@ const route = useRoute();
 
 const page = ref(1);
 const columnsMinMax = ref({});
-const sort = ref([]);
+const sort = ref();
 
 watch(() => sort, async (to, from) => {
   // in store sort might be needed for plugins
@@ -229,11 +264,11 @@ async function getList() {
     totalRows.value = 0;
     return {error: data.error};
   }
-  rows.value = data.data?.map(row => {
-    if (coreStore.resource.columns.find(c => c.primaryKey).foreignResource) {
-      row._primaryKeyValue = row[coreStore.resource.columns.find(c => c.primaryKey).name].pk;
-    } else {
-      row._primaryKeyValue = row[coreStore.resource.columns.find(c => c.primaryKey).name];
+  rows.value = data.data?.map((row: any) => {
+    if (coreStore.resource?.columns?.find(c => c.primaryKey)?.foreignResource) {
+      row._primaryKeyValue = row[coreStore.resource.columns.find(c => c.primaryKey)!.name].pk;
+    } else if (coreStore.resource) {
+      row._primaryKeyValue = row[coreStore.resource.columns.find(c => c.primaryKey)!.name];
     }
     return row;
   });
@@ -245,6 +280,10 @@ async function getList() {
   return {}
 }
 
+function clearCheckboxes() {
+  checkboxes.value = [];
+}
+
 async function refreshExistingList(pk?: any) {
   const currentData = rows.value;
   if (!currentData) {
@@ -297,9 +336,9 @@ async function refreshExistingList(pk?: any) {
 }
 
 
-async function startBulkAction(actionId) {
-  const action = coreStore.resource.options.bulkActions.find(a => a.id === actionId);
-  if (action.confirm) {
+async function startBulkAction(actionId: string) {
+  const action = coreStore.resource?.options?.bulkActions?.find(a => a.id === actionId);
+  if (action?.confirm) {
     const confirmed = await adminforth.confirm({
       message: action.confirm,
     });
@@ -339,10 +378,10 @@ async function startBulkAction(actionId) {
 
 
 class SortQuerySerializer {
-    static serialize(sort) {
+    static serialize(sort: {field: string, direction: 'asc' | 'desc'}[]) {
         return sort.map(s => `${s.field}__${s.direction}`).join(',');
     }
-    static deserialize(str) {
+    static deserialize(str: string) {
         return str.split(',').map(s => {
             const [field, direction] = s.split('__');
             return { field, direction };
@@ -352,10 +391,17 @@ class SortQuerySerializer {
 
 let listAutorefresher: any = null;
 
+function clearAutoRefresher() {
+  if (listAutorefresher) {
+    clearInterval(listAutorefresher);
+    listAutorefresher = null;
+  }
+}
+
 async function init() {
   
   await coreStore.fetchResourceFull({
-    resourceId: route.params.resourceId
+    resourceId: route.params.resourceId as string
   });
   isPageLoaded.value = true;
   // !!! clear filters should be in same tick with sort assignment so that watch can catch it as one change
@@ -366,7 +412,7 @@ async function init() {
     return {
       field,
       operator,
-      value: JSON.parse(decodeURIComponent(route.query[k]))
+      value: JSON.parse((route.query[k] as string))
     }
   });
   if (filters.length) {
@@ -376,8 +422,8 @@ async function init() {
   }
 
   if (route.query.sort) {
-    sort.value = SortQuerySerializer.deserialize(route.query.sort);
-  } else if (coreStore.resource.options?.defaultSort) {
+    sort.value = SortQuerySerializer.deserialize(route.query.sort as string);
+  } else if (coreStore?.resource?.options?.defaultSort) {
     sort.value = [{
         field: coreStore.resource.options.defaultSort.columnName,
         direction: coreStore.resource.options.defaultSort.direction
@@ -387,7 +433,7 @@ async function init() {
   }
   // page init should be also in same tick 
   if (route.query.page) {
-    page.value = parseInt(route.query.page);
+    page.value = parseInt(route.query.page as string);
   }
 
   // getList(); - Not needed here, watch will trigger it
@@ -399,10 +445,7 @@ async function init() {
     }
   });
 
-  if (listAutorefresher) {
-    clearInterval(listAutorefresher);
-    listAutorefresher = null;
-  }
+  clearAutoRefresher();
   if (coreStore.resource!.options?.listRowsAutoRefreshSeconds) {
     listAutorefresher = setInterval(async () => {
       await adminforth.list.silentRefresh();
@@ -416,8 +459,18 @@ watch([page, sort, () => filtersStore.filters], async () => {
 }, { deep: true });
 
 adminforth.list.refresh = async () => {
-  return await getList();
-}
+  const result = await getList();
+
+  if (!result) {
+    return {};
+  }
+
+  if ('error' in result && result.error != null) {
+    return { error: String(result.error) };
+  }
+
+  return {};
+};
 
 adminforth.list.silentRefresh = async () => {
   return await refreshExistingList();
@@ -437,11 +490,11 @@ watch(() => filtersStore.filters, async (to, from) => {
   page.value = 1;
   checkboxes.value = []; // TODO: not sure absolutely needed here
   // update query param for each filter as filter_<column_name>=value
-  const query = {};
+  const query:  Record<string, string | undefined> = {};
   const currentQ = currentQuery();
   filtersStore.filters.forEach(f => {
-    if (f.value) {
-      query[`filter__${f.field}__${f.operator}`] = encodeURIComponent(JSON.stringify(f.value));
+    if (f.value !== undefined && f.value !== null && 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
@@ -460,6 +513,10 @@ onMounted(async () => {
   initInProcess = false;
 });
 
+onUnmounted(() => {
+  clearAutoRefresher();
+});
+
 watch([page], async () => {
   setQuery({ page: page.value });
 });

package/dist/spa/src/views/LoginView.vue

@@ -1,10 +1,10 @@
 <template>
-  <div class="relative flex items-center justify-center min-h-screen bg-gray-100 dark:bg-gray-800 relative w-screen h-screen"
+  <div class="relative flex items-center justify-center min-h-screen bg-lightHtml dark:bg-darkHtml w-screen h-screen"
     :style="coreStore.config?.loginBackgroundImage && backgroundPosition === 'over' ? {
       'background-image': 'url(' + loadFile(coreStore.config?.loginBackgroundImage) + ')',
       'background-size': 'cover',
       'background-position': 'center',
-      'background-blend-mode': 'darken'
+      'background-blend-mode': coreStore.config?.removeBackgroundBlendMode ? 'normal' : 'darken'
     }: {}"
   >
     
@@ -27,7 +27,7 @@
       overflow-x-hidden z-50 min-w-[350px]  justify-center items-center md:inset-0 h-[calc(100%-1rem)] max-h-full">
         <div class="relative p-4 w-full max-h-full max-w-[400px]">
             <!-- Modal content -->
-            <div class="af-login-modal-content relative bg-white rounded-lg shadow dark:bg-gray-700 dark:shadow-black" >
+            <div class="af-login-popup af-login-modal-content relative bg-lightLoginViewBackground rounded-lg shadow dark:bg-darkLoginViewBackground dark:shadow-black" :class=" { 'rounded-b-none  overflow-hidden': error } ">
                 <!-- Modal header -->
                 <div class="af-login-modal-header flex items-center justify-between flex-col p-4 md:p-5 border-b rounded-t dark:border-gray-600">
 
@@ -39,7 +39,7 @@
                         :meta="c.meta"
                       />
                     </template>
-                    <h3 v-else class="text-xl font-semibold text-gray-900 dark:text-white">
+                    <h3 v-else class="text-xl font-semibold text-lightLoginViewText dark:text-darkLoginViewTextColor">
                       {{ $t('Sign in to') }} {{ coreStore.config?.brandName }}
                     </h3>
                 </div>
@@ -47,7 +47,7 @@
                 <div class="af-login-modal-body p-4 md:p-5">
                     <form class="space-y-4" @submit.prevent>
                         <div>
-                            <label for="username" class="block mb-2 text-sm font-medium text-gray-900 dark:text-white">{{ $t('Your') }} {{ coreStore.config?.usernameFieldName?.toLowerCase() }}</label>
+                            <label for="username" class="block mb-2 text-sm font-medium text-lightLoginViewText dark:text-darkLoginViewTextColor">{{ $t('Your') }} {{ coreStore.config?.usernameFieldName?.toLowerCase() }}</label>
                             <Input 
                               v-model="username"
                               autocomplete="username"  
@@ -55,22 +55,20 @@
                               name="username" 
                               id="username" 
                               ref="usernameInput"
-                              oninput="setCustomValidity('')"
                               @keydown.enter="passwordInput.focus()"
                               class="w-full"
                               placeholder="name@company.com" required />
                         </div>
                         <div class="">
-                            <label for="password" class="block mb-2 text-sm font-medium text-gray-900 dark:text-white">{{ $t('Your password') }}</label>
+                            <label for="password" class="block mb-2 text-sm font-medium text-lightLoginViewText dark:text-darkLoginViewTextColor">{{ $t('Your password') }}</label>
                             <Input 
                               v-model="password"
                               ref="passwordInput"
                               autocomplete="current-password"
-                              oninput="setCustomValidity('')"
                               @keydown.enter="login"
                               :type="!showPw ? 'password': 'text'" name="password" id="password" placeholder="••••••••" class="w-full" required>
                               <template #rightIcon>
-                                <button type="button" @click="showPw = !showPw" class="text-gray-400 dark:text-gray-300">
+                                <button type="button" @click="showPw = !showPw" class="text-lightLoginViewSubTextColor dark:text-darkLoginViewSubTextColor">
                                   <IconEyeSolid class="w-5 h-5" v-if="!showPw" />
                                   <IconEyeSlashSolid class="w-5 h-5" v-else />
                                 </button>
@@ -92,20 +90,11 @@
                           v-for="c in coreStore?.config?.loginPageInjections?.underInputs || []"
                           :is="getCustomComponent(c)"
                           :meta="c.meta"
+                          @update:disableLoginButton="setDisableLoginButton($event)"
                         />
-
-                        <div v-if="error" class="af-login-modal-error flex items-center p-4 mb-4 text-sm text-red-800 rounded-lg bg-red-50 dark:bg-gray-800 dark:text-red-400" role="alert">
-                          <svg class="flex-shrink-0 inline w-4 h-4 me-3" 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 .5ZM9.5 4a1.5 1.5 0 1 1 0 3 1.5 1.5 0 0 1 0-3ZM12 15H8a1 1 0 0 1 0-2h1v-3H8a1 1 0 0 1 0-2h2a1 1 0 0 1 1 1v4h1a1 1 0 0 1 0 2Z"/>
-                          </svg>
-                          <span class="sr-only">{{ $t('Info') }}</span>
-                          <div>
-                            {{ error }}
-                          </div>
-                        </div>
-
+                        
                         <div v-if="coreStore.config?.loginPromptHTML"
-                          class="flex items-center p-4 mb-4 text-sm text-gray-800 rounded-lg bg-gray-50 dark:bg-gray-800 dark:text-gray-400" role="alert"
+                          class="flex items-center p-4 mb-4 text-sm text-lightLoginViewPromptText rounded-lg bg-lightLoginViewPromptBackground dark:bg-darkLoginViewPromptBackground dark:text-darkLoginViewPromptText" role="alert"
                         >
                           <svg class="flex-shrink-0 inline w-4 h-4 me-3" 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 .5ZM9.5 4a1.5 1.5 0 1 1 0 3 1.5 1.5 0 0 1 0-3ZM12 15H8a1 1 0 0 1 0-2h1v-3H8a1 1 0 0 1 0-2h2a1 1 0 0 1 1 1v4h1a1 1 0 0 1 0 2Z"/>
@@ -113,13 +102,19 @@
                           <span class="sr-only">{{ $t('Info') }}</span>
                           <div v-html="coreStore.config?.loginPromptHTML"></div>
                         </div>
-                        <Button @click="login" :loader="inProgress" :disabled="inProgress" class="w-full">
+                        <Button @click="login" :loader="inProgress" :disabled="inProgress || disableLoginButton" class="w-full">
                           {{ $t('Login to your account') }}
                         </Button>
+                        <component 
+                          v-for="c in coreStore?.config?.loginPageInjections?.underLoginButton || []"
+                          :is="getCustomComponent(c)"
+                          :meta="c.meta"
+                          @update:disableLoginButton="setDisableLoginButton($event)"
+                        />
                     </form>
-
                 </div>
             </div>
+            <ErrorMessage v-if="error" :error="error" class="absolute left-4 right-4 rounded-t-none mb-0 shadow px-9" />
         </div>
     </div> 
 
@@ -127,7 +122,7 @@
 </template>
 
 
-<script setup>
+<script setup lang="ts">
 
 import { getCustomComponent } from '@/utils';
 import { onBeforeMount, onMounted, ref, computed } from 'vue';
@@ -138,6 +133,7 @@ import { callAdminForthApi, loadFile } from '@/utils';
 import { useRoute, useRouter } from 'vue-router';
 import { Button, Checkbox, Input } from '@/afcl';
 import { useI18n } from 'vue-i18n';
+import ErrorMessage from '@/components/ErrorMessage.vue';
 
 const { t } = useI18n();
 
@@ -150,18 +146,19 @@ const password = ref('');
 const route = useRoute();
 const router = useRouter();
 const inProgress = ref(false);
-
 const coreStore = useCoreStore();
 const user = useUserStore();
 
 const showPw = ref(false);
 
 const error = ref(null);
+const disableLoginButton = ref(false);
 
 const backgroundPosition = computed(() => {
   return coreStore.config?.loginBackgroundPosition || '1/2';
 });
 
+
 onBeforeMount(() => {
   if (localStorage.getItem('isAuthorized') === 'true') {
     // if route has next param, redirect
@@ -175,6 +172,7 @@ onBeforeMount(() => {
 })
 
 onMounted(async () => {
+  coreStore.getLoginFormConfig();
     if (coreStore.config?.demoCredentials) {
       const [demoUsername, demoPassword] = coreStore.config.demoCredentials.split(':');
       username.value = demoUsername;
@@ -185,16 +183,6 @@ onMounted(async () => {
 
 
 async function login() {
-  
-  if (!username.value) {
-    usernameInput.value.setCustomValidity(t('Please fill out this field.'));
-    return;
-  }
-  if (!password.value) {
-    passwordInput.value.setCustomValidity(t('Please fill out this field.'));
-    return;
-  }
-
   if (inProgress.value) {
     return;
   }
@@ -220,5 +208,8 @@ async function login() {
 
 }
 
+function setDisableLoginButton(value: boolean) {
+  disableLoginButton.value = value;
+}
 
 </script>

package/dist/spa/src/views/ResourceParent.vue

@@ -1,5 +1,5 @@
 <template>
-  <div :key="`${$route?.params.resourceId}---${$route?.params.primaryKey}`" class="p-4 flex" 
+  <div :key="`${$route?.params.resourceId}---${$route?.params.primaryKey}`" class="af-resource-parent p-4 flex" 
     :class="limitHeightToPage ? 'h-[calc(100dvh-3.5rem)]': undefined"
   >
     <RouterView/>
@@ -33,7 +33,7 @@ const limitHeightToPage = computed(() => {
   }
   const listPageInjects = coreStore.resource.options.pageInjections.list;
   
-  for (const pi of [listPageInjects.beforeBreadcrumbs, listPageInjects.afterBreadcrumbs, listPageInjects.bottom]) {
+  for (const pi of [listPageInjects.beforeBreadcrumbs, listPageInjects.beforeActionButtons, listPageInjects.afterBreadcrumbs, listPageInjects.bottom]) {
     if (pi) {
       for (const piItem of pi) {
         if (!piItem.meta?.thinEnoughToShrinkTable) {