cloudforet-io · piggggggggy · Feb 15, 2025 · Jan 31, 2025 · Jan 31, 2025 · Jan 31, 2025
diff --git a/apps/web/src/api-clients/_common/composables/use-query-key.ts b/apps/web/src/api-clients/_common/composables/use-query-key.ts
@@ -0,0 +1,41 @@
+import type { ComputedRef } from 'vue';
+import { computed, reactive } from 'vue';
+
+
+import type { QueryKey } from '@tanstack/vue-query';
+
+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 primaryQueryKey - The primary key for the api query (e.g., 'private-dashboard/get'). It follows the `{api-resource-name}/{api-verb}` convention.
+ * @param additionalGlobalParams - Optional additional global parameters to include in the api query key.
+ * @returns A computed reference to the query key array.
+ */
+
+interface GlobalQueryParams {
+    workspaceId?: string;
+    isAdminMode?: boolean;
+}
+export const useAPIQueryKey = (
+    primaryQueryKey: string,
+    additionalGlobalParams?: Partial<GlobalQueryParams>,
+): ComputedRef<QueryKey> => {
+    const appContextStore = useAppContextStore();
+    const userWorkspaceStore = useUserWorkspaceStore();
+
+    const _state = reactive({
+        currentWorkdpaceId: computed<string|undefined>(() => userWorkspaceStore.getters.currentWorkspaceId),
+        isAdminMode: computed<boolean>(() => appContextStore.getters.isAdminMode),
+    });
+
+    const globalQueryParams = reactive<GlobalQueryParams>({
+        workspaceId: _state.currentWorkdpaceId,
+        isAdminMode: _state.isAdminMode,
+        ...additionalGlobalParams,
+    });
+
+    return computed<QueryKey>(() => [primaryQueryKey, { ...globalQueryParams }]);
+};
diff --git a/...b/src/schema/_common/api-verbs/analyze.ts → ...ients/_common/schema/api-verbs/analyze.ts b/...b/src/schema/_common/api-verbs/analyze.ts → ...ients/_common/schema/api-verbs/analyze.ts
diff --git a/...eb/src/schema/_common/api-verbs/export.ts → ...lients/_common/schema/api-verbs/export.ts b/...eb/src/schema/_common/api-verbs/export.ts → ...lients/_common/schema/api-verbs/export.ts
diff --git a/.../web/src/schema/_common/api-verbs/list.ts → ...-clients/_common/schema/api-verbs/list.ts b/.../web/src/schema/_common/api-verbs/list.ts → ...-clients/_common/schema/api-verbs/list.ts
diff --git a/apps/web/src/schema/_common/constant.ts → ...rc/api-clients/_common/schema/constant.ts b/apps/web/src/schema/_common/constant.ts → ...rc/api-clients/_common/schema/constant.ts
diff --git a/apps/web/src/schema/_common/model.ts → ...b/src/api-clients/_common/schema/model.ts b/apps/web/src/schema/_common/model.ts → ...b/src/api-clients/_common/schema/model.ts
diff --git a/apps/web/src/schema/_common/type.ts → ...eb/src/api-clients/_common/schema/type.ts b/apps/web/src/schema/_common/type.ts → ...eb/src/api-clients/_common/schema/type.ts
@@ -1,4 +1,4 @@
-import type { RESOURCE_GROUP } from '@/schema/_common/constant';
+import type { RESOURCE_GROUP } from '@/api-clients/_common/schema/constant';
 
 export type ResourceGroupType = typeof RESOURCE_GROUP[keyof typeof RESOURCE_GROUP];
 

diff --git a/apps/web/src/schema/add-ons/favorite/list.ts → ...i-clients/add-ons/favorite/schema/list.ts b/apps/web/src/schema/add-ons/favorite/list.ts → ...i-clients/add-ons/favorite/schema/list.ts
@@ -1,5 +1,5 @@
-import type { ListResponse } from '@/schema/_common/api-verbs/list';
-import type { FavoriteModel } from '@/schema/add-ons/favorite/model';
+import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list';
+import type { FavoriteModel } from '@/api-clients/add-ons/favorite/schema/model';
 
 import type { FavoriteType } from '@/common/modules/favorites/favorite-button/type';
 

diff --git a/.../web/src/schema/add-ons/favorite/model.ts → ...-clients/add-ons/favorite/schema/model.ts b/.../web/src/schema/add-ons/favorite/model.ts → ...-clients/add-ons/favorite/schema/model.ts
diff --git a/apps/web/src/api-clients/cost-analysis/budget-usage/composables/use-budget-usage-api.ts b/apps/web/src/api-clients/cost-analysis/budget-usage/composables/use-budget-usage-api.ts
diff --git a/...nalysis/budget-usage/api-verbs/analyze.ts → .../budget-usage/schema/api-verbs/analyze.ts b/...nalysis/budget-usage/api-verbs/analyze.ts → .../budget-usage/schema/api-verbs/analyze.ts
@@ -1,6 +1,6 @@
 import type { Query } from '@cloudforet/core-lib/space-connector/type';
 
