Merge branch 'next' of github.com:devforth/adminforth into feature/AdminForth/893/bug-with-login-via-google

SerVitasik · SerVitasik · commit 1db029fe92ae · 2025-11-27T09:16:27.000+02:00
diff --git a/adminforth/documentation/docs/tutorial/03-Customization/09-Actions.md b/adminforth/documentation/docs/tutorial/03-Customization/09-Actions.md
@@ -204,7 +204,7 @@ import { admin } from '../index';
 //diff-add
               await stmt.run(...selectedIds);
 //diff-add
-              return { ok: true, error: false, successMessage: `Marked ${selectedIds.length} apartments as listed` };
+              return { ok: true, successMessage: `Marked ${selectedIds.length} apartments as listed` };
 //diff-add
             },
 //diff-add
diff --git a/adminforth/documentation/docs/tutorial/03-Customization/10-menuConfiguration.md b/adminforth/documentation/docs/tutorial/03-Customization/10-menuConfiguration.md
@@ -23,7 +23,7 @@ E.g. create group "Blog" with Items who link to resource "posts" and "categories
 ```ts title='./index.ts'
   {
     ...
-    menu: {
+    menu: [
       {
         label: 'Blog',
         icon: 'flowbite:brain-solid',
@@ -46,7 +46,7 @@ E.g. create group "Blog" with Items who link to resource "posts" and "categories
         icon: 'flowbite:folder-duplicate-outline',
         resourceId: 'adminuser',
       },
-    },
+    ],
     ...
   }
 ```
diff --git a/adminforth/documentation/docs/tutorial/03-Customization/13-standardPagesTuning.md b/adminforth/documentation/docs/tutorial/03-Customization/13-standardPagesTuning.md
@@ -63,7 +63,7 @@ export default {
     }
 ```
 
-You can also specify on which page you want to create or delete groups. If you assign null, the groups will disappear from this page.
+You can also specify on which page you want to create groups.
 
 ```typescript title="./resources/apartments.ts"
 export default {
@@ -89,10 +89,6 @@ export default {
           }
           //diff-add
         ],
