adminforth 2.4.0-next.33 → 2.4.0-next.331
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.
- package/commands/callTsProxy.js +14 -4
- package/commands/createApp/templates/api.ts.hbs +10 -0
- package/commands/createApp/templates/custom/tsconfig.json.hbs +2 -3
- package/commands/createApp/templates/index.ts.hbs +12 -1
- package/commands/createApp/templates/package.json.hbs +1 -1
- package/commands/createApp/templates/prisma.config.ts.hbs +8 -0
- package/commands/createApp/templates/schema.prisma.hbs +0 -1
- package/commands/createApp/utils.js +10 -0
- package/commands/createCustomComponent/configLoader.js +17 -4
- package/commands/createCustomComponent/main.js +13 -7
- package/commands/createCustomComponent/templates/customCrud/beforeActionButtons.vue.hbs +38 -0
- package/commands/createCustomComponent/templates/customCrud/saveButton.vue.hbs +28 -0
- package/commands/createPlugin/templates/custom/tsconfig.json.hbs +2 -5
- package/commands/createPlugin/templates/package.json.hbs +1 -1
- package/commands/generateModels.js +30 -22
- package/dist/auth.d.ts +9 -1
- package/dist/auth.d.ts.map +1 -1
- package/dist/auth.js +21 -2
- package/dist/auth.js.map +1 -1
- package/dist/dataConnectors/baseConnector.d.ts +1 -1
- package/dist/dataConnectors/baseConnector.d.ts.map +1 -1
- package/dist/dataConnectors/baseConnector.js +70 -18
- package/dist/dataConnectors/baseConnector.js.map +1 -1
- package/dist/dataConnectors/clickhouse.d.ts.map +1 -1
- package/dist/dataConnectors/clickhouse.js +15 -0
- package/dist/dataConnectors/clickhouse.js.map +1 -1
- package/dist/dataConnectors/mongo.d.ts.map +1 -1
- package/dist/dataConnectors/mongo.js +50 -15
- package/dist/dataConnectors/mongo.js.map +1 -1
- package/dist/dataConnectors/mysql.d.ts.map +1 -1
- package/dist/dataConnectors/mysql.js +11 -0
- package/dist/dataConnectors/mysql.js.map +1 -1
- package/dist/dataConnectors/postgres.d.ts.map +1 -1
- package/dist/dataConnectors/postgres.js +43 -14
- package/dist/dataConnectors/postgres.js.map +1 -1
- package/dist/dataConnectors/sqlite.d.ts.map +1 -1
- package/dist/dataConnectors/sqlite.js +11 -0
- package/dist/dataConnectors/sqlite.js.map +1 -1
- package/dist/index.d.ts +11 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +44 -21
- package/dist/index.js.map +1 -1
- package/dist/modules/codeInjector.d.ts +2 -0
- package/dist/modules/codeInjector.d.ts.map +1 -1
- package/dist/modules/codeInjector.js +62 -6
- package/dist/modules/codeInjector.js.map +1 -1
- package/dist/modules/configValidator.d.ts +6 -0
- package/dist/modules/configValidator.d.ts.map +1 -1
- package/dist/modules/configValidator.js +209 -25
- package/dist/modules/configValidator.js.map +1 -1
- package/dist/modules/restApi.d.ts +1 -1
- package/dist/modules/restApi.d.ts.map +1 -1
- package/dist/modules/restApi.js +199 -31
- package/dist/modules/restApi.js.map +1 -1
- package/dist/modules/styles.d.ts +499 -13
- package/dist/modules/styles.d.ts.map +1 -1
- package/dist/modules/styles.js +555 -31
- package/dist/modules/styles.js.map +1 -1
- package/dist/modules/utils.d.ts +7 -15
- package/dist/modules/utils.d.ts.map +1 -1
- package/dist/modules/utils.js +45 -68
- package/dist/modules/utils.js.map +1 -1
- package/dist/servers/express.d.ts +5 -0
- package/dist/servers/express.d.ts.map +1 -1
- package/dist/servers/express.js +40 -1
- package/dist/servers/express.js.map +1 -1
- package/dist/spa/index.html +1 -1
- package/dist/spa/package-lock.json +1208 -708
- package/dist/spa/package.json +34 -34
- package/dist/spa/src/App.vue +132 -174
- package/dist/spa/src/adminforth.ts +41 -17
- package/dist/spa/src/afcl/AreaChart.vue +0 -1
- package/dist/spa/src/afcl/BarChart.vue +2 -2
- package/dist/spa/src/afcl/Button.vue +3 -3
- package/dist/spa/src/afcl/ButtonGroup.vue +91 -0
- package/dist/spa/src/afcl/Card.vue +25 -0
- package/dist/spa/src/afcl/Checkbox.vue +21 -13
- package/dist/spa/src/afcl/CountryFlag.vue +4 -1
- package/dist/spa/src/{components/CustomDatePicker.vue → afcl/DatePicker.vue} +95 -9
- package/dist/spa/src/afcl/Dialog.vue +47 -27
- package/dist/spa/src/afcl/Dropzone.vue +145 -48
- package/dist/spa/src/afcl/Input.vue +14 -6
- package/dist/spa/src/afcl/JsonViewer.vue +25 -0
- package/dist/spa/src/afcl/LinkButton.vue +3 -3
- package/dist/spa/src/afcl/PieChart.vue +5 -5
- package/dist/spa/src/afcl/ProgressBar.vue +7 -7
- package/dist/spa/src/afcl/Select.vue +82 -34
- package/dist/spa/src/afcl/Skeleton.vue +6 -6
- package/dist/spa/src/afcl/Table.vue +313 -75
- package/dist/spa/src/afcl/Textarea.vue +31 -0
- package/dist/spa/src/afcl/Toggle.vue +32 -0
- package/dist/spa/src/afcl/Tooltip.vue +28 -18
- package/dist/spa/src/afcl/VerticalTabs.vue +21 -7
- package/dist/spa/src/afcl/index.ts +6 -3
- package/dist/spa/src/components/AcceptModal.vue +48 -14
- package/dist/spa/src/components/Breadcrumbs.vue +5 -5
- package/dist/spa/src/components/CallActionWrapper.vue +15 -0
- package/dist/spa/src/components/ColumnValueInput.vue +38 -18
- package/dist/spa/src/components/ColumnValueInputWrapper.vue +4 -3
- package/dist/spa/src/components/CustomDateRangePicker.vue +9 -8
- package/dist/spa/src/components/CustomRangePicker.vue +37 -21
- package/dist/spa/src/components/ErrorMessage.vue +21 -0
- package/dist/spa/src/components/Filters.vue +195 -132
- package/dist/spa/src/components/GroupsTable.vue +9 -8
- package/dist/spa/src/components/MenuLink.vue +95 -23
- package/dist/spa/src/components/ResourceForm.vue +99 -51
- package/dist/spa/src/components/ResourceListTable.vue +121 -95
- package/dist/spa/src/components/ResourceListTableVirtual.vue +119 -88
- package/dist/spa/src/components/ShowTable.vue +21 -15
- package/dist/spa/src/components/Sidebar.vue +472 -0
- package/dist/spa/src/components/SingleSkeletLoader.vue +6 -6
- package/dist/spa/src/components/SkeleteLoader.vue +3 -3
- package/dist/spa/src/components/ThreeDotsMenu.vue +84 -15
- package/dist/spa/src/components/Toast.vue +40 -29
- package/dist/spa/src/components/UserMenuSettingsButton.vue +69 -0
- package/dist/spa/src/components/ValueRenderer.vue +44 -17
- package/dist/spa/src/controls/BoolToggle.vue +34 -0
- package/dist/spa/src/i18n.ts +5 -3
- package/dist/spa/src/main.ts +1 -1
- package/dist/spa/src/renderers/CompactField.vue +1 -1
- package/dist/spa/src/renderers/CompactUUID.vue +1 -1
- package/dist/spa/src/router/index.ts +8 -0
- package/dist/spa/src/shims-vue.d.ts +5 -0
- package/dist/spa/src/spa_types/core.ts +13 -1
- package/dist/spa/src/stores/core.ts +15 -1
- package/dist/spa/src/stores/filters.ts +33 -2
- package/dist/spa/src/stores/modal.ts +6 -1
- package/dist/spa/src/stores/toast.ts +22 -3
- package/dist/spa/src/types/Back.ts +168 -23
- package/dist/spa/src/types/Common.ts +109 -32
- package/dist/spa/src/types/FrontendAPI.ts +32 -23
- package/dist/spa/src/types/adapters/CaptchaAdapter.ts +34 -0
- package/dist/spa/src/types/adapters/EmailAdapter.ts +2 -4
- package/dist/spa/src/types/adapters/ImageVisionAdapter.ts +30 -0
- package/dist/spa/src/types/adapters/KeyValueAdapter.ts +16 -0
- package/dist/spa/src/types/adapters/StorageAdapter.ts +4 -2
- package/dist/spa/src/types/adapters/index.ts +3 -0
- package/dist/spa/src/utils.ts +291 -11
- package/dist/spa/src/views/CreateView.vue +88 -22
- package/dist/spa/src/views/EditView.vue +55 -22
- package/dist/spa/src/views/ListView.vue +144 -87
- package/dist/spa/src/views/LoginView.vue +26 -35
- package/dist/spa/src/views/ResourceParent.vue +2 -2
- package/dist/spa/src/views/SettingsView.vue +121 -0
- package/dist/spa/src/views/ShowView.vue +83 -53
- package/dist/spa/src/websocket.ts +6 -1
- package/dist/spa/tsconfig.app.json +1 -1
- package/dist/spa/vite.config.ts +45 -2
- package/dist/types/Back.d.ts +151 -14
- package/dist/types/Back.d.ts.map +1 -1
- package/dist/types/Back.js +15 -0
- package/dist/types/Back.js.map +1 -1
- package/dist/types/Common.d.ts +123 -29
- package/dist/types/Common.d.ts.map +1 -1
- package/dist/types/Common.js.map +1 -1
- package/dist/types/FrontendAPI.d.ts +32 -18
- package/dist/types/FrontendAPI.d.ts.map +1 -1
- package/dist/types/FrontendAPI.js.map +1 -1
- package/dist/types/adapters/CaptchaAdapter.d.ts +30 -0
- package/dist/types/adapters/CaptchaAdapter.d.ts.map +1 -0
- package/dist/types/adapters/CaptchaAdapter.js +5 -0
- package/dist/types/adapters/CaptchaAdapter.js.map +1 -0
- package/dist/types/adapters/EmailAdapter.d.ts +2 -3
- package/dist/types/adapters/EmailAdapter.d.ts.map +1 -1
- package/dist/types/adapters/ImageVisionAdapter.d.ts +25 -0
- package/dist/types/adapters/ImageVisionAdapter.d.ts.map +1 -0
- package/dist/types/adapters/ImageVisionAdapter.js +2 -0
- package/dist/types/adapters/ImageVisionAdapter.js.map +1 -0
- package/dist/types/adapters/KeyValueAdapter.d.ts +10 -0
- package/dist/types/adapters/KeyValueAdapter.d.ts.map +1 -0
- package/dist/types/adapters/KeyValueAdapter.js +2 -0
- package/dist/types/adapters/KeyValueAdapter.js.map +1 -0
- package/dist/types/adapters/StorageAdapter.d.ts +2 -0
- package/dist/types/adapters/StorageAdapter.d.ts.map +1 -1
- package/dist/types/adapters/index.d.ts +3 -0
- package/dist/types/adapters/index.d.ts.map +1 -1
- package/package.json +4 -2
package/dist/spa/src/utils.ts
CHANGED
|
@@ -1,24 +1,32 @@
|
|
|
1
1
|
import { onMounted, ref, resolveComponent } from 'vue';
|
|
2
2
|
import type { CoreConfig } from './spa_types/core';
|
|
3
|
-
import type { ValidationObject } from './types/
|
|
3
|
+
import type { ValidationObject } from './types/Common.js';
|
|
4
4
|
import router from "./router";
|
|
5
5
|
import { useCoreStore } from './stores/core';
|
|
6
6
|
import { useUserStore } from './stores/user';
|
|
7
7
|
import { Dropdown } from 'flowbite';
|
|
8
8
|
import adminforth from './adminforth';
|
|
9
9
|
import sanitizeHtml from 'sanitize-html'
|
|
10
|
+
import debounce from 'debounce';
|
|
11
|
+
import type { AdminForthResourceColumnInputCommon, Predicate } from '@/types/Common';
|
|
12
|
+
import { i18nInstance } from './i18n'
|
|
10
13
|
|
|
11
14
|
const LS_LANG_KEY = `afLanguage`;
|
|
15
|
+
const MAX_CONSECUTIVE_EMPTY_RESULTS = 2;
|
|
16
|
+
const ITEMS_PER_PAGE_LIMIT = 100;
|
|
12
17
|
|
|
13
|
-
export async function callApi({path, method, body
|
|
18
|
+
export async function callApi({path, method, body, headers}: {
|
|
14
19
|
path: string, method: 'GET' | 'POST' | 'PUT' | 'DELETE' | 'PATCH'
|
|
15
20
|
body?: any
|
|
21
|
+
headers?: Record<string, string>
|
|
16
22
|
}): Promise<any> {
|
|
23
|
+
const t = i18nInstance?.global.t || ((s: string) => s)
|
|
17
24
|
const options = {
|
|
18
25
|
method,
|
|
19
26
|
headers: {
|
|
20
27
|
'Content-Type': 'application/json',
|
|
21
28
|
'accept-language': localStorage.getItem(LS_LANG_KEY) || 'en',
|
|
29
|
+
...headers
|
|
22
30
|
},
|
|
23
31
|
body: JSON.stringify(body),
|
|
24
32
|
};
|
|
@@ -27,6 +35,7 @@ export async function callApi({path, method, body=undefined}: {
|
|
|
27
35
|
const r = await fetch(fullPath, options);
|
|
28
36
|
if (r.status == 401 ) {
|
|
29
37
|
useUserStore().unauthorize();
|
|
38
|
+
useCoreStore().resetAdminUser();
|
|
30
39
|
await router.push({ name: 'login' });
|
|
31
40
|
return null;
|
|
32
41
|
}
|
|
@@ -35,18 +44,18 @@ export async function callApi({path, method, body=undefined}: {
|
|
|
35
44
|
// if it is internal error, say to user
|
|
36
45
|
if (e instanceof TypeError && e.message === 'Failed to fetch') {
|
|
37
46
|
// this is a network error
|
|
38
|
-
adminforth.alert({variant:'danger', message:
|
|
47
|
+
adminforth.alert({variant:'danger', message: t('Network error, please check your Internet connection and try again'),})
|
|
39
48
|
return null;
|
|
40
49
|
}
|
|
41
50
|
|
|
42
|
-
adminforth.alert({variant:'danger', message:
|
|
51
|
+
adminforth.alert({variant:'danger', message: t('Something went wrong, please try again later'),})
|
|
43
52
|
console.error(`error in callApi ${path}`, e);
|
|
44
53
|
}
|
|
45
54
|
}
|
|
46
55
|
|
|
47
56
|
export async function callAdminForthApi({ path, method, body=undefined, headers=undefined }: {
|
|
48
57
|
path: string,
|
|
49
|
-
method: 'GET' | 'POST' | 'PUT' | 'DELETE',
|
|
58
|
+
method: 'GET' | 'POST' | 'PUT' | 'DELETE' | 'PATCH',
|
|
50
59
|
body?: any,
|
|
51
60
|
headers?: Record<string, string>
|
|
52
61
|
}): Promise<any> {
|
|
@@ -92,13 +101,14 @@ export const loadFile = (file: string) => {
|
|
|
92
101
|
}
|
|
93
102
|
|
|
94
103
|
export function checkEmptyValues(value: any, viewType: 'show' | 'list' ) {
|
|
95
|
-
const config: CoreConfig | {} = useCoreStore().config;
|
|
104
|
+
const config: CoreConfig | {} | null = useCoreStore().config;
|
|
96
105
|
let emptyFieldPlaceholder = '';
|
|
97
|
-
if (config
|
|
98
|
-
|
|
99
|
-
|
|
106
|
+
if (config && 'emptyFieldPlaceholder' in config) {
|
|
107
|
+
const efp = (config as CoreConfig).emptyFieldPlaceholder;
|
|
108
|
+
if(typeof efp === 'string') {
|
|
109
|
+
emptyFieldPlaceholder = efp;
|
|
100
110
|
} else {
|
|
101
|
-
emptyFieldPlaceholder =
|
|
111
|
+
emptyFieldPlaceholder = efp?.[viewType] || '';
|
|
102
112
|
}
|
|
103
113
|
if (value === null || value === undefined || value === '') {
|
|
104
114
|
return emptyFieldPlaceholder;
|
|
@@ -179,7 +189,7 @@ export function verySimpleHash(str: string): string {
|
|
|
179
189
|
return `${str.split('').reduce((a, b)=>{a=((a<<5)-a)+b.charCodeAt(0);return a&a},0)}`;
|
|
180
190
|
}
|
|
181
191
|
|
|
182
|
-
export function humanifySize(size) {
|
|
192
|
+
export function humanifySize(size: number) {
|
|
183
193
|
if (!size) {
|
|
184
194
|
return '';
|
|
185
195
|
}
|
|
@@ -208,4 +218,274 @@ export function protectAgainstXSS(value: string) {
|
|
|
208
218
|
'img': [ 'src', 'srcset', 'alt', 'title', 'width', 'height', 'loading' ]
|
|
209
219
|
}
|
|
210
220
|
});
|
|
221
|
+
}
|
|
222
|
+
|
|
223
|
+
export function isPolymorphicColumn(column: any): boolean {
|
|
224
|
+
return !!(column.foreignResource?.polymorphicResources && column.foreignResource.polymorphicResources.length > 0);
|
|
225
|
+
}
|
|
226
|
+
|
|
227
|
+
export function handleForeignResourcePagination(
|
|
228
|
+
column: any,
|
|
229
|
+
items: any[],
|
|
230
|
+
emptyResultsCount: number = 0,
|
|
231
|
+
isSearching: boolean = false
|
|
232
|
+
): { hasMore: boolean; emptyResultsCount: number } {
|
|
233
|
+
const isPolymorphic = isPolymorphicColumn(column);
|
|
234
|
+
|
|
235
|
+
if (isPolymorphic) {
|
|
236
|
+
if (isSearching) {
|
|
237
|
+
return {
|
|
238
|
+
hasMore: items.length > 0,
|
|
239
|
+
emptyResultsCount: 0
|
|
240
|
+
};
|
|
241
|
+
} else {
|
|
242
|
+
if (items.length === 0) {
|
|
243
|
+
const newEmptyCount = emptyResultsCount + 1;
|
|
244
|
+
return {
|
|
245
|
+
hasMore: newEmptyCount < MAX_CONSECUTIVE_EMPTY_RESULTS, // Stop loading after 2 consecutive empty results
|
|
246
|
+
emptyResultsCount: newEmptyCount
|
|
247
|
+
};
|
|
248
|
+
} else {
|
|
249
|
+
return {
|
|
250
|
+
hasMore: true,
|
|
251
|
+
emptyResultsCount: 0
|
|
252
|
+
};
|
|
253
|
+
}
|
|
254
|
+
}
|
|
255
|
+
} else {
|
|
256
|
+
return {
|
|
257
|
+
hasMore: items.length === ITEMS_PER_PAGE_LIMIT,
|
|
258
|
+
emptyResultsCount: 0
|
|
259
|
+
};
|
|
260
|
+
}
|
|
261
|
+
}
|
|
262
|
+
|
|
263
|
+
export async function loadMoreForeignOptions({
|
|
264
|
+
columnName,
|
|
265
|
+
searchTerm = '',
|
|
266
|
+
columns,
|
|
267
|
+
resourceId,
|
|
268
|
+
columnOptions,
|
|
269
|
+
columnLoadingState,
|
|
270
|
+
columnOffsets,
|
|
271
|
+
columnEmptyResultsCount
|
|
272
|
+
}: {
|
|
273
|
+
columnName: string;
|
|
274
|
+
searchTerm?: string;
|
|
275
|
+
columns: any[];
|
|
276
|
+
resourceId: string;
|
|
277
|
+
columnOptions: any;
|
|
278
|
+
columnLoadingState: any;
|
|
279
|
+
columnOffsets: any;
|
|
280
|
+
columnEmptyResultsCount: any;
|
|
281
|
+
}) {
|
|
282
|
+
const column = columns?.find(c => c.name === columnName);
|
|
283
|
+
if (!column || !column.foreignResource) return;
|
|
284
|
+
|
|
285
|
+
const state = columnLoadingState[columnName];
|
|
286
|
+
if (state.loading || !state.hasMore) return;
|
|
287
|
+
|
|
288
|
+
state.loading = true;
|
|
289
|
+
|
|
290
|
+
try {
|
|
291
|
+
const list = await callAdminForthApi({
|
|
292
|
+
method: 'POST',
|
|
293
|
+
path: `/get_resource_foreign_data`,
|
|
294
|
+
body: {
|
|
295
|
+
resourceId,
|
|
296
|
+
column: columnName,
|
|
297
|
+
limit: 100,
|
|
298
|
+
offset: columnOffsets[columnName],
|
|
299
|
+
search: searchTerm,
|
|
300
|
+
},
|
|
301
|
+
});
|
|
302
|
+
|
|
303
|
+
if (!list || !Array.isArray(list.items)) {
|
|
304
|
+
console.warn(`Unexpected API response for column ${columnName}:`, list);
|
|
305
|
+
state.hasMore = false;
|
|
306
|
+
return;
|
|
307
|
+
}
|
|
308
|
+
|
|
309
|
+
if (!columnOptions.value) {
|
|
310
|
+
columnOptions.value = {};
|
|
311
|
+
}
|
|
312
|
+
if (!columnOptions.value[columnName]) {
|
|
313
|
+
columnOptions.value[columnName] = [];
|
|
314
|
+
}
|
|
315
|
+
columnOptions.value[columnName].push(...list.items);
|
|
316
|
+
|
|
317
|
+
columnOffsets[columnName] += 100;
|
|
318
|
+
|
|
319
|
+
const paginationResult = handleForeignResourcePagination(
|
|
320
|
+
column,
|
|
321
|
+
list.items,
|
|
322
|
+
columnEmptyResultsCount[columnName] || 0,
|
|
323
|
+
false // not searching
|
|
324
|
+
);
|
|
325
|
+
|
|
326
|
+
columnEmptyResultsCount[columnName] = paginationResult.emptyResultsCount;
|
|
327
|
+
state.hasMore = paginationResult.hasMore;
|
|
328
|
+
|
|
329
|
+
} catch (error) {
|
|
330
|
+
console.error('Error loading more options:', error);
|
|
331
|
+
} finally {
|
|
332
|
+
state.loading = false;
|
|
333
|
+
}
|
|
334
|
+
}
|
|
335
|
+
|
|
336
|
+
export async function searchForeignOptions({
|
|
337
|
+
columnName,
|
|
338
|
+
searchTerm,
|
|
339
|
+
columns,
|
|
340
|
+
resourceId,
|
|
341
|
+
columnOptions,
|
|
342
|
+
columnLoadingState,
|
|
343
|
+
columnOffsets,
|
|
344
|
+
columnEmptyResultsCount
|
|
345
|
+
}: {
|
|
346
|
+
columnName: string;
|
|
347
|
+
searchTerm: string;
|
|
348
|
+
columns: any[];
|
|
349
|
+
resourceId: string;
|
|
350
|
+
columnOptions: any;
|
|
351
|
+
columnLoadingState: any;
|
|
352
|
+
columnOffsets: any;
|
|
353
|
+
columnEmptyResultsCount: any;
|
|
354
|
+
}) {
|
|
355
|
+
const column = columns?.find(c => c.name === columnName);
|
|
356
|
+
|
|
357
|
+
if (!column || !column.foreignResource || !column.foreignResource.searchableFields) {
|
|
358
|
+
return;
|
|
359
|
+
}
|
|
360
|
+
|
|
361
|
+
const state = columnLoadingState[columnName];
|
|
362
|
+
if (state.loading) return;
|
|
363
|
+
|
|
364
|
+
state.loading = true;
|
|
365
|
+
|
|
366
|
+
try {
|
|
367
|
+
const list = await callAdminForthApi({
|
|
368
|
+
method: 'POST',
|
|
369
|
+
path: `/get_resource_foreign_data`,
|
|
370
|
+
body: {
|
|
371
|
+
resourceId,
|
|
372
|
+
column: columnName,
|
|
373
|
+
limit: 100,
|
|
374
|
+
offset: 0,
|
|
375
|
+
search: searchTerm,
|
|
376
|
+
},
|
|
377
|
+
});
|
|
378
|
+
|
|
379
|
+
if (!list || !Array.isArray(list.items)) {
|
|
380
|
+
console.warn(`Unexpected API response for column ${columnName}:`, list);
|
|
381
|
+
state.hasMore = false;
|
|
382
|
+
return;
|
|
383
|
+
}
|
|
384
|
+
|
|
385
|
+
if (!columnOptions.value) {
|
|
386
|
+
columnOptions.value = {};
|
|
387
|
+
}
|
|
388
|
+
columnOptions.value[columnName] = list.items;
|
|
389
|
+
columnOffsets[columnName] = 100;
|
|
390
|
+
|
|
391
|
+
const paginationResult = handleForeignResourcePagination(
|
|
392
|
+
column,
|
|
393
|
+
list.items,
|
|
394
|
+
columnEmptyResultsCount[columnName] || 0,
|
|
395
|
+
true // is searching
|
|
396
|
+
);
|
|
397
|
+
|
|
398
|
+
columnEmptyResultsCount[columnName] = paginationResult.emptyResultsCount;
|
|
399
|
+
state.hasMore = paginationResult.hasMore;
|
|
400
|
+
|
|
401
|
+
} catch (error) {
|
|
402
|
+
console.error('Error searching options:', error);
|
|
403
|
+
} finally {
|
|
404
|
+
state.loading = false;
|
|
405
|
+
}
|
|
406
|
+
}
|
|
407
|
+
|
|
408
|
+
export function createSearchInputHandlers(
|
|
409
|
+
columns: any[],
|
|
410
|
+
searchFunction: (columnName: string, searchTerm: string) => void,
|
|
411
|
+
getDebounceMs?: (column: any) => number
|
|
412
|
+
) {
|
|
413
|
+
if (!columns) return {};
|
|
414
|
+
|
|
415
|
+
return columns.reduce((acc, c) => {
|
|
416
|
+
if (c.foreignResource && c.foreignResource.searchableFields) {
|
|
417
|
+
const debounceMs = getDebounceMs ? getDebounceMs(c) : 300;
|
|
418
|
+
return {
|
|
419
|
+
...acc,
|
|
420
|
+
[c.name]: debounce((searchTerm: string) => {
|
|
421
|
+
searchFunction(c.name, searchTerm);
|
|
422
|
+
}, debounceMs),
|
|
423
|
+
};
|
|
424
|
+
}
|
|
425
|
+
return acc;
|
|
426
|
+
}, {} as Record<string, (searchTerm: string) => void>);
|
|
427
|
+
}
|
|
428
|
+
|
|
429
|
+
export function checkShowIf(c: AdminForthResourceColumnInputCommon, record: Record<string, any>) {
|
|
430
|
+
if (!c.showIf) return true;
|
|
431
|
+
|
|
432
|
+
const evaluatePredicate = (predicate: Predicate): boolean => {
|
|
433
|
+
const results: boolean[] = [];
|
|
434
|
+
|
|
435
|
+
if ("$and" in predicate) {
|
|
436
|
+
results.push(predicate.$and.every(evaluatePredicate));
|
|
437
|
+
}
|
|
438
|
+
|
|
439
|
+
if ("$or" in predicate) {
|
|
440
|
+
results.push(predicate.$or.some(evaluatePredicate));
|
|
441
|
+
}
|
|
442
|
+
|
|
443
|
+
const fieldEntries = Object.entries(predicate).filter(([key]) => !key.startsWith('$'));
|
|
444
|
+
if (fieldEntries.length > 0) {
|
|
445
|
+
const fieldResult = fieldEntries.every(([field, condition]) => {
|
|
446
|
+
const recordValue = record[field];
|
|
447
|
+
|
|
448
|
+
if (condition === undefined) {
|
|
449
|
+
return true;
|
|
450
|
+
}
|
|
451
|
+
if (typeof condition !== "object" || condition === null) {
|
|
452
|
+
return recordValue === condition;
|
|
453
|
+
}
|
|
454
|
+
|
|
455
|
+
if ("$eq" in condition) return recordValue === condition.$eq;
|
|
456
|
+
if ("$not" in condition) return recordValue !== condition.$not;
|
|
457
|
+
if ("$gt" in condition) return recordValue > condition.$gt;
|
|
458
|
+
if ("$gte" in condition) return recordValue >= condition.$gte;
|
|
459
|
+
if ("$lt" in condition) return recordValue < condition.$lt;
|
|
460
|
+
if ("$lte" in condition) return recordValue <= condition.$lte;
|
|
461
|
+
if ("$in" in condition) return (Array.isArray(condition.$in) && condition.$in.includes(recordValue));
|
|
462
|
+
if ("$nin" in condition) return (Array.isArray(condition.$nin) && !condition.$nin.includes(recordValue));
|
|
463
|
+
if ("$includes" in condition)
|
|
464
|
+
return (
|
|
465
|
+
Array.isArray(recordValue) &&
|
|
466
|
+
recordValue.includes(condition.$includes)
|
|
467
|
+
);
|
|
468
|
+
if ("$nincludes" in condition)
|
|
469
|
+
return (
|
|
470
|
+
Array.isArray(recordValue) &&
|
|
471
|
+
!recordValue.includes(condition.$nicludes)
|
|
472
|
+
);
|
|
473
|
+
|
|
474
|
+
return true;
|
|
475
|
+
});
|
|
476
|
+
results.push(fieldResult);
|
|
477
|
+
}
|
|
478
|
+
|
|
479
|
+
return results.every(result => result);
|
|
480
|
+
};
|
|
481
|
+
|
|
482
|
+
return evaluatePredicate(c.showIf);
|
|
483
|
+
}
|
|
484
|
+
|
|
485
|
+
export function btoa_function(source: string): string {
|
|
486
|
+
return btoa(source);
|
|
487
|
+
}
|
|
488
|
+
|
|
489
|
+
export function atob_function(source: string): string {
|
|
490
|
+
return atob(source);
|
|
211
491
|
}
|
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
<component
|
|
5
5
|
v-for="c in coreStore?.resourceOptions?.pageInjections?.create?.beforeBreadcrumbs || []"
|
|
6
6
|
:is="getCustomComponent(c)"
|
|
7
|
-
:meta="c.meta"
|
|
7
|
+
:meta="(c as AdminForthComponentDeclarationFull).meta"
|
|
8
8
|
:record="coreStore.record"
|
|
9
9
|
:resource="coreStore.resource"
|
|
10
10
|
:adminUser="coreStore.adminUser"
|
|
@@ -13,25 +13,42 @@
|
|
|
13
13
|
<BreadcrumbsWithButtons>
|
|
14
14
|
<!-- save and cancle -->
|
|
15
15
|
<button @click="$router.back()"
|
|
16
|
-
class="af-cancel-button flex items-center py-1 px-3 me-2 text-sm font-medium rounded-default text-
|
|
16
|
+
class="af-cancel-button flex items-center py-1 px-3 me-2 text-sm font-medium rounded-default text-lightCreateViewButtonText focus:outline-none bg-lightCreateViewButtonBackground rounded border border-lightCreateViewButtonBorder hover:bg-lightCreateViewButtonBackgroundHover hover:text-lightCreateViewButtonTextHover focus:z-10 focus:ring-4 focus:ring-lightCreateViewButtonFocusRing dark:focus:ring-darkCreateViewButtonFocusRing dark:bg-darkCreateViewButtonBackground dark:text-darkCreateViewButtonText dark:border-darkCreateViewButtonBorder dark:hover:text-darkCreateViewButtonTextHover dark:hover:bg-darkCreateViewButtonBackgroundHover"
|
|
17
17
|
>
|
|
18
18
|
{{ $t('Cancel') }}
|
|
19
19
|
</button>
|
|
20
20
|
|
|
21
|
+
<!-- Custom Save Button injection -->
|
|
22
|
+
<component
|
|
23
|
+
v-if="createSaveButtonInjection"
|
|
24
|
+
:is="getCustomComponent(createSaveButtonInjection)"
|
|
25
|
+
:meta="createSaveButtonInjection.meta"
|
|
26
|
+
:record="record"
|
|
27
|
+
:resource="coreStore.resource"
|
|
28
|
+
:adminUser="coreStore.adminUser"
|
|
29
|
+
:saving="saving"
|
|
30
|
+
:validating="validating"
|
|
31
|
+
:isValid="isValid"
|
|
32
|
+
:disabled="saving || (validating && !isValid)"
|
|
33
|
+
:saveRecord="saveRecord"
|
|
34
|
+
/>
|
|
35
|
+
|
|
36
|
+
<!-- Default Save Button fallback -->
|
|
21
37
|
<button
|
|
22
|
-
|
|
23
|
-
|
|
38
|
+
v-else
|
|
39
|
+
@click="() => saveRecord()"
|
|
40
|
+
class="af-save-button flex items-center py-1 px-3 text-sm font-medium rounded-default text-lightCreateViewSaveButtonText focus:outline-none bg-lightCreateViewButtonBackground rounded border border-lightCreateViewButtonBorder hover:bg-lightCreateViewButtonBackgroundHover hover:text-lightCreateViewSaveButtonTextHover focus:z-10 focus:ring-4 focus:ring-lightCreateViewButtonFocusRing dark:focus:ring-darkCreateViewButtonFocusRing dark:bg-darkCreateViewButtonBackground dark:text-darkCreateViewSaveButtonText dark:border-darkCreateViewButtonBorder dark:hover:text-darkCreateViewSaveButtonTextHover dark:hover:bg-darkCreateViewButtonBackgroundHover disabled:opacity-50 gap-1"
|
|
24
41
|
:disabled="saving || (validating && !isValid)"
|
|
25
42
|
>
|
|
26
43
|
<svg v-if="saving"
|
|
27
|
-
aria-hidden="true" class="w-4 h-4 mr-1 text-gray-200 animate-spin dark:text-gray-600 fill-
|
|
44
|
+
aria-hidden="true" class="w-4 h-4 mr-1 text-gray-200 animate-spin dark:text-gray-600 fill-lightCreateViewSaveButtonText" 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>
|
|
28
45
|
|
|
29
|
-
<IconFloppyDiskSolid v-else class="w-4 h-4
|
|
46
|
+
<IconFloppyDiskSolid v-else class="w-4 h-4" />
|
|
30
47
|
{{ $t('Save') }}
|
|
31
48
|
</button>
|
|
32
49
|
|
|
33
50
|
<ThreeDotsMenu
|
|
34
|
-
:threeDotsDropdownItems="coreStore.resourceOptions?.pageInjections?.create?.threeDotsDropdownItems"
|
|
51
|
+
:threeDotsDropdownItems="(coreStore.resourceOptions?.pageInjections?.create?.threeDotsDropdownItems as [])"
|
|
35
52
|
></ThreeDotsMenu>
|
|
36
53
|
|
|
37
54
|
</BreadcrumbsWithButtons>
|
|
@@ -39,7 +56,7 @@
|
|
|
39
56
|
<component
|
|
40
57
|
v-for="c in coreStore?.resourceOptions?.pageInjections?.create?.afterBreadcrumbs || []"
|
|
41
58
|
:is="getCustomComponent(c)"
|
|
42
|
-
:meta="c.meta"
|
|
59
|
+
:meta="(c as AdminForthComponentDeclarationFull).meta"
|
|
43
60
|
:record="coreStore.record"
|
|
44
61
|
:resource="coreStore.resource"
|
|
45
62
|
:adminUser="coreStore.adminUser"
|
|
@@ -50,8 +67,9 @@
|
|
|
50
67
|
|
|
51
68
|
<ResourceForm
|
|
52
69
|
v-else
|
|
70
|
+
ref="resourceFormRef"
|
|
53
71
|
:record="record"
|
|
54
|
-
:resource="coreStore.resource"
|
|
72
|
+
:resource="coreStore.resource!"
|
|
55
73
|
@update:record="onUpdateRecord"
|
|
56
74
|
@update:isValid="isValid = $event"
|
|
57
75
|
:validating="validating"
|
|
@@ -63,7 +81,7 @@
|
|
|
63
81
|
<component
|
|
64
82
|
v-for="c in coreStore?.resourceOptions?.pageInjections?.create?.bottom || []"
|
|
65
83
|
:is="getCustomComponent(c)"
|
|
66
|
-
:meta="c.meta"
|
|
84
|
+
:meta="(c as AdminForthComponentDeclarationFull).meta"
|
|
67
85
|
:record="coreStore.record"
|
|
68
86
|
:resource="coreStore.resource"
|
|
69
87
|
:adminUser="coreStore.adminUser"
|
|
@@ -81,13 +99,15 @@ import SingleSkeletLoader from '@/components/SingleSkeletLoader.vue';
|
|
|
81
99
|
import { useCoreStore } from '@/stores/core';
|
|
82
100
|
import { callAdminForthApi, getCustomComponent,checkAcessByAllowedActions, initThreeDotsDropdown } from '@/utils';
|
|
83
101
|
import { IconFloppyDiskSolid } from '@iconify-prerendered/vue-flowbite';
|
|
84
|
-
import { onMounted, ref, watch } from 'vue';
|
|
102
|
+
import { onMounted, ref, watch, nextTick } from 'vue';
|
|
85
103
|
import { useRoute, useRouter } from 'vue-router';
|
|
86
104
|
import { computed } from 'vue';
|
|
87
105
|
import { showErrorTost } from '@/composables/useFrontendApi';
|
|
88
106
|
import ThreeDotsMenu from '@/components/ThreeDotsMenu.vue';
|
|
89
107
|
import adminforth from '@/adminforth';
|
|
90
108
|
import { useI18n } from 'vue-i18n';
|
|
109
|
+
import { type AdminForthComponentDeclarationFull } from '@/types/Common.js';
|
|
110
|
+
import type { AdminForthResourceColumn } from '@/types/Back';
|
|
91
111
|
|
|
92
112
|
const isValid = ref(false);
|
|
93
113
|
const validating = ref(false);
|
|
@@ -104,43 +124,68 @@ const coreStore = useCoreStore();
|
|
|
104
124
|
|
|
105
125
|
const { t } = useI18n();
|
|
106
126
|
|
|
127
|
+
const resourceFormRef = ref<InstanceType<typeof ResourceForm> | null>(null);
|
|
128
|
+
|
|
129
|
+
const createSaveButtonInjection = computed<AdminForthComponentDeclarationFull | null>(() => {
|
|
130
|
+
const raw: any = coreStore.resourceOptions?.pageInjections?.create?.saveButton as any;
|
|
131
|
+
if (!raw) return null;
|
|
132
|
+
const item = Array.isArray(raw) ? raw[0] : raw;
|
|
133
|
+
return item as AdminForthComponentDeclarationFull;
|
|
134
|
+
});
|
|
135
|
+
|
|
107
136
|
const initialValues = ref({});
|
|
108
137
|
|
|
109
138
|
const readonlyColumns = ref([]);
|
|
110
139
|
|
|
111
140
|
|
|
112
|
-
async function onUpdateRecord(newRecord) {
|
|
113
|
-
console.log('newRecord', newRecord);
|
|
141
|
+
async function onUpdateRecord(newRecord: any) {
|
|
114
142
|
record.value = newRecord;
|
|
115
143
|
}
|
|
116
144
|
|
|
117
145
|
onMounted(async () => {
|
|
118
146
|
loading.value = true;
|
|
119
147
|
await coreStore.fetchResourceFull({
|
|
120
|
-
resourceId: route.params.resourceId
|
|
148
|
+
resourceId: route.params.resourceId as string
|
|
121
149
|
});
|
|
122
|
-
initialValues.value = (coreStore.resource?.columns || []).reduce((acc, column) => {
|
|
150
|
+
initialValues.value = (coreStore.resource?.columns || []).reduce<Record<string, unknown>>((acc, column) => {
|
|
123
151
|
if (column.suggestOnCreate !== undefined) {
|
|
124
152
|
acc[column.name] = column.suggestOnCreate;
|
|
125
153
|
}
|
|
126
154
|
return acc;
|
|
127
155
|
}, {});
|
|
156
|
+
let userUseMultipleEncoding = true; //TODO remove this in future versions
|
|
128
157
|
if (route.query.values) {
|
|
129
|
-
|
|
158
|
+
try {
|
|
159
|
+
JSON.parse(decodeURIComponent(route.query.values as string));
|
|
160
|
+
console.warn('You are using an outdated format for the query vales. Please update your links and don`t use multiple URL encoding.');
|
|
161
|
+
} catch (e) {
|
|
162
|
+
userUseMultipleEncoding = false;
|
|
163
|
+
console.warn('You are using an outdated format for the query vales. Please update your links and don`t use multiple URL encoding.');
|
|
164
|
+
}
|
|
165
|
+
if (userUseMultipleEncoding) {
|
|
166
|
+
initialValues.value = { ...initialValues.value, ...JSON.parse(decodeURIComponent((route.query.values as string))) };
|
|
167
|
+
} else {
|
|
168
|
+
initialValues.value = { ...initialValues.value, ...JSON.parse(atob(route.query.values as string)) };
|
|
169
|
+
}
|
|
130
170
|
}
|
|
131
171
|
if (route.query.readonlyColumns) {
|
|
132
|
-
|
|
172
|
+
if (userUseMultipleEncoding) {
|
|
173
|
+
readonlyColumns.value = JSON.parse(decodeURIComponent((route.query.readonlyColumns as string)));
|
|
174
|
+
} else {
|
|
175
|
+
readonlyColumns.value = JSON.parse(atob(route.query.readonlyColumns as string));
|
|
176
|
+
}
|
|
133
177
|
}
|
|
134
178
|
record.value = initialValues.value;
|
|
135
179
|
loading.value = false;
|
|
136
|
-
checkAcessByAllowedActions(coreStore.resourceOptions
|
|
180
|
+
checkAcessByAllowedActions(coreStore.resourceOptions!.allowedActions,'create');
|
|
137
181
|
initThreeDotsDropdown();
|
|
138
182
|
});
|
|
139
183
|
|
|
140
|
-
async function saveRecord() {
|
|
141
|
-
console.log('saveRecord isValid', isValid.value);
|
|
184
|
+
async function saveRecord(opts?: { confirmationResult?: any }) {
|
|
142
185
|
if (!isValid.value) {
|
|
143
186
|
validating.value = true;
|
|
187
|
+
await nextTick();
|
|
188
|
+
scrollToInvalidField();
|
|
144
189
|
return;
|
|
145
190
|
} else {
|
|
146
191
|
validating.value = false;
|
|
@@ -152,14 +197,17 @@ async function saveRecord() {
|
|
|
152
197
|
body: {
|
|
153
198
|
resourceId: route.params.resourceId,
|
|
154
199
|
record: record.value,
|
|
200
|
+
meta: {
|
|
201
|
+
...(opts?.confirmationResult ? { confirmationResult: opts.confirmationResult } : {}),
|
|
202
|
+
},
|
|
155
203
|
},
|
|
156
204
|
});
|
|
157
|
-
if (response?.error) {
|
|
205
|
+
if (response?.error && response?.error !== 'Operation aborted by hook') {
|
|
158
206
|
showErrorTost(response.error);
|
|
159
207
|
}
|
|
160
208
|
saving.value = false;
|
|
161
209
|
if (route.query.returnTo) {
|
|
162
|
-
router.push(route.query.returnTo);
|
|
210
|
+
router.push(<string>route.query.returnTo);
|
|
163
211
|
} else {
|
|
164
212
|
router.push({
|
|
165
213
|
name: 'resource-show',
|
|
@@ -175,5 +223,23 @@ async function saveRecord() {
|
|
|
175
223
|
}
|
|
176
224
|
}
|
|
177
225
|
|
|
226
|
+
function scrollToInvalidField() {
|
|
227
|
+
let columnsWithErrors: {column: AdminForthResourceColumn, error: string}[] = [];
|
|
228
|
+
for (const column of resourceFormRef.value?.editableColumns || []) {
|
|
229
|
+
const error = resourceFormRef.value?.columnError(column);
|
|
230
|
+
if (error) {
|
|
231
|
+
columnsWithErrors.push({column, error});
|
|
232
|
+
}
|
|
233
|
+
}
|
|
234
|
+
const errorMessage = t('Failed to save. Please fix errors for the following fields:') + '<ul class="mt-2 list-disc list-inside">' + columnsWithErrors.map(c => `<li><strong>${c.column.label || c.column.name}</strong>: ${c.error}</li>`).join('') + '</ul>';
|
|
235
|
+
adminforth.alert({
|
|
236
|
+
messageHtml: errorMessage,
|
|
237
|
+
variant: 'danger'
|
|
238
|
+
});
|
|
239
|
+
const firstInvalidElement = document.querySelector('.af-invalid-field-message');
|
|
240
|
+
if (firstInvalidElement) {
|
|
241
|
+
firstInvalidElement.scrollIntoView({ behavior: 'smooth', block: 'center' });
|
|
242
|
+
}
|
|
243
|
+
}
|
|
178
244
|
|
|
179
245
|
</script>
|