Skip to content

Commit 9433adf

Browse files
committed
chore: solve widget load bug
Signed-off-by: samuel.park <[email protected]>
1 parent 1340045 commit 9433adf

File tree

1 file changed

+9
-13
lines changed

1 file changed

+9
-13
lines changed

Diff for: apps/web/src/common/modules/widgets/_composables/use-widget-data-table-query.ts

+9-13
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import { computed } from 'vue';
33

44
import { useScopedQuery } from '@/api-clients/_common/composables/use-scoped-query';
55
import { usePrivateDataTableApi } from '@/api-clients/dashboard/private-data-table/composables/use-private-data-table-api';
6-
import type { DataTableGetParameters } from '@/api-clients/dashboard/private-data-table/schema/api-verbs/get';
76
import { usePublicDataTableApi } from '@/api-clients/dashboard/public-data-table/composables/use-public-data-table-api';
87
import { useServiceQueryKey } from '@/query/query-key/use-service-query-key';
98

@@ -15,28 +14,25 @@ export const useWidgetDataTableQuery = (dataTableId: ComputedRef<string|undefine
1514
const { publicDataTableAPI } = usePublicDataTableApi();
1615
const { privateDataTableAPI } = usePrivateDataTableApi();
1716

18-
const isPrivate = computed(() => {
19-
if (!dataTableId.value) return false;
20-
return dataTableId.value.startsWith('private');
21-
});
17+
const isPrivate = computed(() => dataTableId.value?.startsWith('private'));
2218

2319
const { key: publicKey, params: publicParams } = useServiceQueryKey('dashboard', 'public-data-table', 'get', {
2420
contextKey: dataTableId,
25-
params: {
26-
data_table_id: dataTableId.value,
27-
} as DataTableGetParameters,
21+
params: computed(() => ({
22+
data_table_id: dataTableId.value as string,
23+
})),
2824
});
2925
const { key: privateKey, params: privateParams } = useServiceQueryKey('dashboard', 'private-data-table', 'get', {
3026
contextKey: dataTableId,
31-
params: {
32-
data_table_id: dataTableId.value,
33-
} as DataTableGetParameters,
27+
params: computed(() => ({
28+
data_table_id: dataTableId.value as string,
29+
})),
3430
});
3531

3632
const privateDataTableQuery = useScopedQuery({
3733
queryKey: privateKey,
3834
queryFn: () => {
39-
if (!dataTableId.value) {
35+
if (!privateParams.value.data_table_id) {
4036
throw new Error('DataTable ID is required for fetching data');
4137
}
4238
return privateDataTableAPI.get(privateParams.value);
@@ -48,7 +44,7 @@ export const useWidgetDataTableQuery = (dataTableId: ComputedRef<string|undefine
4844
const publicDataTableQuery = useScopedQuery({
4945
queryKey: publicKey,
5046
queryFn: () => {
51-
if (!dataTableId.value) {
47+
if (!publicParams.value.data_table_id) {
5248
throw new Error('DataTable ID is required for fetching data');
5349
}
5450
return publicDataTableAPI.get(publicParams.value);

0 commit comments

Comments
 (0)