adminforth 2.27.0-next.9 → 2.27.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (42) hide show
  1. package/commands/callTsProxy.js +10 -5
  2. package/commands/proxy.ts +18 -10
  3. package/dist/commands/proxy.js +14 -10
  4. package/dist/commands/proxy.js.map +1 -1
  5. package/dist/modules/configValidator.d.ts.map +1 -1
  6. package/dist/modules/configValidator.js +16 -9
  7. package/dist/modules/configValidator.js.map +1 -1
  8. package/dist/modules/restApi.d.ts.map +1 -1
  9. package/dist/modules/restApi.js +37 -2
  10. package/dist/modules/restApi.js.map +1 -1
  11. package/dist/modules/styles.js +1 -1
  12. package/dist/spa/src/App.vue +77 -76
  13. package/dist/spa/src/afcl/Button.vue +2 -3
  14. package/dist/spa/src/afcl/Dialog.vue +1 -1
  15. package/dist/spa/src/afcl/Input.vue +1 -1
  16. package/dist/spa/src/afcl/Select.vue +6 -2
  17. package/dist/spa/src/afcl/Spinner.vue +1 -1
  18. package/dist/spa/src/components/CallActionWrapper.vue +1 -1
  19. package/dist/spa/src/components/ColumnValueInput.vue +16 -3
  20. package/dist/spa/src/components/ColumnValueInputWrapper.vue +2 -2
  21. package/dist/spa/src/components/CustomRangePicker.vue +10 -14
  22. package/dist/spa/src/components/Filters.vue +95 -63
  23. package/dist/spa/src/components/GroupsTable.vue +2 -2
  24. package/dist/spa/src/components/MenuLink.vue +2 -2
  25. package/dist/spa/src/components/ResourceListTable.vue +13 -7
  26. package/dist/spa/src/components/ShowTable.vue +1 -1
  27. package/dist/spa/src/components/Sidebar.vue +2 -2
  28. package/dist/spa/src/components/ThreeDotsMenu.vue +12 -4
  29. package/dist/spa/src/spa_types/core.ts +32 -0
  30. package/dist/spa/src/stores/filters.ts +16 -12
  31. package/dist/spa/src/types/Back.ts +19 -3
  32. package/dist/spa/src/types/Common.ts +7 -2
  33. package/dist/spa/src/utils/utils.ts +35 -3
  34. package/dist/spa/src/views/ListView.vue +22 -32
  35. package/dist/spa/src/views/ShowView.vue +66 -24
  36. package/dist/types/Back.d.ts +19 -14
  37. package/dist/types/Back.d.ts.map +1 -1
  38. package/dist/types/Back.js.map +1 -1
  39. package/dist/types/Common.d.ts +9 -2
  40. package/dist/types/Common.d.ts.map +1 -1
  41. package/dist/types/Common.js.map +1 -1
  42. package/package.json +5 -3
@@ -1,4 +1,6 @@
1
1
  import type { AdminForthResource, AdminForthResourceColumn } from '../types/Back.js';
2
+ import type { FilterParams } from '@/types/Common';
3
+ import type { Ref, ComputedRef } from 'vue';
2
4
 
