@adminforth/i18n 1.0.6 → 1.0.8

package/dist/index.js

@@ -63,6 +63,17 @@ export default class I18N extends AdminForthPlugin {
             }, '');
         });
     }
+    updateUntranslatedMenuBadge() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.menuItemWithBadgeId) {
+                const resource = this.adminforth.resource(this.resourceConfig.resourceId);
+                const count = yield resource.count([Filters.NEQ(this.options.completedFieldName, this.fullCompleatedFieldValue)]);
+                this.adminforth.websocket.publish(`/opentopic/update-menu-badge/${this.menuItemWithBadgeId}`, {
+                    badge: count || null
+                });
+            }
+        });
+    }
     modifyResourceConfig(adminforth, resourceConfig) {
         const _super = Object.create(null, {
             modifyResourceConfig: { get: () => super.modifyResourceConfig }
@@ -176,6 +187,7 @@ export default class I18N extends AdminForthPlugin {
                     for (const lang of langsChanged) {
                         this.cache.clear(`${this.resourceConfig.resourceId}:frontend:${lang}`);
                     }
+                    this.updateUntranslatedMenuBadge();
                 }
                 // clear frontend cache for all lan
                 return { ok: true };
@@ -249,6 +261,8 @@ export default class I18N extends AdminForthPlugin {
                                 return { ok: false, error: e.message };
                             }
                         }
+                        console.log('🪲bulkTranslate done', selectedIds);
+                        this.updateUntranslatedMenuBadge();
                         return {
                             ok: true, error: undefined,
                             successMessage: yield tr(`Translated {count} items`, 'frontend', { count: selectedIds.length }),
@@ -259,11 +273,11 @@ export default class I18N extends AdminForthPlugin {
             ;
             // if there is menu item with resourceId, add .badge function showing number of untranslated strings
             const addBadgeCountToMenuItem = (menuItem) => {
-                console.log('🪲menuItem, registring ', menuItem);
+                this.menuItemWithBadgeId = menuItem.itemId;
                 menuItem.badge = () => __awaiter(this, void 0, void 0, function* () {
                     const resource = adminforth.resource(menuItem.resourceId);
                     const count = yield resource.count([Filters.NEQ(this.options.completedFieldName, this.fullCompleatedFieldValue)]);
-                    return `${count}`;
+                    return count ? `${count}` : null;
                 });
                 menuItem.badgeTooltip = 'Untranslated count';
             };
@@ -324,8 +338,10 @@ ${JSON.stringify(strings.reduce((acc, s) => {
                 }, {}), null, 2)}
 \`\`\`
 `;
+                process.env.HEAVY_DEBUG && console.log('llm prompt', prompt);
                 // call OpenAI
                 const resp = yield this.options.completeAdapter.complete(prompt, [], 300);
+                process.env.HEAVY_DEBUG && console.log('llm resp', resp);
                 if (resp.error) {
                     throw new AiTranslateError(resp.error);
                 }
@@ -409,6 +425,8 @@ ${JSON.stringify(strings.reduce((acc, s) => {
                     console.error('🐛 Error creating record', e);
                 }
             })));
+            // updateBadge
+            this.updateUntranslatedMenuBadge();
         });
     }
     tryProcessAndWatch(adminforth) {
@@ -459,6 +477,9 @@ ${JSON.stringify(strings.reduce((acc, s) => {
         // in this plugin we will use plugin to fill the database with missing language messages
         this.tryProcessAndWatch(adminforth);
         adminforth.tr = (msg, category, lang, params) => __awaiter(this, void 0, void 0, function* () {
+            if (!msg) {
+                return msg;
+            }
             // console.log('🪲tr', msg, category, lang);
             // if lang is not supported , throw
             if (!this.options.supportedLanguages.includes(lang)) {
@@ -475,13 +496,11 @@ ${JSON.stringify(strings.reduce((acc, s) => {
                 const resource = adminforth.resource(resourceConfig.resourceId);
                 const translation = yield resource.get([Filters.EQ(this.enFieldName, msg), Filters.EQ(this.options.categoryFieldName, category)]);
                 if (!translation) {
-                    if (!msg) {
-                        throw Error(`Empty string passed to tr function during translation`);
-                    }
                     yield resource.create({
                         [this.enFieldName]: msg,
                         [this.options.categoryFieldName]: category,
                     });
+                    this.updateUntranslatedMenuBadge();
                 }
                 // do this check here, to faster register missing translations
                 // also not cache it - no sense to cache english strings

package/index.ts

@@ -43,6 +43,7 @@ export default class I18N extends AdminForthPlugin {
   enFieldName: string;
   cache: ICachingAdapter;
   primaryKeyFieldName: string;
+  menuItemWithBadgeId: string;
 
   adminforth: IAdminForth;
 
@@ -71,6 +72,18 @@ export default class I18N extends AdminForthPlugin {
     }, '');
   }
 
+  async updateUntranslatedMenuBadge() {
+    if (this.menuItemWithBadgeId) {
+      const resource = this.adminforth.resource(this.resourceConfig.resourceId);
+      const count = await resource.count([Filters.NEQ(this.options.completedFieldName, this.fullCompleatedFieldValue)]);
+
+      this.adminforth.websocket.publish(`/opentopic/update-menu-badge/${this.menuItemWithBadgeId}`, {
+        badge: count || null
+      });
+    }
+  }
+
+
   async modifyResourceConfig(adminforth: IAdminForth, resourceConfig: AdminForthResource) {
     super.modifyResourceConfig(adminforth, resourceConfig);
 
@@ -80,7 +93,6 @@ export default class I18N extends AdminForthPlugin {
         throw new Error(`Invalid language code ${lang}, please define valid ISO 639-1 language code (2 lowercase letters)`);
       }
     });
-
     
 
     // find primary key field
@@ -90,7 +102,6 @@ export default class I18N extends AdminForthPlugin {
       throw new Error(`Primary key field not found in resource ${resourceConfig.resourceId}`);
     }
 
-
     // parse trFieldNames
     for (const lang of this.options.supportedLanguages) {
       if (lang === 'en') {
@@ -201,6 +212,7 @@ export default class I18N extends AdminForthPlugin {
           this.cache.clear(`${this.resourceConfig.resourceId}:frontend:${lang}`);
         }
 
+        this.updateUntranslatedMenuBadge();
 
       }
       // clear frontend cache for all lan
@@ -286,6 +298,8 @@ export default class I18N extends AdminForthPlugin {
                 return { ok: false, error: e.message };
               }
             }
+            console.log('🪲bulkTranslate done', selectedIds);
+            this.updateUntranslatedMenuBadge();
             return { 
               ok: true, error: undefined, 
               successMessage: await tr(`Translated {count} items`, 'frontend', {count: selectedIds.length}),
@@ -295,15 +309,13 @@ export default class I18N extends AdminForthPlugin {
       );  
     };
 
-
     // if there is menu item with resourceId, add .badge function showing number of untranslated strings
-    
     const addBadgeCountToMenuItem = (menuItem: AdminForthConfigMenuItem) => {
-      console.log('🪲menuItem, registring ', menuItem);
+      this.menuItemWithBadgeId = menuItem.itemId;
       menuItem.badge = async () => {
         const resource = adminforth.resource(menuItem.resourceId);
         const count = await resource.count([Filters.NEQ(this.options.completedFieldName, this.fullCompleatedFieldValue)]);
-        return `${count}`;
+        return count ? `${count}` : null;
       };
       menuItem.badgeTooltip = 'Untranslated count';
     }
@@ -383,6 +395,9 @@ ${
 }
 \`\`\`
 `;
+
+      process.env.HEAVY_DEBUG && console.log('llm prompt', prompt);
+
       // call OpenAI
       const resp = await this.options.completeAdapter.complete(
         prompt,
@@ -390,6 +405,8 @@ ${
         300,
       );
 
+      process.env.HEAVY_DEBUG && console.log('llm resp', resp);
+
       if (resp.error) {
         throw new AiTranslateError(resp.error);
       }
@@ -488,7 +505,10 @@ ${
       } catch (e) {
         console.error('🐛 Error creating record', e);
       }
-    }))
+    }));
+
+    // updateBadge
+    this.updateUntranslatedMenuBadge()
 
 
   }
@@ -544,7 +564,10 @@ ${
     // in this plugin we will use plugin to fill the database with missing language messages
     this.tryProcessAndWatch(adminforth);
 
-    adminforth.tr = async (msg: string, category: string, lang: string, params): Promise<string> => {
+    adminforth.tr = async (msg: string | null | undefined, category: string, lang: string, params): Promise<string> => {
+      if (!msg) {
+        return msg;
+      }
       // console.log('🪲tr', msg, category, lang);
 
       // if lang is not supported , throw
@@ -563,14 +586,11 @@ ${
         const resource = adminforth.resource(resourceConfig.resourceId);
         const translation = await resource.get([Filters.EQ(this.enFieldName, msg), Filters.EQ(this.options.categoryFieldName, category)]);
         if (!translation) {
-
-          if (!msg) {
-            throw Error(`Empty string passed to tr function during translation`);
-          }
           await resource.create({
             [this.enFieldName]: msg,
             [this.options.categoryFieldName]: category,
           });
+          this.updateUntranslatedMenuBadge();
         }
 
         // do this check here, to faster register missing translations

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adminforth/i18n",
-  "version": "1.0.6",
+  "version": "1.0.8",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "type": "module",