adminforth 2.4.0-next.13 → 2.4.0-next.131
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/cli.js +12 -4
- package/commands/createApp/templates/custom/tsconfig.json.hbs +2 -3
- package/commands/createApp/templates/index.ts.hbs +10 -2
- package/commands/createApp/templates/package.json.hbs +1 -1
- package/commands/createApp/utils.js +27 -2
- package/commands/createCustomComponent/configLoader.js +3 -0
- package/dist/dataConnectors/baseConnector.d.ts.map +1 -1
- package/dist/dataConnectors/baseConnector.js +16 -3
- package/dist/dataConnectors/baseConnector.js.map +1 -1
- package/dist/dataConnectors/clickhouse.d.ts.map +1 -1
- package/dist/dataConnectors/clickhouse.js +4 -0
- package/dist/dataConnectors/clickhouse.js.map +1 -1
- package/dist/dataConnectors/mongo.d.ts.map +1 -1
- package/dist/dataConnectors/mongo.js +14 -14
- package/dist/dataConnectors/mongo.js.map +1 -1
- package/dist/index.d.ts +2 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +20 -9
- package/dist/index.js.map +1 -1
- package/dist/modules/codeInjector.d.ts.map +1 -1
- package/dist/modules/codeInjector.js +22 -5
- package/dist/modules/codeInjector.js.map +1 -1
- package/dist/modules/configValidator.d.ts.map +1 -1
- package/dist/modules/configValidator.js +53 -2
- package/dist/modules/configValidator.js.map +1 -1
- package/dist/modules/restApi.d.ts.map +1 -1
- package/dist/modules/restApi.js +147 -25
- package/dist/modules/restApi.js.map +1 -1
- package/dist/modules/styles.d.ts +457 -13
- package/dist/modules/styles.d.ts.map +1 -1
- package/dist/modules/styles.js +513 -31
- package/dist/modules/styles.js.map +1 -1
- package/dist/modules/utils.d.ts +1 -0
- package/dist/modules/utils.d.ts.map +1 -1
- package/dist/modules/utils.js +9 -0
- package/dist/modules/utils.js.map +1 -1
- package/dist/spa/index.html +1 -1
- package/dist/spa/src/App.vue +33 -15
- package/dist/spa/src/adminforth.ts +15 -6
- package/dist/spa/src/afcl/BarChart.vue +2 -2
- package/dist/spa/src/afcl/Button.vue +6 -6
- 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 +44 -27
- package/dist/spa/src/afcl/Dropzone.vue +12 -12
- package/dist/spa/src/afcl/Input.vue +9 -7
- package/dist/spa/src/afcl/JsonViewer.vue +25 -0
- package/dist/spa/src/afcl/Link.vue +1 -1
- package/dist/spa/src/afcl/LinkButton.vue +2 -2
- 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 +68 -34
- package/dist/spa/src/afcl/Skeleton.vue +6 -6
- package/dist/spa/src/afcl/Table.vue +171 -39
- 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 +2 -3
- package/dist/spa/src/afcl/VerticalTabs.vue +3 -3
- package/dist/spa/src/afcl/index.ts +4 -3
- package/dist/spa/src/components/AcceptModal.vue +7 -7
- package/dist/spa/src/components/Breadcrumbs.vue +5 -5
- package/dist/spa/src/components/ColumnValueInput.vue +37 -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 -8
- package/dist/spa/src/components/Filters.vue +83 -37
- package/dist/spa/src/components/GroupsTable.vue +9 -8
- package/dist/spa/src/components/MenuLink.vue +3 -3
- package/dist/spa/src/components/ResourceForm.vue +94 -51
- package/dist/spa/src/components/ResourceListTable.vue +78 -80
- package/dist/spa/src/components/ResourceListTableVirtual.vue +70 -72
- package/dist/spa/src/components/ShowTable.vue +17 -12
- 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 +73 -14
- package/dist/spa/src/components/Toast.vue +2 -7
- package/dist/spa/src/components/ValueRenderer.vue +43 -16
- package/dist/spa/src/controls/BoolToggle.vue +34 -0
- package/dist/spa/src/i18n.ts +1 -1
- package/dist/spa/src/shims-vue.d.ts +5 -0
- package/dist/spa/src/spa_types/core.ts +8 -1
- package/dist/spa/src/stores/core.ts +1 -1
- package/dist/spa/src/stores/modal.ts +6 -1
- package/dist/spa/src/types/Back.ts +93 -21
- package/dist/spa/src/types/Common.ts +44 -31
- package/dist/spa/src/types/FrontendAPI.ts +8 -0
- package/dist/spa/src/types/adapters/CompletionAdapter.ts +25 -0
- package/dist/spa/src/types/adapters/EmailAdapter.ts +27 -0
- package/dist/spa/src/types/adapters/ImageGenerationAdapter.ts +50 -0
- package/dist/spa/src/types/adapters/ImageVisionAdapter.ts +30 -0
- package/dist/spa/src/types/adapters/OAuth2Adapter.ts +34 -0
- package/dist/spa/src/types/adapters/StorageAdapter.ts +73 -0
- package/dist/spa/src/types/adapters/index.ts +6 -0
- package/dist/spa/src/utils.ts +217 -7
- package/dist/spa/src/views/CreateView.vue +18 -19
- package/dist/spa/src/views/EditView.vue +25 -19
- package/dist/spa/src/views/ListView.vue +117 -79
- package/dist/spa/src/views/LoginView.vue +34 -35
- package/dist/spa/src/views/ResourceParent.vue +1 -1
- package/dist/spa/src/views/ShowView.vue +59 -39
- 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 +69 -14
- package/dist/types/Back.d.ts.map +1 -1
- package/dist/types/Back.js +3 -0
- package/dist/types/Back.js.map +1 -1
- package/dist/types/Common.d.ts +37 -28
- package/dist/types/Common.d.ts.map +1 -1
- package/dist/types/Common.js.map +1 -1
- package/dist/types/FrontendAPI.d.ts +7 -0
- package/dist/types/FrontendAPI.d.ts.map +1 -1
- package/dist/types/FrontendAPI.js.map +1 -1
- package/dist/types/adapters/CompletionAdapter.d.ts +20 -0
- package/dist/types/adapters/CompletionAdapter.d.ts.map +1 -0
- package/dist/types/adapters/CompletionAdapter.js +2 -0
- package/dist/types/adapters/CompletionAdapter.js.map +1 -0
- package/dist/types/adapters/EmailAdapter.d.ts +20 -0
- package/dist/types/adapters/EmailAdapter.d.ts.map +1 -0
- package/dist/types/adapters/EmailAdapter.js +2 -0
- package/dist/types/adapters/EmailAdapter.js.map +1 -0
- package/dist/types/adapters/ImageGenerationAdapter.d.ts +37 -0
- package/dist/types/adapters/ImageGenerationAdapter.d.ts.map +1 -0
- package/dist/types/adapters/ImageGenerationAdapter.js +2 -0
- package/dist/types/adapters/ImageGenerationAdapter.js.map +1 -0
- 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/OAuth2Adapter.d.ts +32 -0
- package/dist/types/adapters/OAuth2Adapter.d.ts.map +1 -0
- package/dist/types/adapters/OAuth2Adapter.js +2 -0
- package/dist/types/adapters/OAuth2Adapter.js.map +1 -0
- package/dist/types/adapters/StorageAdapter.d.ts +63 -0
- package/dist/types/adapters/StorageAdapter.d.ts.map +1 -0
- package/dist/types/adapters/StorageAdapter.js +2 -0
- package/dist/types/adapters/StorageAdapter.js.map +1 -0
- package/dist/types/adapters/index.d.ts +7 -0
- package/dist/types/adapters/index.d.ts.map +1 -0
- package/dist/types/adapters/index.js +2 -0
- package/dist/types/adapters/index.js.map +1 -0
- package/package.json +2 -2
- package/dist/spa/src/types/Adapters.ts +0 -213
- package/dist/types/Adapters.d.ts +0 -168
- package/dist/types/Adapters.d.ts.map +0 -1
- package/dist/types/Adapters.js +0 -2
- package/dist/types/Adapters.js.map +0 -1
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
<component
|
|
4
4
|
v-for="c in coreStore?.resourceOptions?.pageInjections?.edit?.beforeBreadcrumbs || []"
|
|
5
5
|
:is="getCustomComponent(c)"
|
|
6
|
-
:meta="c.meta"
|
|
6
|
+
:meta="(c as AdminForthComponentDeclarationFull).meta"
|
|
7
7
|
:record="editableRecord"
|
|
8
8
|
:resource="coreStore.resource"
|
|
9
9
|
:adminUser="coreStore.adminUser"
|
|
@@ -12,14 +12,14 @@
|
|
|
12
12
|
<BreadcrumbsWithButtons>
|
|
13
13
|
<!-- save and cancle -->
|
|
14
14
|
<button @click="$router.back()"
|
|
15
|
-
class="flex items-center py-1 px-3 me-2 text-sm font-medium text-
|
|
15
|
+
class="flex items-center py-1 px-3 me-2 text-sm font-medium text-lightEditViewButtonText rounded-default focus:outline-none bg-lightEditViewButtonBackground rounded border border-lightEditViewButtonBorder hover:bg-lightEditViewButtonBackgroundHover hover:text-lightEditViewButtonTextHover focus:z-10 focus:ring-4 focus:ring-lightEditViewButtonFocusRing dark:focus:ring-darkEditViewButtonFocusRing dark:bg-darkEditViewButtonBackground dark:text-darkEditViewButtonText dark:border-darkEditViewButtonBorder dark:hover:text-darkEditViewButtonTextHover dark:hover:bg-darkEditViewButtonBackgroundHover"
|
|
16
16
|
>
|
|
17
17
|
{{ $t('Cancel') }}
|
|
18
18
|
</button>
|
|
19
19
|
|
|
20
20
|
<button
|
|
21
21
|
@click="saveRecord"
|
|
22
|
-
class="flex items-center py-1 px-3 text-sm font-medium rounded-default text-
|
|
22
|
+
class="flex items-center py-1 px-3 text-sm font-medium rounded-default text-lightEditViewSaveButtonText focus:outline-none bg-lightEditViewButtonBackground rounded border border-lightEditViewButtonBorder hover:bg-lightEditViewButtonBackgroundHover hover:text-lightEditViewSaveButtonTextHover focus:z-10 focus:ring-4 focus:ring-lightEditViewButtonFocusRing dark:focus:ring-darkEditViewButtonFocusRing dark:bg-darkEditViewButtonBackground dark:text-darkEditViewSaveButtonText dark:border-darkEditViewButtonBorder dark:hover:text-darkEditViewSaveButtonTextHover dark:hover:bg-darkEditViewButtonBackgroundHover disabled:opacity-50 gap-1"
|
|
23
23
|
:disabled="saving || (validating && !isValid)"
|
|
24
24
|
>
|
|
25
25
|
<IconFloppyDiskSolid class="w-4 h-4" />
|
|
@@ -27,7 +27,7 @@
|
|
|
27
27
|
</button>
|
|
28
28
|
|
|
29
29
|
<ThreeDotsMenu
|
|
30
|
-
:threeDotsDropdownItems="coreStore.resourceOptions?.pageInjections?.edit?.threeDotsDropdownItems"
|
|
30
|
+
:threeDotsDropdownItems="(coreStore.resourceOptions?.pageInjections?.edit?.threeDotsDropdownItems as [])"
|
|
31
31
|
></ThreeDotsMenu>
|
|
32
32
|
|
|
33
33
|
</BreadcrumbsWithButtons>
|
|
@@ -35,16 +35,16 @@
|
|
|
35
35
|
<component
|
|
36
36
|
v-for="c in coreStore?.resourceOptions?.pageInjections?.edit?.afterBreadcrumbs || []"
|
|
37
37
|
:is="getCustomComponent(c)"
|
|
38
|
-
:meta="c.meta"
|
|
38
|
+
:meta="(c as AdminForthComponentDeclarationFull).meta"
|
|
39
39
|
:record="coreStore.record"
|
|
40
40
|
:resource="coreStore.resource"
|
|
41
41
|
:adminUser="coreStore.adminUser"
|
|
42
42
|
/>
|
|
43
43
|
|
|
44
44
|
<SingleSkeletLoader v-if="loading"></SingleSkeletLoader>
|
|
45
|
-
|
|
45
|
+
|
|
46
46
|
<ResourceForm
|
|
47
|
-
v-else
|
|
47
|
+
v-else-if="coreStore.resource"
|
|
48
48
|
:record="editableRecord"
|
|
49
49
|
:resource="coreStore.resource"
|
|
50
50
|
:adminUser="coreStore.adminUser"
|
|
@@ -58,7 +58,7 @@
|
|
|
58
58
|
<component
|
|
59
59
|
v-for="c in coreStore?.resourceOptions?.pageInjections?.edit?.bottom || []"
|
|
60
60
|
:is="getCustomComponent(c)"
|
|
61
|
-
:meta="c.meta"
|
|
61
|
+
:meta="(c as AdminForthComponentDeclarationFull).meta"
|
|
62
62
|
:record="coreStore.record"
|
|
63
63
|
:resource="coreStore.resource"
|
|
64
64
|
:adminUser="coreStore.adminUser"
|
|
@@ -76,12 +76,13 @@ import SingleSkeletLoader from '@/components/SingleSkeletLoader.vue';
|
|
|
76
76
|
import { useCoreStore } from '@/stores/core';
|
|
77
77
|
import { callAdminForthApi, getCustomComponent,checkAcessByAllowedActions, initThreeDotsDropdown } from '@/utils';
|
|
78
78
|
import { IconFloppyDiskSolid } from '@iconify-prerendered/vue-flowbite';
|
|
79
|
-
import { computed, onMounted, ref } from 'vue';
|
|
79
|
+
import { computed, onMounted, ref, type Ref } from 'vue';
|
|
80
80
|
import { useRoute, useRouter } from 'vue-router';
|
|
81
81
|
import { showErrorTost } from '@/composables/useFrontendApi';
|
|
82
82
|
import ThreeDotsMenu from '@/components/ThreeDotsMenu.vue';
|
|
83
83
|
import adminforth from '@/adminforth';
|
|
84
84
|
import { useI18n } from 'vue-i18n';
|
|
85
|
+
import { type AdminForthComponentDeclarationFull } from '@/types/Common.js';
|
|
85
86
|
|
|
86
87
|
const { t } = useI18n();
|
|
87
88
|
const coreStore = useCoreStore();
|
|
@@ -96,9 +97,9 @@ const loading = ref(true);
|
|
|
96
97
|
|
|
97
98
|
const saving = ref(false);
|
|
98
99
|
|
|
99
|
-
const record = ref({});
|
|
100
|
+
const record: Ref<Record<string, any>> = ref({});
|
|
100
101
|
|
|
101
|
-
async function onUpdateRecord(newRecord) {
|
|
102
|
+
async function onUpdateRecord(newRecord: Record<string, any>) {
|
|
102
103
|
record.value = newRecord;
|
|
103
104
|
}
|
|
104
105
|
|
|
@@ -110,7 +111,7 @@ const editableRecord = computed(() => {
|
|
|
110
111
|
coreStore.resource.columns.forEach(column => {
|
|
111
112
|
if (column.foreignResource) {
|
|
112
113
|
if (column.isArray?.enabled) {
|
|
113
|
-
newRecord[column.name] = newRecord[column.name]?.map(fr => fr.pk);
|
|
114
|
+
newRecord[column.name] = newRecord[column.name]?.map((fr: { pk: any }) => fr.pk);
|
|
114
115
|
} else {
|
|
115
116
|
newRecord[column.name] = newRecord[column.name]?.pk;
|
|
116
117
|
}
|
|
@@ -123,16 +124,20 @@ onMounted(async () => {
|
|
|
123
124
|
loading.value = true;
|
|
124
125
|
|
|
125
126
|
await coreStore.fetchResourceFull({
|
|
126
|
-
resourceId: route.params.resourceId
|
|
127
|
+
resourceId: route.params.resourceId as string
|
|
127
128
|
});
|
|
128
129
|
initThreeDotsDropdown();
|
|
129
130
|
|
|
130
131
|
await coreStore.fetchRecord({
|
|
131
|
-
resourceId: route.params.resourceId,
|
|
132
|
-
primaryKey: route.params.primaryKey,
|
|
132
|
+
resourceId: route.params.resourceId as string,
|
|
133
|
+
primaryKey: route.params.primaryKey as string,
|
|
133
134
|
source: 'edit',
|
|
134
135
|
});
|
|
135
|
-
|
|
136
|
+
|
|
137
|
+
if (coreStore.resourceOptions) {
|
|
138
|
+
checkAcessByAllowedActions(coreStore.resourceOptions.allowedActions,'edit');
|
|
139
|
+
}
|
|
140
|
+
|
|
136
141
|
loading.value = false;
|
|
137
142
|
});
|
|
138
143
|
|
|
@@ -145,7 +150,7 @@ async function saveRecord() {
|
|
|
145
150
|
}
|
|
146
151
|
|
|
147
152
|
saving.value = true;
|
|
148
|
-
const updates = {};
|
|
153
|
+
const updates: Record<string, any> = {};
|
|
149
154
|
for (const key in record.value) {
|
|
150
155
|
let columnIsUpdated = false;
|
|
151
156
|
|
|
@@ -157,7 +162,8 @@ async function saveRecord() {
|
|
|
157
162
|
columnIsUpdated = record.value[key] !== coreStore.record[key];
|
|
158
163
|
}
|
|
159
164
|
|
|
160
|
-
|
|
165
|
+
if (!coreStore.resource) return;
|
|
166
|
+
const column = coreStore.resource.columns.find((c) => c.name === key);
|
|
161
167
|
|
|
162
168
|
if (column?.foreignResource) {
|
|
163
169
|
columnIsUpdated = record.value[key] !== coreStore.record[key]?.pk;
|
|
@@ -177,7 +183,7 @@ async function saveRecord() {
|
|
|
177
183
|
record: updates,
|
|
178
184
|
},
|
|
179
185
|
});
|
|
180
|
-
if (resp.error) {
|
|
186
|
+
if (resp.error && resp.error !== 'Operation aborted by hook') {
|
|
181
187
|
showErrorTost(resp.error);
|
|
182
188
|
} else {
|
|
183
189
|
adminforth.alert({
|
|
@@ -3,7 +3,8 @@
|
|
|
3
3
|
<Teleport to="body">
|
|
4
4
|
<Filters
|
|
5
5
|
:columns="coreStore.resource?.columns"
|
|
6
|
-
:columnsMinMax="columnsMinMax"
|
|
6
|
+
:columnsMinMax="columnsMinMax"
|
|
7
|
+
:show="filtersShow"
|
|
7
8
|
@hide="filtersShow = false"
|
|
8
9
|
/>
|
|
9
10
|
</Teleport>
|
|
@@ -11,7 +12,7 @@
|
|
|
11
12
|
<component
|
|
12
13
|
v-for="c in coreStore?.resourceOptions?.pageInjections?.list?.beforeBreadcrumbs || []"
|
|
13
14
|
:is="getCustomComponent(c)"
|
|
14
|
-
:meta="c.meta"
|
|
15
|
+
:meta="(c as AdminForthComponentDeclarationFull).meta"
|
|
15
16
|
:resource="coreStore.resource"
|
|
16
17
|
:adminUser="coreStore.adminUser"
|
|
17
18
|
/>
|
|
@@ -21,71 +22,66 @@
|
|
|
21
22
|
@click="()=>{checkboxes = []}"
|
|
22
23
|
v-if="checkboxes.length"
|
|
23
24
|
data-tooltip-target="tooltip-remove-all"
|
|
24
|
-
class="flex gap-1 items-center py-1 px-3 me-2 text-sm font-medium text-
|
|
25
|
+
class="flex gap-1 items-center py-1 px-3 me-2 text-sm font-medium text-lightListViewButtonText focus:outline-none bg-lightListViewButtonBackground rounded 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 rounded-default"
|
|
25
26
|
>
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
</div>
|
|
27
|
+
<Tooltip>
|
|
28
|
+
<IconBanOutline class="w-5 h-5 "/>
|
|
29
|
+
<template #tooltip >
|
|
30
|
+
Remove selection
|
|
31
|
+
</template>
|
|
32
|
+
</Tooltip>
|
|
33
33
|
</button>
|
|
34
34
|
|
|
35
|
-
|
|
36
|
-
v-if="checkboxes.length"
|
|
35
|
+
<div
|
|
36
|
+
v-if="checkboxes.length"
|
|
37
37
|
v-for="(action,i) in coreStore.resource?.options?.bulkActions"
|
|
38
|
-
:key="action.id"
|
|
39
|
-
@click="startBulkAction(action.id)"
|
|
40
|
-
class="flex gap-1 items-center py-1 px-3 text-sm font-medium text-gray-900 focus:outline-none bg-white rounded-default border border-gray-300 hover:bg-gray-100 hover:text-lightPrimary focus:z-10 focus:ring-4 focus:ring-gray-100 dark:focus:ring-gray-700 dark:bg-gray-800 dark:text-gray-400 dark:border-gray-600 dark:hover:text-white dark:hover:bg-gray-700"
|
|
41
|
-
:class="{
|
|
42
|
-
'bg-red-100 text-red-800 border-red-400 dark:bg-red-700 dark:text-red-400 dark:border-red-400':action.state==='danger',
|
|
43
|
-
'bg-green-100 text-green-800 border-green-400 dark:bg-green-700 dark:text-green-400 dark:border-green-400':action.state==='success',
|
|
44
|
-
'bg-lightPrimaryOpacity text-lightPrimary border-blue-400 dark:bg-blue-700 dark:text-blue-400 dark:border-blue-400':action.state==='active',
|
|
45
|
-
}"
|
|
46
38
|
>
|
|
47
|
-
<
|
|
48
|
-
v-if="
|
|
49
|
-
:
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
{{ action.
|
|
72
|
-
|
|
73
|
-
|
|
39
|
+
<button
|
|
40
|
+
v-if="!action.showInThreeDotsDropdown"
|
|
41
|
+
:key="action.id"
|
|
42
|
+
@click="startBulkAction(action.id!)"
|
|
43
|
+
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"
|
|
44
|
+
:class="action.buttonCustomCssClass || ''"
|
|
45
|
+
>
|
|
46
|
+
<component
|
|
47
|
+
v-if="action.icon && !bulkActionLoadingStates[action.id!]"
|
|
48
|
+
:is="getIcon(action.icon)"
|
|
49
|
+
class="w-5 h-5 transition duration-75 group-hover:text-gray-900 dark:group-hover:text-white"></component>
|
|
50
|
+
<div v-if="bulkActionLoadingStates[action.id!]">
|
|
51
|
+
<svg
|
|
52
|
+
aria-hidden="true"
|
|
53
|
+
class="w-5 h-5 animate-spin text-gray-200 dark:text-gray-500 fill-gray-500 dark:fill-gray-300"
|
|
54
|
+
viewBox="0 0 100 101"
|
|
55
|
+
fill="none"
|
|
56
|
+
xmlns="http://www.w3.org/2000/svg"
|
|
57
|
+
>
|
|
58
|
+
<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"/>
|
|
59
|
+
<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"/>
|
|
60
|
+
</svg>
|
|
61
|
+
<span class="sr-only">Loading...</span>
|
|
62
|
+
</div>
|
|
63
|
+
{{ `${action.label} (${checkboxes.length})` }}
|
|
64
|
+
<div v-if="action.badge" class="text-white bg-gradient-to-r from-purple-500 via-purple-600 to-purple-700 hover:bg-gradient-to-br focus:ring-4 focus:outline-none focus:ring-purple-300 dark:focus:ring-purple-800
|
|
65
|
+
font-medium rounded-sm text-xs px-1 ml-1 text-center ">
|
|
66
|
+
{{ action.badge }}
|
|
67
|
+
</div>
|
|
68
|
+
</button>
|
|
69
|
+
</div>
|
|
74
70
|
|
|
75
71
|
<RouterLink v-if="coreStore.resource?.options?.allowedActions?.create"
|
|
76
72
|
:to="{ name: 'resource-create', params: { resourceId: $route.params.resourceId } }"
|
|
77
|
-
class="flex items-center py-1 px-3 text-sm font-medium text-
|
|
73
|
+
class="af-create-button flex items-center py-1 px-3 text-sm font-medium text-lightListViewButtonText focus:outline-none bg-lightListViewButtonBackground rounded 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 rounded-default gap-1"
|
|
78
74
|
>
|
|
79
|
-
<IconPlusOutline class="w-4 h-4
|
|
75
|
+
<IconPlusOutline class="w-4 h-4"/>
|
|
80
76
|
{{ $t('Create') }}
|
|
81
77
|
</RouterLink>
|
|
82
78
|
|
|
83
79
|
<button
|
|
84
|
-
class="flex gap-1 items-center py-1 px-3 me-2 text-sm font-medium text-
|
|
80
|
+
class="af-filter-button flex gap-1 items-center py-1 px-3 me-2 text-sm font-medium text-lightListViewButtonText focus:outline-none bg-lightListViewButtonBackground rounded 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 rounded-default"
|
|
85
81
|
@click="()=>{filtersShow = !filtersShow}"
|
|
86
82
|
v-if="coreStore.resource?.options?.allowedActions?.filter"
|
|
87
83
|
>
|
|
88
|
-
<IconFilterOutline class="w-4 h-4
|
|
84
|
+
<IconFilterOutline class="w-4 h-4"/>
|
|
89
85
|
{{ $t('Filter') }}
|
|
90
86
|
<span
|
|
91
87
|
class="bg-red-100 text-red-800 text-xs font-medium me-2 px-2.5 py-0.5 rounded dark:bg-gray-700 dark:text-red-400 border border-red-400"
|
|
@@ -95,14 +91,19 @@
|
|
|
95
91
|
</button>
|
|
96
92
|
|
|
97
93
|
<ThreeDotsMenu
|
|
98
|
-
:threeDotsDropdownItems="coreStore.resourceOptions?.pageInjections?.list?.threeDotsDropdownItems"
|
|
99
|
-
|
|
94
|
+
:threeDotsDropdownItems="(coreStore.resourceOptions?.pageInjections?.list?.threeDotsDropdownItems as [])"
|
|
95
|
+
:bulkActions="coreStore.resource?.options?.bulkActions"
|
|
96
|
+
:checkboxes="checkboxes"
|
|
97
|
+
@startBulkAction="startBulkAction"
|
|
98
|
+
:updateList="getList"
|
|
99
|
+
:clearCheckboxes="clearCheckboxes"
|
|
100
|
+
></ThreeDotsMenu>
|
|
100
101
|
</BreadcrumbsWithButtons>
|
|
101
102
|
|
|
102
103
|
<component
|
|
103
104
|
v-for="c in coreStore?.resourceOptions?.pageInjections?.list?.afterBreadcrumbs || []"
|
|
104
105
|
:is="getCustomComponent(c)"
|
|
105
|
-
:meta="c.meta"
|
|
106
|
+
:meta="(c as AdminForthComponentDeclarationFull).meta"
|
|
106
107
|
:resource="coreStore.resource"
|
|
107
108
|
:adminUser="coreStore.adminUser"
|
|
108
109
|
/>
|
|
@@ -119,12 +120,23 @@
|
|
|
119
120
|
:pageSize="pageSize"
|
|
120
121
|
:totalRows="totalRows"
|
|
121
122
|
:checkboxes="checkboxes"
|
|
122
|
-
:customActionsInjection="coreStore.resourceOptions?.pageInjections?.list?.customActionIcons
|
|
123
|
-
|
|
123
|
+
:customActionsInjection="Array.isArray(coreStore.resourceOptions?.pageInjections?.list?.customActionIcons)
|
|
124
|
+
? coreStore.resourceOptions.pageInjections.list.customActionIcons
|
|
125
|
+
: coreStore.resourceOptions?.pageInjections?.list?.customActionIcons
|
|
126
|
+
? [coreStore.resourceOptions.pageInjections.list.customActionIcons]
|
|
127
|
+
: []
|
|
128
|
+
"
|
|
129
|
+
:tableBodyStartInjection="Array.isArray(coreStore.resourceOptions?.pageInjections?.list?.tableBodyStart)
|
|
130
|
+
? coreStore.resourceOptions.pageInjections.list.tableBodyStart
|
|
131
|
+
: coreStore.resourceOptions?.pageInjections?.list?.tableBodyStart
|
|
132
|
+
? [coreStore.resourceOptions.pageInjections.list.tableBodyStart]
|
|
133
|
+
: []
|
|
134
|
+
"
|
|
124
135
|
:container-height="1100"
|
|
125
136
|
:item-height="52.5"
|
|
126
137
|
:buffer-size="listBufferSize"
|
|
127
138
|
/>
|
|
139
|
+
|
|
128
140
|
<ResourceListTable
|
|
129
141
|
v-else
|
|
130
142
|
:resource="coreStore.resource"
|
|
@@ -138,14 +150,24 @@
|
|
|
138
150
|
:pageSize="pageSize"
|
|
139
151
|
:totalRows="totalRows"
|
|
140
152
|
:checkboxes="checkboxes"
|
|
141
|
-
:customActionsInjection="coreStore.resourceOptions?.pageInjections?.list?.customActionIcons
|
|
142
|
-
|
|
153
|
+
:customActionsInjection="Array.isArray(coreStore.resourceOptions?.pageInjections?.list?.customActionIcons)
|
|
154
|
+
? coreStore.resourceOptions.pageInjections.list.customActionIcons
|
|
155
|
+
: coreStore.resourceOptions?.pageInjections?.list?.customActionIcons
|
|
156
|
+
? [coreStore.resourceOptions.pageInjections.list.customActionIcons]
|
|
157
|
+
: []
|
|
158
|
+
"
|
|
159
|
+
:tableBodyStartInjection="Array.isArray(coreStore.resourceOptions?.pageInjections?.list?.tableBodyStart)
|
|
160
|
+
? coreStore.resourceOptions.pageInjections.list.tableBodyStart
|
|
161
|
+
: coreStore.resourceOptions?.pageInjections?.list?.tableBodyStart
|
|
162
|
+
? [coreStore.resourceOptions.pageInjections.list.tableBodyStart]
|
|
163
|
+
: []
|
|
164
|
+
"
|
|
143
165
|
/>
|
|
144
166
|
|
|
145
167
|
<component
|
|
146
168
|
v-for="c in coreStore?.resourceOptions?.pageInjections?.list?.bottom || []"
|
|
147
169
|
:is="getCustomComponent(c)"
|
|
148
|
-
:meta="c.meta"
|
|
170
|
+
:meta="(c as AdminForthComponentDeclarationFull).meta"
|
|
149
171
|
:resource="coreStore.resource"
|
|
150
172
|
:adminUser="coreStore.adminUser"
|
|
151
173
|
/>
|
|
@@ -165,6 +187,8 @@ import { useRoute } from 'vue-router';
|
|
|
165
187
|
import { showErrorTost } from '@/composables/useFrontendApi'
|
|
166
188
|
import { getCustomComponent, initThreeDotsDropdown } from '@/utils';
|
|
167
189
|
import ThreeDotsMenu from '@/components/ThreeDotsMenu.vue';
|
|
190
|
+
import { Tooltip } from '@/afcl'
|
|
191
|
+
import type { AdminForthComponentDeclarationFull } from '@/types/Common';
|
|
168
192
|
|
|
169
193
|
|
|
170
194
|
import {
|
|
@@ -185,7 +209,7 @@ const route = useRoute();
|
|
|
185
209
|
|
|
186
210
|
const page = ref(1);
|
|
187
211
|
const columnsMinMax = ref({});
|
|
188
|
-
const sort = ref(
|
|
212
|
+
const sort = ref();
|
|
189
213
|
|
|
190
214
|
watch(() => sort, async (to, from) => {
|
|
191
215
|
// in store sort might be needed for plugins
|
|
@@ -229,11 +253,11 @@ async function getList() {
|
|
|
229
253
|
totalRows.value = 0;
|
|
230
254
|
return {error: data.error};
|
|
231
255
|
}
|
|
232
|
-
rows.value = data.data?.map(row => {
|
|
233
|
-
if (coreStore.resource
|
|
234
|
-
row._primaryKeyValue = row[coreStore.resource.columns.find(c => c.primaryKey)
|
|
235
|
-
} else {
|
|
236
|
-
row._primaryKeyValue = row[coreStore.resource.columns.find(c => c.primaryKey)
|
|
256
|
+
rows.value = data.data?.map((row: any) => {
|
|
257
|
+
if (coreStore.resource?.columns?.find(c => c.primaryKey)?.foreignResource) {
|
|
258
|
+
row._primaryKeyValue = row[coreStore.resource.columns.find(c => c.primaryKey)!.name].pk;
|
|
259
|
+
} else if (coreStore.resource) {
|
|
260
|
+
row._primaryKeyValue = row[coreStore.resource.columns.find(c => c.primaryKey)!.name];
|
|
237
261
|
}
|
|
238
262
|
return row;
|
|
239
263
|
});
|
|
@@ -245,6 +269,10 @@ async function getList() {
|
|
|
245
269
|
return {}
|
|
246
270
|
}
|
|
247
271
|
|
|
272
|
+
function clearCheckboxes() {
|
|
273
|
+
checkboxes.value = [];
|
|
274
|
+
}
|
|
275
|
+
|
|
248
276
|
async function refreshExistingList(pk?: any) {
|
|
249
277
|
const currentData = rows.value;
|
|
250
278
|
if (!currentData) {
|
|
@@ -297,9 +325,9 @@ async function refreshExistingList(pk?: any) {
|
|
|
297
325
|
}
|
|
298
326
|
|
|
299
327
|
|
|
300
|
-
async function startBulkAction(actionId) {
|
|
301
|
-
const action = coreStore.resource
|
|
302
|
-
if (action
|
|
328
|
+
async function startBulkAction(actionId: string) {
|
|
329
|
+
const action = coreStore.resource?.options?.bulkActions?.find(a => a.id === actionId);
|
|
330
|
+
if (action?.confirm) {
|
|
303
331
|
const confirmed = await adminforth.confirm({
|
|
304
332
|
message: action.confirm,
|
|
305
333
|
});
|
|
@@ -339,10 +367,10 @@ async function startBulkAction(actionId) {
|
|
|
339
367
|
|
|
340
368
|
|
|
341
369
|
class SortQuerySerializer {
|
|
342
|
-
static serialize(sort) {
|
|
370
|
+
static serialize(sort: {field: string, direction: 'asc' | 'desc'}[]) {
|
|
343
371
|
return sort.map(s => `${s.field}__${s.direction}`).join(',');
|
|
344
372
|
}
|
|
345
|
-
static deserialize(str) {
|
|
373
|
+
static deserialize(str: string) {
|
|
346
374
|
return str.split(',').map(s => {
|
|
347
375
|
const [field, direction] = s.split('__');
|
|
348
376
|
return { field, direction };
|
|
@@ -355,7 +383,7 @@ let listAutorefresher: any = null;
|
|
|
355
383
|
async function init() {
|
|
356
384
|
|
|
357
385
|
await coreStore.fetchResourceFull({
|
|
358
|
-
resourceId: route.params.resourceId
|
|
386
|
+
resourceId: route.params.resourceId as string
|
|
359
387
|
});
|
|
360
388
|
isPageLoaded.value = true;
|
|
361
389
|
// !!! clear filters should be in same tick with sort assignment so that watch can catch it as one change
|
|
@@ -366,7 +394,7 @@ async function init() {
|
|
|
366
394
|
return {
|
|
367
395
|
field,
|
|
368
396
|
operator,
|
|
369
|
-
value: JSON.parse(decodeURIComponent(route.query[k]))
|
|
397
|
+
value: JSON.parse(decodeURIComponent(route.query[k] as string))
|
|
370
398
|
}
|
|
371
399
|
});
|
|
372
400
|
if (filters.length) {
|
|
@@ -376,8 +404,8 @@ async function init() {
|
|
|
376
404
|
}
|
|
377
405
|
|
|
378
406
|
if (route.query.sort) {
|
|
379
|
-
sort.value = SortQuerySerializer.deserialize(route.query.sort);
|
|
380
|
-
} else if (coreStore
|
|
407
|
+
sort.value = SortQuerySerializer.deserialize(route.query.sort as string);
|
|
408
|
+
} else if (coreStore?.resource?.options?.defaultSort) {
|
|
381
409
|
sort.value = [{
|
|
382
410
|
field: coreStore.resource.options.defaultSort.columnName,
|
|
383
411
|
direction: coreStore.resource.options.defaultSort.direction
|
|
@@ -387,7 +415,7 @@ async function init() {
|
|
|
387
415
|
}
|
|
388
416
|
// page init should be also in same tick
|
|
389
417
|
if (route.query.page) {
|
|
390
|
-
page.value = parseInt(route.query.page);
|
|
418
|
+
page.value = parseInt(route.query.page as string);
|
|
391
419
|
}
|
|
392
420
|
|
|
393
421
|
// getList(); - Not needed here, watch will trigger it
|
|
@@ -416,8 +444,18 @@ watch([page, sort, () => filtersStore.filters], async () => {
|
|
|
416
444
|
}, { deep: true });
|
|
417
445
|
|
|
418
446
|
adminforth.list.refresh = async () => {
|
|
419
|
-
|
|
420
|
-
|
|
447
|
+
const result = await getList();
|
|
448
|
+
|
|
449
|
+
if (!result) {
|
|
450
|
+
return {};
|
|
451
|
+
}
|
|
452
|
+
|
|
453
|
+
if ('error' in result && result.error != null) {
|
|
454
|
+
return { error: String(result.error) };
|
|
455
|
+
}
|
|
456
|
+
|
|
457
|
+
return {};
|
|
458
|
+
};
|
|
421
459
|
|
|
422
460
|
adminforth.list.silentRefresh = async () => {
|
|
423
461
|
return await refreshExistingList();
|
|
@@ -437,10 +475,10 @@ watch(() => filtersStore.filters, async (to, from) => {
|
|
|
437
475
|
page.value = 1;
|
|
438
476
|
checkboxes.value = []; // TODO: not sure absolutely needed here
|
|
439
477
|
// update query param for each filter as filter_<column_name>=value
|
|
440
|
-
const query = {};
|
|
478
|
+
const query: Record<string, string | undefined> = {};
|
|
441
479
|
const currentQ = currentQuery();
|
|
442
480
|
filtersStore.filters.forEach(f => {
|
|
443
|
-
if (f.value) {
|
|
481
|
+
if (f.value !== undefined && f.value !== null && f.value !== '') {
|
|
444
482
|
query[`filter__${f.field}__${f.operator}`] = encodeURIComponent(JSON.stringify(f.value));
|
|
445
483
|
}
|
|
446
484
|
});
|