Merge branch 'main' of github.com:devforth/adminforth

Author: Romper9

Changelog.md

@@ -24,6 +24,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 
 - Resolved issue with filters being displayed incorrectly
+- USe  `IS DISTINCT FROM` for [AdminForthFilterOperators.NE] in postgress to properly compare for note equal when values hold zero
 
 ### Added
 - Added adapters

adminforth/modules/restApi.ts

@@ -465,13 +465,30 @@ export default class AdminForthRestAPI implements IAdminForthRestAPI {
         const toReturn = {
             ...resource,
             label: translated.resLabel,
-            columns: resource.columns.map(
-              (col, i) => {
-                return {
-                  ...col,
-                  label: translated[`resCol${i}`],
-                }
-              }
+            columns:
+              await Promise.all(
+                resource.columns.map(
+                  async (col, i) => {
+                    let validation = null;
+                    if (col.validation) {
+                      validation = await Promise.all(                  
+                        col.validation.map(async (val) => {
+                          return  {
+                            ...val,
+                            message: await tr(val.message, `resource.${resource.resourceId}`),
+                          }
+                        })
+                      );
+                        
+                    }
+
+                    return {
+                      ...col,
+                      validation,
+                      label: translated[`resCol${i}`],
+                    }
+                  }
+                ),
             ),
             options: {
               ...resource.options,

adminforth/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "adminforth",
-  "version": "1.5.8-next.10",
+  "version": "1.5.8-next.11",
   "description": "OpenSource Vue3 powered forth-generation admin panel",
   "main": "dist/index.js",
   "module": "dist/index.js",

adminforth/package.json

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

adminforth/plugins/i18n/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@adminforth/two-factors-auth",
-  "version": "1.0.31",
+  "version": "1.0.32",
   "description": "AdminForth plugin for two factors authentication",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

adminforth/plugins/i18n/package.json

@@ -20,7 +20,7 @@
           :key="column.name"
           v-if="currentValues !== null"
           class="bg-ligftForm dark:bg-gray-800 dark:border-gray-700 block md:table-row"
-          :class="{ 'border-b': i !== group.columns.length - 1, 'opacity-50 pointer-events-none': column.editReadonly && source === $t('edit')}"
+          :class="{ 'border-b': i !== group.columns.length - 1, 'opacity-50 pointer-events-none': column.editReadonly && source === 'edit'}"
         >
           <td class="px-6 py-4 flex items-center block md:table-cell pb-0 md:pb-4" 
               :class="{'rounded-bl-lg border-b-none': i === group.columns.length - 1}"> <!--align-top-->

adminforth/plugins/two-factors-auth/package-lock.json

@@ -281,8 +281,8 @@ async function startBulkAction(actionId) {
 
     }
   });
+  bulkActionLoadingStates.value[actionId] = false;
   if (data?.ok) {
-    bulkActionLoadingStates.value[actionId] = false;
     checkboxes.value = [];
     await getList();
 
@@ -295,7 +295,6 @@ async function startBulkAction(actionId) {
 
   }
   if (data?.error) {
-    bulkActionLoadingStates.value[actionId] = false;
     showErrorTost(data.error);
   }
 }