Merge pull request #431 from devforth/next

Next

Author: yaroslav8765

adminforth/dataConnectors/postgres.ts

@@ -400,6 +400,8 @@ class PostgresConnector extends AdminForthBaseConnector implements IAdminForthDa
         }
         const primaryKey = this.getPrimaryKey(resource);
         const q = `INSERT INTO "${tableName}" (${columns.join(', ')}) VALUES (${placeholders}) RETURNING "${primaryKey}"`;
+    //   console.log('\n🔵 [PG INSERT]:', q);
+    //   console.log('📦 [VALUES]:', JSON.stringify(values, null, 2));
         if (process.env.HEAVY_DEBUG_QUERY) {
             console.log('🪲📜 PG Q:', q, 'values:', values);
         }

adminforth/dataConnectors/sqlite.ts

@@ -143,6 +143,12 @@ class SQLiteConnector extends AdminForthBaseConnector implements IAdminForthData
         } else {
           return value;
         }
+              }
+      else if (field.isArray?.enabled) {
+        if (value === null || value === undefined) {
+            return null;
+        }
+        return JSON.stringify(value);
       } else if (field.type == AdminForthDataTypes.BOOLEAN) {
         return value === null ? null : (value ? 1 : 0);
       } else if (field.type == AdminForthDataTypes.JSON) {
@@ -322,7 +328,14 @@ class SQLiteConnector extends AdminForthBaseConnector implements IAdminForthData
       const columns = Object.keys(record);
       const placeholders = columns.map(() => '?').join(', ');
       const values = columns.map((colName) => record[colName]);
-      const q = this.client.prepare(`INSERT INTO ${tableName} (${columns.join(', ')}) VALUES (${placeholders})`);
+      // const q = this.client.prepare(`INSERT INTO ${tableName} (${columns.join(', ')}) VALUES (${placeholders})`);
+      const sql = `INSERT INTO ${tableName} (${columns.join(', ')}) VALUES (${placeholders})`;
+      //console.log('\n🟢 [SQLITE INSERT]:', sql);
+      //console.log('📦 [VALUES]:', JSON.stringify(values, null, 2));
+      const q = this.client.prepare(sql);
+      if (process.env.HEAVY_DEBUG_QUERY) {
+            console.log('🪲📜 SQL Q:', q, 'values:', values);
+        }
       const ret = await q.run(values);
       return ret.lastInsertRowid;
     }

adminforth/documentation/docs/tutorial/07-Plugins/04-RichEditor.md

@@ -227,12 +227,7 @@ export default {
       filePath: ({ originalFilename, originalExtension, contentType }) =>
         `description_images/${new Date().getFullYear()}/${uuid()}/${originalFilename}.${originalExtension}`,
 
-      preview: {
-        // Used to display preview (if it is image) in list and show views instead of just path
-        // previewUrl: ({s3Path}) => `https://tmpbucket-adminforth.s3.eu-central-1.amazonaws.com/${s3Path}`,
-        // show image preview instead of path in list view
-        // showInList: false,
-      },
+
     }),
   ],
 } as AdminForthResourceInput;

adminforth/documentation/docs/tutorial/07-Plugins/05-upload.md

