Merge pull request #457 from devforth/next

yaroslav8765 · web-flow · commit d2f26383bf29 · 2026-01-26T11:27:20.000+02:00
diff --git a/adminforth/basePlugin.ts b/adminforth/basePlugin.ts
@@ -20,6 +20,7 @@ export default class AdminForthPlugin implements IAdminForthPlugin {
   resourceConfig: AdminForthResource;
   className: string;
   activationOrder: number = 0;
+  shouldHaveSingleInstancePerWholeApp?: () => boolean;
 
   constructor(pluginOptions: any, metaUrl: string) {
     // set up plugin here
@@ -28,6 +29,7 @@ export default class AdminForthPlugin implements IAdminForthPlugin {
     this.pluginOptions = pluginOptions;
     afLogger.trace(`🪲 🪲  AdminForthPlugin.constructor ${this.constructor.name}`);
     this.className = this.constructor.name;
+    this.shouldHaveSingleInstancePerWholeApp = () => false;
   }
 
   setupEndpoints(server: any) {
@@ -38,9 +40,6 @@ export default class AdminForthPlugin implements IAdminForthPlugin {
     return 'non-uniquely-identified';
   }
 
-  shouldHaveSingleInstancePerWholeApp(): boolean {
-    return false;
-  }
 
   modifyResourceConfig(adminforth: IAdminForth, resourceConfig: AdminForthResource, allPluginInstances?: {pi: AdminForthPlugin, resource: AdminForthResource}[]) {
     this.resourceConfig = resourceConfig;
diff --git a/adminforth/documentation/docs/tutorial/07-Plugins/01-AuditLog.md b/adminforth/documentation/docs/tutorial/07-Plugins/01-AuditLog.md
@@ -15,7 +15,6 @@ Create `auditLogs.ts` in `resources` folder:
 ```ts title="./resources/auditLogs.ts"
 import AuditLogPlugin from '@adminforth/audit-log';
 import { AdminForthDataTypes } from 'adminforth'
-import { v4 as uuid } from 'uuid';
 ```
 
 [Getting Started](<../001-gettingStarted.md>) will be used as base for this example.
diff --git a/adminforth/documentation/docs/tutorial/07-Plugins/04-RichEditor.md b/adminforth/documentation/docs/tutorial/07-Plugins/04-RichEditor.md
@@ -171,7 +171,7 @@ npm i @adminforth/storage-adapter-local --save
 import AdminForthStorageAdapterLocalFilesystem from "@adminforth/storage-adapter-local";
 import { AdminForthResourceInput } from "adminforth";
 import UploadPlugin from "@adminforth/upload";
-import { v1 as uuid } from "uuid";
+import { randomUUID } from 'crypto';
 
 export default {
   dataSource: "maindb",
@@ -183,7 +183,7 @@ export default {
       name: "id",
       primaryKey: true,
       required: false,
-      fillOnCreate: ({ initialRecord }: any) => uuid(),
+      fillOnCreate: ({ initialRecord }: any) => randomUUID(),
       showIn: {
         create: false,
       },
@@ -225,7 +225,7 @@ export default {
 
 
       filePath: ({ originalFilename, originalExtension, contentType }) =>
-        `description_images/${new Date().getFullYear()}/${uuid()}/${originalFilename}.${originalExtension}`,
+        `description_images/${new Date().getFullYear()}/${randomUUID()}/${originalFilename}.${originalExtension}`,
 
 
     }),
diff --git a/adminforth/documentation/docs/tutorial/07-Plugins/05-upload.md b/adminforth/documentation/docs/tutorial/07-Plugins/05-upload.md
@@ -111,7 +111,7 @@ import UploadPlugin from '@adminforth/upload';
 //diff-add
 import AdminForthAdapterS3Storage from '@adminforth/storage-adapter-amazon-s3'
 //diff-add
-import { v4 as uuid } from 'uuid';
+import { randomUUID } from 'crypto';
 
 export const admin = new AdminForth({
   ...
@@ -153,7 +153,7 @@ export const admin = new AdminForth({
     //diff-add
       filePath: ({originalFilename, originalExtension, contentType}) => 
     //diff-add
-            `aparts/${new Date().getFullYear()}/${uuid()}-${originalFilename}.${originalExtension}`,
+            `aparts/${new Date().getFullYear()}/${randomUUID()}-${originalFilename}.${originalExtension}`,
   //diff-add
     })
 //diff-add
@@ -235,7 +235,7 @@ Then you can change ACL in plugin configuration:
       allowedFileExtensions: ['jpg', 'jpeg', 'png', 'gif', 'webm', 'webp'],
       maxFileSize: 1024 * 1024 * 20, // 20 MB
       filePath: ({originalFilename, originalExtension, contentType}) => 
-            `aparts/${new Date().getFullYear()}/${uuid()}-${originalFilename}.${originalExtension}`,
+            `aparts/${new Date().getFullYear()}/${randomUUID()}-${originalFilename}.${originalExtension}`,
     })
       
 ```
@@ -299,7 +299,7 @@ new UploadPlugin({
   allowedFileExtensions: ['jpg', 'jpeg', 'png', 'gif', 'webm', 'webp'],
   maxFileSize: 1024 * 1024 * 20, // 20 MB
   filePath: ({originalFilename, originalExtension, contentType}) => 
-        `aparts/${new Date().getFullYear()}/${uuid()}-${originalFilename}.${originalExtension}`,
+        `aparts/${new Date().getFullYear()}/${randomUUID()}-${originalFilename}.${originalExtension}`,
 })
 ```
 > adminServeBaseUrl defines the public path prefix. If your AdminForth base URL is /admin, files will be accessible under /admin/static/source/&lt;key&gt;.
@@ -486,7 +486,7 @@ You can set the maximum width for the preview image in the `./resources/apartmen
     allowedFileExtensions: ['jpg', 'jpeg', 'png', 'gif', 'webm', 'webp'],
     maxFileSize: 5 * 1024 * 1024, // 5MB
     filePath: ({originalFilename, originalExtension, contentType}) => 
-      `aparts/${new Date().getFullYear()}/${uuid()}-${originalFilename}.${originalExtension}`,
+      `aparts/${new Date().getFullYear()}/${randomUUID()}-${originalFilename}.${originalExtension}`,
     preview: {
       // Global width settings (applies to all views if specific view settings not provided)
       maxWidth: '200px',  // Maximum width for preview images
diff --git a/adminforth/documentation/docs/tutorial/07-Plugins/10-i18n.md b/adminforth/documentation/docs/tutorial/07-Plugins/10-i18n.md
@@ -58,7 +58,7 @@ Next, add resource for translations:
 import AdminForth, { AdminForthDataTypes, AdminForthResourceInput } from "adminforth";
 import CompletionAdapterOpenAIChatGPT from "@adminforth/completion-adapter-open-ai-chat-gpt";
 import I18nPlugin from "@adminforth/i18n";
-import { v1 as uuid } from "uuid";
+import { randomUUID } from 'crypto';
 
 
 export default {
@@ -113,7 +113,7 @@ export default {
   columns: [
     {
       name: "id",
-      fillOnCreate: ({ initialRecord, adminUser }: any) => uuid(),
+      fillOnCreate: ({ initialRecord, adminUser }: any) => randomUUID(),
       primaryKey: true,
       showIn: { all: false },
     },
diff --git a/adminforth/documentation/docs/tutorial/07-Plugins/14-markdown.md b/adminforth/documentation/docs/tutorial/07-Plugins/14-markdown.md
@@ -63,7 +63,7 @@ npm i @adminforth/storage-adapter-local --save
 import AdminForthStorageAdapterLocalFilesystem from "@adminforth/storage-adapter-local";
 import { AdminForthResourceInput } from "adminforth";
 import UploadPlugin from "@adminforth/upload";
-import { v1 as uuid } from "uuid";
+import { randomUUID } from 'crypto';
 
 export default {
   dataSource: "maindb",
@@ -75,7 +75,7 @@ export default {
       name: "id",
       primaryKey: true,
       required: false,
-      fillOnCreate: ({ initialRecord }: any) => uuid(),
+      fillOnCreate: ({ initialRecord }: any) => randomUUID(),
       showIn: {
         create: false,
       },
@@ -117,7 +117,7 @@ export default {
 
 
       filePath: ({ originalFilename, originalExtension, contentType }) =>
-        `description_images/${new Date().getFullYear()}/${uuid()}/${originalFilename}.${originalExtension}`,
+        `description_images/${new Date().getFullYear()}/${randomUUID()}/${originalFilename}.${originalExtension}`,
 
       preview: {
         // Used to display preview (if it is image) in list and show views instead of just path
diff --git a/adminforth/documentation/docs/tutorial/07-Plugins/17-bulk-ai-flow.md b/adminforth/documentation/docs/tutorial/07-Plugins/17-bulk-ai-flow.md
@@ -122,7 +122,7 @@ export const admin = new AdminForth({
   //diff-add
         filePath: ({originalFilename, originalExtension, contentType}) => 
   //diff-add
-              `aparts/${new Date().getFullYear()}/${uuid()}-${originalFilename}.${originalExtension}`,
+              `aparts/${new Date().getFullYear()}/${randomUUID()}-${originalFilename}.${originalExtension}`,
   //diff-add
       }),
 
diff --git a/adminforth/spa/package-lock.json b/adminforth/spa/package-lock.json
diff --git a/adminforth/spa/package.json b/adminforth/spa/package.json
@@ -26,7 +26,6 @@
     "pinia": "^2.1.7",
     "sanitize-html": "^2.13.0",
     "unhead": "^1.9.12",
-    "uuid": "^10.0.0",
     "vue": "^3.5.12",
     "vue-diff": "^1.2.4",
     "vue-i18n": "^10.0.5",
diff --git a/adminforth/spa/src/stores/toast.ts b/adminforth/spa/src/stores/toast.ts
@@ -1,6 +1,5 @@
 import { ref, watch, type Ref } from 'vue'
 import { defineStore } from 'pinia'
-import { v1 as uuid } from 'uuid';
 import { useRoute } from 'vue-router';
 
 
@@ -23,7 +22,7 @@ export const useToastStore = defineStore('toast', () => {
         buttons?: { value: any; label: string }[];
         onResolve?: (value?: any) => void;
     }): string => {
-        const toastId = uuid();
+        const toastId = crypto.randomUUID();
         toasts.value.push({
             ...toast,
             id: toastId,
diff --git a/cli-demo/package-lock.json b/cli-demo/package-lock.json
diff --git a/cli-demo/package.json b/cli-demo/package.json
@@ -22,7 +22,6 @@
   },
   "dependencies": {
     "@adminforth/audit-log": "^1.0.43",
-    "@prisma/client": "^5.21.1",
-    "uuid": "^11.0.3"
+    "@prisma/client": "^5.21.1"
   }
 }
diff --git a/cli-demo/resources/auditLogs.ts b/cli-demo/resources/auditLogs.ts
@@ -1,12 +1,12 @@
 import AuditLogPlugin from '@adminforth/audit-log';
 import { AdminForthDataTypes } from 'adminforth'
-import { v4 as uuid } from 'uuid';
+import { randomUUID } from 'crypto';
 
 export default {
     dataSource: 'maindb', 
     table: 'audit_logs',
     columns: [
-      { name: 'id', primaryKey: true, required: false, fillOnCreate: ({initialRecord}: any) => uuid(), showIn: ['show'] },
+      { name: 'id', primaryKey: true, required: false, fillOnCreate: ({initialRecord}: any) => randomUUID(), showIn: ['show'] },
       { name: 'created_at', required: false },
       { name: 'resource_id', required: false },
       { name: 'user_id', required: false, 
diff --git a/dev-demo/index.ts b/dev-demo/index.ts
@@ -17,6 +17,7 @@ import passkeysResource from './resources/passkeys.js';
 import carsDescriptionImage from './resources/cars_description_image.js';
 import translations from "./resources/translations.js";
 import { logger, afLogger } from '../adminforth/modules/logger.js';
+import { UUID } from 'crypto';
 
 const ADMIN_BASE_URL = '';
 
diff --git a/dev-demo/package-lock.json b/dev-demo/package-lock.json
diff --git a/dev-demo/package.json b/dev-demo/package.json
@@ -30,8 +30,7 @@
     "express": "^4.21.0",
     "pg": "^8.16.3",
     "random-words": "^2.0.1",
-    "sqlstring": "^2.3.3",
-    "uuid": "^9.0.1"
+    "sqlstring": "^2.3.3"
   },
   "devDependencies": {
     "@dotenvx/dotenvx": "^1.39.0",
diff --git a/dev-demo/resources/carsResourseTemplate.ts b/dev-demo/resources/carsResourseTemplate.ts
@@ -209,10 +209,7 @@ export default function carsResourseTemplate(resourceId: string, dataSource: str
           completion: {
             adapter: new CompletionAdapterOpenAIChatGPT({
               openAiApiKey: process.env.OPENAI_API_KEY as string,
-              model: 'gpt-5-nano',
-              extraRequestBodyParameters: {
-                temperature: 0.7
-              }
+              model: 'gpt-5-mini',
             }),
             expert: {
               debounceTime: 250,
diff --git a/dev-demo/resources/cars_description_image.ts b/dev-demo/resources/cars_description_image.ts
@@ -3,7 +3,7 @@ import AdminForthAdapterS3Storage from '../../adapters/adminforth-storage-adapte
 
 import { AdminForthResourceInput } from "adminforth";
 import UploadPlugin from '../../plugins/adminforth-upload/index.js';
-import { v1 as uuid } from "uuid";
+import { randomUUID } from 'crypto';
 
 export default {
   dataSource: "sqlite",
@@ -15,7 +15,7 @@ export default {
       name: "id",
       primaryKey: true,
       required: false,
-      fillOnCreate: ({ initialRecord }: any) => uuid(),
+      fillOnCreate: ({ initialRecord }: any) => randomUUID(),
       showIn: {
         create: false,
       },
diff --git a/dev-demo/resources/translations.ts b/dev-demo/resources/translations.ts
@@ -1,7 +1,7 @@
 
 import AdminForth, { AdminForthDataTypes, AdminForthResourceInput } from "../../adminforth/index.js";
 import I18nPlugin from "../../plugins/adminforth-i18n/index.js";
-import { v1 as uuid } from "uuid";
+import { randomUUID } from 'crypto';
 
 
 export default {
@@ -44,7 +44,7 @@ export default {
   columns: [
     {
       name: "id",
-      fillOnCreate: ({ initialRecord, adminUser }: any) => uuid(),
+      fillOnCreate: ({ initialRecord, adminUser }: any) => randomUUID(),
       primaryKey: true,
       showIn: { all: false },
     },
diff --git a/live-demo/app/package-lock.json b/live-demo/app/package-lock.json
diff --git a/live-demo/app/package.json b/live-demo/app/package.json
diff --git a/live-demo/app/resources/auditLogs.ts b/live-demo/app/resources/auditLogs.ts
diff --git a/live-demo/app/resources/translations.ts b/live-demo/app/resources/translations.ts
