diff --git a/apps/web/src/api-clients/_common/constants/api-doc-constant.ts b/apps/web/src/api-clients/_common/constants/api-doc-constant.ts index 88f14c4551..cd43eb74d0 100644 --- a/apps/web/src/api-clients/_common/constants/api-doc-constant.ts +++ b/apps/web/src/api-clients/_common/constants/api-doc-constant.ts @@ -183,6 +183,7 @@ export const API_DOC = { ], 'cost-report-config': [ 'list', + 'run', 'update-recipients', 'update', ], @@ -190,22 +191,6 @@ export const API_DOC = { 'analyze', 'list', ], - 'report-adjustment-policy': [ - 'create', - 'delete', - 'get', - 'list', - 'update', - 'change-order', - ], - 'report-adjustment': [ - 'create', - 'delete', - 'get', - 'list', - 'update', - 'change-order', - ], 'data-source': [ 'get', 'list', @@ -222,6 +207,23 @@ export const API_DOC = { 'cancel', 'list', ], + 'report-adjustment': [ + 'change-order', + 'create', + 'delete', + 'get', + 'list', + 'update', + ], + 'report-adjustment-policy': [ + 'change-order', + 'create', + 'delete', + 'get', + 'list', + 'sync-currency', + 'update', + ], 'unified-cost': [ 'analyze', 'get', @@ -488,9 +490,45 @@ export const API_DOC = { ], }, inventory: { + 'cloud-service': [ + 'analyze', + 'get', + 'list', + ], + 'cloud-service-query-set': [ + 'list', + ], + 'cloud-service-type': [ + 'list', + 'stat', + ], + collector: [ + 'collect', + 'create', + 'delete', + 'get', + 'list', + 'update-plugin', + 'update', + ], + metric: [ + 'create', + 'delete', + 'get', + 'list', + 'run', + 'update', + ], 'metric-data': [ 'analyze', ], + namespace: [ + 'get', + 'list', + ], + region: [ + 'list', + ], }, monitoring: { alert: [ @@ -607,6 +645,24 @@ export const API_DOC = { 'list', 'register', ], + plugin: [ + 'deregister', + 'disable', + 'enable', + 'get-versions', + 'get', + 'list', + 'register', + 'stat', + 'update', + ], + }, + secret: { + secret: [ + 'create', + 'get', + 'list', + ], }, } as const; export type APIDoc = typeof API_DOC; diff --git a/apps/web/src/api-clients/inventory/cloud-service-query-set/composables/use-cloud-service-query-set-api.ts b/apps/web/src/api-clients/inventory/cloud-service-query-set/composables/use-cloud-service-query-set-api.ts new file mode 100644 index 0000000000..33ab353b45 --- /dev/null +++ b/apps/web/src/api-clients/inventory/cloud-service-query-set/composables/use-cloud-service-query-set-api.ts @@ -0,0 +1,14 @@ +import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; + +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; +import type { CloudServiceQuerySetListParameters } from '@/api-clients/inventory/cloud-service-query-set/schema/api-verbs/list'; +import type { CloudServiceQuerySetModel } from '@/api-clients/inventory/cloud-service-query-set/schema/model'; + +export const useCloudServiceQuerySetApi = () => { + const actions = { + list: SpaceConnector.clientV2.inventory.cloudServiceQuerySet.list>, + }; + return { + cloudServiceQuerySetAPI: actions, + }; +}; diff --git a/apps/web/src/schema/inventory/cloud-service-query-set/api-verbs/list.ts b/apps/web/src/api-clients/inventory/cloud-service-query-set/schema/api-verbs/list.ts similarity index 86% rename from apps/web/src/schema/inventory/cloud-service-query-set/api-verbs/list.ts rename to apps/web/src/api-clients/inventory/cloud-service-query-set/schema/api-verbs/list.ts index 6325c2fd74..524af2d050 100644 --- a/apps/web/src/schema/inventory/cloud-service-query-set/api-verbs/list.ts +++ b/apps/web/src/api-clients/inventory/cloud-service-query-set/schema/api-verbs/list.ts @@ -1,6 +1,6 @@ import type { Query } from '@cloudforet/core-lib/space-connector/type'; -import type { CloudServiceQueryType, CloudServiceQuerySetState } from '@/schema/inventory/cloud-service-query-set/type'; +import type { CloudServiceQueryType, CloudServiceQuerySetState } from '@/api-clients/inventory/cloud-service-query-set/schema/type'; export interface CloudServiceQuerySetListParameters { diff --git a/apps/web/src/schema/inventory/cloud-service-query-set/model.ts b/apps/web/src/api-clients/inventory/cloud-service-query-set/schema/model.ts similarity index 91% rename from apps/web/src/schema/inventory/cloud-service-query-set/model.ts rename to apps/web/src/api-clients/inventory/cloud-service-query-set/schema/model.ts index 6d1739e9f6..e2a87673cb 100644 --- a/apps/web/src/schema/inventory/cloud-service-query-set/model.ts +++ b/apps/web/src/api-clients/inventory/cloud-service-query-set/schema/model.ts @@ -1,6 +1,6 @@ import type { Tags } from '@/api-clients/_common/schema/model'; import type { ResourceGroupType } from '@/api-clients/_common/schema/type'; -import type { CloudServiceQueryType, CloudServiceQuerySetState } from '@/schema/inventory/cloud-service-query-set/type'; +import type { CloudServiceQueryType, CloudServiceQuerySetState } from '@/api-clients/inventory/cloud-service-query-set/schema/type'; export interface CloudServiceQuerySetModel { query_set_id: string; diff --git a/apps/web/src/schema/inventory/cloud-service-query-set/type.ts b/apps/web/src/api-clients/inventory/cloud-service-query-set/schema/type.ts similarity index 100% rename from apps/web/src/schema/inventory/cloud-service-query-set/type.ts rename to apps/web/src/api-clients/inventory/cloud-service-query-set/schema/type.ts diff --git a/apps/web/src/api-clients/inventory/cloud-service-type/composables/use-cloud-service-type-api.ts b/apps/web/src/api-clients/inventory/cloud-service-type/composables/use-cloud-service-type-api.ts new file mode 100644 index 0000000000..b9e0fafd85 --- /dev/null +++ b/apps/web/src/api-clients/inventory/cloud-service-type/composables/use-cloud-service-type-api.ts @@ -0,0 +1,18 @@ +import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; + +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; +import type { CloudServiceTypeListParameters } from '@/api-clients/inventory/cloud-service-type/schema/api-verbs/list'; +import type { CloudServiceTypeStatParameters } from '@/api-clients/inventory/cloud-service-type/schema/api-verbs/stat'; +import type { CloudServiceTypeModel } from '@/api-clients/inventory/cloud-service-type/schema/model'; + + +export const useCloudServiceTypeApi = () => { + const actions = { + list: SpaceConnector.clientV2.inventory.cloudServiceType.list>, + stat: SpaceConnector.clientV2.inventory.cloudServiceType.stat, + }; + + return { + cloudServiceTypeAPI: actions, + }; +}; diff --git a/apps/web/src/schema/inventory/cloud-service-type/api-verbs/list.ts b/apps/web/src/api-clients/inventory/cloud-service-type/schema/api-verbs/list.ts similarity index 100% rename from apps/web/src/schema/inventory/cloud-service-type/api-verbs/list.ts rename to apps/web/src/api-clients/inventory/cloud-service-type/schema/api-verbs/list.ts diff --git a/apps/web/src/schema/inventory/cloud-service-type/api-verbs/stat.ts b/apps/web/src/api-clients/inventory/cloud-service-type/schema/api-verbs/stat.ts similarity index 100% rename from apps/web/src/schema/inventory/cloud-service-type/api-verbs/stat.ts rename to apps/web/src/api-clients/inventory/cloud-service-type/schema/api-verbs/stat.ts diff --git a/apps/web/src/schema/inventory/cloud-service-type/model.ts b/apps/web/src/api-clients/inventory/cloud-service-type/schema/model.ts similarity index 100% rename from apps/web/src/schema/inventory/cloud-service-type/model.ts rename to apps/web/src/api-clients/inventory/cloud-service-type/schema/model.ts diff --git a/apps/web/src/api-clients/inventory/cloud-service/composables/use-cloud-service-api.ts b/apps/web/src/api-clients/inventory/cloud-service/composables/use-cloud-service-api.ts new file mode 100644 index 0000000000..41cb35b9c3 --- /dev/null +++ b/apps/web/src/api-clients/inventory/cloud-service/composables/use-cloud-service-api.ts @@ -0,0 +1,18 @@ +import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; + +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; +import type { CloudServiceAnalyzeParameters } from '@/api-clients/inventory/cloud-service/schema/api-verbs/analyze'; +import type { CloudServiceGetParameters } from '@/api-clients/inventory/cloud-service/schema/api-verbs/get'; +import type { CloudServiceListParameters } from '@/api-clients/inventory/cloud-service/schema/api-verbs/list'; +import type { CloudServiceModel } from '@/api-clients/inventory/cloud-service/schema/model'; + +export const useCloudServiceApi = () => { + const actions = { + analyze: SpaceConnector.clientV2.inventory.cloudService.analyze, + get: SpaceConnector.clientV2.inventory.cloudService.get, + list: SpaceConnector.clientV2.inventory.cloudService.list>, + }; + return { + cloudServiceAPI: actions, + }; +}; diff --git a/apps/web/src/schema/inventory/cloud-service/api-verbs/analyze.ts b/apps/web/src/api-clients/inventory/cloud-service/schema/api-verbs/analyze.ts similarity index 100% rename from apps/web/src/schema/inventory/cloud-service/api-verbs/analyze.ts rename to apps/web/src/api-clients/inventory/cloud-service/schema/api-verbs/analyze.ts diff --git a/apps/web/src/schema/inventory/cloud-service/api-verbs/get.ts b/apps/web/src/api-clients/inventory/cloud-service/schema/api-verbs/get.ts similarity index 100% rename from apps/web/src/schema/inventory/cloud-service/api-verbs/get.ts rename to apps/web/src/api-clients/inventory/cloud-service/schema/api-verbs/get.ts diff --git a/apps/web/src/schema/inventory/cloud-service/api-verbs/list.ts b/apps/web/src/api-clients/inventory/cloud-service/schema/api-verbs/list.ts similarity index 100% rename from apps/web/src/schema/inventory/cloud-service/api-verbs/list.ts rename to apps/web/src/api-clients/inventory/cloud-service/schema/api-verbs/list.ts diff --git a/apps/web/src/schema/inventory/cloud-service/model.ts b/apps/web/src/api-clients/inventory/cloud-service/schema/model.ts similarity index 88% rename from apps/web/src/schema/inventory/cloud-service/model.ts rename to apps/web/src/api-clients/inventory/cloud-service/schema/model.ts index 0419954449..eaefe0d4dd 100644 --- a/apps/web/src/schema/inventory/cloud-service/model.ts +++ b/apps/web/src/api-clients/inventory/cloud-service/schema/model.ts @@ -1,5 +1,5 @@ import type { Tags } from '@/api-clients/_common/schema/model'; -import type { CloudServiceState } from '@/schema/inventory/cloud-service/type'; +import type { CloudServiceState } from '@/api-clients/inventory/cloud-service/schema/type'; export interface CloudServiceModel { cloud_service_id:string; diff --git a/apps/web/src/schema/inventory/cloud-service/type.ts b/apps/web/src/api-clients/inventory/cloud-service/schema/type.ts similarity index 100% rename from apps/web/src/schema/inventory/cloud-service/type.ts rename to apps/web/src/api-clients/inventory/cloud-service/schema/type.ts diff --git a/apps/web/src/api-clients/inventory/collector/composables/use-collector-api.ts b/apps/web/src/api-clients/inventory/collector/composables/use-collector-api.ts new file mode 100644 index 0000000000..4b0030adf8 --- /dev/null +++ b/apps/web/src/api-clients/inventory/collector/composables/use-collector-api.ts @@ -0,0 +1,29 @@ +import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; + +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; +import type { CollectorCollectParameters } from '@/api-clients/inventory/collector/schema/api-verbs/collect'; +import type { CollectorCreateParameters } from '@/api-clients/inventory/collector/schema/api-verbs/create'; +import type { CollectorDeleteParameters } from '@/api-clients/inventory/collector/schema/api-verbs/delete'; +import type { CollectorGetParameters } from '@/api-clients/inventory/collector/schema/api-verbs/get'; +import type { CollectorListParameters } from '@/api-clients/inventory/collector/schema/api-verbs/list'; +import type { CollectorUpdateParameters } from '@/api-clients/inventory/collector/schema/api-verbs/update'; +import type { CollectorUpdatePluginParameters } from '@/api-clients/inventory/collector/schema/api-verbs/update-plugin'; +import type { CollectorModel } from '@/api-clients/inventory/collector/schema/model'; +import type { JobModel } from '@/schema/inventory/job/model'; + + +export const useCollectorApi = () => { + const actions = { + collect: SpaceConnector.clientV2.inventory.collector.collect, + create: SpaceConnector.clientV2.inventory.collector.create, + delete: SpaceConnector.clientV2.inventory.collector.delete, + get: SpaceConnector.clientV2.inventory.collector.get, + list: SpaceConnector.clientV2.inventory.collector.list>, + update: SpaceConnector.clientV2.inventory.collector.update, + updatePlugin: SpaceConnector.clientV2.inventory.collector.updatePlugin, + }; + + return { + collectorAPI: actions, + }; +}; diff --git a/apps/web/src/schema/inventory/collector/api-verbs/collect.ts b/apps/web/src/api-clients/inventory/collector/schema/api-verbs/collect.ts similarity index 100% rename from apps/web/src/schema/inventory/collector/api-verbs/collect.ts rename to apps/web/src/api-clients/inventory/collector/schema/api-verbs/collect.ts diff --git a/apps/web/src/schema/inventory/collector/api-verbs/create.ts b/apps/web/src/api-clients/inventory/collector/schema/api-verbs/create.ts similarity index 74% rename from apps/web/src/schema/inventory/collector/api-verbs/create.ts rename to apps/web/src/api-clients/inventory/collector/schema/api-verbs/create.ts index 9e2955ae7b..bd5af2b0a2 100644 --- a/apps/web/src/schema/inventory/collector/api-verbs/create.ts +++ b/apps/web/src/api-clients/inventory/collector/schema/api-verbs/create.ts @@ -1,7 +1,7 @@ import type { Tags } from '@/api-clients/_common/schema/model'; import type { ResourceGroupType } from '@/api-clients/_common/schema/type'; -import type { CollectorPluginInfo } from '@/schema/inventory/collector/model'; -import type { Schedule, SecretFilter } from '@/schema/inventory/collector/type'; +import type { CollectorPluginInfo } from '@/api-clients/inventory/collector/schema/model'; +import type { Schedule, SecretFilter } from '@/api-clients/inventory/collector/schema/type'; export interface CollectorCreateParameters { name: string; diff --git a/apps/web/src/schema/inventory/collector/api-verbs/delete.ts b/apps/web/src/api-clients/inventory/collector/schema/api-verbs/delete.ts similarity index 100% rename from apps/web/src/schema/inventory/collector/api-verbs/delete.ts rename to apps/web/src/api-clients/inventory/collector/schema/api-verbs/delete.ts diff --git a/apps/web/src/schema/inventory/collector/api-verbs/get.ts b/apps/web/src/api-clients/inventory/collector/schema/api-verbs/get.ts similarity index 100% rename from apps/web/src/schema/inventory/collector/api-verbs/get.ts rename to apps/web/src/api-clients/inventory/collector/schema/api-verbs/get.ts diff --git a/apps/web/src/schema/inventory/collector/api-verbs/list.ts b/apps/web/src/api-clients/inventory/collector/schema/api-verbs/list.ts similarity index 78% rename from apps/web/src/schema/inventory/collector/api-verbs/list.ts rename to apps/web/src/api-clients/inventory/collector/schema/api-verbs/list.ts index 15a36e8180..fecfabe37f 100644 --- a/apps/web/src/schema/inventory/collector/api-verbs/list.ts +++ b/apps/web/src/api-clients/inventory/collector/schema/api-verbs/list.ts @@ -1,6 +1,6 @@ import type { Query } from '@cloudforet/core-lib/space-connector/type'; -import type { ScheduleState } from '@/schema/inventory/collector/type'; +import type { ScheduleState } from '@/api-clients/inventory/collector/schema/type'; export interface CollectorListParameters { query?: Query; diff --git a/apps/web/src/schema/inventory/collector/api-verbs/update-plugin.ts b/apps/web/src/api-clients/inventory/collector/schema/api-verbs/update-plugin.ts similarity index 76% rename from apps/web/src/schema/inventory/collector/api-verbs/update-plugin.ts rename to apps/web/src/api-clients/inventory/collector/schema/api-verbs/update-plugin.ts index 944ba447f3..9351aee9bd 100644 --- a/apps/web/src/schema/inventory/collector/api-verbs/update-plugin.ts +++ b/apps/web/src/api-clients/inventory/collector/schema/api-verbs/update-plugin.ts @@ -1,4 +1,4 @@ -import type { CollectorOptions } from '@/schema/inventory/collector/type'; +import type { CollectorOptions } from '@/api-clients/inventory/collector/schema/type'; import type { UpgradeMode } from '@/schema/plugin/plugin/type'; export interface CollectorUpdatePluginParameters { diff --git a/apps/web/src/schema/inventory/collector/api-verbs/update.ts b/apps/web/src/api-clients/inventory/collector/schema/api-verbs/update.ts similarity index 79% rename from apps/web/src/schema/inventory/collector/api-verbs/update.ts rename to apps/web/src/api-clients/inventory/collector/schema/api-verbs/update.ts index d1c9321ef9..7a43826836 100644 --- a/apps/web/src/schema/inventory/collector/api-verbs/update.ts +++ b/apps/web/src/api-clients/inventory/collector/schema/api-verbs/update.ts @@ -1,5 +1,5 @@ import type { Tags } from '@/api-clients/_common/schema/model'; -import type { Schedule, SecretFilter } from '@/schema/inventory/collector/type'; +import type { Schedule, SecretFilter } from '@/api-clients/inventory/collector/schema/type'; // collector api parameters export interface CollectorUpdateParameters { diff --git a/apps/web/src/schema/inventory/collector/constant.ts b/apps/web/src/api-clients/inventory/collector/schema/constant.ts similarity index 100% rename from apps/web/src/schema/inventory/collector/constant.ts rename to apps/web/src/api-clients/inventory/collector/schema/constant.ts diff --git a/apps/web/src/schema/inventory/collector/model.ts b/apps/web/src/api-clients/inventory/collector/schema/model.ts similarity index 86% rename from apps/web/src/schema/inventory/collector/model.ts rename to apps/web/src/api-clients/inventory/collector/schema/model.ts index f33f743596..9a335d4e78 100644 --- a/apps/web/src/schema/inventory/collector/model.ts +++ b/apps/web/src/api-clients/inventory/collector/schema/model.ts @@ -2,9 +2,9 @@ import type { Tags } from '@/api-clients/_common/schema/model'; import type { ResourceGroupType } from '@/api-clients/_common/schema/type'; import type { CollectorMetadata, CollectorOptions, Schedule, SecretFilter, -} from '@/schema/inventory/collector/type'; +} from '@/api-clients/inventory/collector/schema/type'; +import type { Capability } from '@/api-clients/repository/plugin/schema/type'; import type { UpgradeMode } from '@/schema/plugin/plugin/type'; -import type { Capability } from '@/schema/repository/plugin/type'; export interface CollectorPluginInfo { diff --git a/apps/web/src/schema/inventory/collector/type.ts b/apps/web/src/api-clients/inventory/collector/schema/type.ts similarity index 88% rename from apps/web/src/schema/inventory/collector/type.ts rename to apps/web/src/api-clients/inventory/collector/schema/type.ts index 1fcf048c03..33b8219af1 100644 --- a/apps/web/src/schema/inventory/collector/type.ts +++ b/apps/web/src/api-clients/inventory/collector/schema/type.ts @@ -1,6 +1,6 @@ import type { JsonSchema } from '@cloudforet/mirinae/types/controls/forms/json-schema-form/type'; -import type { STATE } from '@/schema/inventory/collector/constant'; +import type { STATE } from '@/api-clients/inventory/collector/schema/constant'; export interface CollectorOptions { [key: string]: any; diff --git a/apps/web/src/api-clients/inventory/metric/composables/use-metric-api.ts b/apps/web/src/api-clients/inventory/metric/composables/use-metric-api.ts new file mode 100644 index 0000000000..80f39ad737 --- /dev/null +++ b/apps/web/src/api-clients/inventory/metric/composables/use-metric-api.ts @@ -0,0 +1,25 @@ +import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; + +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; +import type { MetricCreateParameters } from '@/api-clients/inventory/metric/schema/api-verbs/create'; +import type { MetricDeleteParameters } from '@/api-clients/inventory/metric/schema/api-verbs/delete'; +import type { MetricGetParameters } from '@/api-clients/inventory/metric/schema/api-verbs/get'; +import type { MetricListParameters } from '@/api-clients/inventory/metric/schema/api-verbs/list'; +import type { MetricRunParameters } from '@/api-clients/inventory/metric/schema/api-verbs/run'; +import type { MetricUpdateParameters } from '@/api-clients/inventory/metric/schema/api-verbs/update'; +import type { MetricModel } from '@/api-clients/inventory/metric/schema/model'; + +export const useMetricApi = () => { + const actions = { + create: SpaceConnector.clientV2.inventory.metric.create, + delete: SpaceConnector.clientV2.inventory.metric.delete, + get: SpaceConnector.clientV2.inventory.metric.get, + run: SpaceConnector.clientV2.inventory.metric.run, + update: SpaceConnector.clientV2.inventory.metric.update, + list: SpaceConnector.clientV2.inventory.metric.list>, + }; + + return { + metricAPI: actions, + }; +}; diff --git a/apps/web/src/schema/inventory/metric/api-verbs/create.ts b/apps/web/src/api-clients/inventory/metric/schema/api-verbs/create.ts similarity index 84% rename from apps/web/src/schema/inventory/metric/api-verbs/create.ts rename to apps/web/src/api-clients/inventory/metric/schema/api-verbs/create.ts index 50b2ce7e5a..e95b24fae6 100644 --- a/apps/web/src/schema/inventory/metric/api-verbs/create.ts +++ b/apps/web/src/api-clients/inventory/metric/schema/api-verbs/create.ts @@ -1,6 +1,6 @@ import type { Tags } from '@/api-clients/_common/schema/model'; import type { ResourceGroupType } from '@/api-clients/_common/schema/type'; -import type { MetricType } from '@/schema/inventory/metric/type'; +import type { MetricType } from '@/api-clients/inventory/metric/schema/type'; export interface MetricCreateParameters { diff --git a/apps/web/src/schema/inventory/metric/api-verbs/delete.ts b/apps/web/src/api-clients/inventory/metric/schema/api-verbs/delete.ts similarity index 100% rename from apps/web/src/schema/inventory/metric/api-verbs/delete.ts rename to apps/web/src/api-clients/inventory/metric/schema/api-verbs/delete.ts diff --git a/apps/web/src/schema/inventory/metric/api-verbs/get.ts b/apps/web/src/api-clients/inventory/metric/schema/api-verbs/get.ts similarity index 100% rename from apps/web/src/schema/inventory/metric/api-verbs/get.ts rename to apps/web/src/api-clients/inventory/metric/schema/api-verbs/get.ts diff --git a/apps/web/src/schema/inventory/metric/api-verbs/list.ts b/apps/web/src/api-clients/inventory/metric/schema/api-verbs/list.ts similarity index 66% rename from apps/web/src/schema/inventory/metric/api-verbs/list.ts rename to apps/web/src/api-clients/inventory/metric/schema/api-verbs/list.ts index 34e2538a22..53fa70ab5e 100644 --- a/apps/web/src/schema/inventory/metric/api-verbs/list.ts +++ b/apps/web/src/api-clients/inventory/metric/schema/api-verbs/list.ts @@ -1,7 +1,7 @@ import type { Query } from '@cloudforet/core-lib/space-connector/type'; -import type { MetricType } from '@/schema/inventory/metric/type'; -import type { NamespaceCategory } from '@/schema/inventory/namespace/type'; +import type { MetricType } from '@/api-clients/inventory/metric/schema/type'; +import type { NamespaceCategory } from '@/api-clients/inventory/namespace/schema/type'; export interface MetricListParameters { diff --git a/apps/web/src/schema/inventory/metric/api-verbs/run.ts b/apps/web/src/api-clients/inventory/metric/schema/api-verbs/run.ts similarity index 100% rename from apps/web/src/schema/inventory/metric/api-verbs/run.ts rename to apps/web/src/api-clients/inventory/metric/schema/api-verbs/run.ts diff --git a/apps/web/src/schema/inventory/metric/api-verbs/update.ts b/apps/web/src/api-clients/inventory/metric/schema/api-verbs/update.ts similarity index 100% rename from apps/web/src/schema/inventory/metric/api-verbs/update.ts rename to apps/web/src/api-clients/inventory/metric/schema/api-verbs/update.ts diff --git a/apps/web/src/schema/inventory/metric/constant.ts b/apps/web/src/api-clients/inventory/metric/schema/constant.ts similarity index 100% rename from apps/web/src/schema/inventory/metric/constant.ts rename to apps/web/src/api-clients/inventory/metric/schema/constant.ts diff --git a/apps/web/src/schema/inventory/metric/model.ts b/apps/web/src/api-clients/inventory/metric/schema/model.ts similarity index 84% rename from apps/web/src/schema/inventory/metric/model.ts rename to apps/web/src/api-clients/inventory/metric/schema/model.ts index a2615a5812..43a51c7327 100644 --- a/apps/web/src/schema/inventory/metric/model.ts +++ b/apps/web/src/api-clients/inventory/metric/schema/model.ts @@ -1,5 +1,5 @@ import type { Tags } from '@/api-clients/_common/schema/model'; -import type { MetricType, MetricLabelKey } from '@/schema/inventory/metric/type'; +import type { MetricType, MetricLabelKey } from '@/api-clients/inventory/metric/schema/type'; export interface MetricModel { diff --git a/apps/web/src/schema/inventory/metric/type.ts b/apps/web/src/api-clients/inventory/metric/schema/type.ts similarity index 77% rename from apps/web/src/schema/inventory/metric/type.ts rename to apps/web/src/api-clients/inventory/metric/schema/type.ts index 108d75b9ae..7a210c87f5 100644 --- a/apps/web/src/schema/inventory/metric/type.ts +++ b/apps/web/src/api-clients/inventory/metric/schema/type.ts @@ -1,4 +1,4 @@ -import type { METRIC_TYPE } from '@/schema/inventory/metric/constant'; +import type { METRIC_TYPE } from '@/api-clients/inventory/metric/schema/constant'; export type MetricType = typeof METRIC_TYPE[keyof typeof METRIC_TYPE]; diff --git a/apps/web/src/api-clients/inventory/namespace/composables/use-namespace-api.ts b/apps/web/src/api-clients/inventory/namespace/composables/use-namespace-api.ts new file mode 100644 index 0000000000..ffe286d198 --- /dev/null +++ b/apps/web/src/api-clients/inventory/namespace/composables/use-namespace-api.ts @@ -0,0 +1,17 @@ +import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; + +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; +import type { NamespaceGetParameters } from '@/api-clients/inventory/namespace/schema/api-verbs/get'; +import type { NamespaceListParameters } from '@/api-clients/inventory/namespace/schema/api-verbs/list'; +import type { NamespaceModel } from '@/api-clients/inventory/namespace/schema/model'; + +export const useNamespaceApi = () => { + const actions = { + get: SpaceConnector.clientV2.inventory.namespace.get, + list: SpaceConnector.clientV2.inventory.namespace.list>, + }; + + return { + namespaceAPI: actions, + }; +}; diff --git a/apps/web/src/schema/inventory/namespace/api-verbs/get.ts b/apps/web/src/api-clients/inventory/namespace/schema/api-verbs/get.ts similarity index 100% rename from apps/web/src/schema/inventory/namespace/api-verbs/get.ts rename to apps/web/src/api-clients/inventory/namespace/schema/api-verbs/get.ts diff --git a/apps/web/src/schema/inventory/namespace/api-verbs/list.ts b/apps/web/src/api-clients/inventory/namespace/schema/api-verbs/list.ts similarity index 74% rename from apps/web/src/schema/inventory/namespace/api-verbs/list.ts rename to apps/web/src/api-clients/inventory/namespace/schema/api-verbs/list.ts index 2adc1b0c5e..a3e0647de1 100644 --- a/apps/web/src/schema/inventory/namespace/api-verbs/list.ts +++ b/apps/web/src/api-clients/inventory/namespace/schema/api-verbs/list.ts @@ -1,6 +1,6 @@ import type { Query } from '@cloudforet/core-lib/space-connector/type'; -import type { NamespaceCategory, NamespaceGroup } from '@/schema/inventory/namespace/type'; +import type { NamespaceCategory, NamespaceGroup } from '@/api-clients/inventory/namespace/schema/type'; export interface NamespaceListParameters { diff --git a/apps/web/src/schema/inventory/namespace/constant.ts b/apps/web/src/api-clients/inventory/namespace/schema/constant.ts similarity index 100% rename from apps/web/src/schema/inventory/namespace/constant.ts rename to apps/web/src/api-clients/inventory/namespace/schema/constant.ts diff --git a/apps/web/src/schema/inventory/namespace/model.ts b/apps/web/src/api-clients/inventory/namespace/schema/model.ts similarity index 76% rename from apps/web/src/schema/inventory/namespace/model.ts rename to apps/web/src/api-clients/inventory/namespace/schema/model.ts index 90f2feae1f..0ccc5edbff 100644 --- a/apps/web/src/schema/inventory/namespace/model.ts +++ b/apps/web/src/api-clients/inventory/namespace/schema/model.ts @@ -1,5 +1,5 @@ import type { Tags } from '@/api-clients/_common/schema/model'; -import type { NamespaceCategory, NamespaceGroup } from '@/schema/inventory/namespace/type'; +import type { NamespaceCategory, NamespaceGroup } from '@/api-clients/inventory/namespace/schema/type'; export interface NamespaceModel { diff --git a/apps/web/src/schema/inventory/namespace/type.ts b/apps/web/src/api-clients/inventory/namespace/schema/type.ts similarity index 68% rename from apps/web/src/schema/inventory/namespace/type.ts rename to apps/web/src/api-clients/inventory/namespace/schema/type.ts index 535d59eb93..302a9b8200 100644 --- a/apps/web/src/schema/inventory/namespace/type.ts +++ b/apps/web/src/api-clients/inventory/namespace/schema/type.ts @@ -1,4 +1,4 @@ -import type { NAMESPACE_CATEGORY } from '@/schema/inventory/namespace/constant'; +import type { NAMESPACE_CATEGORY } from '@/api-clients/inventory/namespace/schema/constant'; export type NamespaceCategory = typeof NAMESPACE_CATEGORY[keyof typeof NAMESPACE_CATEGORY]; diff --git a/apps/web/src/api-clients/inventory/region/composables/use-region-api.ts b/apps/web/src/api-clients/inventory/region/composables/use-region-api.ts new file mode 100644 index 0000000000..ce0e11ffbc --- /dev/null +++ b/apps/web/src/api-clients/inventory/region/composables/use-region-api.ts @@ -0,0 +1,15 @@ +import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; + +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; +import type { RegionListParameters } from '@/api-clients/inventory/region/schema/api-verbs/list'; +import type { RegionModel } from '@/api-clients/inventory/region/schema/model'; + +export const useRegionApi = () => { + const actions = { + list: SpaceConnector.clientV2.inventory.region.list>, + }; + + return { + regionAPI: actions, + }; +}; diff --git a/apps/web/src/schema/inventory/region/api-verbs/list.ts b/apps/web/src/api-clients/inventory/region/schema/api-verbs/list.ts similarity index 100% rename from apps/web/src/schema/inventory/region/api-verbs/list.ts rename to apps/web/src/api-clients/inventory/region/schema/api-verbs/list.ts diff --git a/apps/web/src/schema/inventory/region/model.ts b/apps/web/src/api-clients/inventory/region/schema/model.ts similarity index 100% rename from apps/web/src/schema/inventory/region/model.ts rename to apps/web/src/api-clients/inventory/region/schema/model.ts diff --git a/apps/web/src/api-clients/monitoring/escalation-policy/composables/use-escalation-policy-api.ts b/apps/web/src/api-clients/monitoring/escalation-policy/composables/use-escalation-policy-api.ts new file mode 100644 index 0000000000..034ef70877 --- /dev/null +++ b/apps/web/src/api-clients/monitoring/escalation-policy/composables/use-escalation-policy-api.ts @@ -0,0 +1,24 @@ +import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; + +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; +import type { EscalationPolicyCreateParameters } from '@/api-clients/monitoring/escalation-policy/schema/api-verbs/create'; +import type { EscalationPolicyDeleteParameters } from '@/api-clients/monitoring/escalation-policy/schema/api-verbs/delete'; +import type { EscalationPolicyGetParameters } from '@/api-clients/monitoring/escalation-policy/schema/api-verbs/get'; +import type { EscalationPolicyListParameters } from '@/api-clients/monitoring/escalation-policy/schema/api-verbs/list'; +import type { EscalationPolicySetDefaultParameters } from '@/api-clients/monitoring/escalation-policy/schema/api-verbs/set-default'; +import type { EscalationPolicyUpdateParameters } from '@/api-clients/monitoring/escalation-policy/schema/api-verbs/update'; +import type { EscalationPolicyModel } from '@/api-clients/monitoring/escalation-policy/schema/model'; + +export const useEscalationPolicyApi = () => { + const actions = { + create: SpaceConnector.clientV2.monitoring.escalationPolicy.create, + delete: SpaceConnector.clientV2.monitoring.escalationPolicy.delete, + get: SpaceConnector.clientV2.monitoring.escalationPolicy.get, + list: SpaceConnector.clientV2.monitoring.escalationPolicy.list>, + setDefault: SpaceConnector.clientV2.monitoring.escalationPolicy.setDefault, + update: SpaceConnector.clientV2.monitoring.escalationPolicy.update, + }; + return { + escalationPolicyAPI: actions, + }; +}; diff --git a/apps/web/src/api-clients/monitoring/webhook/composables/use-webhook-api.ts b/apps/web/src/api-clients/monitoring/webhook/composables/use-webhook-api.ts new file mode 100644 index 0000000000..917ef0ee9f --- /dev/null +++ b/apps/web/src/api-clients/monitoring/webhook/composables/use-webhook-api.ts @@ -0,0 +1,30 @@ +import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; + +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; +import type { WebhookCreateParameters } from '@/api-clients/monitoring/webhook/schema/api-verbs/create'; +import type { WebhookDeleteParameters } from '@/api-clients/monitoring/webhook/schema/api-verbs/delete'; +import type { WebhookDisableParameters } from '@/api-clients/monitoring/webhook/schema/api-verbs/disable'; +import type { WebhookEnableParameters } from '@/api-clients/monitoring/webhook/schema/api-verbs/enable'; +import type { WebhookGetParameters } from '@/api-clients/monitoring/webhook/schema/api-verbs/get'; +import type { WebhookListParameters } from '@/api-clients/monitoring/webhook/schema/api-verbs/list'; +import type { WebhookUpdateParameters } from '@/api-clients/monitoring/webhook/schema/api-verbs/update'; +import type { WebhookUpdatePluginParameters } from '@/api-clients/monitoring/webhook/schema/api-verbs/update-plugin'; +import type { WebhookVerifyPluginParameters } from '@/api-clients/monitoring/webhook/schema/api-verbs/verify-plugin'; +import type { WebhookModel } from '@/api-clients/monitoring/webhook/schema/model'; + +export const useWebhookApi = () => { + const actions = { + create: SpaceConnector.clientV2.monitoring.webhook.create, + delete: SpaceConnector.clientV2.monitoring.webhook.delete, + disable: SpaceConnector.clientV2.monitoring.webhook.disable, + enable: SpaceConnector.clientV2.monitoring.webhook.enable, + get: SpaceConnector.clientV2.monitoring.webhook.get, + list: SpaceConnector.clientV2.monitoring.webhook.list>, + update: SpaceConnector.clientV2.monitoring.webhook.update, + updatePlugin: SpaceConnector.clientV2.monitoring.webhook.updatePlugin, + verifyPlugin: SpaceConnector.clientV2.monitoring.webhook.verifyPlugin, + }; + return { + webhookAPI: actions, + }; +}; diff --git a/apps/web/src/api-clients/notification/protocol/composables/use-protocol-api.ts b/apps/web/src/api-clients/notification/protocol/composables/use-protocol-api.ts index 2d34561697..4ee4b75663 100644 --- a/apps/web/src/api-clients/notification/protocol/composables/use-protocol-api.ts +++ b/apps/web/src/api-clients/notification/protocol/composables/use-protocol-api.ts @@ -11,20 +11,19 @@ import type { ProtocolUpdateParameters } from '@/api-clients/notification/protoc import type { ProtocolUpdatePluginParameters } from '@/api-clients/notification/protocol/schema/api-verbs/update-plugin'; import type { ProtocolModel } from '@/api-clients/notification/protocol/schema/model'; + export const useProtocolApi = () => { const actions = { create: SpaceConnector.clientV2.notification.protocol.create, delete: SpaceConnector.clientV2.notification.protocol.delete, - disable: SpaceConnector.clientV2.notification.protocol.disable, - enable: SpaceConnector.clientV2.notification.protocol.enable, + disable: SpaceConnector.clientV2.notification.protocol.disable, + enable: SpaceConnector.clientV2.notification.protocol.enable, get: SpaceConnector.clientV2.notification.protocol.get, list: SpaceConnector.clientV2.notification.protocol.list>, - updatePlugin: SpaceConnector.clientV2.notification.protocol.updatePlugin, update: SpaceConnector.clientV2.notification.protocol.update, + updatePlugin: SpaceConnector.clientV2.notification.protocol.updatePlugin, }; - return { protocolAPI: actions, }; }; - diff --git a/apps/web/src/api-clients/notification/protocol/schema/api-verbs/create.ts b/apps/web/src/api-clients/notification/protocol/schema/api-verbs/create.ts index f3b8ecd5fb..45a9cd983b 100644 --- a/apps/web/src/api-clients/notification/protocol/schema/api-verbs/create.ts +++ b/apps/web/src/api-clients/notification/protocol/schema/api-verbs/create.ts @@ -1,5 +1,5 @@ import type { Tags } from '@/api-clients/_common/schema/model'; -import type { ProtocolPluginInfo } from '@/schema/notification/protocol/type'; +import type { ProtocolPluginInfo } from '@/api-clients/notification/protocol/schema/type'; export interface ProtocolCreateParameters { name: string; diff --git a/apps/web/src/api-clients/notification/protocol/schema/api-verbs/list.ts b/apps/web/src/api-clients/notification/protocol/schema/api-verbs/list.ts index f5fe5e8139..8ac46eeb4f 100644 --- a/apps/web/src/api-clients/notification/protocol/schema/api-verbs/list.ts +++ b/apps/web/src/api-clients/notification/protocol/schema/api-verbs/list.ts @@ -1,6 +1,6 @@ import type { Query } from '@cloudforet/core-lib/space-connector/type'; -import type { ProtocolState } from '@/schema/notification/protocol/type'; +import type { ProtocolState } from '@/api-clients/notification/protocol/schema/type'; export interface ProtocolListParameters { protocol_id?: string; diff --git a/apps/web/src/api-clients/notification/protocol/schema/model.ts b/apps/web/src/api-clients/notification/protocol/schema/model.ts index 04ec782de6..3a798dc4b6 100644 --- a/apps/web/src/api-clients/notification/protocol/schema/model.ts +++ b/apps/web/src/api-clients/notification/protocol/schema/model.ts @@ -1,5 +1,5 @@ import type { Tags } from '@/api-clients/_common/schema/model'; -import type { ProtocolCapability, ProtocolPluginInfo, ProtocolState } from '@/schema/notification/protocol/type'; +import type { ProtocolCapability, ProtocolPluginInfo, ProtocolState } from '@/api-clients/notification/protocol/schema/type'; export interface ProtocolModel { protocol_id: string; diff --git a/apps/web/src/api-clients/repository/plugin/composables/use-plugin-api.ts b/apps/web/src/api-clients/repository/plugin/composables/use-plugin-api.ts new file mode 100644 index 0000000000..66204cb8b3 --- /dev/null +++ b/apps/web/src/api-clients/repository/plugin/composables/use-plugin-api.ts @@ -0,0 +1,30 @@ +import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; + +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; +import type { PluginDeregisterParameters } from '@/api-clients/repository/plugin/schema/api-verbs/deregister'; +import type { PluginDisableParameters } from '@/api-clients/repository/plugin/schema/api-verbs/disable'; +import type { PluginEnableParameters } from '@/api-clients/repository/plugin/schema/api-verbs/enable'; +import type { PluginGetParameters } from '@/api-clients/repository/plugin/schema/api-verbs/get'; +import type { PluginGetVersionsParameters } from '@/api-clients/repository/plugin/schema/api-verbs/get-versions'; +import type { PluginListParameters } from '@/api-clients/repository/plugin/schema/api-verbs/list'; +import type { PluginRegisterParameters } from '@/api-clients/repository/plugin/schema/api-verbs/register'; +import type { PluginStatParameters } from '@/api-clients/repository/plugin/schema/api-verbs/stat'; +import type { PluginUpdateParameters } from '@/api-clients/repository/plugin/schema/api-verbs/update'; +import type { PluginModel } from '@/api-clients/repository/plugin/schema/model'; + +export const usePluginApi = () => { + const actions = { + deregister: SpaceConnector.clientV2.repository.plugin.deregister, + disable: SpaceConnector.clientV2.repository.plugin.disable, + enable: SpaceConnector.clientV2.repository.plugin.enable, + get: SpaceConnector.clientV2.repository.plugin.get, + getVersions: SpaceConnector.clientV2.repository.plugin.getVersions, + list: SpaceConnector.clientV2.repository.plugin.list>, + register: SpaceConnector.clientV2.repository.plugin.register, + stat: SpaceConnector.clientV2.repository.plugin.stat, + update: SpaceConnector.clientV2.repository.plugin.update, + }; + return { + pluginAPI: actions, + }; +}; diff --git a/apps/web/src/schema/repository/plugin/api-verbs/deregister.ts b/apps/web/src/api-clients/repository/plugin/schema/api-verbs/deregister.ts similarity index 100% rename from apps/web/src/schema/repository/plugin/api-verbs/deregister.ts rename to apps/web/src/api-clients/repository/plugin/schema/api-verbs/deregister.ts diff --git a/apps/web/src/schema/repository/plugin/api-verbs/disable.ts b/apps/web/src/api-clients/repository/plugin/schema/api-verbs/disable.ts similarity index 100% rename from apps/web/src/schema/repository/plugin/api-verbs/disable.ts rename to apps/web/src/api-clients/repository/plugin/schema/api-verbs/disable.ts diff --git a/apps/web/src/schema/repository/plugin/api-verbs/enable.ts b/apps/web/src/api-clients/repository/plugin/schema/api-verbs/enable.ts similarity index 100% rename from apps/web/src/schema/repository/plugin/api-verbs/enable.ts rename to apps/web/src/api-clients/repository/plugin/schema/api-verbs/enable.ts diff --git a/apps/web/src/schema/repository/plugin/api-verbs/get-versions.ts b/apps/web/src/api-clients/repository/plugin/schema/api-verbs/get-versions.ts similarity index 100% rename from apps/web/src/schema/repository/plugin/api-verbs/get-versions.ts rename to apps/web/src/api-clients/repository/plugin/schema/api-verbs/get-versions.ts diff --git a/apps/web/src/schema/repository/plugin/api-verbs/get.ts b/apps/web/src/api-clients/repository/plugin/schema/api-verbs/get.ts similarity index 100% rename from apps/web/src/schema/repository/plugin/api-verbs/get.ts rename to apps/web/src/api-clients/repository/plugin/schema/api-verbs/get.ts diff --git a/apps/web/src/schema/repository/plugin/api-verbs/list.ts b/apps/web/src/api-clients/repository/plugin/schema/api-verbs/list.ts similarity index 79% rename from apps/web/src/schema/repository/plugin/api-verbs/list.ts rename to apps/web/src/api-clients/repository/plugin/schema/api-verbs/list.ts index 026ee6780d..2170b4cc80 100644 --- a/apps/web/src/schema/repository/plugin/api-verbs/list.ts +++ b/apps/web/src/api-clients/repository/plugin/schema/api-verbs/list.ts @@ -1,6 +1,6 @@ import type { Query } from '@cloudforet/core-lib/space-connector/type'; -import type { RegistryType } from '@/schema/repository/plugin/type'; +import type { RegistryType } from '@/api-clients/repository/plugin/schema/type'; export interface PluginListParameters { query?: Query; diff --git a/apps/web/src/schema/repository/plugin/api-verbs/register.ts b/apps/web/src/api-clients/repository/plugin/schema/api-verbs/register.ts similarity index 83% rename from apps/web/src/schema/repository/plugin/api-verbs/register.ts rename to apps/web/src/api-clients/repository/plugin/schema/api-verbs/register.ts index d18559c9d8..f8d9e7daf0 100644 --- a/apps/web/src/schema/repository/plugin/api-verbs/register.ts +++ b/apps/web/src/api-clients/repository/plugin/schema/api-verbs/register.ts @@ -1,5 +1,5 @@ import type { Tags } from '@/api-clients/_common/schema/model'; -import type { Capability, RegistryType } from '@/schema/repository/plugin/type'; +import type { Capability, RegistryType } from '@/api-clients/repository/plugin/schema/type'; export interface PluginRegisterParameters { name: string; diff --git a/apps/web/src/schema/repository/plugin/api-verbs/stat.ts b/apps/web/src/api-clients/repository/plugin/schema/api-verbs/stat.ts similarity index 100% rename from apps/web/src/schema/repository/plugin/api-verbs/stat.ts rename to apps/web/src/api-clients/repository/plugin/schema/api-verbs/stat.ts diff --git a/apps/web/src/schema/repository/plugin/api-verbs/update.ts b/apps/web/src/api-clients/repository/plugin/schema/api-verbs/update.ts similarity index 80% rename from apps/web/src/schema/repository/plugin/api-verbs/update.ts rename to apps/web/src/api-clients/repository/plugin/schema/api-verbs/update.ts index ea3540c8b9..b4f787e62a 100644 --- a/apps/web/src/schema/repository/plugin/api-verbs/update.ts +++ b/apps/web/src/api-clients/repository/plugin/schema/api-verbs/update.ts @@ -1,5 +1,5 @@ import type { Tags } from '@/api-clients/_common/schema/model'; -import type { Capability } from '@/schema/repository/plugin/type'; +import type { Capability } from '@/api-clients/repository/plugin/schema/type'; export interface PluginUpdateParameters { plugin_id: string; diff --git a/apps/web/src/schema/repository/plugin/constants.ts b/apps/web/src/api-clients/repository/plugin/schema/constant.ts similarity index 100% rename from apps/web/src/schema/repository/plugin/constants.ts rename to apps/web/src/api-clients/repository/plugin/schema/constant.ts diff --git a/apps/web/src/schema/repository/plugin/model.ts b/apps/web/src/api-clients/repository/plugin/schema/model.ts similarity index 87% rename from apps/web/src/schema/repository/plugin/model.ts rename to apps/web/src/api-clients/repository/plugin/schema/model.ts index ce0fd16f12..73692a3ad5 100644 --- a/apps/web/src/schema/repository/plugin/model.ts +++ b/apps/web/src/api-clients/repository/plugin/schema/model.ts @@ -1,5 +1,5 @@ import type { Tags } from '@/api-clients/_common/schema/model'; -import type { Capability, PluginState, RegistryType } from '@/schema/repository/plugin/type'; +import type { Capability, PluginState, RegistryType } from '@/api-clients/repository/plugin/schema/type'; import type { RepositoryModel } from '@/schema/repository/repository/model'; export interface PluginModel { diff --git a/apps/web/src/schema/repository/plugin/type.ts b/apps/web/src/api-clients/repository/plugin/schema/type.ts similarity index 81% rename from apps/web/src/schema/repository/plugin/type.ts rename to apps/web/src/api-clients/repository/plugin/schema/type.ts index 543e0f2732..b624cd6b99 100644 --- a/apps/web/src/schema/repository/plugin/type.ts +++ b/apps/web/src/api-clients/repository/plugin/schema/type.ts @@ -1,5 +1,5 @@ import type { MonitoringType } from '@/api-clients/monitoring/data-source/schema/type'; -import type { PLUGIN_STATE, REGISTRY_TYPE } from '@/schema/repository/plugin/constants'; +import type { PLUGIN_STATE, REGISTRY_TYPE } from '@/api-clients/repository/plugin/schema/constant'; export type PluginState = typeof PLUGIN_STATE[keyof typeof PLUGIN_STATE]; diff --git a/apps/web/src/api-clients/secret/secret/composables/use-secret-api.ts b/apps/web/src/api-clients/secret/secret/composables/use-secret-api.ts new file mode 100644 index 0000000000..f65fe3393f --- /dev/null +++ b/apps/web/src/api-clients/secret/secret/composables/use-secret-api.ts @@ -0,0 +1,19 @@ +import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; + +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; +import type { SecretCreateParameters } from '@/api-clients/secret/secret/schema/api-verbs/create'; +import type { SecretGetParameters } from '@/api-clients/secret/secret/schema/api-verbs/get'; +import type { SecretListParameters } from '@/api-clients/secret/secret/schema/api-verbs/list'; +import type { SecretModel } from '@/api-clients/secret/secret/schema/model'; + +export const useSecretApi = () => { + const actions = { + create: SpaceConnector.clientV2.secret.secret.create, + get: SpaceConnector.clientV2.secret.secret.get, + list: SpaceConnector.clientV2.secret.secret.list>, + }; + + return { + secretAPI: actions, + }; +}; diff --git a/apps/web/src/schema/secret/secret/api-verbs/create.ts b/apps/web/src/api-clients/secret/secret/schema/api-verbs/create.ts similarity index 100% rename from apps/web/src/schema/secret/secret/api-verbs/create.ts rename to apps/web/src/api-clients/secret/secret/schema/api-verbs/create.ts diff --git a/apps/web/src/schema/secret/secret/api-verbs/get.ts b/apps/web/src/api-clients/secret/secret/schema/api-verbs/get.ts similarity index 100% rename from apps/web/src/schema/secret/secret/api-verbs/get.ts rename to apps/web/src/api-clients/secret/secret/schema/api-verbs/get.ts diff --git a/apps/web/src/schema/secret/secret/api-verbs/list.ts b/apps/web/src/api-clients/secret/secret/schema/api-verbs/list.ts similarity index 100% rename from apps/web/src/schema/secret/secret/api-verbs/list.ts rename to apps/web/src/api-clients/secret/secret/schema/api-verbs/list.ts diff --git a/apps/web/src/schema/secret/secret/model.ts b/apps/web/src/api-clients/secret/secret/schema/model.ts similarity index 100% rename from apps/web/src/schema/secret/secret/model.ts rename to apps/web/src/api-clients/secret/secret/schema/model.ts diff --git a/apps/web/src/common/composables/data-source/use-cost-data-source-filter-menu-items.ts b/apps/web/src/common/composables/data-source/use-cost-data-source-filter-menu-items.ts index 0a7644b7e2..d6b8d06936 100644 --- a/apps/web/src/common/composables/data-source/use-cost-data-source-filter-menu-items.ts +++ b/apps/web/src/common/composables/data-source/use-cost-data-source-filter-menu-items.ts @@ -5,6 +5,8 @@ import { sortBy } from 'lodash'; import type { MenuItem } from '@cloudforet/mirinae/types/controls/context-menu/type'; +import type { CostDataSourceReferenceItem } from '@/query/resource-query/reference-model/use-cost-data-source-reference-data-model'; + import type { CostDataSourceItems } from '@/store/reference/cost-data-source-reference-store'; import CostTagKeyVariableModel @@ -22,7 +24,7 @@ interface CostDataSourceFilterMenuItem extends MenuItem { } interface UseCostDataSourceFilterMenuItems { isAdminMode: ComputedRef; - costDataSource: ComputedRef; + costDataSource: ComputedRef; } interface UseCostDataSourceFiltersReturn { managedGroupByItems: ComputedRef; 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 index d7f5654ded..d5aaf6b1c9 100644 --- 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 @@ -7,8 +7,8 @@ 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 { useServiceQueryKey } from '@/query/core/query-key/use-service-query-key'; +import { useScopedQuery } from '@/query/service-query/use-scoped-query'; import { useAppContextStore } from '@/store/app-context/app-context-store'; diff --git a/apps/web/src/common/modules/navigations/top-bar/modules/top-bar-search/modules/top-bar-search-dropdown/TopBarSearchDropdown.vue b/apps/web/src/common/modules/navigations/top-bar/modules/top-bar-search/modules/top-bar-search-dropdown/TopBarSearchDropdown.vue index b2662c3d76..210eff1fbc 100644 --- a/apps/web/src/common/modules/navigations/top-bar/modules/top-bar-search/modules/top-bar-search-dropdown/TopBarSearchDropdown.vue +++ b/apps/web/src/common/modules/navigations/top-bar/modules/top-bar-search/modules/top-bar-search-dropdown/TopBarSearchDropdown.vue @@ -14,7 +14,6 @@ import type { ValueItem } from '@cloudforet/mirinae/types/controls/search/query- import { useReferenceRouter } from '@/router/composables/use-reference-router'; import { useAuthorizationStore } from '@/store/authorization/authorization-store'; -import { useAllReferenceStore } from '@/store/reference/all-reference-store'; import { MENU_ID } from '@/lib/menu/config'; @@ -38,8 +37,6 @@ interface Props { focusingDirection: string; } -const allReferenceStore = useAllReferenceStore(); - const props = withDefaults(defineProps(), { isFocused: false, focusingDirection: '', @@ -71,7 +68,6 @@ const getTabHeaderHeight = () => { const storeState = reactive({ activeTab: computed(() => topBarSearchStore.state.activeTab), - cloudServiceTypeMap: computed(() => allReferenceStore.getters.cloudServiceType), }); const state = reactive({ diff --git a/apps/web/src/common/modules/navigations/top-bar/modules/top-bar-toolset/modules/top-bar-profile/TopBarProfile.vue b/apps/web/src/common/modules/navigations/top-bar/modules/top-bar-toolset/modules/top-bar-profile/TopBarProfile.vue index cb60b9da4b..9920c4c48d 100644 --- a/apps/web/src/common/modules/navigations/top-bar/modules/top-bar-toolset/modules/top-bar-profile/TopBarProfile.vue +++ b/apps/web/src/common/modules/navigations/top-bar/modules/top-bar-toolset/modules/top-bar-profile/TopBarProfile.vue @@ -20,13 +20,12 @@ import UserImage from '@/assets/images/role/img_avatar_no-role.png'; import SystemAdminImage from '@/assets/images/role/img_avatar_system-admin.png'; import WorkspaceMemberImage from '@/assets/images/role/img_avatar_workspace-member.png'; import WorkspaceOwnerImage from '@/assets/images/role/img_avatar_workspace-owner.png'; +import { useAllReferenceDataModel } from '@/query/resource-query/reference-model/use-all-reference-data-model'; import { i18n } from '@/translations'; import { useAppContextStore } from '@/store/app-context/app-context-store'; import { useAuthorizationStore } from '@/store/authorization/authorization-store'; import { useDomainStore } from '@/store/domain/domain-store'; -import { useAllReferenceStore } from '@/store/reference/all-reference-store'; -import type { RoleReferenceMap } from '@/store/reference/role-reference-store'; import { languages } from '@/store/user/constant'; import { useUserStore } from '@/store/user/user-store'; @@ -39,6 +38,9 @@ import { AUTH_ROUTE } from '@/services/auth/routes/route-constant'; import { LANDING_ROUTE } from '@/services/landing/routes/route-constant'; import { MY_PAGE_ROUTE } from '@/services/my-page/routes/route-constant'; + + + interface Props { visible: boolean } @@ -55,10 +57,9 @@ const emit = defineEmits<{(e: 'update:visible', visible: boolean): void; }>(); const route = useRoute(); const router = useRouter(); -const allReferenceStore = useAllReferenceStore(); +const referenceMap = useAllReferenceDataModel(); const state = reactive({ - roles: computed(() => allReferenceStore.getters.role), isAdminMode: computed(() => appContextStore.getters.isAdminMode), isUserMode: computed(() => appContextStore.getters.isUserMode), userIcon: computed(() => { @@ -275,7 +276,7 @@ watch(() => props.visible, (value) => { class="info-menu" > {{ $t('COMMON.GNB.ACCOUNT.LABEL_ROLE') }} - {{ state.roles[state.currentWorkspaceRole?.role_id]?.label ?? 'User' }} + {{ referenceMap.role[state.currentWorkspaceRole?.role_id]?.label || 'User' }}
-
-
- - -

- {{ item.name }} -

- -
-
-
- - + + +