adminforth 1.2.99 → 1.2.100

package/modules/restApi.ts

@@ -67,73 +67,64 @@ export default class AdminForthRestAPI {
         let adminUser: AdminUser;
         let toReturn: { ok: boolean, redirectTo?: string, allowedLogin:boolean } = { ok: true, allowedLogin:true};
 
-        let token;
-        if (this.adminforth.config.rootUser 
-            && username === this.adminforth.config.rootUser.username 
-            && password === this.adminforth.config.rootUser.password
-        ) {
-          this.adminforth.auth.setAuthCookie({ response, username, pk: null });
-          adminUser = { isRoot: true, dbUser: null, pk: null, username: this.adminforth.config.rootUser.username};
-        } else {
-          // get resource from db
-          if (!this.adminforth.config.auth) {
-            throw new Error('No config.auth defined');
-          }
-          const userResource = this.adminforth.config.resources.find((res) => res.resourceId === this.adminforth.config.auth.resourceId);
-          // if there is no passwordHashField, in columns, add it, with backendOnly and showIn: []
-          if (!userResource.dataSourceColumns.find((col) => col.name === this.adminforth.config.auth.passwordHashField)) {
-            userResource.dataSourceColumns.push({
-              name: this.adminforth.config.auth.passwordHashField,
-              backendOnly: true,
-              showIn: [],
-              type: AdminForthDataTypes.STRING,
-            });
-            console.log('Adding passwordHashField to userResource', userResource)
-          }
-
-          const userRecord = (
-            await this.adminforth.connectors[userResource.dataSource].getData({
-              resource: userResource,
-              filters: [
-                { field: this.adminforth.config.auth.usernameField, operator: AdminForthFilterOperators.EQ, value: username },
-              ],
-              limit: 1,
-              offset: 0,
-              sort: [],
-            })
-          ).data?.[0];
-
-          if (!userRecord) {
-            return { error: 'User not found' };
-          }
-
-          const passwordHash = userRecord[this.adminforth.config.auth.passwordHashField];
-          const valid = await AdminForthAuth.verifyPassword(password, passwordHash);
-          if (valid) {
-            adminUser = { 
-              isRoot: false, dbUser: userRecord,
-              pk: userRecord[userResource.columns.find((col) => col.primaryKey).name], 
-              username,
-            };
-            const beforeLoginConfirmation = this.adminforth.config.auth.beforeLoginConfirmation as (BeforeLoginConfirmationFunction[] | undefined);
-            if (beforeLoginConfirmation?.length){
-              for (const hook of beforeLoginConfirmation) {
-                const resp = await hook({ adminUser, response });
-                
-                if (resp?.body?.redirectTo) {
-                  toReturn = {ok:resp.ok, redirectTo:resp?.body?.redirectTo, allowedLogin:resp?.body?.allowedLogin};
-                  break;
-                }
+        // get resource from db
+        if (!this.adminforth.config.auth) {
+          throw new Error('No config.auth defined we need it to find user, please follow the docs');
+        }
+        const userResource = this.adminforth.config.resources.find((res) => res.resourceId === this.adminforth.config.auth.usersResourceId);
+        // if there is no passwordHashField, in columns, add it, with backendOnly and showIn: []
+        if (!userResource.dataSourceColumns.find((col) => col.name === this.adminforth.config.auth.passwordHashField)) {
+          userResource.dataSourceColumns.push({
+            name: this.adminforth.config.auth.passwordHashField,
+            backendOnly: true,
+            showIn: [],
+            type: AdminForthDataTypes.STRING,
+          });
+          console.log('Adding passwordHashField to userResource', userResource)
+        }
+
+        const userRecord = (
+          await this.adminforth.connectors[userResource.dataSource].getData({
+            resource: userResource,
+            filters: [
+              { field: this.adminforth.config.auth.usernameField, operator: AdminForthFilterOperators.EQ, value: username },
+            ],
+            limit: 1,
+            offset: 0,
+            sort: [],
+          })
+        ).data?.[0];
+
+        if (!userRecord) {
+          return { error: 'User not found' };
+        }
+
+        const passwordHash = userRecord[this.adminforth.config.auth.passwordHashField];
+        const valid = await AdminForthAuth.verifyPassword(password, passwordHash);
+        if (valid) {
+          adminUser = { 
+            dbUser: userRecord,
+            pk: userRecord[userResource.columns.find((col) => col.primaryKey).name], 
+            username,
+          };
+          const beforeLoginConfirmation = this.adminforth.config.auth.beforeLoginConfirmation as (BeforeLoginConfirmationFunction[] | undefined);
+          if (beforeLoginConfirmation?.length){
+            for (const hook of beforeLoginConfirmation) {
+              const resp = await hook({ adminUser, response });
+              
+              if (resp?.body?.redirectTo) {
+                toReturn = {ok:resp.ok, redirectTo:resp?.body?.redirectTo, allowedLogin:resp?.body?.allowedLogin};
+                break;
               }
             }
-            if (toReturn.allowedLogin){
-              this.adminforth.auth.setAuthCookie({ response, username, pk: userRecord[userResource.columns.find((col) => col.primaryKey).name] });
-            } 
-          } else {
-            return { error: INVALID_MESSAGE };
           }
-          
+          if (toReturn.allowedLogin){
+            this.adminforth.auth.setAuthCookie({ response, username, pk: userRecord[userResource.columns.find((col) => col.primaryKey).name] });
+          } 
+        } else {
+          return { error: INVALID_MESSAGE };
         }
+          
         
         return toReturn;
     }
@@ -168,13 +159,14 @@ export default class AdminForthRestAPI {
           throw new Error('No config.auth defined');
         }
         const usernameField = this.adminforth.config.auth.usernameField;
-        const resource = this.adminforth.config.resources.find((res) => res.resourceId === this.adminforth.config.auth.resourceId);
+        const resource = this.adminforth.config.resources.find((res) => res.resourceId === this.adminforth.config.auth.usersResourceId);
         const usernameColumn = resource.columns.find((col) => col.name === usernameField);
 
         return {
           brandName: this.adminforth.config.customization.brandName,
           usernameFieldName: usernameColumn.label,
           loginBackgroundImage: this.adminforth.config.auth.loginBackgroundImage,
+          loginBackgroundPosition: this.adminforth.config.auth.loginBackgroundPosition,
           title: this.adminforth.config.customization?.title,
           demoCredentials: this.adminforth.config.auth.demoCredentials,
           loginPromptHTML: this.adminforth.config.auth.loginPromptHTML,
@@ -188,14 +180,10 @@ export default class AdminForthRestAPI {
       handler: async ({input, adminUser, cookies}) => {
         let username = ''
         let userFullName = ''
-        if (adminUser.isRoot) {
-          // isRoot can be in JWT token still when rootUser deleted, so we check for rootUser?"
-          username = this.adminforth.config.rootUser?.username || 'RootUser';
-        } else {
-            const dbUser = adminUser.dbUser;
-            username = dbUser[this.adminforth.config.auth.usernameField]; 
-            userFullName =dbUser[this.adminforth.config.auth.userFullNameField];
-        }
+    
+        const dbUser = adminUser.dbUser;
+        username = dbUser[this.adminforth.config.auth.usernameField]; 
+        userFullName =dbUser[this.adminforth.config.auth.userFullNameField];
 
         const userData = {
             [this.adminforth.config.auth.usernameField]: username,
@@ -257,6 +245,7 @@ export default class AdminForthRestAPI {
           menu: newMenu,
           config: { 
             brandName: this.adminforth.config.customization.brandName,
+            showBrandNameInSidebar: this.adminforth.config.customization.showBrandNameInSidebar,
             brandLogo: this.adminforth.config.customization.brandLogo,
             datesFormat: this.adminforth.config.customization.datesFormat,
             deleteConfirmation: this.adminforth.config.deleteConfirmation,
@@ -272,8 +261,6 @@ export default class AdminForthRestAPI {
       },
     });
 
-    
-
     function checkAccess(action: AllowedActionsEnum, allowedActions: AllowedActions): { allowed: boolean, error?: string } {
       const allowed = (allowedActions[action] as boolean | string | undefined);
       if (allowed !== true) {
@@ -331,6 +318,7 @@ export default class AdminForthRestAPI {
       method: 'POST',
       path: '/get_resource_data',
       handler: async ({ body, adminUser }) => {
+
         const { resourceId, source } = body;
         if (['show', 'list'].includes(source) === false) {
           return { error: 'Invalid source, should be list or show' };
@@ -394,6 +382,7 @@ export default class AdminForthRestAPI {
           offset,
           filters,
           sort,
+          getTotals: true,
         });
         // for foreign keys, add references
         await Promise.all(
@@ -581,12 +570,13 @@ export default class AdminForthRestAPI {
 
             const response = await this.adminforth.createResourceRecord({ resource, record, adminUser });
             if (response.error) {
-              return { error: response.error };
+              return { error: response.error, ok: false };
             }
             const connector = this.adminforth.connectors[resource.dataSource];
 
             return {
-              newRecordId: record[connector.getPrimaryKey(resource)]
+              newRecordId: response.createdRecord[connector.getPrimaryKey(resource)],
+              ok: true
             }
         }
     });
@@ -617,7 +607,12 @@ export default class AdminForthRestAPI {
 
             // execute hook if needed
             for (const hook of listify(resource.hooks?.edit?.beforeSave as BeforeSaveFunction[])) {
-              const resp = await hook({ resource, record, adminUser });
+              const resp = await hook({
+                recordId,
+                resource,
+                record,
+                adminUser 
+              });
               if (!resp || (!resp.ok && !resp.error)) {
                 throw new Error(`Hook beforeSave must return object with {ok: true} or { error: 'Error' } `);
               }
@@ -647,7 +642,13 @@ export default class AdminForthRestAPI {
             
             // execute hook if needed
             for (const hook of listify(resource.hooks?.edit?.afterSave as AfterSaveFunction[])) {
-              const resp = await hook({ resource, record, adminUser, oldRecord });
+              const resp = await hook({ 
+                resource, 
+                record, 
+                adminUser, 
+                oldRecord,
+                recordId,
+              });
               if (!resp || (!resp.ok && !resp.error)) {
                 throw new Error(`Hook afterSave must return object with {ok: true} or { error: 'Error' } `);
               }
@@ -687,7 +688,12 @@ export default class AdminForthRestAPI {
 
             // execute hook if needed
             for (const hook of listify(resource.hooks?.delete?.beforeSave as BeforeSaveFunction[])) {
-              const resp = await hook({ resource, record, adminUser });
+              const resp = await hook({ 
+                resource, 
+                record, 
+                adminUser,
+                recordId: body['primaryKey']
+              });
               if (!resp || (!resp.ok && !resp.error)) {
                 throw new Error(`Hook beforeSave must return object with {ok: true} or { error: 'Error' } `);
               }
@@ -702,7 +708,12 @@ export default class AdminForthRestAPI {
 
             // execute hook if needed
             for (const hook of listify(resource.hooks?.delete?.afterSave as BeforeSaveFunction[])) {
-              const resp = await hook({ resource, record, adminUser });
+              const resp = await hook({ 
+                resource, 
+                record, 
+                adminUser,
+                recordId: body['primaryKey']
+              });
               if (!resp || (!resp.ok && !resp.error)) {
                 throw new Error(`Hook afterSave must return object with {ok: true} or { error: 'Error' } `);
               }

package/modules/utils.ts

@@ -1,6 +1,7 @@
 import path from 'path';
 import { fileURLToPath } from 'url';
 import fs from 'fs';
+import Fuse from 'fuse.js';
 // @ts-ignore-next-line
 
 
@@ -335,3 +336,22 @@ export function inverseRGBA(rgba) {
   return brightness > 128 ? 'rgba(0,0,0,1)' : 'rgba(255,255,255,1)';
 }
 
+
+export function suggestIfTypo(names: string[], name: string): string {
+  if (!name) {
+    return null;
+  }
+  const options = {
+    includeScore: true, // Includes score in the results to see how close matches are
+    threshold: 0.3,     // Defines the fuzziness (lower values mean stricter matches)
+  };
+  
+  const fuse = new Fuse(names.filter(
+    (n) => !!n
+  ), options);
+  // Search for a resource
+  const result = fuse.search(name);
+  if (result.length > 0) {
+    return result[0].item;
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adminforth",
-  "version": "1.2.99",
+  "version": "1.2.100",
   "description": "OpenSource Vue3 powered forth-generation admin panel",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -20,9 +20,10 @@
     "@clickhouse/client": "^1.4.0",
     "better-sqlite3": "^10.0.0",
     "dayjs": "^1.11.11",
-    "express": "^4.19.2",
+    "express": "^4.21.0",
     "filewatcher": "^3.0.1",
     "fs-extra": "^11.2.0",
+    "fuse.js": "^7.0.0",
     "jsonwebtoken": "^9.0.2",
     "mongodb": "6.6",
     "node-fetch": "^3.3.2",

package/spa/src/App.vue

@@ -18,7 +18,12 @@
           </div>
           <div class="flex items-center">
             <div class="flex items-center ms-3 ">
+              <span @click="toggleTheme" class="cursor-pointer flex items-center gap-1 block px-4 py-2 text-sm text-black hover:bg-lightHtml dark:text-darkSidebarTextHover dark:hover:bg-darkHtml dark:hover:text-darkSidebarTextActive" role="menuitem">
+                <IconMoonSolid class="w-5 h-5 text-blue-300" v-if="theme !== 'dark'" />
+                <IconSunSolid class="w-5 h-5 text-yellow-300" v-else />
+              </span>
               <div>
+
                 <button type="button" class="flex text-sm bg- rounded-full focus:ring-4 focus:ring-lightSidebarDevider dark:focus:ring-darkSidebarDevider dark:bg-" aria-expanded="false" data-dropdown-toggle="dropdown-user">
                   <span class="sr-only">Open user menu</span>
                   <svg class="w-8 h-8 text-lightNavbarIcons dark:text-darkNavbarIcons" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="currentColor" viewBox="0 0 24 24">
@@ -36,14 +41,9 @@
                   </p>
                 </div>
                 <ul class="py-1" role="none">
-                  <li>
-                    <span @click="toggleTheme" class="cursor-pointer flex items-center gap-1 block px-4 py-2 text-sm text-black hover:bg-lightHtml dark:text-darkSidebarTextHover dark:hover:bg-darkHtml dark:hover:text-darkSidebarTextActive" role="menuitem">
-                      {{ theme === 'dark' ? 'Light' : 'Dark' }}
-                      <IconMoonSolid class="w-5 h-5 text-blue-300" v-if="theme !== 'dark'" />
-                      <IconSunSolid class="w-5 h-5 text-yellow-300" v-else />
-                      mode
-                    </span>
-                  </li>
+                  <!-- <li>
+                    
+                  </li> -->
                   <li>
                     <button @click="logout" class="cursor-pointer flex items-center gap-1 block px-4 py-2 text-sm text-black hover:bg-html dark:text-darkSidebarTextHover dark:hover:bg-darkSidebarItemHover dark:hover:text-darkSidebarTextActive w-full" role="menuitem">Sign out</button>
                   </li>
@@ -68,7 +68,10 @@
       <div class="h-full px-3 pb-4 overflow-y-auto bg-lightSidebar dark:bg-darkSidebar border-r border-lightSidebarBorder dark:border-darkSidebarBorder">
         <div class="flex ms-2 md:me-24  m-4  ">
           <img :src="loadFile(coreStore.config?.brandLogo || '@/assets/logo.svg')" :alt="`${ coreStore.config?.brandName } Logo`" class="h-8 me-3"  />
-          <span class="self-center text-lightNavbarText-size font-semibold sm:text-lightNavbarText-size whitespace-nowrap dark:text-darkSidebarText text-lightSidebarText">
+          <span 
+            v-if="coreStore.config?.showBrandNameInSidebar"
+            class="self-center text-lightNavbarText-size font-semibold sm:text-lightNavbarText-size whitespace-nowrap dark:text-darkSidebarText text-lightSidebarText"
+          >
             {{ coreStore.config?.brandName }}
           </span>
         </div>

package/spa/src/components/Filters.vue

@@ -115,7 +115,7 @@
 </template>
 
 <script setup>
-import { watch, computed, ref, onMounted } from 'vue'
+import { watch, computed } from 'vue'
 import Dropdown from '@/components/Dropdown.vue';
 import CustomDateRangePicker from '@/components/CustomDateRangePicker.vue';
 import { callAdminForthApi } from '@/utils';

package/spa/src/components/ResourceForm.vue

@@ -130,7 +130,6 @@
                       </button>
                     </template>
                     <div v-if="columnError(column) && validating" class="mt-1 text-xs text-red-500 dark:text-red-400">{{ columnError(column) }}</div>
-
                     <div v-if="column.editingNote && column.editingNote[mode]" class="mt-1 text-xs text-gray-400 dark:text-gray-500">{{ column.editingNote[mode] }}</div>
 
                 </td>
@@ -154,10 +153,10 @@ import { IconExclamationCircleSolid, IconEyeSlashSolid, IconEyeSolid } from '@ic
 import { computedAsync } from '@vueuse/core';
 import { initFlowbite } from 'flowbite';
 import { computed, onMounted, ref, watch } from 'vue';
-import { useRouter } from 'vue-router';
+import { useRouter, useRoute } from 'vue-router';
 
 const router = useRouter();
-
+const route = useRoute();
 const props = defineProps({
   loading: Boolean,
   resource: Object,
@@ -168,7 +167,7 @@ const props = defineProps({
 
 const unmasked = ref({});
 
-const mode = computed(() => props.record  && Object.keys(props.record).length ? 'edit' : 'create');
+const mode = computed(() => route.name === 'resource-create' ? 'create' : 'edit');
 
 const emit = defineEmits(['update:record', 'update:isValid']);
 
@@ -245,6 +244,10 @@ const setCurrentValue = (key, value) => {
   } else {
     currentValues.value[key] = value;
   }
+  if (['text', 'richtext', 'string'].includes(col.type) && col.enforceLowerCase) {
+    currentValues.value[key] = currentValues.value[key].toLowerCase();
+  }
+
   currentValues.value = { ...currentValues.value };
   console.log('3️⃣ setCurrentValue', key, value);
   emit('update:record', currentValues.value);