adminforth 1.0.73 → 1.0.75

package/dist/modules/codeInjector.js

@@ -29,10 +29,29 @@ function hashify(obj) {
     return crypto.createHash('sha256').update(JSON.stringify(obj)).digest('hex');
 }
 class CodeInjector {
+    cleanup() {
+        console.log('Cleaning up...');
+        this.allWatchers.forEach((watcher) => {
+            watcher.removeAll();
+        });
+    }
     constructor(adminforth) {
+        this.allWatchers = [];
         this.allComponentNames = {};
         this.srcFoldersToSync = {};
         this.adminforth = adminforth;
+        process.on('SIGINT', () => {
+            console.log('Received SIGINT.');
+            this.cleanup();
+        });
+        process.on('SIGTERM', () => {
+            console.log('Received SIGTERM.');
+            this.cleanup();
+        });
+        process.on('exit', () => {
+            console.log('Exiting.');
+            this.cleanup();
+        });
     }
     // async runShell({command, verbose = false}) {
     //   console.log(`⚙️ Running shell ${command}...`);
@@ -144,7 +163,10 @@ class CodeInjector {
                 yield Promise.all(filesUpdated.map((file) => __awaiter(this, void 0, void 0, function* () {
                     const src = path.join(ADMIN_FORTH_ABSOLUTE_PATH, 'spa', file);
                     const dest = path.join(CodeInjector.SPA_TMP_PATH, file);
-                    yield fsExtra.copy(src, dest);
+                    yield fsExtra.copy(src, dest, {
+                        overwrite: true,
+                        dereference: true, // needed to dereference types
+                    });
                     if (process.env.HEAVY_DEBUG) {
                         console.log('🪲 await fsExtra.copy filtering', src, dest);
                     }
@@ -154,6 +176,13 @@ class CodeInjector {
                 if (process.env.HEAVY_DEBUG) {
                     console.log(`🪲 await fsExtra.copy from ${path.join(ADMIN_FORTH_ABSOLUTE_PATH, 'spa')}, ${CodeInjector.SPA_TMP_PATH}`);
                 }
+                // try to rm SPA_TMP_PATH/src/types directory 
+                try {
+                    yield fs.promises.rm(path.join(CodeInjector.SPA_TMP_PATH, 'src', 'types'), { recursive: true });
+                }
+                catch (e) {
+                    // ignore
+                }
                 yield fsExtra.copy(path.join(ADMIN_FORTH_ABSOLUTE_PATH, 'spa'), CodeInjector.SPA_TMP_PATH, {
                     filter: (src) => {
                         if (process.env.HEAVY_DEBUG) {
@@ -162,6 +191,7 @@ class CodeInjector {
                         return !src.includes('/adminforth/spa/node_modules') && !src.includes('/adminforth/spa/dist');
                     },
                     overwrite: true,
+                    dereference: true, // needed to dereference types
                 });
                 // copy whole custom directory
                 if ((_b = this.adminforth.config.customization) === null || _b === void 0 ? void 0 : _b.customComponentsDir) {
@@ -358,9 +388,7 @@ class CodeInjector {
                 console.log(`File ${file} changed, preparing sources...`);
                 yield this.prepareSources({ filesUpdated: [file.replace(spaPath + '/', '')] });
             }));
-            process.on('exit', () => {
-                watcher.removeAll();
-            });
+            this.allWatchers.push(watcher);
         });
     }
     watchCustomComponentsForCopy(_a) {
@@ -405,9 +433,7 @@ class CodeInjector {
                     recursive: true,
                 });
             }));
-            process.on('exit', () => {
-                watcher.removeAll();
-            });
+            this.allWatchers.push(watcher);
         });
     }
     bundleNow(_a) {

package/dist/servers/express.js

@@ -11,6 +11,7 @@ import path from 'path';
 import { fileURLToPath } from 'url';
 import fs from 'fs';
 import CodeInjector from '../modules/codeInjector.js';
+import fetch from 'node-fetch';
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 function replaceAtStart(string, substring) {
@@ -21,13 +22,9 @@ function replaceAtStart(string, substring) {
 }
 function proxyTo(url, res) {
     return __awaiter(this, void 0, void 0, function* () {
-        const r = yield fetch(url);
-        const body = yield r.text();
-        res.status(r.status);
-        r.headers.forEach((value, name) => {
-            res.setHeader(name, value);
-        });
-        res.send(body);
+        const actual = yield fetch(url);
+        actual.headers.forEach((v, n) => res.setHeader(n, v));
+        actual.body.pipe(res);
     });
 }
 function parseExpressCookie(req) {
@@ -93,11 +90,12 @@ class ExpressServer {
         const slashedPrefix = prefix.endsWith('/') ? prefix : `${prefix}/`;
         if (this.adminforth.runningHotReload) {
             const handler = (req, res) => __awaiter(this, void 0, void 0, function* () {
-                // proxy using fetch to webpack dev server
+                // proxy using fetch to webpack dev server 
                 try {
                     yield proxyTo(`http://localhost:5173${req.url}`, res);
                 }
                 catch (e) {
+                    // console.log('Failed to proxy', e);
                     res.status(500).send(respondNoServer('AdminForth SPA is not ready yet', 'Vite is still starting up. Please wait a moment...'));
                     return;
                 }

package/dist/spa/spa/src/main.ts

@@ -9,7 +9,7 @@ import router from './router'
 const app = createApp(App)
 /* IMPORTANT:ADMINFORTH COMPONENT REGISTRATIONS */
 
-
+ 
 app.use(createPinia())
 app.use(router)
 

package/dist/spa/spa/src/utils.ts

@@ -1,6 +1,7 @@
 import { onMounted, ref, resolveComponent } from 'vue';
 
 import router from "./router";
+import { useCoreStore } from './stores/core';
 
 export async function callApi({path, method, body=undefined} ) {
   const options = {
@@ -62,3 +63,13 @@ export const loadFile = (file: string) => {
   }
   return baseUrl;
 }
+
+// export function checkEmptyValues(value: any, viewType:'show' | 'list' | 'create' | 'edit') {
+//   const config: = useCoreStore().config;
+//   const emptyFieldPlaceholder = config.emptyFieldPlaceholder?.[viewType] || '---';
+
+//   if (value === null || value === undefined || value === '') {
+//     return emptyFieldPlaceholder;
+//   }
+//   return value;
+// }

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

@@ -7,7 +7,8 @@
       'background-blend-mode': 'darken'
     }: {}"
     >
-   <!-- Main modal -->
+
+    <!-- Main modal -->
     <div id="authentication-modal" tabindex="-1" class=" overflow-y-auto overflow-x-hidden z-50 min-w-[400px] justify-center items-center md:inset-0 h-[calc(100%-1rem)] max-h-full">
         <div class="relative p-4 w-full max-w-md max-h-full">
             <!-- Modal content -->
@@ -78,13 +79,14 @@
 
 <script setup>
 
-import { onMounted, ref } from 'vue';
+import { onMounted, ref, watchEffect } from 'vue';
 import { useCoreStore } from '@/stores/core';
 import { IconEyeSolid, IconEyeSlashSolid } from '@iconify-prerendered/vue-flowbite';
 import { callAdminForthApi, loadFile } from '@/utils';
 import { useRouter } from 'vue-router';
 import { initFlowbite } from 'flowbite'
 
+
 const router = useRouter();
 const inProgress = ref(false);
 
@@ -114,6 +116,7 @@ async function login() {
     } else {
       error.value = null;
       router.push('/');
+      await router.isReady();
       await coreStore.fetchMenuAndResource();
       setTimeout(() => {
         initFlowbite();

package/dist/types/AdminForthConfig.js

@@ -1 +1,33 @@
-export {};
+export var AdminForthDataTypes;
+(function (AdminForthDataTypes) {
+    AdminForthDataTypes["STRING"] = "string";
+    AdminForthDataTypes["INTEGER"] = "integer";
+    AdminForthDataTypes["FLOAT"] = "float";
+    AdminForthDataTypes["DECIMAL"] = "decimal";
+    AdminForthDataTypes["BOOLEAN"] = "boolean";
+    AdminForthDataTypes["DATE"] = "date";
+    AdminForthDataTypes["DATETIME"] = "datetime";
+    AdminForthDataTypes["TIME"] = "time";
+    AdminForthDataTypes["TEXT"] = "text";
+    AdminForthDataTypes["JSON"] = "json";
+})(AdminForthDataTypes || (AdminForthDataTypes = {}));
+export var AdminForthFilterOperators;
+(function (AdminForthFilterOperators) {
+    AdminForthFilterOperators["EQ"] = "eq";
+    AdminForthFilterOperators["NE"] = "ne";
+    AdminForthFilterOperators["GT"] = "gt";
+    AdminForthFilterOperators["LT"] = "lt";
+    AdminForthFilterOperators["GTE"] = "gte";
+    AdminForthFilterOperators["LTE"] = "lte";
+    AdminForthFilterOperators["LIKE"] = "like";
+    AdminForthFilterOperators["ILIKE"] = "ilike";
+    AdminForthFilterOperators["IN"] = "in";
+    AdminForthFilterOperators["NIN"] = "nin";
+})(AdminForthFilterOperators || (AdminForthFilterOperators = {}));
+;
+export var AdminForthSortDirections;
+(function (AdminForthSortDirections) {
+    AdminForthSortDirections["ASC"] = "asc";
+    AdminForthSortDirections["DESC"] = "desc";
+})(AdminForthSortDirections || (AdminForthSortDirections = {}));
+;

package/index.ts

@@ -9,9 +9,9 @@ import ExpressServer from './servers/express.js';
 import {v1 as uuid} from 'uuid';
 import fs from 'fs';
 import { ADMINFORTH_VERSION } from './modules/utils.js';
-import { AdminForthFilterOperators, AdminForthTypes, AdminForthTypesValues } from './types.js';
-import { AdminForthConfig } from './types/AdminForthConfig.js';
+import { AdminForthConfig, AdminForthClass, AdminForthFilterOperators, AdminForthDataTypes } from './types/AdminForthConfig.js';
 import { getFunctionList } from './modules/utils.js';
+import path from 'path';
 
 const AVAILABLE_SHOW_IN = ['list', 'edit', 'create', 'filter', 'show'];
 const DEFAULT_ALLOWED_ACTIONS = {create: true, edit: true, show: true, delete: true};
@@ -22,9 +22,8 @@ type ValidationObject = {
   message: string,
 }
 
-class AdminForth {
-  static Types = AdminForthTypes;
-
+class AdminForth implements AdminForthClass {
+  static Types = AdminForthDataTypes;
 
   static Utils = {
     generatePasswordHash: async (password) => {
@@ -48,7 +47,6 @@ class AdminForth {
     dbDiscover?: 'running' | 'done',
   }
 
-
   constructor(config: AdminForthConfig) {
     this.config = {...this.#defaultConfig,...config};
     this.codeInjector = new CodeInjector(this);
@@ -72,7 +70,19 @@ class AdminForth {
     };
   }
 
+  checkCustomFileExists(filePath: string): Array<string> {
+    if (filePath.startsWith('@@/')) {
+      const checkPath = path.join(this.config.customization.customComponentsDir, filePath.replace('@@/', ''));
+      if (!fs.existsSync(checkPath)) {
+        return [`File file ${filePath} does not exist in ${this.config.customization.customComponentsDir}`];
+      }
+    }
+    return [];
+  }
+
   validateConfig() {
+    const errors = [];
+
     if (this.config.rootUser) {
       if (!this.config.rootUser.username) {
         throw new Error('rootUser.username is required');
@@ -91,6 +101,12 @@ class AdminForth {
       if (!this.config.auth.passwordHashField) {
         throw new Error('No config.auth.passwordHashField defined');
       }
+      if (!this.config.auth.usernameField) {
+        throw new Error('No config.auth.usernameField defined');
+      }
+      if (this.config.auth.loginBackgroundImage) {
+        errors.push(...this.checkCustomFileExists(this.config.auth.loginBackgroundImage));
+      }
       const userResource = this.config.resources.find((res) => res.resourceId === this.config.auth.resourceId);
       if (!userResource) {
         throw new Error(`Resource with id "${this.config.auth.resourceId}" not found`);
@@ -106,7 +122,6 @@ class AdminForth {
     }
 
 
-    const errors = [];
     if (!this.config.baseUrl) {
       this.config.baseUrl = '';
     }
@@ -114,10 +129,7 @@ class AdminForth {
       this.config.customization.brandName = 'AdminForth';
     }
     if (this.config.customization.brandLogo) {
-      if (!this.config.customization.brandLogo.startsWith('@@/')) {
-        errors.push(`Brand logo must start with @@ and be placed in custom directory`);
-      }
-      // todo check file exist
+      errors.push(...this.checkCustomFileExists(this.config.customization.brandLogo));
     }
     
 
@@ -422,6 +434,17 @@ class AdminForth {
             throw new Error('No config.auth defined');
           }
           const userResource = this.config.resources.find((res) => res.resourceId === this.config.auth.resourceId);
+          // if there is no passwordHashField, in columns, add it, with backendOnly and showIn: []
+          if (!userResource.dataSourceColumns.find((col) => col.name === this.config.auth.passwordHashField)) {
+            userResource.dataSourceColumns.push({
+              name: this.config.auth.passwordHashField,
+              backendOnly: true,
+              showIn: [],
+              type: AdminForth.Types.STRING,
+            });
+            console.log('Adding passwordHashField to userResource', userResource)
+          }
+
           const userRecord = (
             await this.connectors[userResource.dataSource].getData({
               resource: userResource,
@@ -775,12 +798,12 @@ class AdminForth {
         const item = await this.connectors[resource.dataSource].getMinMaxForColumns({
           resource,
           columns: resource.columns.filter((col) => [
-            AdminForthTypes.INTEGER, 
-            AdminForthTypes.FLOAT,
-            AdminForthTypes.DATE,
-            AdminForthTypes.DATETIME,
-            AdminForthTypes.TIME,
-            AdminForthTypes.DECIMAL,
+            AdminForthDataTypes.INTEGER, 
+            AdminForthDataTypes.FLOAT,
+            AdminForthDataTypes.DATE,
+            AdminForthDataTypes.DATETIME,
+            AdminForthDataTypes.TIME,
+            AdminForthDataTypes.DECIMAL,
           ].includes(col.type) && col.allowMinMaxQuery === true),
         });
         return item;

package/modules/codeInjector.ts

@@ -11,6 +11,7 @@ import { ADMIN_FORTH_ABSOLUTE_PATH } from './utils.js';
 import { getComponentNameFromPath } from './utils.js';
 
 
+
 let TMP_DIR;
 
 try {
@@ -29,14 +30,36 @@ function hashify(obj) {
 
 class CodeInjector {
 
+  allWatchers = [];
   adminforth: AdminForth;
   allComponentNames: { [key: string]: string } = {};
   srcFoldersToSync: { [key: string]: string } = {};
 
   static SPA_TMP_PATH = path.join(TMP_DIR, 'adminforth', 'spa_tmp');
 
+  cleanup() {
+    console.log('Cleaning up...');
+    this.allWatchers.forEach((watcher) => {
+      watcher.removeAll();
+    });
+  }
   constructor(adminforth) {
     this.adminforth = adminforth;
+
+    process.on('SIGINT', () => {
+      console.log('Received SIGINT.');
+      this.cleanup(); 
+    });
+    
+    process.on('SIGTERM', () => {
+      console.log('Received SIGTERM.');
+      this.cleanup();
+    });
+
+    process.on('exit', () => {
+      console.log('Exiting.');
+      this.cleanup();
+    });
   }
 
   // async runShell({command, verbose = false}) {
@@ -153,7 +176,11 @@ class CodeInjector {
       await Promise.all(filesUpdated.map(async (file) => {
         const src = path.join(ADMIN_FORTH_ABSOLUTE_PATH, 'spa', file);
         const dest = path.join(CodeInjector.SPA_TMP_PATH, file);
-        await fsExtra.copy(src, dest);
+ 
+        await fsExtra.copy(src, dest, {
+          overwrite: true,
+          dereference: true, // needed to dereference types
+        });
         if (process.env.HEAVY_DEBUG) {
           console.log('🪲 await fsExtra.copy filtering', src, dest);
         }
@@ -164,6 +191,13 @@ class CodeInjector {
         console.log(`🪲 await fsExtra.copy from ${path.join(ADMIN_FORTH_ABSOLUTE_PATH, 'spa')}, ${CodeInjector.SPA_TMP_PATH}`);
       }
 
+      // try to rm SPA_TMP_PATH/src/types directory 
+      try {
+        await fs.promises.rm(path.join(CodeInjector.SPA_TMP_PATH, 'src', 'types'), { recursive: true });
+      } catch (e) {
+        // ignore
+      }
+
       await fsExtra.copy(path.join(ADMIN_FORTH_ABSOLUTE_PATH, 'spa'), CodeInjector.SPA_TMP_PATH, {
         filter: (src) => {
           if (process.env.HEAVY_DEBUG) {
@@ -173,6 +207,7 @@ class CodeInjector {
           return !src.includes('/adminforth/spa/node_modules') && !src.includes('/adminforth/spa/dist');
         },
         overwrite: true,
+        dereference: true, // needed to dereference types
       });
 
       // copy whole custom directory
@@ -416,9 +451,7 @@ async watchForReprepare({ verbose }) {
         await this.prepareSources({ filesUpdated: [file.replace(spaPath + '/', '')] });
       }
     )
-    process.on('exit', () => {
-      watcher.removeAll();
-    });
+    this.allWatchers.push(watcher);
   }
 
   async watchCustomComponentsForCopy({ verbose }) {
@@ -471,9 +504,7 @@ async watchForReprepare({ verbose }) {
         });
       }
     )
-    process.on('exit', () => {
-      watcher.removeAll();
-    });
+    this.allWatchers.push(watcher);
   }
 
   async bundleNow({hotReload = false, verbose = false}: {hotReload: boolean, verbose: boolean}) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adminforth",
-  "version": "1.0.73",
+  "version": "1.0.75",
   "description": "OpenSource Vue3 powered forth-generation admin panel",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -23,6 +23,7 @@
     "jsonwebtoken": "^9.0.2",
     "mongodb": "6.6",
     "pg": "^8.11.5",
+    "request": "^2.88.2",
     "uuid": "^9.0.1"
   },
   "devDependencies": {

package/plugins/base.ts

@@ -1,13 +1,12 @@
-import { AdminForthResource } from '../types/AdminForthConfig.js';
-import AdminForth from '../index.js';
+import { AdminForthResource, AdminForthPluginType, AdminForthClass } from '../types/AdminForthConfig.js';
 import { getComponentNameFromPath } from '../modules/utils.js';
 import { currentFileDir } from '../modules/utils.js';
 import path from 'path';
 import fs from 'fs';
 
-export default class AdminForthPlugin {
+export default class AdminForthPlugin implements AdminForthPluginType {
 
-  adminforth: AdminForth;
+  adminforth: AdminForthClass;
   pluginDir: string;
   customFolderName: string = 'custom';
 
@@ -16,7 +15,7 @@ export default class AdminForthPlugin {
     this.pluginDir = currentFileDir(metaUrl);
   }
 
-  modifyResourceConfig(adminforth: AdminForth, resourceConfig: AdminForthResource) {
+  modifyResourceConfig(adminforth: AdminForthClass, resourceConfig: AdminForthResource) {
     this.adminforth = adminforth;
   }
 

package/servers/express.ts

@@ -5,6 +5,7 @@ import fs from 'fs';
 import CodeInjector from '../modules/codeInjector.js';
 import AdminForth from '../index.js';
 import { Express } from 'express';
+import fetch from 'node-fetch';
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
@@ -19,13 +20,9 @@ function replaceAtStart(string, substring) {
 }
 
 async function proxyTo(url, res) {
-  const r = await fetch(url);
-  const body = await r.text();
-  res.status(r.status);
-  r.headers.forEach((value, name) => {
-    res.setHeader(name, value);
-  });
-  res.send(body);
+  const actual = await fetch(url);
+  actual.headers.forEach((v, n) => res.setHeader(n, v));
+  actual.body.pipe(res);
 }
 
 async function parseExpressCookie(req) {
@@ -99,13 +96,14 @@ class ExpressServer {
 
     if (this.adminforth.runningHotReload) {
       const handler = async (req, res) => {
-        // proxy using fetch to webpack dev server
+        // proxy using fetch to webpack dev server 
         try {
           await proxyTo(`http://localhost:5173${req.url}`, res);
         } catch (e) {
+          // console.log('Failed to proxy', e);
           res.status(500).send(respondNoServer('AdminForth SPA is not ready yet', 'Vite is still starting up. Please wait a moment...'));
           return;
-      }
+        }
       }
       this.expressApp.get(`${slashedPrefix}assets/*`, handler);
       this.expressApp.get(`${prefix}*`, handler);

package/spa/src/main.ts

@@ -9,7 +9,7 @@ import router from './router'
 const app = createApp(App)
 /* IMPORTANT:ADMINFORTH COMPONENT REGISTRATIONS */
 
-
+ 
 app.use(createPinia())
 app.use(router)
 

package/spa/src/utils.ts

@@ -1,6 +1,7 @@
 import { onMounted, ref, resolveComponent } from 'vue';
 
 import router from "./router";
+import { useCoreStore } from './stores/core';
 
 export async function callApi({path, method, body=undefined} ) {
   const options = {
@@ -62,3 +63,13 @@ export const loadFile = (file: string) => {
   }
   return baseUrl;
 }
+
+// export function checkEmptyValues(value: any, viewType:'show' | 'list' | 'create' | 'edit') {
+//   const config: = useCoreStore().config;
+//   const emptyFieldPlaceholder = config.emptyFieldPlaceholder?.[viewType] || '---';
+
+//   if (value === null || value === undefined || value === '') {
+//     return emptyFieldPlaceholder;
+//   }
+//   return value;
+// }

package/spa/src/views/LoginView.vue

@@ -7,7 +7,8 @@
       'background-blend-mode': 'darken'
     }: {}"
     >
-   <!-- Main modal -->
+
+    <!-- Main modal -->
     <div id="authentication-modal" tabindex="-1" class=" overflow-y-auto overflow-x-hidden z-50 min-w-[400px] justify-center items-center md:inset-0 h-[calc(100%-1rem)] max-h-full">
         <div class="relative p-4 w-full max-w-md max-h-full">
             <!-- Modal content -->
@@ -78,13 +79,14 @@
 
 <script setup>
 
-import { onMounted, ref } from 'vue';
+import { onMounted, ref, watchEffect } from 'vue';
 import { useCoreStore } from '@/stores/core';
 import { IconEyeSolid, IconEyeSlashSolid } from '@iconify-prerendered/vue-flowbite';
 import { callAdminForthApi, loadFile } from '@/utils';
 import { useRouter } from 'vue-router';
 import { initFlowbite } from 'flowbite'
 
+
 const router = useRouter();
 const inProgress = ref(false);
 
@@ -114,6 +116,7 @@ async function login() {
     } else {
       error.value = null;
       router.push('/');
+      await router.isReady();
       await coreStore.fetchMenuAndResource();
       setTimeout(() => {
         initFlowbite();