adminforth 2.4.0-next.13 → 2.4.0-next.130

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,19 +27,19 @@
       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-modal-content relative bg-lightLoginViewBackground rounded-lg shadow dark:bg-darkLoginViewBackground dark:shadow-black" >
                 <!-- Modal header -->
-                <div class="af-login-modal-header flex items-center justify-between p-4 md:p-5 border-b rounded-t dark:border-gray-600">
+                <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">
 
-                    <div v-if="coreStore?.config?.loginPageInjections?.panelHeader.length > 0">
+                    <template v-if="coreStore?.config?.loginPageInjections?.panelHeader.length > 0">
                       <component 
                         v-for="(c, index) in coreStore?.config?.loginPageInjections?.panelHeader || []"
                         :key="index"
                         :is="getCustomComponent(c)"
                         :meta="c.meta"
                       />
-                    </div>
-                    <h3 v-else class="text-xl font-semibold text-gray-900 dark:text-white">
+                    </template>
+                    <h3 v-else class="text-xl font-semibold text-lightLoginViewText dark:text-darkLoginViewTextColor">
                       {{ $t('Sign in to') }} {{ coreStore.config?.brandName }}
                     </h3>
                 </div>
@@ -47,28 +47,28 @@
                 <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"  
                               type="username" 
                               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>
