adminforth 1.5.8-next.1 → 1.5.8-next.11

package/dist/spa/src/components/CustomRangePicker.vue

@@ -5,7 +5,7 @@
       :max="maxFormatted"
       type="number" aria-describedby="helper-text-explanation"
       class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-20 p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500"
-      placeholder="From"
+      :placeholder="$t('From')"
       v-model="start"
     >
 
@@ -14,7 +14,7 @@
       :max="maxFormatted"
       type="number" aria-describedby="helper-text-explanation"
       class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-20 p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500"
-      placeholder="To"
+      :placeholder="$t('To')"
       v-model="end"
     >
 

package/dist/spa/src/components/Filters.vue

@@ -51,7 +51,7 @@
            <input
              v-else-if="[ 'string', 'text' ].includes(c.type)"
              type="text" class="w-full py-1 px-2 border border-gray-300 rounded-md dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500"
-             placeholder="Search"
+             :placeholder="$t('Search')"
              @input="setFilterItem({ column: c, operator: 'ilike', value: $event.target.value || undefined })"
              :value="getFilterItem({ column: c, operator: 'ilike' })"
            >
@@ -68,7 +68,7 @@
            <input
              v-else-if="[ 'date', 'time' ].includes(c.type)"
              type="text" class="w-full py-1 px-2 border border-gray-300 rounded-md"
-             placeholder="Search datetime"
+             :placeholder="$t('Search datetime')"
              @input="setFilterItem({ column: c, operator: 'ilike', value: $event.target.value || undefined })"
              :value="getFilterItem({ column: c, operator: 'ilike' })"
            >
@@ -87,14 +87,14 @@
              <input
                type="number" aria-describedby="helper-text-explanation"
                class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-20 p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500"
-               placeholder="From"
+               :placeholder="$t('From')"
                @input="setFilterItem({ column: c, operator: 'gte', value: $event.target.value || undefined })"
                :value="getFilterItem({ column: c, operator: 'gte' })"
              >
              <input
                type="number" aria-describedby="helper-text-explanation"
                class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-20 p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500"
-               placeholder="To"
+               :placeholder="$t('To')"
                @input="setFilterItem({ column: c, operator: 'lte', value: $event.target.value || undefined})"
                :value="getFilterItem({ column: c, operator: 'lte' })"
              >

package/dist/spa/src/components/GroupsTable.vue

@@ -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 === 'edit'}"
+          :class="{ 'border-b': i !== group.columns.length - 1, 'opacity-50 pointer-events-none': column.editReadonly && source === $t('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-->
@@ -103,7 +103,7 @@
               <textarea
                   v-else-if="['text', 'richtext'].includes(column.type)"
                   class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500"
-                  placeholder="Text"
+                  :placeholder="$t('Text')"
                   :value="currentValues[column.name]"
                   @input="setCurrentValue(column.name, $event.target.value)"
               >
@@ -111,7 +111,7 @@
               <textarea
                   v-else-if="['json'].includes(column.type)"
                   class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500"
-                  placeholder="Text"
+                  :placeholder="$t('Text')"
                   :value="currentValues[column.name]"
                   @input="setCurrentValue(column.name, $event.target.value)"
               >
@@ -120,7 +120,7 @@
                   v-else
                   :type="!column.masked || unmasked[column.name] ? 'text' : 'password'"
                   class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500"
-                  placeholder="Text"
+                  :placeholder="$t('Text')"
                   :value="currentValues[column.name]"
                   @input="setCurrentValue(column.name, $event.target.value)"
                   autocomplete="false"

package/dist/spa/src/components/MenuLink.vue

@@ -13,14 +13,28 @@
     <component v-if="item.icon" :is="getIcon(item.icon)" class="w-5 h-5 text-lightSidebarIcons dark:text-darkSidebarIcons  transition duration-75  group-hover:text-lightSidebarIconsHover dark:group-hover:text-darkSidebarIconsHover" ></component>
     <span class="ms-3">{{ item.label }}</span>
     <span v-if="item.badge" class="inline-flex items-center justify-center w-3 h-3 p-3 ms-3 text-sm font-medium rounded-full bg-lightAnnouncementBG dark:bg-darkAnnouncementBG 
