diff --git a/apps/web/src/api-clients/_common/composables/use-api-query-key.ts b/apps/web/src/api-clients/_common/composables/use-api-query-key.ts deleted file mode 100644 index 1c92d0c5f8..0000000000 --- a/apps/web/src/api-clients/_common/composables/use-api-query-key.ts +++ /dev/null @@ -1,54 +0,0 @@ -import { computed, reactive } from 'vue'; - -import type { - ResourceName, ServiceName, Verb, -} from '@/api-clients/_common/types/query-key-type'; - -import { useAppContextStore } from '@/store/app-context/app-context-store'; -import { useUserWorkspaceStore } from '@/store/app-context/workspace/user-workspace-store'; - -/** - * Generates a computed query key for API requests, incorporating global parameters. - * - * @param service - The service name, representing the API service scope (e.g., 'dashboard'). - * @param resource - The resource name, specifying the target API resource (e.g., 'public-data-table'). - * @param verb - The API action verb, defining the type of request (e.g., 'get', 'list', 'update'). - * @param additionalGlobalParams - Optional additional global parameters (e.g., workspace ID, admin mode). - * @returns A computed reference to the query key array, structured as `[service, resource, verb, { globalParams }]`. - * - * ### Example Usage: - * ```ts - * const queryKey = useAPIQueryKey('dashboard', 'public-data-table', 'get'); - * ``` - * The generated query key ensures: - * - **Type safety**: Prevents invalid API calls by enforcing a valid `service/resource/verb` combination. - * - **Auto-completion**: Provides intelligent suggestions based on predefined API structure. - * - **Cache management**: Enables precise cache invalidation and data synchronization. - */ - -interface GlobalQueryParams { - workspaceId?: string; - isAdminMode?: boolean; -} -export const useAPIQueryKey = , V extends Verb>( - service: S, - resource: R, - verb: V, - additionalGlobalParams?: Partial, -) => { - const appContextStore = useAppContextStore(); - const userWorkspaceStore = useUserWorkspaceStore(); - - const _state = reactive({ - currentWorkdpaceId: computed(() => userWorkspaceStore.getters.currentWorkspaceId), - isAdminMode: computed(() => appContextStore.getters.isAdminMode), - }); - - const globalQueryParams = reactive({ - workspaceId: _state.currentWorkdpaceId, - isAdminMode: _state.isAdminMode, - ...additionalGlobalParams, - }); - - return computed(() => [service, resource, verb, { ...globalQueryParams }]); -}; diff --git a/apps/web/src/api-clients/_common/types/query-key-type.ts b/apps/web/src/api-clients/_common/types/query-key-type.ts deleted file mode 100644 index fadaec94d7..0000000000 --- a/apps/web/src/api-clients/_common/types/query-key-type.ts +++ /dev/null @@ -1,9 +0,0 @@ -import type { API_DOC } from '@/api-clients/_common/constants/api-doc-constant'; - - -/** - * Extracts all possible keys for `{service-name}`, `{resource-name}`, and `{verb}` - */ -export type ServiceName = keyof typeof API_DOC; -export type ResourceName = keyof (typeof API_DOC)[S]; -export type Verb> = Extract<(typeof API_DOC)[S][R], string[]>[number] | string; diff --git a/apps/web/src/api-clients/config/domain-config/composables/use-domain-config-api.ts b/apps/web/src/api-clients/config/domain-config/composables/use-domain-config-api.ts index ac53167f95..cfc59f37ad 100644 --- a/apps/web/src/api-clients/config/domain-config/composables/use-domain-config-api.ts +++ b/apps/web/src/api-clients/config/domain-config/composables/use-domain-config-api.ts @@ -1,6 +1,5 @@ import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; -import { useAPIQueryKey } from '@/api-clients/_common/composables/use-api-query-key'; import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { DomainConfigCreateParameters } from '@/api-clients/config/domain-config/schema/api-verbs/create'; import type { DomainConfigGetParameters } from '@/api-clients/config/domain-config/schema/api-verbs/get'; @@ -10,9 +9,6 @@ import type { DomainConfigUpdateParameters } from '@/api-clients/config/domain-c import type { DomainConfigModel } from '@/api-clients/config/domain-config/schema/model'; export const useDomainConfigApi = () => { - const domainConfigQueryKey = useAPIQueryKey('config', 'domain-config', 'get'); - const domainConfigListQueryKey = useAPIQueryKey('config', 'domain-config', 'list'); - const actions = { create: SpaceConnector.clientV2.config.domainConfig.create, update: SpaceConnector.clientV2.config.domainConfig.update, @@ -22,8 +18,6 @@ export const useDomainConfigApi = () => { }; return { - domainConfigQueryKey, - domainConfigListQueryKey, domainConfigAPI: actions, }; }; diff --git a/apps/web/src/api-clients/config/public-config/composables/use-public-config-api.ts b/apps/web/src/api-clients/config/public-config/composables/use-public-config-api.ts index 9f64ce0881..88c0bbf533 100644 --- a/apps/web/src/api-clients/config/public-config/composables/use-public-config-api.ts +++ b/apps/web/src/api-clients/config/public-config/composables/use-public-config-api.ts @@ -1,9 +1,8 @@ import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; -import { useAPIQueryKey } from '@/api-clients/_common/composables/use-api-query-key'; import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { PublicConfigCreateParameters } from '@/api-clients/config/public-config/schema/api-verbs/create'; -import type { PublicConfigGetParameters as PublicConfigDeleteParameters } from '@/api-clients/config/public-config/schema/api-verbs/delete'; +import type { PublicConfigDeleteParameters } from '@/api-clients/config/public-config/schema/api-verbs/delete'; import type { PublicConfigGetParameters } from '@/api-clients/config/public-config/schema/api-verbs/get'; import type { PublicConfigListParameters } from '@/api-clients/config/public-config/schema/api-verbs/list'; import type { PublicConfigSetParameters } from '@/api-clients/config/public-config/schema/api-verbs/set'; @@ -11,9 +10,6 @@ import type { PublicConfigUpdateParameters } from '@/api-clients/config/public-c import type { PublicConfigModel } from '@/api-clients/config/public-config/schema/model'; export const usePublicConfigApi = () => { - const publicConfigQueryKey = useAPIQueryKey('config', 'public-config', 'get'); - const publicConfigListQueryKey = useAPIQueryKey('config', 'public-config', 'list'); - const actions = { create: SpaceConnector.clientV2.config.publicConfig.create, update: SpaceConnector.clientV2.config.publicConfig.update, @@ -24,8 +20,6 @@ export const usePublicConfigApi = () => { }; return { - publicConfigQueryKey, - publicConfigListQueryKey, publicConfigAPI: actions, }; }; diff --git a/apps/web/src/api-clients/config/public-config/schema/api-verbs/delete.ts b/apps/web/src/api-clients/config/public-config/schema/api-verbs/delete.ts index ab2a71a3b2..9853868da0 100644 --- a/apps/web/src/api-clients/config/public-config/schema/api-verbs/delete.ts +++ b/apps/web/src/api-clients/config/public-config/schema/api-verbs/delete.ts @@ -1,3 +1,3 @@ -export interface PublicConfigGetParameters { +export interface PublicConfigDeleteParameters { name: string; } diff --git a/apps/web/src/api-clients/config/shared-config/composables/use-shared-config-api.ts b/apps/web/src/api-clients/config/shared-config/composables/use-shared-config-api.ts index 7056ddbeb2..7bb052c0c3 100644 --- a/apps/web/src/api-clients/config/shared-config/composables/use-shared-config-api.ts +++ b/apps/web/src/api-clients/config/shared-config/composables/use-shared-config-api.ts @@ -1,6 +1,5 @@ import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; -import { useAPIQueryKey } from '@/api-clients/_common/composables/use-api-query-key'; import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { SharedConfigCreateParameters } from '@/api-clients/config/shared-config/schema/api-verbs/create'; import type { SharedConfigDeleteParameters } from '@/api-clients/config/shared-config/schema/api-verbs/delete'; @@ -10,9 +9,6 @@ import type { SharedConfigUpdateParameters } from '@/api-clients/config/shared-c import type { SharedConfigModel } from '@/api-clients/config/shared-config/schema/model'; export const useSharedConfigApi = () => { - const sharedConfigQueryKey = useAPIQueryKey('config', 'shared-config', 'get'); - const sharedConfigListQueryKey = useAPIQueryKey('config', 'shared-config', 'list'); - const actions = { create: SpaceConnector.clientV2.config.sharedConfig.create, update: SpaceConnector.clientV2.config.sharedConfig.update, @@ -22,8 +18,6 @@ export const useSharedConfigApi = () => { }; return { - sharedConfigQueryKey, - sharedConfigListQueryKey, sharedConfigAPI: actions, }; }; diff --git a/apps/web/src/api-clients/config/user-config/composables/use-user-config-api.ts b/apps/web/src/api-clients/config/user-config/composables/use-user-config-api.ts index 6ece467964..74b4f3867d 100644 --- a/apps/web/src/api-clients/config/user-config/composables/use-user-config-api.ts +++ b/apps/web/src/api-clients/config/user-config/composables/use-user-config-api.ts @@ -1,6 +1,5 @@ import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; -import { useAPIQueryKey } from '@/api-clients/_common/composables/use-api-query-key'; import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { UserConfigCreateParameters } from '@/api-clients/config/user-config/schema/api-verbs/create'; import type { UserConfigDeleteParameters } from '@/api-clients/config/user-config/schema/api-verbs/delete'; @@ -11,9 +10,6 @@ import type { UserConfigUpdateParameters } from '@/api-clients/config/user-confi import type { UserConfigModel } from '@/api-clients/config/user-config/schema/model'; export const useUserConfigApi = () => { - const userConfigQueryKey = useAPIQueryKey('config', 'user-config', 'get'); - const userConfigListQueryKey = useAPIQueryKey('config', 'user-config', 'list'); - const actions = { create: SpaceConnector.clientV2.config.userConfig.create, update: SpaceConnector.clientV2.config.userConfig.update, @@ -24,8 +20,6 @@ export const useUserConfigApi = () => { }; return { - userConfigQueryKey, - userConfigListQueryKey, userConfigAPI: actions, }; }; diff --git a/apps/web/src/api-clients/cost-analysis/cost-report-config/composables/use-cost-report-config-api.ts b/apps/web/src/api-clients/cost-analysis/cost-report-config/composables/use-cost-report-config-api.ts index 8f4839086a..49dc08c0c4 100644 --- a/apps/web/src/api-clients/cost-analysis/cost-report-config/composables/use-cost-report-config-api.ts +++ b/apps/web/src/api-clients/cost-analysis/cost-report-config/composables/use-cost-report-config-api.ts @@ -15,12 +15,8 @@ interface UseCostReportConfigApiReturn { export const useCostReportConfigApi = (): UseCostReportConfigApiReturn => { const actions = { - async update(params: CostReportConfigUpdateParameters) { - return SpaceConnector.clientV2.costAnalysis.costReportConfig.update(params); - }, - async list(params: CostReportConfigListParameters) { - return SpaceConnector.clientV2.costAnalysis.costReportConfig.list>(params); - }, + update: SpaceConnector.clientV2.costAnalysis.costReportConfig.update, + list: SpaceConnector.clientV2.costAnalysis.costReportConfig.list>, }; return { diff --git a/apps/web/src/api-clients/cost-analysis/data-source/composables/use-data-source-api.ts b/apps/web/src/api-clients/cost-analysis/data-source/composables/use-data-source-api.ts index 94eff42640..452af1e8d1 100644 --- a/apps/web/src/api-clients/cost-analysis/data-source/composables/use-data-source-api.ts +++ b/apps/web/src/api-clients/cost-analysis/data-source/composables/use-data-source-api.ts @@ -18,18 +18,10 @@ interface UseDataSourceApiReturn { export const useDataSourceApi = (): UseDataSourceApiReturn => { const actions = { - async get(params: CostDataSourceGetParameters) { - return SpaceConnector.clientV2.costAnalysis.dataSource.get(params); - }, - async list(params: CostDataSourceListParameters) { - return SpaceConnector.clientV2.costAnalysis.dataSource.list>(params); - }, - async sync(params: CostDataSourceSyncParameters) { - return SpaceConnector.clientV2.costAnalysis.dataSource.sync(params); - }, - async updatePermissions(params: CostDataSourceUpdatePermissionsParameters) { - return SpaceConnector.clientV2.costAnalysis.dataSource.updatePermissions(params); - }, + get: SpaceConnector.clientV2.costAnalysis.dataSource.get, + list: SpaceConnector.clientV2.costAnalysis.dataSource.list>, + sync: SpaceConnector.clientV2.costAnalysis.dataSource.sync, + updatePermissions: SpaceConnector.clientV2.costAnalysis.dataSource.updatePermissions, }; return { diff --git a/apps/web/src/api-clients/identity/agent/composables/use-agent-api.ts b/apps/web/src/api-clients/identity/agent/composables/use-agent-api.ts index 0cbe4a8d08..a4e5b0ba2f 100644 --- a/apps/web/src/api-clients/identity/agent/composables/use-agent-api.ts +++ b/apps/web/src/api-clients/identity/agent/composables/use-agent-api.ts @@ -1,6 +1,5 @@ import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; -import { useAPIQueryKey } from '@/api-clients/_common/composables/use-api-query-key'; import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { AgentCreateParameters } from '@/api-clients/identity/agent/schema/api-verbs/create'; import type { AgentDeleteParameters } from '@/api-clients/identity/agent/schema/api-verbs/delete'; @@ -12,9 +11,6 @@ import type { AgentRegenerateParameters } from '@/api-clients/identity/agent/sch import type { AgentModel } from '@/api-clients/identity/agent/schema/model'; export const useAgentApi = () => { - const agentQueryKey = useAPIQueryKey('identity', 'agent', 'get'); - const agentListQueryKey = useAPIQueryKey('identity', 'agent', 'list'); - const actions = { create: SpaceConnector.clientV2.identity.agent.create, delete: SpaceConnector.clientV2.identity.agent.delete, @@ -26,8 +22,6 @@ export const useAgentApi = () => { }; return { - agentQueryKey, - agentListQueryKey, agentAPI: actions, }; }; diff --git a/apps/web/src/api-clients/identity/app/composables/use-app-api.ts b/apps/web/src/api-clients/identity/app/composables/use-app-api.ts index bc88a5189c..4381dff6d4 100644 --- a/apps/web/src/api-clients/identity/app/composables/use-app-api.ts +++ b/apps/web/src/api-clients/identity/app/composables/use-app-api.ts @@ -1,6 +1,5 @@ import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; -import { useAPIQueryKey } from '@/api-clients/_common/composables/use-api-query-key'; import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { AppCreateParameters } from '@/api-clients/identity/app/schema/api-verbs/create'; import type { AppDeleteParameters } from '@/api-clients/identity/app/schema/api-verbs/delete'; @@ -14,9 +13,6 @@ import type { AppUpdateParameters } from '@/api-clients/identity/app/schema/api- import type { AppModel } from '@/api-clients/identity/app/schema/model'; export const useAppApi = () => { - const appQueryKey = useAPIQueryKey('identity', 'app', 'get'); - const appListQueryKey = useAPIQueryKey('identity', 'app', 'list'); - const actions = { create: SpaceConnector.clientV2.identity.app.create, update: SpaceConnector.clientV2.identity.app.update, @@ -30,8 +26,6 @@ export const useAppApi = () => { }; return { - appQueryKey, - appListQueryKey, appAPI: actions, }; }; diff --git a/apps/web/src/api-clients/identity/domain/composables/use-domain-api.ts b/apps/web/src/api-clients/identity/domain/composables/use-domain-api.ts index c8b369212b..e3eecf1ef6 100644 --- a/apps/web/src/api-clients/identity/domain/composables/use-domain-api.ts +++ b/apps/web/src/api-clients/identity/domain/composables/use-domain-api.ts @@ -1,6 +1,5 @@ import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; -import { useAPIQueryKey } from '@/api-clients/_common/composables/use-api-query-key'; import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { DomainGetParameters } from '@/api-clients/identity/domain/schema/api-verbs/get'; import type { DomainGetAuthInfoParams } from '@/api-clients/identity/domain/schema/api-verbs/get-auth-info'; @@ -9,9 +8,6 @@ import type { DomainModel } from '@/api-clients/identity/domain/schema/model'; export const useDomainApi = () => { - const domainQueryKey = useAPIQueryKey('identity', 'domain', 'get'); - const domainListQueryKey = useAPIQueryKey('identity', 'domain', 'list'); - const actions = { get: SpaceConnector.clientV2.identity.domain.get, list: SpaceConnector.clientV2.identity.domain.list>, @@ -19,8 +15,6 @@ export const useDomainApi = () => { }; return { - domainQueryKey, - domainListQueryKey, domainAPI: actions, }; }; diff --git a/apps/web/src/api-clients/identity/endpoint/composables/use-endpoint-api.ts b/apps/web/src/api-clients/identity/endpoint/composables/use-endpoint-api.ts index 9660716ddb..386bdb6461 100644 --- a/apps/web/src/api-clients/identity/endpoint/composables/use-endpoint-api.ts +++ b/apps/web/src/api-clients/identity/endpoint/composables/use-endpoint-api.ts @@ -1,19 +1,15 @@ import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; -import { useAPIQueryKey } from '@/api-clients/_common/composables/use-api-query-key'; import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { EndpointListParameters } from '@/api-clients/identity/endpoint/schema/api-verbs/list'; import type { EndpointModel } from '@/api-clients/identity/endpoint/schema/model'; export const useEndpointApi = () => { - const endpointListQueryKey = useAPIQueryKey('identity', 'endpoint', 'list'); - const actions = { list: SpaceConnector.clientV2.identity.endpoint.list>, }; return { - endpointListQueryKey, endpointAPI: actions, }; }; diff --git a/apps/web/src/api-clients/identity/job/composables/use-job-api.ts b/apps/web/src/api-clients/identity/job/composables/use-job-api.ts index cdec08b3f0..319265693a 100644 --- a/apps/web/src/api-clients/identity/job/composables/use-job-api.ts +++ b/apps/web/src/api-clients/identity/job/composables/use-job-api.ts @@ -1,6 +1,5 @@ import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; -import { useAPIQueryKey } from '@/api-clients/_common/composables/use-api-query-key'; import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { IdentityJobDeleteParameters } from '@/api-clients/identity/job/schema/api-verbs/delete'; import type { IdentityJobGetParameters } from '@/api-clients/identity/job/schema/api-verbs/get'; @@ -9,9 +8,6 @@ import type { IdentityJobStatParameters } from '@/api-clients/identity/job/schem import type { IdentityJobModel } from '@/api-clients/identity/job/schema/model'; export const useJobApi = () => { - const jobQueryKey = useAPIQueryKey('identity', 'job', 'get'); - const jobListQueryKey = useAPIQueryKey('identity', 'job', 'list'); - const actions = { delete: SpaceConnector.clientV2.identity.job.delete, get: SpaceConnector.clientV2.identity.job.get, @@ -20,8 +16,6 @@ export const useJobApi = () => { }; return { - jobQueryKey, - jobListQueryKey, jobAPI: actions, }; }; diff --git a/apps/web/src/api-clients/identity/package/composables/use-package-api.ts b/apps/web/src/api-clients/identity/package/composables/use-package-api.ts index 63666bc57d..3dac02be0f 100644 --- a/apps/web/src/api-clients/identity/package/composables/use-package-api.ts +++ b/apps/web/src/api-clients/identity/package/composables/use-package-api.ts @@ -1,6 +1,5 @@ import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; -import { useAPIQueryKey } from '@/api-clients/_common/composables/use-api-query-key'; import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { PackageChangeOrderParameters } from '@/api-clients/identity/package/schema/api-verbs/change-order'; import type { PackageCreateParameters } from '@/api-clients/identity/package/schema/api-verbs/create'; @@ -13,9 +12,6 @@ import type { PackageModel } from '@/api-clients/identity/package/schema/model'; export const usePackageApi = () => { - const packageQueryKey = useAPIQueryKey('identity', 'package', 'get'); - const packageListQueryKey = useAPIQueryKey('identity', 'package', 'list'); - const actions = { create: SpaceConnector.clientV2.identity.package.create, update: SpaceConnector.clientV2.identity.package.update, @@ -27,8 +23,6 @@ export const usePackageApi = () => { }; return { - packageQueryKey, - packageListQueryKey, packageAPI: actions, }; }; diff --git a/apps/web/src/api-clients/identity/project-group/composables/use-project-group-api.ts b/apps/web/src/api-clients/identity/project-group/composables/use-project-group-api.ts index c544f5fd42..5477be2074 100644 --- a/apps/web/src/api-clients/identity/project-group/composables/use-project-group-api.ts +++ b/apps/web/src/api-clients/identity/project-group/composables/use-project-group-api.ts @@ -1,6 +1,5 @@ import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; -import { useAPIQueryKey } from '@/api-clients/_common/composables/use-api-query-key'; import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { ProjectGroupAddUsersParameters } from '@/api-clients/identity/project-group/schema/api-verbs/add-users'; import type { ProjectGroupChangeParentGroupParameters } from '@/api-clients/identity/project-group/schema/api-verbs/change-parent-group'; @@ -14,9 +13,6 @@ import type { ProjectGroupModel } from '@/api-clients/identity/project-group/sch export const useProjectGroupApi = () => { - const projectGroupQueryKey = useAPIQueryKey('identity', 'project-group', 'get'); - const projectGroupListQueryKey = useAPIQueryKey('identity', 'project-group', 'list'); - const actions = { create: SpaceConnector.clientV2.identity.projectGroup.create, update: SpaceConnector.clientV2.identity.projectGroup.update, @@ -29,8 +25,6 @@ export const useProjectGroupApi = () => { }; return { - projectGroupQueryKey, - projectGroupListQueryKey, projectGroupAPI: actions, }; }; diff --git a/apps/web/src/api-clients/identity/project/composables/use-project-api.ts b/apps/web/src/api-clients/identity/project/composables/use-project-api.ts index 561f6a805e..719a441e58 100644 --- a/apps/web/src/api-clients/identity/project/composables/use-project-api.ts +++ b/apps/web/src/api-clients/identity/project/composables/use-project-api.ts @@ -1,6 +1,5 @@ import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; -import { useAPIQueryKey } from '@/api-clients/_common/composables/use-api-query-key'; import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { ProjectAddUsersParameters } from '@/api-clients/identity/project/schema/api-verbs/add-users'; import type { ProjectChangeProjectGroupParameters } from '@/api-clients/identity/project/schema/api-verbs/change-project-group'; @@ -15,9 +14,6 @@ import type { ProjectModel } from '@/api-clients/identity/project/schema/model'; export const useProjectApi = () => { - const projectQueryKey = useAPIQueryKey('identity', 'project', 'get'); - const projectListQueryKey = useAPIQueryKey('identity', 'project', 'list'); - const actions = { create: SpaceConnector.clientV2.identity.project.create, update: SpaceConnector.clientV2.identity.project.update, @@ -31,8 +27,6 @@ export const useProjectApi = () => { }; return { - projectQueryKey, - projectListQueryKey, projectAPI: actions, }; }; diff --git a/apps/web/src/api-clients/identity/provider/composables/use-provider-api.ts b/apps/web/src/api-clients/identity/provider/composables/use-provider-api.ts index d7bd5a98b9..961e700d35 100644 --- a/apps/web/src/api-clients/identity/provider/composables/use-provider-api.ts +++ b/apps/web/src/api-clients/identity/provider/composables/use-provider-api.ts @@ -1,6 +1,5 @@ import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; -import { useAPIQueryKey } from '@/api-clients/_common/composables/use-api-query-key'; import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { ProviderCreateParameters } from '@/api-clients/identity/provider/schema/api-verbs/create'; import type { ProviderDeleteParameters } from '@/api-clients/identity/provider/schema/api-verbs/delete'; @@ -12,9 +11,6 @@ import type { ProviderModel } from '@/api-clients/identity/provider/schema/model export const useProviderApi = () => { - const providerQueryKey = useAPIQueryKey('identity', 'provider', 'get'); - const providerListQueryKey = useAPIQueryKey('identity', 'provider', 'list'); - const actions = { create: SpaceConnector.clientV2.identity.provider.create, update: SpaceConnector.clientV2.identity.provider.update, @@ -25,8 +21,6 @@ export const useProviderApi = () => { }; return { - providerQueryKey, - providerListQueryKey, providerAPI: actions, }; }; diff --git a/apps/web/src/api-clients/identity/role-binding/composables/use-role-binding-api.ts b/apps/web/src/api-clients/identity/role-binding/composables/use-role-binding-api.ts index 037091c426..bd6d129db5 100644 --- a/apps/web/src/api-clients/identity/role-binding/composables/use-role-binding-api.ts +++ b/apps/web/src/api-clients/identity/role-binding/composables/use-role-binding-api.ts @@ -1,6 +1,5 @@ import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; -import { useAPIQueryKey } from '@/api-clients/_common/composables/use-api-query-key'; import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { RoleCreateParameters } from '@/api-clients/identity/role-binding/schema/api-verbs/create'; import type { RoleBindingDeleteParameters } from '@/api-clients/identity/role-binding/schema/api-verbs/delete'; @@ -9,9 +8,6 @@ import type { RoleBindingUpdateRoleParameters } from '@/api-clients/identity/rol import type { RoleBindingModel } from '@/api-clients/identity/role-binding/schema/model'; export const useRoleBindingApi = () => { - const roleBindingQueryKey = useAPIQueryKey('identity', 'role-binding', 'get'); - const roleBindingListQueryKey = useAPIQueryKey('identity', 'role-binding', 'list'); - const actions = { create: SpaceConnector.clientV2.identity.roleBinding.create, delete: SpaceConnector.clientV2.identity.roleBinding.delete, @@ -20,8 +16,6 @@ export const useRoleBindingApi = () => { }; return { - roleBindingQueryKey, - roleBindingListQueryKey, roleBindingAPI: actions, }; }; diff --git a/apps/web/src/api-clients/identity/role/composables/use-role-api.ts b/apps/web/src/api-clients/identity/role/composables/use-role-api.ts index c6d7986873..f42c8ee16f 100644 --- a/apps/web/src/api-clients/identity/role/composables/use-role-api.ts +++ b/apps/web/src/api-clients/identity/role/composables/use-role-api.ts @@ -1,6 +1,5 @@ import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; -import { useAPIQueryKey } from '@/api-clients/_common/composables/use-api-query-key'; import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { RoleCreateParameters } from '@/api-clients/identity/role/schema/api-verbs/create'; import type { RoleDeleteParameters } from '@/api-clients/identity/role/schema/api-verbs/delete'; @@ -13,9 +12,6 @@ import type { RoleUpdateParameters } from '@/api-clients/identity/role/schema/ap import type { BasicRoleModel, RoleModel } from '@/api-clients/identity/role/schema/model'; export const useRoleApi = () => { - const roleQueryKey = useAPIQueryKey('identity', 'role', 'get'); - const roleListQueryKey = useAPIQueryKey('identity', 'role', 'list'); - const actions = { create: SpaceConnector.clientV2.identity.role.create, update: SpaceConnector.clientV2.identity.role.update, @@ -28,8 +24,6 @@ export const useRoleApi = () => { }; return { - roleQueryKey, - roleListQueryKey, roleAPI: actions, }; }; diff --git a/apps/web/src/api-clients/identity/schema/composables/use-schema-api.ts b/apps/web/src/api-clients/identity/schema/composables/use-schema-api.ts index a8733654a0..0b5b061108 100644 --- a/apps/web/src/api-clients/identity/schema/composables/use-schema-api.ts +++ b/apps/web/src/api-clients/identity/schema/composables/use-schema-api.ts @@ -1,6 +1,5 @@ import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; -import { useAPIQueryKey } from '@/api-clients/_common/composables/use-api-query-key'; import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { SchemaCreateParameters } from '@/api-clients/identity/schema/schema/api-verbs/create'; import type { SchemaDeleteParameters } from '@/api-clients/identity/schema/schema/api-verbs/delete'; @@ -11,9 +10,6 @@ import type { SchemaUpdateParameters } from '@/api-clients/identity/schema/schem import type { SchemaModel } from '@/api-clients/identity/schema/schema/model'; export const useSchemaApi = () => { - const schemaQueryKey = useAPIQueryKey('identity', 'schema', 'get'); - const schemaListQueryKey = useAPIQueryKey('identity', 'schema', 'list'); - const actions = { create: SpaceConnector.clientV2.identity.schema.create, update: SpaceConnector.clientV2.identity.schema.update, @@ -24,8 +20,6 @@ export const useSchemaApi = () => { }; return { - schemaQueryKey, - schemaListQueryKey, schemaAPI: actions, }; }; diff --git a/apps/web/src/api-clients/identity/service-account/composables/use-service-account-api.ts b/apps/web/src/api-clients/identity/service-account/composables/use-service-account-api.ts index 771f6dac2f..97c61212cf 100644 --- a/apps/web/src/api-clients/identity/service-account/composables/use-service-account-api.ts +++ b/apps/web/src/api-clients/identity/service-account/composables/use-service-account-api.ts @@ -1,6 +1,5 @@ import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; -import { useAPIQueryKey } from '@/api-clients/_common/composables/use-api-query-key'; import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { ServiceAccountCreateParameters } from '@/api-clients/identity/service-account/schema/api-verbs/create'; import type { ServiceAccountDeleteParameters } from '@/api-clients/identity/service-account/schema/api-verbs/detele'; @@ -14,9 +13,6 @@ import type { ServiceAccountModel } from '@/api-clients/identity/service-account export const useServiceAccountApi = () => { - const serviceAccountQueryKey = useAPIQueryKey('identity', 'service-account', 'get'); - const serviceAccountListQueryKey = useAPIQueryKey('identity', 'service-account', 'list'); - const actions = { create: SpaceConnector.clientV2.identity.serviceAccount.create, update: SpaceConnector.clientV2.identity.serviceAccount.update, @@ -29,8 +25,6 @@ export const useServiceAccountApi = () => { }; return { - serviceAccountQueryKey, - serviceAccountListQueryKey, serviceAccountAPI: actions, }; }; diff --git a/apps/web/src/api-clients/identity/token/composables/use-token-api.ts b/apps/web/src/api-clients/identity/token/composables/use-token-api.ts index e447a9000f..394d45a6fd 100644 --- a/apps/web/src/api-clients/identity/token/composables/use-token-api.ts +++ b/apps/web/src/api-clients/identity/token/composables/use-token-api.ts @@ -1,23 +1,17 @@ import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; -import { useAPIQueryKey } from '@/api-clients/_common/composables/use-api-query-key'; import type { TokenGrantParameters } from '@/api-clients/identity/token/schema/api-verbs/grant'; import type { TokenIssueParameters } from '@/api-clients/identity/token/schema/api-verbs/issue'; import type { TokenIssueModel, TokenGrantModel } from '@/api-clients/identity/token/schema/model'; export const useTokenApi = () => { - const tokenQueryKey = useAPIQueryKey('identity', 'token', 'issue'); - const tokenGrantQueryKey = useAPIQueryKey('identity', 'token', 'grant'); - const actions = { issue: SpaceConnector.clientV2.identity.token.issue, grant: SpaceConnector.clientV2.identity.token.grant, }; return { - tokenQueryKey, - tokenGrantQueryKey, tokenAPI: actions, }; }; diff --git a/apps/web/src/api-clients/identity/trusted-account/composables/use-trusted-account-api.ts b/apps/web/src/api-clients/identity/trusted-account/composables/use-trusted-account-api.ts index 63a1359fa8..5c926fbabd 100644 --- a/apps/web/src/api-clients/identity/trusted-account/composables/use-trusted-account-api.ts +++ b/apps/web/src/api-clients/identity/trusted-account/composables/use-trusted-account-api.ts @@ -1,6 +1,5 @@ import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; -import { useAPIQueryKey } from '@/api-clients/_common/composables/use-api-query-key'; import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { TrustedAccountCreateParameters } from '@/api-clients/identity/trusted-account/schema/api-verbs/create'; import type { TrustedAccountDeleteParameters } from '@/api-clients/identity/trusted-account/schema/api-verbs/detele'; @@ -13,9 +12,6 @@ import type { TrustedAccountModel } from '@/api-clients/identity/trusted-account export const useTrustedAccountApi = () => { - const trustedAccountQueryKey = useAPIQueryKey('identity', 'trusted-account', 'get'); - const trustedAccountListQueryKey = useAPIQueryKey('identity', 'trusted-account', 'list'); - const actions = { create: SpaceConnector.clientV2.identity.trustedAccount.create, update: SpaceConnector.clientV2.identity.trustedAccount.update, @@ -27,8 +23,6 @@ export const useTrustedAccountApi = () => { }; return { - trustedAccountQueryKey, - trustedAccountListQueryKey, trustedAccountAPI: actions, }; }; diff --git a/apps/web/src/api-clients/identity/user-group/composables/use-user-group-api.ts b/apps/web/src/api-clients/identity/user-group/composables/use-user-group-api.ts index f3f7d590c3..3d5fd32f9a 100644 --- a/apps/web/src/api-clients/identity/user-group/composables/use-user-group-api.ts +++ b/apps/web/src/api-clients/identity/user-group/composables/use-user-group-api.ts @@ -1,6 +1,5 @@ import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; -import { useAPIQueryKey } from '@/api-clients/_common/composables/use-api-query-key'; import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { UserGroupAddUsersParameters } from '@/api-clients/identity/user-group/schema/api-verbs/add-users'; import type { UserGroupCreateParameters } from '@/api-clients/identity/user-group/schema/api-verbs/create'; @@ -13,9 +12,6 @@ import type { UserGroupModel } from '@/api-clients/identity/user-group/schema/mo export const useUserGroupApi = () => { - const userGroupQueryKey = useAPIQueryKey('identity', 'user-group', 'get'); - const userGroupListQueryKey = useAPIQueryKey('identity', 'user-group', 'list'); - const actions = { create: SpaceConnector.clientV2.identity.userGroup.create, update: SpaceConnector.clientV2.identity.userGroup.update, @@ -27,8 +23,6 @@ export const useUserGroupApi = () => { }; return { - userGroupQueryKey, - userGroupListQueryKey, userGroupAPI: actions, }; }; diff --git a/apps/web/src/api-clients/identity/user-profile/composables/use-user-profile-api.ts b/apps/web/src/api-clients/identity/user-profile/composables/use-user-profile-api.ts index d2216672b9..e772db888a 100644 --- a/apps/web/src/api-clients/identity/user-profile/composables/use-user-profile-api.ts +++ b/apps/web/src/api-clients/identity/user-profile/composables/use-user-profile-api.ts @@ -1,6 +1,5 @@ import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; -import { useAPIQueryKey } from '@/api-clients/_common/composables/use-api-query-key'; import type { UserProfileConfirmEmailParameters } from '@/api-clients/identity/user-profile/schema/api-verbs/confirm-email'; import type { UserProfileConfirmMfaParameters } from '@/api-clients/identity/user-profile/schema/api-verbs/confirm-mfa'; import type { UserProfileEnableMfaParameters } from '@/api-clients/identity/user-profile/schema/api-verbs/enable-mfa'; @@ -12,8 +11,6 @@ import type { UserProfileVerifyEmailParameters } from '@/api-clients/identity/us export const useUserProfileApi = () => { - const userProfileQueryKey = useAPIQueryKey('identity', 'user-profile', 'get'); - const actions = { update: SpaceConnector.clientV2.identity.userProfile.update, updatePassword: SpaceConnector.clientV2.identity.userProfile.updatePassword, @@ -26,7 +23,6 @@ export const useUserProfileApi = () => { }; return { - userProfileQueryKey, userProfileAPI: actions, }; }; diff --git a/apps/web/src/api-clients/identity/user/composables/use-user-api.ts b/apps/web/src/api-clients/identity/user/composables/use-user-api.ts index cacbbbc1f0..314ec3e23e 100644 --- a/apps/web/src/api-clients/identity/user/composables/use-user-api.ts +++ b/apps/web/src/api-clients/identity/user/composables/use-user-api.ts @@ -1,6 +1,5 @@ import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; -import { useAPIQueryKey } from '@/api-clients/_common/composables/use-api-query-key'; import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { UserCreateParameters } from '@/api-clients/identity/user/schema/api-verbs/create'; import type { UserDeleteParameters } from '@/api-clients/identity/user/schema/api-verbs/delete'; @@ -14,9 +13,6 @@ import type { UserVerifyEmailParameters } from '@/api-clients/identity/user/sche import type { UserModel } from '@/api-clients/identity/user/schema/model'; export const useUserApi = () => { - const userQueryKey = useAPIQueryKey('identity', 'user', 'get'); - const userListQueryKey = useAPIQueryKey('identity', 'user', 'list'); - const actions = { create: SpaceConnector.clientV2.identity.user.create, update: SpaceConnector.clientV2.identity.user.update, @@ -30,8 +26,6 @@ export const useUserApi = () => { }; return { - userQueryKey, - userListQueryKey, userAPI: actions, }; }; diff --git a/apps/web/src/api-clients/identity/workspace-group-user/composables/use-workspace-group-user-api.ts b/apps/web/src/api-clients/identity/workspace-group-user/composables/use-workspace-group-user-api.ts index e1ce722657..fab5821b63 100644 --- a/apps/web/src/api-clients/identity/workspace-group-user/composables/use-workspace-group-user-api.ts +++ b/apps/web/src/api-clients/identity/workspace-group-user/composables/use-workspace-group-user-api.ts @@ -1,6 +1,5 @@ import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; -import { useAPIQueryKey } from '@/api-clients/_common/composables/use-api-query-key'; import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { WorkspaceGroupUserAddParameters } from '@/api-clients/identity/workspace-group-user/schema/api-verbs/add'; import type { WorkspaceGroupUserFindParameters } from '@/api-clients/identity/workspace-group-user/schema/api-verbs/find'; @@ -11,9 +10,6 @@ import type { WorkspaceGroupUserUpdateRoleParameters } from '@/api-clients/ident import type { WorkspaceGroupUserModel } from '@/api-clients/identity/workspace-group-user/schema/model'; export const useWorkspaceGroupUserApi = () => { - const workspaceGroupUserQueryKey = useAPIQueryKey('identity', 'workspace-group-user', 'get'); - const workspaceGroupUserListQueryKey = useAPIQueryKey('identity', 'workspace-group-user', 'list'); - const actions = { add: SpaceConnector.clientV2.identity.workspaceGroupUser.add, remove: SpaceConnector.clientV2.identity.workspaceGroupUser.remove, @@ -25,8 +21,6 @@ export const useWorkspaceGroupUserApi = () => { }; return { - workspaceGroupUserQueryKey, - workspaceGroupUserListQueryKey, workspaceGroupUserAPI: actions, }; }; diff --git a/apps/web/src/api-clients/identity/workspace-group/composables/use-workspace-group-api.ts b/apps/web/src/api-clients/identity/workspace-group/composables/use-workspace-group-api.ts index 6d823bcfaf..756b377597 100644 --- a/apps/web/src/api-clients/identity/workspace-group/composables/use-workspace-group-api.ts +++ b/apps/web/src/api-clients/identity/workspace-group/composables/use-workspace-group-api.ts @@ -1,6 +1,5 @@ import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; -import { useAPIQueryKey } from '@/api-clients/_common/composables/use-api-query-key'; import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { WorkspaceGroupAddUsersParameters } from '@/api-clients/identity/workspace-group/schema/api-verbs/add-users'; import type { WorkspaceGroupCreateParameters } from '@/api-clients/identity/workspace-group/schema/api-verbs/create'; @@ -14,9 +13,6 @@ import type { WorkspaceGroupUpdateRoleParameters } from '@/api-clients/identity/ import type { WorkspaceGroupModel } from '@/api-clients/identity/workspace-group/schema/model'; export const useWorkspaceGroupApi = () => { - const workspaceGroupQueryKey = useAPIQueryKey('identity', 'workspace-group', 'get'); - const workspaceGroupListQueryKey = useAPIQueryKey('identity', 'workspace-group', 'list'); - const actions = { create: SpaceConnector.clientV2.identity.workspaceGroup.create, update: SpaceConnector.clientV2.identity.workspaceGroup.update, @@ -30,8 +26,6 @@ export const useWorkspaceGroupApi = () => { }; return { - workspaceGroupQueryKey, - workspaceGroupListQueryKey, workspaceGroupAPI: actions, }; }; diff --git a/apps/web/src/api-clients/identity/workspace-user/composables/use-workspace-user-api.ts b/apps/web/src/api-clients/identity/workspace-user/composables/use-workspace-user-api.ts index 1981d3e820..1136eeae6e 100644 --- a/apps/web/src/api-clients/identity/workspace-user/composables/use-workspace-user-api.ts +++ b/apps/web/src/api-clients/identity/workspace-user/composables/use-workspace-user-api.ts @@ -1,6 +1,5 @@ import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; -import { useAPIQueryKey } from '@/api-clients/_common/composables/use-api-query-key'; import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { WorkspaceUserCreateParameters } from '@/api-clients/identity/workspace-user/schema/api-verbs/create'; import type { FindWorkspaceUserParameters } from '@/api-clients/identity/workspace-user/schema/api-verbs/find'; @@ -9,9 +8,6 @@ import type { WorkspaceUserListParameters } from '@/api-clients/identity/workspa import type { WorkspaceUserModel } from '@/api-clients/identity/workspace-user/schema/model'; export const useWorkspaceUserApi = () => { - const workspaceUserQueryKey = useAPIQueryKey('identity', 'workspace-user', 'get'); - const workspaceUserListQueryKey = useAPIQueryKey('identity', 'workspace-user', 'list'); - const actions = { create: SpaceConnector.clientV2.identity.workspaceUser.create, get: SpaceConnector.clientV2.identity.workspaceUser.get, @@ -20,8 +16,6 @@ export const useWorkspaceUserApi = () => { }; return { - workspaceUserQueryKey, - workspaceUserListQueryKey, workspaceUserAPI: actions, }; }; diff --git a/apps/web/src/api-clients/identity/workspace/composables/use-workspace-api.ts b/apps/web/src/api-clients/identity/workspace/composables/use-workspace-api.ts index e2d4115f5b..83ee5f71de 100644 --- a/apps/web/src/api-clients/identity/workspace/composables/use-workspace-api.ts +++ b/apps/web/src/api-clients/identity/workspace/composables/use-workspace-api.ts @@ -1,6 +1,5 @@ import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; -import { useAPIQueryKey } from '@/api-clients/_common/composables/use-api-query-key'; import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { WorkspaceAddPackageParameters } from '@/api-clients/identity/workspace/schema/api-verbs/add-package'; import type { WorkspaceChangeWorkspaceGroupParameters } from '@/api-clients/identity/workspace/schema/api-verbs/change-workspace-group'; @@ -12,9 +11,6 @@ import type { WorkspaceUpdateParameters } from '@/api-clients/identity/workspace import type { WorkspaceModel } from '@/api-clients/identity/workspace/schema/model'; export const useWorkspaceApi = () => { - const workspaceQueryKey = useAPIQueryKey('identity', 'workspace', 'get'); - const workspaceListQueryKey = useAPIQueryKey('identity', 'workspace', 'list'); - const actions = { create: SpaceConnector.clientV2.identity.workspace.create, update: SpaceConnector.clientV2.identity.workspace.update, @@ -26,8 +22,6 @@ export const useWorkspaceApi = () => { }; return { - workspaceQueryKey, - workspaceListQueryKey, workspaceAPI: actions, }; }; diff --git a/apps/web/src/api-clients/inventory/metric-data/composables/use-metric-data-api.ts b/apps/web/src/api-clients/inventory/metric-data/composables/use-metric-data-api.ts index d23b8633d9..153dc8ab0b 100644 --- a/apps/web/src/api-clients/inventory/metric-data/composables/use-metric-data-api.ts +++ b/apps/web/src/api-clients/inventory/metric-data/composables/use-metric-data-api.ts @@ -11,12 +11,8 @@ import type { MetricDataModel } from '@/schema/inventory/metric-data/model'; export const useMetricDataApi = () => { const actions = { - async list(params: MetricDataListParameters) { - return SpaceConnector.clientV2.inventory.metricData.list>(params); - }, - async analyze(params: MetricDataAnalyzeParameters) { - return SpaceConnector.clientV2.inventory.metricData.analyze>(params); - }, + list: SpaceConnector.clientV2.inventory.metricData.list>, + analyze: SpaceConnector.clientV2.inventory.metricData.analyze>, }; return { diff --git a/apps/web/src/api-clients/opsflow/comment/composables/use-comment-api.ts b/apps/web/src/api-clients/opsflow/comment/composables/use-comment-api.ts index a48c00a006..b5574bf903 100644 --- a/apps/web/src/api-clients/opsflow/comment/composables/use-comment-api.ts +++ b/apps/web/src/api-clients/opsflow/comment/composables/use-comment-api.ts @@ -1,6 +1,5 @@ import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; -import { useAPIQueryKey } from '@/api-clients/_common/composables/use-api-query-key'; import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { CommentCreateParameters } from '@/api-clients/opsflow/comment/schema/api-verbs/create'; import type { CommentDeleteParameters } from '@/api-clients/opsflow/comment/schema/api-verbs/delete'; @@ -10,9 +9,6 @@ import type { CommentUpdateParameters } from '@/api-clients/opsflow/comment/sche import type { CommentModel } from '@/api-clients/opsflow/comment/schema/model'; export const useCommentApi = () => { - const commentQueryKey = useAPIQueryKey('opsflow', 'comment', 'get'); - const commentListQueryKey = useAPIQueryKey('opsflow', 'comment', 'list'); - const actions = { create: SpaceConnector.clientV2.opsflow.comment.create, update: SpaceConnector.clientV2.opsflow.comment.update, @@ -22,8 +18,6 @@ export const useCommentApi = () => { }; return { - commentQueryKey, - commentListQueryKey, commentAPI: actions, }; }; diff --git a/apps/web/src/api-clients/opsflow/event/composables/use-event-api.ts b/apps/web/src/api-clients/opsflow/event/composables/use-event-api.ts index 3a10564a88..af673ee3e3 100644 --- a/apps/web/src/api-clients/opsflow/event/composables/use-event-api.ts +++ b/apps/web/src/api-clients/opsflow/event/composables/use-event-api.ts @@ -1,19 +1,15 @@ import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; -import { useAPIQueryKey } from '@/api-clients/_common/composables/use-api-query-key'; import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { EventListParameters } from '@/api-clients/opsflow/event/schema/api-verbs/list'; import type { EventModel } from '@/api-clients/opsflow/event/schema/model'; export const useEventApi = () => { - const eventListQueryKey = useAPIQueryKey('opsflow', 'event', 'list'); - const actions = { list: SpaceConnector.clientV2.opsflow.event.list>, }; return { - eventListQueryKey, eventAPI: actions, }; }; diff --git a/apps/web/src/api-clients/opsflow/task-category/composables/use-task-category-api.ts b/apps/web/src/api-clients/opsflow/task-category/composables/use-task-category-api.ts index 9839b45774..cb69cf81ec 100644 --- a/apps/web/src/api-clients/opsflow/task-category/composables/use-task-category-api.ts +++ b/apps/web/src/api-clients/opsflow/task-category/composables/use-task-category-api.ts @@ -1,6 +1,5 @@ import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; -import { useAPIQueryKey } from '@/api-clients/_common/composables/use-api-query-key'; import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { TaskCategoryCreateParameters } from '@/api-clients/opsflow/task-category/schema/api-verbs/create'; import type { TaskCategoryDeleteParameters } from '@/api-clients/opsflow/task-category/schema/api-verbs/delete'; @@ -10,9 +9,6 @@ import type { TaskCategoryUpdateParameters } from '@/api-clients/opsflow/task-ca import type { TaskCategoryModel } from '@/api-clients/opsflow/task-category/schema/model'; export const useTaskCategoryApi = () => { - const taskCategoryQueryKey = useAPIQueryKey('opsflow', 'task-category', 'get'); - const taskCategoryListQueryKey = useAPIQueryKey('opsflow', 'task-category', 'list'); - const actions = { create: SpaceConnector.clientV2.opsflow.taskCategory.create, update: SpaceConnector.clientV2.opsflow.taskCategory.update, @@ -22,8 +18,6 @@ export const useTaskCategoryApi = () => { }; return { - taskCategoryQueryKey, - taskCategoryListQueryKey, taskCategoryAPI: actions, }; }; diff --git a/apps/web/src/api-clients/opsflow/task-type/composables/use-task-type-api.ts b/apps/web/src/api-clients/opsflow/task-type/composables/use-task-type-api.ts index 70a688ae0a..7e045ff1d2 100644 --- a/apps/web/src/api-clients/opsflow/task-type/composables/use-task-type-api.ts +++ b/apps/web/src/api-clients/opsflow/task-type/composables/use-task-type-api.ts @@ -1,6 +1,5 @@ import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; -import { useAPIQueryKey } from '@/api-clients/_common/composables/use-api-query-key'; import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { TaskTypeCreateParameters } from '@/api-clients/opsflow/task-type/schema/api-verbs/create'; import type { TaskTypeDeleteParameters } from '@/api-clients/opsflow/task-type/schema/api-verbs/delete'; @@ -11,9 +10,6 @@ import type { TaskTypeUpdateFieldsParameters } from '@/api-clients/opsflow/task- import type { TaskTypeModel } from '@/api-clients/opsflow/task-type/schema/model'; export const useTaskTypeApi = () => { - const taskTypeQueryKey = useAPIQueryKey('opsflow', 'task-type', 'get'); - const taskTypeListQueryKey = useAPIQueryKey('opsflow', 'task-type', 'list'); - const actions = { create: SpaceConnector.clientV2.opsflow.taskType.create, update: SpaceConnector.clientV2.opsflow.taskType.update, @@ -24,8 +20,6 @@ export const useTaskTypeApi = () => { }; return { - taskTypeQueryKey, - taskTypeListQueryKey, taskTypeAPI: actions, }; }; diff --git a/apps/web/src/api-clients/opsflow/task/composables/use-task-api.ts b/apps/web/src/api-clients/opsflow/task/composables/use-task-api.ts index 501cd4101e..7c2fcd17c2 100644 --- a/apps/web/src/api-clients/opsflow/task/composables/use-task-api.ts +++ b/apps/web/src/api-clients/opsflow/task/composables/use-task-api.ts @@ -1,6 +1,5 @@ import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; -import { useAPIQueryKey } from '@/api-clients/_common/composables/use-api-query-key'; import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { TaskChangeAssigneeParameters } from '@/api-clients/opsflow/task/schema/api-verbs/change-assignee'; import type { TaskChangeStatusParameters } from '@/api-clients/opsflow/task/schema/api-verbs/change-status'; @@ -13,9 +12,6 @@ import type { TaskUpdateDescriptionParameters } from '@/api-clients/opsflow/task import type { TaskModel } from '@/api-clients/opsflow/task/schema/model'; export const useTaskApi = () => { - const taskQueryKey = useAPIQueryKey('opsflow', 'task', 'get'); - const taskListQueryKey = useAPIQueryKey('opsflow', 'task', 'list'); - const actions = { create: SpaceConnector.clientV2.opsflow.task.create, update: SpaceConnector.clientV2.opsflow.task.update, @@ -28,8 +24,6 @@ export const useTaskApi = () => { }; return { - taskQueryKey, - taskListQueryKey, taskAPI: actions, }; }; diff --git a/apps/web/src/common/composables/global-dashboard/use-global-dashboard-query.ts b/apps/web/src/common/composables/global-dashboard/use-global-dashboard-query.ts new file mode 100644 index 0000000000..d7f5654ded --- /dev/null +++ b/apps/web/src/common/composables/global-dashboard/use-global-dashboard-query.ts @@ -0,0 +1,61 @@ +import { + computed, +} from 'vue'; + + +import { ApiQueryHelper } from '@cloudforet/core-lib/space-connector/helper'; + +import { usePrivateDashboardApi } from '@/api-clients/dashboard/private-dashboard/composables/use-private-dashboard-api'; +import { usePublicDashboardApi } from '@/api-clients/dashboard/public-dashboard/composables/use-public-dashboard-api'; +import { useScopedQuery } from '@/query/composables/use-scoped-query'; +import { useServiceQueryKey } from '@/query/query-key/use-service-query-key'; + +import { useAppContextStore } from '@/store/app-context/app-context-store'; + + +const DEFAULT_LIST_DATA = { results: [] }; +const STALE_TIME = 1000 * 60 * 5; + +const publicDashboardListApiQueryHelper = new ApiQueryHelper().addFilter({ k: 'resource_group', v: 'WORKSPACE', o: '=' }); + +export const useGlobalDashboardQuery = () => { + const { publicDashboardAPI } = usePublicDashboardApi(); + const { privateDashboardAPI } = usePrivateDashboardApi(); + + const appContextStore = useAppContextStore(); + const _isAdminMode = computed(() => appContextStore.getters.isAdminMode); + + /* Query Keys */ + const { key: publicDashboardListQueryKey, params: publicDashboardListParams } = useServiceQueryKey('dashboard', 'public-dashboard', 'list', { + params: computed(() => ({ + query: { + filter: publicDashboardListApiQueryHelper.data.filter, + }, + })), + }); + const { key: privateDashboardListQueryKey, params: privateDashboardListParams } = useServiceQueryKey('dashboard', 'private-dashboard', 'list', { + params: computed(() => ({})), + }); + + return { + publicDashboardListQuery: useScopedQuery({ + queryKey: publicDashboardListQueryKey, + queryFn: () => publicDashboardAPI.list(publicDashboardListParams.value), + select: (data) => data?.results ?? [], + initialData: DEFAULT_LIST_DATA, + initialDataUpdatedAt: 0, + staleTime: STALE_TIME, + enabled: computed(() => !_isAdminMode.value), + }, ['WORKSPACE']), + privateDashboardListQuery: useScopedQuery({ + queryKey: privateDashboardListQueryKey, + queryFn: () => privateDashboardAPI.list(privateDashboardListParams.value), + select: (data) => data?.results || [], + initialData: DEFAULT_LIST_DATA, + initialDataUpdatedAt: 0, + staleTime: STALE_TIME, + enabled: computed(() => !_isAdminMode.value), + }, ['WORKSPACE']), + }; +}; + diff --git a/apps/web/src/common/modules/favorites/favorite-button/FavoriteButton.vue b/apps/web/src/common/modules/favorites/favorite-button/FavoriteButton.vue index 0644fc399b..f0f20c78ef 100644 --- a/apps/web/src/common/modules/favorites/favorite-button/FavoriteButton.vue +++ b/apps/web/src/common/modules/favorites/favorite-button/FavoriteButton.vue @@ -35,12 +35,12 @@ import { convertServiceConfigToReferenceData, } from '@/lib/helper/config-data-helper'; +import { useGlobalDashboardQuery } from '@/common/composables/global-dashboard/use-global-dashboard-query'; import { useFavoriteStore } from '@/common/modules/favorites/favorite-button/store/favorite-store'; import type { FavoriteType, FavoriteConfig } from '@/common/modules/favorites/favorite-button/type'; import { FAVORITE_TYPE } from '@/common/modules/favorites/favorite-button/type'; import { useGnbStore } from '@/common/modules/navigations/stores/gnb-store'; -import { useDashboardQuery } from '@/services/dashboards/composables/use-dashboard-query'; interface Props { itemId: string; @@ -70,14 +70,14 @@ const displayStore = useDisplayStore(); /* Query */ const { - publicDashboardList, - privateDashboardList, -} = useDashboardQuery(); + publicDashboardListQuery, + privateDashboardListQuery, +} = useGlobalDashboardQuery(); const emit = defineEmits<{(e: 'click-favorite'): void; }>(); -const dashboardList = computed(() => [...publicDashboardList.value, ...privateDashboardList.value]); +const dashboardList = computed(() => [...(publicDashboardListQuery?.data?.value ?? []), ...(privateDashboardListQuery?.data?.value ?? [])]); const storeState = reactive({ favoriteMenuList: computed(() => favoriteStoreGetters.favoriteMenuList), favoriteWorkspaceMenuList: computed(() => favoriteStoreGetters.workspaceItems), diff --git a/apps/web/src/common/modules/navigations/top-bar/modules/top-bar-toolset/modules/top-bar-favorite/modules/TopBarFavoriteContextMenu.vue b/apps/web/src/common/modules/navigations/top-bar/modules/top-bar-toolset/modules/top-bar-favorite/modules/TopBarFavoriteContextMenu.vue index 07c40ad50a..43b2cdb851 100644 --- a/apps/web/src/common/modules/navigations/top-bar/modules/top-bar-toolset/modules/top-bar-favorite/modules/TopBarFavoriteContextMenu.vue +++ b/apps/web/src/common/modules/navigations/top-bar/modules/top-bar-toolset/modules/top-bar-favorite/modules/TopBarFavoriteContextMenu.vue @@ -43,6 +43,7 @@ import type { MenuInfo } from '@/lib/menu/config'; import { MENU_ID } from '@/lib/menu/config'; import { MENU_INFO_MAP } from '@/lib/menu/menu-info'; +import { useGlobalDashboardQuery } from '@/common/composables/global-dashboard/use-global-dashboard-query'; import { useGrantScopeGuard } from '@/common/composables/grant-scope-guard'; import { useFavoriteStore } from '@/common/modules/favorites/favorite-button/store/favorite-store'; import { FAVORITE_TYPE } from '@/common/modules/favorites/favorite-button/type'; @@ -52,7 +53,6 @@ import TopBarSuggestionList from '@/common/modules/navigations/top-bar/modules/T import { ASSET_INVENTORY_ROUTE } from '@/services/asset-inventory/routes/route-constant'; import { COST_EXPLORER_ROUTE } from '@/services/cost-explorer/routes/route-constant'; -import { useDashboardQuery } from '@/services/dashboards/composables/use-dashboard-query'; import { DASHBOARDS_ROUTE } from '@/services/dashboards/routes/route-constant'; import { PROJECT_ROUTE_V2 } from '@/services/project/v2/routes/route-constant'; @@ -85,14 +85,14 @@ const { getReferenceLocation } = useReferenceRouter(); /* Query */ const { - publicDashboardList, - privateDashboardList, -} = useDashboardQuery(); + publicDashboardListQuery, + privateDashboardListQuery, +} = useGlobalDashboardQuery(); const router = useRouter(); const route = useRoute(); -const dashboardList = computed(() => [...publicDashboardList.value, ...privateDashboardList.value]); +const dashboardList = computed(() => [...(publicDashboardListQuery?.data?.value ?? []), ...(privateDashboardListQuery?.data?.value ?? [])]); const storeState = reactive({ currentWorkspaceId: computed(() => userWorkspaceStore.getters.currentWorkspaceId), costDataSource: computed(() => allReferenceStore.getters.costDataSource), diff --git a/apps/web/src/services/ops-flow/components/BoardTaskComment.vue b/apps/web/src/services/ops-flow/components/BoardTaskComment.vue index fca1974dbe..b3b5777b67 100644 --- a/apps/web/src/services/ops-flow/components/BoardTaskComment.vue +++ b/apps/web/src/services/ops-flow/components/BoardTaskComment.vue @@ -1,7 +1,6 @@