3
5
  export type resourceById = {
4
6
  [key: string]: AdminForthResource;
@@ -61,3 +63,33 @@ export type AllowedActions = {
61
63
  delete: boolean,
62
64
  }
63
65
 
66
+
67
+ export type sortType = {
68
+ field: string,
69
+ direction: 'ask' | 'desc'
70
+ } | null;
71
+
72
+ export type AdminforthFilterStore = {
73
+ filters: Ref<FilterParams[]>,
74
+
75
+ setSort: (sort: sortType) => void,
76
+ getSort: () => sortType,
77
+
78
+ setFilter: (filters: FilterParams) => void,
79
+ setFilters: (filters: FilterParams[]) => void,
80
+
81
+ getFilters: () => FilterParams[],
82
+
83
+ clearFilter: (fieldName: string) => void,
84
+ clearFilters: () => void,
85
+
86
+ shouldFilterBeHidden: (fieldName: string) => boolean,
87
+
88
+ visibleFiltersCount: ComputedRef<number>,
89
+ }
90
+
91
+ export interface AdminforthFilterStoreUnwrapped extends Omit<AdminforthFilterStore, 'filters' | 'visibleFiltersCount'> {
92
+ filters: FilterParams[],
93
+ visibleFiltersCount: number,
94
+ }
95
+
@@ -1,40 +1,42 @@
1
1
  import { ref, computed, type Ref } from 'vue';
2
2
  import { defineStore } from 'pinia';
3
3
  import { useCoreStore } from './core';
4
+ import type { FilterParams } from '@/types/Common';
5
+ import type { AdminforthFilterStore, sortType } from '../spa_types/core';
4
6
 
5
7
  export const useFiltersStore = defineStore('filters', () => {
6
- const filters: Ref<any[]> = ref([]);
7
- const sort: Ref<any> = ref({});
8
+ const filters: Ref<FilterParams[]> = ref([]);
9
+ const sort: Ref<sortType> = ref(null);
8
10
  const coreStore = useCoreStore();
9
11
 
10
- const setSort = (s: any) => {
12
+ const setSort = (s: sortType): void => {
11
13
  sort.value = s;
12
14
  }
13
- const getSort = () => {
15
+ const getSort = (): sortType => {
14
16
  return sort.value;
15
17
  }
16
- const setFilter = (filter: any) => {
18
+ const setFilter = (filter: FilterParams) => {
17
19
  const index = filters.value.findIndex(f => f.field === filter.field);
18
- if (filters.value[index] && filters.value[index].operator === filter.value.operator) {
20
+ if (filters.value[index] && filters.value[index].operator === filter.operator) {
19
21
  filters.value[index] = filter;
20
22
  return;
21
23
  }
22
24
  filters.value.push(filter);
23
25
  }
24
- const setFilters = (f: any) => {
26
+ const setFilters = (f: FilterParams[]) => {
25
27
  filters.value = f;
26
28
  }
27
- const getFilters = () => {
29
+ const getFilters = (): FilterParams[] => {
28
30
  return filters.value;
29
31
  }
30
- const clearFilter = (fieldName: string) => {
32
+ const clearFilter = (fieldName: string): void => {
31
33
  filters.value = filters.value.filter(f => f.field !== fieldName);
32
34
  }
33
- const clearFilters = () => {
35
+ const clearFilters = (): void => {
34
36
  filters.value = [];
35
37
  }
36
38
 
37
- const shouldFilterBeHidden = (fieldName: string) => {
39
+ const shouldFilterBeHidden = (fieldName: string): boolean => {
38
40
  if (coreStore.resource?.columns) {
39
41
  const column = coreStore.resource.columns.find((col: any) => col.name === fieldName);
40
42
  if (column?.showIn?.filter !== true) {
@@ -48,7 +50,7 @@ export const useFiltersStore = defineStore('filters', () => {
48
50
  return filters.value.filter(f => !shouldFilterBeHidden(f.field)).length;
49
51
  });
50
52
 
51
- return {
53
+ const store = {
52
54
  setFilter,
53
55
  getFilters,
54
56
  clearFilters,
@@ -60,4 +62,6 @@ export const useFiltersStore = defineStore('filters', () => {
60
62
  shouldFilterBeHidden,
61
63
  clearFilter
62
64
  }
65
+
66
+ return store as AdminforthFilterStore;
63
67
  })
@@ -13,6 +13,7 @@ import { ActionCheckSource, AdminForthFilterOperators, AdminForthSortDirections,
13
13
  type AdminForthConfigMenuItem,
14
14
  type AnnouncementBadgeResponse,
15
15
  type AdminForthResourceColumnInputCommon,
16
+ type ColumnMinMaxValue,
16
17
  } from './Common.js';
17
18
 
18
19
  export interface ICodeInjector {
@@ -256,7 +257,7 @@ export interface IAdminForthDataSourceConnector {
256
257
  *
257
258
  * Internally should call {@link IAdminForthDataSourceConnector.getFieldValue} for both min and max values.
258
259
  */
259
- getMinMaxForColumnsWithOriginalTypes({ resource, columns }: { resource: AdminForthResource, columns: AdminForthResourceColumn[] }): Promise<{ [key: string]: { min: any, max: any } }>;
260
+ getMinMaxForColumnsWithOriginalTypes({ resource, columns }: { resource: AdminForthResource, columns: AdminForthResourceColumn[] }): Promise<ColumnMinMaxValue>;
260
261
 
261
262
 
262
263
  /**
@@ -309,7 +310,7 @@ export interface IAdminForthDataSourceConnectorBase extends IAdminForthDataSourc
309
310
  newValues: any,
310
311
  }): Promise<{ok: boolean, error?: string}>;
311
312
 
312
- getMinMaxForColumns({ resource, columns }: { resource: AdminForthResource, columns: AdminForthResourceColumn[] }): Promise<{ [key: string]: { min: any, max: any } }>;
313
+ getMinMaxForColumns({ resource, columns }: { resource: AdminForthResource, columns: AdminForthResourceColumn[] }): Promise<ColumnMinMaxValue>;
313
314
 
314
315
  deleteMany?({resource, recordIds}:{resource: AdminForthResource, recordIds: any[]}): Promise<number>;
315
316
  }
@@ -1305,6 +1306,19 @@ export interface AdminForthActionInput {
1305
1306
  standardAllowedActions: AllowedActions;
1306
1307
  }) => boolean;
1307
1308
  url?: string;
1309
+ bulkHandler?: (params: {
1310
+ adminforth: IAdminForth;
1311
+ resource: AdminForthResource;
1312
+ recordIds: (string | number)[];
1313
+ adminUser: AdminUser;
1314
+ response: IAdminForthHttpResponse;
1315
+ extra?: HttpExtra;
1316
+ tr: ITranslateFunction;
1317
+ }) => Promise<{
1318
+ ok: boolean;
1319
+ error?: string;
1320
+ successMessage?: string;
1321
+ }>;
1308
1322
  action?: (params: {
1309
1323
  adminforth: IAdminForth;
1310
1324
  resource: AdminForthResource;
@@ -1312,7 +1326,7 @@ export interface AdminForthActionInput {
1312
1326
  adminUser: AdminUser;
1313
1327
  response: IAdminForthHttpResponse;
1314
1328
  extra?: HttpExtra;
1315
- tr: Function;
1329
+ tr: ITranslateFunction;
1316
1330
  }) => Promise<{
1317
1331
  ok: boolean;
1318
1332
  error?: string;
@@ -1837,6 +1851,8 @@ export interface ResourceOptionsInput extends Omit<NonNullable<AdminForthResourc
1837
1851
  /**
1838
1852
  * Custom bulk actions list. Bulk actions available in list view when user selects multiple records by
1839
1853
  * using checkboxes.
1854
+ * @deprecated Since 2.26.5. Will be removed in 3.0.0. Use `actions` instead.
1855
+
1840
1856
  */
1841
1857
  bulkActions?: Array<AdminForthBulkAction>,
1842
1858
 
@@ -314,8 +314,9 @@ export type FieldGroup = {
314
314
  noTitle?: boolean;
315
315
  };
316
316
 
317
- export interface AdminForthActionFront extends Omit<AdminForthActionInput, 'id'> {
317
+ export interface AdminForthActionFront extends Omit<AdminForthActionInput, 'id' | 'bulkHandler' | 'action' | 'allowed'> {
318
318
  id: string;
319
+ hasBulkHandler?: boolean;
319
320
  }
320
321
 
321
322
  export interface AdminForthBulkActionFront extends Omit<AdminForthBulkActionCommon, 'id'> {
@@ -1163,7 +1164,7 @@ export interface AdminForthConfigMenuItem {
1163
1164
  * Optional callback which will be called before rendering the menu for each item.
1164
1165
  * Result of callback if not null will be used as a small badge near the menu item.
1165
1166
  */
1166
- badge?: string | ((user: AdminUser) => Promise<string>),
1167
+ badge?: string | number | ((user: AdminUser) => Promise<string> | string | Promise<number> | number),
1167
1168
 
1168
1169
  /**
1169
1170
  * Tooltip shown on hover for badge
@@ -1256,4 +1257,8 @@ export interface GetBaseConfigResponse {
1256
1257
  config: AdminForthConfigForFrontend,
1257
1258
  adminUser: AdminUser,
1258
1259
  version: string,
1260
+ }
1261
+
1262
+ export interface ColumnMinMaxValue {
1263
+ [key: string]: { min: any, max: any }
1259
1264
  }
@@ -8,7 +8,7 @@ import { Dropdown } from 'flowbite';
8
8
  import adminforth, { useAdminforth } from '../adminforth';
9
9
  import sanitizeHtml from 'sanitize-html'
10
10
  import debounce from 'debounce';
11
- import type { AdminForthResourceColumnInputCommon, Predicate } from '@/types/Common';
11
+ import type { AdminForthActionFront, AdminForthResourceColumnInputCommon, AdminForthResourceCommon, Predicate } from '@/types/Common';
12
12
  import { i18nInstance } from '../i18n'
13
13
  import { useI18n } from 'vue-i18n';
14
14
  import { onBeforeRouteLeave } from 'vue-router';
@@ -769,6 +769,7 @@ export async function executeCustomBulkAction({
769
769
  onError,
770
770
  setLoadingState,
771
771
  confirmMessage,
772
+ resource,
772
773
  }: {
773
774
  actionId: string | number | undefined,
774
775
  resourceId: string,
@@ -778,6 +779,7 @@ export async function executeCustomBulkAction({
778
779
  onError?: (error: string) => void,
779
780
  setLoadingState?: (loading: boolean) => void,
780
781
  confirmMessage?: string,
782
+ resource?: AdminForthResourceCommon,
781
783
  }): Promise<any> {
782
784
  if (!recordIds || recordIds.length === 0) {
783
785
  if (onError) {
@@ -799,7 +801,38 @@ export async function executeCustomBulkAction({
799
801
  setLoadingState?.(true);
800
802
 
801
803
  try {
802
- // Execute action for all records in parallel using Promise.all
804
+ const action = resource?.options?.actions?.find((a: any) => a.id === actionId) as AdminForthActionFront | undefined;
805
+
806
+ if (action?.hasBulkHandler && action?.showIn?.bulkButton) {
807
+ const result = await callAdminForthApi({
808
+ path: '/start_custom_bulk_action',
809
+ method: 'POST',
810
+ body: {
811
+ resourceId,
812
+ actionId,
813
+ recordIds,
814
+ extra: extra || {},
815
+ }
816
+ });
817
+
818
+ if (result?.ok) {
819
+ if (onSuccess) {
820
+ await onSuccess([result]);
821
+ }
822
+ return { ok: true, results: [result] };
823
+ }
824
+
825
+ if (result?.error) {
826
+ if (onError) {
827
+ onError(result.error);
828
+ }
829
+ return { error: result.error };
830
+ }
831
+
832
+ return result;
833
+ }
834
+
835
+ // Per-record parallel calls (legacy path)
803
836
  const results = await Promise.all(
804
837
  recordIds.map(recordId =>
805
838
  callAdminForthApi({
@@ -814,7 +847,6 @@ export async function executeCustomBulkAction({
814
847
  })
815
848
  )
816
849
  );
817
-
818
850
  const lastResult = results[results.length - 1];
819
851
  if (lastResult?.redirectUrl) {
820
852
  if (lastResult.redirectUrl.includes('target=_blank')) {
@@ -2,10 +2,11 @@
2
2
  <div class="relative flex flex-col max-w-full w-full">
3
3
  <Teleport to="body">
4
4
  <Filters
5
- :columns="coreStore.resource?.columns"
5
+ :columns="coreStore.resource?.columns as AdminForthResourceColumnCommon[] || []"
6
6
  :columnsMinMax="columnsMinMax"
7
7
  :show="filtersShow"
8
8
  @hide="filtersShow = false"
9
+ :filtersStore="filtersStore"
9
10
  />
10
11
  </Teleport>
11
12
 
@@ -69,19 +70,10 @@
69
70
  v-if="action.icon && !bulkActionLoadingStates[action.id!]"
70
71
  :is="getIcon(action.icon)"
71
72
  class="w-5 h-5 transition duration-75 group-hover:text-gray-900 dark:group-hover:text-white"></component>
72
- <div v-if="bulkActionLoadingStates[action.id!]">
73
- <svg
74
- aria-hidden="true"
75
- class="w-5 h-5 animate-spin text-gray-200 dark:text-gray-500 fill-gray-500 dark:fill-gray-300"
76
- viewBox="0 0 100 101"
77
- fill="none"
78
- xmlns="http://www.w3.org/2000/svg"
79
- >
80
- <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"/>
81
- <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"/>
82
- </svg>
83
- <span class="sr-only">Loading...</span>
84
- </div>
73
+ <Spinner
74
+ v-if="bulkActionLoadingStates[action.id!]"
75
+ class="w-5 h-5 text-gray-200 dark:text-gray-500 fill-gray-500 dark:fill-gray-300"
76
+ />
85
77
  {{ `${action.label} (${checkboxes.length})` }}
86
78
  <div v-if="action.badge" class="text-white bg-gradient-to-r from-purple-500
87
79
  via-purple-600 to-purple-700 hover:bg-gradient-to-br focus:ring-4 focus:outline-none
@@ -98,25 +90,22 @@
98
90
  <button
99
91
  :key="action.id"
100
92
  @click="startCustomBulkActionInner(action.id!)"
101
- 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"
93
+ class="flex gap-1 items-center py-1 px-3 text-sm font-medium text-lightListViewButtonText
94
+ focus:outline-none bg-lightListViewButtonBackground rounded-default border h-[34px]
95
+ border-lightListViewButtonBorder hover:bg-lightListViewButtonBackgroundHover
96
+ hover:text-lightListViewButtonTextHover focus:z-10 focus:ring-4 af-button-shadow
97
+ focus:ring-lightListViewButtonFocusRing dark:focus:ring-darkListViewButtonFocusRing
98
+ dark:bg-darkListViewButtonBackground dark:text-darkListViewButtonText dark:border-darkListViewButtonBorder
99
+ dark:hover:text-darkListViewButtonTextHover dark:hover:bg-darkListViewButtonBackgroundHover"
102
100
  >
103
101
  <component
104
102
  v-if="action.icon && !customActionLoadingStates[action.id!]"
105
103
  :is="getIcon(action.icon)"
106
104
  class="w-5 h-5 transition duration-75 group-hover:text-gray-900 dark:group-hover:text-white"></component>
107
- <div v-if="customActionLoadingStates[action.id!]">
108
- <svg
109
- aria-hidden="true"
110
- class="w-5 h-5 animate-spin text-gray-200 dark:text-gray-500 fill-gray-500 dark:fill-gray-300"
111
- viewBox="0 0 100 101"
112
- fill="none"
113
- xmlns="http://www.w3.org/2000/svg"
114
- >
115
- <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"/>
116
- <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"/>
117
- </svg>
118
- <span class="sr-only">Loading...</span>
119
- </div>
105
+ <Spinner
106
+ v-if="customActionLoadingStates[action.id!]"
107
+ class="w-5 h-5 text-gray-200 dark:text-gray-500 fill-gray-500 dark:fill-gray-300"
108
+ />
120
109
  {{ `${action.name} (${checkboxes.length})` }}
121
110
  </button>
122
111
  </div>
@@ -233,8 +222,8 @@ import { computed, onMounted, onUnmounted, ref, watch, type Ref } from 'vue';
233
222
  import { useRoute } from 'vue-router';
234
223
  import { getCustomComponent, initThreeDotsDropdown, getList, startBulkAction } from '@/utils';
235
224
  import ThreeDotsMenu from '@/components/ThreeDotsMenu.vue';
236
- import { Tooltip } from '@/afcl'
237
- import type { AdminForthComponentDeclaration, AdminForthComponentDeclarationFull } from '@/types/Common';
225
+ import { Tooltip, Spinner } from '@/afcl'
226
+ import type { AdminForthComponentDeclaration, AdminForthComponentDeclarationFull, AdminForthFilterOperators, AdminForthResourceColumnCommon } from '@/types/Common';
238
227
 
239
228
 
240
229
  import {
@@ -344,6 +333,7 @@ async function startCustomBulkActionInner(actionId: string | number) {
344
333
  resourceId: route.params.resourceId as string,
345
334
  recordIds: checkboxes.value,
346
335
  confirmMessage: action?.bulkConfirmationMessage,
336
+ resource: coreStore.resource!,
347
337
  setLoadingState: (loading: boolean) => {
348
338
  customActionLoadingStates.value[actionId] = loading;
349
339
  },
@@ -354,7 +344,7 @@ async function startCustomBulkActionInner(actionId: string | number) {
354
344
  const successResults = results.filter(r => r?.successMessage);
355
345
  if (successResults.length > 0) {
356
346
  alert({
357
- message: action?.bulkSuccessMessage || `${successResults.length} out of ${results.length} items processed successfully`,
347
+ message: action?.bulkSuccessMessage ? action.bulkSuccessMessage : action?.hasBulkHandler ? successResults[0].successMessage : `${successResults.length} out of ${results.length} items processed successfully`,
358
348
  variant: 'success'
359
349
  });
360
350
  }
@@ -413,7 +403,7 @@ async function init() {
413
403
  const [_, field, operator] = k.split('__');
414
404
  return {
415
405
  field,
416
- operator,
406
+ operator: operator as AdminForthFilterOperators,
417
407
  value: JSON.parse((route.query[k] as string))
418
408
  }
419
409
  });
@@ -12,7 +12,7 @@
12
12
  <BreadcrumbsWithButtons>
13
13
  <template v-if="coreStore.resource?.options?.actions">
14
14
 
15
- <template v-for="action in coreStore.resource.options.actions.filter(a => a.showIn?.showButton)" :key="action.id">
15
+ <div class="flex gap-1" v-for="action in coreStore.resource.options.actions.filter(a => a.showIn?.showButton)" :key="action.id">
16
16
  <component
17
17
  :is="action?.customComponent ? getCustomComponent(formatComponent(action.customComponent)) : CallActionWrapper"
18
18
  :meta="action.customComponent ? formatComponent(action.customComponent).meta : undefined"
@@ -29,23 +29,14 @@
29
29
  :is="getIcon(action.icon)"
30
30
  class="w-4 h-4 me-2 text-lightPrimary dark:text-darkPrimary"
31
31
  />
32
- <div v-if="actionLoadingStates[action.id!]" class="me-2">
33
- <svg
34
- aria-hidden="true"
35
- class="w-4 h-4 animate-spin text-gray-200 dark:text-gray-500 fill-gray-500 dark:fill-gray-300"
36
- viewBox="0 0 100 101"
37
- fill="none"
38
- xmlns="http://www.w3.org/2000/svg"
39
- >
40
- <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"/>
41
- <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"/>
42
- </svg>
43
- <span class="sr-only">Loading...</span>
44
- </div>
32
+ <Spinner
33
+ v-if="actionLoadingStates[action.id!]"
34
+ class="w-5 h-5 me-2 text-gray-200 dark:text-gray-500 fill-gray-500 dark:fill-gray-300"
35
+ />
45
36
  {{ action.name }}
46
37
  </button>
47
38
  </component>
48
- </template>
39
+ </div>
49
40
  </template>
50
41
  <RouterLink v-if="coreStore.resource?.options?.allowedActions?.create"
51
42
  :to="{ name: 'resource-create', params: { resourceId: $route.params.resourceId } }"
@@ -85,14 +76,52 @@
85
76
  :adminUser="coreStore.adminUser"
86
77
  />
87
78
 
88
- <div v-if="loading" role="status" class="max-w-sm animate-pulse">
89
- <div class="h-2.5 bg-gray-200 rounded-full dark:bg-gray-700 w-48 mb-4"></div>
90
- <div class="h-2 bg-gray-200 rounded-full dark:bg-gray-700 max-w-[360px] mb-2.5"></div>
91
- <div class="h-2 bg-gray-200 rounded-full dark:bg-gray-700 mb-2.5"></div>
92
- <div class="h-2 bg-gray-200 rounded-full dark:bg-gray-700 max-w-[330px] mb-2.5"></div>
93
- <div class="h-2 bg-gray-200 rounded-full dark:bg-gray-700 max-w-[300px] mb-2.5"></div>
94
- <div class="h-2 bg-gray-200 rounded-full dark:bg-gray-700 max-w-[360px]"></div>
95
- <span class="sr-only">{{ $t('Loading...') }}</span>
79
+ <div
80
+ v-if="loading"
81
+ role="status"
82
+ class="animate-pulse overflow-x-auto shadow-resourseFormShadow dark:shadow-darkResourseFormShadow rounded-lg overflow-hidden border border-lightShowTableBodyBorder dark:border-darkShowTableBodyBorder"
83
+ >
84
+ <div
85
+ v-if="groups && groups.length > 0"
86
+ class="text-md font-semibold px-6 py-3 flex flex-1 items-center bg-lightShowTableHeadingBackground dark:bg-darkShowTableHeadingBackground dark:text-darkShowTableHeadingText border-b border-lightShowTableBodyBorder dark:border-darkShowTableBodyBorder"
87
+ >
88
+ <div class="h-4 bg-gray-300 dark:bg-gray-600 rounded-full w-32"></div>
89
+ </div>
90
+
91
+ <table class="w-full text-sm text-left table-fixed border-collapse">
92
+ <thead class="bg-lightShowTableUnderHeadingBackground dark:bg-darkShowTableUnderHeadingBackground block md:table-row-group">
93
+ <tr class="block md:table-row">
94
+ <th scope="col" class="px-6 py-3 text-xs uppercase hidden md:w-52 md:table-cell text-lightShowTableUnderHeadingText dark:text-darkShowTableUnderHeadingText">
95
+ {{ $t('Field') }}
96
+ </th>
97
+ <th scope="col" class="px-6 py-3 text-xs uppercase hidden md:table-cell text-lightShowTableUnderHeadingText dark:text-darkShowTableUnderHeadingText">
98
+ {{ $t('Value') }}
99
+ </th>
100
+ </tr>
101
+ </thead>
102
+
103
+ <tbody>
104
+ <tr
105
+ v-for="i in skeletonRowsCount"
106
+ :key="i"
107
+ class="bg-lightShowTablesBodyBackground border-t border-lightShowTableBodyBorder dark:bg-darkShowTablesBodyBackground dark:border-darkShowTableBodyBorder block md:table-row"
108
+ >
109
+ <td class="px-6 py-[15.5px] relative block md:table-cell pb-0 md:pb-[15.5px]">
110
+ <div class="md:absolute md:inset-0 flex items-center px-6 py-[15.5px]">
111
+ <div class="h-2.5 bg-gray-200 dark:bg-gray-700 rounded-full w-24"></div>
112
+ </div>
113
+ </td>
114
+
115
+ <td class="px-6 py-[15.5px] whitespace-pre-wrap block md:table-cell">
116
+ <div class="flex items-center h-full min-h-[21px]">
117
+ <div class="h-2.5 bg-gray-200 dark:bg-gray-700 rounded-full w-full max-w-[280px]"></div>
118
+ </div>
119
+ </td>
120
+ </tr>
121
+ </tbody>
122
+ </table>
123
+
124
+ <span class="sr-only">{{ $t('Loading...') }}</span>
96
125
  </div>
97
126
  <div
98
127
  v-else-if="coreStore.record"
@@ -163,6 +192,7 @@ import { useI18n } from 'vue-i18n';
163
192
  import { getIcon } from '@/utils';
164
193
  import { type AdminForthComponentDeclarationFull, type AdminForthResourceColumnCommon, type FieldGroup } from '@/types/Common.js';
165
194
  import CallActionWrapper from '@/components/CallActionWrapper.vue'
195
+ import { Spinner } from '@/afcl';
166
196
 
167
197
  const route = useRoute();
168
198
  const router = useRouter();
@@ -177,6 +207,18 @@ const customActions = computed(() => {
177
207
  return coreStore.resource?.options?.actions?.filter((a: any) => a.showIn?.showThreeDotsMenu) || [];
178
208
  });
179
209
 
210
+ const skeletonRowsCount = computed(() => {
211
+ const allCols = coreStore.resource?.columns || [];
212
+
213
+ const isEnabledInConfig = (col: any) => {
214
+ return col.showIn?.list !== false;
215
+ };
216
+
217
+ const finalCount = allCols.filter(isEnabledInConfig).length;
218
+
219
+ return finalCount > 0 ? finalCount : 10;
220
+ });
221
+
180
222
  onMounted(async () => {
181
223
  loading.value = true;
182
224
  await coreStore.fetchResourceFull({
@@ -216,7 +258,7 @@ const groups = computed(() => {
216
258
  });
217
259
 
218
260
  const allColumns = computed(() => {
219
- return coreStore.resource?.columns.filter(col => col.showIn?.show);
261
+ return coreStore.resource?.columns?.filter(col => col.showIn?.show);
220
262
  });
221
263
 
222
264
  const otherColumns = computed(() => {
@@ -1,6 +1,6 @@
1
1
  import type { Express, Request, Response } from 'express';
2
2
  import type { Writable } from 'stream';
3
- import { ActionCheckSource, AdminForthFilterOperators, AdminForthSortDirections, AllowedActionsEnum, AdminForthResourcePages, type AdminForthComponentDeclaration, type AdminUser, type AllowedActionsResolved, type AdminForthBulkActionCommon, type AdminForthForeignResourceCommon, type AdminForthResourceColumnCommon, type AdminForthResourceInputCommon, type AdminForthComponentDeclarationFull, type AdminForthConfigMenuItem, type AnnouncementBadgeResponse, type AdminForthResourceColumnInputCommon } from './Common.js';
3
+ import { ActionCheckSource, AdminForthFilterOperators, AdminForthSortDirections, AllowedActionsEnum, AdminForthResourcePages, type AdminForthComponentDeclaration, type AdminUser, type AllowedActionsResolved, type AdminForthBulkActionCommon, type AdminForthForeignResourceCommon, type AdminForthResourceColumnCommon, type AdminForthResourceInputCommon, type AdminForthComponentDeclarationFull, type AdminForthConfigMenuItem, type AnnouncementBadgeResponse, type AdminForthResourceColumnInputCommon, type ColumnMinMaxValue } from './Common.js';
4
4
  export interface ICodeInjector {
5
5
  srcFoldersToSync: Object;
6
6
  allComponentNames: Object;
@@ -206,12 +206,7 @@ export interface IAdminForthDataSourceConnector {
206
206
  getMinMaxForColumnsWithOriginalTypes({ resource, columns }: {
207
207
  resource: AdminForthResource;
208
208
  columns: AdminForthResourceColumn[];
209
- }): Promise<{
210
- [key: string]: {
211
- min: any;
212
- max: any;
213
- };
214
- }>;
209
+ }): Promise<ColumnMinMaxValue>;
215
210
  /**
216
211
  * Used to create record in database. Should return value of primary key column of created record.
217
212
  */
@@ -274,12 +269,7 @@ export interface IAdminForthDataSourceConnectorBase extends IAdminForthDataSourc
274
269
  getMinMaxForColumns({ resource, columns }: {
275
270
  resource: AdminForthResource;
276
271
  columns: AdminForthResourceColumn[];
277
- }): Promise<{
278
- [key: string]: {
279
- min: any;
280
- max: any;
281
- };
282
- }>;
272
+ }): Promise<ColumnMinMaxValue>;
283
273
  deleteMany?({ resource, recordIds }: {
284
274
  resource: AdminForthResource;
285
275
  recordIds: any[];
@@ -1205,6 +1195,19 @@ export interface AdminForthActionInput {
1205
1195
  standardAllowedActions: AllowedActions;
1206
1196
  }) => boolean;
1207
1197
  url?: string;
1198
+ bulkHandler?: (params: {
1199
+ adminforth: IAdminForth;
1200
+ resource: AdminForthResource;
1201
+ recordIds: (string | number)[];
1202
+ adminUser: AdminUser;
1203
+ response: IAdminForthHttpResponse;
1204
+ extra?: HttpExtra;
1205
+ tr: ITranslateFunction;
1206
+ }) => Promise<{
1207
+ ok: boolean;
1208
+ error?: string;
1209
+ successMessage?: string;
1210
+ }>;
1208
1211
  action?: (params: {
1209
1212
  adminforth: IAdminForth;
1210
1213
  resource: AdminForthResource;
@@ -1212,7 +1215,7 @@ export interface AdminForthActionInput {
1212
1215
  adminUser: AdminUser;
1213
1216
  response: IAdminForthHttpResponse;
1214
1217
  extra?: HttpExtra;
1215
- tr: Function;
1218
+ tr: ITranslateFunction;
1216
1219
  }) => Promise<{
1217
1220
  ok: boolean;
1218
1221
  error?: string;
@@ -1597,6 +1600,8 @@ export interface ResourceOptionsInput extends Omit<NonNullable<AdminForthResourc
1597
1600
  /**
1598
1601
  * Custom bulk actions list. Bulk actions available in list view when user selects multiple records by
1599
1602
  * using checkboxes.
1603
+ * @deprecated Since 2.26.5. Will be removed in 3.0.0. Use `actions` instead.
1604
+
1600
1605
  */
1601
1606
  bulkActions?: Array<AdminForthBulkAction>;
1602
1607
  /**