adminforth 2.1.0-next.15 → 2.1.0-next.17

package/commands/createCustomComponent/configUpdater.js

@@ -47,9 +47,27 @@ async function findResourceFilePath(resourceId) {
 
                     if (n.TSAsExpression.check(declaration) && n.ObjectExpression.check(declaration.expression)) {
                         objectExpressionNode = declaration.expression;
-                    }
-                    else if (n.ObjectExpression.check(declaration)) {
+                    } else if (n.ObjectExpression.check(declaration)) {
                         objectExpressionNode = declaration;
+                    } else if (n.Identifier.check(declaration)) {
+                        const varName = declaration.name;
+                    
+                        recast.visit(ast, {
+                            visitVariableDeclaration(path) {
+                                for (const decl of path.node.declarations) {
+                                    if (
+                                        n.VariableDeclarator.check(decl) &&
+                                        n.Identifier.check(decl.id) &&
+                                        decl.id.name === varName &&
+                                        n.ObjectExpression.check(decl.init)
+                                    ) {
+                                        objectExpressionNode = decl.init;
+                                        return false;
+                                    }
+                                }
+                                this.traverse(path);
+                            }
+                        });
                     }
 
                     if (objectExpressionNode) {
@@ -118,6 +136,25 @@ export async function updateResourceConfig(resourceId, columnName, fieldType, co
                     objectExpressionNode = declaration.expression;
                 } else if (n.ObjectExpression.check(declaration)) {
                     objectExpressionNode = declaration;
+                } else if (n.Identifier.check(declaration)) {
+                    const varName = declaration.name;
+                
+                    recast.visit(ast, {
+                        visitVariableDeclaration(path) {
+                            for (const decl of path.node.declarations) {
+                                if (
+                                    n.VariableDeclarator.check(decl) &&
+                                    n.Identifier.check(decl.id) &&
+                                    decl.id.name === varName &&
+                                    n.ObjectExpression.check(decl.init)
+                                ) {
+                                    objectExpressionNode = decl.init;
+                                    return false;
+                                }
+                            }
+                            this.traverse(path);
+                        }
+                    });
                 }
 
                 if (!objectExpressionNode) {
@@ -446,9 +483,28 @@ export async function updateCrudInjectionConfig(resourceId, crudType, injectionP
           let objectExpressionNode = null;
   
           if (n.TSAsExpression.check(declaration) && n.ObjectExpression.check(declaration.expression)) {
-            objectExpressionNode = declaration.expression;
+              objectExpressionNode = declaration.expression;
           } else if (n.ObjectExpression.check(declaration)) {
-            objectExpressionNode = declaration;
+              objectExpressionNode = declaration;
+          } else if (n.Identifier.check(declaration)) {
+              const varName = declaration.name;
+          
+              recast.visit(ast, {
+                  visitVariableDeclaration(path) {
+                      for (const decl of path.node.declarations) {
+                          if (
+                              n.VariableDeclarator.check(decl) &&
+                              n.Identifier.check(decl.id) &&
+                              decl.id.name === varName &&
+                              n.ObjectExpression.check(decl.init)
+                          ) {
+                              objectExpressionNode = decl.init;
+                              return false;
+                          }
+                      }
+                      this.traverse(path);
+                  }
+              });
           }
   
           if (!objectExpressionNode) {

package/commands/createCustomComponent/main.js

@@ -58,13 +58,26 @@ async function handleFieldComponentCreation(config, resources) {
 
   console.log(chalk.grey(`Selected ❯ 🔤 Custom fields ❯ ${fieldType}`));
 
-  const resourceId = await select({
-      message: 'Select resource for which you want to change component:',
-      choices: [
-          ...resources.map(r => ({ name: `${r.label} ${chalk.grey(`${r.resourceId}`)}`, value: r.resourceId })),
-          new Separator(),
-          { name: '🔙 BACK', value: '__BACK__' },
-      ]
+  const resourceId = await search({
+    message: 'Select resource for which you want to change component:',
+    source: async (input) => {
+      const searchTerm = input ? input.toLowerCase() : '';
+  
+      const filtered = resources.filter(r => {
+        const label = r.label || '';
+        const id = r.resourceId || '';
+        return label.toLowerCase().includes(searchTerm) || id.toLowerCase().includes(searchTerm);
+      });
+  
+      return [
+        ...filtered.map(r => ({
+          name: `${r.label} ${chalk.grey(`${r.resourceId}`)}`,
+          value: r.resourceId,
+        })),
+        new Separator(),
+        { name: '🔙 BACK', value: '__BACK__' },
+      ];
+    }
   });
    if (resourceId === '__BACK__') return handleFieldComponentCreation(config, resources); // Pass config back
 
@@ -144,14 +157,28 @@ async function handleCrudPageInjectionCreation(config, resources) {
 
   console.log(chalk.grey(`Selected ❯ 📄 CRUD Page Injection ❯ ${crudType}`));
 
-  const resourceId = await select({
+  const resourceId = await search({
     message: 'Select resource for which you want to inject the component:',
-    choices: [
-      ...resources.map(r => ({ name: `${r.label} ${chalk.grey(`${r.resourceId}`)}`, value: r.resourceId })),
-      new Separator(),
-      { name: '🔙 BACK', value: '__BACK__' },
-    ],
+    source: async (input) => {
+      const searchTerm = input ? input.toLowerCase() : '';
+  
+      const filtered = resources.filter(r => {
+        const label = r.label || '';
+        const id = r.resourceId || '';
+        return label.toLowerCase().includes(searchTerm) || id.toLowerCase().includes(searchTerm);
+      });
+  
+      return [
+        ...filtered.map(r => ({
+          name: `${r.label} ${chalk.grey(`${r.resourceId}`)}`,
+          value: r.resourceId,
+        })),
+        new Separator(),
+        { name: '🔙 BACK', value: '__BACK__' },
+      ];
+    }
   });
+  
   if (resourceId === '__BACK__') return handleCrudPageInjectionCreation(config, resources);
 
   const selectedResource = resources.find(r => r.resourceId === resourceId);

package/dist/servers/express.js

@@ -59,7 +59,7 @@ const respondNoServer = (title, explanation) => {
           display: flex;
           justify-content: center;
           align-items: center;
-          height: 100vh;
+          height: 100dvh;
           flex-direction: column;
         }
       </style>

package/dist/spa/src/components/Filters.vue

@@ -6,7 +6,7 @@
 
       :class="show ? 'top-0 transform-none' : ''"
       tabindex="-1" aria-labelledby="drawer-navigation-label"
-      :style="{ height: `calc(100vh ` }"
+      :style="{ height: `calc(100dvh ` }"
   >
     <h5 id="drawer-navigation-label" class="text-base font-semibold text-gray-500 uppercase dark:text-gray-400">
       {{ $t('Filters') }}

package/dist/spa/src/views/ResourceParent.vue

@@ -1,6 +1,6 @@
 <template>
   <div :key="`${$route?.params.resourceId}---${$route?.params.primaryKey}`" class="p-4 flex" 
-    :class="limitHeightToPage ? 'h-[calc(100vh-3.5rem)]': undefined"
+    :class="limitHeightToPage ? 'h-[calc(100dvh-3.5rem)]': undefined"
   >
     <RouterView/>
   </div>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adminforth",
-  "version": "2.1.0-next.15",
+  "version": "2.1.0-next.17",
   "description": "OpenSource Vue3 powered forth-generation admin panel",
   "main": "dist/index.js",
   "module": "dist/index.js",