-          //diff-add
-        editFieldGroups: null,
-          //diff-add
-        showFieldGroups: null,
       }
     }
 ```
diff --git a/adminforth/modules/configValidator.ts b/adminforth/modules/configValidator.ts
@@ -807,17 +807,23 @@ export default class ConfigValidator implements IConfigValidator {
           if (typeof condition !== 'object') {
             return;
           }
+          const relatedColumn = res.columns.find((c) => c.name === field);
+          if (!relatedColumn) {
+            const similar = suggestIfTypo(res.columns.map((c) => c.name), field);
+            errors.push(`Resource "${res.resourceId}" column "${column.name}" has showIf on unknown column "${field}". ${similar ? `Did you mean "${similar}"?` : ''}`);
+            return;
+          }
           if ("$in" in condition && !Array.isArray(condition.$in)) {
             errors.push(`Resource "${res.resourceId}" column "${column.name}" has showIf with $in that is not an array`);
           }
           if ("$nin" in condition && !Array.isArray(condition.$nin)) {
             errors.push(`Resource "${res.resourceId}" column "${column.name}" has showIf with $nin that is not an array`);
           }
-          if ("$includes" in condition && !column.isArray) {
-            errors.push(`Resource "${res.resourceId}" has showIf with $includes on non-array column "${column.name}"`);
+          if ("$includes" in condition && !relatedColumn.isArray?.enabled) {
+            errors.push(`Resource "${res.resourceId}" has showIf with $includes on non-array column "${relatedColumn.name}"`);
           }
-          if ("$nincludes" in condition && !column.isArray) {
-            errors.push(`Resource "${res.resourceId}" has showIf with $nincludes on non-array column "${column.name}"`);
+          if ("$nincludes" in condition && !relatedColumn.isArray?.enabled) {
+            errors.push(`Resource "${res.resourceId}" has showIf with $nincludes on non-array column "${relatedColumn.name}"`);
           }
         });
           }
diff --git a/adminforth/modules/restApi.ts b/adminforth/modules/restApi.ts
@@ -12,6 +12,7 @@ import {
   HttpExtra,
   IAdminForthAndOrFilter,
   BackendOnlyInput,
+  Filters,
 } from "../types/Back.js";
 
 import { ADMINFORTH_VERSION, listify, md5hash, getLoginPromptHTML } from './utils.js';
@@ -363,7 +364,13 @@ export default class AdminForthRestAPI implements IAdminForthRestAPI {
 
         const announcementBadge: AnnouncementBadgeResponse = this.adminforth.config.customization.announcementBadge?.(adminUser);
         
-
+        const settingPages = []
+        for ( const settingPage of this.adminforth.config.auth.userMenuSettingsPages || [] ) {
+          if ( settingPage.isVisible ) {
+            const isVisible = await settingPage.isVisible( adminUser );
+            settingPages.push( { ...settingPage, isVisible } );
+          }
+        }
 
         const publicPart = {
           brandName: this.adminforth.config.customization.brandName,
@@ -378,7 +385,6 @@ export default class AdminForthRestAPI implements IAdminForthRestAPI {
           singleTheme: this.adminforth.config.customization.singleTheme,
           customHeadItems: this.adminforth.config.customization.customHeadItems,
         }
-
         const loggedInPart = {
           showBrandNameInSidebar: this.adminforth.config.customization.showBrandNameInSidebar,
           showBrandLogoInSidebar: this.adminforth.config.customization.showBrandLogoInSidebar,
@@ -393,7 +399,7 @@ export default class AdminForthRestAPI implements IAdminForthRestAPI {
           announcementBadge,
           globalInjections: this.adminforth.config.customization.globalInjections,
           userFullnameField: this.adminforth.config.auth.userFullNameField,
-          settingPages: this.adminforth.config.auth.userMenuSettingsPages,
+          settingPages: settingPages,
         }
 
         // translate menu labels
@@ -1175,6 +1181,14 @@ export default class AdminForthRestAPI implements IAdminForthRestAPI {
               }
             }
 
+            const primaryKeyColumn = resource.columns.find((col) => col.primaryKey);
+            if (record[primaryKeyColumn.name] !== undefined) {
+              const existingRecord = await this.adminforth.resource(resource.resourceId).get([Filters.EQ(primaryKeyColumn.name, record[primaryKeyColumn.name])]);
+              if (existingRecord) {
+                return { error: `Record with ${primaryKeyColumn.name} '${record[primaryKeyColumn.name]}' already exists`, ok: false };
+              }
+            }
+
             const ctxCreate = {
               adminUser,
               resource,
@@ -1291,6 +1305,14 @@ export default class AdminForthRestAPI implements IAdminForthRestAPI {
               return { error: allowedError };
             }
 
+            const primaryKeyColumn = resource.columns.find((col) => col.primaryKey);
+            if (record[primaryKeyColumn.name] !== undefined) {
+              const existingRecord = await this.adminforth.resource(resource.resourceId).get([Filters.EQ(primaryKeyColumn.name, record[primaryKeyColumn.name])]);
+              if (existingRecord) {
+                return { error: `Record with ${primaryKeyColumn.name} '${record[primaryKeyColumn.name]}' already exists`, ok: false };
+              }
+            }
+
             const ctxEdit = {
               adminUser,
               resource,
diff --git a/adminforth/spa/src/App.vue b/adminforth/spa/src/App.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <nav 
-      v-if="loggedIn && routerIsReady && loginRedirectCheckIsReady && defaultLayout"
+      v-if="loggedIn && routerIsReady && loginRedirectCheckIsReady && defaultLayout && headerOnlyLayout"
       class="fixed h-14 top-0 z-30 w-full border-b shadow-sm bg-lightNavbar shadow-headerShadow dark:bg-darkNavbar dark:border-darkSidebarDevider"
     >
       <div class="af-header px-3 lg:px-5 lg:pl-3 flex items-center justify-between h-full w-full" >
@@ -73,7 +73,7 @@
     </nav>
 
     <Sidebar 
-      v-if="loggedIn && routerIsReady && loginRedirectCheckIsReady && defaultLayout"
+      v-if="loggedIn && routerIsReady && loginRedirectCheckIsReady && defaultLayout && !headerOnlyLayout"
       :sideBarOpen="sideBarOpen"
       :forceIconOnly="route.meta?.sidebarAndHeader === 'preferIconOnly'"
       @hideSidebar="hideSidebar"
@@ -183,6 +183,7 @@ initFrontedAPI()
 createHead()
 const sideBarOpen = ref(false);
 const defaultLayout = ref(true);
+const headerOnlyLayout = ref(false);
 const route = useRoute();
 const router = useRouter();
 const publicConfigLoaded = ref(false);
@@ -201,10 +202,77 @@ const expandedWidth = computed(() => coreStore.config?.iconOnlySidebar?.expanded
 const theme = ref('light');
 
 const userMenuComponents = computed(() => {
-  console.log('🪲🆕 userMenuComponents recomputed', coreStore?.config?.globalInjections?.userMenu);
+  console.log('🪲🆕 userMenuComponents recomputed', JSON.parse(JSON.stringify(coreStore?.config?.globalInjections?.userMenu)));
   return coreStore?.config?.globalInjections?.userMenu || [];
 })
 
+watch(
+  () => coreStore.config?.globalInjections?.userMenu,
+  (newVal, oldVal) => {
+    // Only log when it becomes undefined (you can relax this if needed)
+    if (newVal === undefined) {
+      const err = new Error('🔍 userMenu changed to undefined');
+      console.groupCollapsed(
+        '%c[TRACE] userMenu changed to undefined',
+        'color: red; font-weight: bold;'
+      );
+      console.log('old value:', oldVal);
+      console.log('new value:', newVal);
+      console.log('coreStore.config.globalInjections:', coreStore.config?.globalInjections);
+      console.log('Stack trace:');
+      console.log(err.stack);
+      console.groupEnd();
+    } else {
+      // Optional: log ALL changes for debugging
+      console.groupCollapsed(
+        '%c[DEBUG] userMenu changed',
+        'color: orange; font-weight: bold;'
+      );
+      console.log('old value:', oldVal);
+      console.log('new value:', newVal);
+      console.log('coreStore.config.globalInjections:', coreStore.config?.globalInjections);
+      console.groupEnd();
+    }
+  },
+  {
+    deep: false,
+    immediate: false,
+  }
+);
+
+watch(() => coreStore.config?.globalInjections, (v) => {
+  console.log("🔧 globalInjections replaced:", v);
+}, { deep: false });
+
+watch(
+  () => coreStore.config?.globalInjections?.userMenu,
+  (newVal, oldVal) => {
+    if (newVal === undefined) {
+      const err = new Error('🔍 userMenu changed to undefined');
+      console.groupCollapsed(
+        '%c[TRACE] userMenu changed to undefined',
+        'color: red; font-weight: bold;'
+      );
+      console.log('old value:', oldVal);
+      console.log('new value:', newVal);
+      console.log('coreStore.config.globalInjections:', coreStore.config?.globalInjections);
+      console.log('Stack trace:');
+      console.log(err.stack);
+      console.groupEnd();
+    } else {
+      console.groupCollapsed(
+        '%c[DEBUG] userMenu changed',
+        'color: orange; font-weight: bold;'
+      );
+      console.log('old value:', oldVal);
+      console.log('new value:', newVal);
+      console.log('coreStore.config.globalInjections:', coreStore.config?.globalInjections);
+      console.groupEnd();
+    }
+  },
+  { deep: false, immediate: false }
+);
+
 function hideSidebar(): void {
   sideBarOpen.value = false;
 }
@@ -246,6 +314,8 @@ function handleCustomLayout() {
   } else if (route.meta?.sidebarAndHeader === 'preferIconOnly') {
     defaultLayout.value = true;
     isSidebarIconOnly.value = true;
+  } else if (route.meta?.sidebarAndHeader === 'headerOnly') {
+    headerOnlyLayout.value = true;
   } else {
     defaultLayout.value = true;
   }
diff --git a/adminforth/spa/src/components/GroupsTable.vue b/adminforth/spa/src/components/GroupsTable.vue
@@ -55,7 +55,7 @@
               @update:emptiness="customComponentsEmptiness[$event.name] = $event.value"
               :readonly="readonlyColumns?.includes(column.name)"
             />
-            <div v-if="columnError(column) && validating" class="mt-1 text-xs text-lightInputErrorColor dark:text-darkInputErrorColor">{{ columnError(column) }}</div>
+            <div v-if="columnError(column) && validating" class="af-invalid-field-message mt-1 text-xs text-lightInputErrorColor dark:text-darkInputErrorColor">{{ columnError(column) }}</div>
             <div v-if="column.editingNote && column.editingNote[mode]" class="mt-1 text-xs text-lightFormFieldTextColor dark:text-darkFormFieldTextColor">{{ column.editingNote[mode] }}</div>
           </td>
         </tr>
diff --git a/adminforth/spa/src/components/ResourceForm.vue b/adminforth/spa/src/components/ResourceForm.vue
@@ -377,4 +377,9 @@ watch(() => isValid.value, (value) => {
   emit('update:isValid', value);
 });
 
+defineExpose({
+  columnError,
+  editableColumns,
+})
+
 </script>
diff --git a/adminforth/spa/src/components/ResourceListTable.vue b/adminforth/spa/src/components/ResourceListTable.vue
@@ -15,7 +15,7 @@
       <tbody>
         <!-- table header -->
         <tr class="t-header sticky z-20 top-0 text-xs text-lightListTableHeadingText bg-lightListTableHeading dark:bg-darkListTableHeading dark:text-darkListTableHeadingText">
-          <td scope="col" class="p-4 sticky-column bg-lightListTableHeading dark:bg-darkListTableHeading">
+          <td scope="col" class="list-table-header-cell p-4 sticky-column bg-lightListTableHeading dark:bg-darkListTableHeading">
             <Checkbox
               :modelValue="allFromThisPageChecked"
               :disabled="!rows || !rows.length"
@@ -25,7 +25,7 @@
             </Checkbox>
           </td>
 
-          <td v-for="c in columnsListed" ref="headerRefs" scope="col" class="px-2 md:px-3 lg:px-6 py-3" :class="{'sticky-column bg-lightListTableHeading dark:bg-darkListTableHeading': c.listSticky}">
+          <td v-for="c in columnsListed" ref="headerRefs" scope="col" class="list-table-header-cell px-2 md:px-3 lg:px-6 py-3" :class="{'sticky-column bg-lightListTableHeading dark:bg-darkListTableHeading': c.listSticky}">
           
             <div @click="(evt) => c.sortable && onSortButtonClick(evt, c.name)" 
                 class="flex items-center " :class="{'cursor-pointer':c.sortable}">
@@ -86,7 +86,7 @@
         <tr @click="onClick($event,row)" 
           v-else v-for="(row, rowI) in rows" :key="`row_${row._primaryKeyValue}`"
           ref="rowRefs"
-          class="bg-lightListTable dark:bg-darkListTable border-lightListBorder dark:border-gray-700 hover:bg-lightListTableRowHover dark:hover:bg-darkListTableRowHover"
+          class="list-table-body-row bg-lightListTable dark:bg-darkListTable border-lightListBorder dark:border-gray-700 hover:bg-lightListTableRowHover dark:hover:bg-darkListTableRowHover"
 
           :class="{'border-b': rowI !== rows.length - 1, 'cursor-pointer': row._clickUrl !== null}"
         >
@@ -620,9 +620,10 @@ td.sticky-column {
     @apply left-[56px];
   }
 }
-tr:not(:first-child):hover {
-  td.sticky-column {
+tr.list-table-body-row:not(:first-child):hover {
+  td.sticky-column:not(.list-table-header-cell) {
     @apply bg-lightListTableRowHover dark:bg-darkListTableRowHover;
   }
 }
+
 </style>
diff --git a/adminforth/spa/src/components/ResourceListTableVirtual.vue b/adminforth/spa/src/components/ResourceListTableVirtual.vue
@@ -19,7 +19,7 @@
       <tbody>
         <!-- table header -->
         <tr class="t-header sticky z-20 top-0 text-xs  bg-lightListTableHeading dark:bg-darkListTableHeading dark:text-gray-400">
-          <td scope="col" class="p-4 sticky-column bg-lightListTableHeading dark:bg-darkListTableHeading">
+          <td scope="col" class="list-table-header-cell  p-4 sticky-column bg-lightListTableHeading dark:bg-darkListTableHeading">
             <Checkbox
               :modelValue="allFromThisPageChecked"
               :disabled="!rows || !rows.length"
@@ -29,7 +29,7 @@
             </Checkbox>
           </td>
 
-          <td v-for="c in columnsListed" ref="headerRefs" scope="col" class="px-2 md:px-3 lg:px-6 py-3" :class="{'sticky-column bg-lightListTableHeading dark:bg-darkListTableHeading': c.listSticky}">
+          <td v-for="c in columnsListed" ref="headerRefs" scope="col" class="list-table-header-cell  px-2 md:px-3 lg:px-6 py-3" :class="{'sticky-column bg-lightListTableHeading dark:bg-darkListTableHeading': c.listSticky}">
           
             <div @click="(evt) => c.sortable && onSortButtonClick(evt, c.name)" 
                 class="flex items-center " :class="{'cursor-pointer':c.sortable}">
@@ -97,7 +97,7 @@
           v-for="(row, rowI) in visibleRows" 
           :key="`row_${row._primaryKeyValue}`"
           ref="rowRefs"
-          class="bg-lightListTable dark:bg-darkListTable border-lightListBorder dark:border-gray-700 hover:bg-lightListTableRowHover dark:hover:bg-darkListTableRowHover"
+          class="list-table-body-row bg-lightListTable dark:bg-darkListTable border-lightListBorder dark:border-gray-700 hover:bg-lightListTableRowHover dark:hover:bg-darkListTableRowHover"
           :class="{'border-b': rowI !== visibleRows.length - 1, 'cursor-pointer': row._clickUrl !== null}"
           @mounted="(el: any) => updateRowHeight(`row_${row._primaryKeyValue}`, el.offsetHeight)"
         >
@@ -761,8 +761,8 @@ td.sticky-column {
     @apply left-[56px];
   }
 }
-tr:not(:first-child):hover {
-  td.sticky-column {
+tr.list-table-body-row:not(:first-child):hover {
+  td.sticky-column:not(.list-table-header-cell) {
     @apply bg-lightListTableRowHover dark:bg-darkListTableRowHover;
   }
 }
diff --git a/adminforth/spa/src/components/UserMenuSettingsButton.vue b/adminforth/spa/src/components/UserMenuSettingsButton.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="min-w-40">
+  <div v-if="options && options.length" class="min-w-40">
     <div class="cursor-pointer flex items-center justify-between gap-1 block px-4 py-2 text-sm 
       bg-lightUserMenuItemBackground hover:bg-lightUserMenuItemBackgroundHover text-lightUserMenuItemText 
       hover:text-lightUserMenuItemText dark:bg-darkUserMenuItemBackground dark:hover:bg-darkUserMenuItemBackgroundHover 
@@ -50,7 +50,7 @@ const showDropdown = ref(false);
 const props = defineProps(['meta', 'resource']);
 
 const options = computed(() => {
-  return coreStore.config?.settingPages?.map((page) => {
+  return coreStore.config?.settingPages?.filter(page => page.isVisible).map((page) => {
     return {
       pageLabel: page.pageLabel,
       slug: page.slug || null,
diff --git a/adminforth/spa/src/stores/core.ts b/adminforth/spa/src/stores/core.ts
@@ -198,6 +198,7 @@ export const useCoreStore = defineStore('core', () => {
       path: '/get_public_config',
       method: 'GET',
     });
+    console.log('📦 getPublicConfig', res);
     config.value = {...config.value, ...res};
   }
 
@@ -206,6 +207,7 @@ export const useCoreStore = defineStore('core', () => {
       path: '/get_login_form_config',
       method: 'GET',
     });
+    console.log('📦 getLoginFormConfig', res);
     config.value = {...config.value, ...res};
   }
 
diff --git a/adminforth/spa/src/views/CreateView.vue b/adminforth/spa/src/views/CreateView.vue
diff --git a/adminforth/spa/src/views/SettingsView.vue b/adminforth/spa/src/views/SettingsView.vue
diff --git a/adminforth/types/Back.ts b/adminforth/types/Back.ts
diff --git a/adminforth/types/Common.ts b/adminforth/types/Common.ts

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ E.g. create group "Blog" with Items who link to resource "posts" and "categories`
`23`	`23`	```ts title='./index.ts'
`24`	`24`	`{`
`25`	`25`	`...`
`26`		`- menu: {`
	`26`	`+ menu: [`
`27`	`27`	`{`
`28`	`28`	`label: 'Blog',`
`29`	`29`	`icon: 'flowbite:brain-solid',`
`@@ -46,7 +46,7 @@ E.g. create group "Blog" with Items who link to resource "posts" and "categories`
`46`	`46`	`icon: 'flowbite:folder-duplicate-outline',`
`47`	`47`	`resourceId: 'adminuser',`
`48`	`48`	`},`
`49`		`- },`
	`49`	`+ ],`
`50`	`50`	`...`
`51`	`51`	`}`
`52`	`52`	```
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ export default {`
`63`	`63`	`}`
`64`	`64`	```
`65`	`65`
`66`		`-You can also specify on which page you want to create or delete groups. If you assign null, the groups will disappear from this page.`
	`66`	`+You can also specify on which page you want to create groups.`
`67`	`67`
`68`	`68`	```typescript title="./resources/apartments.ts"
`69`	`69`	`export default {`
`@@ -89,10 +89,6 @@ export default {`
`89`	`89`	`}`
`90`	`90`	`//diff-add`
`91`	`91`	`],`
`92`		`- //diff-add`
`93`		`- editFieldGroups: null,`
`94`		`- //diff-add`
`95`		`- showFieldGroups: null,`
`96`	`92`	`}`
`97`	`93`	`}`
`98`	`94`	```
Original file line number	Diff line number	Diff line change
`@@ -807,17 +807,23 @@ export default class ConfigValidator implements IConfigValidator {`
`807`	`807`	`if (typeof condition !== 'object') {`
`808`	`808`	`return;`
`809`	`809`	`}`
	`810`	`+ const relatedColumn = res.columns.find((c) => c.name === field);`
	`811`	`+ if (!relatedColumn) {`
	`812`	`+ const similar = suggestIfTypo(res.columns.map((c) => c.name), field);`
	`813`	+ errors.push(`Resource "${res.resourceId}" column "${column.name}" has showIf on unknown column "${field}". ${similar ? `Did you mean "${similar}"?` : ''}`);
	`814`	`+ return;`
	`815`	`+ }`
`810`	`816`	`if ("$in" in condition && !Array.isArray(condition.$in)) {`
`811`	`817`	errors.push(`Resource "${res.resourceId}" column "${column.name}" has showIf with $in that is not an array`);
`812`	`818`	`}`
`813`	`819`	`if ("$nin" in condition && !Array.isArray(condition.$nin)) {`
`814`	`820`	errors.push(`Resource "${res.resourceId}" column "${column.name}" has showIf with $nin that is not an array`);
`815`	`821`	`}`
`816`		`- if ("$includes" in condition && !column.isArray) {`
`817`		- errors.push(`Resource "${res.resourceId}" has showIf with $includes on non-array column "${column.name}"`);
	`822`	`+ if ("$includes" in condition && !relatedColumn.isArray?.enabled) {`
	`823`	+ errors.push(`Resource "${res.resourceId}" has showIf with $includes on non-array column "${relatedColumn.name}"`);
`818`	`824`	`}`
`819`		`- if ("$nincludes" in condition && !column.isArray) {`
`820`		- errors.push(`Resource "${res.resourceId}" has showIf with $nincludes on non-array column "${column.name}"`);
	`825`	`+ if ("$nincludes" in condition && !relatedColumn.isArray?.enabled) {`
	`826`	+ errors.push(`Resource "${res.resourceId}" has showIf with $nincludes on non-array column "${relatedColumn.name}"`);
`821`	`827`	`}`
`822`	`828`	`});`
`823`	`829`	`}`