adminforth 1.3.41 → 1.3.43

package/dist/modules/codeInjector.js

@@ -24,6 +24,36 @@ try {
 catch (e) {
     TMP_DIR = '/tmp';
 }
+function findHomePage(menuItem) {
+    for (const item of menuItem) {
+        if (item.homepage) {
+            return item;
+        }
+        if (item.children) {
+            const found = findHomePage(item.children);
+            if (found) {
+                return found;
+            }
+        }
+    }
+    return undefined;
+}
+function findFirstMenuItemWithResource(menuItem) {
+    return __awaiter(this, void 0, void 0, function* () {
+        for (const item of menuItem) {
+            if (item.path || item.resourceId) {
+                return item;
+            }
+            if (item.children) {
+                const found = yield findFirstMenuItemWithResource(item.children);
+                if (found) {
+                    return found;
+                }
+            }
+        }
+        return undefined;
+    });
+}
 const execAsync = promisify(exec);
 function hashify(obj) {
     return crypto.createHash('sha256').update(JSON.stringify(obj)).digest('hex');
@@ -128,7 +158,7 @@ class CodeInjector {
     }
     prepareSources(_a) {
         return __awaiter(this, arguments, void 0, function* ({ filesUpdated }) {
-            var _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
+            var _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
             // check SPA_TMP_PATH exists and create if not
             try {
                 yield fs.promises.access(CodeInjector.SPA_TMP_PATH, fs.constants.F_OK);
@@ -377,12 +407,17 @@ class CodeInjector {
                     `${this.adminforth.baseUrlSlashed}assets/favicon.png`);
             yield fs.promises.writeFile(indexHtmlPath, indexHtmlContent);
             /* generate custom routes */
-            const homepageMenuItem = this.adminforth.config.menu.find((mi) => mi.homepage);
-            let childrenHomePageMenuItem = this.adminforth.config.menu.find((mi) => { var _a; return mi.children && ((_a = mi.children) === null || _a === void 0 ? void 0 : _a.find((mi) => mi.homepage)); });
-            let childrenHomepage = (_j = childrenHomePageMenuItem === null || childrenHomePageMenuItem === void 0 ? void 0 : childrenHomePageMenuItem.children) === null || _j === void 0 ? void 0 : _j.find((mi) => mi.homepage);
-            let homePagePath = (homepageMenuItem === null || homepageMenuItem === void 0 ? void 0 : homepageMenuItem.path) || `/resource/${childrenHomepage === null || childrenHomepage === void 0 ? void 0 : childrenHomepage.resourceId}`;
+            let homepageMenuItem = findHomePage(this.adminforth.config.menu);
+            if (!homepageMenuItem) {
+                // find first item with path or resourceId. If we face a menu item with children earlier then path/resourceId, we should search in children
+                homepageMenuItem = yield findFirstMenuItemWithResource(this.adminforth.config.menu);
+            }
+            if (!homepageMenuItem) {
+                throw new Error('No homepage found in menu and no menu item with path/resourceId found. AdminForth can not generate routes');
+            }
+            let homePagePath = homepageMenuItem.path || `/resource/${homepageMenuItem.resourceId}`;
             if (!homePagePath) {
-                homePagePath = ((_k = this.adminforth.config.menu.filter((mi) => mi.path)[0]) === null || _k === void 0 ? void 0 : _k.path) || `/resource/${(_l = this.adminforth.config.menu.filter((mi) => mi.children)[0]) === null || _l === void 0 ? void 0 : _l.resourceId}`;
+                homePagePath = ((_j = this.adminforth.config.menu.filter((mi) => mi.path)[0]) === null || _j === void 0 ? void 0 : _j.path) || `/resource/${(_k = this.adminforth.config.menu.filter((mi) => mi.children)[0]) === null || _k === void 0 ? void 0 : _k.resourceId}`;
             }
             routes += `{
       path: '/',
@@ -399,7 +434,7 @@ class CodeInjector {
             /* customPackageLock */
             let usersLockHash = '';
             let usersPackages = [];
-            if ((_m = this.adminforth.config.customization) === null || _m === void 0 ? void 0 : _m.customComponentsDir) {
+            if ((_l = this.adminforth.config.customization) === null || _l === void 0 ? void 0 : _l.customComponentsDir) {
                 [usersLockHash, usersPackages] = yield this.packagesFromNpm(this.adminforth.config.customization.customComponentsDir);
             }
             const pluginPackages = [];

package/dist/modules/configValidator.js

@@ -176,6 +176,15 @@ export default class ConfigValidator {
                     }
                     col.showIn = col.showIn || Object.values(AdminForthResourcePages);
                     if (col.foreignResource) {
+                        if (!col.foreignResource.resourceId) {
+                            errors.push(`Resource "${res.resourceId}" column "${col.name}" has foreignResource without resourceId`);
+                        }
+                        const resource = this.config.resources.find((r) => r.resourceId === col.foreignResource.resourceId);
+                        if (!resource) {
+                            const similar = suggestIfTypo(this.config.resources.map((r) => r.resourceId), col.foreignResource.resourceId);
+                            errors.push(`Resource "${res.resourceId}" column "${col.name}" has foreignResource resourceId which is not in resources: "${col.foreignResource.resourceId}". 
+              ${similar ? `Did you mean "${similar}" instead of "${col.foreignResource.resourceId}"?` : ''}`);
+                        }
                         const befHook = (_b = (_a = col.foreignResource.hooks) === null || _a === void 0 ? void 0 : _a.dropdownList) === null || _b === void 0 ? void 0 : _b.beforeDatasourceRequest;
                         if (befHook) {
                             if (!Array.isArray(befHook)) {
@@ -356,7 +365,9 @@ export default class ConfigValidator {
                         errors.push(`Menu item with type 'resource' must have resourceId : ${JSON.stringify(item)}`);
                     }
                     if (item.resourceId && !this.config.resources.find((res) => res.resourceId === item.resourceId)) {
-                        errors.push(`Menu item with type 'resourceId' has resourceId which is not in resources: ${JSON.stringify(item)}`);
+                        const similar = suggestIfTypo(this.config.resources.map((res) => res.resourceId), item.resourceId);
+                        errors.push(`Menu item with type 'resourceId' has resourceId which is not in resources: "${JSON.stringify(item)}". 
+                ${similar ? `Did you mean "${similar}" instead of "${item.resourceId}"?` : ''}`);
                     }
                     if (item.type === 'component' && !item.component) {
                         errors.push(`Menu item with type 'component' must have component : ${JSON.stringify(item)}`);

package/modules/codeInjector.ts

@@ -8,7 +8,7 @@ import path from 'path';
 import { promisify } from 'util';
 import AdminForth from '../index.js';
 import { ADMIN_FORTH_ABSOLUTE_PATH, getComponentNameFromPath, transformObject, deepMerge } from './utils.js';
-import { ICodeInjector } from '../types/AdminForthConfig.js';
+import { AdminForthConfigMenuItem, ICodeInjector } from '../types/AdminForthConfig.js';
 import { StylesGenerator } from './styleGenerator.js';
 import { title } from 'process';
 
@@ -22,6 +22,35 @@ try {
 }
 
 
+function findHomePage(menuItem: AdminForthConfigMenuItem[]): AdminForthConfigMenuItem | undefined {
+  for (const item of menuItem) {
+    if (item.homepage) {
+      return item;
+    }
+    if (item.children) {
+      const found = findHomePage(item.children);
+      if (found) {
+        return found;
+      }
+    }
+  }
+  return undefined;
+}
+async function findFirstMenuItemWithResource(menuItem: AdminForthConfigMenuItem[]): Promise<AdminForthConfigMenuItem | undefined> {
+  for (const item of menuItem) {
+    if (item.path || item.resourceId) {
+      return item;
+    }
+    if (item.children) {
+      const found = await findFirstMenuItemWithResource(item.children);
+      if (found) {
+        return found;
+      }
+    }
+  }
+  return undefined;
+}
+
 const execAsync = promisify(exec);
 
 function hashify(obj) {
@@ -429,10 +458,18 @@ class CodeInjector implements ICodeInjector {
 
 
     /* generate custom routes */
-    const homepageMenuItem = this.adminforth.config.menu.find((mi)=>mi.homepage);
-    let childrenHomePageMenuItem = this.adminforth.config.menu.find((mi)=>mi.children && mi.children?.find((mi)=>mi.homepage));
-    let childrenHomepage = childrenHomePageMenuItem?.children?.find((mi)=>mi.homepage)
-    let homePagePath = homepageMenuItem?.path || `/resource/${childrenHomepage?.resourceId}`;
+
+
+    let homepageMenuItem: AdminForthConfigMenuItem = findHomePage(this.adminforth.config.menu);
+    if (!homepageMenuItem) {
+      // find first item with path or resourceId. If we face a menu item with children earlier then path/resourceId, we should search in children
+      homepageMenuItem = await findFirstMenuItemWithResource(this.adminforth.config.menu);
+    }
+    if (!homepageMenuItem) {
+      throw new Error('No homepage found in menu and no menu item with path/resourceId found. AdminForth can not generate routes');
+    }
+
+    let homePagePath = homepageMenuItem.path || `/resource/${homepageMenuItem.resourceId}`;
     if (!homePagePath) {
       homePagePath=this.adminforth.config.menu.filter((mi)=>mi.path)[0]?.path || `/resource/${this.adminforth.config.menu.filter((mi)=>mi.children)[0]?.resourceId}` ;
     }

package/modules/configValidator.ts

@@ -195,6 +195,16 @@ export default class ConfigValidator implements IConfigValidator {
           col.showIn = col.showIn || Object.values(AdminForthResourcePages);
 
           if (col.foreignResource) {
+
+            if (!col.foreignResource.resourceId) {
+              errors.push(`Resource "${res.resourceId}" column "${col.name}" has foreignResource without resourceId`);
+            }
+            const resource = this.config.resources.find((r) => r.resourceId === col.foreignResource.resourceId);
+            if (!resource) {
+              const similar = suggestIfTypo(this.config.resources.map((r) => r.resourceId), col.foreignResource.resourceId);
+              errors.push(`Resource "${res.resourceId}" column "${col.name}" has foreignResource resourceId which is not in resources: "${col.foreignResource.resourceId}". 
+              ${similar ? `Did you mean "${similar}" instead of "${col.foreignResource.resourceId}"?` : ''}`);
+            }
             const befHook = col.foreignResource.hooks?.dropdownList?.beforeDatasourceRequest;
             if (befHook) {
               if (!Array.isArray(befHook)) {
@@ -413,7 +423,9 @@ export default class ConfigValidator implements IConfigValidator {
           }
 
           if (item.resourceId && !this.config.resources.find((res) => res.resourceId === item.resourceId)) {
-            errors.push(`Menu item with type 'resourceId' has resourceId which is not in resources: ${JSON.stringify(item)}`);
+            const similar = suggestIfTypo(this.config.resources.map((res) => res.resourceId), item.resourceId);
+            errors.push(`Menu item with type 'resourceId' has resourceId which is not in resources: "${JSON.stringify(item)}". 
+                ${similar ? `Did you mean "${similar}" instead of "${item.resourceId}"?` : ''}`);
           }
 
           if (item.type === 'component' && !item.component) {

package/package.json

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