-          fill-lightAnnouncementText dark:fill-darkAccent text-lightAnnouncementText dark:text-darkAccent">{{ item.badge }}</span>
+          fill-lightAnnouncementText dark:fill-darkAccent text-lightAnnouncementText dark:text-darkAccent"
+    >
+          
+        <Tooltip v-if="item.badgeTooltip">
+          {{ item.badge }}
+
+          <template #tooltip>
+            {{ item.badgeTooltip }}
+          </template>
+        </Tooltip>
+        <template v-else>
+          {{ item.badge }}
+        </template> 
+
+    </span>
 
   </RouterLink>
 </template>
 
 <script setup lang="ts">
 import { getIcon } from '@/utils';
-
+import { Tooltip } from '@/afcl';
 const props = defineProps(['item', 'isChild']);
 
 

package/dist/spa/src/components/ResourceForm.vue

@@ -1,5 +1,7 @@
 <template>
   <div class="rounded-default">
+    <pre>
+  </pre>
     <form autocomplete="off" @submit.prevent>
       <div v-if="!groups || groups.length === 0">
         <GroupsTable
@@ -64,9 +66,10 @@ import { computed, onMounted, ref, watch } from 'vue';
 import { useRouter, useRoute } from 'vue-router';
 import { useCoreStore } from "@/stores/core";
 import GroupsTable from '@/components/GroupsTable.vue';
+import { useI18n } from 'vue-i18n';
 
-const coreStore = useCoreStore();
 
