Merge branches 'next' and 'next' of github.com:devforth/adminforth into next

Author: ivictbor

adminforth/servers/express.ts

@@ -217,7 +217,7 @@ class ExpressServer implements IExpressHttpServer {
     this.server.listen(...args);
   }
 
-  async processAuthorizeCallbacks(adminUser: AdminUser, toReturn: { error?: string, allowed: boolean }, response: Response, extra: any) {
+  async processAuthorizeCallbacks(adminUser: AdminUser, toReturn: { error?: string, allowed: boolean }, response: Response, extra: HttpExtra) {
     const adminUserAuthorize = this.adminforth.config.auth.adminUserAuthorize as (AdminUserAuthorizeFunction[] | undefined);
 
     for (const hook of listify(adminUserAuthorize)) {
@@ -269,7 +269,15 @@ class ExpressServer implements IExpressHttpServer {
       } else {
         req.adminUser = adminforthUser;
         const toReturn: { error?: string, allowed: boolean } = { allowed: true };
-        await this.processAuthorizeCallbacks(adminforthUser, toReturn, res, {});
+        await this.processAuthorizeCallbacks(adminforthUser, toReturn, res, {
+          body: req.body,
+          query: req.query,
+          headers: req.headers,
+          cookies: cookies as any,
+          requestUrl: req.url,
+          meta: {},
+          response: res
+        });
         if (!toReturn.allowed) {
           res.status(401).send('Unauthorized by AdminForth');
         } else {

adminforth/spa/src/utils/index.ts

@@ -0,0 +1,2 @@
+export * from './utils';
+export * from './listUtils';

adminforth/spa/src/utils/listUtils.ts

@@ -0,0 +1,90 @@
+import { nextTick, onMounted, ref, resolveComponent } from 'vue';
+import { callAdminForthApi } from '@/utils';
+import { type AdminForthResourceCommon } from '../types/Common';
+import { useAdminforth } from '@/adminforth';
+import { showErrorTost } from '@/composables/useFrontendApi'
+
+
+export async function getList(resource: AdminForthResourceCommon, isPageLoaded: boolean, page: number | null , pageSize: number, sort: any, checkboxes:{ value: any[] }, filters: any = [] ) {
+  let rows: any[] = [];
+  let totalRows: number | null = null;
+  if (!isPageLoaded) {
+    return; 
+  }
+  const data = await callAdminForthApi({
+    path: '/get_resource_data',
+    method: 'POST',
+    body: {
+      source: 'list',
+      resourceId: resource.resourceId,
+      limit: pageSize,
+      offset: ((page || 1) - 1) * pageSize,
+      filters: filters,
+      sort: sort,
+    }
+  });
+  if (data.error) {
+    showErrorTost(data.error);
+    rows = [];
+    totalRows = 0;
+    return {rows, totalRows, error: data.error};
+  }
+  rows = data.data?.map((row: any) => {
+    if (resource?.columns?.find(c => c.primaryKey)?.foreignResource) {
+      row._primaryKeyValue = row[resource.columns.find(c => c.primaryKey)!.name].pk;
+    } else if (resource) {
+      row._primaryKeyValue = row[resource.columns.find(c => c.primaryKey)!.name];
+    }
+    return row;
+  });
+  totalRows = data.total;
+  
+  // if checkboxes have items which are not in current data, remove them
+  checkboxes.value = checkboxes.value.filter((pk: any) => rows.some((r: any) => r._primaryKeyValue === pk));
+  await nextTick();
+  return { rows, totalRows };
+}
+
+
+
+export async function startBulkAction(actionId: string, resource: AdminForthResourceCommon, checkboxes: { value: any[] }, 
+  bulkActionLoadingStates: {value: Record<string, boolean>}, getListInner: () => Promise<any>) {
+  const action = resource?.options?.bulkActions?.find(a => a.id === actionId);
+  const { confirm, alert } = useAdminforth();
+
+  if (action?.confirm) {
+    const confirmed = await confirm({
+      message: action.confirm,
+    });
+    if (!confirmed) {
+      return;
+    }
+  }
+  bulkActionLoadingStates.value[actionId] = true;
+
+  const data = await callAdminForthApi({
+    path: '/start_bulk_action',
+    method: 'POST',
+    body: {
+      resourceId: resource.resourceId,
+      actionId: actionId,
+      recordIds: checkboxes.value
+    }
+  });
+  bulkActionLoadingStates.value[actionId] = false;
+  if (data?.ok) {
+    checkboxes.value = [];
+    await getListInner();
+
+    if (data.successMessage) {
+      alert({
+        message: data.successMessage,
+        variant: 'success'
+      });
+    }
+
+  }
+  if (data?.error) {
+    showErrorTost(data.error);
+  }
+}

adminforth/spa/src/utils.ts adminforth/spa/src/utils/utils.tsadminforth/spa/src/utils.ts renamed to adminforth/spa/src/utils/utils.ts

@@ -1,15 +1,17 @@
-import { onMounted, ref, resolveComponent } from 'vue';
-import type { CoreConfig } from './spa_types/core';
-import type { ValidationObject } from './types/Common.js';
-import router from "./router";
-import { useCoreStore } from './stores/core';
-import { useUserStore } from './stores/user';
+import { nextTick, onMounted, ref, resolveComponent } from 'vue';
+import type { CoreConfig } from '../spa_types/core';
+import type { ValidationObject } from '../types/Common.js';
+import router from "../router";
+import { useCoreStore } from '../stores/core';
+import { useUserStore } from '../stores/user';
 import { Dropdown } from 'flowbite';
-import adminforth from './adminforth';
+import adminforth from '../adminforth';
 import sanitizeHtml  from 'sanitize-html'
 import debounce from 'debounce';
 import type { AdminForthResourceColumnInputCommon, Predicate } from '@/types/Common';
-import { i18nInstance } from './i18n'
+import { i18nInstance } from '../i18n'
+
+
 
 const LS_LANG_KEY = `afLanguage`;
 const MAX_CONSECUTIVE_EMPTY_RESULTS = 2;
@@ -112,7 +114,7 @@ export const loadFile = (file: string) => {
     baseUrl = new URL(`./${path}`, import.meta.url).href;
   } else if (file.startsWith('@@/')) {
     path = file.replace('@@/', '');
-    baseUrl = new URL(`./custom/${path}`, import.meta.url).href;
+    baseUrl = new URL(`../custom/${path}`, import.meta.url).href;
   } else {
     baseUrl = new URL(`./${file}`, import.meta.url).href;
   }
@@ -513,4 +515,4 @@ export function btoa_function(source: string): string {
 
 export function atob_function(source: string): string {
   return atob(source);
-}
+}

adminforth/spa/src/views/CreateView.vue

@@ -200,23 +200,25 @@ async function saveRecord() {
   });
   if (response?.error && response?.error !== 'Operation aborted by hook') {
     showErrorTost(response.error);
-  }
-  saving.value = false;
-  if (route.query.returnTo) {
-    router.push(<string>route.query.returnTo);
   } else {
-    router.push({ 
-      name: 'resource-show', 
-      params: { 
-        resourceId: route.params.resourceId, 
-        primaryKey: response.newRecordId
-      } 
-    });
-    alert({
-      message: t('Record created successfully!'),
-      variant: 'success'
-    });
+    saving.value = false;
+    if (route.query.returnTo) {
+      router.push(<string>route.query.returnTo);
+    } else {
+      router.push({ 
+        name: 'resource-show', 
+        params: { 
+          resourceId: route.params.resourceId, 
+          primaryKey: response.newRecordId
+        } 
+      });
+      alert({
+        message: t('Record created successfully!'),
+        variant: 'success'
+      });
+    }
   }
+  saving.value = false;
 }
 
 function scrollToInvalidField() {

adminforth/spa/src/views/EditView.vue

@@ -198,6 +198,7 @@ async function saveRecord() {
     if (columnIsUpdated) {
       updates[key] = record.value[key];
     }
+    saving.value = false;
   }
 
   const resp = await callAdminForthApi({

adminforth/spa/src/views/ListView.vue

@@ -48,7 +48,7 @@
         <button
           v-if="!action.showInThreeDotsDropdown"
           :key="action.id"
-          @click="startBulkAction(action.id!)"
+          @click="startBulkActionInner(action.id!)"
           class="flex gap-1 items-center py-1 px-3 text-sm font-medium text-lightListViewButtonText focus:outline-none bg-lightListViewButtonBackground rounded-default border border-lightListViewButtonBorder hover:bg-lightListViewButtonBackgroundHover hover:text-lightListViewButtonTextHover focus:z-10 focus:ring-4 focus:ring-lightListViewButtonFocusRing dark:focus:ring-darkListViewButtonFocusRing dark:bg-darkListViewButtonBackground dark:text-darkListViewButtonText dark:border-darkListViewButtonBorder dark:hover:text-darkListViewButtonTextHover dark:hover:bg-darkListViewButtonBackgroundHover"
           :class="action.buttonCustomCssClass || ''"
         >
@@ -104,8 +104,8 @@
         :threeDotsDropdownItems="(coreStore.resourceOptions?.pageInjections?.list?.threeDotsDropdownItems as [])"
         :bulkActions="coreStore.resource?.options?.bulkActions"
         :checkboxes="checkboxes"
-        @startBulkAction="startBulkAction"
-        :updateList="getList"
+        @startBulkAction="startBulkActionInner"
+        :updateList="getListInner"
         :clearCheckboxes="clearCheckboxes"
         ></ThreeDotsMenu>
     </BreadcrumbsWithButtons>
@@ -126,7 +126,7 @@
       @update:page="page = $event"
       @update:sort="sort = $event"
       @update:checkboxes="checkboxes = $event"
-      @update:records="getList"
+      @update:records="getListInner"
       :sort="sort"
       :pageSize="pageSize"
       :totalRows="totalRows"
@@ -164,7 +164,7 @@
       @update:page="page = $event"
       @update:sort="sort = $event"
       @update:checkboxes="checkboxes = $event"
-      @update:records="getList"
+      @update:records="getListInner"
       :sort="sort"
       :pageSize="pageSize"
       :totalRows="totalRows"
@@ -209,10 +209,9 @@ import ResourceListTable from '@/components/ResourceListTable.vue';
 import { useCoreStore } from '@/stores/core';
 import { useFiltersStore } from '@/stores/filters';
 import { callAdminForthApi, currentQuery, getIcon, setQuery } from '@/utils';
-import { computed, onMounted, onUnmounted, ref, watch, nextTick, type Ref } from 'vue';
+import { computed, onMounted, onUnmounted, ref, watch, type Ref } from 'vue';
 import { useRoute } from 'vue-router';
-import { showErrorTost } from '@/composables/useFrontendApi'
-import { getCustomComponent, initThreeDotsDropdown } from '@/utils';
+import { getCustomComponent, initThreeDotsDropdown, getList, startBulkAction } from '@/utils';
 import ThreeDotsMenu from '@/components/ThreeDotsMenu.vue';
 import { Tooltip } from '@/afcl'
 import type { AdminForthComponentDeclarationFull } from '@/types/Common';
@@ -228,7 +227,7 @@ import Filters from '@/components/Filters.vue';
 import { useAdminforth } from '@/adminforth';
 
 const filtersShow = ref(false);
-const { confirm, alert, list } = useAdminforth();
+const { list } = useAdminforth();
 const coreStore = useCoreStore();
 const filtersStore = useFiltersStore();
 
@@ -257,45 +256,6 @@ const listBufferSize = computed(() => coreStore.resource?.options?.listBufferSiz
 
 const isPageLoaded = ref(false);
 
-async function getList() {
-  rows.value = null;
-  if (!isPageLoaded.value) {
-    return; 
-  }
-  const data = await callAdminForthApi({
-    path: '/get_resource_data',
-    method: 'POST',
-    body: {
-      source: 'list',
-      resourceId: route.params.resourceId,
-      limit: pageSize.value,
-      offset: ((page.value || 1) - 1) * pageSize.value,
-      filters: filtersStore.filters,
-      sort: sort.value,
-    }
-  });
-  if (data.error) {
-    showErrorTost(data.error);
-    rows.value = [];
-    totalRows.value = 0;
-    return {error: data.error};
-  }
-  rows.value = data.data?.map((row: any) => {
-    if (coreStore.resource?.columns?.find(c => c.primaryKey)?.foreignResource) {
-      row._primaryKeyValue = row[coreStore.resource.columns.find(c => c.primaryKey)!.name].pk;
-    } else if (coreStore.resource) {
-      row._primaryKeyValue = row[coreStore.resource.columns.find(c => c.primaryKey)!.name];
-    }
-    return row;
-  });
-  totalRows.value = data.total;
-  
-  // if checkboxes have items which are not in current data, remove them
-  checkboxes.value = checkboxes.value.filter(pk => rows.value!.some(r => r._primaryKeyValue === pk));
-  await nextTick();
-  return {}
-}
-
 function clearCheckboxes() {
   checkboxes.value = [];
 }
@@ -351,48 +311,21 @@ async function refreshExistingList(pk?: any) {
   return {}
 }
 
+async function startBulkActionInner(actionId: string) {
+  await startBulkAction(actionId, coreStore.resource!, checkboxes, bulkActionLoadingStates, getListInner);
+}
 
-async function startBulkAction(actionId: string) {
-  const action = coreStore.resource?.options?.bulkActions?.find(a => a.id === actionId);
-  if (action?.confirm) {
-    const confirmed = await confirm({
-      message: action.confirm,
-    });
-    if (!confirmed) {
-      return;
-    }
-  }
-  bulkActionLoadingStates.value[actionId] = true;
-
-  const data = await callAdminForthApi({
-    path: '/start_bulk_action',
-    method: 'POST',
-    body: {
-      resourceId: route.params.resourceId,
-      actionId: actionId,
-      recordIds: checkboxes.value
-
-    }
-  });
-  bulkActionLoadingStates.value[actionId] = false;
-  if (data?.ok) {
-    checkboxes.value = [];
-    await getList();
-
-    if (data.successMessage) {
-      alert({
-        message: data.successMessage,
-        variant: 'success'
-      });
-    }
-
-  }
-  if (data?.error) {
-    showErrorTost(data.error);
+async function getListInner() {
+  rows.value = null; // to show loading state
+  const result = await getList(coreStore.resource!, isPageLoaded.value, page.value, pageSize.value, sort.value, checkboxes, filtersStore.filters);
+  if (!result) {
+    return { error: 'No result returned from getList' };
   }
+  rows.value = result.rows;
+  totalRows.value = result.totalRows ?? 0;
+  return result.error ? { error: result.error } : {};
 }
 
-
 class SortQuerySerializer {
     static serialize(sort: {field: string, direction: 'asc' | 'desc'}[]) {
         return sort.map(s => `${s.field}__${s.direction}`).join(',');
@@ -471,12 +404,11 @@ async function init() {
 
 watch([page, sort, () => filtersStore.filters], async () => {
   // console.log('🔄️ page/sort/filter change fired, page:', page.value);
-  await getList();
+  await getListInner();
 }, { deep: true });
 
 list.refresh = async () => {
-  const result = await getList();
-
+  const result = await getListInner();
   if (!result) {
     return {};
   }