-import type { ResourceGroupType } from '@/schema/_common/type';
+import type { ResourceGroupType } from '@/api-clients/_common/schema/type';
 
 
 export interface BudgetUsageAnalyzeParameters {

diff --git a/...t-analysis/budget-usage/api-verbs/list.ts → ...sis/budget-usage/schema/api-verbs/list.ts b/...t-analysis/budget-usage/api-verbs/list.ts → ...sis/budget-usage/schema/api-verbs/list.ts
diff --git a/...chema/cost-analysis/budget-usage/model.ts → ...ost-analysis/budget-usage/schema/model.ts b/...chema/cost-analysis/budget-usage/model.ts → ...ost-analysis/budget-usage/schema/model.ts
@@ -1,4 +1,4 @@
-import type { ResourceGroupType } from '@/schema/_common/type';
+import type { ResourceGroupType } from '@/api-clients/_common/schema/type';
 
 import type { Currency } from '@/store/display/type';
 

diff --git a/apps/web/src/api-clients/cost-analysis/budget/composables/use-budget-api.ts b/apps/web/src/api-clients/cost-analysis/budget/composables/use-budget-api.ts
diff --git a/.../cost-analysis/budget/api-verbs/create.ts → ...nalysis/budget/schema/api-verbs/create.ts b/.../cost-analysis/budget/api-verbs/create.ts → ...nalysis/budget/schema/api-verbs/create.ts
@@ -1,8 +1,8 @@
-import type { Tags } from '@/schema/_common/model';
-import type { ResourceGroupType } from '@/schema/_common/type';
+import type { Tags } from '@/api-clients/_common/schema/model';
+import type { ResourceGroupType } from '@/api-clients/_common/schema/type';
 import type {
     BudgetNotification, BudgetPlannedLimit, BudgetTimeUnit, ProviderFilter,
-} from '@/schema/cost-analysis/budget/type';
+} from '@/api-clients/cost-analysis/budget/schema/type';
 
 export interface BudgetCreateParameters {
     data_source_id: string;

diff --git a/.../cost-analysis/budget/api-verbs/delete.ts → ...nalysis/budget/schema/api-verbs/delete.ts b/.../cost-analysis/budget/api-verbs/delete.ts → ...nalysis/budget/schema/api-verbs/delete.ts
diff --git a/...ema/cost-analysis/budget/api-verbs/get.ts → ...t-analysis/budget/schema/api-verbs/get.ts b/...ema/cost-analysis/budget/api-verbs/get.ts → ...t-analysis/budget/schema/api-verbs/get.ts
diff --git a/...ma/cost-analysis/budget/api-verbs/list.ts → ...-analysis/budget/schema/api-verbs/list.ts b/...ma/cost-analysis/budget/api-verbs/list.ts → ...-analysis/budget/schema/api-verbs/list.ts
@@ -1,6 +1,6 @@
 import type { Query } from '@cloudforet/core-lib/space-connector/type';
 
-import type { BudgetTimeUnit } from '@/schema/cost-analysis/budget/type';
+import type { BudgetTimeUnit } from '@/api-clients/cost-analysis/budget/schema/type';
 
 export interface BudgetListParameters {
     query?: Query

diff --git a/...ysis/budget/api-verbs/set-notification.ts → ...dget/schema/api-verbs/set-notification.ts b/...ysis/budget/api-verbs/set-notification.ts → ...dget/schema/api-verbs/set-notification.ts
@@ -1,4 +1,4 @@
-import type { BudgetNotification } from '@/schema/cost-analysis/budget/type';
+import type { BudgetNotification } from '@/api-clients/cost-analysis/budget/schema/type';
 
 export interface BudgetSetNotificationParameters {
     budget_id: string;

diff --git a/.../cost-analysis/budget/api-verbs/update.ts → ...nalysis/budget/schema/api-verbs/update.ts b/.../cost-analysis/budget/api-verbs/update.ts → ...nalysis/budget/schema/api-verbs/update.ts
@@ -1,5 +1,5 @@
-import type { Tags } from '@/schema/_common/model';
-import type { BudgetPlannedLimit } from '@/schema/cost-analysis/budget/type';
+import type { Tags } from '@/api-clients/_common/schema/model';
+import type { BudgetPlannedLimit } from '@/api-clients/cost-analysis/budget/schema/type';
 
 export interface BudgetUpdateParameters {
     budget_id: string;

diff --git a/.../src/schema/cost-analysis/budget/model.ts → ...ents/cost-analysis/budget/schema/model.ts b/.../src/schema/cost-analysis/budget/model.ts → ...ents/cost-analysis/budget/schema/model.ts
@@ -1,8 +1,8 @@
-import type { Tags } from '@/schema/_common/model';
-import type { ResourceGroupType } from '@/schema/_common/type';
+import type { Tags } from '@/api-clients/_common/schema/model';
+import type { ResourceGroupType } from '@/api-clients/_common/schema/type';
 import type {
     BudgetNotification, BudgetPlannedLimit, BudgetTimeUnit, ProviderFilter,
-} from '@/schema/cost-analysis/budget/type';
+} from '@/api-clients/cost-analysis/budget/schema/type';
 
 import type { Currency } from '@/store/display/type';
 

diff --git a/...b/src/schema/cost-analysis/budget/type.ts → ...ients/cost-analysis/budget/schema/type.ts b/...b/src/schema/cost-analysis/budget/type.ts → ...ients/cost-analysis/budget/schema/type.ts
diff --git a/apps/web/src/api-clients/cost-analysis/cost-query-set/composables/use-cost-query-set-api.ts b/apps/web/src/api-clients/cost-analysis/cost-query-set/composables/use-cost-query-set-api.ts
diff --git a/apps/web/src/api-clients/cost-analysis/cost-query-set/schema/api-verbs/create.ts b/apps/web/src/api-clients/cost-analysis/cost-query-set/schema/api-verbs/create.ts
@@ -0,0 +1,10 @@
+import type { Tags } from '@/api-clients/_common/schema/model';
+import type { CostQuerySetOption } from '@/api-clients/cost-analysis/cost-query-set/schema/type';
+
+
+export interface CostQuerySetCreateParameters {
+    data_source_id: string;
+    name: string;
+    options: CostQuerySetOption;
+    tags?: Tags;
+}
diff --git a/...alysis/cost-query-set/api-verbs/delete.ts → ...cost-query-set/schema/api-verbs/delete.ts b/...alysis/cost-query-set/api-verbs/delete.ts → ...cost-query-set/schema/api-verbs/delete.ts
diff --git a/...analysis/cost-query-set/api-verbs/list.ts → ...s/cost-query-set/schema/api-verbs/list.ts b/...analysis/cost-query-set/api-verbs/list.ts → ...s/cost-query-set/schema/api-verbs/list.ts
diff --git a/apps/web/src/api-clients/cost-analysis/cost-query-set/schema/api-verbs/update.ts b/apps/web/src/api-clients/cost-analysis/cost-query-set/schema/api-verbs/update.ts
@@ -0,0 +1,10 @@
+import type { Tags } from '@/api-clients/_common/schema/model';
+import type { CostQuerySetOption } from '@/api-clients/cost-analysis/cost-query-set/schema/type';
+
+
+export interface CostQuerySetUpdateParameters {
+    cost_query_set_id: string;
+    name?: string;
+    options?: CostQuerySetOption;
+    tags?: Tags;
+}
diff --git a/...ema/cost-analysis/cost-query-set/model.ts → ...t-analysis/cost-query-set/schema/model.ts b/...ema/cost-analysis/cost-query-set/model.ts → ...t-analysis/cost-query-set/schema/model.ts
@@ -1,5 +1,5 @@
-import type { Tags } from '@/schema/_common/model';
-import type { CostQuerySetOption } from '@/schema/cost-analysis/cost-query-set/type';
+import type { Tags } from '@/api-clients/_common/schema/model';
+import type { CostQuerySetOption } from '@/api-clients/cost-analysis/cost-query-set/schema/type';
 
 
 export interface CostQuerySetModel {

diff --git a/...hema/cost-analysis/cost-query-set/type.ts → ...st-analysis/cost-query-set/schema/type.ts b/...hema/cost-analysis/cost-query-set/type.ts → ...st-analysis/cost-query-set/schema/type.ts
diff --git a/...rc/api-clients/cost-analysis/cost-report-config/composables/use-cost-report-config-api.ts b/...rc/api-clients/cost-analysis/cost-report-config/composables/use-cost-report-config-api.ts
diff --git a/...ysis/cost-report-config/api-verbs/list.ts → ...st-report-config/schema/api-verbs/list.ts b/...ysis/cost-report-config/api-verbs/list.ts → ...st-report-config/schema/api-verbs/list.ts
diff --git a/...ort-config/api-verbs/update-recipients.ts → ...fig/schema/api-verbs/update-recipients.ts b/...ort-config/api-verbs/update-recipients.ts → ...fig/schema/api-verbs/update-recipients.ts
diff --git a/...is/cost-report-config/api-verbs/update.ts → ...-report-config/schema/api-verbs/update.ts b/...is/cost-report-config/api-verbs/update.ts → ...-report-config/schema/api-verbs/update.ts
diff --git a/...cost-analysis/cost-report-config/model.ts → ...alysis/cost-report-config/schema/model.ts b/...cost-analysis/cost-report-config/model.ts → ...alysis/cost-report-config/schema/model.ts
@@ -1,4 +1,4 @@
-import type { CostReportConfigStatus } from '@/schema/cost-analysis/cost-report-config/type';
+import type { CostReportConfigStatus } from '@/api-clients/cost-analysis/cost-report-config/schema/type';
 import type { RoleType } from '@/schema/identity/role/type';
 
 import type { Currency } from '@/store/display/type';

diff --git a/.../cost-analysis/cost-report-config/type.ts → ...nalysis/cost-report-config/schema/type.ts b/.../cost-analysis/cost-report-config/type.ts → ...nalysis/cost-report-config/schema/type.ts
diff --git a/...eb/src/api-clients/cost-analysis/cost-report-data/composables/use-cost-report-data-api.ts b/...eb/src/api-clients/cost-analysis/cost-report-data/composables/use-cost-report-data-api.ts
diff --git a/...sis/cost-report-data/api-verbs/analyze.ts → ...t-report-data/schema/api-verbs/analyze.ts b/...sis/cost-report-data/api-verbs/analyze.ts → ...t-report-data/schema/api-verbs/analyze.ts
diff --git a/...alysis/cost-report-data/api-verbs/list.ts → ...cost-report-data/schema/api-verbs/list.ts b/...alysis/cost-report-data/api-verbs/list.ts → ...cost-report-data/schema/api-verbs/list.ts
diff --git a/...a/cost-analysis/cost-report-data/model.ts → ...analysis/cost-report-data/schema/model.ts b/...a/cost-analysis/cost-report-data/model.ts → ...analysis/cost-report-data/schema/model.ts
diff --git a/...ma/cost-analysis/cost-report-data/type.ts → ...-analysis/cost-report-data/schema/type.ts b/...ma/cost-analysis/cost-report-data/type.ts → ...-analysis/cost-report-data/schema/type.ts
diff --git a/apps/web/src/api-clients/cost-analysis/cost-report/composables/use-cost-report-api.ts b/apps/web/src/api-clients/cost-analysis/cost-report/composables/use-cost-report-api.ts
diff --git a/...analysis/cost-report/api-verbs/get-url.ts → ...s/cost-report/schema/api-verbs/get-url.ts b/...analysis/cost-report/api-verbs/get-url.ts → ...s/cost-report/schema/api-verbs/get-url.ts
diff --git a/...ost-analysis/cost-report/api-verbs/get.ts → ...lysis/cost-report/schema/api-verbs/get.ts b/...ost-analysis/cost-report/api-verbs/get.ts → ...lysis/cost-report/schema/api-verbs/get.ts
diff --git a/...st-analysis/cost-report/api-verbs/list.ts → ...ysis/cost-report/schema/api-verbs/list.ts b/...st-analysis/cost-report/api-verbs/list.ts → ...ysis/cost-report/schema/api-verbs/list.ts
@@ -1,6 +1,6 @@
 import type { Query } from '@cloudforet/core-lib/space-connector/type';
 
-import type { CostReportStatus } from '@/schema/cost-analysis/cost-report/type';
+import type { CostReportStatus } from '@/api-clients/cost-analysis/cost-report/schema/type';
 
 
 export interface CostReportListParameters {

diff --git a/...st-analysis/cost-report/api-verbs/send.ts → ...ysis/cost-report/schema/api-verbs/send.ts b/...st-analysis/cost-report/api-verbs/send.ts → ...ysis/cost-report/schema/api-verbs/send.ts
diff --git a/...schema/cost-analysis/cost-report/model.ts → ...cost-analysis/cost-report/schema/model.ts b/...schema/cost-analysis/cost-report/model.ts → ...cost-analysis/cost-report/schema/model.ts
@@ -1,4 +1,4 @@
-import type { CostReportStatus } from '@/schema/cost-analysis/cost-report/type';
+import type { CostReportStatus } from '@/api-clients/cost-analysis/cost-report/schema/type';
 
 import type { Currency } from '@/store/display/type';
 

diff --git a/.../schema/cost-analysis/cost-report/type.ts → .../cost-analysis/cost-report/schema/type.ts b/.../schema/cost-analysis/cost-report/type.ts → .../cost-analysis/cost-report/schema/type.ts
diff --git a/apps/web/src/api-clients/cost-analysis/cost/composables/use-cost-api.ts b/apps/web/src/api-clients/cost-analysis/cost/composables/use-cost-api.ts
diff --git a/...a/cost-analysis/cost/api-verbs/analyze.ts → ...analysis/cost/schema/api-verbs/analyze.ts b/...a/cost-analysis/cost/api-verbs/analyze.ts → ...analysis/cost/schema/api-verbs/analyze.ts
diff --git a/...hema/cost-analysis/cost/api-verbs/stat.ts → ...st-analysis/cost/schema/api-verbs/stat.ts b/...hema/cost-analysis/cost/api-verbs/stat.ts → ...st-analysis/cost/schema/api-verbs/stat.ts
diff --git a/...eb/src/schema/cost-analysis/cost/model.ts → ...lients/cost-analysis/cost/schema/model.ts b/...eb/src/schema/cost-analysis/cost/model.ts → ...lients/cost-analysis/cost/schema/model.ts
@@ -1,4 +1,4 @@
-import type { Tags } from '@/schema/_common/model';
+import type { Tags } from '@/api-clients/_common/schema/model';
 
 export interface CostModel {
     cost_id: string;

diff --git a/.../api-clients/cost-analysis/data-source-account/composables/use-data-source-account-api.ts b/.../api-clients/cost-analysis/data-source-account/composables/use-data-source-account-api.ts
diff --git a/.../data-source-account/api-verbs/analyze.ts → ...ource-account/schema/api-verbs/analyze.ts b/.../data-source-account/api-verbs/analyze.ts → ...ource-account/schema/api-verbs/analyze.ts
diff --git a/...sis/data-source-account/api-verbs/list.ts → ...a-source-account/schema/api-verbs/list.ts b/...sis/data-source-account/api-verbs/list.ts → ...a-source-account/schema/api-verbs/list.ts
diff --git a/...is/data-source-account/api-verbs/reset.ts → ...-source-account/schema/api-verbs/reset.ts b/...is/data-source-account/api-verbs/reset.ts → ...-source-account/schema/api-verbs/reset.ts
diff --git a/...s/data-source-account/api-verbs/update.ts → ...source-account/schema/api-verbs/update.ts b/...s/data-source-account/api-verbs/update.ts → ...source-account/schema/api-verbs/update.ts
diff --git a/...ost-analysis/data-source-account/model.ts → ...lysis/data-source-account/schema/model.ts b/...ost-analysis/data-source-account/model.ts → ...lysis/data-source-account/schema/model.ts
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
diff --git a/...ost-analysis/data-source/api-verbs/get.ts → ...lysis/data-source/schema/api-verbs/get.ts b/...ost-analysis/data-source/api-verbs/get.ts → ...lysis/data-source/schema/api-verbs/get.ts
diff --git a/...st-analysis/data-source/api-verbs/list.ts → ...ysis/data-source/schema/api-verbs/list.ts b/...st-analysis/data-source/api-verbs/list.ts → ...ysis/data-source/schema/api-verbs/list.ts
@@ -1,6 +1,6 @@
 import type { Query } from '@cloudforet/core-lib/space-connector/type';
 
-import type { CostDataSourceState, CostDataSourceType } from '@/schema/cost-analysis/data-source/type';
+import type { CostDataSourceState, CostDataSourceType } from '@/api-clients/cost-analysis/data-source/schema/type';
 
 
 export interface CostDataSourceListParameters {

diff --git a/...st-analysis/data-source/api-verbs/sync.ts → ...ysis/data-source/schema/api-verbs/sync.ts b/...st-analysis/data-source/api-verbs/sync.ts → ...ysis/data-source/schema/api-verbs/sync.ts
diff --git a/...ta-source/api-verbs/update-permissions.ts → ...ce/schema/api-verbs/update-permissions.ts b/...ta-source/api-verbs/update-permissions.ts → ...ce/schema/api-verbs/update-permissions.ts
diff --git a/...ema/cost-analysis/data-source/constant.ts → ...t-analysis/data-source/schema/constant.ts b/...ema/cost-analysis/data-source/constant.ts → ...t-analysis/data-source/schema/constant.ts
diff --git a/...schema/cost-analysis/data-source/model.ts → ...cost-analysis/data-source/schema/model.ts b/...schema/cost-analysis/data-source/model.ts → ...cost-analysis/data-source/schema/model.ts
@@ -1,9 +1,7 @@
 import type { JsonSchema } from '@cloudforet/mirinae/types/controls/forms/json-schema-form/type';
 
-import type { ResourceGroupType } from '@/schema/_common/type';
-import type {
-    CostDataSourceSecretType, CostDataSourceType, CostDataSourceSchedule,
-} from '@/schema/cost-analysis/data-source/type';
+import type { ResourceGroupType } from '@/api-clients/_common/schema/type';
+import type { CostDataSourceSecretType, CostDataSourceState, CostDataSourceType } from '@/api-clients/cost-analysis/data-source/schema/type';
 
 
 interface PluginInfoModel {

diff --git a/.../schema/cost-analysis/data-source/type.ts → .../cost-analysis/data-source/schema/type.ts b/.../schema/cost-analysis/data-source/type.ts → .../cost-analysis/data-source/schema/type.ts
@@ -1,4 +1,4 @@
-import type { COST_DATA_SOURCE_STATE, COST_DATA_SOURCE_TYPE, COST_DATA_SOURCE_SECRET_TYPE } from '@/schema/cost-analysis/data-source/constant';
+import type { COST_DATA_SOURCE_STATE, COST_DATA_SOURCE_TYPE, COST_DATA_SOURCE_SECRET_TYPE } from './constant';
 
 export type CostDataSourceState = typeof COST_DATA_SOURCE_STATE[keyof typeof COST_DATA_SOURCE_STATE];
 

diff --git a/apps/web/src/api-clients/cost-analysis/job/composables/use-job-api.ts b/apps/web/src/api-clients/cost-analysis/job/composables/use-job-api.ts
diff --git a/...ema/cost-analysis/job/api-verbs/cancel.ts → ...t-analysis/job/schema/api-verbs/cancel.ts b/...ema/cost-analysis/job/api-verbs/cancel.ts → ...t-analysis/job/schema/api-verbs/cancel.ts
diff --git a/...chema/cost-analysis/job/api-verbs/list.ts → ...ost-analysis/job/schema/api-verbs/list.ts b/...chema/cost-analysis/job/api-verbs/list.ts → ...ost-analysis/job/schema/api-verbs/list.ts
diff --git a/...web/src/schema/cost-analysis/job/model.ts → ...clients/cost-analysis/job/schema/model.ts b/...web/src/schema/cost-analysis/job/model.ts → ...clients/cost-analysis/job/schema/model.ts
@@ -1,5 +1,6 @@
-import type { ResourceGroupType } from '@/schema/_common/type';
-import type { CostJobStatus } from '@/schema/cost-analysis/job/type';
+import type { ResourceGroupType } from '@/api-clients/_common/schema/type';
+import type { CostJobStatus } from '@/api-clients/cost-analysis/job/schema/type';
+
 
 interface SyncedAccount {
     account_id: string;

diff --git a/.../web/src/schema/cost-analysis/job/type.ts → ...-clients/cost-analysis/job/schema/type.ts b/.../web/src/schema/cost-analysis/job/type.ts → ...-clients/cost-analysis/job/schema/type.ts
diff --git a/apps/web/src/api-clients/cost-analysis/unified-cost/composables/use-unified-cost-api.ts b/apps/web/src/api-clients/cost-analysis/unified-cost/composables/use-unified-cost-api.ts
diff --git a/...nalysis/unified-cost/api-verbs/analyze.ts → .../unified-cost/schema/api-verbs/analyze.ts b/...nalysis/unified-cost/api-verbs/analyze.ts → .../unified-cost/schema/api-verbs/analyze.ts
diff --git a/...st-analysis/unified-cost/api-verbs/get.ts → ...ysis/unified-cost/schema/api-verbs/get.ts b/...st-analysis/unified-cost/api-verbs/get.ts → ...ysis/unified-cost/schema/api-verbs/get.ts
diff --git a/...t-analysis/unified-cost/api-verbs/list.ts → ...sis/unified-cost/schema/api-verbs/list.ts b/...t-analysis/unified-cost/api-verbs/list.ts → ...sis/unified-cost/schema/api-verbs/list.ts
diff --git a/...t-analysis/unified-cost/api-verbs/stat.ts → ...sis/unified-cost/schema/api-verbs/stat.ts b/...t-analysis/unified-cost/api-verbs/stat.ts → ...sis/unified-cost/schema/api-verbs/stat.ts
diff --git a/...chema/cost-analysis/unified-cost/model.ts → ...ost-analysis/unified-cost/schema/model.ts b/...chema/cost-analysis/unified-cost/model.ts → ...ost-analysis/unified-cost/schema/model.ts
diff --git a/...ashboard/_constants/dashboard-constant.ts → ...ashboard/_constants/dashboard-constant.ts b/...ashboard/_constants/dashboard-constant.ts → ...ashboard/_constants/dashboard-constant.ts
diff --git a/...a/dashboard/_constants/widget-constant.ts → ...s/dashboard/_constants/widget-constant.ts b/...a/dashboard/_constants/widget-constant.ts → ...s/dashboard/_constants/widget-constant.ts
diff --git a/.../_types/dashboard-global-variable-type.ts → .../_types/dashboard-global-variable-type.ts b/.../_types/dashboard-global-variable-type.ts → .../_types/dashboard-global-variable-type.ts
diff --git a/...schema/dashboard/_types/dashboard-type.ts → ...lients/dashboard/_types/dashboard-type.ts b/...schema/dashboard/_types/dashboard-type.ts → ...lients/dashboard/_types/dashboard-type.ts
@@ -1,23 +1,25 @@
 import type {
     REFRESH_INTERVAL_OPTIONS_MAP,
     DASHBOARD_TYPE,
-} from '@/schema/dashboard/_constants/dashboard-constant';
-import type { DashboardGlobalVariable } from '@/schema/dashboard/_types/dashboard-global-variable-type';
+} from '@/api-clients/dashboard/_constants/dashboard-constant';
+import type { DashboardGlobalVariable } from '@/api-clients/dashboard/_types/dashboard-global-variable-type';
 import type {
     InheritOptions, WidgetOptions, WidgetSize,
-} from '@/schema/dashboard/_types/widget-type';
-import type { PrivateDashboardChangeFolderParameters } from '@/schema/dashboard/private-dashboard/api-verbs/change-folder';
-import type { PrivateDashboardCreateParameters } from '@/schema/dashboard/private-dashboard/api-verbs/create';
-import type { PrivateDashboardDeleteParameters } from '@/schema/dashboard/private-dashboard/api-verbs/delete';
-import type { PrivateDashboardListParameters } from '@/schema/dashboard/private-dashboard/api-verbs/list';
-import type { PrivateDashboardUpdateParameters } from '@/schema/dashboard/private-dashboard/api-verbs/update';
-import type { PrivateDashboardModel } from '@/schema/dashboard/private-dashboard/model';
-import type { PublicDashboardChangeFolderParameters } from '@/schema/dashboard/public-dashboard/api-verbs/change-folder';
-import type { PublicDashboardCreateParameters } from '@/schema/dashboard/public-dashboard/api-verbs/create';
-import type { PublicDashboardDeleteParameters } from '@/schema/dashboard/public-dashboard/api-verbs/delete';
-import type { PublicDashboardListParameters } from '@/schema/dashboard/public-dashboard/api-verbs/list';
-import type { PublicDashboardUpdateParameters } from '@/schema/dashboard/public-dashboard/api-verbs/update';
-import type { PublicDashboardModel } from '@/schema/dashboard/public-dashboard/model';
+} from '@/api-clients/dashboard/_types/widget-type';
+import type { PrivateDashboardChangeFolderParameters } from '@/api-clients/dashboard/private-dashboard/schema/api-verbs/change-folder';
+import type { PrivateDashboardCreateParameters } from '@/api-clients/dashboard/private-dashboard/schema/api-verbs/create';
+import type { PrivateDashboardDeleteParameters } from '@/api-clients/dashboard/private-dashboard/schema/api-verbs/delete';
+import type { PrivateDashboardGetParameters } from '@/api-clients/dashboard/private-dashboard/schema/api-verbs/get';
+import type { PrivateDashboardListParameters } from '@/api-clients/dashboard/private-dashboard/schema/api-verbs/list';
+import type { PrivateDashboardUpdateParameters } from '@/api-clients/dashboard/private-dashboard/schema/api-verbs/update';
+import type { PrivateDashboardModel } from '@/api-clients/dashboard/private-dashboard/schema/model';
+import type { PublicDashboardChangeFolderParameters } from '@/api-clients/dashboard/public-dashboard/schema/api-verbs/change-folder';
+import type { PublicDashboardCreateParameters } from '@/api-clients/dashboard/public-dashboard/schema/api-verbs/create';
+import type { PublicDashboardDeleteParameters } from '@/api-clients/dashboard/public-dashboard/schema/api-verbs/delete';
+import type { PublicDashboardGetParameters } from '@/api-clients/dashboard/public-dashboard/schema/api-verbs/get';
+import type { PublicDashboardListParameters } from '@/api-clients/dashboard/public-dashboard/schema/api-verbs/list';
+import type { PublicDashboardUpdateParameters } from '@/api-clients/dashboard/public-dashboard/schema/api-verbs/update';
+import type { PublicDashboardModel } from '@/api-clients/dashboard/public-dashboard/schema/model';
 
 import type { VariableModelType } from '@/lib/variable-models';
 import type { Value } from '@/lib/variable-models/_base/types';
@@ -27,12 +29,13 @@ export type DashboardFolderType = 'PUBLIC'|'PRIVATE';
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
-export type DashboardModel = PublicDashboardModel & PrivateDashboardModel;
+export type DashboardModel = PublicDashboardModel | PrivateDashboardModel;
 export type DashboardCreateParams = PublicDashboardCreateParameters | PrivateDashboardCreateParameters;
 export type DashboardChangeFolderParams = PublicDashboardChangeFolderParameters | PrivateDashboardChangeFolderParameters;
 export type DashboardListParams = PublicDashboardListParameters | PrivateDashboardListParameters;
 export type DashboardUpdateParams = PublicDashboardUpdateParameters | PrivateDashboardUpdateParameters;
 export type DashboardDeleteParams = PublicDashboardDeleteParameters | PrivateDashboardDeleteParameters;
+export type DashboardGetParams = PublicDashboardGetParameters | PrivateDashboardGetParameters;
 
 // dashboard variable schema types
 type VariableSelectionType = 'SINGLE' | 'MULTI';
@@ -67,8 +70,9 @@ export interface DashboardVariablesSchema {
 }
 
 export interface DashboardGlobalVariablesSchema {
-    properties: Record<string, DashboardGlobalVariable>;
+    properties: DashboardGlobalVariableSchemaProperties;
 }
+export type DashboardGlobalVariableSchemaProperties = Record<string, DashboardGlobalVariable>;
 
 // dashboard variables types
 export type DashboardVariables = SingleSelectDashboardVariables | MultiSelectDashboardVariables;

diff --git a/apps/web/src/api-clients/dashboard/_types/folder-type.ts b/apps/web/src/api-clients/dashboard/_types/folder-type.ts
@@ -0,0 +1,14 @@
+import type { PrivateFolderCreateParameters } from '@/api-clients/dashboard/private-folder/schema/api-verbs/create';
+import type { PrivateFolderDeleteParameters } from '@/api-clients/dashboard/private-folder/schema/api-verbs/delete';
+import type { PrivateFolderUpdateParameters } from '@/api-clients/dashboard/private-folder/schema/api-verbs/update';
+import type { PrivateFolderModel } from '@/api-clients/dashboard/private-folder/schema/model';
+import type { PublicFolderCreateParameters } from '@/api-clients/dashboard/public-folder/schema/api-verbs/create';
+import type { PublicFolderDeleteParameters } from '@/api-clients/dashboard/public-folder/schema/api-verbs/delete';
+import type { PublicFolderUpdateParameters } from '@/api-clients/dashboard/public-folder/schema/api-verbs/update';
+import type { PublicFolderModel } from '@/api-clients/dashboard/public-folder/schema/model';
+
+
+export type FolderModel = PublicFolderModel | PrivateFolderModel;
+export type FolderCreateParams = PublicFolderCreateParameters | PrivateFolderCreateParameters;
+export type FolderUpdateParams = PublicFolderUpdateParameters | PrivateFolderUpdateParameters;
+export type FolderDeleteParams = PublicFolderDeleteParameters | PrivateFolderDeleteParameters;
diff --git a/...rc/schema/dashboard/_types/widget-type.ts → ...i-clients/dashboard/_types/widget-type.ts b/...rc/schema/dashboard/_types/widget-type.ts → ...i-clients/dashboard/_types/widget-type.ts
@@ -1,24 +1,42 @@
 import type { ConsoleFilterOperator } from '@cloudforet/core-lib/query/type';
 
+import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list';
 import type {
     WIDGET_OPTION_FILTER_KEY_MAP, WIDGET_OPTION_KEYS,
     ASSET_DATA_FIELD_MAP, CHART_TYPE,
     COST_DATA_FIELD_MAP,
     GRANULARITY,
     WIDGET_SIZE,
-} from '@/schema/dashboard/_constants/widget-constant';
-import type { PrivateWidgetListParameters } from '@/schema/dashboard/private-widget/api-verbs/list';
-import type { PrivateWidgetModel } from '@/schema/dashboard/private-widget/model';
-import type { PublicWidgetListParameters } from '@/schema/dashboard/public-widget/api-verbs/list';
-import type { PublicWidgetModel } from '@/schema/dashboard/public-widget/model';
+} from '@/api-clients/dashboard/_constants/widget-constant';
+import type { PrivateWidgetCreateParameters } from '@/api-clients/dashboard/private-widget/schema/api-verbs/create';
+import type { PrivateWidgetDeleteParameters } from '@/api-clients/dashboard/private-widget/schema/api-verbs/delete';
+import type { PrivateWidgetListParameters } from '@/api-clients/dashboard/private-widget/schema/api-verbs/list';
+import type { PrivateWidgetLoadParameters } from '@/api-clients/dashboard/private-widget/schema/api-verbs/load';
+import type { PrivateWidgetLoadSumParameters } from '@/api-clients/dashboard/private-widget/schema/api-verbs/load-sum';
+import type { PrivateWidgetUpdateParameters } from '@/api-clients/dashboard/private-widget/schema/api-verbs/update';
+import type { PrivateWidgetModel } from '@/api-clients/dashboard/private-widget/schema/model';
+import type { PublicWidgetCreateParameters } from '@/api-clients/dashboard/public-widget/schema/api-verbs/create';
+import type { PublicWidgetDeleteParameters } from '@/api-clients/dashboard/public-widget/schema/api-verbs/delete';
+import type { PublicWidgetListParameters } from '@/api-clients/dashboard/public-widget/schema/api-verbs/list';
+import type { PublicWidgetLoadParameters } from '@/api-clients/dashboard/public-widget/schema/api-verbs/load';
+import type { PublicWidgetLoadSumParameters } from '@/api-clients/dashboard/public-widget/schema/api-verbs/load-sum';
+import type { PublicWidgetUpdateParameters } from '@/api-clients/dashboard/public-widget/schema/api-verbs/update';
+import type { PublicWidgetModel } from '@/api-clients/dashboard/public-widget/schema/model';
 
 import type { VariableModelType } from '@/lib/variable-models';
 import type { ManagedVariableModelKey } from '@/lib/variable-models/managed-model-config/base-managed-model-config';
 
+import type { DataInfo, LabelsInfo } from '@/common/modules/widgets/types/widget-model';
+
 
 
 export type WidgetModel = PublicWidgetModel | PrivateWidgetModel;
 export type WidgetListParams = PublicWidgetListParameters|PrivateWidgetListParameters;
+export type WidgetCreateParams = PublicWidgetCreateParameters| PrivateWidgetCreateParameters;
+export type WidgetUpdateParams = PublicWidgetUpdateParameters| PrivateWidgetUpdateParameters;
+export type WidgetDeleteParams = PublicWidgetDeleteParameters| PrivateWidgetDeleteParameters;
+export type WidgetLoadParams = PublicWidgetLoadParameters| PrivateWidgetLoadParameters;
+export type WidgetLoadSumParams = PublicWidgetLoadSumParameters| PrivateWidgetLoadSumParameters;
 
 interface WidgetItemOptions {
     type: VariableModelType;
@@ -134,4 +152,16 @@ export type InheritOptions = Partial<Record<WidgetOptionKey, {
     variable_key?: string;
 }>>;
 
+export type WidgetLoadResponse = ListResponse<Record<string, string|number>> & {
+    labels_info: LabelsInfo;
+    data_info: DataInfo;
+    order?: string[];
+};
+
+export type DataTableLoadResponse = ListResponse<Record<string, string|number>> & {
+    labels_info: LabelsInfo;
+    data_info: DataInfo;
+    order?: string[];
+};
+