Merge pull request #268 from devforth/next

Next

Author: ivictbor

adminforth/commands/cli.js

@@ -12,6 +12,7 @@ import createResource from "./createResource/main.js";
 import chalk from "chalk";
 import path from "path";
 import fs from "fs";
+import { fileURLToPath } from 'url';
 
 function showHelp() {
   console.log(
@@ -20,23 +21,30 @@ function showHelp() {
     chalk.green('  create-plugin') + chalk.white('      Create a plugin for your AdminForth app\n') +
     chalk.green('  generate-models') + chalk.white('    Generate TypeScript models from your databases\n') +
     chalk.green('  bundle') + chalk.white('             Bundles your AdminForth app SPA for production\n') +
-    chalk.green('  component') + chalk.white('          Scaffold a custom Vue component\n')
+    chalk.green('  component') + chalk.white('          Scaffold a custom Vue component\n') +
+    chalk.green('  resource') + chalk.white('            Scaffold a custom resource\n')
   );
 }
 
-function currentFileDir(importMetaUrl) {
-  const filePath = importMetaUrl.replace("file://", "");
+export function currentFileDir(importMetaUrl) {
+  const filePath = fileURLToPath(importMetaUrl);
   const fileDir = path.dirname(filePath);
   return fileDir;
 }
 
-function showVersion() {
+export function getVersion() {
   const ADMIN_FORTH_ABSOLUTE_PATH = path.join(currentFileDir(import.meta.url), '..');
 
   const package_json = JSON.parse(fs.readFileSync(path.join(ADMIN_FORTH_ABSOLUTE_PATH, 'package.json'), 'utf8'));
 
   const ADMINFORTH_VERSION  = package_json.version;
 
+  return ADMINFORTH_VERSION;
+}
+
+function showVersion() {
+  const ADMINFORTH_VERSION = getVersion();
+
   console.log(
     chalk.white('AdminForth CLI version: ') +
     chalk.cyan.bold(ADMINFORTH_VERSION)

adminforth/commands/createApp/templates/custom/tsconfig.json.hbs

@@ -2,9 +2,8 @@
   "compilerOptions": {
     "baseUrl": ".",
     "paths": {
-      "@/": "../node_modules/adminforth/dist/spa/src/",
-      "": "../node_modules/adminforth/dist/spa/node_modules/",
-      "@@/*": "."
+      "@/*": ["../node_modules/adminforth/dist/spa/src/*"],
+      "@@/*": ["./*"]
     }
   }
 }

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

@@ -3,7 +3,10 @@ import AdminForth from 'adminforth';
 import usersResource from "./resources/adminuser.js";
 import { fileURLToPath } from 'url';
 import path from 'path';
-
+import dotenv from "dotenv";
+dotenv.config({ path: '.env.local', override: true });
+dotenv.config({ path: '.env', override: true });
+ 
 const ADMIN_BASE_URL = '';
 
 export const admin = new AdminForth({

adminforth/commands/createApp/templates/package.json.hbs

@@ -22,7 +22,7 @@
   },
   "dependencies": {
     "@dotenvx/dotenvx": "^1.34.0",
-    "adminforth": "latest",
+    "adminforth": "{{adminforthVersion}}",
     "express": "latest-4"
   },
   "devDependencies": {

adminforth/commands/createApp/utils.js

@@ -11,9 +11,31 @@ import { exec } from 'child_process';
 
 import Handlebars from 'handlebars';
 import { promisify } from 'util';
+import { getVersion } from '../cli.js';
 
 const execAsync = promisify(exec);
 
+function detectAdminforthVersion() {
+  try {
+    const version =  getVersion();
+
+    if (typeof version !== 'string') {
+      throw new Error('Invalid version format');
+    }
+
+    if (version.includes('next')) {
+      return 'next';
+    }
+    return 'latest';
+  } catch (err) {
+    console.warn('⚠️ Could not detect AdminForth version, defaulting to "latest".');
+    return 'latest';
+  }
+}
+
+const adminforthVersion = detectAdminforthVersion();
+
+
 export function parseArgumentsIntoOptions(rawArgs) {
   const args = arg(
     {
@@ -203,7 +225,10 @@ async function writeTemplateFiles(dirname, cwd, options) {
     {
       src: 'package.json.hbs',
       dest: 'package.json',
-      data: { appName },
+      data: { 
+        appName,
+        adminforthVersion: adminforthVersion,
+       },
     },
     {
       src: 'index.ts.hbs',
@@ -287,7 +312,7 @@ async function installDependencies(ctx, cwd) {
   const isWindows = process.platform === 'win32';
 
   const nodeBinary = process.execPath; 
-  const npmPath = path.join(path.dirname(nodeBinary), 'npm');
+  const npmPath = path.join(path.dirname(nodeBinary), isWindows ? 'npm.cmd' : 'npm');
   const customDir = ctx.customDir;
   if (isWindows) {
     const res = await Promise.all([

adminforth/dataConnectors/mongo.ts

@@ -194,13 +194,8 @@ class MongoConnector extends AdminForthBaseConnector implements IAdminForthDataS
           if (!value) {
             return null;
           }
-          if (field._underlineType == 'timestamp' || field._underlineType == 'int') {
-            // value is iso string now, convert to unix timestamp
-            return dayjs(value).unix();
-          } else if (field._underlineType == 'varchar') {
-            // value is iso string now, convert to unix timestamp
-            return dayjs(value).toISOString();
-          }
+          return dayjs(value).toDate();
+          
         } else if (field.type == AdminForthDataTypes.BOOLEAN) {
             return value === null ? null : (value ? true : false);
         } else if (field.type == AdminForthDataTypes.DECIMAL) {

adminforth/documentation/blog/2024-08-05-chatgpt/index.md

@@ -11,7 +11,7 @@ Today LLM is already a must tool to speed-up writing, brainstorming, or generati
 
 Here is how it looks in action:
 
-![alt text](../../docs/tutorial/05-Plugins/demoChatGpt.gif)
+![alt text](../../docs/tutorial/07-Plugins/demoChatGpt.gif)
 
 <!-- truncate -->
 

adminforth/documentation/docs/tutorial/001-gettingStarted.md

@@ -314,7 +314,7 @@ Open `index.ts` in your project root and import the new resource:
 ```ts title="./index.ts"
 ...
 //diff-add
-import apartmentsResource from "./resources/apartments";
+import apartmentsResource from "./resources/apartments.js";
 
 ...
 export const admin = new AdminForth({
@@ -409,7 +409,7 @@ async function seedDatabase() {
 //diff-add
 };
 
-if (import.meta.url === `file://${process.argv[1]}`) {
+if (fileURLToPath(import.meta.url) === path.resolve(process.argv[1])) {
 
   ...
 

adminforth/documentation/docs/tutorial/01-helloWorld.md

@@ -131,7 +131,8 @@ Create `index.ts` file in root directory with following content:
 
 ```ts title="./index.ts"
 import express from 'express';
-import AdminForth, { AdminForthDataTypes, AdminUser, Filters } from 'adminforth';
+import AdminForth, { AdminForthDataTypes, Filters } from 'adminforth';
+import type { AdminForthResourceInput, AdminForthResource, AdminUser } from 'adminforth';
 
 export const admin = new AdminForth({
   baseUrl: '',
@@ -208,6 +209,26 @@ export const admin = new AdminForth({
         },
         { name: 'passwordHash', backendOnly: true, showIn: { all: false } }
       ],
+      hooks: {
+        create: {
+          beforeSave: async ({ record, adminUser, resource }: { record: any, adminUser: AdminUser, resource: AdminForthResource }) => {
+            record.password_hash = await AdminForth.Utils.generatePasswordHash(record.password);
+            return { ok: true };
+          }
+        },
+        edit: {
+          beforeSave: async ({ oldRecord, updates, adminUser, resource }: { oldRecord: any, updates: any, adminUser: AdminUser, resource: AdminForthResource }) => {
+            console.log('Updating user', updates);
+            if (oldRecord.id === adminUser.dbUser.id && updates.role) {
+              return { ok: false, error: 'You cannot change your own role' };
+            }
+            if (updates.password) {
+              updates.password_hash = await AdminForth.Utils.generatePasswordHash(updates.password);
+            }
+            return { ok: true }
+          },
+        },
+      }
     },
     {
       table: 'post',

adminforth/documentation/docs/tutorial/03-Customization/03-virtualColumns.md

@@ -67,8 +67,6 @@ columns: [
       resource: AdminForthResourceCommon;
       adminUser: AdminUser
   }>();
-
-###
     
    function getFlagEmojiFromIso(iso) {
       return iso?.toUpperCase()?.replace(/./g, (char) => String.fromCodePoint(char.charCodeAt(0) + 127397));
@@ -88,6 +86,7 @@ One way to do it is to actually add a real column to a table and then fill it ev
 For this purpose following changes will be required for apartments config:
 
 ```ts title='./resources/apartments.ts'
+import { Filters } from "adminforth";
 ...
 resourceId: 'aparts',
 ...