adminforth 1.3.39 → 1.3.41

package/dist/index.js

@@ -291,6 +291,7 @@ class AdminForth {
                     return { error: resp.error };
                 }
             }
+            return { error: null };
         });
     }
     resource(resourceId) {
@@ -329,6 +330,10 @@ AdminForth.Utils = {
             regExp: '^(?=.*[A-Z])(?=.*[a-z])(?=.*[0-9]).+$',
             message: 'Password must include at least one uppercase letter, one lowercase letter, and one number'
         },
+    },
+    EMAIL_VALIDATOR: {
+        regExp: '^[a-z0-9._%+-]+@[a-z0-9.-]+\\.[a-z]{2,}$',
+        message: 'Email is not valid, must be in format example@test.com',
     }
 };
 export default AdminForth;

package/dist/modules/configValidator.js

@@ -63,32 +63,6 @@ export default class ConfigValidator {
         catch (e) {
             this.config.customization.customComponentsDir = undefined;
         }
-        if (this.config.auth) {
-            // TODO: remove in future releases
-            if (!this.config.auth.usersResourceId && this.config.auth.resourceId) {
-                this.config.auth.usersResourceId = this.config.auth.resourceId;
-            }
-            if (!this.config.auth.usersResourceId) {
-                throw new Error('No config.auth.usersResourceId defined');
-            }
-            if (!this.config.auth.passwordHashField) {
-                throw new Error('No config.auth.passwordHashField defined');
-            }
-            if (!this.config.auth.usernameField) {
-                throw new Error('No config.auth.usernameField defined');
-            }
-            if (this.config.auth.loginBackgroundImage) {
-                errors.push(...this.checkCustomFileExists(this.config.auth.loginBackgroundImage));
-            }
-            const userResource = this.config.resources.find((res) => res.resourceId === this.config.auth.usersResourceId);
-            if (!userResource) {
-                const similar = suggestIfTypo(this.config.resources.map((res) => res.resourceId || res.table), this.config.auth.usersResourceId);
-                throw new Error(`Resource with id "${this.config.auth.usersResourceId}" not found. ${similar ? `Did you mean "${similar}"?` : ''}`);
-            }
-            if (!this.config.auth.beforeLoginConfirmation) {
-                this.config.auth.beforeLoginConfirmation = [];
-            }
-        }
         if (!this.config.customization) {
             this.config.customization = {};
         }
@@ -410,6 +384,32 @@ export default class ConfigValidator {
             };
             browseMenu(this.config.menu);
         }
+        if (this.config.auth) {
+            // TODO: remove in future releases
+            if (!this.config.auth.usersResourceId && this.config.auth.resourceId) {
+                this.config.auth.usersResourceId = this.config.auth.resourceId;
+            }
+            if (!this.config.auth.usersResourceId) {
+                throw new Error('No config.auth.usersResourceId defined');
+            }
+            if (!this.config.auth.passwordHashField) {
+                throw new Error('No config.auth.passwordHashField defined');
+            }
+            if (!this.config.auth.usernameField) {
+                throw new Error('No config.auth.usernameField defined');
+            }
+            if (this.config.auth.loginBackgroundImage) {
+                errors.push(...this.checkCustomFileExists(this.config.auth.loginBackgroundImage));
+            }
+            const userResource = this.config.resources.find((res) => res.resourceId === this.config.auth.usersResourceId);
+            if (!userResource) {
+                const similar = suggestIfTypo(this.config.resources.map((res) => res.resourceId), this.config.auth.usersResourceId);
+                throw new Error(`Resource with id "${this.config.auth.usersResourceId}" not found. ${similar ? `Did you mean "${similar}"?` : ''}`);
+            }
+            if (!this.config.auth.beforeLoginConfirmation) {
+                this.config.auth.beforeLoginConfirmation = [];
+            }
+        }
         // check for duplicate resourceIds and show which ones are duplicated
         const resourceIds = this.config.resources.map((res) => res.resourceId);
         const uniqueResourceIds = new Set(resourceIds);

package/index.ts

@@ -50,6 +50,10 @@ class AdminForth implements IAdminForth {
         regExp: '^(?=.*[A-Z])(?=.*[a-z])(?=.*[0-9]).+$',
         message: 'Password must include at least one uppercase letter, one lowercase letter, and one number'
       },
+    },
+    EMAIL_VALIDATOR: {
+      regExp: '^[a-z0-9._%+-]+@[a-z0-9.-]+\\.[a-z]{2,}$',
+      message: 'Email is not valid, must be in format example@test.com',
     }
   }
 
@@ -369,6 +373,8 @@ class AdminForth implements IAdminForth {
         return { error: resp.error };
       }
     }
