translations progress

Author: ivictbor

Changelog.md

@@ -7,6 +7,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [v1.5.8] - next
 
+# Added
+
+- Command to generate typescript models `npx -y adminforth generate-models --env-file=.env`
+
+# Improved
+
+- Added separate BeforeCreateSave function in types without oldRecord and make oldRecord Mandatory in existing BeforeSaveFunction
+
 ## [v1.5.7] - 2024-12-09
 
 ### Fixed

README.md

@@ -71,13 +71,7 @@ npm start
 Add some columns to a database. Open .prisma file, modify it, and run:
 
 ```
-npm run migrate -- --name desctiption_of_changes
-```
-
-Add some columns to a database. Open .prisma file, modify it, and run:
-
-```
-npm run migrate -- --name desctiption_of_changes
+npm run namemigration -- --name desctiption_of_changes
 ```
 
 

adminforth/adapters/completion-adapter-open-ai-chat-gpt/index.ts

@@ -13,7 +13,11 @@ export default class CompletionAdapterOpenAIChatGPT
     }
   }
 
-  complete = async (content: string, stop = ["."], maxTokens = 50) => {
+  complete = async (content: string, stop = ["."], maxTokens = 50): Promise<{
+    content?: string;
+    finishReason?: string;
+    error?: string;
+  }> => {
     const resp = await fetch("https://api.openai.com/v1/chat/completions", {
       method: "POST",
       headers: {
@@ -35,8 +39,7 @@ export default class CompletionAdapterOpenAIChatGPT
     });
     const data = await resp.json();
     if (data.error) {
-      console.error('ChatGPT was not able to generate a response', data.error);
-        return null;
+      return { error: data.error.message };
     }
     return {
       content: data.choices[0].message.content,

adminforth/index.ts

@@ -21,6 +21,7 @@ import {
   IAdminForthDataSourceConnectorBase,
   IWebSocketBroker,
   HttpExtra,
+  BeforeCreateSaveFunction,
 } from './types/Back.js';
 
 import {
@@ -115,6 +116,11 @@ class AdminForth implements IAdminForth {
     console.log(`🚀 AdminForth v${ADMINFORTH_VERSION} starting up`)
   }
 
+  async tr(this, msg: string, category: string = 'default', lang: string = 'en'): Promise<string> {
+    // stub function to make a translation
+    return msg;
+  }
+
   activatePlugins() {
     process.env.HEAVY_DEBUG && console.log('🔌🔌🔌 Activating plugins');
     const allPluginInstances = [];
@@ -295,7 +301,7 @@ class AdminForth implements IAdminForth {
   ): Promise<{ error?: string, createdRecord?: any }> {
 
     // execute hook if needed
-    for (const hook of listify(resource.hooks?.create?.beforeSave as BeforeSaveFunction[])) {
+    for (const hook of listify(resource.hooks?.create?.beforeSave as BeforeCreateSaveFunction[])) {
       console.log('🪲 Hook beforeSave', hook);
       const resp = await hook({ 
         recordId: undefined, 

adminforth/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "adminforth",
-  "version": "1.5.8-next.0",
+  "version": "1.5.8-next.5",
   "description": "OpenSource Vue3 powered forth-generation admin panel",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -14,7 +14,7 @@
   },
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
-    "build": "rm -rf dist && tsc && npm run prepareDist",
+    "build": "rm -rf dist && tsc && npm run prepareDist && npm link",
     "--comment-prepareDist": "-rl allows supply the spa without symlinks which allows to not include source code in the package",
     "prepareDist": "cp -rL spa dist/",
     "put-git-tag": "git tag v$(node -p \"require('./package.json').version\") && git push --tags",
@@ -26,7 +26,6 @@
     "postinstall": "if test -d ./dist/spa/; then cd ./dist/spa/ && npm ci && echo 'installed spa dependencies'; fi",
     "ci-plugins": "for d in plugins/*; do cd $d && npm ci && cd ../..; done",
     "ci-adapters": "for d in adapters/*; do cd $d && npm ci && cd ../..; done"
-
   },
   "exports": {
     ".": {
@@ -41,6 +40,7 @@
     "@clickhouse/client": "^1.4.0",
     "@faker-js/faker": "^9.0.3",
     "@types/express": "^5.0.0",
+    "adminforth": "^1.5.8-next.0",
     "better-sqlite3": "^11.5.0",
     "dayjs": "^1.11.11",
     "dotenv": "^16.4.5",

adminforth/package.json

@@ -146,13 +146,20 @@ export default class AuditLogPlugin extends AdminForthPlugin {
             direction: AdminForthSortDirections.desc
         }
         return;
-      }
+      };
 
-      ['edit', 'create', 'delete'].forEach((hook) => {
+      ['edit', 'delete'].forEach((hook) => {
         resource.hooks[hook].afterSave.push(async ({resource, record, adminUser, oldRecord, extra}) => {
           return await this.createLogRecord(resource, hook as AllowedActionsEnum, record, adminUser, oldRecord, extra)
         })
-      })
+      });
+
+      ['create'].forEach((hook) => {
+        resource.hooks[hook].afterSave.push(async ({resource, record, adminUser, extra}) => {
+          return await this.createLogRecord(resource, hook as AllowedActionsEnum, record, adminUser, undefined, extra)
+        })
+      });
+      
     })
   }
 }