adminforth 2.58.3 → 2.58.5

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

@@ -19,7 +19,7 @@ export const admin = new AdminForth({
     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;
+      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"
       }
@@ -55,7 +55,7 @@ export const admin = new AdminForth({
     },
   ],
   resources: [
-    usersResource
+    usersResource,
   ],
   menu: [
     { type: 'heading', label: 'SYSTEM' },
@@ -63,7 +63,7 @@ export const admin = new AdminForth({
       label: 'Users',
       icon: 'flowbite:user-solid',
       resourceId: 'adminuser'
-    }
+    },
   ],
 });
 
@@ -82,7 +82,7 @@ if (fileURLToPath(import.meta.url) === path.resolve(process.argv[1])) {
   admin.express.serve(app);
 
   admin.discoverDatabases().then(async () => {
-    if (await admin.resource('adminuser').count() === 0) {
+    if ((await admin.resource('adminuser').count()) === 0) {
       await admin.resource('adminuser').create({
         email: 'adminforth',
         password_hash: await AdminForth.Utils.generatePasswordHash('adminforth'),

package/commands/createResource/injectResourceIntoIndex.js

@@ -23,7 +23,7 @@ export async function injectResourceIntoIndex({
   let code = await fs.readFile(indexFilePath, "utf-8");
   const ast = recast.parse(code, { parser });
 
-  const importLine = `import ${resourceId}Resource from "./resources/${table}";`;
+  const resourceImportPath = `./resources/${table}.js`;
   let alreadyImported = false;
 
   recast.visit(ast, {
@@ -31,7 +31,7 @@ export async function injectResourceIntoIndex({
       const { node } = path;
       if (
         n.ImportDeclaration.check(node) &&
-        node.source.value === `./resources/${table}`
+        node.source.value === resourceImportPath
       ) {
         alreadyImported = true;
         return false;
@@ -49,7 +49,7 @@ export async function injectResourceIntoIndex({
   ast.program.body.unshift(
     b.importDeclaration(
       [b.importDefaultSpecifier(b.identifier(`${resourceId}Resource`))],
-      b.stringLiteral(`./resources/${table}`)
+      b.stringLiteral(resourceImportPath)
     )
   );
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adminforth",
-  "version": "2.58.3",
+  "version": "2.58.5",
   "description": "OpenSource Agent-Native forth-generation admin panel",
   "keywords": [
     "adminforth",