Merge branch 'next' into AdminForth/743

Author: yaroslav8765

adminforth/commands/createApp/templates/index.ts.hbs

@@ -3,6 +3,7 @@ import AdminForth from 'adminforth';
 import usersResource from "./resources/adminuser.js";
 import { fileURLToPath } from 'url';
 import path from 'path';
+import { Filters } from 'adminforth';
 
 const ADMIN_BASE_URL = '';
 
@@ -15,6 +16,12 @@ export const admin = new AdminForth({
     rememberMeDays: 30,
     loginBackgroundImage: 'https://images.unsplash.com/photo-1534239697798-120952b76f2b?q=80&w=3389&auto=format&fit=crop&ixlib=rb-4.0.3&ixid=M3wxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8fA%3D%3D',
     loginBackgroundPosition: '1/2',
+    loginPromptHTML: async () => { 
+      const adminforthUserExists = await admin.resource("adminuser").count(Filters.EQ('email', 'adminforth')) > 0;
+      if (adminforthUserExists) {
+        return "Please use <b>adminforth</b> as username and <b>adminforth</b> as password"
+      }
+    },
   },
   customization: {
     brandName: "{{appName}}",

adminforth/commands/createCustomComponent/configLoader.js

@@ -2,7 +2,10 @@ import fs from 'fs/promises';
 import path from 'path';
 import chalk from 'chalk';
 import jiti from 'jiti';
+import dotenv from "dotenv";
 
+dotenv.config({ path: '.env.local', override: true });
+dotenv.config({ path: '.env', override: true });
 
 export async function loadAdminForthConfig() {
   const configFileName = 'index.ts';

adminforth/dataConnectors/baseConnector.ts

@@ -114,7 +114,23 @@ export default class AdminForthBaseConnector implements IAdminForthDataSourceCon
       const fieldObj = resource.dataSourceColumns.find((col) => col.name == (filters as IAdminForthSingleFilter).field);
       if (!fieldObj) {
         const similar = suggestIfTypo(resource.dataSourceColumns.map((col) => col.name), (filters as IAdminForthSingleFilter).field);
-        throw new Error(`Field '${(filters as IAdminForthSingleFilter).field}' not found in resource '${resource.resourceId}'. ${similar ? `Did you mean '${similar}'?` : ''}`);
+        
+        let isPolymorphicTarget = false;
+        if (global.adminforth?.config?.resources) {
+          isPolymorphicTarget = global.adminforth.config.resources.some(res => 
+            res.dataSourceColumns.some(col => 
+              col.foreignResource?.polymorphicResources?.some(pr => 
+                pr.resourceId === resource.resourceId
+              )
+            )
+          );
+        }
+        if (isPolymorphicTarget) {
+          process.env.HEAVY_DEBUG && console.log(`⚠️  Field '${(filters as IAdminForthSingleFilter).field}' not found in polymorphic target resource '${resource.resourceId}', allowing query to proceed.`);
+          return { ok: true, error: '' };
+        } else {
+          throw new Error(`Field '${(filters as IAdminForthSingleFilter).field}' not found in resource '${resource.resourceId}'. ${similar ? `Did you mean '${similar}'?` : ''}`);
+        }
       }
       // value normalization
       if (filters.operator == AdminForthFilterOperators.IN || filters.operator == AdminForthFilterOperators.NIN) {

adminforth/documentation/docs/tutorial/001-gettingStarted.md

@@ -292,6 +292,7 @@ export default {
       name: 'realtor_id',
       foreignResource: {
         resourceId: 'adminuser',
+        searchableFields: ["id", "email"], // fields available for search in filter
       }
     }
   ],

adminforth/documentation/docs/tutorial/03-Customization/02-customFieldRendering.md

@@ -194,6 +194,7 @@ const props = defineProps<{
   meta: any;
   resource: AdminForthResourceCommon;
   adminUser: AdminUser;
+  readonly: boolean;
 }>();
 
 const emit = defineEmits(["update:value"]);

adminforth/documentation/docs/tutorial/03-Customization/13-standardPagesTuning.md

@@ -640,6 +640,31 @@ export default {
   ],
 ```
 
+### Searchable fields 
+
+Enable search in filter dropdown by specifying which fields to search:
+
+```typescript title="./resources/apartments.ts"
+export default {
+      name: 'apartments',
+      columns: [
+        ...
+        {
+          name: "realtor_id",
+          foreignResource: {
+            resourceId: 'adminuser',
+//diff-add
+            searchableFields: ["id", "email"], 
+//diff-add
+            searchIsCaseSensitive: true, // default false
+          },
+        },
+      ],
+    },
+    ...
+  ],
+```
+
 ### Polymorphic foreign resources
 
 Sometimes it is needed for one column to be a foreign key for multiple tables. For example, given the following schema:

adminforth/documentation/docs/tutorial/03-Customization/15-afcl.md

@@ -362,6 +362,31 @@ const enable = ref(false)
   </div>
 </div>
 
+
+## Toggle
+
+<div class="split-screen" >
+  <div >
+
+```ts
+import Toggle from '@/afcl/Toggle.vue';
+```
+
+
+```html
+  <Toggle 
+    :disabled="false" 
+    @update:modelValue="toggleSwitchHandler"> 
+    <p>Click me</p> 
+  </Toggle>
+```
+  </div>
+  <div>
+  ![AFCL Checkbox](image-94.png)
+  </div>
+</div>
+
+
 ## Dialog (Pop-up)
 
 <div class="split-screen" >

adminforth/documentation/docs/tutorial/03-Customization/image-94.png

@@ -511,7 +511,7 @@ class AdminForth implements IAdminForth {
   async createResourceRecord(
     { resource, record, adminUser, extra }: 
     { resource: AdminForthResource, record: any, adminUser: AdminUser, extra?: HttpExtra }
-  ): Promise<{ error?: string, createdRecord?: any }> {
+  ): Promise<{ error?: string, createdRecord?: any, newRecordId?: any }> {
 
     const err = this.validateRecordValues(resource, record, 'create');
     if (err) {
@@ -528,8 +528,18 @@ class AdminForth implements IAdminForth {
         adminforth: this,
         extra,
       });
-      if (!resp || (!resp.ok && !resp.error)) {
-        throw new Error(`Hook beforeSave must return object with {ok: true} or { error: 'Error' } `);
+      if (!resp || (typeof resp.ok !== 'boolean' && (!resp.error && !resp.newRecordId))) {
+        throw new Error(
+          `Invalid return value from beforeSave hook. Expected: { ok: boolean, error?: string | null, newRecordId?: any }.\n` +
+          `Note: Return { ok: false, error: null, newRecordId } to stop creation and redirect to an existing record.`
+        );
+      }
+      if (resp.ok === false && !resp.error) {
+        const { error, ok, newRecordId } = resp;
+        return {
+          error: error ?? 'Operation aborted by hook',
+          newRecordId: newRecordId
+        };
       }
       if (resp.error) {
         return { error: resp.error };
@@ -605,8 +615,11 @@ class AdminForth implements IAdminForth {
         adminforth: this,
         extra,
       });
-      if (!resp || (!resp.ok && !resp.error)) {
-        throw new Error(`Hook beforeSave must return object with {ok: true} or { error: 'Error' } `);
+      if (!resp || typeof resp.ok !== 'boolean') {
+        throw new Error(`Hook beforeSave must return { ok: boolean, error?: string | null }`);
+      }
+      if (resp.ok === false && !resp.error) {
+        return { error: resp.error ?? 'Operation aborted by hook' };
       }
       if (resp.error) {
         return { error: resp.error };

adminforth/index.ts

@@ -658,6 +658,46 @@ export default class ConfigValidator implements IConfigValidator {
             }
           }
 
+          if (col.foreignResource.searchableFields) {
+            const searchableFields = Array.isArray(col.foreignResource.searchableFields) 
+              ? col.foreignResource.searchableFields 
+              : [col.foreignResource.searchableFields];
+
+            searchableFields.forEach((fieldName) => {
+              if (typeof fieldName !== 'string') {
+                errors.push(`Resource "${res.resourceId}" column "${col.name}" foreignResource.searchableFields must contain only strings`);
+                return;
+              }
+
+              if (col.foreignResource.resourceId) {
+                const targetResource = this.inputConfig.resources.find((r) => r.resourceId === col.foreignResource.resourceId || r.table === col.foreignResource.resourceId);
+                if (targetResource) {
+                  const targetColumn = targetResource.columns.find((targetCol) => targetCol.name === fieldName);
+                  if (!targetColumn) {
+                    const similar = suggestIfTypo(targetResource.columns.map((c) => c.name), fieldName);
+                    errors.push(`Resource "${res.resourceId}" column "${col.name}" foreignResource.searchableFields contains field "${fieldName}" which does not exist in target resource "${targetResource.resourceId || targetResource.table}". ${similar ? `Did you mean "${similar}"?` : ''}`);
+                  }
+                }
+              } else if (col.foreignResource.polymorphicResources) {
+                let hasFieldInAnyResource = false;
+                for (const pr of col.foreignResource.polymorphicResources) {
+                  if (pr.resourceId) {
+                    const targetResource = this.inputConfig.resources.find((r) => r.resourceId === pr.resourceId || r.table === pr.resourceId);
+                    if (targetResource) {
+                      const hasField = targetResource.columns.some((targetCol) => targetCol.name === fieldName);
+                      if (hasField) {
+                        hasFieldInAnyResource = true;
+                      }
+                    }
+                  }
+                }      
+                if (!hasFieldInAnyResource) {
+                  errors.push(`Resource "${res.resourceId}" column "${col.name}" foreignResource.searchableFields contains field "${fieldName}" which does not exist in any of the polymorphic target resources`);
+                }
+              }
+            });
+          }
+
           if (col.foreignResource.unsetLabel) {
             if (typeof col.foreignResource.unsetLabel !== 'string') {
               errors.push(`Resource "${res.resourceId}" column "${col.name}" has foreignResource unsetLabel which is not a string`);
@@ -666,6 +706,12 @@ export default class ConfigValidator implements IConfigValidator {
             // set default unset label
             col.foreignResource.unsetLabel = 'Unset';
           }
+
+          // Set default searchIsCaseSensitive
+          if (col.foreignResource.searchIsCaseSensitive === undefined) {
+            col.foreignResource.searchIsCaseSensitive = false;
+          }
+
           const befHook = col.foreignResource.hooks?.dropdownList?.beforeDatasourceRequest;
           if (befHook) {
             if (!Array.isArray(befHook)) {