+const coreStore = useCoreStore();
 const router = useRouter();
 const route = useRoute();
 const props = defineProps({

package/dist/spa/src/components/ResourceListTable.vue

@@ -233,13 +233,18 @@
     <!-- Help text -->
     <span class="text-sm text-gray-700 dark:text-gray-400">
         <span v-if="((page || 1) - 1) * pageSize + 1 > totalRows">{{ $t('Wrong Page') }} </span>
-        <span v-else>{{ $t('Showing') }} </span> 
-        <span class="font-semibold text-gray-900 dark:text-white">
-          {{ ((page || 1) - 1) * pageSize + 1 }}
-        </span> {{ $t('to') }} <span class="font-semibold text-gray-900 dark:text-white">
-          {{ Math.min((page || 1) * pageSize, totalRows) }}
-        </span> {{ $t('of') }} <span class="font-semibold text-gray-900 dark:text-white">{{
-          totalRows }}</span> <span class="hidden sm:inline">{{ $t('Entries') }}</span>
+        <template v-else>
+          <span class="hidden sm:inline"
+            v-html="$t('Showing {from} to {to} of {total} Entries', {from: ((page || 1) - 1) * pageSize + 1, to: Math.min((page || 1) * pageSize, totalRows), total: totalRows})
+              .replace(/\d+/g, '<strong>$&</strong>')">
+          </span>
+          <span class="sm:hidden"
+            v-html="$t('{from} - {to} of {total}', {from: ((page || 1) - 1) * pageSize + 1, to: Math.min((page || 1) * pageSize, totalRows), total: totalRows})
+              .replace(/\d+/g, '<strong>$&</strong>')
+            ">
+          </span>
+
+        </template>
     </span>
   </div>
 </template>

package/dist/spa/src/i18n.ts

@@ -0,0 +1,55 @@
+import { createI18n } from 'vue-i18n';
+import { createApp } from 'vue';
+
+
+// taken from here https://vue-i18n.intlify.dev/guide/essentials/pluralization.html#custom-pluralization
+function slavicPluralRule(choice, choicesLength, orgRule) {
+  if (choice === 0) {
+    return 0
+  }
+
+  const teen = choice > 10 && choice < 20
+  const endsWithOne = choice % 10 === 1
+
+  if (!teen && endsWithOne) {
+    return 1
+  }
+  if (!teen && choice % 10 >= 2 && choice % 10 <= 4) {
+    return 2
+  }
+
+  return choicesLength < 4 ? 2 : 3
+}
+
+
+export function initI18n(app: ReturnType<typeof createApp>) {
+  const i18n = createI18n({
+    legacy: false,
+
+    missingWarn: false,
+    fallbackWarn: false,
+
+    pluralRules: {
+      'uk': slavicPluralRule,
+      'bg': slavicPluralRule,
+      'cs': slavicPluralRule,
+      'hr': slavicPluralRule,
+      'mk': slavicPluralRule,
+      'pl': slavicPluralRule,
+      'sk': slavicPluralRule,
+      'sl': slavicPluralRule,
+      'sr': slavicPluralRule,
+      'be': slavicPluralRule,
+      'ru': slavicPluralRule,
+    },
+
+    missing: (locale, key) => {
+      // very very dirty hack to make work $t("a {key} b", { key: "c" }) as "a c b" when translation is missing
+      // e.g. relevant for "Showing {from} to {to} of {total} entries" on list page
+      return key + ' ';
+    },
+  })
+
+  app.use(i18n);
+
+}

package/dist/spa/src/main.ts

@@ -1,21 +1,20 @@
 import { createApp } from 'vue'
-import { createI18n } from 'vue-i18n'
 import { createPinia } from 'pinia'
 /* IMPORTANT:ADMINFORTH IMPORTS */
 
 
 import App from './App.vue'
 import router from './router'
+import { initI18n } from './i18n'
 
-export const app = createApp(App)
+export const app: ReturnType<typeof createApp> = createApp(App)
 /* IMPORTANT:ADMINFORTH COMPONENT REGISTRATIONS */
 
-const i18n = createI18n({
-  // something vue-i18n options here ...
-})
 app.use(createPinia())
 app.use(router)
-app.use(i18n)
+
+initI18n(app);
+
 
 /* IMPORTANT:ADMINFORTH CUSTOM USES */
 

package/dist/spa/src/renderers/CountryFlag.vue

@@ -51,8 +51,8 @@ const countryName = computed(() => {
 <style scoped lang="scss">
 
 .flag-icon {
-  width: 1.8rem;
-  height: 1.35rem;
+  width: 1.6rem;
+  height: 1.2rem;
   flex-shrink: 0;
 
   // border radius  for background

package/dist/spa/src/stores/core.ts

@@ -1,6 +1,8 @@
 import { ref, computed } from 'vue'
 import { defineStore } from 'pinia'
 import { callAdminForthApi } from '@/utils';
+import websocket from '@/websocket';
+
 import type { AdminForthResourceCommon, AdminForthResourceColumnCommon, GetBaseConfigResponse, ResourceVeryShort, AdminUser, UserData, AdminForthConfigMenuItem, AdminForthConfigForFrontend } from '@/types/Common';
 import type { Ref } from 'vue'
 
@@ -64,19 +66,40 @@ export const useCoreStore = defineStore('core', () => {
     console.log('🌍 AdminForth v', resp.version);
   }
 
-  function findItemWithId(items: AdminForthConfigMenuItem[], _itemId: string): AdminForthConfigMenuItem | undefined {
+  function findItemWithId(items: AdminForthConfigMenuItem[], itemId: string): AdminForthConfigMenuItem | undefined {
     for (const item of items) {
-      if (item._itemId === _itemId) {
+      if (item.itemId === itemId) {
         return item;
       }
       if (item.children) {
-        const found = findItemWithId(item.children, _itemId);
+        const found = findItemWithId(item.children, itemId);
         if (found) {
           return found;
         }
       }
     }
   }
+  async function subscribeToMenuBadges() {
+    const processItem = (mi: AdminForthConfigMenuItem) => {
+      if (mi.badge) {
+        console.log('mi 🧪 subsc', mi)
+        websocket.subscribe(`/opentopic/update-menu-badge/${mi.itemId}`, ({ badge }) => {
+          mi.badge = badge;
+        });
+      }
+    }
+  
+    menu.value.forEach((mi) => {
+      processItem(mi);
+      if (mi.children) {
+        mi.children.forEach((child) => {
+          console.log('mi 🧪', JSON.stringify(child), mi.badge)
+  
+          processItem(child);
+        })
+      }
+    })
+  }
   async function fetchMenuBadges() {
     const resp: Record<string, string> = await callAdminForthApi({
       path: '/get_menu_badges',
@@ -85,12 +108,15 @@ export const useCoreStore = defineStore('core', () => {
     if (!resp) {
       return;
     }
-    Object.entries(resp).forEach(([_itemId, badge]: [string, string]) => {
-      const item: AdminForthConfigMenuItem | undefined = findItemWithId(menu.value, _itemId);
+    Object.entries(resp).forEach(([itemId, badge]: [string, string]) => {
+      const item: AdminForthConfigMenuItem | undefined = findItemWithId(menu.value, itemId);
       if (item) {
         item.badge = badge;
       }
     });
+
+    subscribeToMenuBadges();
+
   }
 
 

package/dist/spa/src/types/Adapters.ts

@@ -13,5 +13,9 @@ export interface CompletionAdapter {
     content: string,
     stop: string[],
     maxTokens: number
-  ): Promise<{ content: string; finishReason: string }>;
+  ): Promise<{
+    content?: string;
+    finishReason?: string;
+    error?: string;
+  }>;
 }

package/dist/spa/src/types/Back.ts

@@ -301,6 +301,8 @@ export interface IAdminForth {
     [key: string]: IAdminForthDataSourceConnectorBase;
   };
 
+  tr(msg: string, category: string, lang: string, params: any): Promise<string>;
+
   createResourceRecord(
     params: { resource: AdminForthResource, record: any, adminUser: AdminUser, extra?: HttpExtra }
   ): Promise<{ error?: string, createdRecord?: any }>;
@@ -453,7 +455,16 @@ export type BeforeSaveFunction = (params: {
   recordId: any, 
   adminUser: AdminUser, 
   record: any, 
-  oldRecord?: any,
+  oldRecord: any,
+  adminforth: IAdminForth,
+  extra?: HttpExtra,
+}) => Promise<{ok: boolean, error?: string}>;
+
+export type BeforeCreateSaveFunction = (params: {
+  resource: AdminForthResource, 
+  recordId: any, 
+  adminUser: AdminUser, 
+  record: any, 
   adminforth: IAdminForth,
   extra?: HttpExtra,
 }) => Promise<{ok: boolean, error?: string}>;
@@ -711,7 +722,7 @@ export interface AdminForthResourceInput extends Omit<AdminForthResourceInputCom
        * - fill-in adminUser as creator of record
        * - Attach additional data to record before saving to database (mostly fillOnCreate should be used instead)
        */
-      beforeSave?: BeforeSaveFunction | Array<BeforeSaveFunction>,
+      beforeSave?: BeforeCreateSaveFunction | Array<BeforeCreateSaveFunction>,
 
       /**
        * Typical use-cases:
@@ -1137,7 +1148,7 @@ export interface AdminForthResource extends Omit<AdminForthResourceInput, 'optio
        * - fill-in adminUser as creator of record
        * - Attach additional data to record before saving to database (mostly fillOnCreate should be used instead)
        */
-      beforeSave?: Array<BeforeSaveFunction>,
+      beforeSave?: Array<BeforeCreateSaveFunction>,
 
       /**
        * Typical use-cases:
@@ -1191,7 +1202,9 @@ export interface AdminForthBulkAction extends AdminForthBulkActionCommon {
    * Callback which will be called on backend when user clicks on action button.
    * It should return Promise which will be resolved when action is done.
    */
-  action: ({ resource, selectedIds, adminUser }: { resource: AdminForthResource, selectedIds: Array<any>, adminUser: AdminUser }) => Promise<{ ok: boolean, error?: string, successMessage?: string }>,
+  action: ({ resource, selectedIds, adminUser, tr }: { 
+    resource: AdminForthResource, selectedIds: Array<any>, adminUser: AdminUser, tr: (key: string, category?: string, params?: any) => string
+  }) => Promise<{ ok: boolean, error?: string, successMessage?: string }>,
 
   /**
    * Allowed callback called to check whether action is allowed for user.
@@ -1284,7 +1297,7 @@ export interface IWebSocketClient {
 }
 
 export interface IWebSocketBroker {
-  publish: (topic: string, data: any) => void;
+  publish: (topic: string, data: any, filterUsers?: (adminUser: AdminUser) => Promise<boolean>) => void;
 
   registerWsClient: (client: IWebSocketClient) => void;
 }

package/dist/spa/src/types/Common.ts

@@ -873,10 +873,17 @@ export interface AdminForthConfigMenuItem {
    */
   badge?: string | ((user: AdminUser) => Promise<string>),
 
+  /**
+   * Tooltip shown on hover for badge
+   */
+  badgeTooltip?: string,
+
+
+
   /**
    * Item id will be automatically generated from hashed resourceId+Path+label
    */
-  _itemId?: string,
+  itemId?: string,  // todo move to runtime type
 }
 
 

package/dist/spa/src/utils.ts

@@ -8,6 +8,7 @@ import { useCoreStore } from './stores/core';
 import { useUserStore } from './stores/user';
 import { Dropdown } from 'flowbite';
 
+const LS_LANG_KEY = `afLanguage`;
 
 export async function callApi({path, method, body=undefined}: {
   path: string, method: 'GET' | 'POST' | 'PUT' | 'DELETE' | 'PATCH' 
@@ -17,6 +18,7 @@ export async function callApi({path, method, body=undefined}: {
     method,
     headers: {
       'Content-Type': 'application/json',
+      'accept-language': localStorage.getItem(LS_LANG_KEY) || 'en',
     },
     body: JSON.stringify(body),
   };

package/dist/spa/src/views/ListView.vue

@@ -43,10 +43,26 @@
         }"
       >
         <component
-          v-if="action.icon"
+          v-if="action.icon && !bulkActionLoadingStates[action.id]"
           :is="getIcon(action.icon)"
           class="w-5 h-5 text-gray-500 transition duration-75 dark:text-gray-400 group-hover:text-gray-900 dark:group-hover:text-white"></component>
-
+        <div v-if="bulkActionLoadingStates[action.id]">
+          <svg 
+            aria-hidden="true" 
+            class="w-5 h-5 animate-spin" 
+            :class="{
+              'text-gray-200 dark:text-gray-500 fill-gray-500 dark:fill-gray-300': action.state !== 'danger',
+              'text-red-200 dark:text-red-800 fill-red-600 dark:fill-red-500': action.state === 'danger'
+            }"
+            viewBox="0 0 100 101" 
+            fill="none" 
+            xmlns="http://www.w3.org/2000/svg"
+          >
+            <path d="M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z" fill="currentColor"/>
+            <path d="M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z" fill="currentFill"/>
+          </svg>
+          <span class="sr-only">Loading...</span>
+        </div>
         {{ `${action.label} (${checkboxes.length})` }}
       </button>
 
@@ -151,6 +167,7 @@ watch(() => sort, async (to, from) => {
 const rows: Ref<any[]|null> = ref(null);
 const totalRows = ref(0);
 const checkboxes = ref([]);
+const bulkActionLoadingStates = ref<{[key: string]: boolean}>({});
 
 const DEFAULT_PAGE_SIZE = 10;
 
@@ -252,6 +269,7 @@ async function startBulkAction(actionId) {
       return;
     }
   }
+  bulkActionLoadingStates.value[actionId] = true;
 
   const data = await callAdminForthApi({
     path: '/start_bulk_action',
@@ -264,6 +282,7 @@ async function startBulkAction(actionId) {
     }
   });
   if (data?.ok) {
+    bulkActionLoadingStates.value[actionId] = false;
     checkboxes.value = [];
     await getList();
 
@@ -276,6 +295,7 @@ async function startBulkAction(actionId) {
 
   }
   if (data?.error) {
+    bulkActionLoadingStates.value[actionId] = false;
     showErrorTost(data.error);
   }
 }

package/dist/spa/src/views/LoginView.vue

@@ -63,7 +63,7 @@
 
                         <div v-if="coreStore.config.rememberMeDays" 
                             class="flex items-start mb-5"
-                            :title="`Stay logged in for ${coreStore.config.rememberMeDays} days`"
+                            :title="$t(`Stay logged in for {days} days`, {days: coreStore.config.rememberMeDays})"
                         >
                           <Checkbox v-model="rememberMeValue" class="mr-2">
                             {{ $t('Remember me') }}

package/dist/types/Adapters.d.ts

@@ -3,8 +3,9 @@ export interface EmailAdapter {
 }
 export interface CompletionAdapter {
     complete(content: string, stop: string[], maxTokens: number): Promise<{
-        content: string;
-        finishReason: string;
+        content?: string;
+        finishReason?: string;
+        error?: string;
     }>;
 }
 //# sourceMappingURL=Adapters.d.ts.map

package/dist/types/Adapters.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Adapters.d.ts","sourceRoot":"","sources":["../../types/Adapters.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,YAAY;IAC3B,SAAS,CACP,IAAI,EAAE,MAAM,EACZ,EAAE,EAAE,MAAM,EACV,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,MAAM,OACf;CACH;AAED,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CACN,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,EAAE,EACd,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,YAAY,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CACvD"}
+{"version":3,"file":"Adapters.d.ts","sourceRoot":"","sources":["../../types/Adapters.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,YAAY;IAC3B,SAAS,CACP,IAAI,EAAE,MAAM,EACZ,EAAE,EAAE,MAAM,EACV,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,MAAM,OACf;CACH;AAED,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CACN,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,EAAE,EACd,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC;QACT,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB,KAAK,CAAC,EAAE,MAAM,CAAC;KAChB,CAAC,CAAC;CACJ"}

package/dist/types/Back.d.ts

@@ -282,6 +282,7 @@ export interface IAdminForth {
     connectors: {
         [key: string]: IAdminForthDataSourceConnectorBase;
     };
+    tr(msg: string, category: string, lang: string, params: any): Promise<string>;
     createResourceRecord(params: {
         resource: AdminForthResource;
         record: any;
@@ -443,7 +444,18 @@ export type BeforeSaveFunction = (params: {
     recordId: any;
     adminUser: AdminUser;
     record: any;
-    oldRecord?: any;
+    oldRecord: any;
+    adminforth: IAdminForth;
+    extra?: HttpExtra;
+}) => Promise<{
+    ok: boolean;
+    error?: string;
+}>;
+export type BeforeCreateSaveFunction = (params: {
+    resource: AdminForthResource;
+    recordId: any;
+    adminUser: AdminUser;
+    record: any;
     adminforth: IAdminForth;
     extra?: HttpExtra;
 }) => Promise<{
@@ -680,7 +692,7 @@ export interface AdminForthResourceInput extends Omit<AdminForthResourceInputCom
              * - fill-in adminUser as creator of record
              * - Attach additional data to record before saving to database (mostly fillOnCreate should be used instead)
              */
-            beforeSave?: BeforeSaveFunction | Array<BeforeSaveFunction>;
+            beforeSave?: BeforeCreateSaveFunction | Array<BeforeCreateSaveFunction>;
             /**
              * Typical use-cases:
              * - Initiate some trigger after record saved to database (e.g sync to another datasource)
@@ -1016,7 +1028,7 @@ export interface AdminForthResource extends Omit<AdminForthResourceInput, 'optio
              * - fill-in adminUser as creator of record
              * - Attach additional data to record before saving to database (mostly fillOnCreate should be used instead)
              */
-            beforeSave?: Array<BeforeSaveFunction>;
+            beforeSave?: Array<BeforeCreateSaveFunction>;
             /**
              * Typical use-cases:
              * - Initiate some trigger after record saved to database (e.g sync to another datasource)
@@ -1060,10 +1072,11 @@ export interface AdminForthBulkAction extends AdminForthBulkActionCommon {
      * Callback which will be called on backend when user clicks on action button.
      * It should return Promise which will be resolved when action is done.
      */
-    action: ({ resource, selectedIds, adminUser }: {
+    action: ({ resource, selectedIds, adminUser, tr }: {
         resource: AdminForthResource;
         selectedIds: Array<any>;
         adminUser: AdminUser;
+        tr: (key: string, category?: string, params?: any) => string;
     }) => Promise<{
         ok: boolean;
         error?: string;
@@ -1151,7 +1164,7 @@ export interface IWebSocketClient {
     onClose: (handler: () => void) => void;
 }
 export interface IWebSocketBroker {
-    publish: (topic: string, data: any) => void;
+    publish: (topic: string, data: any, filterUsers?: (adminUser: AdminUser) => Promise<boolean>) => void;
     registerWsClient: (client: IWebSocketClient) => void;
 }
 export {};