@adminforth/i18n 3.1.3 → 3.1.5

package/build.log

@@ -20,5 +20,5 @@ custom/package.json
 custom/pnpm-lock.yaml
 custom/tsconfig.json
 
-sent 45,470 bytes  received 305 bytes  91,550.00 bytes/sec
-total size is 44,318  speedup is 0.97
+sent 45,755 bytes  received 305 bytes  92,120.00 bytes/sec
+total size is 44,587  speedup is 0.97

package/custom/BulkActionButton.vue

@@ -98,8 +98,10 @@
   const allChecked = computed(() => Object.values(checkedLanguages.value).every(Boolean));
   const noneChecked = computed(() => Object.values(checkedLanguages.value).every(value => !value));
 
+  let unsubscribeFromTranslationProgress: () => void;
+
   onMounted(() => {
-    websocket.subscribe('/translation_progress', (data) => {
+    unsubscribeFromTranslationProgress = websocket.subscribe('/translation_progress', (data) => {
       adminforth.list.refresh();
     });
     for (const lang of props.meta.supportedLanguages) {
@@ -108,7 +110,7 @@
   });
   
   onUnmounted( () => {
-      websocket.unsubscribe('/translation_progress');
+      unsubscribeFromTranslationProgress();
   } )
 
   function selectAll() {

package/custom/LanguageUnderLogin.vue

@@ -45,7 +45,7 @@ watch(() => selectedLanguage.value, async (newVal) => {
     return;
   }
   await setLang({ setLocaleMessage, locale }, props.meta.pluginInstanceId, newVal);
-  coreStore.getPublicConfig();
+  coreStore.fetchConfig({ redirectToLoginIfNotLoggedIn: false });
   coreStore.getLoginFormConfig();
 });
 

package/custom/TranslationJobViewComponent.vue

@@ -135,10 +135,12 @@ async function loadPage(targetPage: number) {
   }
 }
 
-onMounted(async () => {
-  await loadPage(0);
+let unsubscribeFromTaskUpdates: () => void;
+let unsubscribeFromTaskErrors: () => void;
 
-  websocket.subscribe(`/background-jobs-task-update/${props.job.id}`, (data: { taskIndex: number, status?: string, state?: Record<string, any> }) => {
+onMounted(async () => {
+  // subscribe before the first await, so onUnmounted always has something to unsubscribe
+  unsubscribeFromTaskUpdates = websocket.subscribe(`/background-jobs-task-update/${props.job.id}`, (data: { taskIndex: number, status?: string, state?: Record<string, any> }) => {
     const indexOnPage = data.taskIndex - currentOffset.value;
     if (indexOnPage >= 0 && indexOnPage < translationTasks.value.length) {
       if (data.state) {
@@ -149,15 +151,16 @@ onMounted(async () => {
       }
     }
   });
-  websocket.subscribe(`/background-jobs-task-error/${props.job.id}`, (data: { taskIndex: number, status?: string, state?: Record<string, any> }) => {
+  unsubscribeFromTaskErrors = websocket.subscribe(`/background-jobs-task-error/${props.job.id}`, (data: { taskIndex: number, status?: string, state?: Record<string, any> }) => {
     console.log('Error received for task', data);
   });
 
+  await loadPage(0);
 });
 
 onUnmounted(() => {
-  websocket.unsubscribe(`/background-jobs-task-update/${props.job.id}`);
-  websocket.unsubscribe(`/background-jobs-task-error/${props.job.id}`);
+  unsubscribeFromTaskUpdates();
+  unsubscribeFromTaskErrors();
 });
 
 

package/dist/custom/BulkActionButton.vue

@@ -98,8 +98,10 @@
   const allChecked = computed(() => Object.values(checkedLanguages.value).every(Boolean));
   const noneChecked = computed(() => Object.values(checkedLanguages.value).every(value => !value));
 
+  let unsubscribeFromTranslationProgress: () => void;
+
   onMounted(() => {
-    websocket.subscribe('/translation_progress', (data) => {
+    unsubscribeFromTranslationProgress = websocket.subscribe('/translation_progress', (data) => {
       adminforth.list.refresh();
     });
     for (const lang of props.meta.supportedLanguages) {
@@ -108,7 +110,7 @@
   });
   
   onUnmounted( () => {
-      websocket.unsubscribe('/translation_progress');
+      unsubscribeFromTranslationProgress();
   } )
 
   function selectAll() {

package/dist/custom/LanguageUnderLogin.vue

@@ -45,7 +45,7 @@ watch(() => selectedLanguage.value, async (newVal) => {
     return;
   }
   await setLang({ setLocaleMessage, locale }, props.meta.pluginInstanceId, newVal);
-  coreStore.getPublicConfig();
+  coreStore.fetchConfig({ redirectToLoginIfNotLoggedIn: false });
   coreStore.getLoginFormConfig();
 });
 

package/dist/custom/TranslationJobViewComponent.vue

@@ -135,10 +135,12 @@ async function loadPage(targetPage: number) {
   }
 }
 
-onMounted(async () => {
-  await loadPage(0);
+let unsubscribeFromTaskUpdates: () => void;
+let unsubscribeFromTaskErrors: () => void;
 
-  websocket.subscribe(`/background-jobs-task-update/${props.job.id}`, (data: { taskIndex: number, status?: string, state?: Record<string, any> }) => {
+onMounted(async () => {
+  // subscribe before the first await, so onUnmounted always has something to unsubscribe
+  unsubscribeFromTaskUpdates = websocket.subscribe(`/background-jobs-task-update/${props.job.id}`, (data: { taskIndex: number, status?: string, state?: Record<string, any> }) => {
     const indexOnPage = data.taskIndex - currentOffset.value;
     if (indexOnPage >= 0 && indexOnPage < translationTasks.value.length) {
       if (data.state) {
@@ -149,15 +151,16 @@ onMounted(async () => {
       }
     }
   });
-  websocket.subscribe(`/background-jobs-task-error/${props.job.id}`, (data: { taskIndex: number, status?: string, state?: Record<string, any> }) => {
+  unsubscribeFromTaskErrors = websocket.subscribe(`/background-jobs-task-error/${props.job.id}`, (data: { taskIndex: number, status?: string, state?: Record<string, any> }) => {
     console.log('Error received for task', data);
   });
 
+  await loadPage(0);
 });
 
 onUnmounted(() => {
-  websocket.unsubscribe(`/background-jobs-task-update/${props.job.id}`);
-  websocket.unsubscribe(`/background-jobs-task-error/${props.job.id}`);
+  unsubscribeFromTaskUpdates();
+  unsubscribeFromTaskErrors();
 });
 
 

package/dist/index.js

@@ -7,7 +7,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { Filters, suggestIfTypo, AdminForthDataTypes, RAMLock, filtersTools, AdminForthFilterOperators, interpretResource, ActionCheckSource, AllowedActionsEnum } from "adminforth";
+import { Filters, suggestIfTypo, AdminForthDataTypes, RAMLock, filtersTools, AdminForthFilterOperators, interpretResource, ActionCheckSource, AllowedActionsEnum, rejectApiRawFilters } from "adminforth";
 import { I18nBase, getCountryCodeFromLangCode, getPrimaryLanguageCode, requiresSlavicPlurals, SLAVIC_PLURAL_EXAMPLES, SLAVIC_PLURAL_FORMS, SLAVIC_PLURAL_FORMS_HINT, SOURCE_LANGUAGE } from './base.js';
 import { z } from "zod";
 import iso6391 from 'iso-639-1';
@@ -280,10 +280,10 @@ export default class I18nPlugin extends I18nBase {
                     return { ok: true };
                 }));
                 // also add edit hook beforeSave to update completedFieldName
-                resourceConfig.hooks.edit.beforeSave.push((_a) => __awaiter(this, [_a], void 0, function* ({ record, oldRecord }) {
-                    const futureRecord = Object.assign(Object.assign({}, oldRecord), record);
+                resourceConfig.hooks.edit.beforeSave.push((_a) => __awaiter(this, [_a], void 0, function* ({ updates, oldRecord }) {
+                    const futureRecord = Object.assign(Object.assign({}, oldRecord), updates);
                     const futureCompletedFieldValue = yield this.computeCompletedFieldValue(futureRecord);
-                    record[this.options.completedFieldName] = futureCompletedFieldValue;
+                    updates[this.options.completedFieldName] = futureCompletedFieldValue;
                     return { ok: true };
                 }));
                 // add list hook to support filtering by fully_translated virtual field
@@ -907,7 +907,7 @@ export default class I18nPlugin extends I18nBase {
                     result = yield this.adminforth.updateResourceRecord({
                         resource,
                         recordId,
-                        record: updateRecord,
+                        updates: updateRecord,
                         oldRecord,
                         adminUser
                     });
@@ -949,6 +949,10 @@ export default class I18nPlugin extends I18nBase {
             handler: (_a) => __awaiter(this, [_a], void 0, function* ({ body, adminUser, headers, query, cookies, requestUrl, response }) {
                 var _b, _c;
                 const resource = this.resourceConfig;
+                const rawFilterError = rejectApiRawFilters(body.filters);
+                if (rawFilterError) {
+                    return rawFilterError;
+                }
                 for (const hook of ((_c = (_b = resource.hooks) === null || _b === void 0 ? void 0 : _b.list) === null || _c === void 0 ? void 0 : _c.beforeDatasourceRequest) || []) {
                     const filterTools = filtersTools.get(body);
                     body.filtersTools = filterTools;

package/index.ts

@@ -1,4 +1,4 @@
-import AdminForth, { Filters, suggestIfTypo, AdminForthDataTypes, RAMLock, filtersTools, AdminForthFilterOperators, interpretResource, ActionCheckSource, AllowedActionsEnum } from "adminforth";
+import AdminForth, { Filters, suggestIfTypo, AdminForthDataTypes, RAMLock, filtersTools, AdminForthFilterOperators, interpretResource, ActionCheckSource, AllowedActionsEnum, rejectApiRawFilters } from "adminforth";
 import type { IAdminForth, IHttpServer, AdminForthComponentDeclaration, AdminForthResourceColumn, AdminForthResource, BeforeLoginConfirmationFunction, AdminForthConfigMenuItem, AdminUser } from "adminforth";
 import type { PluginOptions, SupportedLanguage } from './types.js';
 import { I18nBase, getCountryCodeFromLangCode, getPrimaryLanguageCode, requiresSlavicPlurals, SLAVIC_PLURAL_EXAMPLES, SLAVIC_PLURAL_FORMS, SLAVIC_PLURAL_FORMS_HINT, SOURCE_LANGUAGE } from './base.js';
@@ -332,12 +332,12 @@ export default class I18nPlugin extends I18nBase<PluginOptions> {
       });
 
       // also add edit hook beforeSave to update completedFieldName
-      resourceConfig.hooks.edit.beforeSave.push(async ({ record, oldRecord }: { record: any, oldRecord: any }): Promise<{ ok: boolean, error?: string }> => {
-        const futureRecord = { ...oldRecord, ...record };
+      resourceConfig.hooks.edit.beforeSave.push(async ({ updates, oldRecord }: { updates: any, oldRecord: any }): Promise<{ ok: boolean, error?: string }> => {
+        const futureRecord = { ...oldRecord, ...updates };
         
         const futureCompletedFieldValue = await this.computeCompletedFieldValue(futureRecord);
     
-        record[this.options.completedFieldName] = futureCompletedFieldValue;
+        updates[this.options.completedFieldName] = futureCompletedFieldValue;
         return { ok: true };
       });
 
@@ -1129,7 +1129,7 @@ export default class I18nPlugin extends I18nBase<PluginOptions> {
           result = await this.adminforth.updateResourceRecord({
             resource,
             recordId,
-            record: updateRecord,
+            updates: updateRecord,
             oldRecord,
             adminUser
           });
@@ -1178,6 +1178,10 @@ export default class I18nPlugin extends I18nBase<PluginOptions> {
       request_schema: getFilteredIdsBodySchema,
       handler: async ({ body, adminUser, headers, query, cookies, requestUrl, response }) => {
         const resource = this.resourceConfig;
+        const rawFilterError = rejectApiRawFilters(body.filters);
+        if (rawFilterError) {
+          return rawFilterError;
+        }
 
         for (const hook of resource.hooks?.list?.beforeDatasourceRequest || []) {
           const filterTools = filtersTools.get(body);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adminforth/i18n",
-  "version": "3.1.3",
+  "version": "3.1.5",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "type": "module",
@@ -43,7 +43,7 @@
   },
   "devDependencies": {
     "@types/node": "^22.10.7",
-    "adminforth": "^3.8.2",
+    "adminforth": "^4.7.3",
     "i18n-iso-countries": "^7.13.0",
     "semantic-release": "^24.2.1",
     "semantic-release-slack-bot": "^4.0.2",