@@ -31,7 +31,8 @@ Leave all settings unchanged (ACL Disabled, Block all public access - checked)
         ],
         "AllowedMethods": [
             "HEAD",
-            "PUT"
+            "PUT",
+            "GET"
         ],
         "AllowedOrigins": [
             "http://localhost:3500"

adminforth/documentation/docs/tutorial/07-Plugins/11-oauth.md

@@ -350,4 +350,43 @@ Links to adapters:
 [Google](https://github.com/devforth/adminforth-google-oauth-adapter)
 [GitHub](https://github.com/devforth/adminforth-github-oauth-adapter)
 [Facebook](https://github.com/devforth/adminforth-facebook-oauth-adapter)
-[Keycloak](https://github.com/devforth/adminforth-keycloak-oauth-adapter)
+[Keycloak](https://github.com/devforth/adminforth-keycloak-oauth-adapter)
+
+
+## Fill user full name
+
+If you have a fullName field in your users resource, you can add it to the plugin setup:
+
+```ts
+
+plugins: [
+  ...
+
+  new OAuthPlugin({
+
+    ...
+
+    userFullNameField: 'fullName'
+
+    ...
+
+  }),
+]
+
+```
+
+This field will be automatically filled with the name that the provider returns, if this field was empty.
+
+> ☝️Not all providers return full name or even if they do, there is no guarantee that they will be correct
+
+> Google Adapter: returns fullName, but if there is no last name - it will return only first name
+
+>Facebook: returns fullName
+
+>Github: returns name or fullName (depends of what user added in name field)
+
+>Keycloak: returns fullName
+
+>Microsoft: returns fullName
+
+>Twitch: return only users display name

adminforth/modules/configValidator.ts

@@ -1159,6 +1159,18 @@ export default class ConfigValidator implements IConfigValidator {
       } else {
         newConfig.auth.beforeLoginConfirmation = blc;
       }
+
+      // normalize adminUserAuthorize hooks
+      const aua = this.inputConfig.auth.adminUserAuthorize;
+      if (!Array.isArray(aua)) {
+        if (aua) {
+          newConfig.auth.adminUserAuthorize = [aua];
+        } else {
+          newConfig.auth.adminUserAuthorize = [];
+        }
+      } else {
+        newConfig.auth.adminUserAuthorize = aua;
+      }
     }
 
     // check for duplicate resourceIds and show which ones are duplicated

adminforth/modules/restApi.ts

@@ -15,10 +15,10 @@ import {
   Filters,
 } from "../types/Back.js";
 
-import { ADMINFORTH_VERSION, listify, md5hash, getLoginPromptHTML } from './utils.js';
+import { ADMINFORTH_VERSION, listify, md5hash, getLoginPromptHTML, checkShowIf } from './utils.js';
 
 import AdminForthAuth from "../auth.js";
-import { ActionCheckSource, AdminForthConfigMenuItem, AdminForthDataTypes, AdminForthFilterOperators, AdminForthResourceCommon, AdminForthResourcePages,
+import { ActionCheckSource, AdminForthConfigMenuItem, AdminForthDataTypes, AdminForthFilterOperators, AdminForthResourceColumnInputCommon, AdminForthResourceCommon, AdminForthResourcePages,
    AdminUser, AllowedActionsEnum, AllowedActionsResolved, 
    AnnouncementBadgeResponse,
    GetBaseConfigResponse,
@@ -323,10 +323,13 @@ export default class AdminForthRestAPI implements IAdminForthRestAPI {
 
         const userPk = dbUser[userResource.columns.find((col) => col.primaryKey).name];
 
+        const userAvatarUrl = await this.adminforth.config.auth.avatarUrl?.(adminUser);
+
         const userData = {
             [this.adminforth.config.auth.usernameField]: username,
             [this.adminforth.config.auth.userFullNameField]: userFullName,
             pk: userPk,
+            userAvatarUrl: userAvatarUrl || null,
         };
         const checkIsMenuItemVisible = (menuItem) => {
           if (typeof menuItem.visible === 'function') {
@@ -1177,7 +1180,10 @@ export default class AdminForthRestAPI implements IAdminForthRestAPI {
                   record[column.name] === undefined &&
                   column.showIn.create
               ) {
-                  return { error: `Column '${column.name}' is required`, ok: false };
+                  const isColumnShownWithShowIf = await checkShowIf(column as AdminForthResourceColumnInputCommon, record) ;
+                  if (isColumnShownWithShowIf === true) {
+                    return { error: `Column '${column.name}' is required`, ok: false };
+                  }
               }
             }
 
@@ -1200,8 +1206,11 @@ export default class AdminForthRestAPI implements IAdminForthRestAPI {
             for (const column of resource.columns) {
               if ((column.required as { create?: boolean })?.create) {
                 const shown = await isShown(column, 'create', ctxCreate);
-                if (shown && record[column.name] === undefined) {
-                  return { error: `Column '${column.name}' is required`, ok: false };
+                const isColumnShownWithShowIf = await checkShowIf(column as AdminForthResourceColumnInputCommon , record) ;
+                if (isColumnShownWithShowIf === true) {
+                  if (shown && record[column.name] === undefined) {
+                    return { error: `Column '${column.name}' is required`, ok: false };
+                  }
                 }
               }
             }

adminforth/modules/utils.ts

@@ -3,7 +3,7 @@ import { fileURLToPath } from 'url';
 import fs from 'fs';
 import Fuse from 'fuse.js';
 import crypto from 'crypto';
-import AdminForth, { AdminForthConfig } from '../index.js';
+import AdminForth, { AdminForthConfig, AdminForthResourceColumnInputCommon, Predicate } from '../index.js';
 import { RateLimiterMemory, RateLimiterAbstract } from "rate-limiter-flexible";
 // @ts-ignore-next-line
 
@@ -478,4 +478,60 @@ export function slugifyString(str: string): string {
     .toLowerCase()
     .replace(/\s+/g, '-')
     .replace(/[^a-z0-9-_]/g, '-');
+}
+
+export function checkShowIf(c: AdminForthResourceColumnInputCommon, record: Record<string, any>) {
+  if (!c.showIf) return true;
+
+  const evaluatePredicate = (predicate: Predicate): boolean => {
+    const results: boolean[] = [];
+
+    if ("$and" in predicate) {
+      results.push(predicate.$and.every(evaluatePredicate));
+    }
+
+    if ("$or" in predicate) {
+      results.push(predicate.$or.some(evaluatePredicate));
+    }
+
+    const fieldEntries = Object.entries(predicate).filter(([key]) => !key.startsWith('$'));
+    if (fieldEntries.length > 0) {
+      const fieldResult = fieldEntries.every(([field, condition]) => {
+        const recordValue = record[field];
+
+        if (condition === undefined) {
+          return true;
+        }
+        if (typeof condition !== "object" || condition === null) {
+          return recordValue === condition;
+        }
+
+        if ("$eq" in condition) return recordValue === condition.$eq;
+        if ("$not" in condition) return recordValue !== condition.$not;
+        if ("$gt" in condition) return recordValue > condition.$gt;
+        if ("$gte" in condition) return recordValue >= condition.$gte;
+        if ("$lt" in condition) return recordValue < condition.$lt;
+        if ("$lte" in condition) return recordValue <= condition.$lte;
+        if ("$in" in condition) return (Array.isArray(condition.$in) && condition.$in.includes(recordValue));
+        if ("$nin" in condition) return (Array.isArray(condition.$nin) && !condition.$nin.includes(recordValue));
+        if ("$includes" in condition)
+          return (
+            Array.isArray(recordValue) &&
+            recordValue.includes(condition.$includes)
+          );
+        if ("$nincludes" in condition)
+          return (
+            Array.isArray(recordValue) &&
+            !recordValue.includes(condition.$nicludes)
+          );
+
+        return true;
+      });
+      results.push(fieldResult);
+    }
+
+    return results.every(result => result);
+  };
+
+  return evaluatePredicate(c.showIf);
 }

adminforth/spa/package-lock.json

@@ -15,6 +15,7 @@
   "dependencies": {
     "@iconify-prerendered/vue-flag": "^0.28.1748584105",
     "@iconify-prerendered/vue-flowbite": "^0.28.1754899090",
+    "@iconify-prerendered/vue-humbleicons": "^0.28.1754108846",
     "@unhead/vue": "^1.9.12",
     "@vueuse/core": "^10.10.0",
     "apexcharts": "^4.7.0",