+
+    return { error: null };
   }
 
   resource(resourceId: string): IOperationalResource {

package/modules/configValidator.ts

@@ -76,35 +76,6 @@ export default class ConfigValidator implements IConfigValidator {
       this.config.customization.customComponentsDir = undefined;
     }
 
-    if (this.config.auth) {
-      // TODO: remove in future releases
-      if (!this.config.auth.usersResourceId && this.config.auth.resourceId) {
-        this.config.auth.usersResourceId = this.config.auth.resourceId;
-      }
-
-      if (!this.config.auth.usersResourceId) {
-        throw new Error('No config.auth.usersResourceId defined');
-      }
-      if (!this.config.auth.passwordHashField) {
-        throw new Error('No config.auth.passwordHashField defined');
-      }
-      if (!this.config.auth.usernameField) {
-        throw new Error('No config.auth.usernameField defined');
-      }
-      if (this.config.auth.loginBackgroundImage) {
-        errors.push(...this.checkCustomFileExists(this.config.auth.loginBackgroundImage));
-      }
-      const userResource = this.config.resources.find((res) => res.resourceId === this.config.auth.usersResourceId);
-      if (!userResource) {
-        const similar = suggestIfTypo(this.config.resources.map((res) => res.resourceId || res.table), this.config.auth.usersResourceId);
-        throw new Error(`Resource with id "${this.config.auth.usersResourceId}" not found. ${similar ? `Did you mean "${similar}"?` : ''}`);
-      }
-
-      if (!this.config.auth.beforeLoginConfirmation) {
-        this.config.auth.beforeLoginConfirmation = [];
-      }
-    }
-
     if (!this.config.customization) {
       this.config.customization = {};
     }
@@ -476,6 +447,35 @@ export default class ConfigValidator implements IConfigValidator {
 
     }
 
+    if (this.config.auth) {
+      // TODO: remove in future releases
+      if (!this.config.auth.usersResourceId && this.config.auth.resourceId) {
+        this.config.auth.usersResourceId = this.config.auth.resourceId;
+      }
+
+      if (!this.config.auth.usersResourceId) {
+        throw new Error('No config.auth.usersResourceId defined');
+      }
+      if (!this.config.auth.passwordHashField) {
+        throw new Error('No config.auth.passwordHashField defined');
+      }
+      if (!this.config.auth.usernameField) {
+        throw new Error('No config.auth.usernameField defined');
+      }
+      if (this.config.auth.loginBackgroundImage) {
+        errors.push(...this.checkCustomFileExists(this.config.auth.loginBackgroundImage));
+      }
+      const userResource = this.config.resources.find((res) => res.resourceId === this.config.auth.usersResourceId);
+      if (!userResource) {
+        const similar = suggestIfTypo(this.config.resources.map((res) => res.resourceId ), this.config.auth.usersResourceId);
+        throw new Error(`Resource with id "${this.config.auth.usersResourceId}" not found. ${similar ? `Did you mean "${similar}"?` : ''}`);
+      }
+
+      if (!this.config.auth.beforeLoginConfirmation) {
+        this.config.auth.beforeLoginConfirmation = [];
+      }
+    }
+
     // check for duplicate resourceIds and show which ones are duplicated
     const resourceIds = this.config.resources.map((res) => res.resourceId);
     const uniqueResourceIds = new Set(resourceIds);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adminforth",
-  "version": "1.3.39",
+  "version": "1.3.41",
   "description": "OpenSource Vue3 powered forth-generation admin panel",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/spa/src/App.vue

@@ -313,16 +313,21 @@ function handleCustomLayout() {
   }
 }
 
+function humanizeSnake(str: string): string {
+  if (!str) {
+    return '';
+  }
+  return str.split('_').map((word) => word.charAt(0).toUpperCase() + word.slice(1)).join(' ');
+}
 
-
-watch(route, () => {
+watch([route, () => coreStore.resourceById], async () => {
   handleCustomLayout()
-  title.value = `${coreStore.config?.title || coreStore.config?.brandName || 'Adminforth'} | ${ Object.values(route.params)[0] || route.meta.title || ' '}`;
+  await new Promise((resolve) => setTimeout(resolve, 0));
+  const resourceTitle = coreStore.resourceById[route.params?.resourceId as string]?.label || humanizeSnake(Object.values(route.params)[0] as string);
+  title.value = `${coreStore.config?.title || coreStore.config?.brandName || 'Adminforth'} | ${ resourceTitle || route.meta.title || ' '}`;
   useHead({
     title: title.value,
   })
-  
-
 });
 
 watch (()=>coreStore.menu, () => {

package/spa/src/components/ResourceListTable.vue

@@ -381,17 +381,19 @@ async function onClick(e,row) {
   if (window.getSelection().toString()) return;
   else {
     if (e.ctrlKey || e.metaKey) {
+
       if (row._clickUrl) {
         window.open(row._clickUrl, '_blank');
       } else {
-        router.push(
+        window.open(
           router.resolve({
             name: 'resource-show',
             params: {
               resourceId: props.resource.resourceId,
               primaryKey: row._primaryKeyValue,
             },
-          })
+          }).fullPath,
+          '_blank'
         );
       }
     } else {

package/spa/src/components/ThreeDotsMenu.vue

@@ -37,7 +37,7 @@ import { useCoreStore } from '@/stores/core'
 const coreStore = useCoreStore()
 
 const props = defineProps<{
-  threeDotsDropdownItems: any[]
+  threeDotsDropdownItems: any[] | undefined
 }>()
 
 </script>

package/spa/src/index.scss

@@ -25,3 +25,7 @@
 //   }
 // }
 
+
+*{
+  -moz-user-select: none;
+}

package/spa/src/views/ListView.vue

@@ -183,6 +183,9 @@ async function getList() {
     return row;
   });
   totalRows.value = data.total;
+  await new Promise(resolve => setTimeout(resolve, 0));
+  initFlowbite(); // for tooltips in table
+
 }
 
 async function startBulkAction(actionId) {

package/types/AdminForthConfig.ts

@@ -1442,7 +1442,7 @@ export class Sorts {
 export interface IOperationalResource {
   get: (filter: IAdminForthFilter | IAdminForthFilter[]) => Promise<any | null>;
 
-  list: (filter: IAdminForthFilter | IAdminForthFilter[], limit: number, offset: number, sort: IAdminForthSort | IAdminForthSort[]) => Promise<any[]>;
+  list: (filter: IAdminForthFilter | IAdminForthFilter[], limit?: number, offset?: number, sort?: IAdminForthSort | IAdminForthSort[]) => Promise<any[]>;
 
   count: (filter: IAdminForthFilter | IAdminForthFilter[] | undefined) => Promise<number>;