@@ -101,15 +101,15 @@
                             {{ 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"
+                        
+                        <div v-if="loginPromptHTML"
+                          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"/>
                           </svg>
                           <span class="sr-only">{{ $t('Info') }}</span>
-                          <div v-html="coreStore.config?.loginPromptHTML"></div>
+                          <div v-html="loginPromptHTML"></div>
                         </div>
                         <Button @click="login" :loader="inProgress" :disabled="inProgress" class="w-full">
                           {{ $t('Login to your account') }}
@@ -142,11 +142,13 @@ const { t } = useI18n();
 const passwordInput = ref(null);
 const usernameInput = ref(null);
 const rememberMeValue= ref(false);
+const username = ref('');
+const password = ref('');
 
 const route = useRoute();
 const router = useRouter();
 const inProgress = ref(false);
-
+const loginPromptHTML = ref()
 const coreStore = useCoreStore();
 const user = useUserStore();
 
@@ -158,6 +160,15 @@ const backgroundPosition = computed(() => {
   return coreStore.config?.loginBackgroundPosition || '1/2';
 });
 
+
+async function getLoginFormConfig() {
+  const response = await callAdminForthApi({
+    path: '/get_login_form_config',
+    method: 'GET',
+  });
+  loginPromptHTML.value = response.loginPromptHTML;
+}
+
 onBeforeMount(() => {
   if (localStorage.getItem('isAuthorized') === 'true') {
     // if route has next param, redirect
@@ -171,29 +182,17 @@ onBeforeMount(() => {
 })
 
 onMounted(async () => {
+  getLoginFormConfig();
     if (coreStore.config?.demoCredentials) {
-      const [username, password] = coreStore.config.demoCredentials.split(':');
-      usernameInput.value.value = username;
-      passwordInput.value.value = password;
+      const [demoUsername, demoPassword] = coreStore.config.demoCredentials.split(':');
+      username.value = demoUsername;
+      password.value = demoPassword;
     }
     usernameInput.value.focus();
 });
 
 
 async function login() {
-  
-  const username = usernameInput.value.value;
-  const password = passwordInput.value.value;
-
-  if (!username) {
-    usernameInput.value.setCustomValidity(t('Please fill out this field.'));
-    return;
-  }
-  if (!password) {
-    passwordInput.value.setCustomValidity(t('Please fill out this field.'));
-    return;
-  }
-
   if (inProgress.value) {
     return;
   }
@@ -202,8 +201,8 @@ async function login() {
     path: '/login',
     method: 'POST',
     body: {
-      username,
-      password,
+      username: username.value,
+      password: password.value,
       rememberMe: rememberMeValue.value,
     }
   });

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/>

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

@@ -4,7 +4,7 @@
       v-if="!loading"
       v-for="c in coreStore?.resourceOptions?.pageInjections?.show?.beforeBreadcrumbs || []"
       :is="getCustomComponent(c)"
-      :meta="c.meta"
+      :meta="(c as AdminForthComponentDeclarationFull).meta"
       :record="coreStore.record"
       :resource="coreStore.resource"
       :adminUser="coreStore.adminUser"
@@ -15,7 +15,7 @@
           v-for="action in coreStore.resource.options.actions.filter(a => a.showIn?.showButton)" 
           :key="action.id"
           @click="startCustomAction(action.id)"
-          :disabled="actionLoadingStates[action.id]"
+          :disabled="actionLoadingStates[action.id!]"
           class="flex 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"
         >
           <component 
@@ -28,28 +28,28 @@
       </template>
       <RouterLink v-if="coreStore.resource?.options?.allowedActions?.create"
         :to="{ name: 'resource-create', params: { resourceId: $route.params.resourceId } }"
-        class="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-add-new-button flex items-center py-1 px-3 text-sm font-medium text-lightShowViewButtonText focus:outline-none bg-lightShowViewButtonBackground rounded border border-lightShowViewButtonBorder hover:bg-lightShowViewButtonBackgroundHover hover:text-lightShowViewButtonTextHover focus:z-10 focus:ring-4 focus:ring-lightShowViewButtonFocusRing dark:focus:ring-darkShowViewButtonFocusRing dark:bg-darkShowViewButtonBackground dark:text-darkShowViewButtonText dark:border-darkShowViewButtonBorder dark:hover:text-darkShowViewButtonTextHover dark:hover:bg-darkShowViewButtonBackgroundHover rounded-default gap-1"
       >
-        <IconPlusOutline class="w-4 h-4 me-2"/>
+        <IconPlusOutline class="w-4 h-4"/>
         {{ $t('Add new') }}
       </RouterLink>
 
       <RouterLink v-if="coreStore?.resourceOptions?.allowedActions?.edit" :to="{ name: 'resource-edit', params: { resourceId: $route.params.resourceId, primaryKey: $route.params.primaryKey } }" 
-        class="flex 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="flex items-center af-edit-button py-1 px-3 text-sm font-medium text-lightShowViewButtonText focus:outline-none bg-lightShowViewButtonBackground rounded-default border border-lightShowViewButtonBorder hover:bg-lightShowViewButtonBackgroundHover hover:text-lightShowViewButtonTextHover focus:z-10 focus:ring-4 focus:ring-lightShowViewButtonFocusRing dark:focus:ring-darkShowViewButtonFocusRing dark:bg-darkShowViewButtonBackground dark:text-darkShowViewButtonText dark:border-darkShowViewButtonBorder dark:hover:text-darkShowViewButtonTextHover dark:hover:bg-darkShowViewButtonBackgroundHover gap-1"
       >
         <IconPenSolid class="w-4 h-4" />
         {{ $t('Edit') }}
       </RouterLink>
 
       <button v-if="coreStore?.resourceOptions?.allowedActions?.delete"  @click="deleteRecord"
-        class="flex items-center py-1 px-3 text-sm font-medium rounded-default text-red-600 focus:outline-none bg-white  border border-gray-300 hover:bg-gray-100 hover:text-red-700 focus:z-10 focus:ring-4 focus:ring-gray-100 dark:focus:ring-gray-700 dark:bg-gray-800 dark:text-red-500 dark:border-gray-600 dark:hover:text-white dark:hover:bg-gray-700"
+        class="flex items-center af-delete-button py-1 px-3 text-sm font-medium rounded-default text-red-600 focus:outline-none bg-lightShowViewButtonBackground  border border-lightShowViewButtonBorder hover:bg-lightShowViewButtonBackgroundHover hover:text-red-700 focus:z-10 focus:ring-4 focus:ring-lightShowViewButtonFocusRing dark:focus:ring-darkShowViewButtonFocusRing dark:bg-darkShowViewButtonBackground dark:text-red-500 dark:border-darkShowViewButtonBorder dark:hover:text-darkShowViewButtonTextHover dark:hover:bg-darkShowViewButtonBackgroundHover gap-1"
       >
         <IconTrashBinSolid class="w-4 h-4" />
         {{ $t('Delete') }}
       </button>
 
       <ThreeDotsMenu 
-        :threeDotsDropdownItems="coreStore.resourceOptions?.pageInjections?.show?.threeDotsDropdownItems"
+        :threeDotsDropdownItems="(coreStore.resourceOptions?.pageInjections?.show?.threeDotsDropdownItems as [])"
         :customActions="customActions"
       ></ThreeDotsMenu>
     </BreadcrumbsWithButtons>
@@ -57,7 +57,7 @@
     <component 
       v-for="c in coreStore?.resourceOptions?.pageInjections?.show?.afterBreadcrumbs || []"
       :is="getCustomComponent(c)"
-      :meta="c.meta"
+      :meta="(c as AdminForthComponentDeclarationFull).meta"
       :record="coreStore.record"
       :resource="coreStore.resource"
       :adminUser="coreStore.adminUser"
@@ -76,11 +76,11 @@
       v-else-if="coreStore.record"
       class="relative w-full flex flex-col gap-4"
     >
-    <div v-if="!groups.length && allColumns.length">
+    <div v-if="!groups.length && allColumns?.length">
       <ShowTable
-        :columns="allColumns"
         :resource="coreStore.resource"
         :record="coreStore.record"
+        :columns="allColumns as Array<{ name: string; label?: string; components?: any }>"
       />
     </div>
     <template v-else> 
@@ -93,12 +93,12 @@
           :record="coreStore.record"
         />
       </template>
-      <template v-if="otherColumns.length > 0">
+      <template v-if="otherColumns && otherColumns.length > 0">
         <ShowTable
-          :columns="otherColumns"
           groupName="Other Fields"
           :resource="coreStore.resource"
           :record="coreStore.record"
+          :columns="otherColumns as Array<{ name: string; label?: string; components?: any }>"
         />
       </template>
     </template>
@@ -112,8 +112,7 @@
       v-if="!loading"
       v-for="c in coreStore?.resourceOptions?.pageInjections?.show?.bottom || []"
       :is="getCustomComponent(c)"
-      :meta="c.meta"
-      :column="column"
+      :meta="(c as AdminForthComponentDeclarationFull).meta"
       :record="coreStore.record"
       :resource="coreStore.resource"
       :adminUser="coreStore.adminUser"
@@ -140,6 +139,7 @@ import ShowTable from '@/components/ShowTable.vue';
 import adminforth from "@/adminforth";
 import { useI18n } from 'vue-i18n';
 import { getIcon } from '@/utils';
+import { type AdminForthComponentDeclarationFull, type AdminForthResourceColumnCommon, type FieldGroup } from '@/types/Common.js';
 
 const route = useRoute();
 const router = useRouter();
@@ -147,62 +147,65 @@ const loading = ref(true);
 const { t } = useI18n();
 const coreStore = useCoreStore();
 
-const actionLoadingStates = ref({});
+const actionLoadingStates = ref<Record<string, boolean>>({});
 
 const customActions = computed(() => {
-  return coreStore.resource?.options?.actions?.filter(a => a.showIn?.showThreeDotsMenu) || [];
+  return coreStore.resource?.options?.actions?.filter((a: any) => a.showIn?.showThreeDotsMenu) || [];
 });
 
 onMounted(async () => {
   loading.value = true;
   await coreStore.fetchResourceFull({
-    resourceId: route.params.resourceId
+    resourceId: route.params.resourceId as string,
   });
   initThreeDotsDropdown();
   await coreStore.fetchRecord({
-    resourceId: route.params.resourceId, 
-    primaryKey: route.params.primaryKey,
+    resourceId: route.params.resourceId as string, 
+    primaryKey: route.params.primaryKey as string,
     source: 'show',
   });
-  checkAcessByAllowedActions(coreStore.resourceOptions.allowedActions,'show');
+  if(coreStore.resourceOptions){
+    checkAcessByAllowedActions(coreStore.resourceOptions.allowedActions,'show');
+  }
   loading.value = false;
 });
 
 const groups = computed(() => {
   let fieldGroupType;
-  if (coreStore.resource.options?.showFieldGroups) {
-    fieldGroupType = coreStore.resource.options.showFieldGroups;
-  } else if (coreStore.resource.options?.showFieldGroups === null) {
-    fieldGroupType = [];
-  } else {
-    fieldGroupType = coreStore.resource.options?.fieldGroups;
+  if (coreStore.resource) {
+    if (coreStore.resource.options?.showFieldGroups) {
+      fieldGroupType = coreStore.resource.options.showFieldGroups;
+    } else if (coreStore.resource.options?.showFieldGroups === null) {
+      fieldGroupType = [];
+    } else {
+      fieldGroupType = coreStore.resource.options?.fieldGroups;
+    }
   }
+  const activeGroups: typeof fieldGroupType | [] = fieldGroupType ?? [];
 
-  const activeGroups = fieldGroupType ?? [];
-
-  return activeGroups.map(group => ({
+  return activeGroups.map((group: FieldGroup) => ({
     ...group,
-    columns: coreStore.resource.columns.filter(
-      col => group.columns.includes(col.name) && col.showIn.show
+    columns: coreStore.resource?.columns.filter(
+      col => group.columns.includes(col.name) && col.showIn?.show
     ),
   }));
 });
 
 const allColumns = computed(() => {
-  return coreStore.resource.columns.filter(col => col.showIn.show);
+  return coreStore.resource?.columns.filter(col => col.showIn?.show);
 });
 
 const otherColumns = computed(() => {
   const groupedColumnNames = new Set(
-    groups.value.flatMap(group => group.columns.map(col => col.name))
+    groups.value.flatMap(group => group.columns.map((col: AdminForthResourceColumnCommon) => col.name))
   );
 
-  return coreStore.resource.columns.filter(
-    col => !groupedColumnNames.has(col.name) && col.showIn.show
+  return coreStore.resource?.columns.filter(
+    col => !groupedColumnNames.has(col.name) && col.showIn?.show
   );
 });
 
-async function deleteRecord(row) {
+async function deleteRecord() {
   const data = await adminforth.confirm({
     message: t('Are you sure you want to delete this item?'),
     yes: t('Delete'),
@@ -231,7 +234,7 @@ async function deleteRecord(row) {
     
 }
 
-async function startCustomAction(actionId) {  
+async function startCustomAction(actionId: string) {  
   actionLoadingStates.value[actionId] = true;
 
   const data = await callAdminForthApi({
@@ -263,8 +266,8 @@ async function startCustomAction(actionId) {
   
   if (data?.ok) {
     await coreStore.fetchRecord({
-      resourceId: route.params.resourceId, 
-      primaryKey: route.params.primaryKey,
+      resourceId: route.params.resourceId as string, 
+      primaryKey: route.params.primaryKey as string,
       source: 'show',
     });
 
@@ -281,4 +284,21 @@ async function startCustomAction(actionId) {
   }
 }
 
+adminforth.show.refresh = () => {
+  (async () => {
+    try {
+      loading.value = true;
+      await coreStore.fetchRecord({
+        resourceId: String(route.params.resourceId),
+        primaryKey: String(route.params.primaryKey),
+        source: 'show',
+      });
+    } catch (e) {
+      showErrorTost((e as Error).message);
+    } finally {
+      loading.value = false;
+    }
+  })();
+}
+
 </script>

package/dist/spa/src/websocket.ts

@@ -1,8 +1,13 @@
 
 const subscriptions: { [topic: string]: ((data: any) => void)[] } = {};
+
+interface ExtendedWebSocket extends WebSocket {
+  connected?: boolean;
+}
+
 const state: {
   status: 'connecting' | 'connected' | 'disconnected';
-  ws: WebSocket | null;
+  ws: ExtendedWebSocket | null;
 } = {
   status: 'connecting',
   ws: null

package/dist/spa/tsconfig.app.json

@@ -1,6 +1,6 @@
 {
   "extends": "@vue/tsconfig/tsconfig.dom.json",
-  "include": ["env.d.ts", "src/**/*", "src/**/*.vue"],
+  "include": ["env.d.ts", "src/**/*", "src/**/*.vue", "src/**/*.d.ts"],
   "exclude": ["src/**/__tests__/*"],
   "compilerOptions": {
     "composite": true,

package/dist/spa/vite.config.ts

@@ -1,18 +1,60 @@
 import { fileURLToPath, URL } from 'node:url'
-
 import { defineConfig } from 'vite'
 import vue from '@vitejs/plugin-vue'
 import portfinder from 'portfinder';
+import { Plugin } from 'vite';
+import tailwindcss from 'tailwindcss';
+
 
 /**
  * Find the next available port after a specified port.
  * @param {number} startPort - The starting port to check.
  * @returns {Promise<number>} - A promise that resolves with the next available port.
  */
-async function getNextAvailablePort(startPort) {
+async function getNextAvailablePort(startPort: number | undefined) {
   return await portfinder.getPortPromise({ port: startPort });
 };
 
+function ignoreTailwindErrors(): Plugin {
+  return {
+    name: 'ignore-tailwind-errors',
+    configureServer(server) {
+      server.middlewares.use((req, res, next) => {
+        const originalWrite = res.write;
+        res.write = function(chunk) {
+          if (typeof chunk === 'string' && chunk.includes('tailwind')) {
+            return true;
+          }
+          return originalWrite.call(this, chunk);
+        };
+        next();
+      });
+    },
+    config(config, { command }) {
+      if (command === 'build') {
+        // Override PostCSS config for build
+        config.css = config.css || {};
+        config.css.postcss = {
+          plugins: [
+            {
+              postcssPlugin: 'ignore-tailwind-errors',
+              Once(root, helpers) {
+                try {
+                  return tailwindcss()(root, helpers);
+                } catch (error: any) {
+                  console.warn('TailwindCSS warning ignored:', error.message);
+                  return;
+                }
+              }
+            }
+          ]
+        };
+      }
+    }
+  };
+}
+
+
 const appPort = await getNextAvailablePort(5173);
 const hmrPort = await getNextAvailablePort(5273);
 console.log(`SPA port: ${appPort}. HMR port: ${hmrPort}`);
@@ -27,6 +69,7 @@ export default defineConfig({
     },
   },
   plugins: [
+    //ignoreTailwindErrors(),
     vue(),
   ],
   resolve: {