@adminforth/i18n 1.0.21-next.0 → 1.0.21-next.1

package/Changelog.md

@@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [1.0.21] - next
 
+### Fixed
+- improve cache reset when editing messages manually
+
 ## [1.0.20]
 
 ### Fixed

package/dist/index.js

@@ -215,7 +215,6 @@ export default class I18N extends AdminForthPlugin {
             }));
             // add hook on edit of any translation
             resourceConfig.hooks.edit.afterSave.push((_d) => __awaiter(this, [_d], void 0, function* ({ updates, oldRecord }) {
-                console.log('🪲edit.afterSave', JSON.stringify(updates, null, 2), '-----', JSON.stringify(oldRecord, null, 2));
                 if (oldRecord) {
                     // find lang which changed
                     let langsChanged = [];
@@ -223,10 +222,18 @@ export default class I18N extends AdminForthPlugin {
                         if (lang === 'en') {
                             continue;
                         }
+                        if (updates[this.trFieldNames[lang]]) {
+                            langsChanged.push(lang);
+                        }
                     }
                     // clear frontend cache for all langsChanged
                     for (const lang of langsChanged) {
-                        this.cache.clear(`${this.resourceConfig.resourceId}:frontend:${lang}`);
+                        if (oldRecord[this.options.categoryFieldName] === 'frontend') {
+                            this.cache.clear(`${this.resourceConfig.resourceId}:frontend:${lang}`);
+                        }
+                        else {
+                            this.cache.clear(`${this.resourceConfig.resourceId}:${oldRecord[this.options.categoryFieldName]}:${lang}:${oldRecord[this.enFieldName]}`);
+                        }
                     }
                     this.updateUntranslatedMenuBadge();
                 }
@@ -236,8 +243,13 @@ export default class I18N extends AdminForthPlugin {
             // add hook on delete of any translation to reset cache
             resourceConfig.hooks.delete.afterSave.push((_e) => __awaiter(this, [_e], void 0, function* ({ record }) {
                 for (const lang of this.options.supportedLanguages) {
-                    this.cache.clear(`${this.resourceConfig.resourceId}:frontend:${lang}`);
-                    this.cache.clear(`${this.resourceConfig.resourceId}:${record[this.options.categoryFieldName]}:${lang}:${record[this.enFieldName]}`);
+                    // if frontend, clear frontend cache
+                    if (record[this.options.categoryFieldName] === 'frontend') {
+                        this.cache.clear(`${this.resourceConfig.resourceId}:frontend:${lang}`);
+                    }
+                    else {
+                        this.cache.clear(`${this.resourceConfig.resourceId}:${record[this.options.categoryFieldName]}:${lang}:${record[this.enFieldName]}`);
+                    }
                 }
                 this.updateUntranslatedMenuBadge();
                 return { ok: true };

package/index.ts

@@ -244,7 +244,6 @@ export default class I18N extends AdminForthPlugin {
 
     // add hook on edit of any translation
     resourceConfig.hooks.edit.afterSave.push(async ({ updates, oldRecord }: { updates: any, oldRecord?: any }): Promise<{ ok: boolean, error?: string }> => {
-      console.log('🪲edit.afterSave', JSON.stringify(updates, null, 2),'-----', JSON.stringify(oldRecord, null, 2));
       if (oldRecord) {
         // find lang which changed
         let langsChanged: LanguageCode[] = [];
@@ -252,27 +251,34 @@ export default class I18N extends AdminForthPlugin {
           if (lang === 'en') {
             continue;
           }
+          if (updates[this.trFieldNames[lang]]) {
+            langsChanged.push(lang);
+          }
         }
-
+        
         // clear frontend cache for all langsChanged
         for (const lang of langsChanged) {
-          this.cache.clear(`${this.resourceConfig.resourceId}:frontend:${lang}`);
+          if (oldRecord[this.options.categoryFieldName] === 'frontend') {
+            this.cache.clear(`${this.resourceConfig.resourceId}:frontend:${lang}`);
+          } else {
+            this.cache.clear(`${this.resourceConfig.resourceId}:${oldRecord[this.options.categoryFieldName]}:${lang}:${oldRecord[this.enFieldName]}`);
+          }
         }
-
         this.updateUntranslatedMenuBadge();
-
       }
       // clear frontend cache for all lan
-
-
       return { ok: true };
     });
 
     // add hook on delete of any translation to reset cache
     resourceConfig.hooks.delete.afterSave.push(async ({ record }: { record: any }): Promise<{ ok: boolean, error?: string }> => {
       for (const lang of this.options.supportedLanguages) {
-        this.cache.clear(`${this.resourceConfig.resourceId}:frontend:${lang}`);
-        this.cache.clear(`${this.resourceConfig.resourceId}:${record[this.options.categoryFieldName]}:${lang}:${record[this.enFieldName]}`);
+        // if frontend, clear frontend cache
+        if (record[this.options.categoryFieldName] === 'frontend') {
+          this.cache.clear(`${this.resourceConfig.resourceId}:frontend:${lang}`);
+        } else {
+          this.cache.clear(`${this.resourceConfig.resourceId}:${record[this.options.categoryFieldName]}:${lang}:${record[this.enFieldName]}`);
+        }
       }
       this.updateUntranslatedMenuBadge();
       return { ok: true };

package/package.json

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