@@ -3,7 +3,6 @@ import { computed } from 'vue';
3
3
4
4
import { useScopedQuery } from '@/api-clients/_common/composables/use-scoped-query' ;
5
5
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' ;
7
6
import { usePublicDataTableApi } from '@/api-clients/dashboard/public-data-table/composables/use-public-data-table-api' ;
8
7
import { useServiceQueryKey } from '@/query/query-key/use-service-query-key' ;
9
8
@@ -15,28 +14,25 @@ export const useWidgetDataTableQuery = (dataTableId: ComputedRef<string|undefine
15
14
const { publicDataTableAPI } = usePublicDataTableApi ( ) ;
16
15
const { privateDataTableAPI } = usePrivateDataTableApi ( ) ;
17
16
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' ) ) ;
22
18
23
19
const { key : publicKey , params : publicParams } = useServiceQueryKey ( 'dashboard' , 'public-data-table' , 'get' , {
24
20
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
+ } ) ) ,
28
24
} ) ;
29
25
const { key : privateKey , params : privateParams } = useServiceQueryKey ( 'dashboard' , 'private-data-table' , 'get' , {
30
26
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
+ } ) ) ,
34
30
} ) ;
35
31
36
32
const privateDataTableQuery = useScopedQuery ( {
37
33
queryKey : privateKey ,
38
34
queryFn : ( ) => {
39
- if ( ! dataTableId . value ) {
35
+ if ( ! privateParams . value . data_table_id ) {
40
36
throw new Error ( 'DataTable ID is required for fetching data' ) ;
41
37
}
42
38
return privateDataTableAPI . get ( privateParams . value ) ;
@@ -48,7 +44,7 @@ export const useWidgetDataTableQuery = (dataTableId: ComputedRef<string|undefine
48
44
const publicDataTableQuery = useScopedQuery ( {
49
45
queryKey : publicKey ,
50
46
queryFn : ( ) => {
51
- if ( ! dataTableId . value ) {
47
+ if ( ! publicParams . value . data_table_id ) {
52
48
throw new Error ( 'DataTable ID is required for fetching data' ) ;
53
49
}
54
50
return publicDataTableAPI . get ( publicParams . value ) ;
0 commit comments