adminforth 1.1.12 → 1.1.13

package/dist/index.js

@@ -63,7 +63,7 @@ class AdminForth {
         }
         return [];
     }
-    validateComponent(component, errors) {
+    validateComponent(component, errors, ignoreExistsCheck = false) {
         if (!component) {
             return component;
         }
@@ -74,7 +74,9 @@ class AdminForth {
         else {
             obj = component;
         }
-        errors.push(...this.checkCustomFileExists(obj.file));
+        if (!ignoreExistsCheck) {
+            errors.push(...this.checkCustomFileExists(obj.file));
+        }
         return obj;
     }
     validateConfig() {
@@ -314,13 +316,14 @@ class AdminForth {
             for (const column of resource.columns) {
                 if (column.components) {
                     console.log('🔧🔧🔧 Validating components for resource', column.components);
-                    for (const comp of Object.values(column.components)) {
+                    for (const [key, comp] of Object.entries(column.components)) {
+                        let ignoreExistsCheck = false;
                         if (this.codeInjector.allComponentNames[comp.file]) {
                             // not obvious, but if we are in this if, it means that this is plugin component
                             // and there is no sense to check if it exists in users folder
-                            continue;
+                            ignoreExistsCheck = true;
                         }
-                        this.validateComponent(comp, errors);
+                        column.components[key] = this.validateComponent(comp, errors, ignoreExistsCheck);
                     }
                 }
             }

package/dist/modules/codeInjector.js

@@ -229,10 +229,13 @@ class CodeInjector {
             const customResourceComponents = [];
             this.adminforth.config.resources.forEach((resource) => {
                 var _a;
-                resource.columns.forEach((field) => {
-                    if (field.components) {
-                        Object.values(field.components).forEach(({ file }) => {
+                resource.columns.forEach((column) => {
+                    if (column.components) {
+                        Object.values(column.components).forEach(({ file }) => {
                             if (!customResourceComponents.includes(file)) {
+                                if (file === undefined) {
+                                    throw new Error('file is undefined from field.components, field:' + JSON.stringify(column));
+                                }
                                 customResourceComponents.push(file);
                             }
                         });
@@ -242,12 +245,16 @@ class CodeInjector {
                     Object.values(injection).forEach((filePathes) => {
                         filePathes.forEach(({ file }) => {
                             if (!customResourceComponents.includes(file)) {
+                                if (file === undefined) {
+                                    throw new Error('file is undefined');
+                                }
                                 customResourceComponents.push(file);
                             }
                         });
                     });
                 });
             });
+            console.log('🔧 🔧 Injecting code into Vue sources...', customResourceComponents);
             customResourceComponents.forEach((filePath) => {
                 const componentName = getComponentNameFromPath(filePath);
                 this.allComponentNames[filePath] = componentName;

package/index.ts

@@ -83,7 +83,7 @@ class AdminForth implements AdminForthClass {
     return [];
   }
 
-  validateComponent(component: AdminForthComponentDeclaration, errors: Array<string>): AdminForthComponentDeclaration {
+  validateComponent(component: AdminForthComponentDeclaration, errors: Array<string>, ignoreExistsCheck: boolean = false): AdminForthComponentDeclaration {
     if (!component) {
       return component;
     }
@@ -93,7 +93,9 @@ class AdminForth implements AdminForthClass {
     } else {
       obj = component;
     }
-    errors.push(...this.checkCustomFileExists(obj.file));
+    if (!ignoreExistsCheck) {
+      errors.push(...this.checkCustomFileExists(obj.file));
+    }
     
     return obj;
   }
@@ -373,13 +375,14 @@ class AdminForth implements AdminForthClass {
           if (column.components) {
             console.log('🔧🔧🔧 Validating components for resource', column.components);
 
-            for (const comp of Object.values(column.components) as Array<AdminForthComponentDeclarationFull>) {
-                if (this.codeInjector.allComponentNames[comp.file]) {
-                    // not obvious, but if we are in this if, it means that this is plugin component
-                    // and there is no sense to check if it exists in users folder
-                    continue;
-                }
-                this.validateComponent(comp, errors);
+            for (const [key, comp] of Object.entries(column.components as Record<string, AdminForthComponentDeclarationFull>)) {
+              let ignoreExistsCheck = false;
+              if (this.codeInjector.allComponentNames[comp.file]) {
+                  // not obvious, but if we are in this if, it means that this is plugin component
+                  // and there is no sense to check if it exists in users folder
+                  ignoreExistsCheck = true;
+              }
+              column.components[key] = this.validateComponent(comp, errors, ignoreExistsCheck);
             }
         }
       }

package/modules/codeInjector.ts

@@ -254,10 +254,13 @@ class CodeInjector implements CodeInjectorType {
     // for each custom component generate import statement
     const customResourceComponents = [];
     this.adminforth.config.resources.forEach((resource) => {
-      resource.columns.forEach((field) => {
-        if (field.components) {
-          Object.values(field.components).forEach(({ file }: {file: string}) => {
+      resource.columns.forEach((column) => {
+        if (column.components) {
+          Object.values(column.components).forEach(({ file }: {file: string}) => {
             if (!customResourceComponents.includes(file)) {
+              if (file === undefined) {
+                throw new Error('file is undefined from field.components, field:' + JSON.stringify(column));
+              }
               customResourceComponents.push(file);
             }
           });
@@ -267,6 +270,9 @@ class CodeInjector implements CodeInjectorType {
         Object.values(injection).forEach((filePathes: {file: string}[]) => {
           filePathes.forEach(({ file }) => {
             if (!customResourceComponents.includes(file)) {
+              if (file === undefined) {
+                throw new Error('file is undefined');
+              }
               customResourceComponents.push(file);
             }
           });
@@ -276,6 +282,7 @@ class CodeInjector implements CodeInjectorType {
 
     });
 
+    console.log('🔧 🔧 Injecting code into Vue sources...', customResourceComponents);
     customResourceComponents.forEach((filePath) => {
       const componentName = getComponentNameFromPath(filePath);
       this.allComponentNames[filePath] = componentName;

package/package.json

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

package/plugins/ForeignInlineListPlugin/custom/InlineList.vue

@@ -90,6 +90,7 @@
       :totalRows="totalRows"
       :checkboxes="checkboxes"
     />
+
   </td>
 </template>
 
@@ -114,7 +115,7 @@ const loading = ref(true);
 const page = ref(1);
 const sort = ref([]);
 const checkboxes = ref([]);
-const pageSize = computed(() => listResource.value?.options?.pageSize || 10);
+const pageSize = computed(() => listResource.value?.options?.listPageSize || 10);
 
 const rows = ref(null);
 const totalRows = ref(0);