From 876539775f934eaf17d8ae88553355dc0c8221ed Mon Sep 17 00:00:00 2001 From: nayeongkim Date: Tue, 11 Feb 2025 15:39:44 +0900 Subject: [PATCH 01/62] chore: changed z-index at custom overlay Signed-off-by: NaYeong,Kim --- apps/web/src/common/components/forms/pairs-form/PairsForm.vue | 2 +- .../components/CloudServiceHistoryDetailOverlay.vue | 2 +- .../components/CloudServiceHistoryDetailOverlay.vue | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/web/src/common/components/forms/pairs-form/PairsForm.vue b/apps/web/src/common/components/forms/pairs-form/PairsForm.vue index 95ee27fb67..be090e0ff4 100644 --- a/apps/web/src/common/components/forms/pairs-form/PairsForm.vue +++ b/apps/web/src/common/components/forms/pairs-form/PairsForm.vue @@ -102,7 +102,7 @@ onMounted(() => { height: calc(100vh - $(top-bar-height)); top: $top-bar-height; left: 0; - z-index: 1030; + z-index: 1020; background-color: $bg-color; .page-wrapper { diff --git a/apps/web/src/services/asset-inventory-v1/components/CloudServiceHistoryDetailOverlay.vue b/apps/web/src/services/asset-inventory-v1/components/CloudServiceHistoryDetailOverlay.vue index a552503629..5a2a9ddc33 100644 --- a/apps/web/src/services/asset-inventory-v1/components/CloudServiceHistoryDetailOverlay.vue +++ b/apps/web/src/services/asset-inventory-v1/components/CloudServiceHistoryDetailOverlay.vue @@ -261,7 +261,7 @@ export default defineComponent({ top: $top-bar-height; left: 0; flex-direction: column; - z-index: 1030; + z-index: 1020; /* transition: opacity 0.3s ease; */ max-height: 100%; diff --git a/apps/web/src/services/asset-inventory/components/CloudServiceHistoryDetailOverlay.vue b/apps/web/src/services/asset-inventory/components/CloudServiceHistoryDetailOverlay.vue index c15a55f394..ceef0ccd3a 100644 --- a/apps/web/src/services/asset-inventory/components/CloudServiceHistoryDetailOverlay.vue +++ b/apps/web/src/services/asset-inventory/components/CloudServiceHistoryDetailOverlay.vue @@ -261,7 +261,7 @@ export default defineComponent({ top: $top-bar-height; left: 0; flex-direction: column; - z-index: 1030; + z-index: 1020; /* transition: opacity 0.3s ease; */ max-height: 100%; From 5e751d8266b1d1135958304c789959639611c51e Mon Sep 17 00:00:00 2001 From: Yongtae Park Date: Sat, 1 Feb 2025 01:37:29 +0900 Subject: [PATCH 02/62] feat(api-clients): create api-clients directory (common, dashboard) Signed-off-by: samuel.park --- .../_common/composables/use-query-key.ts | 0 .../_common/schema}/api-verbs/analyze.ts | 0 .../_common/schema}/api-verbs/export.ts | 0 .../_common/schema}/api-verbs/list.ts | 0 .../_common/schema}/constant.ts | 0 .../_common/schema}/model.ts | 0 .../_common/schema}/type.ts | 2 +- .../_constants/dashboard-constant.ts | 0 .../dashboard/_constants/widget-constant.ts | 0 .../_types/dashboard-global-variable-type.ts | 0 .../dashboard/_types/dashboard-type.ts | 30 +++++++++---------- .../dashboard/_types/folder-type.ts | 11 +++++++ .../dashboard/_types/widget-type.ts | 10 +++---- .../composables/use-private-dashboard-api.ts | 0 .../schema}/api-verbs/change-folder.ts | 0 .../schema}/api-verbs/create.ts | 4 +-- .../schema}/api-verbs/delete.ts | 0 .../schema}/api-verbs/get.ts | 0 .../schema}/api-verbs/list.ts | 0 .../schema}/api-verbs/update.ts | 4 +-- .../private-dashboard/schema}/model.ts | 4 +-- .../composables/use-private-data-table-api.ts | 0 .../private-data-table/schema}/model.ts | 2 +- .../composables/use-private-folder-api.ts | 0 .../schema}/api-verbs/create.ts | 2 +- .../schema}/api-verbs/delete.ts | 0 .../private-folder/schema}/api-verbs/list.ts | 0 .../schema}/api-verbs/update.ts | 2 +- .../dashboard/private-folder/schema}/model.ts | 2 +- .../composables/use-private-widget-api.ts | 0 .../schema}/api-verbs/create.ts | 2 +- .../schema}/api-verbs/delete.ts | 0 .../private-widget/schema}/api-verbs/get.ts | 0 .../private-widget/schema}/api-verbs/list.ts | 0 .../schema}/api-verbs/load-sum.ts | 2 +- .../private-widget/schema}/api-verbs/load.ts | 4 +-- .../schema}/api-verbs/update.ts | 2 +- .../dashboard/private-widget/schema}/model.ts | 2 +- .../composables/use-public-dashboard-api.ts | 0 .../schema}/api-verbs/change-folder.ts | 0 .../schema}/api-verbs/create.ts | 6 ++-- .../schema}/api-verbs/delete.ts | 0 .../public-dashboard/schema}/api-verbs/get.ts | 0 .../schema}/api-verbs/list.ts | 0 .../schema}/api-verbs/share.ts | 2 +- .../schema}/api-verbs/unshare.ts | 0 .../schema}/api-verbs/update.ts | 4 +-- .../public-dashboard/schema}/model.ts | 6 ++-- .../composables/use-public-data-table-api.ts | 0 .../schema}/api-verbs/add.ts | 4 +-- .../schema}/api-verbs/delete.ts | 0 .../schema}/api-verbs/get.ts | 0 .../schema}/api-verbs/list.ts | 0 .../schema/api-verbs/load.ts | 15 ++++++++++ .../schema}/api-verbs/transform.ts | 4 +-- .../schema}/api-verbs/update.ts | 4 +-- .../public-data-table/schema}/model.ts | 4 +-- .../composables/use-public-folder-api.ts | 0 .../public-folder/schema}/api-verbs/create.ts | 4 +-- .../public-folder/schema}/api-verbs/delete.ts | 0 .../public-folder/schema}/api-verbs/list.ts | 0 .../public-folder/schema}/api-verbs/share.ts | 0 .../schema}/api-verbs/unshare.ts | 0 .../public-folder/schema}/api-verbs/update.ts | 2 +- .../dashboard/public-folder/schema}/model.ts | 4 +-- .../composables/use-public-widget-api.ts | 0 .../public-widget/schema}/api-verbs/create.ts | 2 +- .../public-widget/schema}/api-verbs/delete.ts | 0 .../public-widget/schema}/api-verbs/get.ts | 0 .../public-widget/schema}/api-verbs/list.ts | 0 .../schema}/api-verbs/load-sum.ts | 2 +- .../public-widget/schema}/api-verbs/load.ts | 4 +-- .../public-widget/schema}/api-verbs/update.ts | 2 +- .../dashboard/public-widget/schema}/model.ts | 4 +-- .../common/components/inputs/TagsInput.vue | 2 +- .../__tests__/index.test.ts | 2 +- .../editor-content-transformer/index.ts | 2 +- .../custom-field-modal/CustomFieldModal.vue | 2 +- .../favorite-button/store/favorite-store.ts | 2 +- .../modules/navigations/stores/gnb-store.ts | 2 +- .../modules/TopBarNoticeContextMenu.vue | 2 +- .../TopBarNotificationsContextMenu.vue | 2 +- .../modules/popup/notice/NoticePopup.vue | 2 +- .../WidgetFormDataSourcePopover.vue | 10 +++---- .../_components/WidgetFormDataTableCard.vue | 4 +-- .../WidgetFormDataTableCardAddContents.vue | 6 ++-- .../WidgetFormDataTableCardFiltersItem.vue | 2 +- ...getFormDataTableCardTransformAddLabels.vue | 4 +-- ...dgetFormDataTableCardTransformContents.vue | 4 +-- ...dgetFormDataTableCardTransformEvaluate.vue | 4 +-- .../WidgetFormDataTableCardTransformJoin.vue | 4 +-- ...getFormDataTableCardTransformPivotForm.vue | 6 ++-- ...FormDataTableCardTransformValueMapping.vue | 4 +-- ...tFormDataTableGlobalVariableViewButton.vue | 2 +- .../widgets/_components/WidgetFormOverlay.vue | 8 ++--- .../WidgetFormOverlayPreviewTable.vue | 8 ++--- .../_components/WidgetFormOverlayStep1.vue | 4 +-- .../_components/WidgetFormOverlayStep2.vue | 2 +- .../WidgetFormOverlayStep2WidgetForm.vue | 4 +-- .../widgets/_components/WidgetFrame.vue | 4 +-- .../widgets/_composables/use-widget-frame.ts | 10 +++---- .../widget-inherit-options-helper.test.ts | 4 +-- .../widget-options-filters-helper.test.ts | 2 +- .../__tests__/widget-schema-helper.test.ts | 4 +-- .../_helpers/global-variable-helper.ts | 2 +- .../_helpers/widget-data-table-helper.ts | 4 +-- .../modules/widgets/_helpers/widget-helper.ts | 6 ++-- .../widgets/_helpers/widget-width-helper.ts | 4 +-- .../widgets/_store/widget-generate-store.ts | 24 +++++++-------- .../_widget-field-value-manager/index.ts | 4 +-- .../_widget-field-value-manager/type.ts | 4 +-- .../WidgetFieldCustomTableColumnWidth.vue | 4 +-- .../WidgetFieldDataFieldHeatmapColor.vue | 4 +-- .../data-field/WidgetFieldDataField.vue | 4 +-- .../date-range/WidgetFieldDateRange.vue | 2 +- .../number-format/WidgetFieldNumberFormat.vue | 4 +-- .../sub-total/WidgetFieldSubTotal.vue | 4 +-- .../WidgetFieldTableColumnComparison.vue | 4 +-- .../ClusteredColumnChart.vue | 8 ++--- .../color-coded-heatmap/ColorCodedHeatmap.vue | 8 ++--- .../ColorCodedTableHeatmap.vue | 8 ++--- .../modules/widgets/_widgets/gauge/Gauge.vue | 8 ++--- .../widgets/_widgets/geo-map/GeoMap.vue | 8 ++--- .../widgets/_widgets/heatmap/Heatmap.vue | 8 ++--- .../widgets/_widgets/line-chart/LineChart.vue | 8 ++--- .../_widgets/number-card/NumberCard.vue | 8 ++--- .../widgets/_widgets/pie-chart/PieChart.vue | 8 ++--- .../_widgets/sankey-chart/SankeyChart.vue | 8 ++--- .../StackedColumnChart.vue | 8 ++--- .../StackedHorizontalBarChart.vue | 8 ++--- .../modules/widgets/_widgets/table/Table.vue | 12 ++++---- .../table/_component/WidgetDataTable.vue | 4 +-- .../widgets/_widgets/treemap/Treemap.vue | 8 ++--- .../modules/widgets/types/widget-data-type.ts | 2 +- .../widgets/types/widget-display-type.ts | 6 ++-- .../widgets/types/widget-frame-type.ts | 2 +- .../workspace/WorkspaceSelectDropdown.vue | 2 +- .../src/common/pages/CostReportDetailPage.vue | 2 +- apps/web/src/lib/file-manager/type.ts | 2 +- apps/web/src/lib/helper/config-data-helper.ts | 2 +- .../lib/helper/file-download-helper/index.ts | 2 +- .../last-accessed-workspace.ts | 2 +- .../resource-model/project-variable-model.ts | 2 +- apps/web/src/schema/add-ons/favorite/list.ts | 2 +- .../escalation-policy/api-verbs/create.ts | 2 +- .../escalation-policy/api-verbs/update.ts | 2 +- .../alert-manager/escalation-policy/model.ts | 2 +- .../event-rule/api-verbs/create.ts | 2 +- .../event-rule/api-verbs/update.ts | 2 +- .../schema/alert-manager/event-rule/model.ts | 2 +- .../notification-protocol/api-verbs/create.ts | 2 +- .../notification-protocol/api-verbs/update.ts | 2 +- .../notification-protocol/model.ts | 2 +- .../api-verbs/create-forward-channel.ts | 2 +- .../service-channel/api-verbs/create.ts | 2 +- .../service-channel/api-verbs/update.ts | 2 +- .../alert-manager/service-channel/model.ts | 2 +- .../alert-manager/service/api-verbs/create.ts | 2 +- .../alert-manager/service/api-verbs/update.ts | 2 +- .../src/schema/alert-manager/service/model.ts | 2 +- .../user-channel/api-verbs/create.ts | 2 +- .../user-channel/api-verbs/update.ts | 2 +- .../alert-manager/user-channel/model.ts | 2 +- .../user-group-channel/api-verbs/create.ts | 2 +- .../user-group-channel/api-verbs/update.ts | 2 +- .../alert-manager/user-group-channel/model.ts | 2 +- .../alert-manager/webhook/api-verbs/create.ts | 2 +- .../alert-manager/webhook/api-verbs/update.ts | 2 +- .../src/schema/alert-manager/webhook/model.ts | 2 +- .../src/schema/board/post/api-verbs/create.ts | 2 +- apps/web/src/schema/board/post/model.ts | 2 +- .../src/schema/config/domain-config/model.ts | 2 +- .../src/schema/config/public-config/model.ts | 2 +- .../config/shared-config/api-verbs/create.ts | 2 +- .../src/schema/config/shared-config/model.ts | 4 +-- .../config/user-config/api-verbs/create.ts | 2 +- .../config/user-config/api-verbs/set.ts | 2 +- .../config/user-config/api-verbs/update.ts | 2 +- .../src/schema/config/user-config/model.ts | 2 +- .../budget-usage/api-verbs/analyze.ts | 2 +- .../cost-analysis/budget-usage/model.ts | 2 +- .../cost-analysis/budget/api-verbs/create.ts | 4 +-- .../cost-analysis/budget/api-verbs/update.ts | 2 +- .../src/schema/cost-analysis/budget/model.ts | 4 +-- .../cost-query-set/api-verbs/create.ts | 2 +- .../cost-query-set/api-verbs/update.ts | 2 +- .../cost-analysis/cost-query-set/model.ts | 2 +- .../src/schema/cost-analysis/cost/model.ts | 2 +- .../schema/cost-analysis/data-source/model.ts | 6 ++-- .../web/src/schema/cost-analysis/job/model.ts | 2 +- .../schema/dashboard/_types/folder-type.ts | 11 ------- .../public-data-table/api-verbs/load.ts | 15 ---------- .../src/schema/file-manager/api-verbs/add.ts | 4 +-- .../schema/file-manager/api-verbs/update.ts | 2 +- apps/web/src/schema/file-manager/model.ts | 4 +-- .../schema/identity/app/api-verbs/create.ts | 4 +-- .../schema/identity/app/api-verbs/update.ts | 2 +- apps/web/src/schema/identity/app/model.ts | 4 +-- apps/web/src/schema/identity/domain/model.ts | 2 +- .../identity/package/api-verbs/create.ts | 2 +- .../identity/package/api-verbs/update.ts | 2 +- apps/web/src/schema/identity/package/model.ts | 2 +- .../schema/identity/project-group/model.ts | 2 +- apps/web/src/schema/identity/project/model.ts | 2 +- .../identity/provider/api-verbs/create.ts | 2 +- .../identity/provider/api-verbs/update.ts | 2 +- .../web/src/schema/identity/provider/model.ts | 2 +- .../identity/role-binding/api-verbs/create.ts | 2 +- .../identity/role-binding/api-verbs/list.ts | 2 +- .../src/schema/identity/role-binding/model.ts | 2 +- .../schema/identity/role/api-verbs/create.ts | 2 +- .../schema/identity/role/api-verbs/update.ts | 2 +- apps/web/src/schema/identity/role/model.ts | 2 +- .../identity/schema/api-verbs/create.ts | 2 +- .../identity/schema/api-verbs/update.ts | 2 +- apps/web/src/schema/identity/schema/model.ts | 2 +- .../service-account/api-verbs/create.ts | 2 +- .../service-account/api-verbs/update.ts | 2 +- .../schema/identity/service-account/model.ts | 2 +- .../trusted-account/api-verbs/create.ts | 4 +-- .../trusted-account/api-verbs/update.ts | 2 +- .../schema/identity/trusted-account/model.ts | 4 +-- .../identity/user-group/api-verbs/create.ts | 2 +- .../identity/user-group/api-verbs/update.ts | 2 +- .../src/schema/identity/user-group/model.ts | 2 +- .../identity/user-profile/api-verbs/update.ts | 2 +- .../src/schema/identity/user-profile/model.ts | 2 +- .../schema/identity/user/api-verbs/create.ts | 2 +- .../schema/identity/user/api-verbs/update.ts | 2 +- apps/web/src/schema/identity/user/model.ts | 2 +- .../identity/workspace-group-user/model.ts | 2 +- .../workspace-group/api-verbs/create.ts | 2 +- .../workspace-group/api-verbs/update.ts | 2 +- .../schema/identity/workspace-group/model.ts | 2 +- .../workspace-user/api-verbs/create.ts | 2 +- .../schema/identity/workspace-user/model.ts | 2 +- .../identity/workspace/api-verbs/create.ts | 2 +- .../identity/workspace/api-verbs/update.ts | 2 +- .../src/schema/identity/workspace/model.ts | 2 +- .../namespace-group/api-verbs/create.ts | 2 +- .../namespace-group/api-verbs/update.ts | 2 +- .../inventory-v2/namespace-group/model.ts | 2 +- .../namespace/api-verbs/create.ts | 4 +-- .../inventory-v2/namespace/api-verbs/list.ts | 2 +- .../namespace/api-verbs/update.ts | 2 +- .../schema/inventory-v2/namespace/model.ts | 4 +-- .../cloud-service-query-set/model.ts | 4 +-- .../inventory/cloud-service-type/model.ts | 2 +- .../schema/inventory/cloud-service/model.ts | 2 +- .../collector-rule/api-verbs/create.ts | 2 +- .../collector-rule/api-verbs/update.ts | 2 +- .../schema/inventory/collector-rule/model.ts | 2 +- .../inventory/collector/api-verbs/create.ts | 4 +-- .../inventory/collector/api-verbs/update.ts | 2 +- .../src/schema/inventory/collector/model.ts | 4 +-- apps/web/src/schema/inventory/job/model.ts | 2 +- .../metric-example/api-verbs/create.ts | 2 +- .../metric-example/api-verbs/update.ts | 2 +- .../schema/inventory/metric-example/model.ts | 2 +- .../inventory/metric/api-verbs/create.ts | 4 +-- .../inventory/metric/api-verbs/update.ts | 2 +- apps/web/src/schema/inventory/metric/model.ts | 2 +- .../src/schema/inventory/namespace/model.ts | 2 +- apps/web/src/schema/inventory/region/model.ts | 2 +- .../schema/monitoring/alert/api-verbs/list.ts | 2 +- .../schema/monitoring/data-source/model.ts | 2 +- .../escalation-policy/api-verbs/list.ts | 2 +- .../escalation-policy/api-verbs/update.ts | 2 +- .../monitoring/escalation-policy/model.ts | 4 +-- .../monitoring/event-rule/api-verbs/create.ts | 2 +- .../monitoring/event-rule/api-verbs/update.ts | 2 +- .../src/schema/monitoring/event-rule/model.ts | 4 +-- .../monitoring/webhook/api-verbs/create.ts | 2 +- .../monitoring/webhook/api-verbs/update.ts | 2 +- .../src/schema/monitoring/webhook/model.ts | 2 +- .../project-channel/api-verbs/create.ts | 2 +- .../project-channel/api-verbs/update.ts | 2 +- .../notification/project-channel/model.ts | 2 +- .../notification/protocol/api-verbs/create.ts | 2 +- .../notification/protocol/api-verbs/update.ts | 2 +- .../src/schema/notification/protocol/model.ts | 2 +- .../user-channel/api-verbs/create.ts | 2 +- .../user-channel/api-verbs/update.ts | 2 +- .../schema/notification/user-channel/model.ts | 2 +- apps/web/src/schema/opsflow/comment/model.ts | 2 +- .../opsflow/task-category/api-verbs/create.ts | 2 +- .../opsflow/task-category/api-verbs/update.ts | 2 +- .../src/schema/opsflow/task-category/model.ts | 2 +- .../opsflow/task-type/api-verbs/create.ts | 2 +- .../opsflow/task-type/api-verbs/update.ts | 2 +- .../web/src/schema/opsflow/task-type/model.ts | 2 +- .../repository/dashboard-template/model.ts | 2 +- .../repository/plugin/api-verbs/register.ts | 2 +- .../repository/plugin/api-verbs/update.ts | 2 +- .../web/src/schema/repository/plugin/model.ts | 2 +- .../schema/secret/secret/api-verbs/create.ts | 4 +-- apps/web/src/schema/secret/secret/model.ts | 4 +-- .../secret/trusted-secret/api-verbs/create.ts | 4 +-- .../secret/trusted-secret/api-verbs/update.ts | 2 +- .../src/schema/secret/trusted-secret/model.ts | 4 +-- .../WorkspaceGroupAddUsersModal.vue | 2 +- .../WorkspaceGroupAddWorkspacesModal.vue | 2 +- .../components/WorkspaceGroupCreateModal.vue | 2 +- .../components/WorkspaceGroupTabGroupUser.vue | 2 +- .../WorkspaceTagManagementTabContents.vue | 2 +- .../composables/use-select-drop-down-list.ts | 2 +- ...nSettingsAutoDormancyConfigurationPage.vue | 2 +- .../pages/admin/AdminWorkspaceGroupPage.vue | 2 +- .../advanced/store/bookmark-page-store.ts | 2 +- .../store/workspace-group-page-store.ts | 2 +- .../advanced/store/workspace-page-store.ts | 2 +- .../AlertDashboardAlertStateWidget.vue | 2 +- ...tDashboardProjectSearchWidgetAlertList.vue | 2 +- ...hboardTop5ProjectActivityWidgetTooltip.vue | 2 +- .../components/AlertDetailNote.vue | 2 +- .../components/AlertDetailResponder.vue | 2 +- .../components/AlertDetailTabsPushedEvent.vue | 2 +- .../EscalationPolicyFormRulesInput.vue | 4 +-- .../helpers/alert-badge-helper.ts | 2 +- .../pages/AlertDashboardPage.vue | 2 +- .../pages/EscalationPolicyPage.vue | 2 +- .../stores/alert-assign-user-store.ts | 2 +- .../components/AlertDetailNote.vue | 2 +- .../components/AlertDetailTabsTimeline.vue | 2 +- .../ServiceDetailTabsNotifications.vue | 2 +- .../ServiceDetailTabsOverviewNotification.vue | 2 +- .../ServiceDetailTabsOverviewStatusTable.vue | 2 +- .../ServiceDetailTabsOverviewWebhook.vue | 2 +- ...viceDetailTabsSettingsEscalationPolicy.vue | 2 +- ...ngsEscalationPolicyFormChannelDropdown.vue | 2 +- ...DetailTabsSettingsEventRuleActionAlert.vue | 2 +- ...eDetailTabsSettingsEventRuleScopeModal.vue | 2 +- .../components/ServiceDetailTabsWebhook.vue | 2 +- .../ServiceDetailTabsWebhookDetail.vue | 2 +- .../alert-manager/components/ServiceList.vue | 2 +- .../components/WebhookCreateForm.vue | 2 +- .../components/WebhookCreateTypeSelector.vue | 2 +- .../alert-manager/stores/alert-page-store.ts | 2 +- .../stores/service-create-form-store.ts | 2 +- .../stores/service-detail-page-store.ts | 2 +- .../components/CloudServiceAlertsTab.vue | 2 +- .../components/CloudServiceDetail.vue | 6 ++-- ...oudServiceDetailExcelExportOptionModal.vue | 4 +-- ...CloudServiceDetailMultipleSelectedData.vue | 6 ++-- .../CloudServiceExcelExportOptionModal.vue | 4 +-- .../components/CloudServiceHistory.vue | 2 +- .../CloudServiceHistoryDetailNoteTab.vue | 2 +- .../components/CloudServiceLogTab.vue | 2 +- .../CollectorAdditionalRuleForm.vue | 2 +- .../components/CollectorCreateStep1.vue | 2 +- .../CollectorCreateStep1SearchFilter.vue | 2 +- .../components/CollectorCreateStep4.vue | 2 +- .../components/CollectorDataModal.vue | 2 +- ...CollectorDetailAttachedServiceAccounts.vue | 2 +- .../components/CollectorDetailTags.vue | 2 +- .../CollectorHistoryJobTaskTable.vue | 2 +- .../components/MetricExplorerChart.vue | 2 +- .../components/MetricExplorerDataTable.vue | 2 +- .../components/MetricExplorerDonutChart.vue | 2 +- .../components/MetricExplorerHeader.vue | 2 +- .../MetricExplorerHorizontalColumnChart.vue | 2 +- .../components/MetricExplorerLineChart.vue | 2 +- .../components/MetricExplorerMapChart.vue | 2 +- .../MetricExplorerQueryFormSidebar.vue | 2 +- .../ServiceAccountAttachedGeneralAccounts.vue | 2 +- .../ServiceAccountBaseInformationForm.vue | 2 +- .../ServiceAccountCredentialsForm.vue | 2 +- .../components/ServiceAccountEditModal.vue | 2 +- .../components/WorkspaceDropdown.vue | 2 +- .../asset-analysis-chart-data-helper.ts | 2 +- .../dynamic-ui-schema-generator/index.ts | 2 +- .../pages/CloudServiceDetailPage.vue | 6 ++-- .../pages/CollectorHistoryPage.vue | 2 +- .../pages/CollectorMainPage.vue | 2 +- .../pages/ServiceAccountPage.vue | 2 +- .../pages/admin/AdminCollectorHistoryPage.vue | 2 +- .../pages/admin/AdminCollectorMainPage.vue | 2 +- .../stores/cloud-service-detail-page-store.ts | 2 +- .../stores/collector-data-modal-store.ts | 2 +- .../stores/collector-form-store.ts | 2 +- .../stores/collector-job-store.ts | 2 +- .../stores/collector-page-store.ts | 2 +- .../stores/metric-explorer-page-store.ts | 2 +- .../stores/service-account-page-store.ts | 2 +- .../stores/service-account-schema-store.ts | 2 +- .../types/collector-main-page-type.ts | 2 +- .../components/CloudServiceDetail.vue | 6 ++-- ...oudServiceDetailExcelExportOptionModal.vue | 4 +-- ...CloudServiceDetailMultipleSelectedData.vue | 6 ++-- .../CloudServiceExcelExportOptionModal.vue | 4 +-- .../components/CloudServiceHistory.vue | 2 +- .../CloudServiceHistoryDetailNoteTab.vue | 2 +- .../components/CloudServiceLogTab.vue | 2 +- .../CollectorAdditionalRuleForm.vue | 2 +- .../components/CollectorCreateStep1.vue | 2 +- .../CollectorCreateStep1SearchFilter.vue | 2 +- .../components/CollectorCreateStep4.vue | 2 +- .../components/CollectorDataModal.vue | 2 +- ...CollectorDetailAttachedServiceAccounts.vue | 2 +- .../components/CollectorDetailTags.vue | 2 +- .../CollectorHistoryJobTaskTable.vue | 2 +- .../components/MetricExplorerChart.vue | 2 +- .../components/MetricExplorerDataTable.vue | 2 +- .../components/MetricExplorerDonutChart.vue | 2 +- .../components/MetricExplorerHeader.vue | 2 +- .../MetricExplorerHorizontalColumnChart.vue | 2 +- .../components/MetricExplorerLineChart.vue | 2 +- .../components/MetricExplorerMapChart.vue | 2 +- .../MetricExplorerQueryFormSidebar.vue | 2 +- .../ServiceAccountAttachedGeneralAccounts.vue | 2 +- .../ServiceAccountBaseInformationForm.vue | 2 +- .../ServiceAccountCredentialsForm.vue | 2 +- .../components/ServiceAccountEditModal.vue | 2 +- .../components/WorkspaceDropdown.vue | 2 +- .../asset-analysis-chart-data-helper.ts | 2 +- .../dynamic-ui-schema-generator/index.ts | 2 +- .../pages/CloudServiceDetailPage.vue | 6 ++-- .../pages/CollectorHistoryPage.vue | 2 +- .../pages/CollectorMainPage.vue | 2 +- .../pages/ServiceAccountPage.vue | 2 +- .../pages/admin/AdminCollectorHistoryPage.vue | 2 +- .../pages/admin/AdminCollectorMainPage.vue | 2 +- .../stores/cloud-service-detail-page-store.ts | 2 +- .../stores/collector-data-modal-store.ts | 2 +- .../stores/collector-form-store.ts | 2 +- .../stores/collector-job-store.ts | 2 +- .../stores/collector-page-store.ts | 2 +- .../stores/metric-explorer-l-s-b-store.ts | 4 +-- .../stores/metric-explorer-page-store.ts | 2 +- .../stores/service-account-page-store.ts | 2 +- .../stores/service-account-schema-store.ts | 2 +- .../types/collector-main-page-type.ts | 2 +- ...lyDetectionConfigurationRecipientsForm.vue | 2 +- .../components/BudgetCreateTargetSelect.vue | 2 +- .../components/BudgetMainList.vue | 4 +-- .../components/CostAnalysisChart.vue | 2 +- .../components/CostAnalysisDataTable.vue | 2 +- .../CostAnalysisStackedColumnChart.vue | 2 +- ...ostReportMonthlyTotalAmountSummaryCard.vue | 4 +-- .../CostReportOverviewCostTrendCard.vue | 2 +- .../CostReportOverviewCostTrendChart.vue | 2 +- .../components/DataSourceManagementModal.vue | 2 +- ...aSourceManagementTabLinkedAccountTable.vue | 2 +- .../cost-explorer/routes/admin/routes.ts | 2 +- .../stores/budget-detail-page-store.ts | 2 +- .../stores/cost-report-page-store.ts | 2 +- .../stores/data-sources-page-store.ts | 4 +-- .../src/services/dashboards/DashboardsLSB.vue | 2 +- .../dashboard-create/DashboardCreateStep1.vue | 2 +- .../DashboardCreateStep2BundleCase.vue | 6 ++-- .../DashboardCreateStep2SingleCase.vue | 6 ++-- .../dashboard-detail/DashboardCloneModal.vue | 16 +++++----- .../DashboardDetailHeader.vue | 2 +- .../DashboardFolderSingleMoveModal.vue | 2 +- .../DashboardGlobalVariableFilter.vue | 2 +- .../DashboardGlobalVariableFilterEnum.vue | 2 +- ...shboardGlobalVariableFilterNumberInput.vue | 4 +-- ...hboardGlobalVariableFilterNumberSlider.vue | 2 +- ...DashboardGlobalVariableFilterReference.vue | 2 +- ...DashboardGlobalVariableFilterTextInput.vue | 2 +- .../DashboardManageVariableImportModal.vue | 6 ++-- ...DashboardManageVariableImportModalTree.vue | 2 +- .../DashboardManageVariableOverlay.vue | 2 +- .../DashboardNameEditModal.vue | 2 +- .../DashboardRefreshDropdown.vue | 4 +-- .../DashboardReorderSidebar.vue | 4 +-- .../DashboardShareWithCodeModal.vue | 14 ++++----- .../DashboardToolsetDateDropdown.vue | 2 +- .../DashboardToolsetScope.vue | 2 +- .../DashboardVariablesFormDynamic.vue | 2 +- .../DashboardVariablesFormManual.vue | 2 +- .../DashboardVariablesFormModal.vue | 2 +- .../DashboardVariablesMoreButton.vue | 2 +- .../dashboard-detail/DashboardVariablesV2.vue | 4 +-- .../DashboardWidgetContainerV2.vue | 24 +++++++-------- .../DashboardFolderFormModal.vue | 14 ++++----- .../DashboardBundleCloneModal.vue | 4 +-- .../DashboardBundleDeleteModal.vue | 4 +-- .../DashboardBundleMoveModal.vue | 4 +-- .../DashboardBundleShareModal.vue | 12 ++++---- .../dashboard-main/DashboardLSBTree.vue | 2 +- .../dashboard-main/DashboardMainBoardList.vue | 6 ++-- .../legacy/DashboardManageVariableForm.vue | 2 +- .../legacy/DashboardVariableDropdown.vue | 2 +- .../components/legacy/DashboardVariables.vue | 2 +- .../components/legacy/WidgetFullModeModal.vue | 4 +-- .../use-dashboard-control-menu-items.ts | 4 +-- .../use-reformed-widget-info-list.ts | 4 +-- .../dashboard-managed-variables-schema.ts | 2 +- .../constants/dashboard-vars-schema-preset.ts | 2 +- .../constants/widget-container-config.ts | 2 +- .../__tests__/widget-width-helper.test.ts | 2 +- .../dashboard-global-variables-helper.ts | 2 +- .../helpers/dashboard-share-helper.ts | 14 ++++----- .../helpers/dashboard-tree-data-helper.ts | 4 +-- .../helpers/dashboard-widget-info-helper.ts | 2 +- .../dashboards/helpers/widget-width-helper.ts | 4 +-- .../dashboards/pages/DashboardsMainPage.vue | 4 +-- .../stores/dashboard-create-page-store.ts | 4 +-- .../stores/dashboard-detail-info-store.ts | 22 +++++++------- .../stores/dashboard-page-control-store.ts | 12 ++++---- .../dashboards/stores/widget-form-store.ts | 4 +-- .../dashboards/types/shared-dashboard-type.ts | 12 ++++---- .../BaseCountOfFindingsWidget.vue | 2 +- .../base-count-of-findings/widget-config.ts | 4 +-- .../_base-widgets/base-pie/BasePieWidget.vue | 2 +- .../_base-widgets/base-pie/widget-config.ts | 4 +-- .../base-trend/BaseTrendWidget.vue | 4 +-- .../_base-widgets/base-trend/widget-config.ts | 4 +-- .../widgets/_components/WidgetFrame.vue | 6 ++-- .../_composables/use-widget-lifecycle.ts | 4 +-- .../use-widget/merge-base-widget-state.ts | 4 +-- .../use-widget/use-base-widget-state.ts | 2 +- .../use-widget/use-widget-console-filters.ts | 2 +- .../use-widget/use-widget-date-range.ts | 4 +-- .../use-widget/use-widget-frame.ts | 4 +-- .../use-widget/use-widget-location.ts | 2 +- .../_composables/use-widget/use-widget.ts | 2 +- .../managed-widget-options-schema.ts | 2 +- .../_constants/widget-config-list-constant.ts | 2 +- .../widget-inherit-options-helper.test.ts | 4 +-- .../widget-options-filters-helper.test.ts | 2 +- .../__tests__/widget-schema-helper.test.ts | 4 +-- .../widgets/_helpers/widget-chart-helper.ts | 6 ++-- .../widgets/_helpers/widget-config-helper.ts | 2 +- .../_helpers/widget-inherit-options-helper.ts | 4 +-- .../_helpers/widget-location-helper.ts | 2 +- .../_helpers/widget-options-filters-helper.ts | 2 +- .../widgets/_helpers/widget-options-helper.ts | 4 +-- .../widget-options-schema-generator.ts | 2 +- .../widgets/_helpers/widget-schema-helper.ts | 4 +-- .../widgets/_helpers/widget-table-helper.ts | 6 ++-- .../_helpers/widget-validation-helper.ts | 4 +-- .../dashboards/widgets/_types/widget-type.ts | 4 +-- .../compliance-status/widget-config.ts | 2 +- .../count-of-fail-findings/widget-config.ts | 4 +-- .../widget-config.ts | 4 +-- .../widget-config.ts | 2 +- .../TotalFailFindingsHistoryWidget.vue | 4 +-- .../widget-config.ts | 4 +-- .../widget-config.ts | 2 +- .../TrendOfPassAndFailFindingsWidget.vue | 4 +-- .../widget-config.ts | 4 +-- .../budget-status/widget-config.ts | 4 +-- .../BudgetUsageByTargetWidget.vue | 2 +- .../budget-usage-by-target/widget-config.ts | 4 +-- .../BudgetUsageSummaryWidget.vue | 2 +- .../budget-usage-summary/widget-config.ts | 4 +-- .../CostByRegionMultiFieldsWidget.vue | 2 +- .../widget-config.ts | 4 +-- .../cost-by-region/CostByRegionWidget.vue | 2 +- .../cost-by-region/widget-config.ts | 4 +-- .../cost-widgets/cost-donut/widget-config.ts | 4 +-- .../cost-widgets/cost-map/CostMapWidget.vue | 4 +-- .../cost-map/costmap-chart-data-helper.ts | 2 +- .../cost-widgets/cost-map/widget-config.ts | 4 +-- .../cost-widgets/cost-pie/widget-config.ts | 4 +-- .../CostSummaryMultiFieldsWidget.vue | 2 +- .../widget-config.ts | 4 +-- .../cost-trend-stacked/widget-config.ts | 4 +-- .../cost-widgets/cost-trend/widget-config.ts | 4 +-- .../monthly-cost/MonthlyCostWidget.vue | 2 +- .../monthly-cost/widget-config.ts | 4 +-- .../iam/components/AppManagementFormModal.vue | 8 ++--- .../iam/components/RoleDeleteModal.vue | 2 +- .../UserGroupChannelAddFormData.vue | 2 +- ...rGroupManagementTabNotificationChannel.vue | 2 +- .../UserGroupManagementTabUsers.vue | 2 +- .../components/UserManagementAddAdminRole.vue | 2 +- .../iam/components/UserManagementAddModal.vue | 4 +-- .../iam/components/UserManagementAddRole.vue | 2 +- .../iam/components/UserManagementAddTag.vue | 2 +- .../UserManagementFormAdminRole.vue | 2 +- .../components/UserManagementFormModal.vue | 6 ++-- .../iam/components/UserManagementTab.vue | 2 +- .../UserManagementTabAssignedRole.vue | 2 +- .../components/UserManagementTabProjects.vue | 2 +- .../iam/components/UserManagementTabTag.vue | 2 +- .../components/UserManagementTabWorkspace.vue | 4 +-- .../iam/components/UserManagementTable.vue | 2 +- .../src/services/iam/composables/tag-data.ts | 2 +- .../user-management-form-validations.ts | 2 +- .../src/services/iam/store/app-page-store.ts | 2 +- .../src/services/iam/store/role-page-store.ts | 2 +- .../iam/store/user-group-page-store.ts | 2 +- .../src/services/iam/store/user-page-store.ts | 2 +- apps/web/src/services/iam/types/user-type.ts | 2 +- .../services/info/components/NoticeDetail.vue | 2 +- .../services/info/components/NoticeForm.vue | 4 +-- .../services/info/components/NoticeList.vue | 2 +- .../components/NoticeWorkspaceDropdown.vue | 2 +- .../pages/admin/AdminNoticeDetailPage.vue | 2 +- .../LandingGroupWorkspaces.vue | 2 +- .../LandingWorkspaceGroupAddUsersModal.vue | 2 +- .../LandingWorkspaceGroupTabGroupUser.vue | 2 +- .../LandingWorkspaceGroupTabWorkspace.vue | 2 +- .../components/NotificationAddFormData.vue | 2 +- .../components/NotificationAddMemberGroup.vue | 2 +- .../components/NotificationChannelList.vue | 4 +-- .../ops-flow/composables/use-task-api.ts | 2 +- .../ops-flow/stores/admin/package-store.ts | 2 +- .../services/ops-flow/stores/comment-store.ts | 2 +- .../ops-flow/stores/task-category-store.ts | 2 +- .../ops-flow/stores/task-detail-page-store.ts | 2 +- .../ops-flow/stores/task-type-store.ts | 2 +- .../field-templates/AssetTaskField.vue | 2 +- .../ProjectAlertEventRuleConditionForm.vue | 2 +- .../ProjectAlertSettingsEscalationPolicy.vue | 2 +- .../components/ProjectAlertSettingsTab.vue | 4 +-- .../ProjectAlertWebhookCreateStep2.vue | 2 +- .../components/ProjectAlertWebhookTab.vue | 2 +- .../components/ProjectDetailTabHeader.vue | 2 +- .../project-v1/components/ProjectMain.vue | 2 +- .../ProjectMainProjectGroupFormModal.vue | 2 +- .../components/ProjectMemberInviteModal.vue | 2 +- .../components/ProjectSummaryAlertWidget.vue | 2 +- .../composables/use-project-tree.ts | 2 +- .../pages/ProjectAlertEventRulePage.vue | 2 +- .../project-v1/pages/ProjectAlertPage.vue | 2 +- .../project-v1/pages/ProjectSummaryPage.vue | 2 +- .../stores/project-detail-page-store.ts | 2 +- .../components/ProjectDetailTabHeader.vue | 2 +- .../project/components/ProjectMain.vue | 2 +- .../ProjectMainProjectGroupFormModal.vue | 2 +- .../components/ProjectMemberInviteModal.vue | 2 +- .../project/composables/use-project-tree.ts | 2 +- .../stores/project-detail-page-store.ts | 2 +- .../components/AccountSummary.vue | 2 +- .../workspace-home/components/CostSummary.vue | 2 +- .../store/workspace-home-page-store.ts | 4 +-- .../workspace/user-workspace-store.ts | 2 +- .../src/store/config/domain-config-store.ts | 2 +- .../src/store/dashboard/dashboard-store.ts | 22 +++++++------- apps/web/src/store/display/display-store.ts | 2 +- apps/web/src/store/notice/index.ts | 2 +- .../store/reference/app-reference-store.ts | 2 +- .../cloud-service-type-reference-store.ts | 2 +- ...cloue-service-query-set-reference-store.ts | 2 +- .../reference/collector-reference-store.ts | 2 +- .../cost-data-source-reference-store.ts | 2 +- .../escalation-policy-reference-store.ts | 2 +- .../store/reference/metric-reference-store.ts | 2 +- .../reference/namespace-reference-store.ts | 2 +- .../store/reference/plugin-reference-store.ts | 2 +- .../project-group-reference-store.ts | 2 +- .../reference/project-reference-store.ts | 2 +- .../reference/protocol-reference-store.ts | 2 +- .../reference/provider-reference-store.ts | 2 +- .../public-dashboard-reference-store.ts | 6 ++-- .../public-folder-reference-store.ts | 6 ++-- .../store/reference/region-reference-store.ts | 2 +- .../store/reference/role-reference-store.ts | 2 +- .../store/reference/secret-reference-store.ts | 2 +- .../service-account-reference-store.ts | 2 +- .../reference/service-reference-store.ts | 2 +- .../trusted-account-reference-store.ts | 2 +- .../reference/user-group-reference-store.ts | 2 +- .../store/reference/user-reference-store.ts | 2 +- .../reference/webhook-reference-store.ts | 2 +- .../workspace-group-reference-store.ts | 2 +- .../reference/workspace-reference-store.ts | 2 +- 661 files changed, 968 insertions(+), 970 deletions(-) create mode 100644 apps/web/src/api-clients/_common/composables/use-query-key.ts rename apps/web/src/{schema/_common => api-clients/_common/schema}/api-verbs/analyze.ts (100%) rename apps/web/src/{schema/_common => api-clients/_common/schema}/api-verbs/export.ts (100%) rename apps/web/src/{schema/_common => api-clients/_common/schema}/api-verbs/list.ts (100%) rename apps/web/src/{schema/_common => api-clients/_common/schema}/constant.ts (100%) rename apps/web/src/{schema/_common => api-clients/_common/schema}/model.ts (100%) rename apps/web/src/{schema/_common => api-clients/_common/schema}/type.ts (73%) rename apps/web/src/{schema => api-clients}/dashboard/_constants/dashboard-constant.ts (100%) rename apps/web/src/{schema => api-clients}/dashboard/_constants/widget-constant.ts (100%) rename apps/web/src/{schema => api-clients}/dashboard/_types/dashboard-global-variable-type.ts (100%) rename apps/web/src/{schema => api-clients}/dashboard/_types/dashboard-type.ts (69%) create mode 100644 apps/web/src/api-clients/dashboard/_types/folder-type.ts rename apps/web/src/{schema => api-clients}/dashboard/_types/widget-type.ts (89%) create mode 100644 apps/web/src/api-clients/dashboard/private-dashboard/composables/use-private-dashboard-api.ts rename apps/web/src/{schema/dashboard/private-dashboard => api-clients/dashboard/private-dashboard/schema}/api-verbs/change-folder.ts (100%) rename apps/web/src/{schema/dashboard/private-dashboard => api-clients/dashboard/private-dashboard/schema}/api-verbs/create.ts (84%) rename apps/web/src/{schema/dashboard/private-dashboard => api-clients/dashboard/private-dashboard/schema}/api-verbs/delete.ts (100%) rename apps/web/src/{schema/dashboard/private-dashboard => api-clients/dashboard/private-dashboard/schema}/api-verbs/get.ts (100%) rename apps/web/src/{schema/dashboard/private-dashboard => api-clients/dashboard/private-dashboard/schema}/api-verbs/list.ts (100%) rename apps/web/src/{schema/dashboard/private-dashboard => api-clients/dashboard/private-dashboard/schema}/api-verbs/update.ts (81%) rename apps/web/src/{schema/dashboard/private-dashboard => api-clients/dashboard/private-dashboard/schema}/model.ts (86%) create mode 100644 apps/web/src/api-clients/dashboard/private-data-table/composables/use-private-data-table-api.ts rename apps/web/src/{schema/dashboard/private-data-table => api-clients/dashboard/private-data-table/schema}/model.ts (91%) create mode 100644 apps/web/src/api-clients/dashboard/private-folder/composables/use-private-folder-api.ts rename apps/web/src/{schema/dashboard/private-folder => api-clients/dashboard/private-folder/schema}/api-verbs/create.ts (68%) rename apps/web/src/{schema/dashboard/private-folder => api-clients/dashboard/private-folder/schema}/api-verbs/delete.ts (100%) rename apps/web/src/{schema/dashboard/private-folder => api-clients/dashboard/private-folder/schema}/api-verbs/list.ts (100%) rename apps/web/src/{schema/dashboard/private-folder => api-clients/dashboard/private-folder/schema}/api-verbs/update.ts (63%) rename apps/web/src/{schema/dashboard/private-folder => api-clients/dashboard/private-folder/schema}/model.ts (77%) create mode 100644 apps/web/src/api-clients/dashboard/private-widget/composables/use-private-widget-api.ts rename apps/web/src/{schema/dashboard/private-widget => api-clients/dashboard/private-widget/schema}/api-verbs/create.ts (89%) rename apps/web/src/{schema/dashboard/private-widget => api-clients/dashboard/private-widget/schema}/api-verbs/delete.ts (100%) rename apps/web/src/{schema/dashboard/private-widget => api-clients/dashboard/private-widget/schema}/api-verbs/get.ts (100%) rename apps/web/src/{schema/dashboard/private-widget => api-clients/dashboard/private-widget/schema}/api-verbs/list.ts (100%) rename apps/web/src/{schema/dashboard/private-widget => api-clients/dashboard/private-widget/schema}/api-verbs/load-sum.ts (65%) rename apps/web/src/{schema/dashboard/private-widget => api-clients/dashboard/private-widget/schema}/api-verbs/load.ts (66%) rename apps/web/src/{schema/dashboard/private-widget => api-clients/dashboard/private-widget/schema}/api-verbs/update.ts (86%) rename apps/web/src/{schema/dashboard/private-widget => api-clients/dashboard/private-widget/schema}/model.ts (93%) create mode 100644 apps/web/src/api-clients/dashboard/public-dashboard/composables/use-public-dashboard-api.ts rename apps/web/src/{schema/dashboard/public-dashboard => api-clients/dashboard/public-dashboard/schema}/api-verbs/change-folder.ts (100%) rename apps/web/src/{schema/dashboard/public-dashboard => api-clients/dashboard/public-dashboard/schema}/api-verbs/create.ts (79%) rename apps/web/src/{schema/dashboard/public-dashboard => api-clients/dashboard/public-dashboard/schema}/api-verbs/delete.ts (100%) rename apps/web/src/{schema/dashboard/public-dashboard => api-clients/dashboard/public-dashboard/schema}/api-verbs/get.ts (100%) rename apps/web/src/{schema/dashboard/public-dashboard => api-clients/dashboard/public-dashboard/schema}/api-verbs/list.ts (100%) rename apps/web/src/{schema/dashboard/public-dashboard => api-clients/dashboard/public-dashboard/schema}/api-verbs/share.ts (55%) rename apps/web/src/{schema/dashboard/public-dashboard => api-clients/dashboard/public-dashboard/schema}/api-verbs/unshare.ts (100%) rename apps/web/src/{schema/dashboard/public-dashboard => api-clients/dashboard/public-dashboard/schema}/api-verbs/update.ts (81%) rename apps/web/src/{schema/dashboard/public-dashboard => api-clients/dashboard/public-dashboard/schema}/model.ts (82%) create mode 100644 apps/web/src/api-clients/dashboard/public-data-table/composables/use-public-data-table-api.ts rename apps/web/src/{schema/dashboard/public-data-table => api-clients/dashboard/public-data-table/schema}/api-verbs/add.ts (67%) rename apps/web/src/{schema/dashboard/public-data-table => api-clients/dashboard/public-data-table/schema}/api-verbs/delete.ts (100%) rename apps/web/src/{schema/dashboard/public-data-table => api-clients/dashboard/public-data-table/schema}/api-verbs/get.ts (100%) rename apps/web/src/{schema/dashboard/public-data-table => api-clients/dashboard/public-data-table/schema}/api-verbs/list.ts (100%) create mode 100644 apps/web/src/api-clients/dashboard/public-data-table/schema/api-verbs/load.ts rename apps/web/src/{schema/dashboard/public-data-table => api-clients/dashboard/public-data-table/schema}/api-verbs/transform.ts (68%) rename apps/web/src/{schema/dashboard/public-data-table => api-clients/dashboard/public-data-table/schema}/api-verbs/update.ts (63%) rename apps/web/src/{schema/dashboard/public-data-table => api-clients/dashboard/public-data-table/schema}/model.ts (85%) create mode 100644 apps/web/src/api-clients/dashboard/public-folder/composables/use-public-folder-api.ts rename apps/web/src/{schema/dashboard/public-folder => api-clients/dashboard/public-folder/schema}/api-verbs/create.ts (63%) rename apps/web/src/{schema/dashboard/public-folder => api-clients/dashboard/public-folder/schema}/api-verbs/delete.ts (100%) rename apps/web/src/{schema/dashboard/public-folder => api-clients/dashboard/public-folder/schema}/api-verbs/list.ts (100%) rename apps/web/src/{schema/dashboard/public-folder => api-clients/dashboard/public-folder/schema}/api-verbs/share.ts (100%) rename apps/web/src/{schema/dashboard/public-folder => api-clients/dashboard/public-folder/schema}/api-verbs/unshare.ts (100%) rename apps/web/src/{schema/dashboard/public-folder => api-clients/dashboard/public-folder/schema}/api-verbs/update.ts (63%) rename apps/web/src/{schema/dashboard/public-folder => api-clients/dashboard/public-folder/schema}/model.ts (72%) create mode 100644 apps/web/src/api-clients/dashboard/public-widget/composables/use-public-widget-api.ts rename apps/web/src/{schema/dashboard/public-widget => api-clients/dashboard/public-widget/schema}/api-verbs/create.ts (89%) rename apps/web/src/{schema/dashboard/public-widget => api-clients/dashboard/public-widget/schema}/api-verbs/delete.ts (100%) rename apps/web/src/{schema/dashboard/public-widget => api-clients/dashboard/public-widget/schema}/api-verbs/get.ts (100%) rename apps/web/src/{schema/dashboard/public-widget => api-clients/dashboard/public-widget/schema}/api-verbs/list.ts (100%) rename apps/web/src/{schema/dashboard/public-widget => api-clients/dashboard/public-widget/schema}/api-verbs/load-sum.ts (65%) rename apps/web/src/{schema/dashboard/public-widget => api-clients/dashboard/public-widget/schema}/api-verbs/load.ts (66%) rename apps/web/src/{schema/dashboard/public-widget => api-clients/dashboard/public-widget/schema}/api-verbs/update.ts (86%) rename apps/web/src/{schema/dashboard/public-widget => api-clients/dashboard/public-widget/schema}/model.ts (87%) delete mode 100644 apps/web/src/schema/dashboard/_types/folder-type.ts delete mode 100644 apps/web/src/schema/dashboard/public-data-table/api-verbs/load.ts 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 new file mode 100644 index 0000000000..e69de29bb2 diff --git a/apps/web/src/schema/_common/api-verbs/analyze.ts b/apps/web/src/api-clients/_common/schema/api-verbs/analyze.ts similarity index 100% rename from apps/web/src/schema/_common/api-verbs/analyze.ts rename to apps/web/src/api-clients/_common/schema/api-verbs/analyze.ts diff --git a/apps/web/src/schema/_common/api-verbs/export.ts b/apps/web/src/api-clients/_common/schema/api-verbs/export.ts similarity index 100% rename from apps/web/src/schema/_common/api-verbs/export.ts rename to apps/web/src/api-clients/_common/schema/api-verbs/export.ts diff --git a/apps/web/src/schema/_common/api-verbs/list.ts b/apps/web/src/api-clients/_common/schema/api-verbs/list.ts similarity index 100% rename from apps/web/src/schema/_common/api-verbs/list.ts rename to apps/web/src/api-clients/_common/schema/api-verbs/list.ts diff --git a/apps/web/src/schema/_common/constant.ts b/apps/web/src/api-clients/_common/schema/constant.ts similarity index 100% rename from apps/web/src/schema/_common/constant.ts rename to apps/web/src/api-clients/_common/schema/constant.ts diff --git a/apps/web/src/schema/_common/model.ts b/apps/web/src/api-clients/_common/schema/model.ts similarity index 100% rename from apps/web/src/schema/_common/model.ts rename to apps/web/src/api-clients/_common/schema/model.ts diff --git a/apps/web/src/schema/_common/type.ts b/apps/web/src/api-clients/_common/schema/type.ts similarity index 73% rename from apps/web/src/schema/_common/type.ts rename to apps/web/src/api-clients/_common/schema/type.ts index 7857281650..54ccf642bd 100644 --- a/apps/web/src/schema/_common/type.ts +++ b/apps/web/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/dashboard/_constants/dashboard-constant.ts b/apps/web/src/api-clients/dashboard/_constants/dashboard-constant.ts similarity index 100% rename from apps/web/src/schema/dashboard/_constants/dashboard-constant.ts rename to apps/web/src/api-clients/dashboard/_constants/dashboard-constant.ts diff --git a/apps/web/src/schema/dashboard/_constants/widget-constant.ts b/apps/web/src/api-clients/dashboard/_constants/widget-constant.ts similarity index 100% rename from apps/web/src/schema/dashboard/_constants/widget-constant.ts rename to apps/web/src/api-clients/dashboard/_constants/widget-constant.ts diff --git a/apps/web/src/schema/dashboard/_types/dashboard-global-variable-type.ts b/apps/web/src/api-clients/dashboard/_types/dashboard-global-variable-type.ts similarity index 100% rename from apps/web/src/schema/dashboard/_types/dashboard-global-variable-type.ts rename to apps/web/src/api-clients/dashboard/_types/dashboard-global-variable-type.ts diff --git a/apps/web/src/schema/dashboard/_types/dashboard-type.ts b/apps/web/src/api-clients/dashboard/_types/dashboard-type.ts similarity index 69% rename from apps/web/src/schema/dashboard/_types/dashboard-type.ts rename to apps/web/src/api-clients/dashboard/_types/dashboard-type.ts index 74e6601cce..d29d40b0d7 100644 --- a/apps/web/src/schema/dashboard/_types/dashboard-type.ts +++ b/apps/web/src/api-clients/dashboard/_types/dashboard-type.ts @@ -1,23 +1,23 @@ 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 { 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 { 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'; diff --git a/apps/web/src/api-clients/dashboard/_types/folder-type.ts b/apps/web/src/api-clients/dashboard/_types/folder-type.ts new file mode 100644 index 0000000000..b27e9eef93 --- /dev/null +++ b/apps/web/src/api-clients/dashboard/_types/folder-type.ts @@ -0,0 +1,11 @@ +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 { 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 { PublicFolderModel } from '@/api-clients/dashboard/public-folder/schema/model'; + + +export type FolderModel = PublicFolderModel & PrivateFolderModel; +export type FolderCreateParams = PublicFolderCreateParameters | PrivateFolderCreateParameters; +export type FolderDeleteParams = PublicFolderDeleteParameters | PrivateFolderDeleteParameters; diff --git a/apps/web/src/schema/dashboard/_types/widget-type.ts b/apps/web/src/api-clients/dashboard/_types/widget-type.ts similarity index 89% rename from apps/web/src/schema/dashboard/_types/widget-type.ts rename to apps/web/src/api-clients/dashboard/_types/widget-type.ts index ba40bf6b15..2df74d13d6 100644 --- a/apps/web/src/schema/dashboard/_types/widget-type.ts +++ b/apps/web/src/api-clients/dashboard/_types/widget-type.ts @@ -6,11 +6,11 @@ import 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 { PrivateWidgetListParameters } from '@/api-clients/dashboard/private-widget/schema/api-verbs/list'; +import type { PrivateWidgetModel } from '@/api-clients/dashboard/private-widget/schema/model'; +import type { PublicWidgetListParameters } from '@/api-clients/dashboard/public-widget/schema/api-verbs/list'; +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'; diff --git a/apps/web/src/api-clients/dashboard/private-dashboard/composables/use-private-dashboard-api.ts b/apps/web/src/api-clients/dashboard/private-dashboard/composables/use-private-dashboard-api.ts new file mode 100644 index 0000000000..e69de29bb2 diff --git a/apps/web/src/schema/dashboard/private-dashboard/api-verbs/change-folder.ts b/apps/web/src/api-clients/dashboard/private-dashboard/schema/api-verbs/change-folder.ts similarity index 100% rename from apps/web/src/schema/dashboard/private-dashboard/api-verbs/change-folder.ts rename to apps/web/src/api-clients/dashboard/private-dashboard/schema/api-verbs/change-folder.ts diff --git a/apps/web/src/schema/dashboard/private-dashboard/api-verbs/create.ts b/apps/web/src/api-clients/dashboard/private-dashboard/schema/api-verbs/create.ts similarity index 84% rename from apps/web/src/schema/dashboard/private-dashboard/api-verbs/create.ts rename to apps/web/src/api-clients/dashboard/private-dashboard/schema/api-verbs/create.ts index ba652f4755..dbb65ed664 100644 --- a/apps/web/src/schema/dashboard/private-dashboard/api-verbs/create.ts +++ b/apps/web/src/api-clients/dashboard/private-dashboard/schema/api-verbs/create.ts @@ -1,9 +1,9 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; import type { DashboardGlobalVariablesSchema, DashboardOptions, DashboardVariables, DashboardVariablesSchema, DashboardVars, -} from '@/schema/dashboard/_types/dashboard-type'; +} from '@/api-clients/dashboard/_types/dashboard-type'; import type { SharedDashboardLayout } from '@/services/dashboards/types/shared-dashboard-type'; diff --git a/apps/web/src/schema/dashboard/private-dashboard/api-verbs/delete.ts b/apps/web/src/api-clients/dashboard/private-dashboard/schema/api-verbs/delete.ts similarity index 100% rename from apps/web/src/schema/dashboard/private-dashboard/api-verbs/delete.ts rename to apps/web/src/api-clients/dashboard/private-dashboard/schema/api-verbs/delete.ts diff --git a/apps/web/src/schema/dashboard/private-dashboard/api-verbs/get.ts b/apps/web/src/api-clients/dashboard/private-dashboard/schema/api-verbs/get.ts similarity index 100% rename from apps/web/src/schema/dashboard/private-dashboard/api-verbs/get.ts rename to apps/web/src/api-clients/dashboard/private-dashboard/schema/api-verbs/get.ts diff --git a/apps/web/src/schema/dashboard/private-dashboard/api-verbs/list.ts b/apps/web/src/api-clients/dashboard/private-dashboard/schema/api-verbs/list.ts similarity index 100% rename from apps/web/src/schema/dashboard/private-dashboard/api-verbs/list.ts rename to apps/web/src/api-clients/dashboard/private-dashboard/schema/api-verbs/list.ts diff --git a/apps/web/src/schema/dashboard/private-dashboard/api-verbs/update.ts b/apps/web/src/api-clients/dashboard/private-dashboard/schema/api-verbs/update.ts similarity index 81% rename from apps/web/src/schema/dashboard/private-dashboard/api-verbs/update.ts rename to apps/web/src/api-clients/dashboard/private-dashboard/schema/api-verbs/update.ts index 5bd06889f7..5267e699c5 100644 --- a/apps/web/src/schema/dashboard/private-dashboard/api-verbs/update.ts +++ b/apps/web/src/api-clients/dashboard/private-dashboard/schema/api-verbs/update.ts @@ -1,9 +1,9 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; import type { DashboardOptions, DashboardVariables, DashboardVariablesSchema, DashboardLayout, DashboardVars, DashboardGlobalVariablesSchema, -} from '@/schema/dashboard/_types/dashboard-type'; +} from '@/api-clients/dashboard/_types/dashboard-type'; export interface PrivateDashboardUpdateParameters { diff --git a/apps/web/src/schema/dashboard/private-dashboard/model.ts b/apps/web/src/api-clients/dashboard/private-dashboard/schema/model.ts similarity index 86% rename from apps/web/src/schema/dashboard/private-dashboard/model.ts rename to apps/web/src/api-clients/dashboard/private-dashboard/schema/model.ts index 287dd77063..22f43ca43b 100644 --- a/apps/web/src/schema/dashboard/private-dashboard/model.ts +++ b/apps/web/src/api-clients/dashboard/private-dashboard/schema/model.ts @@ -1,4 +1,4 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; import type { DashboardLayout, DashboardOptions, @@ -6,7 +6,7 @@ import type { DashboardVariablesSchema, DashboardVars, DashboardGlobalVariablesSchema, -} from '@/schema/dashboard/_types/dashboard-type'; +} from '@/api-clients/dashboard/_types/dashboard-type'; export interface PrivateDashboardModel { diff --git a/apps/web/src/api-clients/dashboard/private-data-table/composables/use-private-data-table-api.ts b/apps/web/src/api-clients/dashboard/private-data-table/composables/use-private-data-table-api.ts new file mode 100644 index 0000000000..e69de29bb2 diff --git a/apps/web/src/schema/dashboard/private-data-table/model.ts b/apps/web/src/api-clients/dashboard/private-data-table/schema/model.ts similarity index 91% rename from apps/web/src/schema/dashboard/private-data-table/model.ts rename to apps/web/src/api-clients/dashboard/private-data-table/schema/model.ts index 99ede6f499..fcc82fd1c9 100644 --- a/apps/web/src/schema/dashboard/private-data-table/model.ts +++ b/apps/web/src/api-clients/dashboard/private-data-table/schema/model.ts @@ -1,4 +1,4 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; import type { DataInfo, diff --git a/apps/web/src/api-clients/dashboard/private-folder/composables/use-private-folder-api.ts b/apps/web/src/api-clients/dashboard/private-folder/composables/use-private-folder-api.ts new file mode 100644 index 0000000000..e69de29bb2 diff --git a/apps/web/src/schema/dashboard/private-folder/api-verbs/create.ts b/apps/web/src/api-clients/dashboard/private-folder/schema/api-verbs/create.ts similarity index 68% rename from apps/web/src/schema/dashboard/private-folder/api-verbs/create.ts rename to apps/web/src/api-clients/dashboard/private-folder/schema/api-verbs/create.ts index 5ddd40cd00..c0be3d3083 100644 --- a/apps/web/src/schema/dashboard/private-folder/api-verbs/create.ts +++ b/apps/web/src/api-clients/dashboard/private-folder/schema/api-verbs/create.ts @@ -1,4 +1,4 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; export interface PrivateFolderCreateParameters { diff --git a/apps/web/src/schema/dashboard/private-folder/api-verbs/delete.ts b/apps/web/src/api-clients/dashboard/private-folder/schema/api-verbs/delete.ts similarity index 100% rename from apps/web/src/schema/dashboard/private-folder/api-verbs/delete.ts rename to apps/web/src/api-clients/dashboard/private-folder/schema/api-verbs/delete.ts diff --git a/apps/web/src/schema/dashboard/private-folder/api-verbs/list.ts b/apps/web/src/api-clients/dashboard/private-folder/schema/api-verbs/list.ts similarity index 100% rename from apps/web/src/schema/dashboard/private-folder/api-verbs/list.ts rename to apps/web/src/api-clients/dashboard/private-folder/schema/api-verbs/list.ts diff --git a/apps/web/src/schema/dashboard/private-folder/api-verbs/update.ts b/apps/web/src/api-clients/dashboard/private-folder/schema/api-verbs/update.ts similarity index 63% rename from apps/web/src/schema/dashboard/private-folder/api-verbs/update.ts rename to apps/web/src/api-clients/dashboard/private-folder/schema/api-verbs/update.ts index 430769eec3..095b6498ba 100644 --- a/apps/web/src/schema/dashboard/private-folder/api-verbs/update.ts +++ b/apps/web/src/api-clients/dashboard/private-folder/schema/api-verbs/update.ts @@ -1,4 +1,4 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; export interface PrivateFolderUpdateParameters { diff --git a/apps/web/src/schema/dashboard/private-folder/model.ts b/apps/web/src/api-clients/dashboard/private-folder/schema/model.ts similarity index 77% rename from apps/web/src/schema/dashboard/private-folder/model.ts rename to apps/web/src/api-clients/dashboard/private-folder/schema/model.ts index 7cc3cc74ac..9b8e68000c 100644 --- a/apps/web/src/schema/dashboard/private-folder/model.ts +++ b/apps/web/src/api-clients/dashboard/private-folder/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 PrivateFolderModel { folder_id: string; diff --git a/apps/web/src/api-clients/dashboard/private-widget/composables/use-private-widget-api.ts b/apps/web/src/api-clients/dashboard/private-widget/composables/use-private-widget-api.ts new file mode 100644 index 0000000000..e69de29bb2 diff --git a/apps/web/src/schema/dashboard/private-widget/api-verbs/create.ts b/apps/web/src/api-clients/dashboard/private-widget/schema/api-verbs/create.ts similarity index 89% rename from apps/web/src/schema/dashboard/private-widget/api-verbs/create.ts rename to apps/web/src/api-clients/dashboard/private-widget/schema/api-verbs/create.ts index 147e81c547..1d95c873f3 100644 --- a/apps/web/src/schema/dashboard/private-widget/api-verbs/create.ts +++ b/apps/web/src/api-clients/dashboard/private-widget/schema/api-verbs/create.ts @@ -1,4 +1,4 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; import type { WidgetSize } from '@/common/modules/widgets/types/widget-display-type'; import type { WidgetType, WidgetState } from '@/common/modules/widgets/types/widget-model'; diff --git a/apps/web/src/schema/dashboard/private-widget/api-verbs/delete.ts b/apps/web/src/api-clients/dashboard/private-widget/schema/api-verbs/delete.ts similarity index 100% rename from apps/web/src/schema/dashboard/private-widget/api-verbs/delete.ts rename to apps/web/src/api-clients/dashboard/private-widget/schema/api-verbs/delete.ts diff --git a/apps/web/src/schema/dashboard/private-widget/api-verbs/get.ts b/apps/web/src/api-clients/dashboard/private-widget/schema/api-verbs/get.ts similarity index 100% rename from apps/web/src/schema/dashboard/private-widget/api-verbs/get.ts rename to apps/web/src/api-clients/dashboard/private-widget/schema/api-verbs/get.ts diff --git a/apps/web/src/schema/dashboard/private-widget/api-verbs/list.ts b/apps/web/src/api-clients/dashboard/private-widget/schema/api-verbs/list.ts similarity index 100% rename from apps/web/src/schema/dashboard/private-widget/api-verbs/list.ts rename to apps/web/src/api-clients/dashboard/private-widget/schema/api-verbs/list.ts diff --git a/apps/web/src/schema/dashboard/private-widget/api-verbs/load-sum.ts b/apps/web/src/api-clients/dashboard/private-widget/schema/api-verbs/load-sum.ts similarity index 65% rename from apps/web/src/schema/dashboard/private-widget/api-verbs/load-sum.ts rename to apps/web/src/api-clients/dashboard/private-widget/schema/api-verbs/load-sum.ts index 6dfacf812e..a530d3edb1 100644 --- a/apps/web/src/schema/dashboard/private-widget/api-verbs/load-sum.ts +++ b/apps/web/src/api-clients/dashboard/private-widget/schema/api-verbs/load-sum.ts @@ -1,4 +1,4 @@ -import type { DashboardVars } from '@/schema/dashboard/_types/dashboard-type'; +import type { DashboardVars } from '@/api-clients/dashboard/_types/dashboard-type'; export interface PrivateWidgetLoadSumParameters { widget_id: string; diff --git a/apps/web/src/schema/dashboard/private-widget/api-verbs/load.ts b/apps/web/src/api-clients/dashboard/private-widget/schema/api-verbs/load.ts similarity index 66% rename from apps/web/src/schema/dashboard/private-widget/api-verbs/load.ts rename to apps/web/src/api-clients/dashboard/private-widget/schema/api-verbs/load.ts index c3a5b883a9..11412aafbd 100644 --- a/apps/web/src/schema/dashboard/private-widget/api-verbs/load.ts +++ b/apps/web/src/api-clients/dashboard/private-widget/schema/api-verbs/load.ts @@ -1,7 +1,7 @@ import type { Sort } from '@cloudforet/core-lib/space-connector/type'; -import type { Page } from '@/schema/_common/type'; -import type { DashboardVars } from '@/schema/dashboard/_types/dashboard-type'; +import type { Page } from '@/api-clients/_common/schema/type'; +import type { DashboardVars } from '@/api-clients/dashboard/_types/dashboard-type'; export interface PrivateWidgetLoadParameters { widget_id: string; diff --git a/apps/web/src/schema/dashboard/private-widget/api-verbs/update.ts b/apps/web/src/api-clients/dashboard/private-widget/schema/api-verbs/update.ts similarity index 86% rename from apps/web/src/schema/dashboard/private-widget/api-verbs/update.ts rename to apps/web/src/api-clients/dashboard/private-widget/schema/api-verbs/update.ts index 31a908eb44..34f946baba 100644 --- a/apps/web/src/schema/dashboard/private-widget/api-verbs/update.ts +++ b/apps/web/src/api-clients/dashboard/private-widget/schema/api-verbs/update.ts @@ -1,4 +1,4 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; import type { WidgetSize } from '@/common/modules/widgets/types/widget-display-type'; import type { WidgetType, WidgetState } from '@/common/modules/widgets/types/widget-model'; diff --git a/apps/web/src/schema/dashboard/private-widget/model.ts b/apps/web/src/api-clients/dashboard/private-widget/schema/model.ts similarity index 93% rename from apps/web/src/schema/dashboard/private-widget/model.ts rename to apps/web/src/api-clients/dashboard/private-widget/schema/model.ts index 5ccf39e18a..33696fe49a 100644 --- a/apps/web/src/schema/dashboard/private-widget/model.ts +++ b/apps/web/src/api-clients/dashboard/private-widget/schema/model.ts @@ -1,4 +1,4 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; import type { WidgetFieldValue } from '@/common/modules/widgets/_widget-field-value-manager/type'; import type { WidgetSize } from '@/common/modules/widgets/types/widget-display-type'; diff --git a/apps/web/src/api-clients/dashboard/public-dashboard/composables/use-public-dashboard-api.ts b/apps/web/src/api-clients/dashboard/public-dashboard/composables/use-public-dashboard-api.ts new file mode 100644 index 0000000000..e69de29bb2 diff --git a/apps/web/src/schema/dashboard/public-dashboard/api-verbs/change-folder.ts b/apps/web/src/api-clients/dashboard/public-dashboard/schema/api-verbs/change-folder.ts similarity index 100% rename from apps/web/src/schema/dashboard/public-dashboard/api-verbs/change-folder.ts rename to apps/web/src/api-clients/dashboard/public-dashboard/schema/api-verbs/change-folder.ts diff --git a/apps/web/src/schema/dashboard/public-dashboard/api-verbs/create.ts b/apps/web/src/api-clients/dashboard/public-dashboard/schema/api-verbs/create.ts similarity index 79% rename from apps/web/src/schema/dashboard/public-dashboard/api-verbs/create.ts rename to apps/web/src/api-clients/dashboard/public-dashboard/schema/api-verbs/create.ts index 4898b7909f..fe5c4718e0 100644 --- a/apps/web/src/schema/dashboard/public-dashboard/api-verbs/create.ts +++ b/apps/web/src/api-clients/dashboard/public-dashboard/schema/api-verbs/create.ts @@ -1,10 +1,10 @@ -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 { DashboardOptions, DashboardVariables, DashboardVariablesSchema, DashboardVars, DashboardGlobalVariablesSchema, -} from '@/schema/dashboard/_types/dashboard-type'; +} from '@/api-clients/dashboard/_types/dashboard-type'; import type { SharedDashboardLayout } from '@/services/dashboards/types/shared-dashboard-type'; diff --git a/apps/web/src/schema/dashboard/public-dashboard/api-verbs/delete.ts b/apps/web/src/api-clients/dashboard/public-dashboard/schema/api-verbs/delete.ts similarity index 100% rename from apps/web/src/schema/dashboard/public-dashboard/api-verbs/delete.ts rename to apps/web/src/api-clients/dashboard/public-dashboard/schema/api-verbs/delete.ts diff --git a/apps/web/src/schema/dashboard/public-dashboard/api-verbs/get.ts b/apps/web/src/api-clients/dashboard/public-dashboard/schema/api-verbs/get.ts similarity index 100% rename from apps/web/src/schema/dashboard/public-dashboard/api-verbs/get.ts rename to apps/web/src/api-clients/dashboard/public-dashboard/schema/api-verbs/get.ts diff --git a/apps/web/src/schema/dashboard/public-dashboard/api-verbs/list.ts b/apps/web/src/api-clients/dashboard/public-dashboard/schema/api-verbs/list.ts similarity index 100% rename from apps/web/src/schema/dashboard/public-dashboard/api-verbs/list.ts rename to apps/web/src/api-clients/dashboard/public-dashboard/schema/api-verbs/list.ts diff --git a/apps/web/src/schema/dashboard/public-dashboard/api-verbs/share.ts b/apps/web/src/api-clients/dashboard/public-dashboard/schema/api-verbs/share.ts similarity index 55% rename from apps/web/src/schema/dashboard/public-dashboard/api-verbs/share.ts rename to apps/web/src/api-clients/dashboard/public-dashboard/schema/api-verbs/share.ts index 886f84fecd..8e560be5e0 100644 --- a/apps/web/src/schema/dashboard/public-dashboard/api-verbs/share.ts +++ b/apps/web/src/api-clients/dashboard/public-dashboard/schema/api-verbs/share.ts @@ -1,4 +1,4 @@ -import type { DashboardScope } from '@/schema/dashboard/_types/dashboard-type'; +import type { DashboardScope } from '@/api-clients/dashboard/_types/dashboard-type'; export interface PublicDashboardShareParameters { dashboard_id: string; diff --git a/apps/web/src/schema/dashboard/public-dashboard/api-verbs/unshare.ts b/apps/web/src/api-clients/dashboard/public-dashboard/schema/api-verbs/unshare.ts similarity index 100% rename from apps/web/src/schema/dashboard/public-dashboard/api-verbs/unshare.ts rename to apps/web/src/api-clients/dashboard/public-dashboard/schema/api-verbs/unshare.ts diff --git a/apps/web/src/schema/dashboard/public-dashboard/api-verbs/update.ts b/apps/web/src/api-clients/dashboard/public-dashboard/schema/api-verbs/update.ts similarity index 81% rename from apps/web/src/schema/dashboard/public-dashboard/api-verbs/update.ts rename to apps/web/src/api-clients/dashboard/public-dashboard/schema/api-verbs/update.ts index bcf8a6ea39..4f2a503a2f 100644 --- a/apps/web/src/schema/dashboard/public-dashboard/api-verbs/update.ts +++ b/apps/web/src/api-clients/dashboard/public-dashboard/schema/api-verbs/update.ts @@ -1,9 +1,9 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; import type { DashboardOptions, DashboardVariables, DashboardVariablesSchema, DashboardLayout, DashboardVars, DashboardGlobalVariablesSchema, -} from '@/schema/dashboard/_types/dashboard-type'; +} from '@/api-clients/dashboard/_types/dashboard-type'; export interface PublicDashboardUpdateParameters { diff --git a/apps/web/src/schema/dashboard/public-dashboard/model.ts b/apps/web/src/api-clients/dashboard/public-dashboard/schema/model.ts similarity index 82% rename from apps/web/src/schema/dashboard/public-dashboard/model.ts rename to apps/web/src/api-clients/dashboard/public-dashboard/schema/model.ts index dc416a6077..5ae600ff6d 100644 --- a/apps/web/src/schema/dashboard/public-dashboard/model.ts +++ b/apps/web/src/api-clients/dashboard/public-dashboard/schema/model.ts @@ -1,5 +1,5 @@ -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 { DashboardLayout, DashboardOptions, @@ -8,7 +8,7 @@ import type { DashboardVars, DashboardScope, DashboardGlobalVariablesSchema, -} from '@/schema/dashboard/_types/dashboard-type'; +} from '@/api-clients/dashboard/_types/dashboard-type'; export interface PublicDashboardModel { diff --git a/apps/web/src/api-clients/dashboard/public-data-table/composables/use-public-data-table-api.ts b/apps/web/src/api-clients/dashboard/public-data-table/composables/use-public-data-table-api.ts new file mode 100644 index 0000000000..e69de29bb2 diff --git a/apps/web/src/schema/dashboard/public-data-table/api-verbs/add.ts b/apps/web/src/api-clients/dashboard/public-data-table/schema/api-verbs/add.ts similarity index 67% rename from apps/web/src/schema/dashboard/public-data-table/api-verbs/add.ts rename to apps/web/src/api-clients/dashboard/public-data-table/schema/api-verbs/add.ts index 04d55a0fc8..b58c7c4d6b 100644 --- a/apps/web/src/schema/dashboard/public-data-table/api-verbs/add.ts +++ b/apps/web/src/api-clients/dashboard/public-data-table/schema/api-verbs/add.ts @@ -1,5 +1,5 @@ -import type { Tags } from '@/schema/_common/model'; -import type { DashboardVars } from '@/schema/dashboard/_types/dashboard-type'; +import type { Tags } from '@/api-clients/_common/schema/model'; +import type { DashboardVars } from '@/api-clients/dashboard/_types/dashboard-type'; import type { DataTableOptions, DataTableSourceType, diff --git a/apps/web/src/schema/dashboard/public-data-table/api-verbs/delete.ts b/apps/web/src/api-clients/dashboard/public-data-table/schema/api-verbs/delete.ts similarity index 100% rename from apps/web/src/schema/dashboard/public-data-table/api-verbs/delete.ts rename to apps/web/src/api-clients/dashboard/public-data-table/schema/api-verbs/delete.ts diff --git a/apps/web/src/schema/dashboard/public-data-table/api-verbs/get.ts b/apps/web/src/api-clients/dashboard/public-data-table/schema/api-verbs/get.ts similarity index 100% rename from apps/web/src/schema/dashboard/public-data-table/api-verbs/get.ts rename to apps/web/src/api-clients/dashboard/public-data-table/schema/api-verbs/get.ts diff --git a/apps/web/src/schema/dashboard/public-data-table/api-verbs/list.ts b/apps/web/src/api-clients/dashboard/public-data-table/schema/api-verbs/list.ts similarity index 100% rename from apps/web/src/schema/dashboard/public-data-table/api-verbs/list.ts rename to apps/web/src/api-clients/dashboard/public-data-table/schema/api-verbs/list.ts diff --git a/apps/web/src/api-clients/dashboard/public-data-table/schema/api-verbs/load.ts b/apps/web/src/api-clients/dashboard/public-data-table/schema/api-verbs/load.ts new file mode 100644 index 0000000000..defac8b27b --- /dev/null +++ b/apps/web/src/api-clients/dashboard/public-data-table/schema/api-verbs/load.ts @@ -0,0 +1,15 @@ +import type { Page } from '@/api-clients/_common/schema/type'; +import type { DashboardVars } from '@/api-clients/dashboard/_types/dashboard-type'; +import type { Granularity } from '@/api-clients/dashboard/_types/widget-type'; + + + +export interface DataTableLoadParameters { + data_table_id: string; + granularity: Granularity; + start?: string; + end?: string; + sort?: any[]; + page?: Page; + vars?: DashboardVars; +} diff --git a/apps/web/src/schema/dashboard/public-data-table/api-verbs/transform.ts b/apps/web/src/api-clients/dashboard/public-data-table/schema/api-verbs/transform.ts similarity index 68% rename from apps/web/src/schema/dashboard/public-data-table/api-verbs/transform.ts rename to apps/web/src/api-clients/dashboard/public-data-table/schema/api-verbs/transform.ts index 3e41dbc784..4e18967e73 100644 --- a/apps/web/src/schema/dashboard/public-data-table/api-verbs/transform.ts +++ b/apps/web/src/api-clients/dashboard/public-data-table/schema/api-verbs/transform.ts @@ -1,5 +1,5 @@ -import type { Tags } from '@/schema/_common/model'; -import type { DashboardVars } from '@/schema/dashboard/_types/dashboard-type'; +import type { Tags } from '@/api-clients/_common/schema/model'; +import type { DashboardVars } from '@/api-clients/dashboard/_types/dashboard-type'; import type { DataTableOperator, diff --git a/apps/web/src/schema/dashboard/public-data-table/api-verbs/update.ts b/apps/web/src/api-clients/dashboard/public-data-table/schema/api-verbs/update.ts similarity index 63% rename from apps/web/src/schema/dashboard/public-data-table/api-verbs/update.ts rename to apps/web/src/api-clients/dashboard/public-data-table/schema/api-verbs/update.ts index 8211c0f670..9641db8bbc 100644 --- a/apps/web/src/schema/dashboard/public-data-table/api-verbs/update.ts +++ b/apps/web/src/api-clients/dashboard/public-data-table/schema/api-verbs/update.ts @@ -1,5 +1,5 @@ -import type { Tags } from '@/schema/_common/model'; -import type { DashboardVars } from '@/schema/dashboard/_types/dashboard-type'; +import type { Tags } from '@/api-clients/_common/schema/model'; +import type { DashboardVars } from '@/api-clients/dashboard/_types/dashboard-type'; import type { DataTableOptions } from '@/common/modules/widgets/types/widget-model'; diff --git a/apps/web/src/schema/dashboard/public-data-table/model.ts b/apps/web/src/api-clients/dashboard/public-data-table/schema/model.ts similarity index 85% rename from apps/web/src/schema/dashboard/public-data-table/model.ts rename to apps/web/src/api-clients/dashboard/public-data-table/schema/model.ts index 0c2c63e4b8..81b3815482 100644 --- a/apps/web/src/schema/dashboard/public-data-table/model.ts +++ b/apps/web/src/api-clients/dashboard/public-data-table/schema/model.ts @@ -1,5 +1,5 @@ -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 { DataInfo, diff --git a/apps/web/src/api-clients/dashboard/public-folder/composables/use-public-folder-api.ts b/apps/web/src/api-clients/dashboard/public-folder/composables/use-public-folder-api.ts new file mode 100644 index 0000000000..e69de29bb2 diff --git a/apps/web/src/schema/dashboard/public-folder/api-verbs/create.ts b/apps/web/src/api-clients/dashboard/public-folder/schema/api-verbs/create.ts similarity index 63% rename from apps/web/src/schema/dashboard/public-folder/api-verbs/create.ts rename to apps/web/src/api-clients/dashboard/public-folder/schema/api-verbs/create.ts index 0a36ddc1d1..76d46dcf06 100644 --- a/apps/web/src/schema/dashboard/public-folder/api-verbs/create.ts +++ b/apps/web/src/api-clients/dashboard/public-folder/schema/api-verbs/create.ts @@ -1,5 +1,5 @@ -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'; export interface PublicFolderCreateParameters { diff --git a/apps/web/src/schema/dashboard/public-folder/api-verbs/delete.ts b/apps/web/src/api-clients/dashboard/public-folder/schema/api-verbs/delete.ts similarity index 100% rename from apps/web/src/schema/dashboard/public-folder/api-verbs/delete.ts rename to apps/web/src/api-clients/dashboard/public-folder/schema/api-verbs/delete.ts diff --git a/apps/web/src/schema/dashboard/public-folder/api-verbs/list.ts b/apps/web/src/api-clients/dashboard/public-folder/schema/api-verbs/list.ts similarity index 100% rename from apps/web/src/schema/dashboard/public-folder/api-verbs/list.ts rename to apps/web/src/api-clients/dashboard/public-folder/schema/api-verbs/list.ts diff --git a/apps/web/src/schema/dashboard/public-folder/api-verbs/share.ts b/apps/web/src/api-clients/dashboard/public-folder/schema/api-verbs/share.ts similarity index 100% rename from apps/web/src/schema/dashboard/public-folder/api-verbs/share.ts rename to apps/web/src/api-clients/dashboard/public-folder/schema/api-verbs/share.ts diff --git a/apps/web/src/schema/dashboard/public-folder/api-verbs/unshare.ts b/apps/web/src/api-clients/dashboard/public-folder/schema/api-verbs/unshare.ts similarity index 100% rename from apps/web/src/schema/dashboard/public-folder/api-verbs/unshare.ts rename to apps/web/src/api-clients/dashboard/public-folder/schema/api-verbs/unshare.ts diff --git a/apps/web/src/schema/dashboard/public-folder/api-verbs/update.ts b/apps/web/src/api-clients/dashboard/public-folder/schema/api-verbs/update.ts similarity index 63% rename from apps/web/src/schema/dashboard/public-folder/api-verbs/update.ts rename to apps/web/src/api-clients/dashboard/public-folder/schema/api-verbs/update.ts index 866a2826f1..89398261c5 100644 --- a/apps/web/src/schema/dashboard/public-folder/api-verbs/update.ts +++ b/apps/web/src/api-clients/dashboard/public-folder/schema/api-verbs/update.ts @@ -1,4 +1,4 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; export interface PublicFolderUpdateParameters { diff --git a/apps/web/src/schema/dashboard/public-folder/model.ts b/apps/web/src/api-clients/dashboard/public-folder/schema/model.ts similarity index 72% rename from apps/web/src/schema/dashboard/public-folder/model.ts rename to apps/web/src/api-clients/dashboard/public-folder/schema/model.ts index 275b136a0a..424b1471ea 100644 --- a/apps/web/src/schema/dashboard/public-folder/model.ts +++ b/apps/web/src/api-clients/dashboard/public-folder/schema/model.ts @@ -1,5 +1,5 @@ -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'; export interface PublicFolderModel { folder_id: string; diff --git a/apps/web/src/api-clients/dashboard/public-widget/composables/use-public-widget-api.ts b/apps/web/src/api-clients/dashboard/public-widget/composables/use-public-widget-api.ts new file mode 100644 index 0000000000..e69de29bb2 diff --git a/apps/web/src/schema/dashboard/public-widget/api-verbs/create.ts b/apps/web/src/api-clients/dashboard/public-widget/schema/api-verbs/create.ts similarity index 89% rename from apps/web/src/schema/dashboard/public-widget/api-verbs/create.ts rename to apps/web/src/api-clients/dashboard/public-widget/schema/api-verbs/create.ts index 845aa99ac7..3b5d7f9502 100644 --- a/apps/web/src/schema/dashboard/public-widget/api-verbs/create.ts +++ b/apps/web/src/api-clients/dashboard/public-widget/schema/api-verbs/create.ts @@ -1,4 +1,4 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; import type { WidgetSize } from '@/common/modules/widgets/types/widget-display-type'; import type { WidgetState, WidgetType } from '@/common/modules/widgets/types/widget-model'; diff --git a/apps/web/src/schema/dashboard/public-widget/api-verbs/delete.ts b/apps/web/src/api-clients/dashboard/public-widget/schema/api-verbs/delete.ts similarity index 100% rename from apps/web/src/schema/dashboard/public-widget/api-verbs/delete.ts rename to apps/web/src/api-clients/dashboard/public-widget/schema/api-verbs/delete.ts diff --git a/apps/web/src/schema/dashboard/public-widget/api-verbs/get.ts b/apps/web/src/api-clients/dashboard/public-widget/schema/api-verbs/get.ts similarity index 100% rename from apps/web/src/schema/dashboard/public-widget/api-verbs/get.ts rename to apps/web/src/api-clients/dashboard/public-widget/schema/api-verbs/get.ts diff --git a/apps/web/src/schema/dashboard/public-widget/api-verbs/list.ts b/apps/web/src/api-clients/dashboard/public-widget/schema/api-verbs/list.ts similarity index 100% rename from apps/web/src/schema/dashboard/public-widget/api-verbs/list.ts rename to apps/web/src/api-clients/dashboard/public-widget/schema/api-verbs/list.ts diff --git a/apps/web/src/schema/dashboard/public-widget/api-verbs/load-sum.ts b/apps/web/src/api-clients/dashboard/public-widget/schema/api-verbs/load-sum.ts similarity index 65% rename from apps/web/src/schema/dashboard/public-widget/api-verbs/load-sum.ts rename to apps/web/src/api-clients/dashboard/public-widget/schema/api-verbs/load-sum.ts index 229cc160b4..d3f18c4ed2 100644 --- a/apps/web/src/schema/dashboard/public-widget/api-verbs/load-sum.ts +++ b/apps/web/src/api-clients/dashboard/public-widget/schema/api-verbs/load-sum.ts @@ -1,4 +1,4 @@ -import type { DashboardVars } from '@/schema/dashboard/_types/dashboard-type'; +import type { DashboardVars } from '@/api-clients/dashboard/_types/dashboard-type'; export interface PublicWidgetLoadSumParameters { widget_id: string; diff --git a/apps/web/src/schema/dashboard/public-widget/api-verbs/load.ts b/apps/web/src/api-clients/dashboard/public-widget/schema/api-verbs/load.ts similarity index 66% rename from apps/web/src/schema/dashboard/public-widget/api-verbs/load.ts rename to apps/web/src/api-clients/dashboard/public-widget/schema/api-verbs/load.ts index a68d2d6048..92f91961bd 100644 --- a/apps/web/src/schema/dashboard/public-widget/api-verbs/load.ts +++ b/apps/web/src/api-clients/dashboard/public-widget/schema/api-verbs/load.ts @@ -1,7 +1,7 @@ import type { Sort } from '@cloudforet/core-lib/space-connector/type'; -import type { Page } from '@/schema/_common/type'; -import type { DashboardVars } from '@/schema/dashboard/_types/dashboard-type'; +import type { Page } from '@/api-clients/_common/schema/type'; +import type { DashboardVars } from '@/api-clients/dashboard/_types/dashboard-type'; export interface PublicWidgetLoadParameters { widget_id: string; diff --git a/apps/web/src/schema/dashboard/public-widget/api-verbs/update.ts b/apps/web/src/api-clients/dashboard/public-widget/schema/api-verbs/update.ts similarity index 86% rename from apps/web/src/schema/dashboard/public-widget/api-verbs/update.ts rename to apps/web/src/api-clients/dashboard/public-widget/schema/api-verbs/update.ts index 012e6d8e1c..2e9800a142 100644 --- a/apps/web/src/schema/dashboard/public-widget/api-verbs/update.ts +++ b/apps/web/src/api-clients/dashboard/public-widget/schema/api-verbs/update.ts @@ -1,4 +1,4 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; import type { WidgetSize } from '@/common/modules/widgets/types/widget-display-type'; import type { WidgetType, WidgetState } from '@/common/modules/widgets/types/widget-model'; diff --git a/apps/web/src/schema/dashboard/public-widget/model.ts b/apps/web/src/api-clients/dashboard/public-widget/schema/model.ts similarity index 87% rename from apps/web/src/schema/dashboard/public-widget/model.ts rename to apps/web/src/api-clients/dashboard/public-widget/schema/model.ts index 28481d29d8..a844fc6f8a 100644 --- a/apps/web/src/schema/dashboard/public-widget/model.ts +++ b/apps/web/src/api-clients/dashboard/public-widget/schema/model.ts @@ -1,5 +1,5 @@ -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 { WidgetFieldValue } from '@/common/modules/widgets/_widget-field-value-manager/type'; import type { WidgetSize } from '@/common/modules/widgets/types/widget-display-type'; diff --git a/apps/web/src/common/components/inputs/TagsInput.vue b/apps/web/src/common/components/inputs/TagsInput.vue index 0cab82940e..976fe9552d 100644 --- a/apps/web/src/common/components/inputs/TagsInput.vue +++ b/apps/web/src/common/components/inputs/TagsInput.vue @@ -6,7 +6,7 @@ import type { TranslateResult } from 'vue-i18n'; import { PFieldGroup, PTextInput } from '@cloudforet/mirinae'; import type { InputItem } from '@cloudforet/mirinae/types/controls/input/text-input/type'; -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; import { i18n } from '@/translations'; import { useProxyValue } from '@/common/composables/proxy-state'; diff --git a/apps/web/src/common/composables/date-range-formatter/__tests__/index.test.ts b/apps/web/src/common/composables/date-range-formatter/__tests__/index.test.ts index 175db30ab3..49964337b3 100644 --- a/apps/web/src/common/composables/date-range-formatter/__tests__/index.test.ts +++ b/apps/web/src/common/composables/date-range-formatter/__tests__/index.test.ts @@ -10,7 +10,7 @@ import dayjs from 'dayjs'; import utc from 'dayjs/plugin/utc'; import { describe, expect, it } from 'vitest'; -import type { DateRange } from '@/schema/dashboard/_types/dashboard-type'; +import type { DateRange } from '@/api-clients/dashboard/_types/dashboard-type'; import { useDateRangeFormatter } from '@/common/composables/date-range-formatter'; diff --git a/apps/web/src/common/composables/editor-content-transformer/index.ts b/apps/web/src/common/composables/editor-content-transformer/index.ts index b6c0d7b69d..6c8a24e8e9 100644 --- a/apps/web/src/common/composables/editor-content-transformer/index.ts +++ b/apps/web/src/common/composables/editor-content-transformer/index.ts @@ -8,7 +8,7 @@ import { isEqual } from 'lodash'; import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; -import type { ContentsType } from '@/schema/_common/type'; +import type { ContentsType } from '@/api-clients/_common/schema/type'; import { getFileDownloadUrl } from '@/lib/file-manager'; import type { FileManagerResourceGroupType } from '@/lib/file-manager/type'; diff --git a/apps/web/src/common/modules/custom-table/custom-field-modal/CustomFieldModal.vue b/apps/web/src/common/modules/custom-table/custom-field-modal/CustomFieldModal.vue index c24880a5fa..d67cd690b2 100644 --- a/apps/web/src/common/modules/custom-table/custom-field-modal/CustomFieldModal.vue +++ b/apps/web/src/common/modules/custom-table/custom-field-modal/CustomFieldModal.vue @@ -10,7 +10,7 @@ import { } from '@cloudforet/mirinae'; import type { DataTableFieldType } from '@cloudforet/mirinae/types/data-display/tables/data-table/type'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { UserConfigGetParameters } from '@/schema/config/user-config/api-verbs/get'; import type { UserConfigUpdateParameters } from '@/schema/config/user-config/api-verbs/update'; import type { UserConfigModel } from '@/schema/config/user-config/model'; diff --git a/apps/web/src/common/modules/favorites/favorite-button/store/favorite-store.ts b/apps/web/src/common/modules/favorites/favorite-button/store/favorite-store.ts index 66211bcb7f..55696266a4 100644 --- a/apps/web/src/common/modules/favorites/favorite-button/store/favorite-store.ts +++ b/apps/web/src/common/modules/favorites/favorite-button/store/favorite-store.ts @@ -5,7 +5,7 @@ import { defineStore } from 'pinia'; import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; import { ApiQueryHelper } from '@cloudforet/core-lib/space-connector/helper'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { UserConfigDeleteParameters } from '@/schema/config/user-config/api-verbs/delete'; import type { UserConfigListParameters } from '@/schema/config/user-config/api-verbs/list'; import type { UserConfigSetParameters } from '@/schema/config/user-config/api-verbs/set'; diff --git a/apps/web/src/common/modules/navigations/stores/gnb-store.ts b/apps/web/src/common/modules/navigations/stores/gnb-store.ts index eaa10bf9c2..0678817c72 100644 --- a/apps/web/src/common/modules/navigations/stores/gnb-store.ts +++ b/apps/web/src/common/modules/navigations/stores/gnb-store.ts @@ -4,7 +4,7 @@ import { defineStore } from 'pinia'; import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { UserConfigListParameters } from '@/schema/config/user-config/api-verbs/list'; import type { UserConfigModel } from '@/schema/config/user-config/model'; import type { CostQuerySetListParameters } from '@/schema/cost-analysis/cost-query-set/api-verbs/list'; diff --git a/apps/web/src/common/modules/navigations/top-bar/modules/top-bar-toolset/modules/top-bar-notice/modules/TopBarNoticeContextMenu.vue b/apps/web/src/common/modules/navigations/top-bar/modules/top-bar-toolset/modules/top-bar-notice/modules/TopBarNoticeContextMenu.vue index 31260e5482..49fe0e1185 100644 --- a/apps/web/src/common/modules/navigations/top-bar/modules/top-bar-toolset/modules/top-bar-notice/modules/TopBarNoticeContextMenu.vue +++ b/apps/web/src/common/modules/navigations/top-bar/modules/top-bar-toolset/modules/top-bar-notice/modules/TopBarNoticeContextMenu.vue @@ -10,8 +10,8 @@ import { PDataLoader, PI, PDivider, PEmpty, } from '@cloudforet/mirinae'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import { SpaceRouter } from '@/router'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; import type { PostListParameters } from '@/schema/board/post/api-verbs/list'; import { POST_BOARD_TYPE } from '@/schema/board/post/constant'; import type { PostModel } from '@/schema/board/post/model'; diff --git a/apps/web/src/common/modules/navigations/top-bar/modules/top-bar-toolset/modules/top-bar-notifications/modules/TopBarNotificationsContextMenu.vue b/apps/web/src/common/modules/navigations/top-bar/modules/top-bar-toolset/modules/top-bar-notifications/modules/TopBarNotificationsContextMenu.vue index 64f861d0dd..5866be524e 100644 --- a/apps/web/src/common/modules/navigations/top-bar/modules/top-bar-toolset/modules/top-bar-notifications/modules/TopBarNotificationsContextMenu.vue +++ b/apps/web/src/common/modules/navigations/top-bar/modules/top-bar-toolset/modules/top-bar-notifications/modules/TopBarNotificationsContextMenu.vue @@ -18,7 +18,7 @@ import { import { ACTION_ICON } from '@cloudforet/mirinae/src/navigation/link/type'; import { iso8601Formatter } from '@cloudforet/utils'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { NotificationDeleteParameters } from '@/schema/notification/notification/api-verbs/delete'; import type { NotificationListParameters } from '@/schema/notification/notification/api-verbs/list'; import type { NotificationSetReadParameters } from '@/schema/notification/notification/api-verbs/set-read'; diff --git a/apps/web/src/common/modules/popup/notice/NoticePopup.vue b/apps/web/src/common/modules/popup/notice/NoticePopup.vue index b1d7a25b0f..8398f79472 100644 --- a/apps/web/src/common/modules/popup/notice/NoticePopup.vue +++ b/apps/web/src/common/modules/popup/notice/NoticePopup.vue @@ -6,7 +6,7 @@ import { import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; import { ApiQueryHelper } from '@cloudforet/core-lib/space-connector/helper'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { PostListParameters } from '@/schema/board/post/api-verbs/list'; import { POST_BOARD_TYPE } from '@/schema/board/post/constant'; import type { PostModel } from '@/schema/board/post/model'; diff --git a/apps/web/src/common/modules/widgets/_components/WidgetFormDataSourcePopover.vue b/apps/web/src/common/modules/widgets/_components/WidgetFormDataSourcePopover.vue index 45089fe064..7d2b02146c 100644 --- a/apps/web/src/common/modules/widgets/_components/WidgetFormDataSourcePopover.vue +++ b/apps/web/src/common/modules/widgets/_components/WidgetFormDataSourcePopover.vue @@ -11,11 +11,11 @@ import { import { POPOVER_TRIGGER } from '@cloudforet/mirinae/src/data-display/popover/type'; -import type { PrivateWidgetCreateParameters } from '@/schema/dashboard/private-widget/api-verbs/create'; -import type { PrivateWidgetModel } from '@/schema/dashboard/private-widget/model'; -import type { DataTableAddParameters } from '@/schema/dashboard/public-data-table/api-verbs/add'; -import type { PublicWidgetCreateParameters } from '@/schema/dashboard/public-widget/api-verbs/create'; -import type { PublicWidgetModel } from '@/schema/dashboard/public-widget/model'; +import type { PrivateWidgetCreateParameters } from '@/api-clients/dashboard/private-widget/schema/api-verbs/create'; +import type { PrivateWidgetModel } from '@/api-clients/dashboard/private-widget/schema/model'; +import type { DataTableAddParameters } from '@/api-clients/dashboard/public-data-table/schema/api-verbs/add'; +import type { PublicWidgetCreateParameters } from '@/api-clients/dashboard/public-widget/schema/api-verbs/create'; +import type { PublicWidgetModel } from '@/api-clients/dashboard/public-widget/schema/model'; import { i18n } from '@/translations'; import { useAllReferenceStore } from '@/store/reference/all-reference-store'; diff --git a/apps/web/src/common/modules/widgets/_components/WidgetFormDataTableCard.vue b/apps/web/src/common/modules/widgets/_components/WidgetFormDataTableCard.vue index c30cae31ea..d520d73ace 100644 --- a/apps/web/src/common/modules/widgets/_components/WidgetFormDataTableCard.vue +++ b/apps/web/src/common/modules/widgets/_components/WidgetFormDataTableCard.vue @@ -3,8 +3,8 @@ import { computed, reactive, ref, } from 'vue'; -import type { PrivateDataTableModel } from '@/schema/dashboard/private-data-table/model'; -import type { PublicDataTableModel } from '@/schema/dashboard/public-data-table/model'; +import type { PrivateDataTableModel } from '@/api-clients/dashboard/private-data-table/schema/model'; +import type { PublicDataTableModel } from '@/api-clients/dashboard/public-data-table/schema/model'; import WidgetFormDataTableCardAddContents from '@/common/modules/widgets/_components/WidgetFormDataTableCardAddContents.vue'; diff --git a/apps/web/src/common/modules/widgets/_components/WidgetFormDataTableCardAddContents.vue b/apps/web/src/common/modules/widgets/_components/WidgetFormDataTableCardAddContents.vue index ac93d403a0..0c4974333f 100644 --- a/apps/web/src/common/modules/widgets/_components/WidgetFormDataTableCardAddContents.vue +++ b/apps/web/src/common/modules/widgets/_components/WidgetFormDataTableCardAddContents.vue @@ -8,9 +8,9 @@ import { isArray, isEqual, uniq } from 'lodash'; import type { MenuItem } from '@cloudforet/mirinae/src/controls/context-menu/type'; import type { SelectDropdownMenuItem } from '@cloudforet/mirinae/src/controls/dropdown/select-dropdown/type'; -import type { PrivateDataTableModel } from '@/schema/dashboard/private-data-table/model'; -import type { DataTableUpdateParameters } from '@/schema/dashboard/public-data-table/api-verbs/update'; -import type { PublicDataTableModel } from '@/schema/dashboard/public-data-table/model'; +import type { PrivateDataTableModel } from '@/api-clients/dashboard/private-data-table/schema/model'; +import type { DataTableUpdateParameters } from '@/api-clients/dashboard/public-data-table/schema/api-verbs/update'; +import type { PublicDataTableModel } from '@/api-clients/dashboard/public-data-table/schema/model'; import { i18n } from '@/translations'; import { useAllReferenceStore } from '@/store/reference/all-reference-store'; diff --git a/apps/web/src/common/modules/widgets/_components/WidgetFormDataTableCardFiltersItem.vue b/apps/web/src/common/modules/widgets/_components/WidgetFormDataTableCardFiltersItem.vue index 5dc9341f01..280ff6ae9b 100644 --- a/apps/web/src/common/modules/widgets/_components/WidgetFormDataTableCardFiltersItem.vue +++ b/apps/web/src/common/modules/widgets/_components/WidgetFormDataTableCardFiltersItem.vue @@ -13,7 +13,7 @@ import { import type { MenuItem } from '@cloudforet/mirinae/types/controls/context-menu/type'; import type { AutocompleteHandler } from '@cloudforet/mirinae/types/controls/dropdown/select-dropdown/type'; -import type { DashboardGlobalVariable } from '@/schema/dashboard/_types/dashboard-global-variable-type'; +import type { DashboardGlobalVariable } from '@/api-clients/dashboard/_types/dashboard-global-variable-type'; import { useProxyValue } from '@/common/composables/proxy-state'; import { diff --git a/apps/web/src/common/modules/widgets/_components/WidgetFormDataTableCardTransformAddLabels.vue b/apps/web/src/common/modules/widgets/_components/WidgetFormDataTableCardTransformAddLabels.vue index 35b2361424..d3fcb83a86 100644 --- a/apps/web/src/common/modules/widgets/_components/WidgetFormDataTableCardTransformAddLabels.vue +++ b/apps/web/src/common/modules/widgets/_components/WidgetFormDataTableCardTransformAddLabels.vue @@ -11,8 +11,8 @@ import { PIconButton, PFieldGroup, PTextInput, PButton, PFieldTitle, } from '@cloudforet/mirinae'; -import type { PrivateDataTableModel } from '@/schema/dashboard/private-data-table/model'; -import type { PublicDataTableModel } from '@/schema/dashboard/public-data-table/model'; +import type { PrivateDataTableModel } from '@/api-clients/dashboard/private-data-table/schema/model'; +import type { PublicDataTableModel } from '@/api-clients/dashboard/public-data-table/schema/model'; import { i18n } from '@/translations'; import { useProxyValue } from '@/common/composables/proxy-state'; diff --git a/apps/web/src/common/modules/widgets/_components/WidgetFormDataTableCardTransformContents.vue b/apps/web/src/common/modules/widgets/_components/WidgetFormDataTableCardTransformContents.vue index ec2ba58574..be46329f83 100644 --- a/apps/web/src/common/modules/widgets/_components/WidgetFormDataTableCardTransformContents.vue +++ b/apps/web/src/common/modules/widgets/_components/WidgetFormDataTableCardTransformContents.vue @@ -7,8 +7,8 @@ import { cloneDeep, intersection, isEmpty, isEqual, } from 'lodash'; -import type { PrivateDataTableModel } from '@/schema/dashboard/private-data-table/model'; -import type { PublicDataTableModel } from '@/schema/dashboard/public-data-table/model'; +import type { PrivateDataTableModel } from '@/api-clients/dashboard/private-data-table/schema/model'; +import type { PublicDataTableModel } from '@/api-clients/dashboard/public-data-table/schema/model'; import { i18n } from '@/translations'; import { showErrorMessage, showSuccessMessage } from '@/lib/helper/notice-alert-helper'; diff --git a/apps/web/src/common/modules/widgets/_components/WidgetFormDataTableCardTransformEvaluate.vue b/apps/web/src/common/modules/widgets/_components/WidgetFormDataTableCardTransformEvaluate.vue index 8720d9bfc9..545d8f5827 100644 --- a/apps/web/src/common/modules/widgets/_components/WidgetFormDataTableCardTransformEvaluate.vue +++ b/apps/web/src/common/modules/widgets/_components/WidgetFormDataTableCardTransformEvaluate.vue @@ -12,8 +12,8 @@ import { import { ACTION_ICON } from '@cloudforet/mirinae/src/navigation/link/type'; import type { MenuItem } from '@cloudforet/mirinae/types/controls/context-menu/type'; -import type { PrivateDataTableModel } from '@/schema/dashboard/private-data-table/model'; -import type { PublicDataTableModel } from '@/schema/dashboard/public-data-table/model'; +import type { PrivateDataTableModel } from '@/api-clients/dashboard/private-data-table/schema/model'; +import type { PublicDataTableModel } from '@/api-clients/dashboard/public-data-table/schema/model'; import { i18n } from '@/translations'; import { showSuccessMessage } from '@/lib/helper/notice-alert-helper'; diff --git a/apps/web/src/common/modules/widgets/_components/WidgetFormDataTableCardTransformJoin.vue b/apps/web/src/common/modules/widgets/_components/WidgetFormDataTableCardTransformJoin.vue index a73283aa7b..3f76452372 100644 --- a/apps/web/src/common/modules/widgets/_components/WidgetFormDataTableCardTransformJoin.vue +++ b/apps/web/src/common/modules/widgets/_components/WidgetFormDataTableCardTransformJoin.vue @@ -10,8 +10,8 @@ import { } from '@cloudforet/mirinae'; import type { SelectDropdownMenuItem } from '@cloudforet/mirinae/src/controls/dropdown/select-dropdown/type'; -import type { PrivateDataTableModel } from '@/schema/dashboard/private-data-table/model'; -import type { PublicDataTableModel } from '@/schema/dashboard/public-data-table/model'; +import type { PrivateDataTableModel } from '@/api-clients/dashboard/private-data-table/schema/model'; +import type { PublicDataTableModel } from '@/api-clients/dashboard/public-data-table/schema/model'; import { useProxyValue } from '@/common/composables/proxy-state'; import WidgetFormDataTableCardTransformFormWrapper diff --git a/apps/web/src/common/modules/widgets/_components/WidgetFormDataTableCardTransformPivotForm.vue b/apps/web/src/common/modules/widgets/_components/WidgetFormDataTableCardTransformPivotForm.vue index e57097616c..4fcab34e55 100644 --- a/apps/web/src/common/modules/widgets/_components/WidgetFormDataTableCardTransformPivotForm.vue +++ b/apps/web/src/common/modules/widgets/_components/WidgetFormDataTableCardTransformPivotForm.vue @@ -11,9 +11,9 @@ import { } from '@cloudforet/mirinae'; import type { MenuItem } from '@cloudforet/mirinae/types/inputs/context-menu/type'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; -import { GRANULARITY } from '@/schema/dashboard/_constants/widget-constant'; -import type { DataTableLoadParameters } from '@/schema/dashboard/public-data-table/api-verbs/load'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; +import { GRANULARITY } from '@/api-clients/dashboard/_constants/widget-constant'; +import type { DataTableLoadParameters } from '@/api-clients/dashboard/public-data-table/schema/api-verbs/load'; import { i18n } from '@/translations'; import { showErrorMessage } from '@/lib/helper/notice-alert-helper'; diff --git a/apps/web/src/common/modules/widgets/_components/WidgetFormDataTableCardTransformValueMapping.vue b/apps/web/src/common/modules/widgets/_components/WidgetFormDataTableCardTransformValueMapping.vue index 2ec4643ffc..6721216c9f 100644 --- a/apps/web/src/common/modules/widgets/_components/WidgetFormDataTableCardTransformValueMapping.vue +++ b/apps/web/src/common/modules/widgets/_components/WidgetFormDataTableCardTransformValueMapping.vue @@ -12,8 +12,8 @@ import { import type { MenuItem } from '@cloudforet/mirinae/types/controls/context-menu/type'; import type { SelectDropdownMenuItem } from '@cloudforet/mirinae/types/controls/dropdown/select-dropdown/type'; -import type { PrivateDataTableModel } from '@/schema/dashboard/private-data-table/model'; -import type { PublicDataTableModel } from '@/schema/dashboard/public-data-table/model'; +import type { PrivateDataTableModel } from '@/api-clients/dashboard/private-data-table/schema/model'; +import type { PublicDataTableModel } from '@/api-clients/dashboard/public-data-table/schema/model'; import { i18n } from '@/translations'; import { useProxyValue } from '@/common/composables/proxy-state'; diff --git a/apps/web/src/common/modules/widgets/_components/WidgetFormDataTableGlobalVariableViewButton.vue b/apps/web/src/common/modules/widgets/_components/WidgetFormDataTableGlobalVariableViewButton.vue index 64c2a41a91..b769fe47c2 100644 --- a/apps/web/src/common/modules/widgets/_components/WidgetFormDataTableGlobalVariableViewButton.vue +++ b/apps/web/src/common/modules/widgets/_components/WidgetFormDataTableGlobalVariableViewButton.vue @@ -5,7 +5,7 @@ import { computed, reactive } from 'vue'; import { PButton, PPopover, PCopyButton } from '@cloudforet/mirinae'; -import type { DashboardGlobalVariable } from '@/schema/dashboard/_types/dashboard-global-variable-type'; +import type { DashboardGlobalVariable } from '@/api-clients/dashboard/_types/dashboard-global-variable-type'; import { getOrderedGlobalVariables } from '@/services/dashboards/helpers/dashboard-global-variables-helper'; import { useDashboardDetailInfoStore } from '@/services/dashboards/stores/dashboard-detail-info-store'; diff --git a/apps/web/src/common/modules/widgets/_components/WidgetFormOverlay.vue b/apps/web/src/common/modules/widgets/_components/WidgetFormOverlay.vue index 2d9452ddcf..493fbe12b8 100644 --- a/apps/web/src/common/modules/widgets/_components/WidgetFormOverlay.vue +++ b/apps/web/src/common/modules/widgets/_components/WidgetFormOverlay.vue @@ -10,10 +10,10 @@ import { } from '@cloudforet/mirinae'; -import type { PrivateWidgetDeleteParameters } from '@/schema/dashboard/private-widget/api-verbs/delete'; -import type { PrivateWidgetUpdateParameters } from '@/schema/dashboard/private-widget/api-verbs/update'; -import type { PublicWidgetDeleteParameters } from '@/schema/dashboard/public-widget/api-verbs/delete'; -import type { PublicWidgetUpdateParameters } from '@/schema/dashboard/public-widget/api-verbs/update'; +import type { PrivateWidgetDeleteParameters } from '@/api-clients/dashboard/private-widget/schema/api-verbs/delete'; +import type { PrivateWidgetUpdateParameters } from '@/api-clients/dashboard/private-widget/schema/api-verbs/update'; +import type { PublicWidgetDeleteParameters } from '@/api-clients/dashboard/public-widget/schema/api-verbs/delete'; +import type { PublicWidgetUpdateParameters } from '@/api-clients/dashboard/public-widget/schema/api-verbs/update'; import { i18n } from '@/translations'; import ErrorHandler from '@/common/composables/error/errorHandler'; diff --git a/apps/web/src/common/modules/widgets/_components/WidgetFormOverlayPreviewTable.vue b/apps/web/src/common/modules/widgets/_components/WidgetFormOverlayPreviewTable.vue index a672480280..8ea78902e4 100644 --- a/apps/web/src/common/modules/widgets/_components/WidgetFormOverlayPreviewTable.vue +++ b/apps/web/src/common/modules/widgets/_components/WidgetFormOverlayPreviewTable.vue @@ -15,10 +15,10 @@ import { import type { MenuItem } from '@cloudforet/mirinae/src/controls/context-menu/type'; import { byteFormatter, numberFormatter } from '@cloudforet/utils'; -import type { Page } from '@/schema/_common/type'; -import type { PrivateDataTableModel } from '@/schema/dashboard/private-data-table/model'; -import type { DataTableLoadParameters } from '@/schema/dashboard/public-data-table/api-verbs/load'; -import type { PublicDataTableModel } from '@/schema/dashboard/public-data-table/model'; +import type { Page } from '@/api-clients/_common/schema/type'; +import type { PrivateDataTableModel } from '@/api-clients/dashboard/private-data-table/schema/model'; +import type { DataTableLoadParameters } from '@/api-clients/dashboard/public-data-table/schema/api-verbs/load'; +import type { PublicDataTableModel } from '@/api-clients/dashboard/public-data-table/schema/model'; import { i18n } from '@/translations'; import { useAllReferenceStore } from '@/store/reference/all-reference-store'; diff --git a/apps/web/src/common/modules/widgets/_components/WidgetFormOverlayStep1.vue b/apps/web/src/common/modules/widgets/_components/WidgetFormOverlayStep1.vue index 31f82532e5..c962c7254a 100644 --- a/apps/web/src/common/modules/widgets/_components/WidgetFormOverlayStep1.vue +++ b/apps/web/src/common/modules/widgets/_components/WidgetFormOverlayStep1.vue @@ -9,8 +9,8 @@ import { PI, PTooltip, PButton, } from '@cloudforet/mirinae'; -import type { PrivateDataTableModel } from '@/schema/dashboard/private-data-table/model'; -import type { PublicDataTableModel } from '@/schema/dashboard/public-data-table/model'; +import type { PrivateDataTableModel } from '@/api-clients/dashboard/private-data-table/schema/model'; +import type { PublicDataTableModel } from '@/api-clients/dashboard/public-data-table/schema/model'; import { i18n } from '@/translations'; import { showSuccessMessage } from '@/lib/helper/notice-alert-helper'; diff --git a/apps/web/src/common/modules/widgets/_components/WidgetFormOverlayStep2.vue b/apps/web/src/common/modules/widgets/_components/WidgetFormOverlayStep2.vue index 0ff096e3ec..f6d69583d0 100644 --- a/apps/web/src/common/modules/widgets/_components/WidgetFormOverlayStep2.vue +++ b/apps/web/src/common/modules/widgets/_components/WidgetFormOverlayStep2.vue @@ -11,7 +11,7 @@ import { import type { DashboardOptions, DashboardVars, -} from '@/schema/dashboard/_types/dashboard-type'; +} from '@/api-clients/dashboard/_types/dashboard-type'; import { i18n } from '@/translations'; import { useAppContextStore } from '@/store/app-context/app-context-store'; diff --git a/apps/web/src/common/modules/widgets/_components/WidgetFormOverlayStep2WidgetForm.vue b/apps/web/src/common/modules/widgets/_components/WidgetFormOverlayStep2WidgetForm.vue index 6ccb7d9f58..480372c4e1 100644 --- a/apps/web/src/common/modules/widgets/_components/WidgetFormOverlayStep2WidgetForm.vue +++ b/apps/web/src/common/modules/widgets/_components/WidgetFormOverlayStep2WidgetForm.vue @@ -11,8 +11,8 @@ import { } from '@cloudforet/mirinae'; import type { MenuItem } from '@cloudforet/mirinae/types/controls/context-menu/type'; -import type { PrivateDataTableModel } from '@/schema/dashboard/private-data-table/model'; -import type { PublicDataTableModel } from '@/schema/dashboard/public-data-table/model'; +import type { PrivateDataTableModel } from '@/api-clients/dashboard/private-data-table/schema/model'; +import type { PublicDataTableModel } from '@/api-clients/dashboard/public-data-table/schema/model'; import NewMark from '@/common/components/marks/NewMark.vue'; import { DATA_TABLE_OPERATOR, DATA_TABLE_TYPE } from '@/common/modules/widgets/_constants/data-table-constant'; diff --git a/apps/web/src/common/modules/widgets/_components/WidgetFrame.vue b/apps/web/src/common/modules/widgets/_components/WidgetFrame.vue index a8c10d12b5..0214240344 100644 --- a/apps/web/src/common/modules/widgets/_components/WidgetFrame.vue +++ b/apps/web/src/common/modules/widgets/_components/WidgetFrame.vue @@ -10,8 +10,8 @@ import { import { POPOVER_TRIGGER } from '@cloudforet/mirinae/src/data-display/popover/type'; import type { MenuItem } from '@cloudforet/mirinae/types/controls/context-menu/type'; -import { WIDGET_SIZE } from '@/schema/dashboard/_constants/widget-constant'; -import type { WidgetSize } from '@/schema/dashboard/_types/widget-type'; +import { WIDGET_SIZE } from '@/api-clients/dashboard/_constants/widget-constant'; +import type { WidgetSize } from '@/api-clients/dashboard/_types/widget-type'; import { i18n } from '@/translations'; import { WIDGET_WIDTH_STR_MAP } from '@/common/modules/widgets/_constants/widget-display-constant'; diff --git a/apps/web/src/common/modules/widgets/_composables/use-widget-frame.ts b/apps/web/src/common/modules/widgets/_composables/use-widget-frame.ts index d24d672efd..d7de6c3e50 100644 --- a/apps/web/src/common/modules/widgets/_composables/use-widget-frame.ts +++ b/apps/web/src/common/modules/widgets/_composables/use-widget-frame.ts @@ -7,11 +7,11 @@ import { cloneDeep } from 'lodash'; import type { ConsoleFilter } from '@cloudforet/core-lib/query/type'; import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; -import type { DashboardVars } from '@/schema/dashboard/_types/dashboard-type'; -import type { PrivateDataTableModel } from '@/schema/dashboard/private-data-table/model'; -import type { DataTableListParameters } from '@/schema/dashboard/public-data-table/api-verbs/list'; -import type { PublicDataTableModel } from '@/schema/dashboard/public-data-table/model'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; +import type { DashboardVars } from '@/api-clients/dashboard/_types/dashboard-type'; +import type { PrivateDataTableModel } from '@/api-clients/dashboard/private-data-table/schema/model'; +import type { DataTableListParameters } from '@/api-clients/dashboard/public-data-table/schema/api-verbs/list'; +import type { PublicDataTableModel } from '@/api-clients/dashboard/public-data-table/schema/model'; import { arrayToQueryString, objectToQueryString, primitiveToQueryString } from '@/lib/router-query-string'; diff --git a/apps/web/src/common/modules/widgets/_helpers/__tests__/widget-inherit-options-helper.test.ts b/apps/web/src/common/modules/widgets/_helpers/__tests__/widget-inherit-options-helper.test.ts index 0ad7de6492..b7f20f2a23 100644 --- a/apps/web/src/common/modules/widgets/_helpers/__tests__/widget-inherit-options-helper.test.ts +++ b/apps/web/src/common/modules/widgets/_helpers/__tests__/widget-inherit-options-helper.test.ts @@ -1,8 +1,8 @@ import { cloneDeep } from 'lodash'; import { describe, expect, it } from 'vitest'; -import type { DashboardVariablesSchema } from '@/schema/dashboard/_types/dashboard-type'; -import type { InheritOptions, WidgetConfig, WidgetOptionsSchema } from '@/schema/dashboard/_types/widget-type'; +import type { DashboardVariablesSchema } from '@/api-clients/dashboard/_types/dashboard-type'; +import type { InheritOptions, WidgetConfig, WidgetOptionsSchema } from '@/api-clients/dashboard/_types/widget-type'; import { getInheritingOptionKeys, diff --git a/apps/web/src/common/modules/widgets/_helpers/__tests__/widget-options-filters-helper.test.ts b/apps/web/src/common/modules/widgets/_helpers/__tests__/widget-options-filters-helper.test.ts index 9eaa7af7e0..61d4f9a8a7 100644 --- a/apps/web/src/common/modules/widgets/_helpers/__tests__/widget-options-filters-helper.test.ts +++ b/apps/web/src/common/modules/widgets/_helpers/__tests__/widget-options-filters-helper.test.ts @@ -1,4 +1,4 @@ -import type { WidgetFilterKey, WidgetFiltersMap } from '@/schema/dashboard/_types/widget-type'; +import type { WidgetFilterKey, WidgetFiltersMap } from '@/api-clients/dashboard/_types/widget-type'; import { setFilterAndGetWidgetFiltersMap } from '@/services/dashboards/widgets/_helpers/widget-options-filters-helper'; diff --git a/apps/web/src/common/modules/widgets/_helpers/__tests__/widget-schema-helper.test.ts b/apps/web/src/common/modules/widgets/_helpers/__tests__/widget-schema-helper.test.ts index a1fff9193d..611ed71954 100644 --- a/apps/web/src/common/modules/widgets/_helpers/__tests__/widget-schema-helper.test.ts +++ b/apps/web/src/common/modules/widgets/_helpers/__tests__/widget-schema-helper.test.ts @@ -1,7 +1,7 @@ import { describe, expect, it } from 'vitest'; -import type { DashboardVariableSchemaProperty, DashboardVariablesSchema } from '@/schema/dashboard/_types/dashboard-type'; -import type { InheritOptions, WidgetConfig, WidgetOptions } from '@/schema/dashboard/_types/widget-type'; +import type { DashboardVariableSchemaProperty, DashboardVariablesSchema } from '@/api-clients/dashboard/_types/dashboard-type'; +import type { InheritOptions, WidgetConfig, WidgetOptions } from '@/api-clients/dashboard/_types/widget-type'; import { getInitialSchemaProperties, getNonInheritedWidgetOptionNamesAmongUsedVariables, diff --git a/apps/web/src/common/modules/widgets/_helpers/global-variable-helper.ts b/apps/web/src/common/modules/widgets/_helpers/global-variable-helper.ts index 7d69c51cf7..b68e089848 100644 --- a/apps/web/src/common/modules/widgets/_helpers/global-variable-helper.ts +++ b/apps/web/src/common/modules/widgets/_helpers/global-variable-helper.ts @@ -1,6 +1,6 @@ import type { MenuItem } from '@cloudforet/mirinae/types/controls/context-menu/type'; -import type { DashboardVars } from '@/schema/dashboard/_types/dashboard-type'; +import type { DashboardVars } from '@/api-clients/dashboard/_types/dashboard-type'; export const isGlobalVariableFormat = (value: string | MenuItem[]): boolean => { if (Array.isArray(value)) return false; diff --git a/apps/web/src/common/modules/widgets/_helpers/widget-data-table-helper.ts b/apps/web/src/common/modules/widgets/_helpers/widget-data-table-helper.ts index f9015ccdad..6a17913ceb 100644 --- a/apps/web/src/common/modules/widgets/_helpers/widget-data-table-helper.ts +++ b/apps/web/src/common/modules/widgets/_helpers/widget-data-table-helper.ts @@ -1,5 +1,5 @@ -import type { PrivateDataTableModel } from '@/schema/dashboard/private-data-table/model'; -import type { PublicDataTableModel } from '@/schema/dashboard/public-data-table/model'; +import type { PrivateDataTableModel } from '@/api-clients/dashboard/private-data-table/schema/model'; +import type { PublicDataTableModel } from '@/api-clients/dashboard/public-data-table/schema/model'; import type { DataTableOptions } from '@/common/modules/widgets/types/widget-model'; diff --git a/apps/web/src/common/modules/widgets/_helpers/widget-helper.ts b/apps/web/src/common/modules/widgets/_helpers/widget-helper.ts index 89845f0157..2dea5083f6 100644 --- a/apps/web/src/common/modules/widgets/_helpers/widget-helper.ts +++ b/apps/web/src/common/modules/widgets/_helpers/widget-helper.ts @@ -3,9 +3,9 @@ import bytes from 'bytes'; import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; import { byteFormatter, customNumberFormatter, numberFormatter } from '@cloudforet/utils'; -import type { PrivateDataTableModel } from '@/schema/dashboard/private-data-table/model'; -import type { DataTableGetParameters } from '@/schema/dashboard/public-data-table/api-verbs/get'; -import type { PublicDataTableModel } from '@/schema/dashboard/public-data-table/model'; +import type { PrivateDataTableModel } from '@/api-clients/dashboard/private-data-table/schema/model'; +import type { DataTableGetParameters } from '@/api-clients/dashboard/public-data-table/schema/api-verbs/get'; +import type { PublicDataTableModel } from '@/api-clients/dashboard/public-data-table/schema/model'; import ErrorHandler from '@/common/composables/error/errorHandler'; import { DATE_FIELD } from '@/common/modules/widgets/_constants/widget-constant'; diff --git a/apps/web/src/common/modules/widgets/_helpers/widget-width-helper.ts b/apps/web/src/common/modules/widgets/_helpers/widget-width-helper.ts index abffec0753..c6ade38c9a 100644 --- a/apps/web/src/common/modules/widgets/_helpers/widget-width-helper.ts +++ b/apps/web/src/common/modules/widgets/_helpers/widget-width-helper.ts @@ -1,7 +1,7 @@ import { sum, max } from 'lodash'; -import { WIDGET_SIZE } from '@/schema/dashboard/_constants/widget-constant'; -import type { WidgetSize } from '@/schema/dashboard/_types/widget-type'; +import { WIDGET_SIZE } from '@/api-clients/dashboard/_constants/widget-constant'; +import type { WidgetSize } from '@/api-clients/dashboard/_types/widget-type'; import { WIDGET_GAP, diff --git a/apps/web/src/common/modules/widgets/_store/widget-generate-store.ts b/apps/web/src/common/modules/widgets/_store/widget-generate-store.ts index 05fcf4da90..3d2cd30b0a 100644 --- a/apps/web/src/common/modules/widgets/_store/widget-generate-store.ts +++ b/apps/web/src/common/modules/widgets/_store/widget-generate-store.ts @@ -5,18 +5,18 @@ import { defineStore } from 'pinia'; import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; -import type { PrivateDataTableModel } from '@/schema/dashboard/private-data-table/model'; -import type { PrivateWidgetUpdateParameters } from '@/schema/dashboard/private-widget/api-verbs/update'; -import type { PrivateWidgetModel } from '@/schema/dashboard/private-widget/model'; -import type { DataTableAddParameters } from '@/schema/dashboard/public-data-table/api-verbs/add'; -import type { DataTableDeleteParameters } from '@/schema/dashboard/public-data-table/api-verbs/delete'; -import type { DataTableListParameters } from '@/schema/dashboard/public-data-table/api-verbs/list'; -import type { DataTableTransformParameters } from '@/schema/dashboard/public-data-table/api-verbs/transform'; -import type { DataTableUpdateParameters } from '@/schema/dashboard/public-data-table/api-verbs/update'; -import type { PublicDataTableModel } from '@/schema/dashboard/public-data-table/model'; -import type { PublicWidgetUpdateParameters } from '@/schema/dashboard/public-widget/api-verbs/update'; -import type { PublicWidgetModel } from '@/schema/dashboard/public-widget/model'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; +import type { PrivateDataTableModel } from '@/api-clients/dashboard/private-data-table/schema/model'; +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 { DataTableAddParameters } from '@/api-clients/dashboard/public-data-table/schema/api-verbs/add'; +import type { DataTableDeleteParameters } from '@/api-clients/dashboard/public-data-table/schema/api-verbs/delete'; +import type { DataTableListParameters } from '@/api-clients/dashboard/public-data-table/schema/api-verbs/list'; +import type { DataTableTransformParameters } from '@/api-clients/dashboard/public-data-table/schema/api-verbs/transform'; +import type { DataTableUpdateParameters } from '@/api-clients/dashboard/public-data-table/schema/api-verbs/update'; +import type { PublicDataTableModel } from '@/api-clients/dashboard/public-data-table/schema/model'; +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 { showErrorMessage } from '@/lib/helper/notice-alert-helper'; import getRandomId from '@/lib/random-id-generator'; diff --git a/apps/web/src/common/modules/widgets/_widget-field-value-manager/index.ts b/apps/web/src/common/modules/widgets/_widget-field-value-manager/index.ts index 04c0eadf86..f29e3d342e 100644 --- a/apps/web/src/common/modules/widgets/_widget-field-value-manager/index.ts +++ b/apps/web/src/common/modules/widgets/_widget-field-value-manager/index.ts @@ -2,8 +2,8 @@ import { ref } from 'vue'; import { cloneDeep } from 'lodash'; -import type { PrivateDataTableModel } from '@/schema/dashboard/private-data-table/model'; -import type { PublicDataTableModel } from '@/schema/dashboard/public-data-table/model'; +import type { PrivateDataTableModel } from '@/api-clients/dashboard/private-data-table/schema/model'; +import type { PublicDataTableModel } from '@/api-clients/dashboard/public-data-table/schema/model'; import { integrateFieldsSchema } from '@/common/modules/widgets/_helpers/widget-field-helper'; import { widgetFieldDefaultValueSetterRegistry } from '@/common/modules/widgets/_widget-field-value-manager/constant/default-value-registry'; diff --git a/apps/web/src/common/modules/widgets/_widget-field-value-manager/type.ts b/apps/web/src/common/modules/widgets/_widget-field-value-manager/type.ts index 7063255d9e..160658b274 100644 --- a/apps/web/src/common/modules/widgets/_widget-field-value-manager/type.ts +++ b/apps/web/src/common/modules/widgets/_widget-field-value-manager/type.ts @@ -1,5 +1,5 @@ -import type { PrivateDataTableModel } from '@/schema/dashboard/private-data-table/model'; -import type { PublicDataTableModel } from '@/schema/dashboard/public-data-table/model'; +import type { PrivateDataTableModel } from '@/api-clients/dashboard/private-data-table/schema/model'; +import type { PublicDataTableModel } from '@/api-clients/dashboard/public-data-table/schema/model'; import type { CategoryByValue } from '@/common/modules/widgets/_widget-fields/category-by/type'; import type { ColorSchemaValue } from '@/common/modules/widgets/_widget-fields/color-schema/type'; diff --git a/apps/web/src/common/modules/widgets/_widget-fields/custom-table-column-width/WidgetFieldCustomTableColumnWidth.vue b/apps/web/src/common/modules/widgets/_widget-fields/custom-table-column-width/WidgetFieldCustomTableColumnWidth.vue index 826f8dd4f9..11365e21b4 100644 --- a/apps/web/src/common/modules/widgets/_widget-fields/custom-table-column-width/WidgetFieldCustomTableColumnWidth.vue +++ b/apps/web/src/common/modules/widgets/_widget-fields/custom-table-column-width/WidgetFieldCustomTableColumnWidth.vue @@ -12,8 +12,8 @@ import type { MenuItem } from '@cloudforet/mirinae/types/controls/context-menu/t -import type { PrivateDataTableModel } from '@/schema/dashboard/private-data-table/model'; -import type { PublicDataTableModel } from '@/schema/dashboard/public-data-table/model'; +import type { PrivateDataTableModel } from '@/api-clients/dashboard/private-data-table/schema/model'; +import type { PublicDataTableModel } from '@/api-clients/dashboard/public-data-table/schema/model'; import getRandomId from '@/lib/random-id-generator'; diff --git a/apps/web/src/common/modules/widgets/_widget-fields/data-field-heatmap-color/WidgetFieldDataFieldHeatmapColor.vue b/apps/web/src/common/modules/widgets/_widget-fields/data-field-heatmap-color/WidgetFieldDataFieldHeatmapColor.vue index b4728975fa..bd6e0a328a 100644 --- a/apps/web/src/common/modules/widgets/_widget-fields/data-field-heatmap-color/WidgetFieldDataFieldHeatmapColor.vue +++ b/apps/web/src/common/modules/widgets/_widget-fields/data-field-heatmap-color/WidgetFieldDataFieldHeatmapColor.vue @@ -9,8 +9,8 @@ import { import type { SelectDropdownMenuItem } from '@cloudforet/mirinae/types/controls/dropdown/select-dropdown/type'; -import type { PrivateDataTableModel } from '@/schema/dashboard/private-data-table/model'; -import type { PublicDataTableModel } from '@/schema/dashboard/public-data-table/model'; +import type { PrivateDataTableModel } from '@/api-clients/dashboard/private-data-table/schema/model'; +import type { PublicDataTableModel } from '@/api-clients/dashboard/public-data-table/schema/model'; import { i18n } from '@/translations'; import { DATA_TABLE_OPERATOR } from '@/common/modules/widgets/_constants/data-table-constant'; diff --git a/apps/web/src/common/modules/widgets/_widget-fields/data-field/WidgetFieldDataField.vue b/apps/web/src/common/modules/widgets/_widget-fields/data-field/WidgetFieldDataField.vue index 5ae8e1c745..12e0029cdc 100644 --- a/apps/web/src/common/modules/widgets/_widget-fields/data-field/WidgetFieldDataField.vue +++ b/apps/web/src/common/modules/widgets/_widget-fields/data-field/WidgetFieldDataField.vue @@ -6,8 +6,8 @@ import { import { PSelectDropdown, PFieldGroup } from '@cloudforet/mirinae'; import type { MenuItem } from '@cloudforet/mirinae/types/controls/context-menu/type'; -import type { PrivateDataTableModel } from '@/schema/dashboard/private-data-table/model'; -import type { PublicDataTableModel } from '@/schema/dashboard/public-data-table/model'; +import type { PrivateDataTableModel } from '@/api-clients/dashboard/private-data-table/schema/model'; +import type { PublicDataTableModel } from '@/api-clients/dashboard/public-data-table/schema/model'; import { DATA_TABLE_OPERATOR } from '@/common/modules/widgets/_constants/data-table-constant'; import { SUB_TOTAL_NAME } from '@/common/modules/widgets/_constants/widget-field-constant'; diff --git a/apps/web/src/common/modules/widgets/_widget-fields/date-range/WidgetFieldDateRange.vue b/apps/web/src/common/modules/widgets/_widget-fields/date-range/WidgetFieldDateRange.vue index d7a39a5e56..2116a352f8 100644 --- a/apps/web/src/common/modules/widgets/_widget-fields/date-range/WidgetFieldDateRange.vue +++ b/apps/web/src/common/modules/widgets/_widget-fields/date-range/WidgetFieldDateRange.vue @@ -10,7 +10,7 @@ import { } from '@cloudforet/mirinae'; import type { MenuItem } from '@cloudforet/mirinae/types/controls/context-menu/type'; -import type { DateRange } from '@/schema/dashboard/_types/dashboard-type'; +import type { DateRange } from '@/api-clients/dashboard/_types/dashboard-type'; import { useWidgetDateRange } from '@/common/modules/widgets/_composables/use-widget-date-range'; import { diff --git a/apps/web/src/common/modules/widgets/_widget-fields/number-format/WidgetFieldNumberFormat.vue b/apps/web/src/common/modules/widgets/_widget-fields/number-format/WidgetFieldNumberFormat.vue index e9e469b382..8ef4c0dc1a 100644 --- a/apps/web/src/common/modules/widgets/_widget-fields/number-format/WidgetFieldNumberFormat.vue +++ b/apps/web/src/common/modules/widgets/_widget-fields/number-format/WidgetFieldNumberFormat.vue @@ -9,8 +9,8 @@ import { import type { SelectDropdownMenuItem } from '@cloudforet/mirinae/types/controls/dropdown/select-dropdown/type'; import { customNumberFormatter } from '@cloudforet/utils'; -import type { PrivateDataTableModel } from '@/schema/dashboard/private-data-table/model'; -import type { PublicDataTableModel } from '@/schema/dashboard/public-data-table/model'; +import type { PrivateDataTableModel } from '@/api-clients/dashboard/private-data-table/schema/model'; +import type { PublicDataTableModel } from '@/api-clients/dashboard/public-data-table/schema/model'; import { i18n } from '@/translations'; import { DATA_TABLE_OPERATOR } from '@/common/modules/widgets/_constants/data-table-constant'; diff --git a/apps/web/src/common/modules/widgets/_widget-fields/sub-total/WidgetFieldSubTotal.vue b/apps/web/src/common/modules/widgets/_widget-fields/sub-total/WidgetFieldSubTotal.vue index 82c731311c..3a681437bf 100644 --- a/apps/web/src/common/modules/widgets/_widget-fields/sub-total/WidgetFieldSubTotal.vue +++ b/apps/web/src/common/modules/widgets/_widget-fields/sub-total/WidgetFieldSubTotal.vue @@ -5,8 +5,8 @@ import { PFieldTitle, PToggleButton, PI, PTooltip, PCheckbox, } from '@cloudforet/mirinae'; -import type { PrivateDataTableModel } from '@/schema/dashboard/private-data-table/model'; -import type { PublicDataTableModel } from '@/schema/dashboard/public-data-table/model'; +import type { PrivateDataTableModel } from '@/api-clients/dashboard/private-data-table/schema/model'; +import type { PublicDataTableModel } from '@/api-clients/dashboard/public-data-table/schema/model'; import { DATA_TABLE_OPERATOR } from '@/common/modules/widgets/_constants/data-table-constant'; import { useWidgetGenerateStore } from '@/common/modules/widgets/_store/widget-generate-store'; diff --git a/apps/web/src/common/modules/widgets/_widget-fields/table-column-comparison/WidgetFieldTableColumnComparison.vue b/apps/web/src/common/modules/widgets/_widget-fields/table-column-comparison/WidgetFieldTableColumnComparison.vue index 358d1d6277..19e2f1b91c 100644 --- a/apps/web/src/common/modules/widgets/_widget-fields/table-column-comparison/WidgetFieldTableColumnComparison.vue +++ b/apps/web/src/common/modules/widgets/_widget-fields/table-column-comparison/WidgetFieldTableColumnComparison.vue @@ -10,8 +10,8 @@ import { import type { MenuItem } from '@cloudforet/mirinae/types/inputs/context-menu/type'; import type { SelectDropdownMenuItem } from '@cloudforet/mirinae/types/inputs/dropdown/select-dropdown/type'; -import type { PrivateDataTableModel } from '@/schema/dashboard/private-data-table/model'; -import type { PublicDataTableModel } from '@/schema/dashboard/public-data-table/model'; +import type { PrivateDataTableModel } from '@/api-clients/dashboard/private-data-table/schema/model'; +import type { PublicDataTableModel } from '@/api-clients/dashboard/public-data-table/schema/model'; import { i18n } from '@/translations'; diff --git a/apps/web/src/common/modules/widgets/_widgets/clustered-column-chart/ClusteredColumnChart.vue b/apps/web/src/common/modules/widgets/_widgets/clustered-column-chart/ClusteredColumnChart.vue index d3434610ad..675c6a1281 100644 --- a/apps/web/src/common/modules/widgets/_widgets/clustered-column-chart/ClusteredColumnChart.vue +++ b/apps/web/src/common/modules/widgets/_widgets/clustered-column-chart/ClusteredColumnChart.vue @@ -18,10 +18,10 @@ import { import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; import { numberFormatter } from '@cloudforet/utils'; -import type { PrivateDataTableModel } from '@/schema/dashboard/private-data-table/model'; -import type { PrivateWidgetLoadParameters } from '@/schema/dashboard/private-widget/api-verbs/load'; -import type { PublicDataTableModel } from '@/schema/dashboard/public-data-table/model'; -import type { PublicWidgetLoadParameters } from '@/schema/dashboard/public-widget/api-verbs/load'; +import type { PrivateDataTableModel } from '@/api-clients/dashboard/private-data-table/schema/model'; +import type { PrivateWidgetLoadParameters } from '@/api-clients/dashboard/private-widget/schema/api-verbs/load'; +import type { PublicDataTableModel } from '@/api-clients/dashboard/public-data-table/schema/model'; +import type { PublicWidgetLoadParameters } from '@/api-clients/dashboard/public-widget/schema/api-verbs/load'; import { i18n } from '@/translations'; import WidgetFrame from '@/common/modules/widgets/_components/WidgetFrame.vue'; diff --git a/apps/web/src/common/modules/widgets/_widgets/color-coded-heatmap/ColorCodedHeatmap.vue b/apps/web/src/common/modules/widgets/_widgets/color-coded-heatmap/ColorCodedHeatmap.vue index 573ff65699..c77c26f58a 100644 --- a/apps/web/src/common/modules/widgets/_widgets/color-coded-heatmap/ColorCodedHeatmap.vue +++ b/apps/web/src/common/modules/widgets/_widgets/color-coded-heatmap/ColorCodedHeatmap.vue @@ -13,10 +13,10 @@ import { } from '@cloudforet/mirinae'; import { numberFormatter } from '@cloudforet/utils'; -import type { PrivateDataTableModel } from '@/schema/dashboard/private-data-table/model'; -import type { PrivateWidgetLoadParameters } from '@/schema/dashboard/private-widget/api-verbs/load'; -import type { PublicDataTableModel } from '@/schema/dashboard/public-data-table/model'; -import type { PublicWidgetLoadParameters } from '@/schema/dashboard/public-widget/api-verbs/load'; +import type { PrivateDataTableModel } from '@/api-clients/dashboard/private-data-table/schema/model'; +import type { PrivateWidgetLoadParameters } from '@/api-clients/dashboard/private-widget/schema/api-verbs/load'; +import type { PublicDataTableModel } from '@/api-clients/dashboard/public-data-table/schema/model'; +import type { PublicWidgetLoadParameters } from '@/api-clients/dashboard/public-widget/schema/api-verbs/load'; import { i18n } from '@/translations'; import WidgetCustomLegend from '@/common/modules/widgets/_components/WidgetCustomLegend.vue'; diff --git a/apps/web/src/common/modules/widgets/_widgets/color-coded-table-heatmap/ColorCodedTableHeatmap.vue b/apps/web/src/common/modules/widgets/_widgets/color-coded-table-heatmap/ColorCodedTableHeatmap.vue index f675093c44..4f78edca5d 100644 --- a/apps/web/src/common/modules/widgets/_widgets/color-coded-table-heatmap/ColorCodedTableHeatmap.vue +++ b/apps/web/src/common/modules/widgets/_widgets/color-coded-table-heatmap/ColorCodedTableHeatmap.vue @@ -11,10 +11,10 @@ import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; import { PTooltip } from '@cloudforet/mirinae'; import { getContrastingColor, numberFormatter } from '@cloudforet/utils'; -import type { PrivateDataTableModel } from '@/schema/dashboard/private-data-table/model'; -import type { PrivateWidgetLoadParameters } from '@/schema/dashboard/private-widget/api-verbs/load'; -import type { PublicDataTableModel } from '@/schema/dashboard/public-data-table/model'; -import type { PublicWidgetLoadParameters } from '@/schema/dashboard/public-widget/api-verbs/load'; +import type { PrivateDataTableModel } from '@/api-clients/dashboard/private-data-table/schema/model'; +import type { PrivateWidgetLoadParameters } from '@/api-clients/dashboard/private-widget/schema/api-verbs/load'; +import type { PublicDataTableModel } from '@/api-clients/dashboard/public-data-table/schema/model'; +import type { PublicWidgetLoadParameters } from '@/api-clients/dashboard/public-widget/schema/api-verbs/load'; import { i18n } from '@/translations'; import WidgetCustomLegend from '@/common/modules/widgets/_components/WidgetCustomLegend.vue'; diff --git a/apps/web/src/common/modules/widgets/_widgets/gauge/Gauge.vue b/apps/web/src/common/modules/widgets/_widgets/gauge/Gauge.vue index b672382f81..7dcc16c86b 100644 --- a/apps/web/src/common/modules/widgets/_widgets/gauge/Gauge.vue +++ b/apps/web/src/common/modules/widgets/_widgets/gauge/Gauge.vue @@ -14,10 +14,10 @@ import { isEmpty, orderBy, throttle } from 'lodash'; import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; -import type { PrivateDataTableModel } from '@/schema/dashboard/private-data-table/model'; -import type { PrivateWidgetLoadParameters } from '@/schema/dashboard/private-widget/api-verbs/load'; -import type { PublicDataTableModel } from '@/schema/dashboard/public-data-table/model'; -import type { PublicWidgetLoadParameters } from '@/schema/dashboard/public-widget/api-verbs/load'; +import type { PrivateDataTableModel } from '@/api-clients/dashboard/private-data-table/schema/model'; +import type { PrivateWidgetLoadParameters } from '@/api-clients/dashboard/private-widget/schema/api-verbs/load'; +import type { PublicDataTableModel } from '@/api-clients/dashboard/public-data-table/schema/model'; +import type { PublicWidgetLoadParameters } from '@/api-clients/dashboard/public-widget/schema/api-verbs/load'; import { i18n } from '@/translations'; import WidgetFrame from '@/common/modules/widgets/_components/WidgetFrame.vue'; diff --git a/apps/web/src/common/modules/widgets/_widgets/geo-map/GeoMap.vue b/apps/web/src/common/modules/widgets/_widgets/geo-map/GeoMap.vue index 77bdabf3ba..7675ee8920 100644 --- a/apps/web/src/common/modules/widgets/_widgets/geo-map/GeoMap.vue +++ b/apps/web/src/common/modules/widgets/_widgets/geo-map/GeoMap.vue @@ -16,10 +16,10 @@ import { throttle } from 'lodash'; import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; import { numberFormatter } from '@cloudforet/utils'; -import type { PrivateDataTableModel } from '@/schema/dashboard/private-data-table/model'; -import type { PrivateWidgetLoadParameters } from '@/schema/dashboard/private-widget/api-verbs/load'; -import type { PublicDataTableModel } from '@/schema/dashboard/public-data-table/model'; -import type { PublicWidgetLoadParameters } from '@/schema/dashboard/public-widget/api-verbs/load'; +import type { PrivateDataTableModel } from '@/api-clients/dashboard/private-data-table/schema/model'; +import type { PrivateWidgetLoadParameters } from '@/api-clients/dashboard/private-widget/schema/api-verbs/load'; +import type { PublicDataTableModel } from '@/api-clients/dashboard/public-data-table/schema/model'; +import type { PublicWidgetLoadParameters } from '@/api-clients/dashboard/public-widget/schema/api-verbs/load'; import { i18n } from '@/translations'; import { useAllReferenceStore } from '@/store/reference/all-reference-store'; diff --git a/apps/web/src/common/modules/widgets/_widgets/heatmap/Heatmap.vue b/apps/web/src/common/modules/widgets/_widgets/heatmap/Heatmap.vue index 24882737f1..842f86c71f 100644 --- a/apps/web/src/common/modules/widgets/_widgets/heatmap/Heatmap.vue +++ b/apps/web/src/common/modules/widgets/_widgets/heatmap/Heatmap.vue @@ -14,10 +14,10 @@ import { isEmpty, max, throttle } from 'lodash'; import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; import { numberFormatter } from '@cloudforet/utils'; -import type { PrivateDataTableModel } from '@/schema/dashboard/private-data-table/model'; -import type { PrivateWidgetLoadParameters } from '@/schema/dashboard/private-widget/api-verbs/load'; -import type { PublicDataTableModel } from '@/schema/dashboard/public-data-table/model'; -import type { PublicWidgetLoadParameters } from '@/schema/dashboard/public-widget/api-verbs/load'; +import type { PrivateDataTableModel } from '@/api-clients/dashboard/private-data-table/schema/model'; +import type { PrivateWidgetLoadParameters } from '@/api-clients/dashboard/private-widget/schema/api-verbs/load'; +import type { PublicDataTableModel } from '@/api-clients/dashboard/public-data-table/schema/model'; +import type { PublicWidgetLoadParameters } from '@/api-clients/dashboard/public-widget/schema/api-verbs/load'; import { i18n } from '@/translations'; import WidgetFrame from '@/common/modules/widgets/_components/WidgetFrame.vue'; diff --git a/apps/web/src/common/modules/widgets/_widgets/line-chart/LineChart.vue b/apps/web/src/common/modules/widgets/_widgets/line-chart/LineChart.vue index e91741a7d2..5d254d098a 100644 --- a/apps/web/src/common/modules/widgets/_widgets/line-chart/LineChart.vue +++ b/apps/web/src/common/modules/widgets/_widgets/line-chart/LineChart.vue @@ -18,10 +18,10 @@ import { import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; import { numberFormatter } from '@cloudforet/utils'; -import type { PrivateDataTableModel } from '@/schema/dashboard/private-data-table/model'; -import type { PrivateWidgetLoadParameters } from '@/schema/dashboard/private-widget/api-verbs/load'; -import type { PublicDataTableModel } from '@/schema/dashboard/public-data-table/model'; -import type { PublicWidgetLoadParameters } from '@/schema/dashboard/public-widget/api-verbs/load'; +import type { PrivateDataTableModel } from '@/api-clients/dashboard/private-data-table/schema/model'; +import type { PrivateWidgetLoadParameters } from '@/api-clients/dashboard/private-widget/schema/api-verbs/load'; +import type { PublicDataTableModel } from '@/api-clients/dashboard/public-data-table/schema/model'; +import type { PublicWidgetLoadParameters } from '@/api-clients/dashboard/public-widget/schema/api-verbs/load'; import { i18n } from '@/translations'; import WidgetFrame from '@/common/modules/widgets/_components/WidgetFrame.vue'; diff --git a/apps/web/src/common/modules/widgets/_widgets/number-card/NumberCard.vue b/apps/web/src/common/modules/widgets/_widgets/number-card/NumberCard.vue index 47a53a660f..3abf689be2 100644 --- a/apps/web/src/common/modules/widgets/_widgets/number-card/NumberCard.vue +++ b/apps/web/src/common/modules/widgets/_widgets/number-card/NumberCard.vue @@ -13,10 +13,10 @@ import { } from '@cloudforet/mirinae'; import { numberFormatter } from '@cloudforet/utils'; -import type { PrivateDataTableModel } from '@/schema/dashboard/private-data-table/model'; -import type { PrivateWidgetLoadSumParameters } from '@/schema/dashboard/private-widget/api-verbs/load-sum'; -import type { PublicDataTableModel } from '@/schema/dashboard/public-data-table/model'; -import type { PublicWidgetLoadSumParameters } from '@/schema/dashboard/public-widget/api-verbs/load-sum'; +import type { PrivateDataTableModel } from '@/api-clients/dashboard/private-data-table/schema/model'; +import type { PrivateWidgetLoadSumParameters } from '@/api-clients/dashboard/private-widget/schema/api-verbs/load-sum'; +import type { PublicDataTableModel } from '@/api-clients/dashboard/public-data-table/schema/model'; +import type { PublicWidgetLoadSumParameters } from '@/api-clients/dashboard/public-widget/schema/api-verbs/load-sum'; import { i18n } from '@/translations'; import WidgetFrame from '@/common/modules/widgets/_components/WidgetFrame.vue'; diff --git a/apps/web/src/common/modules/widgets/_widgets/pie-chart/PieChart.vue b/apps/web/src/common/modules/widgets/_widgets/pie-chart/PieChart.vue index 207206c683..bb93b59a96 100644 --- a/apps/web/src/common/modules/widgets/_widgets/pie-chart/PieChart.vue +++ b/apps/web/src/common/modules/widgets/_widgets/pie-chart/PieChart.vue @@ -20,10 +20,10 @@ import { import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; import { numberFormatter } from '@cloudforet/utils'; -import type { PrivateDataTableModel } from '@/schema/dashboard/private-data-table/model'; -import type { PrivateWidgetLoadParameters } from '@/schema/dashboard/private-widget/api-verbs/load'; -import type { PublicDataTableModel } from '@/schema/dashboard/public-data-table/model'; -import type { PublicWidgetLoadParameters } from '@/schema/dashboard/public-widget/api-verbs/load'; +import type { PrivateDataTableModel } from '@/api-clients/dashboard/private-data-table/schema/model'; +import type { PrivateWidgetLoadParameters } from '@/api-clients/dashboard/private-widget/schema/api-verbs/load'; +import type { PublicDataTableModel } from '@/api-clients/dashboard/public-data-table/schema/model'; +import type { PublicWidgetLoadParameters } from '@/api-clients/dashboard/public-widget/schema/api-verbs/load'; import { i18n } from '@/translations'; import WidgetFrame from '@/common/modules/widgets/_components/WidgetFrame.vue'; diff --git a/apps/web/src/common/modules/widgets/_widgets/sankey-chart/SankeyChart.vue b/apps/web/src/common/modules/widgets/_widgets/sankey-chart/SankeyChart.vue index 2dbdffbee8..c15507876b 100644 --- a/apps/web/src/common/modules/widgets/_widgets/sankey-chart/SankeyChart.vue +++ b/apps/web/src/common/modules/widgets/_widgets/sankey-chart/SankeyChart.vue @@ -20,10 +20,10 @@ import { import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; import { numberFormatter } from '@cloudforet/utils'; -import type { PrivateDataTableModel } from '@/schema/dashboard/private-data-table/model'; -import type { PrivateWidgetLoadParameters } from '@/schema/dashboard/private-widget/api-verbs/load'; -import type { PublicDataTableModel } from '@/schema/dashboard/public-data-table/model'; -import type { PublicWidgetLoadParameters } from '@/schema/dashboard/public-widget/api-verbs/load'; +import type { PrivateDataTableModel } from '@/api-clients/dashboard/private-data-table/schema/model'; +import type { PrivateWidgetLoadParameters } from '@/api-clients/dashboard/private-widget/schema/api-verbs/load'; +import type { PublicDataTableModel } from '@/api-clients/dashboard/public-data-table/schema/model'; +import type { PublicWidgetLoadParameters } from '@/api-clients/dashboard/public-widget/schema/api-verbs/load'; import { i18n } from '@/translations'; import WidgetFrame from '@/common/modules/widgets/_components/WidgetFrame.vue'; diff --git a/apps/web/src/common/modules/widgets/_widgets/stacked-column-chart/StackedColumnChart.vue b/apps/web/src/common/modules/widgets/_widgets/stacked-column-chart/StackedColumnChart.vue index 7cbceaf272..681766b6b8 100644 --- a/apps/web/src/common/modules/widgets/_widgets/stacked-column-chart/StackedColumnChart.vue +++ b/apps/web/src/common/modules/widgets/_widgets/stacked-column-chart/StackedColumnChart.vue @@ -18,10 +18,10 @@ import { import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; import { numberFormatter } from '@cloudforet/utils'; -import type { PrivateDataTableModel } from '@/schema/dashboard/private-data-table/model'; -import type { PrivateWidgetLoadParameters } from '@/schema/dashboard/private-widget/api-verbs/load'; -import type { PublicDataTableModel } from '@/schema/dashboard/public-data-table/model'; -import type { PublicWidgetLoadParameters } from '@/schema/dashboard/public-widget/api-verbs/load'; +import type { PrivateDataTableModel } from '@/api-clients/dashboard/private-data-table/schema/model'; +import type { PrivateWidgetLoadParameters } from '@/api-clients/dashboard/private-widget/schema/api-verbs/load'; +import type { PublicDataTableModel } from '@/api-clients/dashboard/public-data-table/schema/model'; +import type { PublicWidgetLoadParameters } from '@/api-clients/dashboard/public-widget/schema/api-verbs/load'; import { i18n } from '@/translations'; import WidgetFrame from '@/common/modules/widgets/_components/WidgetFrame.vue'; diff --git a/apps/web/src/common/modules/widgets/_widgets/stacked-horizontal-bar-chart/StackedHorizontalBarChart.vue b/apps/web/src/common/modules/widgets/_widgets/stacked-horizontal-bar-chart/StackedHorizontalBarChart.vue index a17c19490c..4a3fa76499 100644 --- a/apps/web/src/common/modules/widgets/_widgets/stacked-horizontal-bar-chart/StackedHorizontalBarChart.vue +++ b/apps/web/src/common/modules/widgets/_widgets/stacked-horizontal-bar-chart/StackedHorizontalBarChart.vue @@ -16,10 +16,10 @@ import { import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; import { numberFormatter } from '@cloudforet/utils'; -import type { PrivateDataTableModel } from '@/schema/dashboard/private-data-table/model'; -import type { PrivateWidgetLoadParameters } from '@/schema/dashboard/private-widget/api-verbs/load'; -import type { PublicDataTableModel } from '@/schema/dashboard/public-data-table/model'; -import type { PublicWidgetLoadParameters } from '@/schema/dashboard/public-widget/api-verbs/load'; +import type { PrivateDataTableModel } from '@/api-clients/dashboard/private-data-table/schema/model'; +import type { PrivateWidgetLoadParameters } from '@/api-clients/dashboard/private-widget/schema/api-verbs/load'; +import type { PublicDataTableModel } from '@/api-clients/dashboard/public-data-table/schema/model'; +import type { PublicWidgetLoadParameters } from '@/api-clients/dashboard/public-widget/schema/api-verbs/load'; import { i18n } from '@/translations'; import WidgetFrame from '@/common/modules/widgets/_components/WidgetFrame.vue'; diff --git a/apps/web/src/common/modules/widgets/_widgets/table/Table.vue b/apps/web/src/common/modules/widgets/_widgets/table/Table.vue index b4b51400d7..d11fc0161b 100644 --- a/apps/web/src/common/modules/widgets/_widgets/table/Table.vue +++ b/apps/web/src/common/modules/widgets/_widgets/table/Table.vue @@ -10,12 +10,12 @@ import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; import type { Sort } from '@cloudforet/core-lib/space-connector/type'; import { PPagination } from '@cloudforet/mirinae'; -import type { PrivateDataTableModel } from '@/schema/dashboard/private-data-table/model'; -import type { PrivateWidgetLoadParameters } from '@/schema/dashboard/private-widget/api-verbs/load'; -import type { PrivateWidgetLoadSumParameters } from '@/schema/dashboard/private-widget/api-verbs/load-sum'; -import type { PublicDataTableModel } from '@/schema/dashboard/public-data-table/model'; -import type { PublicWidgetLoadParameters } from '@/schema/dashboard/public-widget/api-verbs/load'; -import type { PublicWidgetLoadSumParameters } from '@/schema/dashboard/public-widget/api-verbs/load-sum'; +import type { PrivateDataTableModel } from '@/api-clients/dashboard/private-data-table/schema/model'; +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 { PublicDataTableModel } from '@/api-clients/dashboard/public-data-table/schema/model'; +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 { i18n } from '@/translations'; import WidgetFrame from '@/common/modules/widgets/_components/WidgetFrame.vue'; diff --git a/apps/web/src/common/modules/widgets/_widgets/table/_component/WidgetDataTable.vue b/apps/web/src/common/modules/widgets/_widgets/table/_component/WidgetDataTable.vue index 23a73bf0f1..aa0ef4e1f0 100644 --- a/apps/web/src/common/modules/widgets/_widgets/table/_component/WidgetDataTable.vue +++ b/apps/web/src/common/modules/widgets/_widgets/table/_component/WidgetDataTable.vue @@ -7,8 +7,8 @@ import type { Query } from '@cloudforet/core-lib/space-connector/type'; import { PI, PTooltip } from '@cloudforet/mirinae'; import { numberFormatter } from '@cloudforet/utils'; -import type { PrivateDataTableModel } from '@/schema/dashboard/private-data-table/model'; -import type { PublicDataTableModel } from '@/schema/dashboard/public-data-table/model'; +import type { PrivateDataTableModel } from '@/api-clients/dashboard/private-data-table/schema/model'; +import type { PublicDataTableModel } from '@/api-clients/dashboard/public-data-table/schema/model'; import type { Currency } from '@/store/display/type'; import { useAllReferenceStore } from '@/store/reference/all-reference-store'; diff --git a/apps/web/src/common/modules/widgets/_widgets/treemap/Treemap.vue b/apps/web/src/common/modules/widgets/_widgets/treemap/Treemap.vue index 762e98d215..1cfead597b 100644 --- a/apps/web/src/common/modules/widgets/_widgets/treemap/Treemap.vue +++ b/apps/web/src/common/modules/widgets/_widgets/treemap/Treemap.vue @@ -18,10 +18,10 @@ import { import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; import { numberFormatter } from '@cloudforet/utils'; -import type { PrivateDataTableModel } from '@/schema/dashboard/private-data-table/model'; -import type { PrivateWidgetLoadParameters } from '@/schema/dashboard/private-widget/api-verbs/load'; -import type { PublicDataTableModel } from '@/schema/dashboard/public-data-table/model'; -import type { PublicWidgetLoadParameters } from '@/schema/dashboard/public-widget/api-verbs/load'; +import type { PrivateDataTableModel } from '@/api-clients/dashboard/private-data-table/schema/model'; +import type { PrivateWidgetLoadParameters } from '@/api-clients/dashboard/private-widget/schema/api-verbs/load'; +import type { PublicDataTableModel } from '@/api-clients/dashboard/public-data-table/schema/model'; +import type { PublicWidgetLoadParameters } from '@/api-clients/dashboard/public-widget/schema/api-verbs/load'; import { i18n } from '@/translations'; import WidgetFrame from '@/common/modules/widgets/_components/WidgetFrame.vue'; diff --git a/apps/web/src/common/modules/widgets/types/widget-data-type.ts b/apps/web/src/common/modules/widgets/types/widget-data-type.ts index 4b654a4078..eca690d726 100644 --- a/apps/web/src/common/modules/widgets/types/widget-data-type.ts +++ b/apps/web/src/common/modules/widgets/types/widget-data-type.ts @@ -1,4 +1,4 @@ -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { DATE_FIELD } from '@/common/modules/widgets/_constants/widget-constant'; import type { DataInfo, LabelsInfo } from '@/common/modules/widgets/types/widget-model'; diff --git a/apps/web/src/common/modules/widgets/types/widget-display-type.ts b/apps/web/src/common/modules/widgets/types/widget-display-type.ts index c72e260393..ab6c84a39e 100644 --- a/apps/web/src/common/modules/widgets/types/widget-display-type.ts +++ b/apps/web/src/common/modules/widgets/types/widget-display-type.ts @@ -1,9 +1,9 @@ import type { DashboardOptions, DashboardVars, -} from '@/schema/dashboard/_types/dashboard-type'; -import type { PrivateDataTableModel } from '@/schema/dashboard/private-data-table/model'; -import type { PublicDataTableModel } from '@/schema/dashboard/public-data-table/model'; +} from '@/api-clients/dashboard/_types/dashboard-type'; +import type { PrivateDataTableModel } from '@/api-clients/dashboard/private-data-table/schema/model'; +import type { PublicDataTableModel } from '@/api-clients/dashboard/public-data-table/schema/model'; import type { WIDGET_SIZE } from '@/common/modules/widgets/_constants/widget-display-constant'; import type { WidgetFieldValue } from '@/common/modules/widgets/_widget-field-value-manager/type'; diff --git a/apps/web/src/common/modules/widgets/types/widget-frame-type.ts b/apps/web/src/common/modules/widgets/types/widget-frame-type.ts index 02975d6ac3..a5a67738ae 100644 --- a/apps/web/src/common/modules/widgets/types/widget-frame-type.ts +++ b/apps/web/src/common/modules/widgets/types/widget-frame-type.ts @@ -1,6 +1,6 @@ import type { TranslateResult } from 'vue-i18n'; -import type { WIDGET_SIZE } from '@/schema/dashboard/_constants/widget-constant'; +import type { WIDGET_SIZE } from '@/api-clients/dashboard/_constants/widget-constant'; import type { WidgetFieldValue } from '@/common/modules/widgets/_widget-field-value-manager/type'; import type { WidgetFieldName } from '@/common/modules/widgets/types/widget-field-type'; diff --git a/apps/web/src/common/modules/workspace/WorkspaceSelectDropdown.vue b/apps/web/src/common/modules/workspace/WorkspaceSelectDropdown.vue index cf81076439..233b4bd439 100644 --- a/apps/web/src/common/modules/workspace/WorkspaceSelectDropdown.vue +++ b/apps/web/src/common/modules/workspace/WorkspaceSelectDropdown.vue @@ -13,7 +13,7 @@ import type { } from '@cloudforet/mirinae/types/controls/dropdown/select-dropdown/type'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { WorkspaceListParameters } from '@/schema/identity/workspace/api-verbs/list'; import type { WorkspaceModel } from '@/schema/identity/workspace/model'; diff --git a/apps/web/src/common/pages/CostReportDetailPage.vue b/apps/web/src/common/pages/CostReportDetailPage.vue index 6d4c4af45b..55552814da 100644 --- a/apps/web/src/common/pages/CostReportDetailPage.vue +++ b/apps/web/src/common/pages/CostReportDetailPage.vue @@ -14,7 +14,7 @@ import { PLink, PDataTable, PIconButton } from '@cloudforet/mirinae'; import type { DataTableFieldType } from '@cloudforet/mirinae/src/data-display/tables/data-table/type'; import { numberFormatter } from '@cloudforet/utils'; -import type { AnalyzeResponse } from '@/schema/_common/api-verbs/analyze'; +import type { AnalyzeResponse } from '@/api-clients/_common/schema/api-verbs/analyze'; import type { CostReportDataAnalyzeParameters } from '@/schema/cost-analysis/cost-report-data/api-verbs/analyze'; import type { CostReportGetParameters } from '@/schema/cost-analysis/cost-report/api-verbs/get'; import type { CostReportModel } from '@/schema/cost-analysis/cost-report/model'; diff --git a/apps/web/src/lib/file-manager/type.ts b/apps/web/src/lib/file-manager/type.ts index 12f05e0248..c31340b06c 100644 --- a/apps/web/src/lib/file-manager/type.ts +++ b/apps/web/src/lib/file-manager/type.ts @@ -1,3 +1,3 @@ -import type { ResourceGroupType } from '@/schema/_common/type'; +import type { ResourceGroupType } from '@/api-clients/_common/schema/type'; export type FileManagerResourceGroupType = ResourceGroupType|'USER'|'PUBLIC'; diff --git a/apps/web/src/lib/helper/config-data-helper.ts b/apps/web/src/lib/helper/config-data-helper.ts index cdc9c2aef6..8669a343ff 100644 --- a/apps/web/src/lib/helper/config-data-helper.ts +++ b/apps/web/src/lib/helper/config-data-helper.ts @@ -1,7 +1,7 @@ import { cloneDeep, find } from 'lodash'; +import type { DashboardModel } from '@/api-clients/dashboard/_types/dashboard-type'; import type { CostQuerySetModel } from '@/schema/cost-analysis/cost-query-set/model'; -import type { DashboardModel } from '@/schema/dashboard/_types/dashboard-type'; import type { WorkspaceModel } from '@/schema/identity/workspace/model'; import type { MetricExampleModel } from '@/schema/inventory/metric-example/model'; diff --git a/apps/web/src/lib/helper/file-download-helper/index.ts b/apps/web/src/lib/helper/file-download-helper/index.ts index a8b99ea6d9..6c7e9b575f 100644 --- a/apps/web/src/lib/helper/file-download-helper/index.ts +++ b/apps/web/src/lib/helper/file-download-helper/index.ts @@ -3,7 +3,7 @@ import axios from 'axios'; import { downloadByFileUrl } from '@cloudforet/core-lib/file-download'; import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; -import type { ExportResponse } from '@/schema/_common/api-verbs/export'; +import type { ExportResponse } from '@/api-clients/_common/schema/api-verbs/export'; import { i18n } from '@/translations'; import config from '@/lib/config'; diff --git a/apps/web/src/lib/site-initializer/last-accessed-workspace.ts b/apps/web/src/lib/site-initializer/last-accessed-workspace.ts index 6fb83666cd..0675f0039b 100644 --- a/apps/web/src/lib/site-initializer/last-accessed-workspace.ts +++ b/apps/web/src/lib/site-initializer/last-accessed-workspace.ts @@ -1,6 +1,6 @@ import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { UserConfigListParameters } from '@/schema/config/user-config/api-verbs/list'; import type { UserConfigSetParameters } from '@/schema/config/user-config/api-verbs/set'; import type { UserConfigModel } from '@/schema/config/user-config/model'; diff --git a/apps/web/src/lib/variable-models/managed-model/resource-model/project-variable-model.ts b/apps/web/src/lib/variable-models/managed-model/resource-model/project-variable-model.ts index a0d7f05c34..b1613e91d9 100644 --- a/apps/web/src/lib/variable-models/managed-model/resource-model/project-variable-model.ts +++ b/apps/web/src/lib/variable-models/managed-model/resource-model/project-variable-model.ts @@ -1,7 +1,7 @@ import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; import { getCancellableFetcher } from '@cloudforet/core-lib/space-connector/cancellable-fetcher'; -import type { ListResponse as ApiListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse as ApiListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { ProjectGroupListParameters } from '@/schema/identity/project-group/api-verbs/list'; import type { ProjectGroupModel } from '@/schema/identity/project-group/model'; import type { ProjectModel } from '@/schema/identity/project/model'; diff --git a/apps/web/src/schema/add-ons/favorite/list.ts b/apps/web/src/schema/add-ons/favorite/list.ts index 37fb8370a9..bbab1d59ec 100644 --- a/apps/web/src/schema/add-ons/favorite/list.ts +++ b/apps/web/src/schema/add-ons/favorite/list.ts @@ -1,4 +1,4 @@ -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { FavoriteModel } from '@/schema/add-ons/favorite/model'; import type { FavoriteType } from '@/common/modules/favorites/favorite-button/type'; diff --git a/apps/web/src/schema/alert-manager/escalation-policy/api-verbs/create.ts b/apps/web/src/schema/alert-manager/escalation-policy/api-verbs/create.ts index d725f2fefb..d4ae69a1b3 100644 --- a/apps/web/src/schema/alert-manager/escalation-policy/api-verbs/create.ts +++ b/apps/web/src/schema/alert-manager/escalation-policy/api-verbs/create.ts @@ -1,4 +1,4 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; import type { EscalationPolicyFinishConditionType, EscalationPolicyRepeatType, diff --git a/apps/web/src/schema/alert-manager/escalation-policy/api-verbs/update.ts b/apps/web/src/schema/alert-manager/escalation-policy/api-verbs/update.ts index a38e7d3e1f..933f30a875 100644 --- a/apps/web/src/schema/alert-manager/escalation-policy/api-verbs/update.ts +++ b/apps/web/src/schema/alert-manager/escalation-policy/api-verbs/update.ts @@ -1,4 +1,4 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; import type { EscalationPolicyFinishConditionType, EscalationPolicyRepeatType, diff --git a/apps/web/src/schema/alert-manager/escalation-policy/model.ts b/apps/web/src/schema/alert-manager/escalation-policy/model.ts index d7871941b6..0293026271 100644 --- a/apps/web/src/schema/alert-manager/escalation-policy/model.ts +++ b/apps/web/src/schema/alert-manager/escalation-policy/model.ts @@ -1,4 +1,4 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; import type { EscalationPolicyFinishConditionType, EscalationPolicyRepeatType, diff --git a/apps/web/src/schema/alert-manager/event-rule/api-verbs/create.ts b/apps/web/src/schema/alert-manager/event-rule/api-verbs/create.ts index 7c22fbcbe5..ddda29c748 100644 --- a/apps/web/src/schema/alert-manager/event-rule/api-verbs/create.ts +++ b/apps/web/src/schema/alert-manager/event-rule/api-verbs/create.ts @@ -1,4 +1,4 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; import type { EventRuleActionsType, EventRuleConditionsPolicyType, diff --git a/apps/web/src/schema/alert-manager/event-rule/api-verbs/update.ts b/apps/web/src/schema/alert-manager/event-rule/api-verbs/update.ts index 4e38c164e8..dbe47c84e1 100644 --- a/apps/web/src/schema/alert-manager/event-rule/api-verbs/update.ts +++ b/apps/web/src/schema/alert-manager/event-rule/api-verbs/update.ts @@ -1,4 +1,4 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; import type { EventRuleActionsType, EventRuleConditionsPolicyType, diff --git a/apps/web/src/schema/alert-manager/event-rule/model.ts b/apps/web/src/schema/alert-manager/event-rule/model.ts index 6dac06e403..539eef9b03 100644 --- a/apps/web/src/schema/alert-manager/event-rule/model.ts +++ b/apps/web/src/schema/alert-manager/event-rule/model.ts @@ -1,4 +1,4 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; import type { EventRuleActionsType, EventRuleConditionsPolicyType, diff --git a/apps/web/src/schema/alert-manager/notification-protocol/api-verbs/create.ts b/apps/web/src/schema/alert-manager/notification-protocol/api-verbs/create.ts index 87b4842558..260e2f04eb 100644 --- a/apps/web/src/schema/alert-manager/notification-protocol/api-verbs/create.ts +++ b/apps/web/src/schema/alert-manager/notification-protocol/api-verbs/create.ts @@ -1,4 +1,4 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; import type { NotificationProtocolPluginInfoRequestType } from '@/schema/alert-manager/notification-protocol/type'; diff --git a/apps/web/src/schema/alert-manager/notification-protocol/api-verbs/update.ts b/apps/web/src/schema/alert-manager/notification-protocol/api-verbs/update.ts index 70cdda10b0..1384d1b0b1 100644 --- a/apps/web/src/schema/alert-manager/notification-protocol/api-verbs/update.ts +++ b/apps/web/src/schema/alert-manager/notification-protocol/api-verbs/update.ts @@ -1,4 +1,4 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; export interface NotificationProtocolUpdateParameters { protocol_id: string; diff --git a/apps/web/src/schema/alert-manager/notification-protocol/model.ts b/apps/web/src/schema/alert-manager/notification-protocol/model.ts index afe35ab61a..09858280e6 100644 --- a/apps/web/src/schema/alert-manager/notification-protocol/model.ts +++ b/apps/web/src/schema/alert-manager/notification-protocol/model.ts @@ -1,6 +1,6 @@ import type { TranslateResult } from 'vue-i18n'; -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; import type { NotificationProtocolPluginInfoType, NotificationProtocolStateType, diff --git a/apps/web/src/schema/alert-manager/service-channel/api-verbs/create-forward-channel.ts b/apps/web/src/schema/alert-manager/service-channel/api-verbs/create-forward-channel.ts index 8a60e983d4..9cc120c911 100644 --- a/apps/web/src/schema/alert-manager/service-channel/api-verbs/create-forward-channel.ts +++ b/apps/web/src/schema/alert-manager/service-channel/api-verbs/create-forward-channel.ts @@ -1,4 +1,4 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; import type { ServiceChannelDataType, ServiceChannelScheduleInfoType } from '@/schema/alert-manager/service-channel/type'; export interface ServiceChannelCreateForwardChannelParameters { diff --git a/apps/web/src/schema/alert-manager/service-channel/api-verbs/create.ts b/apps/web/src/schema/alert-manager/service-channel/api-verbs/create.ts index c66e40c91e..7a9cb76cdc 100644 --- a/apps/web/src/schema/alert-manager/service-channel/api-verbs/create.ts +++ b/apps/web/src/schema/alert-manager/service-channel/api-verbs/create.ts @@ -1,4 +1,4 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; import type { ServiceChannelDataType, ServiceChannelScheduleInfoType } from '@/schema/alert-manager/service-channel/type'; export interface ServiceChannelCreateParameters { diff --git a/apps/web/src/schema/alert-manager/service-channel/api-verbs/update.ts b/apps/web/src/schema/alert-manager/service-channel/api-verbs/update.ts index 3005abb264..51dc4c2801 100644 --- a/apps/web/src/schema/alert-manager/service-channel/api-verbs/update.ts +++ b/apps/web/src/schema/alert-manager/service-channel/api-verbs/update.ts @@ -1,4 +1,4 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; import type { ServiceChannelDataType, ServiceChannelScheduleInfoType } from '@/schema/alert-manager/service-channel/type'; export interface ServiceChannelUpdateParameters { diff --git a/apps/web/src/schema/alert-manager/service-channel/model.ts b/apps/web/src/schema/alert-manager/service-channel/model.ts index 196dba04af..0d8bea6974 100644 --- a/apps/web/src/schema/alert-manager/service-channel/model.ts +++ b/apps/web/src/schema/alert-manager/service-channel/model.ts @@ -1,4 +1,4 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; import type { ServiceChannelDataType, ServiceChannelStateType, diff --git a/apps/web/src/schema/alert-manager/service/api-verbs/create.ts b/apps/web/src/schema/alert-manager/service/api-verbs/create.ts index 578c281ce4..21a95bb002 100644 --- a/apps/web/src/schema/alert-manager/service/api-verbs/create.ts +++ b/apps/web/src/schema/alert-manager/service/api-verbs/create.ts @@ -1,4 +1,4 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; import type { MembersType, ServiceOptionsType } from '@/schema/alert-manager/service/type'; export interface ServiceCreateParameters { diff --git a/apps/web/src/schema/alert-manager/service/api-verbs/update.ts b/apps/web/src/schema/alert-manager/service/api-verbs/update.ts index e9feef9c4a..bcfb7b6917 100644 --- a/apps/web/src/schema/alert-manager/service/api-verbs/update.ts +++ b/apps/web/src/schema/alert-manager/service/api-verbs/update.ts @@ -1,4 +1,4 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; import type { ServiceOptionsType } from '@/schema/alert-manager/service/type'; export interface ServiceUpdateParameters { diff --git a/apps/web/src/schema/alert-manager/service/model.ts b/apps/web/src/schema/alert-manager/service/model.ts index 32f14eebdf..9abedbd232 100644 --- a/apps/web/src/schema/alert-manager/service/model.ts +++ b/apps/web/src/schema/alert-manager/service/model.ts @@ -1,4 +1,4 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; import type { AlertsInfoType, AlertsType, MembersType, ServiceOptionsType, } from '@/schema/alert-manager/service/type'; diff --git a/apps/web/src/schema/alert-manager/user-channel/api-verbs/create.ts b/apps/web/src/schema/alert-manager/user-channel/api-verbs/create.ts index 5c66bd688d..1ba874cf52 100644 --- a/apps/web/src/schema/alert-manager/user-channel/api-verbs/create.ts +++ b/apps/web/src/schema/alert-manager/user-channel/api-verbs/create.ts @@ -1,4 +1,4 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; import type { UserChannelScheduleInfoType } from '@/schema/alert-manager/user-channel/type'; export interface UserChannelCreateParameters { diff --git a/apps/web/src/schema/alert-manager/user-channel/api-verbs/update.ts b/apps/web/src/schema/alert-manager/user-channel/api-verbs/update.ts index 4138955b74..b6a8cbe81c 100644 --- a/apps/web/src/schema/alert-manager/user-channel/api-verbs/update.ts +++ b/apps/web/src/schema/alert-manager/user-channel/api-verbs/update.ts @@ -1,4 +1,4 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; import type { UserChannelScheduleInfoType } from '@/schema/alert-manager/user-channel/type'; export interface UserChannelUpdateParameters { diff --git a/apps/web/src/schema/alert-manager/user-channel/model.ts b/apps/web/src/schema/alert-manager/user-channel/model.ts index d4d18dc6c5..bc046d561b 100644 --- a/apps/web/src/schema/alert-manager/user-channel/model.ts +++ b/apps/web/src/schema/alert-manager/user-channel/model.ts @@ -1,4 +1,4 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; import type { UserChannelScheduleInfoType, UserChannelStateType } from '@/schema/alert-manager/user-channel/type'; export interface UserChannelModel { diff --git a/apps/web/src/schema/alert-manager/user-group-channel/api-verbs/create.ts b/apps/web/src/schema/alert-manager/user-group-channel/api-verbs/create.ts index 6c239e1cfb..0b3172b938 100644 --- a/apps/web/src/schema/alert-manager/user-group-channel/api-verbs/create.ts +++ b/apps/web/src/schema/alert-manager/user-group-channel/api-verbs/create.ts @@ -1,4 +1,4 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; import type { UserGroupChannelScheduleInfoType, } from '@/schema/alert-manager/user-group-channel/type'; diff --git a/apps/web/src/schema/alert-manager/user-group-channel/api-verbs/update.ts b/apps/web/src/schema/alert-manager/user-group-channel/api-verbs/update.ts index eeb711ed19..63d204af10 100644 --- a/apps/web/src/schema/alert-manager/user-group-channel/api-verbs/update.ts +++ b/apps/web/src/schema/alert-manager/user-group-channel/api-verbs/update.ts @@ -1,4 +1,4 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; import type { UserGroupChannelScheduleInfoType } from '@/schema/alert-manager/user-group-channel/type'; export interface UserGroupChannelUpdateParameters { diff --git a/apps/web/src/schema/alert-manager/user-group-channel/model.ts b/apps/web/src/schema/alert-manager/user-group-channel/model.ts index d5d386cd88..2c86789ad5 100644 --- a/apps/web/src/schema/alert-manager/user-group-channel/model.ts +++ b/apps/web/src/schema/alert-manager/user-group-channel/model.ts @@ -1,5 +1,5 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; import type { UserGroupChannelStateType, UserGroupChannelScheduleInfoType, diff --git a/apps/web/src/schema/alert-manager/webhook/api-verbs/create.ts b/apps/web/src/schema/alert-manager/webhook/api-verbs/create.ts index 3561de794e..0242ea89c0 100644 --- a/apps/web/src/schema/alert-manager/webhook/api-verbs/create.ts +++ b/apps/web/src/schema/alert-manager/webhook/api-verbs/create.ts @@ -1,4 +1,4 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; import type { WebhookPluginInfoType } from '@/schema/alert-manager/webhook/type'; export interface WebhookCreateParameters { diff --git a/apps/web/src/schema/alert-manager/webhook/api-verbs/update.ts b/apps/web/src/schema/alert-manager/webhook/api-verbs/update.ts index 40573436c2..f6767a508c 100644 --- a/apps/web/src/schema/alert-manager/webhook/api-verbs/update.ts +++ b/apps/web/src/schema/alert-manager/webhook/api-verbs/update.ts @@ -1,4 +1,4 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; export interface WebhookUpdateParameters { webhook_id: string; diff --git a/apps/web/src/schema/alert-manager/webhook/model.ts b/apps/web/src/schema/alert-manager/webhook/model.ts index 94fdd45a72..35017a43c0 100644 --- a/apps/web/src/schema/alert-manager/webhook/model.ts +++ b/apps/web/src/schema/alert-manager/webhook/model.ts @@ -1,4 +1,4 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; import type { WebhookPluginInfoType, WebhookRequestType, WebhookStateType, WebhookMessageFormatType, } from '@/schema/alert-manager/webhook/type'; diff --git a/apps/web/src/schema/board/post/api-verbs/create.ts b/apps/web/src/schema/board/post/api-verbs/create.ts index 456eb272df..b951186517 100644 --- a/apps/web/src/schema/board/post/api-verbs/create.ts +++ b/apps/web/src/schema/board/post/api-verbs/create.ts @@ -1,4 +1,4 @@ -import type { ResourceGroupType } from '@/schema/_common/type'; +import type { ResourceGroupType } from '@/api-clients/_common/schema/type'; import type { PostBoardType } from '@/schema/board/post/type'; export interface PostCreateParameters { diff --git a/apps/web/src/schema/board/post/model.ts b/apps/web/src/schema/board/post/model.ts index 2c8f92433a..c0469b880b 100644 --- a/apps/web/src/schema/board/post/model.ts +++ b/apps/web/src/schema/board/post/model.ts @@ -1,4 +1,4 @@ -import type { ResourceGroupType, ContentsType } from '@/schema/_common/type'; +import type { ResourceGroupType, ContentsType } from '@/api-clients/_common/schema/type'; import type { PostBoardType } from '@/schema/board/post/type'; import type { FileModel } from '@/schema/file-manager/model'; diff --git a/apps/web/src/schema/config/domain-config/model.ts b/apps/web/src/schema/config/domain-config/model.ts index 94c453b948..29dfe2e040 100644 --- a/apps/web/src/schema/config/domain-config/model.ts +++ b/apps/web/src/schema/config/domain-config/model.ts @@ -1,4 +1,4 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; export interface DomainConfigModel> { name: string; diff --git a/apps/web/src/schema/config/public-config/model.ts b/apps/web/src/schema/config/public-config/model.ts index 49f738172b..bc6fcd0e79 100644 --- a/apps/web/src/schema/config/public-config/model.ts +++ b/apps/web/src/schema/config/public-config/model.ts @@ -1,4 +1,4 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; export interface PublicConfigModel> { name: string; diff --git a/apps/web/src/schema/config/shared-config/api-verbs/create.ts b/apps/web/src/schema/config/shared-config/api-verbs/create.ts index 0de72dd71c..a1756bab9c 100644 --- a/apps/web/src/schema/config/shared-config/api-verbs/create.ts +++ b/apps/web/src/schema/config/shared-config/api-verbs/create.ts @@ -1,4 +1,4 @@ -import type { ResourceGroupType } from '@/schema/_common/type'; +import type { ResourceGroupType } from '@/api-clients/_common/schema/type'; export interface SharedConfigCreateParameters> { name: string; diff --git a/apps/web/src/schema/config/shared-config/model.ts b/apps/web/src/schema/config/shared-config/model.ts index 4549d58ee4..34559ff59e 100644 --- a/apps/web/src/schema/config/shared-config/model.ts +++ b/apps/web/src/schema/config/shared-config/model.ts @@ -1,5 +1,5 @@ -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'; export interface SharedConfigModel> { name: string; diff --git a/apps/web/src/schema/config/user-config/api-verbs/create.ts b/apps/web/src/schema/config/user-config/api-verbs/create.ts index 3fabe9706e..821177781c 100644 --- a/apps/web/src/schema/config/user-config/api-verbs/create.ts +++ b/apps/web/src/schema/config/user-config/api-verbs/create.ts @@ -1,4 +1,4 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; export interface UserConfigCreateParameters> { name: string; diff --git a/apps/web/src/schema/config/user-config/api-verbs/set.ts b/apps/web/src/schema/config/user-config/api-verbs/set.ts index 0e9e11f75d..724e084075 100644 --- a/apps/web/src/schema/config/user-config/api-verbs/set.ts +++ b/apps/web/src/schema/config/user-config/api-verbs/set.ts @@ -1,4 +1,4 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; export interface UserConfigSetParameters> { name: string; diff --git a/apps/web/src/schema/config/user-config/api-verbs/update.ts b/apps/web/src/schema/config/user-config/api-verbs/update.ts index 10f0947d57..f253bf4cc2 100644 --- a/apps/web/src/schema/config/user-config/api-verbs/update.ts +++ b/apps/web/src/schema/config/user-config/api-verbs/update.ts @@ -1,4 +1,4 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; export interface UserConfigUpdateParameters> { name: string; diff --git a/apps/web/src/schema/config/user-config/model.ts b/apps/web/src/schema/config/user-config/model.ts index df7d85f6b5..a110b43082 100644 --- a/apps/web/src/schema/config/user-config/model.ts +++ b/apps/web/src/schema/config/user-config/model.ts @@ -1,4 +1,4 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; export interface UserConfigModel> { name: string; diff --git a/apps/web/src/schema/cost-analysis/budget-usage/api-verbs/analyze.ts b/apps/web/src/schema/cost-analysis/budget-usage/api-verbs/analyze.ts index 427508fab4..4c68386e74 100644 --- a/apps/web/src/schema/cost-analysis/budget-usage/api-verbs/analyze.ts +++ b/apps/web/src/schema/cost-analysis/budget-usage/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/apps/web/src/schema/cost-analysis/budget-usage/model.ts b/apps/web/src/schema/cost-analysis/budget-usage/model.ts index aba4f3be26..099704073c 100644 --- a/apps/web/src/schema/cost-analysis/budget-usage/model.ts +++ b/apps/web/src/schema/cost-analysis/budget-usage/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/schema/cost-analysis/budget/api-verbs/create.ts b/apps/web/src/schema/cost-analysis/budget/api-verbs/create.ts index c197f3abe1..9d74764cbc 100644 --- a/apps/web/src/schema/cost-analysis/budget/api-verbs/create.ts +++ b/apps/web/src/schema/cost-analysis/budget/api-verbs/create.ts @@ -1,5 +1,5 @@ -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'; diff --git a/apps/web/src/schema/cost-analysis/budget/api-verbs/update.ts b/apps/web/src/schema/cost-analysis/budget/api-verbs/update.ts index 8af40b8570..64d5b30000 100644 --- a/apps/web/src/schema/cost-analysis/budget/api-verbs/update.ts +++ b/apps/web/src/schema/cost-analysis/budget/api-verbs/update.ts @@ -1,4 +1,4 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; import type { BudgetPlannedLimit } from '@/schema/cost-analysis/budget/type'; export interface BudgetUpdateParameters { diff --git a/apps/web/src/schema/cost-analysis/budget/model.ts b/apps/web/src/schema/cost-analysis/budget/model.ts index 174294ebde..3251c0500d 100644 --- a/apps/web/src/schema/cost-analysis/budget/model.ts +++ b/apps/web/src/schema/cost-analysis/budget/model.ts @@ -1,5 +1,5 @@ -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'; diff --git a/apps/web/src/schema/cost-analysis/cost-query-set/api-verbs/create.ts b/apps/web/src/schema/cost-analysis/cost-query-set/api-verbs/create.ts index 6121c63d35..6aa66cc445 100644 --- a/apps/web/src/schema/cost-analysis/cost-query-set/api-verbs/create.ts +++ b/apps/web/src/schema/cost-analysis/cost-query-set/api-verbs/create.ts @@ -1,4 +1,4 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; import type { CostQuerySetOption } from '@/schema/cost-analysis/cost-query-set/type'; diff --git a/apps/web/src/schema/cost-analysis/cost-query-set/api-verbs/update.ts b/apps/web/src/schema/cost-analysis/cost-query-set/api-verbs/update.ts index 1636db616b..09e7e26a36 100644 --- a/apps/web/src/schema/cost-analysis/cost-query-set/api-verbs/update.ts +++ b/apps/web/src/schema/cost-analysis/cost-query-set/api-verbs/update.ts @@ -1,4 +1,4 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; import type { CostQuerySetOption } from '@/schema/cost-analysis/cost-query-set/type'; diff --git a/apps/web/src/schema/cost-analysis/cost-query-set/model.ts b/apps/web/src/schema/cost-analysis/cost-query-set/model.ts index 13e32a4a22..e37c35645f 100644 --- a/apps/web/src/schema/cost-analysis/cost-query-set/model.ts +++ b/apps/web/src/schema/cost-analysis/cost-query-set/model.ts @@ -1,4 +1,4 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; import type { CostQuerySetOption } from '@/schema/cost-analysis/cost-query-set/type'; diff --git a/apps/web/src/schema/cost-analysis/cost/model.ts b/apps/web/src/schema/cost-analysis/cost/model.ts index 2deec308cb..9e21ca1b57 100644 --- a/apps/web/src/schema/cost-analysis/cost/model.ts +++ b/apps/web/src/schema/cost-analysis/cost/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/apps/web/src/schema/cost-analysis/data-source/model.ts b/apps/web/src/schema/cost-analysis/data-source/model.ts index 37162804be..521787c1c5 100644 --- a/apps/web/src/schema/cost-analysis/data-source/model.ts +++ b/apps/web/src/schema/cost-analysis/data-source/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 '@/schema/cost-analysis/data-source/type'; interface PluginInfoModel { diff --git a/apps/web/src/schema/cost-analysis/job/model.ts b/apps/web/src/schema/cost-analysis/job/model.ts index 95d2a6cb90..8dd1a44154 100644 --- a/apps/web/src/schema/cost-analysis/job/model.ts +++ b/apps/web/src/schema/cost-analysis/job/model.ts @@ -1,4 +1,4 @@ -import type { ResourceGroupType } from '@/schema/_common/type'; +import type { ResourceGroupType } from '@/api-clients/_common/schema/type'; import type { CostJobStatus } from '@/schema/cost-analysis/job/type'; interface SyncedAccount { diff --git a/apps/web/src/schema/dashboard/_types/folder-type.ts b/apps/web/src/schema/dashboard/_types/folder-type.ts deleted file mode 100644 index 56eb9e9e8d..0000000000 --- a/apps/web/src/schema/dashboard/_types/folder-type.ts +++ /dev/null @@ -1,11 +0,0 @@ -import type { PrivateFolderCreateParameters } from '@/schema/dashboard/private-folder/api-verbs/create'; -import type { PrivateFolderDeleteParameters } from '@/schema/dashboard/private-folder/api-verbs/delete'; -import type { PrivateFolderModel } from '@/schema/dashboard/private-folder/model'; -import type { PublicFolderCreateParameters } from '@/schema/dashboard/public-folder/api-verbs/create'; -import type { PublicFolderDeleteParameters } from '@/schema/dashboard/public-folder/api-verbs/delete'; -import type { PublicFolderModel } from '@/schema/dashboard/public-folder/model'; - - -export type FolderModel = PublicFolderModel & PrivateFolderModel; -export type FolderCreateParams = PublicFolderCreateParameters | PrivateFolderCreateParameters; -export type FolderDeleteParams = PublicFolderDeleteParameters | PrivateFolderDeleteParameters; diff --git a/apps/web/src/schema/dashboard/public-data-table/api-verbs/load.ts b/apps/web/src/schema/dashboard/public-data-table/api-verbs/load.ts deleted file mode 100644 index f96701a1b9..0000000000 --- a/apps/web/src/schema/dashboard/public-data-table/api-verbs/load.ts +++ /dev/null @@ -1,15 +0,0 @@ -import type { Page } from '@/schema/_common/type'; -import type { DashboardVars } from '@/schema/dashboard/_types/dashboard-type'; -import type { Granularity } from '@/schema/dashboard/_types/widget-type'; - - - -export interface DataTableLoadParameters { - data_table_id: string; - granularity: Granularity; - start?: string; - end?: string; - sort?: any[]; - page?: Page; - vars?: DashboardVars; -} diff --git a/apps/web/src/schema/file-manager/api-verbs/add.ts b/apps/web/src/schema/file-manager/api-verbs/add.ts index 57d2c85ae5..b67fd3212e 100644 --- a/apps/web/src/schema/file-manager/api-verbs/add.ts +++ b/apps/web/src/schema/file-manager/api-verbs/add.ts @@ -1,5 +1,5 @@ -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 { FileReference } from '@/schema/file-manager/type'; export interface FileAddParameters { diff --git a/apps/web/src/schema/file-manager/api-verbs/update.ts b/apps/web/src/schema/file-manager/api-verbs/update.ts index f5eec54783..cdc8432a50 100644 --- a/apps/web/src/schema/file-manager/api-verbs/update.ts +++ b/apps/web/src/schema/file-manager/api-verbs/update.ts @@ -1,4 +1,4 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; import type { FileReference } from '@/schema/file-manager/type'; export interface FileUpdateParameters { diff --git a/apps/web/src/schema/file-manager/model.ts b/apps/web/src/schema/file-manager/model.ts index d761a880b6..aee6055f17 100644 --- a/apps/web/src/schema/file-manager/model.ts +++ b/apps/web/src/schema/file-manager/model.ts @@ -1,5 +1,5 @@ -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 { FileState, FileReference } from '@/schema/file-manager/type'; export interface FileModel { diff --git a/apps/web/src/schema/identity/app/api-verbs/create.ts b/apps/web/src/schema/identity/app/api-verbs/create.ts index 5becc36778..98f7c8f1c7 100644 --- a/apps/web/src/schema/identity/app/api-verbs/create.ts +++ b/apps/web/src/schema/identity/app/api-verbs/create.ts @@ -1,5 +1,5 @@ -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'; export interface AppCreateParameters { name: string; diff --git a/apps/web/src/schema/identity/app/api-verbs/update.ts b/apps/web/src/schema/identity/app/api-verbs/update.ts index 4b8e3194f7..66f8553346 100644 --- a/apps/web/src/schema/identity/app/api-verbs/update.ts +++ b/apps/web/src/schema/identity/app/api-verbs/update.ts @@ -1,4 +1,4 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; export interface AppUpdateParameters { app_id: string; diff --git a/apps/web/src/schema/identity/app/model.ts b/apps/web/src/schema/identity/app/model.ts index 3358b3bba1..29981c36f8 100644 --- a/apps/web/src/schema/identity/app/model.ts +++ b/apps/web/src/schema/identity/app/model.ts @@ -1,5 +1,5 @@ -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 { AppStatusType } from '@/schema/identity/app/type'; import type { RoleType } from '@/schema/identity/role/type'; diff --git a/apps/web/src/schema/identity/domain/model.ts b/apps/web/src/schema/identity/domain/model.ts index 3df90e3c3a..ff9317ff8d 100644 --- a/apps/web/src/schema/identity/domain/model.ts +++ b/apps/web/src/schema/identity/domain/model.ts @@ -1,4 +1,4 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; import type { DomainState } from '@/schema/identity/domain/constant'; export interface DomainModel { diff --git a/apps/web/src/schema/identity/package/api-verbs/create.ts b/apps/web/src/schema/identity/package/api-verbs/create.ts index e0e27e9f6a..d1bf056643 100644 --- a/apps/web/src/schema/identity/package/api-verbs/create.ts +++ b/apps/web/src/schema/identity/package/api-verbs/create.ts @@ -1,4 +1,4 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; export interface PackageCreateParameters { name: string; diff --git a/apps/web/src/schema/identity/package/api-verbs/update.ts b/apps/web/src/schema/identity/package/api-verbs/update.ts index 48d7f17267..f9f3d8bc32 100644 --- a/apps/web/src/schema/identity/package/api-verbs/update.ts +++ b/apps/web/src/schema/identity/package/api-verbs/update.ts @@ -1,4 +1,4 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; export interface PackageUpdateParameters { package_id: string; diff --git a/apps/web/src/schema/identity/package/model.ts b/apps/web/src/schema/identity/package/model.ts index 50cab3071d..4e498d16e1 100644 --- a/apps/web/src/schema/identity/package/model.ts +++ b/apps/web/src/schema/identity/package/model.ts @@ -1,4 +1,4 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; export interface PackageModel { package_id: string; diff --git a/apps/web/src/schema/identity/project-group/model.ts b/apps/web/src/schema/identity/project-group/model.ts index 4f5c46047d..b15428ee13 100644 --- a/apps/web/src/schema/identity/project-group/model.ts +++ b/apps/web/src/schema/identity/project-group/model.ts @@ -1,4 +1,4 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; export interface ProjectGroupModel { diff --git a/apps/web/src/schema/identity/project/model.ts b/apps/web/src/schema/identity/project/model.ts index d706d2d559..ed34282216 100644 --- a/apps/web/src/schema/identity/project/model.ts +++ b/apps/web/src/schema/identity/project/model.ts @@ -1,4 +1,4 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; import type { ProjectType } from '@/schema/identity/project/type'; diff --git a/apps/web/src/schema/identity/provider/api-verbs/create.ts b/apps/web/src/schema/identity/provider/api-verbs/create.ts index 02eb308824..6349212eea 100644 --- a/apps/web/src/schema/identity/provider/api-verbs/create.ts +++ b/apps/web/src/schema/identity/provider/api-verbs/create.ts @@ -1,4 +1,4 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; export interface ProviderCreateParameters { provider: string; diff --git a/apps/web/src/schema/identity/provider/api-verbs/update.ts b/apps/web/src/schema/identity/provider/api-verbs/update.ts index 122794efbe..bc02ba50be 100644 --- a/apps/web/src/schema/identity/provider/api-verbs/update.ts +++ b/apps/web/src/schema/identity/provider/api-verbs/update.ts @@ -1,4 +1,4 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; export interface ProviderUpdateParameters { provider: string; diff --git a/apps/web/src/schema/identity/provider/model.ts b/apps/web/src/schema/identity/provider/model.ts index 8fef259efa..26f82a3239 100644 --- a/apps/web/src/schema/identity/provider/model.ts +++ b/apps/web/src/schema/identity/provider/model.ts @@ -1,4 +1,4 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; export interface ProviderModel { provider: string; diff --git a/apps/web/src/schema/identity/role-binding/api-verbs/create.ts b/apps/web/src/schema/identity/role-binding/api-verbs/create.ts index ff23ec329b..ee9757d0a4 100644 --- a/apps/web/src/schema/identity/role-binding/api-verbs/create.ts +++ b/apps/web/src/schema/identity/role-binding/api-verbs/create.ts @@ -1,4 +1,4 @@ -import type { ResourceGroupType } from '@/schema/_common/type'; +import type { ResourceGroupType } from '@/api-clients/_common/schema/type'; export interface RoleCreateParameters { user_id: string; diff --git a/apps/web/src/schema/identity/role-binding/api-verbs/list.ts b/apps/web/src/schema/identity/role-binding/api-verbs/list.ts index cb214f01f2..c4791ea82c 100644 --- a/apps/web/src/schema/identity/role-binding/api-verbs/list.ts +++ b/apps/web/src/schema/identity/role-binding/api-verbs/list.ts @@ -1,6 +1,6 @@ import type { Query } from '@cloudforet/core-lib/space-connector/type'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { RoleBindingModel } from '@/schema/identity/role-binding/model'; import type { RoleType } from '@/schema/identity/role/type'; diff --git a/apps/web/src/schema/identity/role-binding/model.ts b/apps/web/src/schema/identity/role-binding/model.ts index c556bf7293..e9ad42dd89 100644 --- a/apps/web/src/schema/identity/role-binding/model.ts +++ b/apps/web/src/schema/identity/role-binding/model.ts @@ -1,4 +1,4 @@ -import type { ResourceGroupType } from '@/schema/_common/type'; +import type { ResourceGroupType } from '@/api-clients/_common/schema/type'; import type { RoleType } from '@/schema/identity/role/type'; diff --git a/apps/web/src/schema/identity/role/api-verbs/create.ts b/apps/web/src/schema/identity/role/api-verbs/create.ts index 6f39472e71..482ba7792a 100644 --- a/apps/web/src/schema/identity/role/api-verbs/create.ts +++ b/apps/web/src/schema/identity/role/api-verbs/create.ts @@ -1,4 +1,4 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; import type { RoleType } from '@/schema/identity/role/type'; export interface RoleCreateParameters { diff --git a/apps/web/src/schema/identity/role/api-verbs/update.ts b/apps/web/src/schema/identity/role/api-verbs/update.ts index 88bc6a35f7..7fd5377abd 100644 --- a/apps/web/src/schema/identity/role/api-verbs/update.ts +++ b/apps/web/src/schema/identity/role/api-verbs/update.ts @@ -1,4 +1,4 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; export interface RoleUpdateParameters { role_id: string; diff --git a/apps/web/src/schema/identity/role/model.ts b/apps/web/src/schema/identity/role/model.ts index 16da7733c2..30ad12fe4b 100644 --- a/apps/web/src/schema/identity/role/model.ts +++ b/apps/web/src/schema/identity/role/model.ts @@ -1,4 +1,4 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; import type { RoleType, RoleState } from '@/schema/identity/role/type'; diff --git a/apps/web/src/schema/identity/schema/api-verbs/create.ts b/apps/web/src/schema/identity/schema/api-verbs/create.ts index 8bb2e056ea..2ce82a285c 100644 --- a/apps/web/src/schema/identity/schema/api-verbs/create.ts +++ b/apps/web/src/schema/identity/schema/api-verbs/create.ts @@ -1,6 +1,6 @@ import type { JsonSchema } from '@cloudforet/mirinae/types/controls/forms/json-schema-form/type'; -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; import type { SchemaType } from '@/schema/identity/schema/type'; export interface SchemaCreateParameters { diff --git a/apps/web/src/schema/identity/schema/api-verbs/update.ts b/apps/web/src/schema/identity/schema/api-verbs/update.ts index fb3743280a..c9fb25a8a0 100644 --- a/apps/web/src/schema/identity/schema/api-verbs/update.ts +++ b/apps/web/src/schema/identity/schema/api-verbs/update.ts @@ -1,6 +1,6 @@ import type { JsonSchema } from '@cloudforet/mirinae/types/controls/forms/json-schema-form/type'; -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; export interface SchemaUpdateParameters { schema_id: string; diff --git a/apps/web/src/schema/identity/schema/model.ts b/apps/web/src/schema/identity/schema/model.ts index a4a290a5e4..fcf0e51e73 100644 --- a/apps/web/src/schema/identity/schema/model.ts +++ b/apps/web/src/schema/identity/schema/model.ts @@ -1,6 +1,6 @@ import type { JsonSchema } from '@cloudforet/mirinae/types/controls/forms/json-schema-form/type'; -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; import type { SchemaType } from '@/schema/identity/schema/type'; export interface SchemaModel { diff --git a/apps/web/src/schema/identity/service-account/api-verbs/create.ts b/apps/web/src/schema/identity/service-account/api-verbs/create.ts index 0b5b85a9f9..cef311f12b 100644 --- a/apps/web/src/schema/identity/service-account/api-verbs/create.ts +++ b/apps/web/src/schema/identity/service-account/api-verbs/create.ts @@ -1,4 +1,4 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; export interface ServiceAccountCreateParameters { name: string; diff --git a/apps/web/src/schema/identity/service-account/api-verbs/update.ts b/apps/web/src/schema/identity/service-account/api-verbs/update.ts index 6398f29de4..ce80ea285e 100644 --- a/apps/web/src/schema/identity/service-account/api-verbs/update.ts +++ b/apps/web/src/schema/identity/service-account/api-verbs/update.ts @@ -1,4 +1,4 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; export interface ServiceAccountUpdateParameters { service_account_id: string; diff --git a/apps/web/src/schema/identity/service-account/model.ts b/apps/web/src/schema/identity/service-account/model.ts index c379a79d53..085a11c5e0 100644 --- a/apps/web/src/schema/identity/service-account/model.ts +++ b/apps/web/src/schema/identity/service-account/model.ts @@ -1,4 +1,4 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; import type { ServiceAccountType } from '@/schema/identity/service-account/type'; export interface ServiceAccountModel { diff --git a/apps/web/src/schema/identity/trusted-account/api-verbs/create.ts b/apps/web/src/schema/identity/trusted-account/api-verbs/create.ts index 174da66953..bedf702ac3 100644 --- a/apps/web/src/schema/identity/trusted-account/api-verbs/create.ts +++ b/apps/web/src/schema/identity/trusted-account/api-verbs/create.ts @@ -1,5 +1,5 @@ -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'; export interface TrustedAccountCreateParameters { name: string; diff --git a/apps/web/src/schema/identity/trusted-account/api-verbs/update.ts b/apps/web/src/schema/identity/trusted-account/api-verbs/update.ts index 81e8198d24..3f6e252d51 100644 --- a/apps/web/src/schema/identity/trusted-account/api-verbs/update.ts +++ b/apps/web/src/schema/identity/trusted-account/api-verbs/update.ts @@ -1,4 +1,4 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; export interface TrustedAccountUpdateParameters { trusted_account_id: string; diff --git a/apps/web/src/schema/identity/trusted-account/model.ts b/apps/web/src/schema/identity/trusted-account/model.ts index 4b4292de53..e01e0d73d5 100644 --- a/apps/web/src/schema/identity/trusted-account/model.ts +++ b/apps/web/src/schema/identity/trusted-account/model.ts @@ -1,5 +1,5 @@ -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'; export interface TrustedAccountModel { trusted_account_id: string; diff --git a/apps/web/src/schema/identity/user-group/api-verbs/create.ts b/apps/web/src/schema/identity/user-group/api-verbs/create.ts index 883e88d8fb..c03865595b 100644 --- a/apps/web/src/schema/identity/user-group/api-verbs/create.ts +++ b/apps/web/src/schema/identity/user-group/api-verbs/create.ts @@ -1,4 +1,4 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; export interface UserGroupCreateParameters { name: string; diff --git a/apps/web/src/schema/identity/user-group/api-verbs/update.ts b/apps/web/src/schema/identity/user-group/api-verbs/update.ts index 2c0a0936ca..03fc2a91ff 100644 --- a/apps/web/src/schema/identity/user-group/api-verbs/update.ts +++ b/apps/web/src/schema/identity/user-group/api-verbs/update.ts @@ -1,4 +1,4 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; export interface UserGroupUpdateParameters { user_group_id?: string; diff --git a/apps/web/src/schema/identity/user-group/model.ts b/apps/web/src/schema/identity/user-group/model.ts index 7372d3c798..9c617c1d1d 100644 --- a/apps/web/src/schema/identity/user-group/model.ts +++ b/apps/web/src/schema/identity/user-group/model.ts @@ -1,4 +1,4 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; import type { UserGroupChannelModel } from '@/schema/alert-manager/user-group-channel/model'; export interface UserGroupModel { diff --git a/apps/web/src/schema/identity/user-profile/api-verbs/update.ts b/apps/web/src/schema/identity/user-profile/api-verbs/update.ts index d03580a884..44f5a541f3 100644 --- a/apps/web/src/schema/identity/user-profile/api-verbs/update.ts +++ b/apps/web/src/schema/identity/user-profile/api-verbs/update.ts @@ -1,4 +1,4 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; export interface UserProfileUpdateParameters { password?: string; diff --git a/apps/web/src/schema/identity/user-profile/model.ts b/apps/web/src/schema/identity/user-profile/model.ts index 02c86232ae..9c529a0d52 100644 --- a/apps/web/src/schema/identity/user-profile/model.ts +++ b/apps/web/src/schema/identity/user-profile/model.ts @@ -1,4 +1,4 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; import type { UserState } from '@/schema/identity/user/type'; export interface MyWorkspaceModel { diff --git a/apps/web/src/schema/identity/user/api-verbs/create.ts b/apps/web/src/schema/identity/user/api-verbs/create.ts index 617b93a76c..79e4c416b7 100644 --- a/apps/web/src/schema/identity/user/api-verbs/create.ts +++ b/apps/web/src/schema/identity/user/api-verbs/create.ts @@ -1,4 +1,4 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; import type { AuthType } from '@/schema/identity/user/type'; diff --git a/apps/web/src/schema/identity/user/api-verbs/update.ts b/apps/web/src/schema/identity/user/api-verbs/update.ts index 6a0a2fa9ab..c7278cc482 100644 --- a/apps/web/src/schema/identity/user/api-verbs/update.ts +++ b/apps/web/src/schema/identity/user/api-verbs/update.ts @@ -1,4 +1,4 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; export interface UserUpdateParameters { diff --git a/apps/web/src/schema/identity/user/model.ts b/apps/web/src/schema/identity/user/model.ts index 84a8cfb851..aa9058324f 100644 --- a/apps/web/src/schema/identity/user/model.ts +++ b/apps/web/src/schema/identity/user/model.ts @@ -1,4 +1,4 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; import type { RoleType } from '@/schema/identity/role/type'; import type { MultiFactorAuthType } from '@/schema/identity/user-profile/type'; import type { diff --git a/apps/web/src/schema/identity/workspace-group-user/model.ts b/apps/web/src/schema/identity/workspace-group-user/model.ts index 2fb1858d42..bb7debac43 100644 --- a/apps/web/src/schema/identity/workspace-group-user/model.ts +++ b/apps/web/src/schema/identity/workspace-group-user/model.ts @@ -1,4 +1,4 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; import type { RoleType } from '@/schema/identity/role/type'; import type { UserState } from '@/schema/identity/user/type'; import type { WorkspaceModel } from '@/schema/identity/workspace/model'; diff --git a/apps/web/src/schema/identity/workspace-group/api-verbs/create.ts b/apps/web/src/schema/identity/workspace-group/api-verbs/create.ts index bcdbc989d9..3020b5a1d6 100644 --- a/apps/web/src/schema/identity/workspace-group/api-verbs/create.ts +++ b/apps/web/src/schema/identity/workspace-group/api-verbs/create.ts @@ -1,4 +1,4 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; export interface WorkspaceGroupCreateParameters { name: string; diff --git a/apps/web/src/schema/identity/workspace-group/api-verbs/update.ts b/apps/web/src/schema/identity/workspace-group/api-verbs/update.ts index 51877fead5..3c7d20b919 100644 --- a/apps/web/src/schema/identity/workspace-group/api-verbs/update.ts +++ b/apps/web/src/schema/identity/workspace-group/api-verbs/update.ts @@ -1,4 +1,4 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; export interface WorkspaceGroupUpdateParameters { workspace_group_id: string; diff --git a/apps/web/src/schema/identity/workspace-group/model.ts b/apps/web/src/schema/identity/workspace-group/model.ts index ec7067cee8..c55ae02cf7 100644 --- a/apps/web/src/schema/identity/workspace-group/model.ts +++ b/apps/web/src/schema/identity/workspace-group/model.ts @@ -1,4 +1,4 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; import type { RoleType } from '@/schema/identity/role/type'; import type { UserState } from '@/schema/identity/user/type'; diff --git a/apps/web/src/schema/identity/workspace-user/api-verbs/create.ts b/apps/web/src/schema/identity/workspace-user/api-verbs/create.ts index c7212e7c7c..5a418395fd 100644 --- a/apps/web/src/schema/identity/workspace-user/api-verbs/create.ts +++ b/apps/web/src/schema/identity/workspace-user/api-verbs/create.ts @@ -1,4 +1,4 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; import type { AuthType } from '@/schema/identity/user/type'; export interface WorkspaceUserCreateParameters { diff --git a/apps/web/src/schema/identity/workspace-user/model.ts b/apps/web/src/schema/identity/workspace-user/model.ts index 215fb8b3e9..72d89bea59 100644 --- a/apps/web/src/schema/identity/workspace-user/model.ts +++ b/apps/web/src/schema/identity/workspace-user/model.ts @@ -1,4 +1,4 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; import type { RoleBindingModel } from '@/schema/identity/role-binding/model'; import type { RoleType } from '@/schema/identity/role/type'; import type { UserGroupPerUserModel } from '@/schema/identity/user/model'; diff --git a/apps/web/src/schema/identity/workspace/api-verbs/create.ts b/apps/web/src/schema/identity/workspace/api-verbs/create.ts index 0a6c2c51f6..c2f186c45c 100644 --- a/apps/web/src/schema/identity/workspace/api-verbs/create.ts +++ b/apps/web/src/schema/identity/workspace/api-verbs/create.ts @@ -1,4 +1,4 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; export interface WorkspaceCreateParameters { name: string; diff --git a/apps/web/src/schema/identity/workspace/api-verbs/update.ts b/apps/web/src/schema/identity/workspace/api-verbs/update.ts index 811e660736..8bcb908315 100644 --- a/apps/web/src/schema/identity/workspace/api-verbs/update.ts +++ b/apps/web/src/schema/identity/workspace/api-verbs/update.ts @@ -1,4 +1,4 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; export interface WorkspaceUpdateParameters { workspace_id: string; diff --git a/apps/web/src/schema/identity/workspace/model.ts b/apps/web/src/schema/identity/workspace/model.ts index 622b31e295..daee9779c5 100644 --- a/apps/web/src/schema/identity/workspace/model.ts +++ b/apps/web/src/schema/identity/workspace/model.ts @@ -1,4 +1,4 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; export type WorkspaceState = 'ENABLED' | 'DISABLED' | 'DORMANT'; diff --git a/apps/web/src/schema/inventory-v2/namespace-group/api-verbs/create.ts b/apps/web/src/schema/inventory-v2/namespace-group/api-verbs/create.ts index 0ed76201c8..d1bec1ec0f 100644 --- a/apps/web/src/schema/inventory-v2/namespace-group/api-verbs/create.ts +++ b/apps/web/src/schema/inventory-v2/namespace-group/api-verbs/create.ts @@ -1,4 +1,4 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; export interface NamespaceGroupCreateParameters { namespace_group_id?: string; diff --git a/apps/web/src/schema/inventory-v2/namespace-group/api-verbs/update.ts b/apps/web/src/schema/inventory-v2/namespace-group/api-verbs/update.ts index bd00eb0aee..527f2d132f 100644 --- a/apps/web/src/schema/inventory-v2/namespace-group/api-verbs/update.ts +++ b/apps/web/src/schema/inventory-v2/namespace-group/api-verbs/update.ts @@ -1,4 +1,4 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; export interface NamespaceGroupUpdateParameters { namespace_group_id: string; diff --git a/apps/web/src/schema/inventory-v2/namespace-group/model.ts b/apps/web/src/schema/inventory-v2/namespace-group/model.ts index bfca22606c..54596562c2 100644 --- a/apps/web/src/schema/inventory-v2/namespace-group/model.ts +++ b/apps/web/src/schema/inventory-v2/namespace-group/model.ts @@ -1,4 +1,4 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; export interface NamespaceGroupModel { namespace_group_id: string; diff --git a/apps/web/src/schema/inventory-v2/namespace/api-verbs/create.ts b/apps/web/src/schema/inventory-v2/namespace/api-verbs/create.ts index 764a7fdc08..0e8b3fbeed 100644 --- a/apps/web/src/schema/inventory-v2/namespace/api-verbs/create.ts +++ b/apps/web/src/schema/inventory-v2/namespace/api-verbs/create.ts @@ -1,5 +1,5 @@ -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 { NamespaceCategory } from '@/schema/inventory-v2/namespace/type'; export interface NamespaceCreateParameters { diff --git a/apps/web/src/schema/inventory-v2/namespace/api-verbs/list.ts b/apps/web/src/schema/inventory-v2/namespace/api-verbs/list.ts index 025ff6b407..f6f0d70fb0 100644 --- a/apps/web/src/schema/inventory-v2/namespace/api-verbs/list.ts +++ b/apps/web/src/schema/inventory-v2/namespace/api-verbs/list.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'; import type { NamespaceCategory } from '@/schema/inventory-v2/namespace/type'; diff --git a/apps/web/src/schema/inventory-v2/namespace/api-verbs/update.ts b/apps/web/src/schema/inventory-v2/namespace/api-verbs/update.ts index 0ed1a03cc7..c26bfe2b1e 100644 --- a/apps/web/src/schema/inventory-v2/namespace/api-verbs/update.ts +++ b/apps/web/src/schema/inventory-v2/namespace/api-verbs/update.ts @@ -1,4 +1,4 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; export interface NamespaceUpdateParameters { namespace_id: string; diff --git a/apps/web/src/schema/inventory-v2/namespace/model.ts b/apps/web/src/schema/inventory-v2/namespace/model.ts index 837196fdda..7c25db5851 100644 --- a/apps/web/src/schema/inventory-v2/namespace/model.ts +++ b/apps/web/src/schema/inventory-v2/namespace/model.ts @@ -1,5 +1,5 @@ -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 { NamespaceCategory } from '@/schema/inventory-v2/namespace/type'; diff --git a/apps/web/src/schema/inventory/cloud-service-query-set/model.ts b/apps/web/src/schema/inventory/cloud-service-query-set/model.ts index 77c8823883..6d1739e9f6 100644 --- a/apps/web/src/schema/inventory/cloud-service-query-set/model.ts +++ b/apps/web/src/schema/inventory/cloud-service-query-set/model.ts @@ -1,5 +1,5 @@ -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 { CloudServiceQueryType, CloudServiceQuerySetState } from '@/schema/inventory/cloud-service-query-set/type'; export interface CloudServiceQuerySetModel { diff --git a/apps/web/src/schema/inventory/cloud-service-type/model.ts b/apps/web/src/schema/inventory/cloud-service-type/model.ts index b9ba120d1b..d426e0cb62 100644 --- a/apps/web/src/schema/inventory/cloud-service-type/model.ts +++ b/apps/web/src/schema/inventory/cloud-service-type/model.ts @@ -1,4 +1,4 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; export interface CloudServiceTypeModel { cloud_service_type_id: string; diff --git a/apps/web/src/schema/inventory/cloud-service/model.ts b/apps/web/src/schema/inventory/cloud-service/model.ts index bbc466f8b4..0419954449 100644 --- a/apps/web/src/schema/inventory/cloud-service/model.ts +++ b/apps/web/src/schema/inventory/cloud-service/model.ts @@ -1,4 +1,4 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; import type { CloudServiceState } from '@/schema/inventory/cloud-service/type'; export interface CloudServiceModel { diff --git a/apps/web/src/schema/inventory/collector-rule/api-verbs/create.ts b/apps/web/src/schema/inventory/collector-rule/api-verbs/create.ts index 19e5d8a581..4cf2fc2327 100644 --- a/apps/web/src/schema/inventory/collector-rule/api-verbs/create.ts +++ b/apps/web/src/schema/inventory/collector-rule/api-verbs/create.ts @@ -1,4 +1,4 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; import type { AdditionalRuleAction, AdditionalRuleCondition } from '@/schema/inventory/collector-rule/model'; import type { CollectorRuleConditionPolicy } from '@/schema/inventory/collector-rule/type'; diff --git a/apps/web/src/schema/inventory/collector-rule/api-verbs/update.ts b/apps/web/src/schema/inventory/collector-rule/api-verbs/update.ts index 186975d88a..6e141430c5 100644 --- a/apps/web/src/schema/inventory/collector-rule/api-verbs/update.ts +++ b/apps/web/src/schema/inventory/collector-rule/api-verbs/update.ts @@ -1,4 +1,4 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; import type { AdditionalRuleAction, AdditionalRuleCondition } from '@/schema/inventory/collector-rule/model'; import type { CollectorRuleConditionPolicy } from '@/schema/inventory/collector-rule/type'; diff --git a/apps/web/src/schema/inventory/collector-rule/model.ts b/apps/web/src/schema/inventory/collector-rule/model.ts index 61b698d43f..1829e9e427 100644 --- a/apps/web/src/schema/inventory/collector-rule/model.ts +++ b/apps/web/src/schema/inventory/collector-rule/model.ts @@ -1,4 +1,4 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; import type { CollectorRuleConditionPolicy, CollectorRuleType, CollectorResourceGroup, CollectorRuleConditionOperator, CollectorRuleConditionKey, diff --git a/apps/web/src/schema/inventory/collector/api-verbs/create.ts b/apps/web/src/schema/inventory/collector/api-verbs/create.ts index 8155638ad7..9e2955ae7b 100644 --- a/apps/web/src/schema/inventory/collector/api-verbs/create.ts +++ b/apps/web/src/schema/inventory/collector/api-verbs/create.ts @@ -1,5 +1,5 @@ -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 { CollectorPluginInfo } from '@/schema/inventory/collector/model'; import type { Schedule, SecretFilter } from '@/schema/inventory/collector/type'; diff --git a/apps/web/src/schema/inventory/collector/api-verbs/update.ts b/apps/web/src/schema/inventory/collector/api-verbs/update.ts index f4968459ff..d1c9321ef9 100644 --- a/apps/web/src/schema/inventory/collector/api-verbs/update.ts +++ b/apps/web/src/schema/inventory/collector/api-verbs/update.ts @@ -1,4 +1,4 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; import type { Schedule, SecretFilter } from '@/schema/inventory/collector/type'; // collector api parameters diff --git a/apps/web/src/schema/inventory/collector/model.ts b/apps/web/src/schema/inventory/collector/model.ts index 6b06175c3e..f33f743596 100644 --- a/apps/web/src/schema/inventory/collector/model.ts +++ b/apps/web/src/schema/inventory/collector/model.ts @@ -1,5 +1,5 @@ -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 { CollectorMetadata, CollectorOptions, Schedule, SecretFilter, } from '@/schema/inventory/collector/type'; diff --git a/apps/web/src/schema/inventory/job/model.ts b/apps/web/src/schema/inventory/job/model.ts index 237a3d7598..3d1b429969 100644 --- a/apps/web/src/schema/inventory/job/model.ts +++ b/apps/web/src/schema/inventory/job/model.ts @@ -1,4 +1,4 @@ -import type { ResourceGroupType } from '@/schema/_common/type'; +import type { ResourceGroupType } from '@/api-clients/_common/schema/type'; import type { JobStatus } from '@/schema/inventory/job/type'; diff --git a/apps/web/src/schema/inventory/metric-example/api-verbs/create.ts b/apps/web/src/schema/inventory/metric-example/api-verbs/create.ts index e18be57bcb..967d1cb4fe 100644 --- a/apps/web/src/schema/inventory/metric-example/api-verbs/create.ts +++ b/apps/web/src/schema/inventory/metric-example/api-verbs/create.ts @@ -1,4 +1,4 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; export interface MetricExampleCreateParameters { diff --git a/apps/web/src/schema/inventory/metric-example/api-verbs/update.ts b/apps/web/src/schema/inventory/metric-example/api-verbs/update.ts index 0a1503219f..be2ffca69c 100644 --- a/apps/web/src/schema/inventory/metric-example/api-verbs/update.ts +++ b/apps/web/src/schema/inventory/metric-example/api-verbs/update.ts @@ -1,4 +1,4 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; export interface MetricExampleUpdateParameters { diff --git a/apps/web/src/schema/inventory/metric-example/model.ts b/apps/web/src/schema/inventory/metric-example/model.ts index 63c0e94cd8..105d7e2995 100644 --- a/apps/web/src/schema/inventory/metric-example/model.ts +++ b/apps/web/src/schema/inventory/metric-example/model.ts @@ -1,4 +1,4 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; export interface MetricExampleModel { diff --git a/apps/web/src/schema/inventory/metric/api-verbs/create.ts b/apps/web/src/schema/inventory/metric/api-verbs/create.ts index bdea75159f..50b2ce7e5a 100644 --- a/apps/web/src/schema/inventory/metric/api-verbs/create.ts +++ b/apps/web/src/schema/inventory/metric/api-verbs/create.ts @@ -1,5 +1,5 @@ -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 { MetricType } from '@/schema/inventory/metric/type'; diff --git a/apps/web/src/schema/inventory/metric/api-verbs/update.ts b/apps/web/src/schema/inventory/metric/api-verbs/update.ts index f9039a3a2b..b2d105de0f 100644 --- a/apps/web/src/schema/inventory/metric/api-verbs/update.ts +++ b/apps/web/src/schema/inventory/metric/api-verbs/update.ts @@ -1,4 +1,4 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; export interface MetricUpdateParameters { diff --git a/apps/web/src/schema/inventory/metric/model.ts b/apps/web/src/schema/inventory/metric/model.ts index 857ac942bb..a2615a5812 100644 --- a/apps/web/src/schema/inventory/metric/model.ts +++ b/apps/web/src/schema/inventory/metric/model.ts @@ -1,4 +1,4 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; import type { MetricType, MetricLabelKey } from '@/schema/inventory/metric/type'; diff --git a/apps/web/src/schema/inventory/namespace/model.ts b/apps/web/src/schema/inventory/namespace/model.ts index 02615c24aa..90f2feae1f 100644 --- a/apps/web/src/schema/inventory/namespace/model.ts +++ b/apps/web/src/schema/inventory/namespace/model.ts @@ -1,4 +1,4 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; import type { NamespaceCategory, NamespaceGroup } from '@/schema/inventory/namespace/type'; diff --git a/apps/web/src/schema/inventory/region/model.ts b/apps/web/src/schema/inventory/region/model.ts index e7e10820cc..7c3c462221 100644 --- a/apps/web/src/schema/inventory/region/model.ts +++ b/apps/web/src/schema/inventory/region/model.ts @@ -1,4 +1,4 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; export interface RegionModel { diff --git a/apps/web/src/schema/monitoring/alert/api-verbs/list.ts b/apps/web/src/schema/monitoring/alert/api-verbs/list.ts index 913664b6e2..a408a40886 100644 --- a/apps/web/src/schema/monitoring/alert/api-verbs/list.ts +++ b/apps/web/src/schema/monitoring/alert/api-verbs/list.ts @@ -1,6 +1,6 @@ import type { Query } from '@cloudforet/core-lib/space-connector/type'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { AlertModel } from '@/schema/monitoring/alert/model'; import type { AlertSeverity, AlertState, AlertUrgency, diff --git a/apps/web/src/schema/monitoring/data-source/model.ts b/apps/web/src/schema/monitoring/data-source/model.ts index e8313a6446..0630522018 100644 --- a/apps/web/src/schema/monitoring/data-source/model.ts +++ b/apps/web/src/schema/monitoring/data-source/model.ts @@ -1,6 +1,6 @@ import type { DynamicLayout } from '@cloudforet/mirinae/types/data-display/dynamic/dynamic-layout/type/layout-schema'; -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; import type { MonitoringType } from '@/schema/monitoring/data-source/type'; diff --git a/apps/web/src/schema/monitoring/escalation-policy/api-verbs/list.ts b/apps/web/src/schema/monitoring/escalation-policy/api-verbs/list.ts index 0627a2f46f..bb90d61493 100644 --- a/apps/web/src/schema/monitoring/escalation-policy/api-verbs/list.ts +++ b/apps/web/src/schema/monitoring/escalation-policy/api-verbs/list.ts @@ -1,6 +1,6 @@ import type { Query } from '@cloudforet/core-lib/space-connector/type'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { EscalationPolicyModel } from '@/schema/monitoring/escalation-policy/model'; import type { EscalationPolicyFinishCondition } from '@/schema/monitoring/escalation-policy/type'; diff --git a/apps/web/src/schema/monitoring/escalation-policy/api-verbs/update.ts b/apps/web/src/schema/monitoring/escalation-policy/api-verbs/update.ts index b51e2af48b..a8a7d0c8a4 100644 --- a/apps/web/src/schema/monitoring/escalation-policy/api-verbs/update.ts +++ b/apps/web/src/schema/monitoring/escalation-policy/api-verbs/update.ts @@ -1,4 +1,4 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; import type { EscalationPolicyRule, EscalationPolicyFinishCondition } from '@/schema/monitoring/escalation-policy/type'; export interface EscalationPolicyUpdateParameters { diff --git a/apps/web/src/schema/monitoring/escalation-policy/model.ts b/apps/web/src/schema/monitoring/escalation-policy/model.ts index d7fda0634b..7f19cc1290 100644 --- a/apps/web/src/schema/monitoring/escalation-policy/model.ts +++ b/apps/web/src/schema/monitoring/escalation-policy/model.ts @@ -1,5 +1,5 @@ -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 { EscalationPolicyRule, EscalationPolicyFinishCondition } from '@/schema/monitoring/escalation-policy/type'; export interface EscalationPolicyModel { diff --git a/apps/web/src/schema/monitoring/event-rule/api-verbs/create.ts b/apps/web/src/schema/monitoring/event-rule/api-verbs/create.ts index a0371f1e6b..e977caefd1 100644 --- a/apps/web/src/schema/monitoring/event-rule/api-verbs/create.ts +++ b/apps/web/src/schema/monitoring/event-rule/api-verbs/create.ts @@ -1,4 +1,4 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; import type { EventRuleModel } from '@/schema/monitoring/event-rule/model'; import type { EventRuleActions, EventRuleCondition, diff --git a/apps/web/src/schema/monitoring/event-rule/api-verbs/update.ts b/apps/web/src/schema/monitoring/event-rule/api-verbs/update.ts index 9487f5bbf0..5a09d6e157 100644 --- a/apps/web/src/schema/monitoring/event-rule/api-verbs/update.ts +++ b/apps/web/src/schema/monitoring/event-rule/api-verbs/update.ts @@ -1,4 +1,4 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; import type { EventRuleActions, EventRuleCondition, EventRuleConditionsPolicy, EventRuleOptions, diff --git a/apps/web/src/schema/monitoring/event-rule/model.ts b/apps/web/src/schema/monitoring/event-rule/model.ts index 7db01a0997..4df071cbc8 100644 --- a/apps/web/src/schema/monitoring/event-rule/model.ts +++ b/apps/web/src/schema/monitoring/event-rule/model.ts @@ -1,5 +1,5 @@ -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 { EventRuleCondition, EventRuleActions, EventRuleConditionsPolicy, EventRuleOptions, } from '@/schema/monitoring/event-rule/type'; diff --git a/apps/web/src/schema/monitoring/webhook/api-verbs/create.ts b/apps/web/src/schema/monitoring/webhook/api-verbs/create.ts index a1870c3e04..13f3deaaff 100644 --- a/apps/web/src/schema/monitoring/webhook/api-verbs/create.ts +++ b/apps/web/src/schema/monitoring/webhook/api-verbs/create.ts @@ -1,4 +1,4 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; import type { WebhookPluginInfo } from '@/schema/monitoring/webhook/type'; export interface WebhookCreateParameters { diff --git a/apps/web/src/schema/monitoring/webhook/api-verbs/update.ts b/apps/web/src/schema/monitoring/webhook/api-verbs/update.ts index d213813cd0..6aae40e227 100644 --- a/apps/web/src/schema/monitoring/webhook/api-verbs/update.ts +++ b/apps/web/src/schema/monitoring/webhook/api-verbs/update.ts @@ -1,4 +1,4 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; export interface WebhookUpdateParameters { webhook_id: string; diff --git a/apps/web/src/schema/monitoring/webhook/model.ts b/apps/web/src/schema/monitoring/webhook/model.ts index 791d8de553..e0b1484a94 100644 --- a/apps/web/src/schema/monitoring/webhook/model.ts +++ b/apps/web/src/schema/monitoring/webhook/model.ts @@ -1,4 +1,4 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; import type { WebhookPluginInfo, WebhookState } from '@/schema/monitoring/webhook/type'; type WebhookRequestsType = { diff --git a/apps/web/src/schema/notification/project-channel/api-verbs/create.ts b/apps/web/src/schema/notification/project-channel/api-verbs/create.ts index 9a9427c2f7..34a8f69406 100644 --- a/apps/web/src/schema/notification/project-channel/api-verbs/create.ts +++ b/apps/web/src/schema/notification/project-channel/api-verbs/create.ts @@ -1,4 +1,4 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; import type { NotificationLevel } from '@/schema/notification/notification/type'; import type { ChannelSchedule } from '@/schema/notification/type'; diff --git a/apps/web/src/schema/notification/project-channel/api-verbs/update.ts b/apps/web/src/schema/notification/project-channel/api-verbs/update.ts index e0b747bfdb..72bd2aa596 100644 --- a/apps/web/src/schema/notification/project-channel/api-verbs/update.ts +++ b/apps/web/src/schema/notification/project-channel/api-verbs/update.ts @@ -1,4 +1,4 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; import type { NotificationLevel } from '@/schema/notification/notification/type'; export type ProjectChannelUpdateParameters = { diff --git a/apps/web/src/schema/notification/project-channel/model.ts b/apps/web/src/schema/notification/project-channel/model.ts index 4c9c5bcf2f..b96da9e8d7 100644 --- a/apps/web/src/schema/notification/project-channel/model.ts +++ b/apps/web/src/schema/notification/project-channel/model.ts @@ -1,4 +1,4 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; import type { NotificationLevel } from '@/schema/notification/notification/type'; import type { ChannelSchedule, ChannelState } from '@/schema/notification/type'; diff --git a/apps/web/src/schema/notification/protocol/api-verbs/create.ts b/apps/web/src/schema/notification/protocol/api-verbs/create.ts index 49e749e25c..f3b8ecd5fb 100644 --- a/apps/web/src/schema/notification/protocol/api-verbs/create.ts +++ b/apps/web/src/schema/notification/protocol/api-verbs/create.ts @@ -1,4 +1,4 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; import type { ProtocolPluginInfo } from '@/schema/notification/protocol/type'; export interface ProtocolCreateParameters { diff --git a/apps/web/src/schema/notification/protocol/api-verbs/update.ts b/apps/web/src/schema/notification/protocol/api-verbs/update.ts index cc9f578a3c..0bf2f45666 100644 --- a/apps/web/src/schema/notification/protocol/api-verbs/update.ts +++ b/apps/web/src/schema/notification/protocol/api-verbs/update.ts @@ -1,4 +1,4 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; export interface ProtocolUpdateParameters { protocol_id: string; diff --git a/apps/web/src/schema/notification/protocol/model.ts b/apps/web/src/schema/notification/protocol/model.ts index 25cb0660b1..04ec782de6 100644 --- a/apps/web/src/schema/notification/protocol/model.ts +++ b/apps/web/src/schema/notification/protocol/model.ts @@ -1,4 +1,4 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; import type { ProtocolCapability, ProtocolPluginInfo, ProtocolState } from '@/schema/notification/protocol/type'; export interface ProtocolModel { diff --git a/apps/web/src/schema/notification/user-channel/api-verbs/create.ts b/apps/web/src/schema/notification/user-channel/api-verbs/create.ts index 26aa3d01b8..ed27bab27c 100644 --- a/apps/web/src/schema/notification/user-channel/api-verbs/create.ts +++ b/apps/web/src/schema/notification/user-channel/api-verbs/create.ts @@ -1,4 +1,4 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; import type { ChannelSchedule } from '@/schema/notification/type'; export type UserChannelCreateParameters = { diff --git a/apps/web/src/schema/notification/user-channel/api-verbs/update.ts b/apps/web/src/schema/notification/user-channel/api-verbs/update.ts index 323f564801..5867161b40 100644 --- a/apps/web/src/schema/notification/user-channel/api-verbs/update.ts +++ b/apps/web/src/schema/notification/user-channel/api-verbs/update.ts @@ -1,4 +1,4 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; export type UserChannelUpdateParameters = { user_channel_id: string diff --git a/apps/web/src/schema/notification/user-channel/model.ts b/apps/web/src/schema/notification/user-channel/model.ts index a2b7ad469b..93f4338926 100644 --- a/apps/web/src/schema/notification/user-channel/model.ts +++ b/apps/web/src/schema/notification/user-channel/model.ts @@ -1,4 +1,4 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; import type { ChannelSchedule, ChannelState } from '@/schema/notification/type'; export interface UserChannelModel { diff --git a/apps/web/src/schema/opsflow/comment/model.ts b/apps/web/src/schema/opsflow/comment/model.ts index 0784502dba..386fb63f81 100644 --- a/apps/web/src/schema/opsflow/comment/model.ts +++ b/apps/web/src/schema/opsflow/comment/model.ts @@ -1,4 +1,4 @@ -import type { ResourceGroupType } from '@/schema/_common/type'; +import type { ResourceGroupType } from '@/api-clients/_common/schema/type'; import type { CommentType, MentionTargets, MentionSource } from '@/schema/opsflow/comment/type'; export interface CommentModel { diff --git a/apps/web/src/schema/opsflow/task-category/api-verbs/create.ts b/apps/web/src/schema/opsflow/task-category/api-verbs/create.ts index 9c0ae46e28..48dc79ffc4 100644 --- a/apps/web/src/schema/opsflow/task-category/api-verbs/create.ts +++ b/apps/web/src/schema/opsflow/task-category/api-verbs/create.ts @@ -1,4 +1,4 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; import type { TaskField } from '@/schema/opsflow/_types/task-field-type'; import type { TaskStatusType, TaskStatusOptionWithOptionalId } from '@/schema/opsflow/task/type'; diff --git a/apps/web/src/schema/opsflow/task-category/api-verbs/update.ts b/apps/web/src/schema/opsflow/task-category/api-verbs/update.ts index d5c28948af..ef12354274 100644 --- a/apps/web/src/schema/opsflow/task-category/api-verbs/update.ts +++ b/apps/web/src/schema/opsflow/task-category/api-verbs/update.ts @@ -1,4 +1,4 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; import type { TaskField } from '@/schema/opsflow/_types/task-field-type'; import type { TaskStatusOptions, TaskStatusOptionWithOptionalId, TaskStatusType } from '@/schema/opsflow/task/type'; diff --git a/apps/web/src/schema/opsflow/task-category/model.ts b/apps/web/src/schema/opsflow/task-category/model.ts index 08fb0ed7ce..ca2bd3b97f 100644 --- a/apps/web/src/schema/opsflow/task-category/model.ts +++ b/apps/web/src/schema/opsflow/task-category/model.ts @@ -1,4 +1,4 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; import type { TaskField } from '@/schema/opsflow/_types/task-field-type'; import type { TaskStatusOptions } from '@/schema/opsflow/task/type'; diff --git a/apps/web/src/schema/opsflow/task-type/api-verbs/create.ts b/apps/web/src/schema/opsflow/task-type/api-verbs/create.ts index f8f400e4a2..d5bd94b7b2 100644 --- a/apps/web/src/schema/opsflow/task-type/api-verbs/create.ts +++ b/apps/web/src/schema/opsflow/task-type/api-verbs/create.ts @@ -1,4 +1,4 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; import type { TaskField } from '@/schema/opsflow/_types/task-field-type'; export interface TaskTypeCreateParameters { diff --git a/apps/web/src/schema/opsflow/task-type/api-verbs/update.ts b/apps/web/src/schema/opsflow/task-type/api-verbs/update.ts index d66eb5f469..332833977b 100644 --- a/apps/web/src/schema/opsflow/task-type/api-verbs/update.ts +++ b/apps/web/src/schema/opsflow/task-type/api-verbs/update.ts @@ -1,4 +1,4 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; export interface TaskTypeUpdateParameters { task_type_id: string; diff --git a/apps/web/src/schema/opsflow/task-type/model.ts b/apps/web/src/schema/opsflow/task-type/model.ts index 23113a3c40..fb9897ad57 100644 --- a/apps/web/src/schema/opsflow/task-type/model.ts +++ b/apps/web/src/schema/opsflow/task-type/model.ts @@ -1,4 +1,4 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; import type { TaskField } from '@/schema/opsflow/_types/task-field-type'; export interface TaskTypeModel { diff --git a/apps/web/src/schema/repository/dashboard-template/model.ts b/apps/web/src/schema/repository/dashboard-template/model.ts index aab8f9de33..9dc4d5f3ff 100644 --- a/apps/web/src/schema/repository/dashboard-template/model.ts +++ b/apps/web/src/schema/repository/dashboard-template/model.ts @@ -1,4 +1,4 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; import type { DashboardTemplateState, DashboardTemplateType } from '@/schema/repository/dashboard-template/type'; import type { SharedDashboardInfo } from '@/services/dashboards/types/shared-dashboard-type'; diff --git a/apps/web/src/schema/repository/plugin/api-verbs/register.ts b/apps/web/src/schema/repository/plugin/api-verbs/register.ts index cde3e59d43..d18559c9d8 100644 --- a/apps/web/src/schema/repository/plugin/api-verbs/register.ts +++ b/apps/web/src/schema/repository/plugin/api-verbs/register.ts @@ -1,4 +1,4 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; import type { Capability, RegistryType } from '@/schema/repository/plugin/type'; export interface PluginRegisterParameters { diff --git a/apps/web/src/schema/repository/plugin/api-verbs/update.ts b/apps/web/src/schema/repository/plugin/api-verbs/update.ts index 71e39c2366..ea3540c8b9 100644 --- a/apps/web/src/schema/repository/plugin/api-verbs/update.ts +++ b/apps/web/src/schema/repository/plugin/api-verbs/update.ts @@ -1,4 +1,4 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; import type { Capability } from '@/schema/repository/plugin/type'; export interface PluginUpdateParameters { diff --git a/apps/web/src/schema/repository/plugin/model.ts b/apps/web/src/schema/repository/plugin/model.ts index d86cd4e19a..ce0fd16f12 100644 --- a/apps/web/src/schema/repository/plugin/model.ts +++ b/apps/web/src/schema/repository/plugin/model.ts @@ -1,4 +1,4 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; import type { Capability, PluginState, RegistryType } from '@/schema/repository/plugin/type'; import type { RepositoryModel } from '@/schema/repository/repository/model'; diff --git a/apps/web/src/schema/secret/secret/api-verbs/create.ts b/apps/web/src/schema/secret/secret/api-verbs/create.ts index 69a6a0f907..97639e1069 100644 --- a/apps/web/src/schema/secret/secret/api-verbs/create.ts +++ b/apps/web/src/schema/secret/secret/api-verbs/create.ts @@ -1,5 +1,5 @@ -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'; export interface SecretCreateParameters { name: string; diff --git a/apps/web/src/schema/secret/secret/model.ts b/apps/web/src/schema/secret/secret/model.ts index 1841b3315f..a718a222c5 100644 --- a/apps/web/src/schema/secret/secret/model.ts +++ b/apps/web/src/schema/secret/secret/model.ts @@ -1,5 +1,5 @@ -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'; export interface SecretModel { secret_id: string; diff --git a/apps/web/src/schema/secret/trusted-secret/api-verbs/create.ts b/apps/web/src/schema/secret/trusted-secret/api-verbs/create.ts index c4d87bebd7..67a4e365f7 100644 --- a/apps/web/src/schema/secret/trusted-secret/api-verbs/create.ts +++ b/apps/web/src/schema/secret/trusted-secret/api-verbs/create.ts @@ -1,5 +1,5 @@ -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'; export interface TrustedSecretCreateParameters { name: string; diff --git a/apps/web/src/schema/secret/trusted-secret/api-verbs/update.ts b/apps/web/src/schema/secret/trusted-secret/api-verbs/update.ts index 91b7eb54b8..7a741b43ba 100644 --- a/apps/web/src/schema/secret/trusted-secret/api-verbs/update.ts +++ b/apps/web/src/schema/secret/trusted-secret/api-verbs/update.ts @@ -1,4 +1,4 @@ -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; export interface TrustedSecretUpdateParameters { trusted_secret_id: string; diff --git a/apps/web/src/schema/secret/trusted-secret/model.ts b/apps/web/src/schema/secret/trusted-secret/model.ts index 01d61ab52b..c85e7dd670 100644 --- a/apps/web/src/schema/secret/trusted-secret/model.ts +++ b/apps/web/src/schema/secret/trusted-secret/model.ts @@ -1,5 +1,5 @@ -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'; export interface TrustedSecretModel { trusted_secret_id: string; diff --git a/apps/web/src/services/advanced/components/WorkspaceGroupAddUsersModal.vue b/apps/web/src/services/advanced/components/WorkspaceGroupAddUsersModal.vue index 8851d9b8c5..e368a34deb 100644 --- a/apps/web/src/services/advanced/components/WorkspaceGroupAddUsersModal.vue +++ b/apps/web/src/services/advanced/components/WorkspaceGroupAddUsersModal.vue @@ -8,7 +8,7 @@ import { } from '@cloudforet/mirinae'; import type { MenuItem } from '@cloudforet/mirinae/types/controls/context-menu/type'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { RoleListParameters } from '@/schema/identity/role/api-verbs/list'; import { ROLE_STATE, ROLE_TYPE } from '@/schema/identity/role/constant'; import type { RoleModel } from '@/schema/identity/role/model'; diff --git a/apps/web/src/services/advanced/components/WorkspaceGroupAddWorkspacesModal.vue b/apps/web/src/services/advanced/components/WorkspaceGroupAddWorkspacesModal.vue index 1ca11db4e0..8d056ce3ea 100644 --- a/apps/web/src/services/advanced/components/WorkspaceGroupAddWorkspacesModal.vue +++ b/apps/web/src/services/advanced/components/WorkspaceGroupAddWorkspacesModal.vue @@ -10,7 +10,7 @@ import { PButtonModal, PFieldGroup, PSelectDropdown, PTooltip, } from '@cloudforet/mirinae'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { WorkspaceChangeWorkspaceGroupParameters } from '@/schema/identity/workspace/api-verbs/change-workspace-group'; import type { WorkspaceListParameters } from '@/schema/identity/workspace/api-verbs/list'; import type { WorkspaceModel } from '@/schema/identity/workspace/model'; diff --git a/apps/web/src/services/advanced/components/WorkspaceGroupCreateModal.vue b/apps/web/src/services/advanced/components/WorkspaceGroupCreateModal.vue index a958190ba1..b1679f129e 100644 --- a/apps/web/src/services/advanced/components/WorkspaceGroupCreateModal.vue +++ b/apps/web/src/services/advanced/components/WorkspaceGroupCreateModal.vue @@ -9,7 +9,7 @@ import { PButtonModal, PFieldGroup, PTextInput, PSelectDropdown, PTooltip, } from '@cloudforet/mirinae'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { WorkspaceGroupCreateParameters } from '@/schema/identity/workspace-group/api-verbs/create'; import type { WorkspaceGroupModel } from '@/schema/identity/workspace-group/model'; import type { WorkspaceChangeWorkspaceGroupParameters } from '@/schema/identity/workspace/api-verbs/change-workspace-group'; diff --git a/apps/web/src/services/advanced/components/WorkspaceGroupTabGroupUser.vue b/apps/web/src/services/advanced/components/WorkspaceGroupTabGroupUser.vue index 5c35714b23..56b9cf95f5 100644 --- a/apps/web/src/services/advanced/components/WorkspaceGroupTabGroupUser.vue +++ b/apps/web/src/services/advanced/components/WorkspaceGroupTabGroupUser.vue @@ -9,7 +9,7 @@ import { } from '@cloudforet/mirinae'; import type { DataTableFieldType } from '@cloudforet/mirinae/types/data-display/tables/data-table/type'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { RoleListParameters } from '@/schema/identity/role/api-verbs/list'; import { ROLE_STATE, ROLE_TYPE } from '@/schema/identity/role/constant'; import type { RoleModel } from '@/schema/identity/role/model'; diff --git a/apps/web/src/services/advanced/components/WorkspaceTagManagementTabContents.vue b/apps/web/src/services/advanced/components/WorkspaceTagManagementTabContents.vue index 533323507d..6d6ca63eb9 100644 --- a/apps/web/src/services/advanced/components/WorkspaceTagManagementTabContents.vue +++ b/apps/web/src/services/advanced/components/WorkspaceTagManagementTabContents.vue @@ -7,7 +7,7 @@ import { } from '@cloudforet/mirinae'; -import type { Tags, TimeStamp } from '@/schema/_common/model'; +import type { Tags, TimeStamp } from '@/api-clients/_common/schema/model'; import type { WorkspaceUpdateParameters } from '@/schema/identity/workspace/api-verbs/update'; import type { WorkspaceModel } from '@/schema/identity/workspace/model'; import { i18n } from '@/translations'; diff --git a/apps/web/src/services/advanced/composables/use-select-drop-down-list.ts b/apps/web/src/services/advanced/composables/use-select-drop-down-list.ts index fc8da1497b..71cd53ee98 100644 --- a/apps/web/src/services/advanced/composables/use-select-drop-down-list.ts +++ b/apps/web/src/services/advanced/composables/use-select-drop-down-list.ts @@ -10,7 +10,7 @@ import type { ConsoleFilter } from '@cloudforet/core-lib/query/type'; import { ApiQueryHelper } from '@cloudforet/core-lib/space-connector/helper'; import type { SelectDropdownMenuItem } from '@cloudforet/mirinae/types/controls/dropdown/select-dropdown/type'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import ErrorHandler from '@/common/composables/error/errorHandler'; diff --git a/apps/web/src/services/advanced/pages/admin/AdminDomainSettingsAutoDormancyConfigurationPage.vue b/apps/web/src/services/advanced/pages/admin/AdminDomainSettingsAutoDormancyConfigurationPage.vue index 21d5788f19..4ce45681f8 100644 --- a/apps/web/src/services/advanced/pages/admin/AdminDomainSettingsAutoDormancyConfigurationPage.vue +++ b/apps/web/src/services/advanced/pages/admin/AdminDomainSettingsAutoDormancyConfigurationPage.vue @@ -10,7 +10,7 @@ import { } from '@cloudforet/mirinae'; import { getNumberFromString, numberFormatter } from '@cloudforet/utils'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { DomainConfigListParameters } from '@/schema/config/domain-config/api-verbs/list'; import type { DomainConfigUpdateParameters } from '@/schema/config/domain-config/api-verbs/update'; import { DOMAIN_CONFIG_NAMES } from '@/schema/config/domain-config/constant'; diff --git a/apps/web/src/services/advanced/pages/admin/AdminWorkspaceGroupPage.vue b/apps/web/src/services/advanced/pages/admin/AdminWorkspaceGroupPage.vue index 64270da367..e9d9474f9a 100644 --- a/apps/web/src/services/advanced/pages/admin/AdminWorkspaceGroupPage.vue +++ b/apps/web/src/services/advanced/pages/admin/AdminWorkspaceGroupPage.vue @@ -5,7 +5,7 @@ import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; import { ApiQueryHelper } from '@cloudforet/core-lib/space-connector/helper'; import { PHorizontalLayout } from '@cloudforet/mirinae'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { WorkspaceGroupListParameters } from '@/schema/identity/workspace-group/api-verbs/list'; import type { WorkspaceGroupModel } from '@/schema/identity/workspace-group/model'; diff --git a/apps/web/src/services/advanced/store/bookmark-page-store.ts b/apps/web/src/services/advanced/store/bookmark-page-store.ts index 9315e35c1f..d756fbeb0d 100644 --- a/apps/web/src/services/advanced/store/bookmark-page-store.ts +++ b/apps/web/src/services/advanced/store/bookmark-page-store.ts @@ -9,7 +9,7 @@ import type { ConsoleFilter } from '@cloudforet/core-lib/query/type'; import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; import { ApiQueryHelper } from '@cloudforet/core-lib/space-connector/helper'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { SharedConfigListParameters } from '@/schema/config/shared-config/api-verbs/list'; import type { SharedConfigModel } from '@/schema/config/shared-config/model'; import type { WorkspaceListParameters } from '@/schema/identity/workspace/api-verbs/list'; diff --git a/apps/web/src/services/advanced/store/workspace-group-page-store.ts b/apps/web/src/services/advanced/store/workspace-group-page-store.ts index d355c557ec..a973a14958 100644 --- a/apps/web/src/services/advanced/store/workspace-group-page-store.ts +++ b/apps/web/src/services/advanced/store/workspace-group-page-store.ts @@ -7,7 +7,7 @@ import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; import { ApiQueryHelper } from '@cloudforet/core-lib/space-connector/helper'; import type { Query } from '@cloudforet/core-lib/space-connector/type'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { CostReportConfigListParameters } from '@/schema/cost-analysis/cost-report-config/api-verbs/list'; import type { CostReportConfigModel } from '@/schema/cost-analysis/cost-report-config/model'; import type { RoleListParameters } from '@/schema/identity/role/api-verbs/list'; diff --git a/apps/web/src/services/advanced/store/workspace-page-store.ts b/apps/web/src/services/advanced/store/workspace-page-store.ts index 1a3ad61c7b..b8460736ce 100644 --- a/apps/web/src/services/advanced/store/workspace-page-store.ts +++ b/apps/web/src/services/advanced/store/workspace-page-store.ts @@ -3,7 +3,7 @@ import { defineStore } from 'pinia'; import type { ConsoleFilter } from '@cloudforet/core-lib/query/type'; import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { CostReportConfigListParameters } from '@/schema/cost-analysis/cost-report-config/api-verbs/list'; import type { CostReportConfigModel } from '@/schema/cost-analysis/cost-report-config/model'; import type { RoleBindingListParameters, RoleBindingListResponse } from '@/schema/identity/role-binding/api-verbs/list'; diff --git a/apps/web/src/services/alert-manager-v1/components/AlertDashboardAlertStateWidget.vue b/apps/web/src/services/alert-manager-v1/components/AlertDashboardAlertStateWidget.vue index 4faf07c8ff..25a429bd32 100644 --- a/apps/web/src/services/alert-manager-v1/components/AlertDashboardAlertStateWidget.vue +++ b/apps/web/src/services/alert-manager-v1/components/AlertDashboardAlertStateWidget.vue @@ -14,7 +14,7 @@ import { } from '@cloudforet/mirinae'; import { numberFormatter } from '@cloudforet/utils'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { AlertListParameters } from '@/schema/monitoring/alert/api-verbs/list'; import { ALERT_STATE } from '@/schema/monitoring/alert/constants'; import type { AlertModel } from '@/schema/monitoring/alert/model'; diff --git a/apps/web/src/services/alert-manager-v1/components/AlertDashboardProjectSearchWidgetAlertList.vue b/apps/web/src/services/alert-manager-v1/components/AlertDashboardProjectSearchWidgetAlertList.vue index 4dc98639ec..499213cbad 100644 --- a/apps/web/src/services/alert-manager-v1/components/AlertDashboardProjectSearchWidgetAlertList.vue +++ b/apps/web/src/services/alert-manager-v1/components/AlertDashboardProjectSearchWidgetAlertList.vue @@ -10,7 +10,7 @@ import { PListCard, PLink, } from '@cloudforet/mirinae'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { AlertListParameters } from '@/schema/monitoring/alert/api-verbs/list'; import { ALERT_STATE } from '@/schema/monitoring/alert/constants'; import type { AlertModel } from '@/schema/monitoring/alert/model'; diff --git a/apps/web/src/services/alert-manager-v1/components/AlertDashboardTop5ProjectActivityWidgetTooltip.vue b/apps/web/src/services/alert-manager-v1/components/AlertDashboardTop5ProjectActivityWidgetTooltip.vue index e57511ff03..c3b6ce0f28 100644 --- a/apps/web/src/services/alert-manager-v1/components/AlertDashboardTop5ProjectActivityWidgetTooltip.vue +++ b/apps/web/src/services/alert-manager-v1/components/AlertDashboardTop5ProjectActivityWidgetTooltip.vue @@ -12,7 +12,7 @@ import { PI, } from '@cloudforet/mirinae'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { AlertListParameters } from '@/schema/monitoring/alert/api-verbs/list'; import type { AlertModel } from '@/schema/monitoring/alert/model'; diff --git a/apps/web/src/services/alert-manager-v1/components/AlertDetailNote.vue b/apps/web/src/services/alert-manager-v1/components/AlertDetailNote.vue index 1e8cb905eb..92806f337a 100644 --- a/apps/web/src/services/alert-manager-v1/components/AlertDetailNote.vue +++ b/apps/web/src/services/alert-manager-v1/components/AlertDetailNote.vue @@ -9,7 +9,7 @@ import { } from '@cloudforet/mirinae'; import { iso8601Formatter } from '@cloudforet/utils'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { NoteCreateParameters } from '@/schema/monitoring/note/api-verbs/create'; import type { NoteDeleteParameters } from '@/schema/monitoring/note/api-verbs/delete'; import type { NoteListParameters } from '@/schema/monitoring/note/api-verbs/list'; diff --git a/apps/web/src/services/alert-manager-v1/components/AlertDetailResponder.vue b/apps/web/src/services/alert-manager-v1/components/AlertDetailResponder.vue index 271b134e6f..cd783a51d9 100644 --- a/apps/web/src/services/alert-manager-v1/components/AlertDetailResponder.vue +++ b/apps/web/src/services/alert-manager-v1/components/AlertDetailResponder.vue @@ -11,7 +11,7 @@ import { PBadge, PCollapsibleList, PPaneLayout, PHeading, PEmpty, PHeadingLayout, } from '@cloudforet/mirinae'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { AlertModel } from '@/schema/monitoring/alert/model'; import type { EscalationPolicyGetParameters } from '@/schema/monitoring/escalation-policy/api-verbs/get'; import type { EscalationPolicyModel } from '@/schema/monitoring/escalation-policy/model'; diff --git a/apps/web/src/services/alert-manager-v1/components/AlertDetailTabsPushedEvent.vue b/apps/web/src/services/alert-manager-v1/components/AlertDetailTabsPushedEvent.vue index b771645be4..29dd67acbd 100644 --- a/apps/web/src/services/alert-manager-v1/components/AlertDetailTabsPushedEvent.vue +++ b/apps/web/src/services/alert-manager-v1/components/AlertDetailTabsPushedEvent.vue @@ -11,7 +11,7 @@ import { PButton, PButtonModal, PI, PCodeEditor, PToolbox, PEmpty, } from '@cloudforet/mirinae'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { EventListParameters } from '@/schema/monitoring/event/api-verbs/list'; import type { EventModel } from '@/schema/monitoring/event/model'; diff --git a/apps/web/src/services/alert-manager-v1/components/EscalationPolicyFormRulesInput.vue b/apps/web/src/services/alert-manager-v1/components/EscalationPolicyFormRulesInput.vue index 2e19ec4ea4..f48a83a315 100644 --- a/apps/web/src/services/alert-manager-v1/components/EscalationPolicyFormRulesInput.vue +++ b/apps/web/src/services/alert-manager-v1/components/EscalationPolicyFormRulesInput.vue @@ -12,8 +12,8 @@ import { } from '@cloudforet/mirinae'; import { ACTION_ICON } from '@cloudforet/mirinae/src/navigation/link/type'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; -import { RESOURCE_GROUP } from '@/schema/_common/constant'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; +import { RESOURCE_GROUP } from '@/api-clients/_common/schema/constant'; import type { EscalationPolicyRule } from '@/schema/monitoring/escalation-policy/type'; import type { ProjectChannelListParameters } from '@/schema/notification/project-channel/api-verbs/list'; import type { ProjectChannelModel } from '@/schema/notification/project-channel/model'; diff --git a/apps/web/src/services/alert-manager-v1/helpers/alert-badge-helper.ts b/apps/web/src/services/alert-manager-v1/helpers/alert-badge-helper.ts index 521cc45173..80f00f3cdb 100644 --- a/apps/web/src/services/alert-manager-v1/helpers/alert-badge-helper.ts +++ b/apps/web/src/services/alert-manager-v1/helpers/alert-badge-helper.ts @@ -1,4 +1,4 @@ -import { RESOURCE_GROUP } from '@/schema/_common/constant'; +import { RESOURCE_GROUP } from '@/api-clients/_common/schema/constant'; import { ALERT_STATE } from '@/schema/monitoring/alert/constants'; import type { EscalationPolicyModel } from '@/schema/monitoring/escalation-policy/model'; diff --git a/apps/web/src/services/alert-manager-v1/pages/AlertDashboardPage.vue b/apps/web/src/services/alert-manager-v1/pages/AlertDashboardPage.vue index 10a5ad17e1..99050398e1 100644 --- a/apps/web/src/services/alert-manager-v1/pages/AlertDashboardPage.vue +++ b/apps/web/src/services/alert-manager-v1/pages/AlertDashboardPage.vue @@ -5,7 +5,7 @@ import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; import { PHeading } from '@cloudforet/mirinae'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { ProjectAlertConfigListParameters } from '@/schema/monitoring/project-alert-config/api-verbs/list'; import type { ProjectAlertConfigModel } from '@/schema/monitoring/project-alert-config/model'; diff --git a/apps/web/src/services/alert-manager-v1/pages/EscalationPolicyPage.vue b/apps/web/src/services/alert-manager-v1/pages/EscalationPolicyPage.vue index 7d16360459..018fb59ea4 100644 --- a/apps/web/src/services/alert-manager-v1/pages/EscalationPolicyPage.vue +++ b/apps/web/src/services/alert-manager-v1/pages/EscalationPolicyPage.vue @@ -16,7 +16,7 @@ import type { KeyItemSet, ValueHandlerMap } from '@cloudforet/mirinae/types/cont import type { ToolboxOptions } from '@cloudforet/mirinae/types/controls/toolbox/type'; import { iso8601Formatter } from '@cloudforet/utils'; -import { RESOURCE_GROUP } from '@/schema/_common/constant'; +import { RESOURCE_GROUP } from '@/api-clients/_common/schema/constant'; import type { EscalationPolicyDeleteParameters } from '@/schema/monitoring/escalation-policy/api-verbs/delete'; import type { EscalationPolicyListParameters, diff --git a/apps/web/src/services/alert-manager-v1/stores/alert-assign-user-store.ts b/apps/web/src/services/alert-manager-v1/stores/alert-assign-user-store.ts index df10f849d4..7f93fd3639 100644 --- a/apps/web/src/services/alert-manager-v1/stores/alert-assign-user-store.ts +++ b/apps/web/src/services/alert-manager-v1/stores/alert-assign-user-store.ts @@ -5,7 +5,7 @@ import { defineStore } from 'pinia'; import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { WorkspaceUserListParameters } from '@/schema/identity/workspace-user/api-verbs/list'; import type { WorkspaceUserModel } from '@/schema/identity/workspace-user/model'; import type { AlertAssignUserParameters } from '@/schema/monitoring/alert/api-verbs/assign-user'; diff --git a/apps/web/src/services/alert-manager/components/AlertDetailNote.vue b/apps/web/src/services/alert-manager/components/AlertDetailNote.vue index 4d13b2b5b4..be4a83e99f 100644 --- a/apps/web/src/services/alert-manager/components/AlertDetailNote.vue +++ b/apps/web/src/services/alert-manager/components/AlertDetailNote.vue @@ -7,7 +7,7 @@ import { } from '@cloudforet/mirinae'; import { iso8601Formatter } from '@cloudforet/utils'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { AlertModel } from '@/schema/alert-manager/alert/model'; import type { NoteCreateParameters } from '@/schema/alert-manager/note/api-verbs/create'; import type { NoteDeleteParameters } from '@/schema/alert-manager/note/api-verbs/delete'; diff --git a/apps/web/src/services/alert-manager/components/AlertDetailTabsTimeline.vue b/apps/web/src/services/alert-manager/components/AlertDetailTabsTimeline.vue index 4fe2b04afe..ba6b27c527 100644 --- a/apps/web/src/services/alert-manager/components/AlertDetailTabsTimeline.vue +++ b/apps/web/src/services/alert-manager/components/AlertDetailTabsTimeline.vue @@ -9,7 +9,7 @@ import { PButton, PToolbox, PHeading, PHeadingLayout, PDataLoader, PDivider, PSelectStatus, PTextButton, } from '@cloudforet/mirinae'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { AlertHistoryParameters } from '@/schema/alert-manager/alert/api-verbs/history'; import { ALERT_HISTORY_ACTION } from '@/schema/alert-manager/alert/constants'; import type { AlertModel, AlertHistoryModel } from '@/schema/alert-manager/alert/model'; diff --git a/apps/web/src/services/alert-manager/components/ServiceDetailTabsNotifications.vue b/apps/web/src/services/alert-manager/components/ServiceDetailTabsNotifications.vue index 60756747c7..d4b0cfdd10 100644 --- a/apps/web/src/services/alert-manager/components/ServiceDetailTabsNotifications.vue +++ b/apps/web/src/services/alert-manager/components/ServiceDetailTabsNotifications.vue @@ -20,7 +20,7 @@ import { import type { MenuItem } from '@cloudforet/mirinae/types/controls/context-menu/type'; import type { ValueHandlerMap } from '@cloudforet/mirinae/types/controls/search/query-search/type'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { ServiceChannelListParameters } from '@/schema/alert-manager/service-channel/api-verbs/list'; import { SERVICE_CHANNEL_FORWARD_TYPE, diff --git a/apps/web/src/services/alert-manager/components/ServiceDetailTabsOverviewNotification.vue b/apps/web/src/services/alert-manager/components/ServiceDetailTabsOverviewNotification.vue index 8b208fbd0c..7ccfcdd451 100644 --- a/apps/web/src/services/alert-manager/components/ServiceDetailTabsOverviewNotification.vue +++ b/apps/web/src/services/alert-manager/components/ServiceDetailTabsOverviewNotification.vue @@ -9,7 +9,7 @@ import { PFieldTitle, PIconButton, PLazyImg, PDivider, PTextButton, PDataLoader, PI, } from '@cloudforet/mirinae'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { ServiceChannelListParameters } from '@/schema/alert-manager/service-channel/api-verbs/list'; import { SERVICE_CHANNEL_TYPE } from '@/schema/alert-manager/service-channel/constants'; import type { ServiceChannelModel } from '@/schema/alert-manager/service-channel/model'; diff --git a/apps/web/src/services/alert-manager/components/ServiceDetailTabsOverviewStatusTable.vue b/apps/web/src/services/alert-manager/components/ServiceDetailTabsOverviewStatusTable.vue index ee97ccfa30..bccb9f9b09 100644 --- a/apps/web/src/services/alert-manager/components/ServiceDetailTabsOverviewStatusTable.vue +++ b/apps/web/src/services/alert-manager/components/ServiceDetailTabsOverviewStatusTable.vue @@ -11,7 +11,7 @@ import { import type { ValueItem } from '@cloudforet/mirinae/types/controls/search/query-search/type'; import { iso8601Formatter } from '@cloudforet/utils'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { AlertListParameters } from '@/schema/alert-manager/alert/api-verbs/list'; import { ALERT_STATUS, ALERT_URGENCY } from '@/schema/alert-manager/alert/constants'; import type { AlertModel } from '@/schema/alert-manager/alert/model'; diff --git a/apps/web/src/services/alert-manager/components/ServiceDetailTabsOverviewWebhook.vue b/apps/web/src/services/alert-manager/components/ServiceDetailTabsOverviewWebhook.vue index 349c1314e6..cfdb109165 100644 --- a/apps/web/src/services/alert-manager/components/ServiceDetailTabsOverviewWebhook.vue +++ b/apps/web/src/services/alert-manager/components/ServiceDetailTabsOverviewWebhook.vue @@ -9,7 +9,7 @@ import { PFieldTitle, PIconButton, PLazyImg, PDivider, PTextButton, PDataLoader, } from '@cloudforet/mirinae'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { WebhookListParameters } from '@/schema/alert-manager/webhook/api-verbs/list'; import type { WebhookModel } from '@/schema/alert-manager/webhook/model'; diff --git a/apps/web/src/services/alert-manager/components/ServiceDetailTabsSettingsEscalationPolicy.vue b/apps/web/src/services/alert-manager/components/ServiceDetailTabsSettingsEscalationPolicy.vue index 226fe57808..d2884da55f 100644 --- a/apps/web/src/services/alert-manager/components/ServiceDetailTabsSettingsEscalationPolicy.vue +++ b/apps/web/src/services/alert-manager/components/ServiceDetailTabsSettingsEscalationPolicy.vue @@ -19,7 +19,7 @@ import type { MenuItem } from '@cloudforet/mirinae/types/controls/context-menu/t import type { ValueHandlerMap } from '@cloudforet/mirinae/types/controls/search/query-search/type'; import { iso8601Formatter } from '@cloudforet/utils'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { EscalationPolicyListParameters } from '@/schema/alert-manager/escalation-policy/api-verbs/list'; import type { EscalationPolicyModel } from '@/schema/alert-manager/escalation-policy/model'; import type { EscalationPolicyRulesType } from '@/schema/alert-manager/escalation-policy/type'; diff --git a/apps/web/src/services/alert-manager/components/ServiceDetailTabsSettingsEscalationPolicyFormChannelDropdown.vue b/apps/web/src/services/alert-manager/components/ServiceDetailTabsSettingsEscalationPolicyFormChannelDropdown.vue index 84691ee7d2..9548988cb1 100644 --- a/apps/web/src/services/alert-manager/components/ServiceDetailTabsSettingsEscalationPolicyFormChannelDropdown.vue +++ b/apps/web/src/services/alert-manager/components/ServiceDetailTabsSettingsEscalationPolicyFormChannelDropdown.vue @@ -14,7 +14,7 @@ import type { SelectDropdownMenuItem, } from '@cloudforet/mirinae/types/controls/dropdown/select-dropdown/type'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { ServiceChannelListParameters } from '@/schema/alert-manager/service-channel/api-verbs/list'; import { SERVICE_CHANNEL_TYPE } from '@/schema/alert-manager/service-channel/constants'; import type { ServiceChannelModel } from '@/schema/alert-manager/service-channel/model'; diff --git a/apps/web/src/services/alert-manager/components/ServiceDetailTabsSettingsEventRuleActionAlert.vue b/apps/web/src/services/alert-manager/components/ServiceDetailTabsSettingsEventRuleActionAlert.vue index 6f494af387..69de4e019d 100644 --- a/apps/web/src/services/alert-manager/components/ServiceDetailTabsSettingsEventRuleActionAlert.vue +++ b/apps/web/src/services/alert-manager/components/ServiceDetailTabsSettingsEventRuleActionAlert.vue @@ -17,7 +17,7 @@ import { import type { SelectDropdownMenuItem } from '@cloudforet/mirinae/types/controls/dropdown/select-dropdown/type'; import type { InputItem } from '@cloudforet/mirinae/types/controls/input/text-input/type'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import { ALERT_STATUS } from '@/schema/alert-manager/alert/constants'; import type { AlertStatusType } from '@/schema/alert-manager/alert/type'; import type { EscalationPolicyListParameters } from '@/schema/alert-manager/escalation-policy/api-verbs/list'; diff --git a/apps/web/src/services/alert-manager/components/ServiceDetailTabsSettingsEventRuleScopeModal.vue b/apps/web/src/services/alert-manager/components/ServiceDetailTabsSettingsEventRuleScopeModal.vue index a6703b6bf5..25a96b0c06 100644 --- a/apps/web/src/services/alert-manager/components/ServiceDetailTabsSettingsEventRuleScopeModal.vue +++ b/apps/web/src/services/alert-manager/components/ServiceDetailTabsSettingsEventRuleScopeModal.vue @@ -12,7 +12,7 @@ import { } from '@cloudforet/mirinae'; import type { SelectDropdownMenuItem } from '@cloudforet/mirinae/types/controls/dropdown/select-dropdown/type'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import { EVENT_RULE_SCOPE } from '@/schema/alert-manager/event-rule/constant'; import type { EventRuleScopeType } from '@/schema/alert-manager/event-rule/type'; import type { WebhookListParameters } from '@/schema/alert-manager/webhook/api-verbs/list'; diff --git a/apps/web/src/services/alert-manager/components/ServiceDetailTabsWebhook.vue b/apps/web/src/services/alert-manager/components/ServiceDetailTabsWebhook.vue index 503e28698c..e7fbce8ff1 100644 --- a/apps/web/src/services/alert-manager/components/ServiceDetailTabsWebhook.vue +++ b/apps/web/src/services/alert-manager/components/ServiceDetailTabsWebhook.vue @@ -19,7 +19,7 @@ import { import type { MenuItem } from '@cloudforet/mirinae/types/controls/context-menu/type'; import type { ValueHandlerMap } from '@cloudforet/mirinae/types/controls/search/query-search/type'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { WebhookListParameters } from '@/schema/alert-manager/webhook/api-verbs/list'; import { WEBHOOK_STATE } from '@/schema/alert-manager/webhook/constants'; import type { WebhookModel } from '@/schema/alert-manager/webhook/model'; diff --git a/apps/web/src/services/alert-manager/components/ServiceDetailTabsWebhookDetail.vue b/apps/web/src/services/alert-manager/components/ServiceDetailTabsWebhookDetail.vue index bb589c3bf3..f4fc4c5ed0 100644 --- a/apps/web/src/services/alert-manager/components/ServiceDetailTabsWebhookDetail.vue +++ b/apps/web/src/services/alert-manager/components/ServiceDetailTabsWebhookDetail.vue @@ -15,7 +15,7 @@ import type { DataTableFieldType } from '@cloudforet/mirinae/src/data-display/ta import type { TabItem } from '@cloudforet/mirinae/types/navigation/tabs/tab/type'; import { iso8601Formatter } from '@cloudforet/utils'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { WebhookGetParameters } from '@/schema/alert-manager/webhook/api-verbs/get'; import type { WebhookListErrorSParameters } from '@/schema/alert-manager/webhook/api-verbs/list-errors'; import type { WebhookUpdateMessageFormatParameters } from '@/schema/alert-manager/webhook/api-verbs/update-message-format'; diff --git a/apps/web/src/services/alert-manager/components/ServiceList.vue b/apps/web/src/services/alert-manager/components/ServiceList.vue index c08e04c2cd..ea64b1a73c 100644 --- a/apps/web/src/services/alert-manager/components/ServiceList.vue +++ b/apps/web/src/services/alert-manager/components/ServiceList.vue @@ -12,7 +12,7 @@ import { } from '@cloudforet/mirinae'; import type { ToolboxOptions } from '@cloudforet/mirinae/src/controls/toolbox/type'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { ServiceListParameters } from '@/schema/alert-manager/service/api-verbs/list'; import type { ServiceModel } from '@/schema/alert-manager/service/model'; diff --git a/apps/web/src/services/alert-manager/components/WebhookCreateForm.vue b/apps/web/src/services/alert-manager/components/WebhookCreateForm.vue index 5325e269f6..bd6aa77ac3 100644 --- a/apps/web/src/services/alert-manager/components/WebhookCreateForm.vue +++ b/apps/web/src/services/alert-manager/components/WebhookCreateForm.vue @@ -6,7 +6,7 @@ import { PFieldGroup, PTextInput, PSelectDropdown, PDataLoader, PLazyImg, } from '@cloudforet/mirinae'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { PluginGetVersionsParameters } from '@/schema/repository/plugin/api-verbs/get-versions'; import type { PluginModel } from '@/schema/repository/plugin/model'; import { i18n } from '@/translations'; diff --git a/apps/web/src/services/alert-manager/components/WebhookCreateTypeSelector.vue b/apps/web/src/services/alert-manager/components/WebhookCreateTypeSelector.vue index d469027657..d965763e17 100644 --- a/apps/web/src/services/alert-manager/components/WebhookCreateTypeSelector.vue +++ b/apps/web/src/services/alert-manager/components/WebhookCreateTypeSelector.vue @@ -6,7 +6,7 @@ import { PSelectCard, PLazyImg, PDataLoader, } from '@cloudforet/mirinae'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { PluginListParameters } from '@/schema/repository/plugin/api-verbs/list'; import type { PluginModel } from '@/schema/repository/plugin/model'; import type { RepositoryListParameters } from '@/schema/repository/repository/api-verbs/list'; diff --git a/apps/web/src/services/alert-manager/stores/alert-page-store.ts b/apps/web/src/services/alert-manager/stores/alert-page-store.ts index 1ec6a5a669..f6a838c951 100644 --- a/apps/web/src/services/alert-manager/stores/alert-page-store.ts +++ b/apps/web/src/services/alert-manager/stores/alert-page-store.ts @@ -6,7 +6,7 @@ import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; import type { Query } from '@cloudforet/core-lib/space-connector/type'; import type { SelectDropdownMenuItem } from '@cloudforet/mirinae/types/controls/dropdown/select-dropdown/type'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { AlertListParameters } from '@/schema/alert-manager/alert/api-verbs/list'; import type { AlertModel } from '@/schema/alert-manager/alert/model'; diff --git a/apps/web/src/services/alert-manager/stores/service-create-form-store.ts b/apps/web/src/services/alert-manager/stores/service-create-form-store.ts index 9fbd3c1c49..162f438380 100644 --- a/apps/web/src/services/alert-manager/stores/service-create-form-store.ts +++ b/apps/web/src/services/alert-manager/stores/service-create-form-store.ts @@ -5,7 +5,7 @@ import { defineStore } from 'pinia'; import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { NotificationProtocolListParameters } from '@/schema/alert-manager/notification-protocol/api-verbs/list'; import type { NotificationProtocolModel } from '@/schema/alert-manager/notification-protocol/model'; import type { ServiceModel } from '@/schema/alert-manager/service/model'; diff --git a/apps/web/src/services/alert-manager/stores/service-detail-page-store.ts b/apps/web/src/services/alert-manager/stores/service-detail-page-store.ts index 93cf5da52c..d2990c81eb 100644 --- a/apps/web/src/services/alert-manager/stores/service-detail-page-store.ts +++ b/apps/web/src/services/alert-manager/stores/service-detail-page-store.ts @@ -5,7 +5,7 @@ import { defineStore } from 'pinia'; import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { EventRuleGetParameters } from '@/schema/alert-manager/event-rule/api-verbs/get'; import type { EventRuleListParameters } from '@/schema/alert-manager/event-rule/api-verbs/list'; import type { EventRuleModel } from '@/schema/alert-manager/event-rule/model'; diff --git a/apps/web/src/services/asset-inventory-v1/components/CloudServiceAlertsTab.vue b/apps/web/src/services/asset-inventory-v1/components/CloudServiceAlertsTab.vue index 4ac42150d8..e087fac05d 100644 --- a/apps/web/src/services/asset-inventory-v1/components/CloudServiceAlertsTab.vue +++ b/apps/web/src/services/asset-inventory-v1/components/CloudServiceAlertsTab.vue @@ -13,7 +13,7 @@ import type { DataTableFieldType } from '@cloudforet/mirinae/src/data-display/ta import type { SelectDropdownMenuItem } from '@cloudforet/mirinae/types/controls/dropdown/select-dropdown/type'; import { iso8601Formatter } from '@cloudforet/utils'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { AlertListParameters } from '@/schema/alert-manager/alert/api-verbs/list'; import { ALERT_STATUS, ALERT_URGENCY } from '@/schema/alert-manager/alert/constants'; import type { AlertModel } from '@/schema/alert-manager/alert/model'; diff --git a/apps/web/src/services/asset-inventory-v1/components/CloudServiceDetail.vue b/apps/web/src/services/asset-inventory-v1/components/CloudServiceDetail.vue index 2ed0a558d6..d21e5e3d45 100644 --- a/apps/web/src/services/asset-inventory-v1/components/CloudServiceDetail.vue +++ b/apps/web/src/services/asset-inventory-v1/components/CloudServiceDetail.vue @@ -21,9 +21,9 @@ import type { DynamicLayout, DynamicLayoutType } from '@cloudforet/mirinae/types import type { TabItem } from '@cloudforet/mirinae/types/navigation/tabs/tab/type'; -import { QueryType } from '@/schema/_common/api-verbs/export'; -import type { ExportParameter } from '@/schema/_common/api-verbs/export'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import { QueryType } from '@/api-clients/_common/schema/api-verbs/export'; +import type { ExportParameter } from '@/api-clients/_common/schema/api-verbs/export'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { CloudServiceGetParameters } from '@/schema/inventory/cloud-service/api-verbs/get'; import type { CloudServiceListParameters } from '@/schema/inventory/cloud-service/api-verbs/list'; import type { CloudServiceModel } from '@/schema/inventory/cloud-service/model'; diff --git a/apps/web/src/services/asset-inventory-v1/components/CloudServiceDetailExcelExportOptionModal.vue b/apps/web/src/services/asset-inventory-v1/components/CloudServiceDetailExcelExportOptionModal.vue index e57e821b86..e9ae1a7ad9 100644 --- a/apps/web/src/services/asset-inventory-v1/components/CloudServiceDetailExcelExportOptionModal.vue +++ b/apps/web/src/services/asset-inventory-v1/components/CloudServiceDetailExcelExportOptionModal.vue @@ -16,8 +16,8 @@ import { import type { DynamicField } from '@cloudforet/mirinae/src/data-display/dynamic/dynamic-field/type/field-schema'; import type { DynamicLayout } from '@cloudforet/mirinae/types/data-display/dynamic/dynamic-layout/type/layout-schema'; -import { QueryType } from '@/schema/_common/api-verbs/export'; -import type { ExportOption, ExportParameter } from '@/schema/_common/api-verbs/export'; +import { QueryType } from '@/api-clients/_common/schema/api-verbs/export'; +import type { ExportOption, ExportParameter } from '@/api-clients/_common/schema/api-verbs/export'; import { i18n } from '@/translations'; import { useAppContextStore } from '@/store/app-context/app-context-store'; diff --git a/apps/web/src/services/asset-inventory-v1/components/CloudServiceDetailMultipleSelectedData.vue b/apps/web/src/services/asset-inventory-v1/components/CloudServiceDetailMultipleSelectedData.vue index 0a283ad0ff..5f80d4bd19 100644 --- a/apps/web/src/services/asset-inventory-v1/components/CloudServiceDetailMultipleSelectedData.vue +++ b/apps/web/src/services/asset-inventory-v1/components/CloudServiceDetailMultipleSelectedData.vue @@ -20,9 +20,9 @@ import type { DynamicLayout } from '@cloudforet/mirinae/types/data-display/dynam import type { TabItem } from '@cloudforet/mirinae/types/navigation/tabs/tab/type'; -import { QueryType } from '@/schema/_common/api-verbs/export'; -import type { ExportParameter } from '@/schema/_common/api-verbs/export'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import { QueryType } from '@/api-clients/_common/schema/api-verbs/export'; +import type { ExportParameter } from '@/api-clients/_common/schema/api-verbs/export'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { CloudServiceGetParameters } from '@/schema/inventory/cloud-service/api-verbs/get'; import type { CloudServiceListParameters } from '@/schema/inventory/cloud-service/api-verbs/list'; import type { CloudServiceModel } from '@/schema/inventory/cloud-service/model'; diff --git a/apps/web/src/services/asset-inventory-v1/components/CloudServiceExcelExportOptionModal.vue b/apps/web/src/services/asset-inventory-v1/components/CloudServiceExcelExportOptionModal.vue index dcbf44da7f..6c1c11acb9 100644 --- a/apps/web/src/services/asset-inventory-v1/components/CloudServiceExcelExportOptionModal.vue +++ b/apps/web/src/services/asset-inventory-v1/components/CloudServiceExcelExportOptionModal.vue @@ -12,8 +12,8 @@ import { import type { DynamicLayout } from '@cloudforet/mirinae/types/data-display/dynamic/dynamic-layout/type/layout-schema'; -import { QueryType } from '@/schema/_common/api-verbs/export'; -import type { ExportOption, ExportParameter } from '@/schema/_common/api-verbs/export'; +import { QueryType } from '@/api-clients/_common/schema/api-verbs/export'; +import type { ExportOption, ExportParameter } from '@/api-clients/_common/schema/api-verbs/export'; import type { CloudServiceAnalyzeParameters } from '@/schema/inventory/cloud-service/api-verbs/analyze'; import { i18n } from '@/translations'; diff --git a/apps/web/src/services/asset-inventory-v1/components/CloudServiceHistory.vue b/apps/web/src/services/asset-inventory-v1/components/CloudServiceHistory.vue index 2c49c8fae8..3774b8fbec 100644 --- a/apps/web/src/services/asset-inventory-v1/components/CloudServiceHistory.vue +++ b/apps/web/src/services/asset-inventory-v1/components/CloudServiceHistory.vue @@ -113,8 +113,8 @@ import { } from '@cloudforet/mirinae'; import type { ToolboxOptions } from '@cloudforet/mirinae/types/controls/toolbox/type'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import { SpaceRouter } from '@/router'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; import type { ChangeHistoryListParameters } from '@/schema/inventory/change-history/api-verbs/list'; import type { ChangeHistoryModel } from '@/schema/inventory/change-history/model'; import type { NoteListParameters } from '@/schema/inventory/note/api-verbs/list'; diff --git a/apps/web/src/services/asset-inventory-v1/components/CloudServiceHistoryDetailNoteTab.vue b/apps/web/src/services/asset-inventory-v1/components/CloudServiceHistoryDetailNoteTab.vue index b21e903b42..2a8343b746 100644 --- a/apps/web/src/services/asset-inventory-v1/components/CloudServiceHistoryDetailNoteTab.vue +++ b/apps/web/src/services/asset-inventory-v1/components/CloudServiceHistoryDetailNoteTab.vue @@ -13,7 +13,7 @@ import { } from '@cloudforet/mirinae'; import { iso8601Formatter } from '@cloudforet/utils'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { NoteCreateParameters } from '@/schema/inventory/note/api-verbs/create'; import type { NoteDeleteParameters } from '@/schema/inventory/note/api-verbs/delete'; import type { NoteListParameters } from '@/schema/inventory/note/api-verbs/list'; diff --git a/apps/web/src/services/asset-inventory-v1/components/CloudServiceLogTab.vue b/apps/web/src/services/asset-inventory-v1/components/CloudServiceLogTab.vue index a082b145e7..67ae196d4c 100644 --- a/apps/web/src/services/asset-inventory-v1/components/CloudServiceLogTab.vue +++ b/apps/web/src/services/asset-inventory-v1/components/CloudServiceLogTab.vue @@ -88,7 +88,7 @@ import type { DynamicLayoutEventListener } from '@cloudforet/mirinae/types/data- import type { DynamicLayout } from '@cloudforet/mirinae/types/data-display/dynamic/dynamic-layout/type/layout-schema'; import type { TabItem } from '@cloudforet/mirinae/types/navigation/tabs/tab/type'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { DataSourceListParameters } from '@/schema/monitoring/data-source/api-verbs/list'; import type { DataSourceModel } from '@/schema/monitoring/data-source/model'; import type { MonitoringLogListParameters } from '@/schema/monitoring/log/api-verbs/list'; diff --git a/apps/web/src/services/asset-inventory-v1/components/CollectorAdditionalRuleForm.vue b/apps/web/src/services/asset-inventory-v1/components/CollectorAdditionalRuleForm.vue index 01827a2102..059c52c66a 100644 --- a/apps/web/src/services/asset-inventory-v1/components/CollectorAdditionalRuleForm.vue +++ b/apps/web/src/services/asset-inventory-v1/components/CollectorAdditionalRuleForm.vue @@ -12,7 +12,7 @@ import { } from '@cloudforet/mirinae'; import type { SelectDropdownMenuItem } from '@cloudforet/mirinae/types/controls/dropdown/select-dropdown/type'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { CloudServiceTypeStatParameters } from '@/schema/inventory/cloud-service-type/api-verbs/stat'; import { COLLECTOR_RULE_CONDITION_KEY, COLLECTOR_RULE_CONDITION_KEY_LABEL, diff --git a/apps/web/src/services/asset-inventory-v1/components/CollectorCreateStep1.vue b/apps/web/src/services/asset-inventory-v1/components/CollectorCreateStep1.vue index 294fe961dd..cdb96df25d 100644 --- a/apps/web/src/services/asset-inventory-v1/components/CollectorCreateStep1.vue +++ b/apps/web/src/services/asset-inventory-v1/components/CollectorCreateStep1.vue @@ -80,7 +80,7 @@ import { } from '@cloudforet/mirinae'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { PluginListParameters } from '@/schema/repository/plugin/api-verbs/list'; import type { PluginModel } from '@/schema/repository/plugin/model'; diff --git a/apps/web/src/services/asset-inventory-v1/components/CollectorCreateStep1SearchFilter.vue b/apps/web/src/services/asset-inventory-v1/components/CollectorCreateStep1SearchFilter.vue index 2f17205096..f6378b3833 100644 --- a/apps/web/src/services/asset-inventory-v1/components/CollectorCreateStep1SearchFilter.vue +++ b/apps/web/src/services/asset-inventory-v1/components/CollectorCreateStep1SearchFilter.vue @@ -122,7 +122,7 @@ import { import type { MenuItem } from '@cloudforet/mirinae/types/controls/context-menu/type'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { RepositoryListParameters } from '@/schema/repository/repository/api-verbs/list'; import type { RepositoryModel } from '@/schema/repository/repository/model'; diff --git a/apps/web/src/services/asset-inventory-v1/components/CollectorCreateStep4.vue b/apps/web/src/services/asset-inventory-v1/components/CollectorCreateStep4.vue index 60e7c74daa..d67ec9607a 100644 --- a/apps/web/src/services/asset-inventory-v1/components/CollectorCreateStep4.vue +++ b/apps/web/src/services/asset-inventory-v1/components/CollectorCreateStep4.vue @@ -59,8 +59,8 @@ import { } from '@cloudforet/mirinae'; +import { RESOURCE_GROUP } from '@/api-clients/_common/schema/constant'; import { SpaceRouter } from '@/router'; -import { RESOURCE_GROUP } from '@/schema/_common/constant'; import type { CollectorCollectParameters } from '@/schema/inventory/collector/api-verbs/collect'; import type { CollectorCreateParameters } from '@/schema/inventory/collector/api-verbs/create'; import type { CollectorModel } from '@/schema/inventory/collector/model'; diff --git a/apps/web/src/services/asset-inventory-v1/components/CollectorDataModal.vue b/apps/web/src/services/asset-inventory-v1/components/CollectorDataModal.vue index a9ff8c28b6..8db14ee6a7 100644 --- a/apps/web/src/services/asset-inventory-v1/components/CollectorDataModal.vue +++ b/apps/web/src/services/asset-inventory-v1/components/CollectorDataModal.vue @@ -40,7 +40,7 @@ import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; import { ApiQueryHelper } from '@cloudforet/core-lib/space-connector/helper'; import { PButtonModal } from '@cloudforet/mirinae'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { CollectorCollectParameters } from '@/schema/inventory/collector/api-verbs/collect'; import type { JobModel } from '@/schema/inventory/job/model'; import type { SecretListParameters } from '@/schema/secret/secret/api-verbs/list'; diff --git a/apps/web/src/services/asset-inventory-v1/components/CollectorDetailAttachedServiceAccounts.vue b/apps/web/src/services/asset-inventory-v1/components/CollectorDetailAttachedServiceAccounts.vue index 35e9dd0344..b6628d54eb 100644 --- a/apps/web/src/services/asset-inventory-v1/components/CollectorDetailAttachedServiceAccounts.vue +++ b/apps/web/src/services/asset-inventory-v1/components/CollectorDetailAttachedServiceAccounts.vue @@ -14,7 +14,7 @@ import type { DefinitionField } from '@cloudforet/mirinae/types/data-display/tab import type { ToolboxTableOptions } from '@cloudforet/mirinae/types/data-display/tables/toolbox-table/type'; import { iso8601Formatter } from '@cloudforet/utils'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { SecretListParameters } from '@/schema/secret/secret/api-verbs/list'; import type { SecretModel } from '@/schema/secret/secret/model'; import { i18n } from '@/translations'; diff --git a/apps/web/src/services/asset-inventory-v1/components/CollectorDetailTags.vue b/apps/web/src/services/asset-inventory-v1/components/CollectorDetailTags.vue index 2325242570..8f7a80ebae 100644 --- a/apps/web/src/services/asset-inventory-v1/components/CollectorDetailTags.vue +++ b/apps/web/src/services/asset-inventory-v1/components/CollectorDetailTags.vue @@ -4,7 +4,7 @@ import { computed } from 'vue'; import { PTag, PFieldTitle, PEmpty } from '@cloudforet/mirinae'; import { isNotEmpty } from '@cloudforet/utils'; -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; const props = withDefaults(defineProps<{ tags: Tags; diff --git a/apps/web/src/services/asset-inventory-v1/components/CollectorHistoryJobTaskTable.vue b/apps/web/src/services/asset-inventory-v1/components/CollectorHistoryJobTaskTable.vue index 4fae3c5dbe..c35cd2617b 100644 --- a/apps/web/src/services/asset-inventory-v1/components/CollectorHistoryJobTaskTable.vue +++ b/apps/web/src/services/asset-inventory-v1/components/CollectorHistoryJobTaskTable.vue @@ -14,7 +14,7 @@ import { import { ACTION_ICON } from '@cloudforet/mirinae/src/navigation/link/type'; import { durationFormatter, iso8601Formatter } from '@cloudforet/utils'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { JobTaskListParameters } from '@/schema/inventory/job-task/api-verbs/list'; import type { JobTaskModel } from '@/schema/inventory/job-task/model'; import { i18n } from '@/translations'; diff --git a/apps/web/src/services/asset-inventory-v1/components/MetricExplorerChart.vue b/apps/web/src/services/asset-inventory-v1/components/MetricExplorerChart.vue index 3ba7aa06f6..8d9c607156 100644 --- a/apps/web/src/services/asset-inventory-v1/components/MetricExplorerChart.vue +++ b/apps/web/src/services/asset-inventory-v1/components/MetricExplorerChart.vue @@ -13,7 +13,7 @@ import { PEmpty, PSelectButton, PSkeleton, PSelectDropdown, PButton, } from '@cloudforet/mirinae'; -import type { AnalyzeResponse } from '@/schema/_common/api-verbs/analyze'; +import type { AnalyzeResponse } from '@/api-clients/_common/schema/api-verbs/analyze'; import type { MetricDataAnalyzeParameters } from '@/schema/inventory/metric-data/api-verbs/analyze'; import MetricExplorerDonutChart from '@/services/asset-inventory-v1/components/MetricExplorerDonutChart.vue'; diff --git a/apps/web/src/services/asset-inventory-v1/components/MetricExplorerDataTable.vue b/apps/web/src/services/asset-inventory-v1/components/MetricExplorerDataTable.vue index f29de81bf4..a91fa59437 100644 --- a/apps/web/src/services/asset-inventory-v1/components/MetricExplorerDataTable.vue +++ b/apps/web/src/services/asset-inventory-v1/components/MetricExplorerDataTable.vue @@ -18,7 +18,7 @@ import { PTextPagination, PToolboxTable } from '@cloudforet/mirinae'; import type { DataTableFieldType } from '@cloudforet/mirinae/types/data-display/tables/data-table/type'; import { byteFormatter, numberFormatter } from '@cloudforet/utils'; -import type { AnalyzeResponse } from '@/schema/_common/api-verbs/analyze'; +import type { AnalyzeResponse } from '@/api-clients/_common/schema/api-verbs/analyze'; import type { MetricDataAnalyzeParameters } from '@/schema/inventory/metric-data/api-verbs/analyze'; import type { MetricLabelKey } from '@/schema/inventory/metric/type'; diff --git a/apps/web/src/services/asset-inventory-v1/components/MetricExplorerDonutChart.vue b/apps/web/src/services/asset-inventory-v1/components/MetricExplorerDonutChart.vue index b029b84e29..108e20c52f 100644 --- a/apps/web/src/services/asset-inventory-v1/components/MetricExplorerDonutChart.vue +++ b/apps/web/src/services/asset-inventory-v1/components/MetricExplorerDonutChart.vue @@ -11,7 +11,7 @@ import { isEmpty, orderBy, throttle } from 'lodash'; import { numberFormatter } from '@cloudforet/utils'; -import type { AnalyzeResponse } from '@/schema/_common/api-verbs/analyze'; +import type { AnalyzeResponse } from '@/api-clients/_common/schema/api-verbs/analyze'; import { useProxyValue } from '@/common/composables/proxy-state'; import { getReferenceLabel } from '@/common/modules/widgets/_helpers/widget-date-helper'; diff --git a/apps/web/src/services/asset-inventory-v1/components/MetricExplorerHeader.vue b/apps/web/src/services/asset-inventory-v1/components/MetricExplorerHeader.vue index 42487829bc..ce292d688f 100644 --- a/apps/web/src/services/asset-inventory-v1/components/MetricExplorerHeader.vue +++ b/apps/web/src/services/asset-inventory-v1/components/MetricExplorerHeader.vue @@ -13,7 +13,7 @@ import { import type { MenuItem } from '@cloudforet/mirinae/types/controls/context-menu/type'; -import { RESOURCE_GROUP } from '@/schema/_common/constant'; +import { RESOURCE_GROUP } from '@/api-clients/_common/schema/constant'; import type { MetricExampleDeleteParameters } from '@/schema/inventory/metric-example/api-verbs/delete'; import type { MetricExampleUpdateParameters } from '@/schema/inventory/metric-example/api-verbs/update'; import type { MetricExampleModel } from '@/schema/inventory/metric-example/model'; diff --git a/apps/web/src/services/asset-inventory-v1/components/MetricExplorerHorizontalColumnChart.vue b/apps/web/src/services/asset-inventory-v1/components/MetricExplorerHorizontalColumnChart.vue index 93c116c754..383c7ce44f 100644 --- a/apps/web/src/services/asset-inventory-v1/components/MetricExplorerHorizontalColumnChart.vue +++ b/apps/web/src/services/asset-inventory-v1/components/MetricExplorerHorizontalColumnChart.vue @@ -13,7 +13,7 @@ import { import { numberFormatter } from '@cloudforet/utils'; -import type { AnalyzeResponse } from '@/schema/_common/api-verbs/analyze'; +import type { AnalyzeResponse } from '@/api-clients/_common/schema/api-verbs/analyze'; import { useProxyValue } from '@/common/composables/proxy-state'; import { diff --git a/apps/web/src/services/asset-inventory-v1/components/MetricExplorerLineChart.vue b/apps/web/src/services/asset-inventory-v1/components/MetricExplorerLineChart.vue index f8ae5d6965..15f34ab2c1 100644 --- a/apps/web/src/services/asset-inventory-v1/components/MetricExplorerLineChart.vue +++ b/apps/web/src/services/asset-inventory-v1/components/MetricExplorerLineChart.vue @@ -14,7 +14,7 @@ import { import { numberFormatter } from '@cloudforet/utils'; -import type { AnalyzeResponse } from '@/schema/_common/api-verbs/analyze'; +import type { AnalyzeResponse } from '@/api-clients/_common/schema/api-verbs/analyze'; import { useProxyValue } from '@/common/composables/proxy-state'; import { diff --git a/apps/web/src/services/asset-inventory-v1/components/MetricExplorerMapChart.vue b/apps/web/src/services/asset-inventory-v1/components/MetricExplorerMapChart.vue index 9a051629c0..98ab76d85e 100644 --- a/apps/web/src/services/asset-inventory-v1/components/MetricExplorerMapChart.vue +++ b/apps/web/src/services/asset-inventory-v1/components/MetricExplorerMapChart.vue @@ -13,7 +13,7 @@ import { import { numberFormatter } from '@cloudforet/utils'; -import type { AnalyzeResponse } from '@/schema/_common/api-verbs/analyze'; +import type { AnalyzeResponse } from '@/api-clients/_common/schema/api-verbs/analyze'; import { getReferenceLabel } from '@/common/modules/widgets/_helpers/widget-date-helper'; diff --git a/apps/web/src/services/asset-inventory-v1/components/MetricExplorerQueryFormSidebar.vue b/apps/web/src/services/asset-inventory-v1/components/MetricExplorerQueryFormSidebar.vue index a2f1fee8ad..a87c0dd419 100644 --- a/apps/web/src/services/asset-inventory-v1/components/MetricExplorerQueryFormSidebar.vue +++ b/apps/web/src/services/asset-inventory-v1/components/MetricExplorerQueryFormSidebar.vue @@ -9,7 +9,7 @@ import { } from '@cloudforet/mirinae'; -import { RESOURCE_GROUP } from '@/schema/_common/constant'; +import { RESOURCE_GROUP } from '@/api-clients/_common/schema/constant'; import type { MetricCreateParameters } from '@/schema/inventory/metric/api-verbs/create'; import type { MetricUpdateParameters } from '@/schema/inventory/metric/api-verbs/update'; import { METRIC_TYPE } from '@/schema/inventory/metric/constant'; diff --git a/apps/web/src/services/asset-inventory-v1/components/ServiceAccountAttachedGeneralAccounts.vue b/apps/web/src/services/asset-inventory-v1/components/ServiceAccountAttachedGeneralAccounts.vue index bc939b2837..c3a01b6540 100644 --- a/apps/web/src/services/asset-inventory-v1/components/ServiceAccountAttachedGeneralAccounts.vue +++ b/apps/web/src/services/asset-inventory-v1/components/ServiceAccountAttachedGeneralAccounts.vue @@ -29,7 +29,7 @@ import type { ToolboxOptions } from '@cloudforet/mirinae/types/controls/toolbox/ import type { DataTableFieldType } from '@cloudforet/mirinae/types/data-display/tables/data-table/type'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { ServiceAccountListParameters } from '@/schema/identity/service-account/api-verbs/list'; import { SERVICE_ACCOUNT_STATE } from '@/schema/identity/service-account/constant'; import type { ServiceAccountModel } from '@/schema/identity/service-account/model'; diff --git a/apps/web/src/services/asset-inventory-v1/components/ServiceAccountBaseInformationForm.vue b/apps/web/src/services/asset-inventory-v1/components/ServiceAccountBaseInformationForm.vue index fc344b5f10..699b80def7 100644 --- a/apps/web/src/services/asset-inventory-v1/components/ServiceAccountBaseInformationForm.vue +++ b/apps/web/src/services/asset-inventory-v1/components/ServiceAccountBaseInformationForm.vue @@ -8,7 +8,7 @@ import { PFieldGroup, PJsonSchemaForm, PTextInput, } from '@cloudforet/mirinae'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { ServiceAccountListParameters } from '@/schema/identity/service-account/api-verbs/list'; import type { ServiceAccountModel } from '@/schema/identity/service-account/model'; import type { TrustedAccountModel } from '@/schema/identity/trusted-account/model'; diff --git a/apps/web/src/services/asset-inventory-v1/components/ServiceAccountCredentialsForm.vue b/apps/web/src/services/asset-inventory-v1/components/ServiceAccountCredentialsForm.vue index 6e3d0b6c67..70369a4ffd 100644 --- a/apps/web/src/services/asset-inventory-v1/components/ServiceAccountCredentialsForm.vue +++ b/apps/web/src/services/asset-inventory-v1/components/ServiceAccountCredentialsForm.vue @@ -17,7 +17,7 @@ import type { JsonSchema } from '@cloudforet/mirinae/types/controls/forms/json-s import type { TabItem } from '@cloudforet/mirinae/types/navigation/tabs/tab/type'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { SchemaListParameters } from '@/schema/identity/schema/api-verbs/list'; import type { SchemaModel } from '@/schema/identity/schema/model'; import { ACCOUNT_TYPE } from '@/schema/identity/service-account/constant'; diff --git a/apps/web/src/services/asset-inventory-v1/components/ServiceAccountEditModal.vue b/apps/web/src/services/asset-inventory-v1/components/ServiceAccountEditModal.vue index 5e9ab187f3..ee9c01fb5c 100644 --- a/apps/web/src/services/asset-inventory-v1/components/ServiceAccountEditModal.vue +++ b/apps/web/src/services/asset-inventory-v1/components/ServiceAccountEditModal.vue @@ -7,7 +7,7 @@ import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; import { PButtonModal, PFieldGroup, PTextInput } from '@cloudforet/mirinae'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { ServiceAccountListParameters } from '@/schema/identity/service-account/api-verbs/list'; import type { ServiceAccountUpdateParameters } from '@/schema/identity/service-account/api-verbs/update'; import type { ServiceAccountModel } from '@/schema/identity/service-account/model'; diff --git a/apps/web/src/services/asset-inventory-v1/components/WorkspaceDropdown.vue b/apps/web/src/services/asset-inventory-v1/components/WorkspaceDropdown.vue index 571e0c4bb1..49248584bc 100644 --- a/apps/web/src/services/asset-inventory-v1/components/WorkspaceDropdown.vue +++ b/apps/web/src/services/asset-inventory-v1/components/WorkspaceDropdown.vue @@ -9,7 +9,7 @@ import { PButton, PSelectDropdown, PStatus } from '@cloudforet/mirinae'; import type { SelectDropdownMenuItem } from '@cloudforet/mirinae/src/controls/dropdown/select-dropdown/type'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { WorkspaceListParameters } from '@/schema/identity/workspace/api-verbs/list'; import type { WorkspaceModel } from '@/schema/identity/workspace/model'; diff --git a/apps/web/src/services/asset-inventory-v1/helpers/asset-analysis-chart-data-helper.ts b/apps/web/src/services/asset-inventory-v1/helpers/asset-analysis-chart-data-helper.ts index cef3ab1ea5..97feea0c8a 100644 --- a/apps/web/src/services/asset-inventory-v1/helpers/asset-analysis-chart-data-helper.ts +++ b/apps/web/src/services/asset-inventory-v1/helpers/asset-analysis-chart-data-helper.ts @@ -1,6 +1,6 @@ import dayjs from 'dayjs'; -import type { AnalyzeResponse } from '@/schema/_common/api-verbs/analyze'; +import type { AnalyzeResponse } from '@/api-clients/_common/schema/api-verbs/analyze'; import type { ReferenceMap } from '@/store/reference/type'; diff --git a/apps/web/src/services/asset-inventory-v1/helpers/dynamic-ui-schema-generator/index.ts b/apps/web/src/services/asset-inventory-v1/helpers/dynamic-ui-schema-generator/index.ts index fcfb7c271f..525dc56c7a 100644 --- a/apps/web/src/services/asset-inventory-v1/helpers/dynamic-ui-schema-generator/index.ts +++ b/apps/web/src/services/asset-inventory-v1/helpers/dynamic-ui-schema-generator/index.ts @@ -3,7 +3,7 @@ import type { JsonSchema } from '@cloudforet/mirinae/types/controls/forms/json-s import type { DynamicField } from '@cloudforet/mirinae/types/data-display/dynamic/dynamic-field/type/field-schema'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { UserConfigCreateParameters } from '@/schema/config/user-config/api-verbs/create'; import type { UserConfigGetParameters } from '@/schema/config/user-config/api-verbs/get'; import type { UserConfigUpdateParameters } from '@/schema/config/user-config/api-verbs/update'; diff --git a/apps/web/src/services/asset-inventory-v1/pages/CloudServiceDetailPage.vue b/apps/web/src/services/asset-inventory-v1/pages/CloudServiceDetailPage.vue index 91be521536..59b042b378 100644 --- a/apps/web/src/services/asset-inventory-v1/pages/CloudServiceDetailPage.vue +++ b/apps/web/src/services/asset-inventory-v1/pages/CloudServiceDetailPage.vue @@ -24,9 +24,9 @@ import type { DynamicLayoutOptions, } from '@cloudforet/mirinae/types/data-display/dynamic/dynamic-layout/type/layout-schema'; -import { QueryType } from '@/schema/_common/api-verbs/export'; -import type { ExportParameter } from '@/schema/_common/api-verbs/export'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import { QueryType } from '@/api-clients/_common/schema/api-verbs/export'; +import type { ExportParameter } from '@/api-clients/_common/schema/api-verbs/export'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { CloudServiceGetParameters } from '@/schema/inventory/cloud-service/api-verbs/get'; import type { CloudServiceListParameters } from '@/schema/inventory/cloud-service/api-verbs/list'; import type { CloudServiceModel } from '@/schema/inventory/cloud-service/model'; diff --git a/apps/web/src/services/asset-inventory-v1/pages/CollectorHistoryPage.vue b/apps/web/src/services/asset-inventory-v1/pages/CollectorHistoryPage.vue index dc970b0b7e..16d60eab43 100644 --- a/apps/web/src/services/asset-inventory-v1/pages/CollectorHistoryPage.vue +++ b/apps/web/src/services/asset-inventory-v1/pages/CollectorHistoryPage.vue @@ -20,8 +20,8 @@ import type { ToolboxOptions } from '@cloudforet/mirinae/types/controls/toolbox/ import type { DataTableField } from '@cloudforet/mirinae/types/data-display/tables/data-table/type'; import { durationFormatter, iso8601Formatter } from '@cloudforet/utils'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import { SpaceRouter } from '@/router'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; import type { JobListParameters } from '@/schema/inventory/job/api-verbs/list'; import type { JobModel } from '@/schema/inventory/job/model'; import { i18n } from '@/translations'; diff --git a/apps/web/src/services/asset-inventory-v1/pages/CollectorMainPage.vue b/apps/web/src/services/asset-inventory-v1/pages/CollectorMainPage.vue index 2807cf8bda..79df11ed9e 100644 --- a/apps/web/src/services/asset-inventory-v1/pages/CollectorMainPage.vue +++ b/apps/web/src/services/asset-inventory-v1/pages/CollectorMainPage.vue @@ -13,8 +13,8 @@ import { PButton, PHeading, PDataLoader, PHeadingLayout, } from '@cloudforet/mirinae'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import { SpaceRouter } from '@/router'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; import type { CollectorListParameters } from '@/schema/inventory/collector/api-verbs/list'; import type { CollectorModel } from '@/schema/inventory/collector/model'; diff --git a/apps/web/src/services/asset-inventory-v1/pages/ServiceAccountPage.vue b/apps/web/src/services/asset-inventory-v1/pages/ServiceAccountPage.vue index a786884bf9..69433dfe6b 100644 --- a/apps/web/src/services/asset-inventory-v1/pages/ServiceAccountPage.vue +++ b/apps/web/src/services/asset-inventory-v1/pages/ServiceAccountPage.vue @@ -23,7 +23,7 @@ import type { import type { DynamicLayoutOptions, SearchSchema } from '@cloudforet/mirinae/types/data-display/dynamic/dynamic-layout/type/layout-schema'; import { numberFormatter } from '@cloudforet/utils'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import { ROLE_TYPE } from '@/schema/identity/role/constant'; import type { ServiceAccountListParameters } from '@/schema/identity/service-account/api-verbs/list'; import { ACCOUNT_TYPE, SERVICE_ACCOUNT_STATE } from '@/schema/identity/service-account/constant'; diff --git a/apps/web/src/services/asset-inventory-v1/pages/admin/AdminCollectorHistoryPage.vue b/apps/web/src/services/asset-inventory-v1/pages/admin/AdminCollectorHistoryPage.vue index c9cbd7df1a..0e74b61135 100644 --- a/apps/web/src/services/asset-inventory-v1/pages/admin/AdminCollectorHistoryPage.vue +++ b/apps/web/src/services/asset-inventory-v1/pages/admin/AdminCollectorHistoryPage.vue @@ -21,8 +21,8 @@ import type { ToolboxOptions } from '@cloudforet/mirinae/types/controls/toolbox/ import type { DataTableField } from '@cloudforet/mirinae/types/data-display/tables/data-table/type'; import { durationFormatter, iso8601Formatter } from '@cloudforet/utils'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import { SpaceRouter } from '@/router'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; import type { JobListParameters } from '@/schema/inventory/job/api-verbs/list'; import type { JobModel } from '@/schema/inventory/job/model'; import { i18n } from '@/translations'; diff --git a/apps/web/src/services/asset-inventory-v1/pages/admin/AdminCollectorMainPage.vue b/apps/web/src/services/asset-inventory-v1/pages/admin/AdminCollectorMainPage.vue index 705a921fc9..76a70197c9 100644 --- a/apps/web/src/services/asset-inventory-v1/pages/admin/AdminCollectorMainPage.vue +++ b/apps/web/src/services/asset-inventory-v1/pages/admin/AdminCollectorMainPage.vue @@ -13,8 +13,8 @@ import { PButton, PHeading, PDataLoader, PHeadingLayout, } from '@cloudforet/mirinae'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import { SpaceRouter } from '@/router'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; import type { CollectorListParameters } from '@/schema/inventory/collector/api-verbs/list'; import type { CollectorModel } from '@/schema/inventory/collector/model'; diff --git a/apps/web/src/services/asset-inventory-v1/stores/cloud-service-detail-page-store.ts b/apps/web/src/services/asset-inventory-v1/stores/cloud-service-detail-page-store.ts index 78c7ef2c6c..3c0c991229 100644 --- a/apps/web/src/services/asset-inventory-v1/stores/cloud-service-detail-page-store.ts +++ b/apps/web/src/services/asset-inventory-v1/stores/cloud-service-detail-page-store.ts @@ -4,7 +4,7 @@ import { defineStore } from 'pinia'; import type { ConsoleFilter } from '@cloudforet/core-lib/query/type'; import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { CloudServiceTypeListParameters } from '@/schema/inventory/cloud-service-type/api-verbs/list'; import type { CloudServiceTypeModel } from '@/schema/inventory/cloud-service-type/model'; diff --git a/apps/web/src/services/asset-inventory-v1/stores/collector-data-modal-store.ts b/apps/web/src/services/asset-inventory-v1/stores/collector-data-modal-store.ts index 8f29c0b3b2..8922ab11a0 100644 --- a/apps/web/src/services/asset-inventory-v1/stores/collector-data-modal-store.ts +++ b/apps/web/src/services/asset-inventory-v1/stores/collector-data-modal-store.ts @@ -3,7 +3,7 @@ import { defineStore } from 'pinia'; import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { CollectorModel, } from '@/schema/inventory/collector/model'; diff --git a/apps/web/src/services/asset-inventory-v1/stores/collector-form-store.ts b/apps/web/src/services/asset-inventory-v1/stores/collector-form-store.ts index f35ba3f47f..c0cfa58d27 100644 --- a/apps/web/src/services/asset-inventory-v1/stores/collector-form-store.ts +++ b/apps/web/src/services/asset-inventory-v1/stores/collector-form-store.ts @@ -5,7 +5,7 @@ import { defineStore } from 'pinia'; import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; import type { SelectDropdownMenuItem } from '@cloudforet/mirinae/types/controls/dropdown/select-dropdown/type'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { CollectorRuleListParameters } from '@/schema/inventory/collector-rule/api-verbs/list'; import type { CollectorRuleModel } from '@/schema/inventory/collector-rule/model'; import type { diff --git a/apps/web/src/services/asset-inventory-v1/stores/collector-job-store.ts b/apps/web/src/services/asset-inventory-v1/stores/collector-job-store.ts index cb9e29fb8c..9d79dac207 100644 --- a/apps/web/src/services/asset-inventory-v1/stores/collector-job-store.ts +++ b/apps/web/src/services/asset-inventory-v1/stores/collector-job-store.ts @@ -4,7 +4,7 @@ import { defineStore } from 'pinia'; import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; import { ApiQueryHelper } from '@cloudforet/core-lib/space-connector/helper'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { CollectorModel } from '@/schema/inventory/collector/model'; import type { Schedule } from '@/schema/inventory/collector/type'; import type { JobListParameters } from '@/schema/inventory/job/api-verbs/list'; diff --git a/apps/web/src/services/asset-inventory-v1/stores/collector-page-store.ts b/apps/web/src/services/asset-inventory-v1/stores/collector-page-store.ts index f5e7cd91b5..89b3cde3ef 100644 --- a/apps/web/src/services/asset-inventory-v1/stores/collector-page-store.ts +++ b/apps/web/src/services/asset-inventory-v1/stores/collector-page-store.ts @@ -6,7 +6,7 @@ import type { ConsoleFilter } from '@cloudforet/core-lib/query/type'; import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; import type { Query } from '@cloudforet/core-lib/space-connector/type'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { CollectorListParameters } from '@/schema/inventory/collector/api-verbs/list'; import type { CollectorUpdateParameters } from '@/schema/inventory/collector/api-verbs/update'; import type { CollectorModel } from '@/schema/inventory/collector/model'; diff --git a/apps/web/src/services/asset-inventory-v1/stores/metric-explorer-page-store.ts b/apps/web/src/services/asset-inventory-v1/stores/metric-explorer-page-store.ts index 06f5f80595..b4755f0630 100644 --- a/apps/web/src/services/asset-inventory-v1/stores/metric-explorer-page-store.ts +++ b/apps/web/src/services/asset-inventory-v1/stores/metric-explorer-page-store.ts @@ -7,7 +7,7 @@ import type { ConsoleFilter } from '@cloudforet/core-lib/query/type'; import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; import { getCancellableFetcher } from '@cloudforet/core-lib/space-connector/cancellable-fetcher'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { MetricExampleListParameters } from '@/schema/inventory/metric-example/api-verbs/list'; import type { MetricExampleModel } from '@/schema/inventory/metric-example/model'; import type { MetricGetParameters } from '@/schema/inventory/metric/api-verbs/get'; diff --git a/apps/web/src/services/asset-inventory-v1/stores/service-account-page-store.ts b/apps/web/src/services/asset-inventory-v1/stores/service-account-page-store.ts index 6f6074b0c9..8215168838 100644 --- a/apps/web/src/services/asset-inventory-v1/stores/service-account-page-store.ts +++ b/apps/web/src/services/asset-inventory-v1/stores/service-account-page-store.ts @@ -6,7 +6,7 @@ import { defineStore } from 'pinia'; import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; import type { JsonSchema } from '@cloudforet/mirinae/types/controls/forms/json-schema-form/type'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { CostReportConfigListParameters } from '@/schema/cost-analysis/cost-report-config/api-verbs/list'; import type { CostReportConfigModel } from '@/schema/cost-analysis/cost-report-config/model'; import type { IdentityJobListParameters } from '@/schema/identity/job/api-verbs/list'; diff --git a/apps/web/src/services/asset-inventory-v1/stores/service-account-schema-store.ts b/apps/web/src/services/asset-inventory-v1/stores/service-account-schema-store.ts index c611036bfe..bd6faa42a5 100644 --- a/apps/web/src/services/asset-inventory-v1/stores/service-account-schema-store.ts +++ b/apps/web/src/services/asset-inventory-v1/stores/service-account-schema-store.ts @@ -8,7 +8,7 @@ import { defineStore } from 'pinia'; import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; import type { DynamicField } from '@cloudforet/mirinae/types/data-display/dynamic/dynamic-field/type/field-schema'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { ProviderModel } from '@/schema/identity/provider/model'; import type { SchemaListParameters } from '@/schema/identity/schema/api-verbs/list'; import type { SchemaModel } from '@/schema/identity/schema/model'; diff --git a/apps/web/src/services/asset-inventory-v1/types/collector-main-page-type.ts b/apps/web/src/services/asset-inventory-v1/types/collector-main-page-type.ts index a29a416260..c3a9193fc8 100644 --- a/apps/web/src/services/asset-inventory-v1/types/collector-main-page-type.ts +++ b/apps/web/src/services/asset-inventory-v1/types/collector-main-page-type.ts @@ -2,7 +2,7 @@ import type { Dictionary, Location } from 'vue-router/types/router'; import type { ConsoleFilter } from '@cloudforet/core-lib/query/type'; -import type { ResourceGroupType } from '@/schema/_common/type'; +import type { ResourceGroupType } from '@/api-clients/_common/schema/type'; import type { CollectorPluginInfo, diff --git a/apps/web/src/services/asset-inventory/components/CloudServiceDetail.vue b/apps/web/src/services/asset-inventory/components/CloudServiceDetail.vue index 3ea6b646d9..92ffae3668 100644 --- a/apps/web/src/services/asset-inventory/components/CloudServiceDetail.vue +++ b/apps/web/src/services/asset-inventory/components/CloudServiceDetail.vue @@ -21,9 +21,9 @@ import type { DynamicLayout, DynamicLayoutType } from '@cloudforet/mirinae/types import type { TabItem } from '@cloudforet/mirinae/types/navigation/tabs/tab/type'; -import { QueryType } from '@/schema/_common/api-verbs/export'; -import type { ExportParameter } from '@/schema/_common/api-verbs/export'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import { QueryType } from '@/api-clients/_common/schema/api-verbs/export'; +import type { ExportParameter } from '@/api-clients/_common/schema/api-verbs/export'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { CloudServiceGetParameters } from '@/schema/inventory/cloud-service/api-verbs/get'; import type { CloudServiceListParameters } from '@/schema/inventory/cloud-service/api-verbs/list'; import type { CloudServiceModel } from '@/schema/inventory/cloud-service/model'; diff --git a/apps/web/src/services/asset-inventory/components/CloudServiceDetailExcelExportOptionModal.vue b/apps/web/src/services/asset-inventory/components/CloudServiceDetailExcelExportOptionModal.vue index 4be6357afb..95ac4e38d2 100644 --- a/apps/web/src/services/asset-inventory/components/CloudServiceDetailExcelExportOptionModal.vue +++ b/apps/web/src/services/asset-inventory/components/CloudServiceDetailExcelExportOptionModal.vue @@ -16,8 +16,8 @@ import { import type { DynamicField } from '@cloudforet/mirinae/src/data-display/dynamic/dynamic-field/type/field-schema'; import type { DynamicLayout } from '@cloudforet/mirinae/types/data-display/dynamic/dynamic-layout/type/layout-schema'; -import { QueryType } from '@/schema/_common/api-verbs/export'; -import type { ExportOption, ExportParameter } from '@/schema/_common/api-verbs/export'; +import { QueryType } from '@/api-clients/_common/schema/api-verbs/export'; +import type { ExportOption, ExportParameter } from '@/api-clients/_common/schema/api-verbs/export'; import { i18n } from '@/translations'; import { useAppContextStore } from '@/store/app-context/app-context-store'; diff --git a/apps/web/src/services/asset-inventory/components/CloudServiceDetailMultipleSelectedData.vue b/apps/web/src/services/asset-inventory/components/CloudServiceDetailMultipleSelectedData.vue index 8421a37138..0818711f5d 100644 --- a/apps/web/src/services/asset-inventory/components/CloudServiceDetailMultipleSelectedData.vue +++ b/apps/web/src/services/asset-inventory/components/CloudServiceDetailMultipleSelectedData.vue @@ -20,9 +20,9 @@ import type { DynamicLayout } from '@cloudforet/mirinae/types/data-display/dynam import type { TabItem } from '@cloudforet/mirinae/types/navigation/tabs/tab/type'; -import { QueryType } from '@/schema/_common/api-verbs/export'; -import type { ExportParameter } from '@/schema/_common/api-verbs/export'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import { QueryType } from '@/api-clients/_common/schema/api-verbs/export'; +import type { ExportParameter } from '@/api-clients/_common/schema/api-verbs/export'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { CloudServiceGetParameters } from '@/schema/inventory/cloud-service/api-verbs/get'; import type { CloudServiceListParameters } from '@/schema/inventory/cloud-service/api-verbs/list'; import type { CloudServiceModel } from '@/schema/inventory/cloud-service/model'; diff --git a/apps/web/src/services/asset-inventory/components/CloudServiceExcelExportOptionModal.vue b/apps/web/src/services/asset-inventory/components/CloudServiceExcelExportOptionModal.vue index 20bd58c0c8..7bea462dd2 100644 --- a/apps/web/src/services/asset-inventory/components/CloudServiceExcelExportOptionModal.vue +++ b/apps/web/src/services/asset-inventory/components/CloudServiceExcelExportOptionModal.vue @@ -12,8 +12,8 @@ import { import type { DynamicLayout } from '@cloudforet/mirinae/types/data-display/dynamic/dynamic-layout/type/layout-schema'; -import { QueryType } from '@/schema/_common/api-verbs/export'; -import type { ExportOption, ExportParameter } from '@/schema/_common/api-verbs/export'; +import { QueryType } from '@/api-clients/_common/schema/api-verbs/export'; +import type { ExportOption, ExportParameter } from '@/api-clients/_common/schema/api-verbs/export'; import type { CloudServiceAnalyzeParameters } from '@/schema/inventory/cloud-service/api-verbs/analyze'; import { i18n } from '@/translations'; diff --git a/apps/web/src/services/asset-inventory/components/CloudServiceHistory.vue b/apps/web/src/services/asset-inventory/components/CloudServiceHistory.vue index 9a5c21953f..a9104d384c 100644 --- a/apps/web/src/services/asset-inventory/components/CloudServiceHistory.vue +++ b/apps/web/src/services/asset-inventory/components/CloudServiceHistory.vue @@ -113,8 +113,8 @@ import { import type { KeyItem, ValueHandler } from '@cloudforet/mirinae/types/controls/search/query-search/type'; import type { ToolboxOptions } from '@cloudforet/mirinae/types/controls/toolbox/type'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import { SpaceRouter } from '@/router'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; import type { ChangeHistoryListParameters } from '@/schema/inventory/change-history/api-verbs/list'; import type { ChangeHistoryModel } from '@/schema/inventory/change-history/model'; import type { NoteListParameters } from '@/schema/inventory/note/api-verbs/list'; diff --git a/apps/web/src/services/asset-inventory/components/CloudServiceHistoryDetailNoteTab.vue b/apps/web/src/services/asset-inventory/components/CloudServiceHistoryDetailNoteTab.vue index 6233732d55..e5b709b0ad 100644 --- a/apps/web/src/services/asset-inventory/components/CloudServiceHistoryDetailNoteTab.vue +++ b/apps/web/src/services/asset-inventory/components/CloudServiceHistoryDetailNoteTab.vue @@ -10,7 +10,7 @@ import { } from '@cloudforet/mirinae'; import { iso8601Formatter } from '@cloudforet/utils'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { NoteCreateParameters } from '@/schema/inventory/note/api-verbs/create'; import type { NoteDeleteParameters } from '@/schema/inventory/note/api-verbs/delete'; import type { NoteListParameters } from '@/schema/inventory/note/api-verbs/list'; diff --git a/apps/web/src/services/asset-inventory/components/CloudServiceLogTab.vue b/apps/web/src/services/asset-inventory/components/CloudServiceLogTab.vue index a082b145e7..67ae196d4c 100644 --- a/apps/web/src/services/asset-inventory/components/CloudServiceLogTab.vue +++ b/apps/web/src/services/asset-inventory/components/CloudServiceLogTab.vue @@ -88,7 +88,7 @@ import type { DynamicLayoutEventListener } from '@cloudforet/mirinae/types/data- import type { DynamicLayout } from '@cloudforet/mirinae/types/data-display/dynamic/dynamic-layout/type/layout-schema'; import type { TabItem } from '@cloudforet/mirinae/types/navigation/tabs/tab/type'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { DataSourceListParameters } from '@/schema/monitoring/data-source/api-verbs/list'; import type { DataSourceModel } from '@/schema/monitoring/data-source/model'; import type { MonitoringLogListParameters } from '@/schema/monitoring/log/api-verbs/list'; diff --git a/apps/web/src/services/asset-inventory/components/CollectorAdditionalRuleForm.vue b/apps/web/src/services/asset-inventory/components/CollectorAdditionalRuleForm.vue index 3318fb192e..f8b50cc20d 100644 --- a/apps/web/src/services/asset-inventory/components/CollectorAdditionalRuleForm.vue +++ b/apps/web/src/services/asset-inventory/components/CollectorAdditionalRuleForm.vue @@ -12,7 +12,7 @@ import { } from '@cloudforet/mirinae'; import type { SelectDropdownMenuItem } from '@cloudforet/mirinae/types/controls/dropdown/select-dropdown/type'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { CloudServiceTypeStatParameters } from '@/schema/inventory/cloud-service-type/api-verbs/stat'; import { COLLECTOR_RULE_CONDITION_KEY, COLLECTOR_RULE_CONDITION_KEY_LABEL, diff --git a/apps/web/src/services/asset-inventory/components/CollectorCreateStep1.vue b/apps/web/src/services/asset-inventory/components/CollectorCreateStep1.vue index 4a18473195..027883c4db 100644 --- a/apps/web/src/services/asset-inventory/components/CollectorCreateStep1.vue +++ b/apps/web/src/services/asset-inventory/components/CollectorCreateStep1.vue @@ -80,7 +80,7 @@ import { } from '@cloudforet/mirinae'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { PluginListParameters } from '@/schema/repository/plugin/api-verbs/list'; import type { PluginModel } from '@/schema/repository/plugin/model'; diff --git a/apps/web/src/services/asset-inventory/components/CollectorCreateStep1SearchFilter.vue b/apps/web/src/services/asset-inventory/components/CollectorCreateStep1SearchFilter.vue index 447d66ca7d..3dea7cc2a1 100644 --- a/apps/web/src/services/asset-inventory/components/CollectorCreateStep1SearchFilter.vue +++ b/apps/web/src/services/asset-inventory/components/CollectorCreateStep1SearchFilter.vue @@ -122,7 +122,7 @@ import { import type { MenuItem } from '@cloudforet/mirinae/types/controls/context-menu/type'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { RepositoryListParameters } from '@/schema/repository/repository/api-verbs/list'; import type { RepositoryModel } from '@/schema/repository/repository/model'; diff --git a/apps/web/src/services/asset-inventory/components/CollectorCreateStep4.vue b/apps/web/src/services/asset-inventory/components/CollectorCreateStep4.vue index 8d65c8ff8f..2526eb44f5 100644 --- a/apps/web/src/services/asset-inventory/components/CollectorCreateStep4.vue +++ b/apps/web/src/services/asset-inventory/components/CollectorCreateStep4.vue @@ -59,8 +59,8 @@ import { } from '@cloudforet/mirinae'; +import { RESOURCE_GROUP } from '@/api-clients/_common/schema/constant'; import { SpaceRouter } from '@/router'; -import { RESOURCE_GROUP } from '@/schema/_common/constant'; import type { CollectorCollectParameters } from '@/schema/inventory/collector/api-verbs/collect'; import type { CollectorCreateParameters } from '@/schema/inventory/collector/api-verbs/create'; import type { CollectorModel } from '@/schema/inventory/collector/model'; diff --git a/apps/web/src/services/asset-inventory/components/CollectorDataModal.vue b/apps/web/src/services/asset-inventory/components/CollectorDataModal.vue index cc6c92de8d..1826da26d3 100644 --- a/apps/web/src/services/asset-inventory/components/CollectorDataModal.vue +++ b/apps/web/src/services/asset-inventory/components/CollectorDataModal.vue @@ -40,7 +40,7 @@ import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; import { ApiQueryHelper } from '@cloudforet/core-lib/space-connector/helper'; import { PButtonModal } from '@cloudforet/mirinae'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { CollectorCollectParameters } from '@/schema/inventory/collector/api-verbs/collect'; import type { JobModel } from '@/schema/inventory/job/model'; import type { SecretListParameters } from '@/schema/secret/secret/api-verbs/list'; diff --git a/apps/web/src/services/asset-inventory/components/CollectorDetailAttachedServiceAccounts.vue b/apps/web/src/services/asset-inventory/components/CollectorDetailAttachedServiceAccounts.vue index 653bafc413..b19b261a73 100644 --- a/apps/web/src/services/asset-inventory/components/CollectorDetailAttachedServiceAccounts.vue +++ b/apps/web/src/services/asset-inventory/components/CollectorDetailAttachedServiceAccounts.vue @@ -14,7 +14,7 @@ import type { DefinitionField } from '@cloudforet/mirinae/types/data-display/tab import type { ToolboxTableOptions } from '@cloudforet/mirinae/types/data-display/tables/toolbox-table/type'; import { iso8601Formatter } from '@cloudforet/utils'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { SecretListParameters } from '@/schema/secret/secret/api-verbs/list'; import type { SecretModel } from '@/schema/secret/secret/model'; import { i18n } from '@/translations'; diff --git a/apps/web/src/services/asset-inventory/components/CollectorDetailTags.vue b/apps/web/src/services/asset-inventory/components/CollectorDetailTags.vue index 2325242570..8f7a80ebae 100644 --- a/apps/web/src/services/asset-inventory/components/CollectorDetailTags.vue +++ b/apps/web/src/services/asset-inventory/components/CollectorDetailTags.vue @@ -4,7 +4,7 @@ import { computed } from 'vue'; import { PTag, PFieldTitle, PEmpty } from '@cloudforet/mirinae'; import { isNotEmpty } from '@cloudforet/utils'; -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; const props = withDefaults(defineProps<{ tags: Tags; diff --git a/apps/web/src/services/asset-inventory/components/CollectorHistoryJobTaskTable.vue b/apps/web/src/services/asset-inventory/components/CollectorHistoryJobTaskTable.vue index adf73e64f0..241ede2dc4 100644 --- a/apps/web/src/services/asset-inventory/components/CollectorHistoryJobTaskTable.vue +++ b/apps/web/src/services/asset-inventory/components/CollectorHistoryJobTaskTable.vue @@ -14,7 +14,7 @@ import { ACTION_ICON } from '@cloudforet/mirinae/src/navigation/link/type'; import type { KeyItemSet } from '@cloudforet/mirinae/types/controls/search/query-search/type'; import { durationFormatter, iso8601Formatter } from '@cloudforet/utils'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { JobTaskListParameters } from '@/schema/inventory/job-task/api-verbs/list'; import type { JobTaskModel } from '@/schema/inventory/job-task/model'; import { i18n } from '@/translations'; diff --git a/apps/web/src/services/asset-inventory/components/MetricExplorerChart.vue b/apps/web/src/services/asset-inventory/components/MetricExplorerChart.vue index e127be5213..842510cbdd 100644 --- a/apps/web/src/services/asset-inventory/components/MetricExplorerChart.vue +++ b/apps/web/src/services/asset-inventory/components/MetricExplorerChart.vue @@ -13,7 +13,7 @@ import { PEmpty, PSelectButton, PSkeleton, PSelectDropdown, PButton, } from '@cloudforet/mirinae'; -import type { AnalyzeResponse } from '@/schema/_common/api-verbs/analyze'; +import type { AnalyzeResponse } from '@/api-clients/_common/schema/api-verbs/analyze'; import type { MetricDataAnalyzeParameters } from '@/schema/inventory/metric-data/api-verbs/analyze'; import MetricExplorerDonutChart from '@/services/asset-inventory/components/MetricExplorerDonutChart.vue'; diff --git a/apps/web/src/services/asset-inventory/components/MetricExplorerDataTable.vue b/apps/web/src/services/asset-inventory/components/MetricExplorerDataTable.vue index cf84e262e8..ff44b3b686 100644 --- a/apps/web/src/services/asset-inventory/components/MetricExplorerDataTable.vue +++ b/apps/web/src/services/asset-inventory/components/MetricExplorerDataTable.vue @@ -18,7 +18,7 @@ import { PTextPagination, PToolboxTable } from '@cloudforet/mirinae'; import type { DataTableFieldType } from '@cloudforet/mirinae/types/data-display/tables/data-table/type'; import { byteFormatter, numberFormatter } from '@cloudforet/utils'; -import type { AnalyzeResponse } from '@/schema/_common/api-verbs/analyze'; +import type { AnalyzeResponse } from '@/api-clients/_common/schema/api-verbs/analyze'; import type { MetricDataAnalyzeParameters } from '@/schema/inventory/metric-data/api-verbs/analyze'; import type { MetricLabelKey } from '@/schema/inventory/metric/type'; diff --git a/apps/web/src/services/asset-inventory/components/MetricExplorerDonutChart.vue b/apps/web/src/services/asset-inventory/components/MetricExplorerDonutChart.vue index 982872df01..eae084082c 100644 --- a/apps/web/src/services/asset-inventory/components/MetricExplorerDonutChart.vue +++ b/apps/web/src/services/asset-inventory/components/MetricExplorerDonutChart.vue @@ -11,7 +11,7 @@ import { isEmpty, orderBy, throttle } from 'lodash'; import { numberFormatter } from '@cloudforet/utils'; -import type { AnalyzeResponse } from '@/schema/_common/api-verbs/analyze'; +import type { AnalyzeResponse } from '@/api-clients/_common/schema/api-verbs/analyze'; import { useProxyValue } from '@/common/composables/proxy-state'; import { getReferenceLabel } from '@/common/modules/widgets/_helpers/widget-date-helper'; diff --git a/apps/web/src/services/asset-inventory/components/MetricExplorerHeader.vue b/apps/web/src/services/asset-inventory/components/MetricExplorerHeader.vue index 13e40c7725..f3204b2bee 100644 --- a/apps/web/src/services/asset-inventory/components/MetricExplorerHeader.vue +++ b/apps/web/src/services/asset-inventory/components/MetricExplorerHeader.vue @@ -10,7 +10,7 @@ import { } from '@cloudforet/mirinae'; import type { MenuItem } from '@cloudforet/mirinae/types/controls/context-menu/type'; -import { RESOURCE_GROUP } from '@/schema/_common/constant'; +import { RESOURCE_GROUP } from '@/api-clients/_common/schema/constant'; import type { MetricExampleDeleteParameters } from '@/schema/inventory/metric-example/api-verbs/delete'; import type { MetricExampleUpdateParameters } from '@/schema/inventory/metric-example/api-verbs/update'; import type { MetricExampleModel } from '@/schema/inventory/metric-example/model'; diff --git a/apps/web/src/services/asset-inventory/components/MetricExplorerHorizontalColumnChart.vue b/apps/web/src/services/asset-inventory/components/MetricExplorerHorizontalColumnChart.vue index 375ec05b77..6f166b898f 100644 --- a/apps/web/src/services/asset-inventory/components/MetricExplorerHorizontalColumnChart.vue +++ b/apps/web/src/services/asset-inventory/components/MetricExplorerHorizontalColumnChart.vue @@ -13,7 +13,7 @@ import { import { numberFormatter } from '@cloudforet/utils'; -import type { AnalyzeResponse } from '@/schema/_common/api-verbs/analyze'; +import type { AnalyzeResponse } from '@/api-clients/_common/schema/api-verbs/analyze'; import { useProxyValue } from '@/common/composables/proxy-state'; import { diff --git a/apps/web/src/services/asset-inventory/components/MetricExplorerLineChart.vue b/apps/web/src/services/asset-inventory/components/MetricExplorerLineChart.vue index f38c488de2..689f5e8a34 100644 --- a/apps/web/src/services/asset-inventory/components/MetricExplorerLineChart.vue +++ b/apps/web/src/services/asset-inventory/components/MetricExplorerLineChart.vue @@ -14,7 +14,7 @@ import { import { numberFormatter } from '@cloudforet/utils'; -import type { AnalyzeResponse } from '@/schema/_common/api-verbs/analyze'; +import type { AnalyzeResponse } from '@/api-clients/_common/schema/api-verbs/analyze'; import { useProxyValue } from '@/common/composables/proxy-state'; import { diff --git a/apps/web/src/services/asset-inventory/components/MetricExplorerMapChart.vue b/apps/web/src/services/asset-inventory/components/MetricExplorerMapChart.vue index c9fbf1c18a..7b4369d797 100644 --- a/apps/web/src/services/asset-inventory/components/MetricExplorerMapChart.vue +++ b/apps/web/src/services/asset-inventory/components/MetricExplorerMapChart.vue @@ -13,7 +13,7 @@ import { import { numberFormatter } from '@cloudforet/utils'; -import type { AnalyzeResponse } from '@/schema/_common/api-verbs/analyze'; +import type { AnalyzeResponse } from '@/api-clients/_common/schema/api-verbs/analyze'; import { getReferenceLabel } from '@/common/modules/widgets/_helpers/widget-date-helper'; diff --git a/apps/web/src/services/asset-inventory/components/MetricExplorerQueryFormSidebar.vue b/apps/web/src/services/asset-inventory/components/MetricExplorerQueryFormSidebar.vue index 1a72c81bf7..e3a09c900e 100644 --- a/apps/web/src/services/asset-inventory/components/MetricExplorerQueryFormSidebar.vue +++ b/apps/web/src/services/asset-inventory/components/MetricExplorerQueryFormSidebar.vue @@ -9,7 +9,7 @@ import { } from '@cloudforet/mirinae'; -import { RESOURCE_GROUP } from '@/schema/_common/constant'; +import { RESOURCE_GROUP } from '@/api-clients/_common/schema/constant'; import type { MetricCreateParameters } from '@/schema/inventory/metric/api-verbs/create'; import type { MetricUpdateParameters } from '@/schema/inventory/metric/api-verbs/update'; import { METRIC_TYPE } from '@/schema/inventory/metric/constant'; diff --git a/apps/web/src/services/asset-inventory/components/ServiceAccountAttachedGeneralAccounts.vue b/apps/web/src/services/asset-inventory/components/ServiceAccountAttachedGeneralAccounts.vue index 03a00e2b09..27b88023b5 100644 --- a/apps/web/src/services/asset-inventory/components/ServiceAccountAttachedGeneralAccounts.vue +++ b/apps/web/src/services/asset-inventory/components/ServiceAccountAttachedGeneralAccounts.vue @@ -29,7 +29,7 @@ import type { ToolboxOptions } from '@cloudforet/mirinae/types/controls/toolbox/ import type { DataTableFieldType } from '@cloudforet/mirinae/types/data-display/tables/data-table/type'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { ServiceAccountListParameters } from '@/schema/identity/service-account/api-verbs/list'; import { SERVICE_ACCOUNT_STATE } from '@/schema/identity/service-account/constant'; import type { ServiceAccountModel } from '@/schema/identity/service-account/model'; diff --git a/apps/web/src/services/asset-inventory/components/ServiceAccountBaseInformationForm.vue b/apps/web/src/services/asset-inventory/components/ServiceAccountBaseInformationForm.vue index 5ac5fa9e1c..7971ccc79d 100644 --- a/apps/web/src/services/asset-inventory/components/ServiceAccountBaseInformationForm.vue +++ b/apps/web/src/services/asset-inventory/components/ServiceAccountBaseInformationForm.vue @@ -9,7 +9,7 @@ import { } from '@cloudforet/mirinae'; import type { JsonSchema } from '@cloudforet/mirinae/types/controls/forms/json-schema-form/type'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { ServiceAccountListParameters } from '@/schema/identity/service-account/api-verbs/list'; import type { ServiceAccountModel } from '@/schema/identity/service-account/model'; import type { TrustedAccountModel } from '@/schema/identity/trusted-account/model'; diff --git a/apps/web/src/services/asset-inventory/components/ServiceAccountCredentialsForm.vue b/apps/web/src/services/asset-inventory/components/ServiceAccountCredentialsForm.vue index f2379d59b6..63385848e7 100644 --- a/apps/web/src/services/asset-inventory/components/ServiceAccountCredentialsForm.vue +++ b/apps/web/src/services/asset-inventory/components/ServiceAccountCredentialsForm.vue @@ -17,7 +17,7 @@ import type { JsonSchema } from '@cloudforet/mirinae/types/controls/forms/json-s import type { TabItem } from '@cloudforet/mirinae/types/navigation/tabs/tab/type'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { SchemaListParameters } from '@/schema/identity/schema/api-verbs/list'; import type { SchemaModel } from '@/schema/identity/schema/model'; import { ACCOUNT_TYPE } from '@/schema/identity/service-account/constant'; diff --git a/apps/web/src/services/asset-inventory/components/ServiceAccountEditModal.vue b/apps/web/src/services/asset-inventory/components/ServiceAccountEditModal.vue index 6234508974..b59a18f5a6 100644 --- a/apps/web/src/services/asset-inventory/components/ServiceAccountEditModal.vue +++ b/apps/web/src/services/asset-inventory/components/ServiceAccountEditModal.vue @@ -7,7 +7,7 @@ import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; import { PButtonModal, PFieldGroup, PTextInput } from '@cloudforet/mirinae'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { ServiceAccountListParameters } from '@/schema/identity/service-account/api-verbs/list'; import type { ServiceAccountUpdateParameters } from '@/schema/identity/service-account/api-verbs/update'; import type { ServiceAccountModel } from '@/schema/identity/service-account/model'; diff --git a/apps/web/src/services/asset-inventory/components/WorkspaceDropdown.vue b/apps/web/src/services/asset-inventory/components/WorkspaceDropdown.vue index 571e0c4bb1..49248584bc 100644 --- a/apps/web/src/services/asset-inventory/components/WorkspaceDropdown.vue +++ b/apps/web/src/services/asset-inventory/components/WorkspaceDropdown.vue @@ -9,7 +9,7 @@ import { PButton, PSelectDropdown, PStatus } from '@cloudforet/mirinae'; import type { SelectDropdownMenuItem } from '@cloudforet/mirinae/src/controls/dropdown/select-dropdown/type'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { WorkspaceListParameters } from '@/schema/identity/workspace/api-verbs/list'; import type { WorkspaceModel } from '@/schema/identity/workspace/model'; diff --git a/apps/web/src/services/asset-inventory/helpers/asset-analysis-chart-data-helper.ts b/apps/web/src/services/asset-inventory/helpers/asset-analysis-chart-data-helper.ts index 0288a4a159..428b73f076 100644 --- a/apps/web/src/services/asset-inventory/helpers/asset-analysis-chart-data-helper.ts +++ b/apps/web/src/services/asset-inventory/helpers/asset-analysis-chart-data-helper.ts @@ -1,6 +1,6 @@ import dayjs from 'dayjs'; -import type { AnalyzeResponse } from '@/schema/_common/api-verbs/analyze'; +import type { AnalyzeResponse } from '@/api-clients/_common/schema/api-verbs/analyze'; import type { ReferenceMap } from '@/store/reference/type'; diff --git a/apps/web/src/services/asset-inventory/helpers/dynamic-ui-schema-generator/index.ts b/apps/web/src/services/asset-inventory/helpers/dynamic-ui-schema-generator/index.ts index 306a83047f..f22094aac7 100644 --- a/apps/web/src/services/asset-inventory/helpers/dynamic-ui-schema-generator/index.ts +++ b/apps/web/src/services/asset-inventory/helpers/dynamic-ui-schema-generator/index.ts @@ -3,7 +3,7 @@ import type { JsonSchema } from '@cloudforet/mirinae/types/controls/forms/json-s import type { DynamicField } from '@cloudforet/mirinae/types/data-display/dynamic/dynamic-field/type/field-schema'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { UserConfigCreateParameters } from '@/schema/config/user-config/api-verbs/create'; import type { UserConfigGetParameters } from '@/schema/config/user-config/api-verbs/get'; import type { UserConfigUpdateParameters } from '@/schema/config/user-config/api-verbs/update'; diff --git a/apps/web/src/services/asset-inventory/pages/CloudServiceDetailPage.vue b/apps/web/src/services/asset-inventory/pages/CloudServiceDetailPage.vue index dbcba434e7..1547310682 100644 --- a/apps/web/src/services/asset-inventory/pages/CloudServiceDetailPage.vue +++ b/apps/web/src/services/asset-inventory/pages/CloudServiceDetailPage.vue @@ -24,9 +24,9 @@ import type { DynamicLayoutOptions, } from '@cloudforet/mirinae/types/data-display/dynamic/dynamic-layout/type/layout-schema'; -import { QueryType } from '@/schema/_common/api-verbs/export'; -import type { ExportParameter } from '@/schema/_common/api-verbs/export'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import { QueryType } from '@/api-clients/_common/schema/api-verbs/export'; +import type { ExportParameter } from '@/api-clients/_common/schema/api-verbs/export'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { CloudServiceGetParameters } from '@/schema/inventory/cloud-service/api-verbs/get'; import type { CloudServiceListParameters } from '@/schema/inventory/cloud-service/api-verbs/list'; import type { CloudServiceModel } from '@/schema/inventory/cloud-service/model'; diff --git a/apps/web/src/services/asset-inventory/pages/CollectorHistoryPage.vue b/apps/web/src/services/asset-inventory/pages/CollectorHistoryPage.vue index 9c8cb8b92d..b67bb3042c 100644 --- a/apps/web/src/services/asset-inventory/pages/CollectorHistoryPage.vue +++ b/apps/web/src/services/asset-inventory/pages/CollectorHistoryPage.vue @@ -20,8 +20,8 @@ import type { ToolboxOptions } from '@cloudforet/mirinae/types/controls/toolbox/ import type { DataTableField } from '@cloudforet/mirinae/types/data-display/tables/data-table/type'; import { durationFormatter, iso8601Formatter } from '@cloudforet/utils'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import { SpaceRouter } from '@/router'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; import type { JobListParameters } from '@/schema/inventory/job/api-verbs/list'; import type { JobModel } from '@/schema/inventory/job/model'; import { i18n } from '@/translations'; diff --git a/apps/web/src/services/asset-inventory/pages/CollectorMainPage.vue b/apps/web/src/services/asset-inventory/pages/CollectorMainPage.vue index be2c7c8d4f..e27fdfd78a 100644 --- a/apps/web/src/services/asset-inventory/pages/CollectorMainPage.vue +++ b/apps/web/src/services/asset-inventory/pages/CollectorMainPage.vue @@ -13,8 +13,8 @@ import { PButton, PHeading, PDataLoader, PHeadingLayout, } from '@cloudforet/mirinae'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import { SpaceRouter } from '@/router'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; import type { CollectorListParameters } from '@/schema/inventory/collector/api-verbs/list'; import type { CollectorModel } from '@/schema/inventory/collector/model'; diff --git a/apps/web/src/services/asset-inventory/pages/ServiceAccountPage.vue b/apps/web/src/services/asset-inventory/pages/ServiceAccountPage.vue index b5cec03e0e..238a464649 100644 --- a/apps/web/src/services/asset-inventory/pages/ServiceAccountPage.vue +++ b/apps/web/src/services/asset-inventory/pages/ServiceAccountPage.vue @@ -21,7 +21,7 @@ import type { import type { DynamicLayoutOptions, SearchSchema } from '@cloudforet/mirinae/types/data-display/dynamic/dynamic-layout/type/layout-schema'; import { numberFormatter } from '@cloudforet/utils'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import { ROLE_TYPE } from '@/schema/identity/role/constant'; import type { ServiceAccountListParameters } from '@/schema/identity/service-account/api-verbs/list'; import { ACCOUNT_TYPE, SERVICE_ACCOUNT_STATE } from '@/schema/identity/service-account/constant'; diff --git a/apps/web/src/services/asset-inventory/pages/admin/AdminCollectorHistoryPage.vue b/apps/web/src/services/asset-inventory/pages/admin/AdminCollectorHistoryPage.vue index 2f4f4a54f1..b867c2fe3b 100644 --- a/apps/web/src/services/asset-inventory/pages/admin/AdminCollectorHistoryPage.vue +++ b/apps/web/src/services/asset-inventory/pages/admin/AdminCollectorHistoryPage.vue @@ -21,8 +21,8 @@ import type { ToolboxOptions } from '@cloudforet/mirinae/types/controls/toolbox/ import type { DataTableField } from '@cloudforet/mirinae/types/data-display/tables/data-table/type'; import { durationFormatter, iso8601Formatter } from '@cloudforet/utils'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import { SpaceRouter } from '@/router'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; import type { JobListParameters } from '@/schema/inventory/job/api-verbs/list'; import type { JobModel } from '@/schema/inventory/job/model'; import { i18n } from '@/translations'; diff --git a/apps/web/src/services/asset-inventory/pages/admin/AdminCollectorMainPage.vue b/apps/web/src/services/asset-inventory/pages/admin/AdminCollectorMainPage.vue index e149fd8ccf..15395f49bf 100644 --- a/apps/web/src/services/asset-inventory/pages/admin/AdminCollectorMainPage.vue +++ b/apps/web/src/services/asset-inventory/pages/admin/AdminCollectorMainPage.vue @@ -13,8 +13,8 @@ import { PButton, PHeading, PDataLoader, PHeadingLayout, } from '@cloudforet/mirinae'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import { SpaceRouter } from '@/router'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; import type { CollectorListParameters } from '@/schema/inventory/collector/api-verbs/list'; import type { CollectorModel } from '@/schema/inventory/collector/model'; diff --git a/apps/web/src/services/asset-inventory/stores/cloud-service-detail-page-store.ts b/apps/web/src/services/asset-inventory/stores/cloud-service-detail-page-store.ts index c9c0b5c9d0..f095bb0f76 100644 --- a/apps/web/src/services/asset-inventory/stores/cloud-service-detail-page-store.ts +++ b/apps/web/src/services/asset-inventory/stores/cloud-service-detail-page-store.ts @@ -4,7 +4,7 @@ import { defineStore } from 'pinia'; import type { ConsoleFilter } from '@cloudforet/core-lib/query/type'; import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { CloudServiceTypeListParameters } from '@/schema/inventory/cloud-service-type/api-verbs/list'; import type { CloudServiceTypeModel } from '@/schema/inventory/cloud-service-type/model'; diff --git a/apps/web/src/services/asset-inventory/stores/collector-data-modal-store.ts b/apps/web/src/services/asset-inventory/stores/collector-data-modal-store.ts index b4d0137e86..632d7e394c 100644 --- a/apps/web/src/services/asset-inventory/stores/collector-data-modal-store.ts +++ b/apps/web/src/services/asset-inventory/stores/collector-data-modal-store.ts @@ -3,7 +3,7 @@ import { defineStore } from 'pinia'; import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { CollectorModel, } from '@/schema/inventory/collector/model'; diff --git a/apps/web/src/services/asset-inventory/stores/collector-form-store.ts b/apps/web/src/services/asset-inventory/stores/collector-form-store.ts index 7eeceaffd4..acfd5dfbca 100644 --- a/apps/web/src/services/asset-inventory/stores/collector-form-store.ts +++ b/apps/web/src/services/asset-inventory/stores/collector-form-store.ts @@ -5,7 +5,7 @@ import { defineStore } from 'pinia'; import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; import type { SelectDropdownMenuItem } from '@cloudforet/mirinae/types/controls/dropdown/select-dropdown/type'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { CollectorRuleListParameters } from '@/schema/inventory/collector-rule/api-verbs/list'; import type { CollectorRuleModel } from '@/schema/inventory/collector-rule/model'; import type { diff --git a/apps/web/src/services/asset-inventory/stores/collector-job-store.ts b/apps/web/src/services/asset-inventory/stores/collector-job-store.ts index 4aa052a67b..c386514608 100644 --- a/apps/web/src/services/asset-inventory/stores/collector-job-store.ts +++ b/apps/web/src/services/asset-inventory/stores/collector-job-store.ts @@ -4,7 +4,7 @@ import { defineStore } from 'pinia'; import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; import { ApiQueryHelper } from '@cloudforet/core-lib/space-connector/helper'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { CollectorModel } from '@/schema/inventory/collector/model'; import type { Schedule } from '@/schema/inventory/collector/type'; import type { JobListParameters } from '@/schema/inventory/job/api-verbs/list'; diff --git a/apps/web/src/services/asset-inventory/stores/collector-page-store.ts b/apps/web/src/services/asset-inventory/stores/collector-page-store.ts index 23634de7e9..21d56f6966 100644 --- a/apps/web/src/services/asset-inventory/stores/collector-page-store.ts +++ b/apps/web/src/services/asset-inventory/stores/collector-page-store.ts @@ -6,7 +6,7 @@ import type { ConsoleFilter } from '@cloudforet/core-lib/query/type'; import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; import type { Query } from '@cloudforet/core-lib/space-connector/type'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { CollectorListParameters } from '@/schema/inventory/collector/api-verbs/list'; import type { CollectorUpdateParameters } from '@/schema/inventory/collector/api-verbs/update'; import type { CollectorModel } from '@/schema/inventory/collector/model'; diff --git a/apps/web/src/services/asset-inventory/stores/metric-explorer-l-s-b-store.ts b/apps/web/src/services/asset-inventory/stores/metric-explorer-l-s-b-store.ts index b8706cfbb1..962a74d282 100644 --- a/apps/web/src/services/asset-inventory/stores/metric-explorer-l-s-b-store.ts +++ b/apps/web/src/services/asset-inventory/stores/metric-explorer-l-s-b-store.ts @@ -5,8 +5,8 @@ import { defineStore } from 'pinia'; import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; import { getCancellableFetcher } from '@cloudforet/core-lib/space-connector/cancellable-fetcher'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; -import { RESOURCE_GROUP } from '@/schema/_common/constant'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; +import { RESOURCE_GROUP } from '@/api-clients/_common/schema/constant'; import type { NamespaceGroupListParameters } from '@/schema/inventory-v2/namespace-group/api-verbs/list'; import type { NamespaceGroupModel } from '@/schema/inventory-v2/namespace-group/model'; import type { NamespaceGetParameters } from '@/schema/inventory-v2/namespace/api-verbs/get'; diff --git a/apps/web/src/services/asset-inventory/stores/metric-explorer-page-store.ts b/apps/web/src/services/asset-inventory/stores/metric-explorer-page-store.ts index f15fc8672b..0f5db1cbd9 100644 --- a/apps/web/src/services/asset-inventory/stores/metric-explorer-page-store.ts +++ b/apps/web/src/services/asset-inventory/stores/metric-explorer-page-store.ts @@ -7,7 +7,7 @@ import type { ConsoleFilter } from '@cloudforet/core-lib/query/type'; import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; import { getCancellableFetcher } from '@cloudforet/core-lib/space-connector/cancellable-fetcher'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { MetricExampleListParameters } from '@/schema/inventory/metric-example/api-verbs/list'; import type { MetricExampleModel } from '@/schema/inventory/metric-example/model'; import type { MetricGetParameters } from '@/schema/inventory/metric/api-verbs/get'; diff --git a/apps/web/src/services/asset-inventory/stores/service-account-page-store.ts b/apps/web/src/services/asset-inventory/stores/service-account-page-store.ts index 5841b32ce1..daedc7327c 100644 --- a/apps/web/src/services/asset-inventory/stores/service-account-page-store.ts +++ b/apps/web/src/services/asset-inventory/stores/service-account-page-store.ts @@ -6,7 +6,7 @@ import { defineStore } from 'pinia'; import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; import type { JsonSchema } from '@cloudforet/mirinae/types/controls/forms/json-schema-form/type'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { CostReportConfigListParameters } from '@/schema/cost-analysis/cost-report-config/api-verbs/list'; import type { CostReportConfigModel } from '@/schema/cost-analysis/cost-report-config/model'; import type { IdentityJobListParameters } from '@/schema/identity/job/api-verbs/list'; diff --git a/apps/web/src/services/asset-inventory/stores/service-account-schema-store.ts b/apps/web/src/services/asset-inventory/stores/service-account-schema-store.ts index aa5ab9da82..be50f5dddb 100644 --- a/apps/web/src/services/asset-inventory/stores/service-account-schema-store.ts +++ b/apps/web/src/services/asset-inventory/stores/service-account-schema-store.ts @@ -8,7 +8,7 @@ import { defineStore } from 'pinia'; import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; import type { DynamicField } from '@cloudforet/mirinae/types/data-display/dynamic/dynamic-field/type/field-schema'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { ProviderModel } from '@/schema/identity/provider/model'; import type { SchemaListParameters } from '@/schema/identity/schema/api-verbs/list'; import type { SchemaModel } from '@/schema/identity/schema/model'; diff --git a/apps/web/src/services/asset-inventory/types/collector-main-page-type.ts b/apps/web/src/services/asset-inventory/types/collector-main-page-type.ts index a29a416260..c3a9193fc8 100644 --- a/apps/web/src/services/asset-inventory/types/collector-main-page-type.ts +++ b/apps/web/src/services/asset-inventory/types/collector-main-page-type.ts @@ -2,7 +2,7 @@ import type { Dictionary, Location } from 'vue-router/types/router'; import type { ConsoleFilter } from '@cloudforet/core-lib/query/type'; -import type { ResourceGroupType } from '@/schema/_common/type'; +import type { ResourceGroupType } from '@/api-clients/_common/schema/type'; import type { CollectorPluginInfo, diff --git a/apps/web/src/services/cost-explorer/components/AnomalyDetectionConfigurationRecipientsForm.vue b/apps/web/src/services/cost-explorer/components/AnomalyDetectionConfigurationRecipientsForm.vue index 0552efbcbf..2de2dbf0cd 100644 --- a/apps/web/src/services/cost-explorer/components/AnomalyDetectionConfigurationRecipientsForm.vue +++ b/apps/web/src/services/cost-explorer/components/AnomalyDetectionConfigurationRecipientsForm.vue @@ -9,7 +9,7 @@ import { import type { SelectDropdownMenuItem, AutocompleteHandler } from '@cloudforet/mirinae/types/controls/dropdown/select-dropdown/type'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { RoleListParameters } from '@/schema/identity/role/api-verbs/list'; import { ROLE_STATE, ROLE_TYPE } from '@/schema/identity/role/constant'; import type { RoleModel } from '@/schema/identity/role/model'; diff --git a/apps/web/src/services/cost-explorer/components/BudgetCreateTargetSelect.vue b/apps/web/src/services/cost-explorer/components/BudgetCreateTargetSelect.vue index 3faa753500..8bf56c5edb 100644 --- a/apps/web/src/services/cost-explorer/components/BudgetCreateTargetSelect.vue +++ b/apps/web/src/services/cost-explorer/components/BudgetCreateTargetSelect.vue @@ -10,7 +10,7 @@ import type { } from '@cloudforet/mirinae/types/controls/dropdown/select-dropdown/type'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { WorkspaceListParameters } from '@/schema/identity/workspace/api-verbs/list'; import type { WorkspaceModel } from '@/schema/identity/workspace/model'; import { i18n } from '@/translations'; diff --git a/apps/web/src/services/cost-explorer/components/BudgetMainList.vue b/apps/web/src/services/cost-explorer/components/BudgetMainList.vue index d63821a301..78fa41415e 100644 --- a/apps/web/src/services/cost-explorer/components/BudgetMainList.vue +++ b/apps/web/src/services/cost-explorer/components/BudgetMainList.vue @@ -12,9 +12,9 @@ import { PDataLoader, } from '@cloudforet/mirinae'; +import type { AnalyzeResponse } from '@/api-clients/_common/schema/api-verbs/analyze'; +import { RESOURCE_GROUP } from '@/api-clients/_common/schema/constant'; import { SpaceRouter } from '@/router'; -import type { AnalyzeResponse } from '@/schema/_common/api-verbs/analyze'; -import { RESOURCE_GROUP } from '@/schema/_common/constant'; import type { BudgetUsageAnalyzeParameters, BudgetUsageAnalyzeResult, diff --git a/apps/web/src/services/cost-explorer/components/CostAnalysisChart.vue b/apps/web/src/services/cost-explorer/components/CostAnalysisChart.vue index a87bffc286..39c3e3ad99 100644 --- a/apps/web/src/services/cost-explorer/components/CostAnalysisChart.vue +++ b/apps/web/src/services/cost-explorer/components/CostAnalysisChart.vue @@ -16,7 +16,7 @@ import { } from '@cloudforet/mirinae'; import type { SelectDropdownMenuItem } from '@cloudforet/mirinae/types/controls/dropdown/select-dropdown/type'; -import type { AnalyzeResponse } from '@/schema/_common/api-verbs/analyze'; +import type { AnalyzeResponse } from '@/api-clients/_common/schema/api-verbs/analyze'; import ErrorHandler from '@/common/composables/error/errorHandler'; diff --git a/apps/web/src/services/cost-explorer/components/CostAnalysisDataTable.vue b/apps/web/src/services/cost-explorer/components/CostAnalysisDataTable.vue index a374f2c120..83f2b86ba2 100644 --- a/apps/web/src/services/cost-explorer/components/CostAnalysisDataTable.vue +++ b/apps/web/src/services/cost-explorer/components/CostAnalysisDataTable.vue @@ -27,7 +27,7 @@ import type { MenuItem } from '@cloudforet/mirinae/types/inputs/context-menu/typ import { numberFormatter } from '@cloudforet/utils'; -import type { AnalyzeResponse } from '@/schema/_common/api-verbs/analyze'; +import type { AnalyzeResponse } from '@/api-clients/_common/schema/api-verbs/analyze'; import { useAppContextStore } from '@/store/app-context/app-context-store'; import { useAllReferenceStore } from '@/store/reference/all-reference-store'; diff --git a/apps/web/src/services/cost-explorer/components/CostAnalysisStackedColumnChart.vue b/apps/web/src/services/cost-explorer/components/CostAnalysisStackedColumnChart.vue index 404372584e..592f329ce2 100644 --- a/apps/web/src/services/cost-explorer/components/CostAnalysisStackedColumnChart.vue +++ b/apps/web/src/services/cost-explorer/components/CostAnalysisStackedColumnChart.vue @@ -17,7 +17,7 @@ import { } from '@cloudforet/mirinae'; import { numberFormatter } from '@cloudforet/utils'; -import type { AnalyzeResponse } from '@/schema/_common/api-verbs/analyze'; +import type { AnalyzeResponse } from '@/api-clients/_common/schema/api-verbs/analyze'; import { useProxyValue } from '@/common/composables/proxy-state'; import { diff --git a/apps/web/src/services/cost-explorer/components/CostReportMonthlyTotalAmountSummaryCard.vue b/apps/web/src/services/cost-explorer/components/CostReportMonthlyTotalAmountSummaryCard.vue index af223ae86f..3ac50995f0 100644 --- a/apps/web/src/services/cost-explorer/components/CostReportMonthlyTotalAmountSummaryCard.vue +++ b/apps/web/src/services/cost-explorer/components/CostReportMonthlyTotalAmountSummaryCard.vue @@ -21,8 +21,8 @@ import type { DataTableFieldType } from '@cloudforet/mirinae/src/data-display/ta import type { SelectButtonType } from '@cloudforet/mirinae/types/controls/buttons/select-button-group/type'; import { numberFormatter } from '@cloudforet/utils'; -import type { AnalyzeResponse } from '@/schema/_common/api-verbs/analyze'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { AnalyzeResponse } from '@/api-clients/_common/schema/api-verbs/analyze'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { CostReportDataAnalyzeParameters } from '@/schema/cost-analysis/cost-report-data/api-verbs/analyze'; import type { CostReportListParameters } from '@/schema/cost-analysis/cost-report/api-verbs/list'; import type { CostReportModel } from '@/schema/cost-analysis/cost-report/model'; diff --git a/apps/web/src/services/cost-explorer/components/CostReportOverviewCostTrendCard.vue b/apps/web/src/services/cost-explorer/components/CostReportOverviewCostTrendCard.vue index 44abbd5ead..07caf26056 100644 --- a/apps/web/src/services/cost-explorer/components/CostReportOverviewCostTrendCard.vue +++ b/apps/web/src/services/cost-explorer/components/CostReportOverviewCostTrendCard.vue @@ -14,7 +14,7 @@ import type { SelectButtonType } from '@cloudforet/mirinae/types/controls/button import type { SelectDropdownMenuItem } from '@cloudforet/mirinae/types/controls/dropdown/select-dropdown/type'; -import type { AnalyzeResponse } from '@/schema/_common/api-verbs/analyze'; +import type { AnalyzeResponse } from '@/api-clients/_common/schema/api-verbs/analyze'; import type { CostReportDataAnalyzeParameters } from '@/schema/cost-analysis/cost-report-data/api-verbs/analyze'; import { i18n } from '@/translations'; diff --git a/apps/web/src/services/cost-explorer/components/CostReportOverviewCostTrendChart.vue b/apps/web/src/services/cost-explorer/components/CostReportOverviewCostTrendChart.vue index 2e3ef785c7..02ffa10404 100644 --- a/apps/web/src/services/cost-explorer/components/CostReportOverviewCostTrendChart.vue +++ b/apps/web/src/services/cost-explorer/components/CostReportOverviewCostTrendChart.vue @@ -19,7 +19,7 @@ import { import type { DataTableFieldType } from '@cloudforet/mirinae/src/data-display/tables/data-table/type'; import { numberFormatter } from '@cloudforet/utils'; -import type { AnalyzeResponse } from '@/schema/_common/api-verbs/analyze'; +import type { AnalyzeResponse } from '@/api-clients/_common/schema/api-verbs/analyze'; import { useAllReferenceStore } from '@/store/reference/all-reference-store'; import type { ProviderReferenceMap } from '@/store/reference/provider-reference-store'; diff --git a/apps/web/src/services/cost-explorer/components/DataSourceManagementModal.vue b/apps/web/src/services/cost-explorer/components/DataSourceManagementModal.vue index 7ec5d4cf69..265a0b1a43 100644 --- a/apps/web/src/services/cost-explorer/components/DataSourceManagementModal.vue +++ b/apps/web/src/services/cost-explorer/components/DataSourceManagementModal.vue @@ -8,7 +8,7 @@ import { PButtonModal, PSelectDropdown, PFieldTitle } from '@cloudforet/mirinae' import type { AutocompleteHandler } from '@cloudforet/mirinae/types/controls/dropdown/select-dropdown/type'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { CostDataSourceAccountModel } from '@/schema/cost-analysis/data-source-account/model'; import type { WorkspaceListParameters } from '@/schema/identity/workspace/api-verbs/list'; import type { WorkspaceModel } from '@/schema/identity/workspace/model'; diff --git a/apps/web/src/services/cost-explorer/components/DataSourceManagementTabLinkedAccountTable.vue b/apps/web/src/services/cost-explorer/components/DataSourceManagementTabLinkedAccountTable.vue index f972852894..5d6eb41b09 100644 --- a/apps/web/src/services/cost-explorer/components/DataSourceManagementTabLinkedAccountTable.vue +++ b/apps/web/src/services/cost-explorer/components/DataSourceManagementTabLinkedAccountTable.vue @@ -17,7 +17,7 @@ import type { KeyItemSet, ValueHandlerMap } from '@cloudforet/mirinae/types/cont import type { ToolboxOptions } from '@cloudforet/mirinae/types/controls/toolbox/type'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { CostDataSourceAccountModel } from '@/schema/cost-analysis/data-source-account/model'; import type { WorkspaceListParameters } from '@/schema/identity/workspace/api-verbs/list'; import type { WorkspaceModel } from '@/schema/identity/workspace/model'; diff --git a/apps/web/src/services/cost-explorer/routes/admin/routes.ts b/apps/web/src/services/cost-explorer/routes/admin/routes.ts index 9bdda84e3c..45fa3f988a 100644 --- a/apps/web/src/services/cost-explorer/routes/admin/routes.ts +++ b/apps/web/src/services/cost-explorer/routes/admin/routes.ts @@ -2,7 +2,7 @@ import type { RouteConfig } from 'vue-router'; import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { CostDataSourceListParameters } from '@/schema/cost-analysis/data-source/api-verbs/list'; import type { DataSourceModel } from '@/schema/monitoring/data-source/model'; diff --git a/apps/web/src/services/cost-explorer/stores/budget-detail-page-store.ts b/apps/web/src/services/cost-explorer/stores/budget-detail-page-store.ts index c30416e03c..e3fc3bd7fe 100644 --- a/apps/web/src/services/cost-explorer/stores/budget-detail-page-store.ts +++ b/apps/web/src/services/cost-explorer/stores/budget-detail-page-store.ts @@ -3,7 +3,7 @@ import { defineStore } from 'pinia'; import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; -import type { AnalyzeResponse } from '@/schema/_common/api-verbs/analyze'; +import type { AnalyzeResponse } from '@/api-clients/_common/schema/api-verbs/analyze'; import type { BudgetUsageListParameters } from '@/schema/cost-analysis/budget-usage/api-verbs/list'; import type { BudgetUsageModel } from '@/schema/cost-analysis/budget-usage/model'; import type { BudgetGetParameters } from '@/schema/cost-analysis/budget/api-verbs/get'; diff --git a/apps/web/src/services/cost-explorer/stores/cost-report-page-store.ts b/apps/web/src/services/cost-explorer/stores/cost-report-page-store.ts index 6374caf3ee..f438b5b803 100644 --- a/apps/web/src/services/cost-explorer/stores/cost-report-page-store.ts +++ b/apps/web/src/services/cost-explorer/stores/cost-report-page-store.ts @@ -6,7 +6,7 @@ import { defineStore } from 'pinia'; import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; import { ApiQueryHelper } from '@cloudforet/core-lib/space-connector/helper'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { CostReportConfigListParameters } from '@/schema/cost-analysis/cost-report-config/api-verbs/list'; import type { CostReportConfigModel } from '@/schema/cost-analysis/cost-report-config/model'; import type { CostReportGetParameters } from '@/schema/cost-analysis/cost-report/api-verbs/get'; diff --git a/apps/web/src/services/cost-explorer/stores/data-sources-page-store.ts b/apps/web/src/services/cost-explorer/stores/data-sources-page-store.ts index cd1064e293..90f144682c 100644 --- a/apps/web/src/services/cost-explorer/stores/data-sources-page-store.ts +++ b/apps/web/src/services/cost-explorer/stores/data-sources-page-store.ts @@ -7,8 +7,8 @@ import type { ConsoleFilter } from '@cloudforet/core-lib/query/type'; import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; import { durationFormatter } from '@cloudforet/utils'; -import type { AnalyzeResponse } from '@/schema/_common/api-verbs/analyze'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { AnalyzeResponse } from '@/api-clients/_common/schema/api-verbs/analyze'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { DataSourceAccountAnalyzeParameters } from '@/schema/cost-analysis/data-source-account/api-verbs/analyze'; import type { CostDataSourceAccountListParameters } from '@/schema/cost-analysis/data-source-account/api-verbs/list'; import type { CostDataSourceAccountResetParameters } from '@/schema/cost-analysis/data-source-account/api-verbs/reset'; diff --git a/apps/web/src/services/dashboards/DashboardsLSB.vue b/apps/web/src/services/dashboards/DashboardsLSB.vue index e9ebb14323..4d9983bb30 100644 --- a/apps/web/src/services/dashboards/DashboardsLSB.vue +++ b/apps/web/src/services/dashboards/DashboardsLSB.vue @@ -8,7 +8,7 @@ import { PIconButton, } from '@cloudforet/mirinae'; -import type { DashboardModel } from '@/schema/dashboard/_types/dashboard-type'; +import type { DashboardModel } from '@/api-clients/dashboard/_types/dashboard-type'; import { ROLE_TYPE } from '@/schema/identity/role/constant'; import { i18n } from '@/translations'; diff --git a/apps/web/src/services/dashboards/components/dashboard-create/DashboardCreateStep1.vue b/apps/web/src/services/dashboards/components/dashboard-create/DashboardCreateStep1.vue index bac8adbb25..c449162582 100644 --- a/apps/web/src/services/dashboards/components/dashboard-create/DashboardCreateStep1.vue +++ b/apps/web/src/services/dashboards/components/dashboard-create/DashboardCreateStep1.vue @@ -10,7 +10,7 @@ import { import type { TreeNode } from '@cloudforet/mirinae/src/data-display/tree/tree-view/type'; import type { BoardSet } from '@cloudforet/mirinae/types/data-display/board/type'; -import type { DashboardModel } from '@/schema/dashboard/_types/dashboard-type'; +import type { DashboardModel } from '@/api-clients/dashboard/_types/dashboard-type'; import type { DashboardTemplateModel } from '@/schema/repository/dashboard-template/model'; import { i18n } from '@/translations'; diff --git a/apps/web/src/services/dashboards/components/dashboard-create/DashboardCreateStep2BundleCase.vue b/apps/web/src/services/dashboards/components/dashboard-create/DashboardCreateStep2BundleCase.vue index c691fc1f66..b75c816b9c 100644 --- a/apps/web/src/services/dashboards/components/dashboard-create/DashboardCreateStep2BundleCase.vue +++ b/apps/web/src/services/dashboards/components/dashboard-create/DashboardCreateStep2BundleCase.vue @@ -10,10 +10,10 @@ import { } from '@cloudforet/mirinae'; import { getClonedName } from '@cloudforet/utils'; +import { RESOURCE_GROUP } from '@/api-clients/_common/schema/constant'; +import type { DashboardCreateParams, DashboardModel, DashboardType } from '@/api-clients/dashboard/_types/dashboard-type'; +import type { PublicDashboardCreateParameters } from '@/api-clients/dashboard/public-dashboard/schema/api-verbs/create'; import { SpaceRouter } from '@/router'; -import { RESOURCE_GROUP } from '@/schema/_common/constant'; -import type { DashboardCreateParams, DashboardModel, DashboardType } from '@/schema/dashboard/_types/dashboard-type'; -import type { PublicDashboardCreateParameters } from '@/schema/dashboard/public-dashboard/api-verbs/create'; import { ROLE_TYPE } from '@/schema/identity/role/constant'; import { i18n } from '@/translations'; diff --git a/apps/web/src/services/dashboards/components/dashboard-create/DashboardCreateStep2SingleCase.vue b/apps/web/src/services/dashboards/components/dashboard-create/DashboardCreateStep2SingleCase.vue index eac9a051f1..54913918da 100644 --- a/apps/web/src/services/dashboards/components/dashboard-create/DashboardCreateStep2SingleCase.vue +++ b/apps/web/src/services/dashboards/components/dashboard-create/DashboardCreateStep2SingleCase.vue @@ -9,10 +9,10 @@ import { import type { SelectDropdownMenuItem } from '@cloudforet/mirinae/types/controls/dropdown/select-dropdown/type'; import type { InputItem } from '@cloudforet/mirinae/types/controls/input/text-input/type'; +import { RESOURCE_GROUP } from '@/api-clients/_common/schema/constant'; +import type { DashboardCreateParams } from '@/api-clients/dashboard/_types/dashboard-type'; +import type { PublicDashboardCreateParameters } from '@/api-clients/dashboard/public-dashboard/schema/api-verbs/create'; import { SpaceRouter } from '@/router'; -import { RESOURCE_GROUP } from '@/schema/_common/constant'; -import type { DashboardCreateParams } from '@/schema/dashboard/_types/dashboard-type'; -import type { PublicDashboardCreateParameters } from '@/schema/dashboard/public-dashboard/api-verbs/create'; import { i18n } from '@/translations'; import { useAppContextStore } from '@/store/app-context/app-context-store'; diff --git a/apps/web/src/services/dashboards/components/dashboard-detail/DashboardCloneModal.vue b/apps/web/src/services/dashboards/components/dashboard-detail/DashboardCloneModal.vue index d615878ae9..0e1392b532 100644 --- a/apps/web/src/services/dashboards/components/dashboard-detail/DashboardCloneModal.vue +++ b/apps/web/src/services/dashboards/components/dashboard-detail/DashboardCloneModal.vue @@ -7,15 +7,15 @@ import { } from '@cloudforet/mirinae'; import { getClonedName } from '@cloudforet/utils'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; +import { RESOURCE_GROUP } from '@/api-clients/_common/schema/constant'; +import type { DashboardType, DashboardModel } from '@/api-clients/dashboard/_types/dashboard-type'; +import type { WidgetModel } from '@/api-clients/dashboard/_types/widget-type'; +import type { PrivateDashboardCreateParameters } from '@/api-clients/dashboard/private-dashboard/schema/api-verbs/create'; +import type { PrivateWidgetListParameters } from '@/api-clients/dashboard/private-widget/schema/api-verbs/list'; +import type { PublicDashboardCreateParameters } from '@/api-clients/dashboard/public-dashboard/schema/api-verbs/create'; +import type { PublicWidgetListParameters } from '@/api-clients/dashboard/public-widget/schema/api-verbs/list'; import { SpaceRouter } from '@/router'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; -import { RESOURCE_GROUP } from '@/schema/_common/constant'; -import type { DashboardType, DashboardModel } from '@/schema/dashboard/_types/dashboard-type'; -import type { WidgetModel } from '@/schema/dashboard/_types/widget-type'; -import type { PrivateDashboardCreateParameters } from '@/schema/dashboard/private-dashboard/api-verbs/create'; -import type { PrivateWidgetListParameters } from '@/schema/dashboard/private-widget/api-verbs/list'; -import type { PublicDashboardCreateParameters } from '@/schema/dashboard/public-dashboard/api-verbs/create'; -import type { PublicWidgetListParameters } from '@/schema/dashboard/public-widget/api-verbs/list'; import { ROLE_TYPE } from '@/schema/identity/role/constant'; import { i18n } from '@/translations'; diff --git a/apps/web/src/services/dashboards/components/dashboard-detail/DashboardDetailHeader.vue b/apps/web/src/services/dashboards/components/dashboard-detail/DashboardDetailHeader.vue index 622a4635d5..46d3ffa096 100644 --- a/apps/web/src/services/dashboards/components/dashboard-detail/DashboardDetailHeader.vue +++ b/apps/web/src/services/dashboards/components/dashboard-detail/DashboardDetailHeader.vue @@ -7,7 +7,7 @@ import { import type { BadgeStyleType, BadgeType } from '@cloudforet/mirinae/src/data-display/badge/type'; import type { MenuItem } from '@cloudforet/mirinae/types/controls/context-menu/type'; -import type { DashboardScope } from '@/schema/dashboard/_types/dashboard-type'; +import type { DashboardScope } from '@/api-clients/dashboard/_types/dashboard-type'; import { ROLE_TYPE } from '@/schema/identity/role/constant'; import { i18n } from '@/translations'; diff --git a/apps/web/src/services/dashboards/components/dashboard-detail/DashboardFolderSingleMoveModal.vue b/apps/web/src/services/dashboards/components/dashboard-detail/DashboardFolderSingleMoveModal.vue index 2cea478fe5..b22eb18321 100644 --- a/apps/web/src/services/dashboards/components/dashboard-detail/DashboardFolderSingleMoveModal.vue +++ b/apps/web/src/services/dashboards/components/dashboard-detail/DashboardFolderSingleMoveModal.vue @@ -9,7 +9,7 @@ import { } from '@cloudforet/mirinae'; import type { SelectDropdownMenuItem } from '@cloudforet/mirinae/types/controls/dropdown/select-dropdown/type'; -import type { DashboardChangeFolderParams } from '@/schema/dashboard/_types/dashboard-type'; +import type { DashboardChangeFolderParams } from '@/api-clients/dashboard/_types/dashboard-type'; import { i18n } from '@/translations'; import { useDashboardStore } from '@/store/dashboard/dashboard-store'; diff --git a/apps/web/src/services/dashboards/components/dashboard-detail/DashboardGlobalVariableFilter.vue b/apps/web/src/services/dashboards/components/dashboard-detail/DashboardGlobalVariableFilter.vue index 6d60d8a4db..a758c8b21d 100644 --- a/apps/web/src/services/dashboards/components/dashboard-detail/DashboardGlobalVariableFilter.vue +++ b/apps/web/src/services/dashboards/components/dashboard-detail/DashboardGlobalVariableFilter.vue @@ -3,7 +3,7 @@ import { computed, reactive, } from 'vue'; -import type { DashboardGlobalVariable, GlobalVariableFilterType } from '@/schema/dashboard/_types/dashboard-global-variable-type'; +import type { DashboardGlobalVariable, GlobalVariableFilterType } from '@/api-clients/dashboard/_types/dashboard-global-variable-type'; import DashboardGlobalVariableFilterEnum from '@/services/dashboards/components/dashboard-detail/DashboardGlobalVariableFilterEnum.vue'; diff --git a/apps/web/src/services/dashboards/components/dashboard-detail/DashboardGlobalVariableFilterEnum.vue b/apps/web/src/services/dashboards/components/dashboard-detail/DashboardGlobalVariableFilterEnum.vue index 8b1dc632f6..de28e7b619 100644 --- a/apps/web/src/services/dashboards/components/dashboard-detail/DashboardGlobalVariableFilterEnum.vue +++ b/apps/web/src/services/dashboards/components/dashboard-detail/DashboardGlobalVariableFilterEnum.vue @@ -13,7 +13,7 @@ import type { DashboardGlobalVariable, NumberEnumVariable, TextEnumVariable, -} from '@/schema/dashboard/_types/dashboard-global-variable-type'; +} from '@/api-clients/dashboard/_types/dashboard-global-variable-type'; import { useDashboardDetailInfoStore } from '@/services/dashboards/stores/dashboard-detail-info-store'; diff --git a/apps/web/src/services/dashboards/components/dashboard-detail/DashboardGlobalVariableFilterNumberInput.vue b/apps/web/src/services/dashboards/components/dashboard-detail/DashboardGlobalVariableFilterNumberInput.vue index 20d02c4e12..dab9a96d1d 100644 --- a/apps/web/src/services/dashboards/components/dashboard-detail/DashboardGlobalVariableFilterNumberInput.vue +++ b/apps/web/src/services/dashboards/components/dashboard-detail/DashboardGlobalVariableFilterNumberInput.vue @@ -15,8 +15,8 @@ import type { InputItem } from '@cloudforet/mirinae/src/controls/input/text-inpu import type { DashboardGlobalVariable, NumberAnyVariable, -} from '@/schema/dashboard/_types/dashboard-global-variable-type'; -import type { DashboardVars } from '@/schema/dashboard/_types/dashboard-type'; +} from '@/api-clients/dashboard/_types/dashboard-global-variable-type'; +import type { DashboardVars } from '@/api-clients/dashboard/_types/dashboard-type'; import { i18n } from '@/translations'; import { useDashboardDetailInfoStore } from '@/services/dashboards/stores/dashboard-detail-info-store'; diff --git a/apps/web/src/services/dashboards/components/dashboard-detail/DashboardGlobalVariableFilterNumberSlider.vue b/apps/web/src/services/dashboards/components/dashboard-detail/DashboardGlobalVariableFilterNumberSlider.vue index c94edf8ec6..a8d554bf6a 100644 --- a/apps/web/src/services/dashboards/components/dashboard-detail/DashboardGlobalVariableFilterNumberSlider.vue +++ b/apps/web/src/services/dashboards/components/dashboard-detail/DashboardGlobalVariableFilterNumberSlider.vue @@ -11,7 +11,7 @@ import { PTag, PSlider } from '@cloudforet/mirinae'; import type { DashboardGlobalVariable, NumberAnyVariable, -} from '@/schema/dashboard/_types/dashboard-global-variable-type'; +} from '@/api-clients/dashboard/_types/dashboard-global-variable-type'; import { useDashboardDetailInfoStore } from '@/services/dashboards/stores/dashboard-detail-info-store'; diff --git a/apps/web/src/services/dashboards/components/dashboard-detail/DashboardGlobalVariableFilterReference.vue b/apps/web/src/services/dashboards/components/dashboard-detail/DashboardGlobalVariableFilterReference.vue index b5de0f4829..63c4ed0ab6 100644 --- a/apps/web/src/services/dashboards/components/dashboard-detail/DashboardGlobalVariableFilterReference.vue +++ b/apps/web/src/services/dashboards/components/dashboard-detail/DashboardGlobalVariableFilterReference.vue @@ -12,7 +12,7 @@ import type { AutocompleteHandler } from '@cloudforet/mirinae/types/controls/dro import type { DashboardGlobalVariable, ReferenceVariable, -} from '@/schema/dashboard/_types/dashboard-global-variable-type'; +} from '@/api-clients/dashboard/_types/dashboard-global-variable-type'; import type { WorkspaceModel } from '@/schema/identity/workspace/model'; import { useUserWorkspaceStore } from '@/store/app-context/workspace/user-workspace-store'; diff --git a/apps/web/src/services/dashboards/components/dashboard-detail/DashboardGlobalVariableFilterTextInput.vue b/apps/web/src/services/dashboards/components/dashboard-detail/DashboardGlobalVariableFilterTextInput.vue index 069aa3f228..205add70a7 100644 --- a/apps/web/src/services/dashboards/components/dashboard-detail/DashboardGlobalVariableFilterTextInput.vue +++ b/apps/web/src/services/dashboards/components/dashboard-detail/DashboardGlobalVariableFilterTextInput.vue @@ -12,7 +12,7 @@ import type { InputItem } from '@cloudforet/mirinae/src/controls/input/text-inpu import type { DashboardGlobalVariable, TextAnyVariable, -} from '@/schema/dashboard/_types/dashboard-global-variable-type'; +} from '@/api-clients/dashboard/_types/dashboard-global-variable-type'; import { useDashboardDetailInfoStore } from '@/services/dashboards/stores/dashboard-detail-info-store'; diff --git a/apps/web/src/services/dashboards/components/dashboard-detail/DashboardManageVariableImportModal.vue b/apps/web/src/services/dashboards/components/dashboard-detail/DashboardManageVariableImportModal.vue index ef03196b91..7210e10ff6 100644 --- a/apps/web/src/services/dashboards/components/dashboard-detail/DashboardManageVariableImportModal.vue +++ b/apps/web/src/services/dashboards/components/dashboard-detail/DashboardManageVariableImportModal.vue @@ -7,9 +7,9 @@ import { PButton, PButtonModal, PCheckbox, PSearch, PScopedNotification, } from '@cloudforet/mirinae'; -import type { DashboardGlobalVariable } from '@/schema/dashboard/_types/dashboard-global-variable-type'; -import type { PrivateDashboardModel } from '@/schema/dashboard/private-dashboard/model'; -import type { PublicDashboardModel } from '@/schema/dashboard/public-dashboard/model'; +import type { DashboardGlobalVariable } from '@/api-clients/dashboard/_types/dashboard-global-variable-type'; +import type { PrivateDashboardModel } from '@/api-clients/dashboard/private-dashboard/schema/model'; +import type { PublicDashboardModel } from '@/api-clients/dashboard/public-dashboard/schema/model'; import { i18n } from '@/translations'; import { useDashboardStore } from '@/store/dashboard/dashboard-store'; diff --git a/apps/web/src/services/dashboards/components/dashboard-detail/DashboardManageVariableImportModalTree.vue b/apps/web/src/services/dashboards/components/dashboard-detail/DashboardManageVariableImportModalTree.vue index bcf70e79dc..04939a63c0 100644 --- a/apps/web/src/services/dashboards/components/dashboard-detail/DashboardManageVariableImportModalTree.vue +++ b/apps/web/src/services/dashboards/components/dashboard-detail/DashboardManageVariableImportModalTree.vue @@ -7,7 +7,7 @@ import { PI, PTreeView } from '@cloudforet/mirinae'; import type { TreeNode } from '@cloudforet/mirinae/src/data-display/tree/tree-view/type'; import type { TreeDisplayMap } from '@cloudforet/mirinae/types/data-display/tree/tree-view/type'; -import type { DashboardModel } from '@/schema/dashboard/_types/dashboard-type'; +import type { DashboardModel } from '@/api-clients/dashboard/_types/dashboard-type'; import { useProxyValue } from '@/common/composables/proxy-state'; diff --git a/apps/web/src/services/dashboards/components/dashboard-detail/DashboardManageVariableOverlay.vue b/apps/web/src/services/dashboards/components/dashboard-detail/DashboardManageVariableOverlay.vue index 29c5965b46..08e541588c 100644 --- a/apps/web/src/services/dashboards/components/dashboard-detail/DashboardManageVariableOverlay.vue +++ b/apps/web/src/services/dashboards/components/dashboard-detail/DashboardManageVariableOverlay.vue @@ -10,8 +10,8 @@ import { import type { DataTableField } from '@cloudforet/mirinae/src/data-display/tables/data-table/type'; import { getClonedName } from '@cloudforet/utils'; +import type { DashboardGlobalVariable } from '@/api-clients/dashboard/_types/dashboard-global-variable-type'; import { SpaceRouter } from '@/router'; -import type { DashboardGlobalVariable } from '@/schema/dashboard/_types/dashboard-global-variable-type'; import { i18n } from '@/translations'; import { useDashboardStore } from '@/store/dashboard/dashboard-store'; diff --git a/apps/web/src/services/dashboards/components/dashboard-detail/DashboardNameEditModal.vue b/apps/web/src/services/dashboards/components/dashboard-detail/DashboardNameEditModal.vue index 82bb72b98f..58c87cf6dd 100644 --- a/apps/web/src/services/dashboards/components/dashboard-detail/DashboardNameEditModal.vue +++ b/apps/web/src/services/dashboards/components/dashboard-detail/DashboardNameEditModal.vue @@ -5,7 +5,7 @@ import { import { PButtonModal, PFieldGroup, PTextInput } from '@cloudforet/mirinae'; -import type { DashboardModel } from '@/schema/dashboard/_types/dashboard-type'; +import type { DashboardModel } from '@/api-clients/dashboard/_types/dashboard-type'; import { i18n } from '@/translations'; import { useDashboardStore } from '@/store/dashboard/dashboard-store'; diff --git a/apps/web/src/services/dashboards/components/dashboard-detail/DashboardRefreshDropdown.vue b/apps/web/src/services/dashboards/components/dashboard-detail/DashboardRefreshDropdown.vue index 155c97c610..a012ab867e 100644 --- a/apps/web/src/services/dashboards/components/dashboard-detail/DashboardRefreshDropdown.vue +++ b/apps/web/src/services/dashboards/components/dashboard-detail/DashboardRefreshDropdown.vue @@ -8,8 +8,8 @@ import type { TranslateResult } from 'vue-i18n'; import { PIconButton, PSelectDropdown } from '@cloudforet/mirinae'; import type { MenuItem } from '@cloudforet/mirinae/types/controls/context-menu/type'; -import { REFRESH_INTERVAL_OPTIONS_MAP } from '@/schema/dashboard/_constants/dashboard-constant'; -import type { RefreshIntervalOption } from '@/schema/dashboard/_types/dashboard-type'; +import { REFRESH_INTERVAL_OPTIONS_MAP } from '@/api-clients/dashboard/_constants/dashboard-constant'; +import type { RefreshIntervalOption } from '@/api-clients/dashboard/_types/dashboard-type'; import { i18n } from '@/translations'; import { useDashboardStore } from '@/store/dashboard/dashboard-store'; diff --git a/apps/web/src/services/dashboards/components/dashboard-detail/DashboardReorderSidebar.vue b/apps/web/src/services/dashboards/components/dashboard-detail/DashboardReorderSidebar.vue index 03a9b19d61..5296c9db22 100644 --- a/apps/web/src/services/dashboards/components/dashboard-detail/DashboardReorderSidebar.vue +++ b/apps/web/src/services/dashboards/components/dashboard-detail/DashboardReorderSidebar.vue @@ -9,8 +9,8 @@ import { PI, PButton, } from '@cloudforet/mirinae'; -import type { PrivateWidgetModel } from '@/schema/dashboard/private-widget/model'; -import type { PublicWidgetModel } from '@/schema/dashboard/public-widget/model'; +import type { PrivateWidgetModel } from '@/api-clients/dashboard/private-widget/schema/model'; +import type { PublicWidgetModel } from '@/api-clients/dashboard/public-widget/schema/model'; import { useDashboardStore } from '@/store/dashboard/dashboard-store'; import { useDisplayStore } from '@/store/display/display-store'; diff --git a/apps/web/src/services/dashboards/components/dashboard-detail/DashboardShareWithCodeModal.vue b/apps/web/src/services/dashboards/components/dashboard-detail/DashboardShareWithCodeModal.vue index b4a41edc95..27e33a120a 100644 --- a/apps/web/src/services/dashboards/components/dashboard-detail/DashboardShareWithCodeModal.vue +++ b/apps/web/src/services/dashboards/components/dashboard-detail/DashboardShareWithCodeModal.vue @@ -6,13 +6,13 @@ import { PButtonModal, PCodeEditor, PButton, } from '@cloudforet/mirinae'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; -import type { DashboardModel } from '@/schema/dashboard/_types/dashboard-type'; -import type { WidgetModel } from '@/schema/dashboard/_types/widget-type'; -import type { PrivateDataTableModel } from '@/schema/dashboard/private-data-table/model'; -import type { PrivateWidgetListParameters } from '@/schema/dashboard/private-widget/api-verbs/list'; -import type { PublicDataTableModel } from '@/schema/dashboard/public-data-table/model'; -import type { PublicWidgetListParameters } from '@/schema/dashboard/public-widget/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; +import type { DashboardModel } from '@/api-clients/dashboard/_types/dashboard-type'; +import type { WidgetModel } from '@/api-clients/dashboard/_types/widget-type'; +import type { PrivateDataTableModel } from '@/api-clients/dashboard/private-data-table/schema/model'; +import type { PrivateWidgetListParameters } from '@/api-clients/dashboard/private-widget/schema/api-verbs/list'; +import type { PublicDataTableModel } from '@/api-clients/dashboard/public-data-table/schema/model'; +import type { PublicWidgetListParameters } from '@/api-clients/dashboard/public-widget/schema/api-verbs/list'; import { useAllReferenceStore } from '@/store/reference/all-reference-store'; import type { CostDataSourceReferenceMap } from '@/store/reference/cost-data-source-reference-store'; diff --git a/apps/web/src/services/dashboards/components/dashboard-detail/DashboardToolsetDateDropdown.vue b/apps/web/src/services/dashboards/components/dashboard-detail/DashboardToolsetDateDropdown.vue index 37bf004a6a..f9d615f329 100644 --- a/apps/web/src/services/dashboards/components/dashboard-detail/DashboardToolsetDateDropdown.vue +++ b/apps/web/src/services/dashboards/components/dashboard-detail/DashboardToolsetDateDropdown.vue @@ -9,7 +9,7 @@ import { cloneDeep, range } from 'lodash'; import { PSelectDropdown } from '@cloudforet/mirinae'; import type { MenuItem } from '@cloudforet/mirinae/types/controls/context-menu/type'; -import type { DateRange, DashboardOptions } from '@/schema/dashboard/_types/dashboard-type'; +import type { DateRange, DashboardOptions } from '@/api-clients/dashboard/_types/dashboard-type'; import { i18n } from '@/translations'; import { useDashboardStore } from '@/store/dashboard/dashboard-store'; diff --git a/apps/web/src/services/dashboards/components/dashboard-detail/DashboardToolsetScope.vue b/apps/web/src/services/dashboards/components/dashboard-detail/DashboardToolsetScope.vue index de7da92782..6599b75d4b 100644 --- a/apps/web/src/services/dashboards/components/dashboard-detail/DashboardToolsetScope.vue +++ b/apps/web/src/services/dashboards/components/dashboard-detail/DashboardToolsetScope.vue @@ -9,7 +9,7 @@ import { } from '@cloudforet/mirinae'; import type { SelectDropdownMenuItem, AutocompleteHandler } from '@cloudforet/mirinae/types/controls/dropdown/select-dropdown/type'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { WorkspaceListParameters } from '@/schema/identity/workspace/api-verbs/list'; import type { WorkspaceModel } from '@/schema/identity/workspace/model'; diff --git a/apps/web/src/services/dashboards/components/dashboard-detail/DashboardVariablesFormDynamic.vue b/apps/web/src/services/dashboards/components/dashboard-detail/DashboardVariablesFormDynamic.vue index 5b46d8c22c..8482a003e4 100644 --- a/apps/web/src/services/dashboards/components/dashboard-detail/DashboardVariablesFormDynamic.vue +++ b/apps/web/src/services/dashboards/components/dashboard-detail/DashboardVariablesFormDynamic.vue @@ -8,7 +8,7 @@ import { } from '@cloudforet/mirinae'; import type { MenuItem } from '@cloudforet/mirinae/types/controls/context-menu/type'; -import type { DashboardGlobalVariable } from '@/schema/dashboard/_types/dashboard-global-variable-type'; +import type { DashboardGlobalVariable } from '@/api-clients/dashboard/_types/dashboard-global-variable-type'; import { i18n } from '@/translations'; import { useAppContextStore } from '@/store/app-context/app-context-store'; diff --git a/apps/web/src/services/dashboards/components/dashboard-detail/DashboardVariablesFormManual.vue b/apps/web/src/services/dashboards/components/dashboard-detail/DashboardVariablesFormManual.vue index fce0e3b3e3..bb3bdac49f 100644 --- a/apps/web/src/services/dashboards/components/dashboard-detail/DashboardVariablesFormManual.vue +++ b/apps/web/src/services/dashboards/components/dashboard-detail/DashboardVariablesFormManual.vue @@ -8,7 +8,7 @@ import type { SelectDropdownMenuItem } from '@cloudforet/mirinae/types/controls/ import type { DashboardGlobalVariable, ManualVariable, -} from '@/schema/dashboard/_types/dashboard-global-variable-type'; +} from '@/api-clients/dashboard/_types/dashboard-global-variable-type'; import { i18n } from '@/translations'; import { useProxyValue } from '@/common/composables/proxy-state'; diff --git a/apps/web/src/services/dashboards/components/dashboard-detail/DashboardVariablesFormModal.vue b/apps/web/src/services/dashboards/components/dashboard-detail/DashboardVariablesFormModal.vue index d9a93c5d02..7bb6d70a87 100644 --- a/apps/web/src/services/dashboards/components/dashboard-detail/DashboardVariablesFormModal.vue +++ b/apps/web/src/services/dashboards/components/dashboard-detail/DashboardVariablesFormModal.vue @@ -7,7 +7,7 @@ import { PButtonModal, PFieldGroup, PTextInput, PRadioGroup, PRadio, PScopedNotification, } from '@cloudforet/mirinae'; -import type { DashboardGlobalVariable, ManualVariable } from '@/schema/dashboard/_types/dashboard-global-variable-type'; +import type { DashboardGlobalVariable, ManualVariable } from '@/api-clients/dashboard/_types/dashboard-global-variable-type'; import { i18n } from '@/translations'; import { useDashboardStore } from '@/store/dashboard/dashboard-store'; diff --git a/apps/web/src/services/dashboards/components/dashboard-detail/DashboardVariablesMoreButton.vue b/apps/web/src/services/dashboards/components/dashboard-detail/DashboardVariablesMoreButton.vue index f8fb2a21b3..987c2ff6cc 100644 --- a/apps/web/src/services/dashboards/components/dashboard-detail/DashboardVariablesMoreButton.vue +++ b/apps/web/src/services/dashboards/components/dashboard-detail/DashboardVariablesMoreButton.vue @@ -13,7 +13,7 @@ import { import { PButton, PContextMenu, useContextMenuController } from '@cloudforet/mirinae'; import type { MenuItem } from '@cloudforet/mirinae/types/controls/context-menu/type'; -import type { DashboardGlobalVariable } from '@/schema/dashboard/_types/dashboard-global-variable-type'; +import type { DashboardGlobalVariable } from '@/api-clients/dashboard/_types/dashboard-global-variable-type'; import { i18n } from '@/translations'; import { useDashboardStore } from '@/store/dashboard/dashboard-store'; diff --git a/apps/web/src/services/dashboards/components/dashboard-detail/DashboardVariablesV2.vue b/apps/web/src/services/dashboards/components/dashboard-detail/DashboardVariablesV2.vue index a3b1063860..3ff1fdb63d 100644 --- a/apps/web/src/services/dashboards/components/dashboard-detail/DashboardVariablesV2.vue +++ b/apps/web/src/services/dashboards/components/dashboard-detail/DashboardVariablesV2.vue @@ -6,8 +6,8 @@ import { isEqual } from 'lodash'; import { PI, PTextButton, PDivider } from '@cloudforet/mirinae'; -import type { DashboardGlobalVariable } from '@/schema/dashboard/_types/dashboard-global-variable-type'; -import type { DashboardVars } from '@/schema/dashboard/_types/dashboard-type'; +import type { DashboardGlobalVariable } from '@/api-clients/dashboard/_types/dashboard-global-variable-type'; +import type { DashboardVars } from '@/api-clients/dashboard/_types/dashboard-type'; import { useAppContextStore } from '@/store/app-context/app-context-store'; diff --git a/apps/web/src/services/dashboards/components/dashboard-detail/DashboardWidgetContainerV2.vue b/apps/web/src/services/dashboards/components/dashboard-detail/DashboardWidgetContainerV2.vue index 7611d621cb..cddcca73fe 100644 --- a/apps/web/src/services/dashboards/components/dashboard-detail/DashboardWidgetContainerV2.vue +++ b/apps/web/src/services/dashboards/components/dashboard-detail/DashboardWidgetContainerV2.vue @@ -11,18 +11,18 @@ import { PDataLoader, PEmpty, PButton, } from '@cloudforet/mirinae'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; -import type { PrivateDataTableModel } from '@/schema/dashboard/private-data-table/model'; -import type { PrivateWidgetCreateParameters } from '@/schema/dashboard/private-widget/api-verbs/create'; -import type { PrivateWidgetDeleteParameters } from '@/schema/dashboard/private-widget/api-verbs/delete'; -import type { PrivateWidgetUpdateParameters } from '@/schema/dashboard/private-widget/api-verbs/update'; -import type { PrivateWidgetModel } from '@/schema/dashboard/private-widget/model'; -import type { DataTableListParameters } from '@/schema/dashboard/public-data-table/api-verbs/list'; -import type { PublicDataTableModel } from '@/schema/dashboard/public-data-table/model'; -import type { PublicWidgetCreateParameters } from '@/schema/dashboard/public-widget/api-verbs/create'; -import type { PublicWidgetDeleteParameters } from '@/schema/dashboard/public-widget/api-verbs/delete'; -import type { PublicWidgetUpdateParameters } from '@/schema/dashboard/public-widget/api-verbs/update'; -import type { PublicWidgetModel } from '@/schema/dashboard/public-widget/model'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; +import type { PrivateDataTableModel } from '@/api-clients/dashboard/private-data-table/schema/model'; +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 { PrivateWidgetUpdateParameters } from '@/api-clients/dashboard/private-widget/schema/api-verbs/update'; +import type { PrivateWidgetModel } from '@/api-clients/dashboard/private-widget/schema/model'; +import type { DataTableListParameters } from '@/api-clients/dashboard/public-data-table/schema/api-verbs/list'; +import type { PublicDataTableModel } from '@/api-clients/dashboard/public-data-table/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 { PublicWidgetUpdateParameters } from '@/api-clients/dashboard/public-widget/schema/api-verbs/update'; +import type { PublicWidgetModel } from '@/api-clients/dashboard/public-widget/schema/model'; import { i18n } from '@/translations'; import { useDashboardStore } from '@/store/dashboard/dashboard-store'; diff --git a/apps/web/src/services/dashboards/components/dashboard-folder/DashboardFolderFormModal.vue b/apps/web/src/services/dashboards/components/dashboard-folder/DashboardFolderFormModal.vue index 840dcc032b..2a55c026ab 100644 --- a/apps/web/src/services/dashboards/components/dashboard-folder/DashboardFolderFormModal.vue +++ b/apps/web/src/services/dashboards/components/dashboard-folder/DashboardFolderFormModal.vue @@ -8,13 +8,13 @@ import { PButtonModal, PFieldGroup, PTextInput, PToggleButton, } from '@cloudforet/mirinae'; -import { RESOURCE_GROUP } from '@/schema/_common/constant'; -import type { PrivateFolderCreateParameters } from '@/schema/dashboard/private-folder/api-verbs/create'; -import type { PrivateFolderUpdateParameters } from '@/schema/dashboard/private-folder/api-verbs/update'; -import type { PrivateFolderModel } from '@/schema/dashboard/private-folder/model'; -import type { PublicFolderCreateParameters } from '@/schema/dashboard/public-folder/api-verbs/create'; -import type { PublicFolderUpdateParameters } from '@/schema/dashboard/public-folder/api-verbs/update'; -import type { PublicFolderModel } from '@/schema/dashboard/public-folder/model'; +import { RESOURCE_GROUP } from '@/api-clients/_common/schema/constant'; +import type { PrivateFolderCreateParameters } from '@/api-clients/dashboard/private-folder/schema/api-verbs/create'; +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 { PublicFolderUpdateParameters } from '@/api-clients/dashboard/public-folder/schema/api-verbs/update'; +import type { PublicFolderModel } from '@/api-clients/dashboard/public-folder/schema/model'; import { ROLE_TYPE } from '@/schema/identity/role/constant'; import { i18n } from '@/translations'; diff --git a/apps/web/src/services/dashboards/components/dashboard-main/DashboardBundleCloneModal.vue b/apps/web/src/services/dashboards/components/dashboard-main/DashboardBundleCloneModal.vue index 10c240608e..f830abcf50 100644 --- a/apps/web/src/services/dashboards/components/dashboard-main/DashboardBundleCloneModal.vue +++ b/apps/web/src/services/dashboards/components/dashboard-main/DashboardBundleCloneModal.vue @@ -10,8 +10,8 @@ import { import type { SelectDropdownMenuItem } from '@cloudforet/mirinae/types/controls/dropdown/select-dropdown/type'; import type { DataTableFieldType } from '@cloudforet/mirinae/types/data-display/tables/data-table/type'; -import type { DashboardModel } from '@/schema/dashboard/_types/dashboard-type'; -import type { FolderModel } from '@/schema/dashboard/_types/folder-type'; +import type { DashboardModel } from '@/api-clients/dashboard/_types/dashboard-type'; +import type { FolderModel } from '@/api-clients/dashboard/_types/folder-type'; import { ROLE_TYPE } from '@/schema/identity/role/constant'; import { i18n } from '@/translations'; diff --git a/apps/web/src/services/dashboards/components/dashboard-main/DashboardBundleDeleteModal.vue b/apps/web/src/services/dashboards/components/dashboard-main/DashboardBundleDeleteModal.vue index 54f59ca805..8502dc368a 100644 --- a/apps/web/src/services/dashboards/components/dashboard-main/DashboardBundleDeleteModal.vue +++ b/apps/web/src/services/dashboards/components/dashboard-main/DashboardBundleDeleteModal.vue @@ -4,8 +4,8 @@ import { computed, reactive } from 'vue'; import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; import { PDataTable, PI } from '@cloudforet/mirinae'; -import type { PrivateFolderDeleteParameters } from '@/schema/dashboard/private-folder/api-verbs/delete'; -import type { PublicFolderDeleteParameters } from '@/schema/dashboard/public-folder/api-verbs/delete'; +import type { PrivateFolderDeleteParameters } from '@/api-clients/dashboard/private-folder/schema/api-verbs/delete'; +import type { PublicFolderDeleteParameters } from '@/api-clients/dashboard/public-folder/schema/api-verbs/delete'; import { i18n } from '@/translations'; import { useDashboardStore } from '@/store/dashboard/dashboard-store'; diff --git a/apps/web/src/services/dashboards/components/dashboard-main/DashboardBundleMoveModal.vue b/apps/web/src/services/dashboards/components/dashboard-main/DashboardBundleMoveModal.vue index a2306d0812..d81b1eb68f 100644 --- a/apps/web/src/services/dashboards/components/dashboard-main/DashboardBundleMoveModal.vue +++ b/apps/web/src/services/dashboards/components/dashboard-main/DashboardBundleMoveModal.vue @@ -10,8 +10,8 @@ import { } from '@cloudforet/mirinae'; import type { SelectDropdownMenuItem } from '@cloudforet/mirinae/types/controls/dropdown/select-dropdown/type'; -import type { DashboardChangeFolderParams } from '@/schema/dashboard/_types/dashboard-type'; -import type { FolderModel } from '@/schema/dashboard/_types/folder-type'; +import type { DashboardChangeFolderParams } from '@/api-clients/dashboard/_types/dashboard-type'; +import type { FolderModel } from '@/api-clients/dashboard/_types/folder-type'; import { i18n } from '@/translations'; import { useAppContextStore } from '@/store/app-context/app-context-store'; diff --git a/apps/web/src/services/dashboards/components/dashboard-main/DashboardBundleShareModal.vue b/apps/web/src/services/dashboards/components/dashboard-main/DashboardBundleShareModal.vue index 0fd44a47d7..80d014416e 100644 --- a/apps/web/src/services/dashboards/components/dashboard-main/DashboardBundleShareModal.vue +++ b/apps/web/src/services/dashboards/components/dashboard-main/DashboardBundleShareModal.vue @@ -8,12 +8,12 @@ import { } from '@cloudforet/mirinae'; import type { MenuItem } from '@cloudforet/mirinae/types/controls/context-menu/type'; -import type { PublicDashboardShareParameters } from '@/schema/dashboard/public-dashboard/api-verbs/share'; -import type { PublicDashboardUnshareParameters } from '@/schema/dashboard/public-dashboard/api-verbs/unshare'; -import type { PublicDashboardModel } from '@/schema/dashboard/public-dashboard/model'; -import type { PublicFolderShareParameters } from '@/schema/dashboard/public-folder/api-verbs/share'; -import type { PublicFolderUnshareParameters } from '@/schema/dashboard/public-folder/api-verbs/unshare'; -import type { PublicFolderModel } from '@/schema/dashboard/public-folder/model'; +import type { PublicDashboardShareParameters } from '@/api-clients/dashboard/public-dashboard/schema/api-verbs/share'; +import type { PublicDashboardUnshareParameters } from '@/api-clients/dashboard/public-dashboard/schema/api-verbs/unshare'; +import type { PublicDashboardModel } from '@/api-clients/dashboard/public-dashboard/schema/model'; +import type { PublicFolderShareParameters } from '@/api-clients/dashboard/public-folder/schema/api-verbs/share'; +import type { PublicFolderUnshareParameters } from '@/api-clients/dashboard/public-folder/schema/api-verbs/unshare'; +import type { PublicFolderModel } from '@/api-clients/dashboard/public-folder/schema/model'; import { i18n } from '@/translations'; import { useAppContextStore } from '@/store/app-context/app-context-store'; diff --git a/apps/web/src/services/dashboards/components/dashboard-main/DashboardLSBTree.vue b/apps/web/src/services/dashboards/components/dashboard-main/DashboardLSBTree.vue index 848f3095cb..69ada238e1 100644 --- a/apps/web/src/services/dashboards/components/dashboard-main/DashboardLSBTree.vue +++ b/apps/web/src/services/dashboards/components/dashboard-main/DashboardLSBTree.vue @@ -9,7 +9,7 @@ import type { TreeNode } from '@cloudforet/mirinae/src/data-display/tree/tree-vi import type { MenuItem } from '@cloudforet/mirinae/types/controls/context-menu/type'; import type { TreeDisplayMap } from '@cloudforet/mirinae/types/data-display/tree/tree-view/type'; -import type { DashboardModel } from '@/schema/dashboard/_types/dashboard-type'; +import type { DashboardModel } from '@/api-clients/dashboard/_types/dashboard-type'; import { ROLE_TYPE } from '@/schema/identity/role/constant'; import { useAppContextStore } from '@/store/app-context/app-context-store'; diff --git a/apps/web/src/services/dashboards/components/dashboard-main/DashboardMainBoardList.vue b/apps/web/src/services/dashboards/components/dashboard-main/DashboardMainBoardList.vue index 8dc4756358..6b41c6453d 100644 --- a/apps/web/src/services/dashboards/components/dashboard-main/DashboardMainBoardList.vue +++ b/apps/web/src/services/dashboards/components/dashboard-main/DashboardMainBoardList.vue @@ -9,9 +9,9 @@ import { import type { BoardSet } from '@cloudforet/mirinae/types/data-display/board/type'; -import type { DashboardModel } from '@/schema/dashboard/_types/dashboard-type'; -import type { PrivateDashboardModel } from '@/schema/dashboard/private-dashboard/model'; -import type { PublicDashboardModel } from '@/schema/dashboard/public-dashboard/model'; +import type { DashboardModel } from '@/api-clients/dashboard/_types/dashboard-type'; +import type { PrivateDashboardModel } from '@/api-clients/dashboard/private-dashboard/schema/model'; +import type { PublicDashboardModel } from '@/api-clients/dashboard/public-dashboard/schema/model'; import { i18n } from '@/translations'; import { useAppContextStore } from '@/store/app-context/app-context-store'; diff --git a/apps/web/src/services/dashboards/components/legacy/DashboardManageVariableForm.vue b/apps/web/src/services/dashboards/components/legacy/DashboardManageVariableForm.vue index 42a59e8887..acd9bc3b1b 100644 --- a/apps/web/src/services/dashboards/components/legacy/DashboardManageVariableForm.vue +++ b/apps/web/src/services/dashboards/components/legacy/DashboardManageVariableForm.vue @@ -7,7 +7,7 @@ import { PButton, PFieldGroup, PSelectDropdown, PTextInput, useProxyValue, } from '@cloudforet/mirinae'; -import type { DashboardVariableSchemaProperty } from '@/schema/dashboard/_types/dashboard-type'; +import type { DashboardVariableSchemaProperty } from '@/api-clients/dashboard/_types/dashboard-type'; import { i18n } from '@/translations'; import getRandomId from '@/lib/random-id-generator'; diff --git a/apps/web/src/services/dashboards/components/legacy/DashboardVariableDropdown.vue b/apps/web/src/services/dashboards/components/legacy/DashboardVariableDropdown.vue index 9a5b139528..cd1e2a5350 100644 --- a/apps/web/src/services/dashboards/components/legacy/DashboardVariableDropdown.vue +++ b/apps/web/src/services/dashboards/components/legacy/DashboardVariableDropdown.vue @@ -15,7 +15,7 @@ import type { AutocompleteHandler, } from '@cloudforet/mirinae/types/controls/dropdown/select-dropdown/type'; -import type { DashboardVariableSchemaProperty, DashboardVariables } from '@/schema/dashboard/_types/dashboard-type'; +import type { DashboardVariableSchemaProperty, DashboardVariables } from '@/api-clients/dashboard/_types/dashboard-type'; import type { WorkspaceModel } from '@/schema/identity/workspace/model'; import { useUserWorkspaceStore } from '@/store/app-context/workspace/user-workspace-store'; diff --git a/apps/web/src/services/dashboards/components/legacy/DashboardVariables.vue b/apps/web/src/services/dashboards/components/legacy/DashboardVariables.vue index 8254e5edab..891bf09a14 100644 --- a/apps/web/src/services/dashboards/components/legacy/DashboardVariables.vue +++ b/apps/web/src/services/dashboards/components/legacy/DashboardVariables.vue @@ -5,7 +5,7 @@ import { isEqual, xor } from 'lodash'; import { PI, PTextButton, PDivider } from '@cloudforet/mirinae'; -import type { DashboardVariables, DashboardVariablesSchema } from '@/schema/dashboard/_types/dashboard-type'; +import type { DashboardVariables, DashboardVariablesSchema } from '@/api-clients/dashboard/_types/dashboard-type'; import ChangedMark from '@/common/components/marks/ChangedMark.vue'; diff --git a/apps/web/src/services/dashboards/components/legacy/WidgetFullModeModal.vue b/apps/web/src/services/dashboards/components/legacy/WidgetFullModeModal.vue index 66e3fab4c2..4bbeacf7c6 100644 --- a/apps/web/src/services/dashboards/components/legacy/WidgetFullModeModal.vue +++ b/apps/web/src/services/dashboards/components/legacy/WidgetFullModeModal.vue @@ -15,8 +15,8 @@ import type { DashboardVariablesSchema, DashboardVariables as IDashboardVariables, DashboardLayoutWidgetInfo, -} from '@/schema/dashboard/_types/dashboard-type'; -import type { WidgetSize } from '@/schema/dashboard/_types/widget-type'; +} from '@/api-clients/dashboard/_types/dashboard-type'; +import type { WidgetSize } from '@/api-clients/dashboard/_types/widget-type'; import { gray } from '@/styles/colors'; diff --git a/apps/web/src/services/dashboards/composables/use-dashboard-control-menu-items.ts b/apps/web/src/services/dashboards/composables/use-dashboard-control-menu-items.ts index aa369af4bd..a63dc381bb 100644 --- a/apps/web/src/services/dashboards/composables/use-dashboard-control-menu-items.ts +++ b/apps/web/src/services/dashboards/composables/use-dashboard-control-menu-items.ts @@ -3,8 +3,8 @@ import { computed } from 'vue'; import type { MenuItem } from '@cloudforet/mirinae/types/controls/context-menu/type'; -import type { DashboardModel } from '@/schema/dashboard/_types/dashboard-type'; -import type { FolderModel } from '@/schema/dashboard/_types/folder-type'; +import type { DashboardModel } from '@/api-clients/dashboard/_types/dashboard-type'; +import type { FolderModel } from '@/api-clients/dashboard/_types/folder-type'; import { i18n } from '@/translations'; diff --git a/apps/web/src/services/dashboards/composables/use-reformed-widget-info-list.ts b/apps/web/src/services/dashboards/composables/use-reformed-widget-info-list.ts index 5b2f04df9b..5926f71e76 100644 --- a/apps/web/src/services/dashboards/composables/use-reformed-widget-info-list.ts +++ b/apps/web/src/services/dashboards/composables/use-reformed-widget-info-list.ts @@ -3,8 +3,8 @@ import { computed, reactive, toRef } from 'vue'; import { flattenDeep } from 'lodash'; -import type { DashboardLayoutWidgetInfo } from '@/schema/dashboard/_types/dashboard-type'; -import type { WidgetConfig, WidgetSize } from '@/schema/dashboard/_types/widget-type'; +import type { DashboardLayoutWidgetInfo } from '@/api-clients/dashboard/_types/dashboard-type'; +import type { WidgetConfig, WidgetSize } from '@/api-clients/dashboard/_types/widget-type'; import { widgetThemeAssigner, diff --git a/apps/web/src/services/dashboards/constants/dashboard-managed-variables-schema.ts b/apps/web/src/services/dashboards/constants/dashboard-managed-variables-schema.ts index fbd8957792..7893603229 100644 --- a/apps/web/src/services/dashboards/constants/dashboard-managed-variables-schema.ts +++ b/apps/web/src/services/dashboards/constants/dashboard-managed-variables-schema.ts @@ -1,4 +1,4 @@ -import type { DashboardVariablesSchema } from '@/schema/dashboard/_types/dashboard-type'; +import type { DashboardVariablesSchema } from '@/api-clients/dashboard/_types/dashboard-type'; import { MANAGED_VARIABLE_MODEL_KEY_MAP, diff --git a/apps/web/src/services/dashboards/constants/dashboard-vars-schema-preset.ts b/apps/web/src/services/dashboards/constants/dashboard-vars-schema-preset.ts index ad46f2b7e0..21b2c0c4bf 100644 --- a/apps/web/src/services/dashboards/constants/dashboard-vars-schema-preset.ts +++ b/apps/web/src/services/dashboards/constants/dashboard-vars-schema-preset.ts @@ -1,4 +1,4 @@ -import type { DashboardGlobalVariablesSchema } from '@/schema/dashboard/_types/dashboard-type'; +import type { DashboardGlobalVariablesSchema } from '@/api-clients/dashboard/_types/dashboard-type'; diff --git a/apps/web/src/services/dashboards/constants/widget-container-config.ts b/apps/web/src/services/dashboards/constants/widget-container-config.ts index 2fe174df08..ff9613bc5e 100644 --- a/apps/web/src/services/dashboards/constants/widget-container-config.ts +++ b/apps/web/src/services/dashboards/constants/widget-container-config.ts @@ -1,4 +1,4 @@ -import type { WidgetConfig } from '@/schema/dashboard/_types/widget-type'; +import type { WidgetConfig } from '@/api-clients/dashboard/_types/widget-type'; import type { WidgetTheme } from '@/services/dashboards/widgets/_types/widget-type'; diff --git a/apps/web/src/services/dashboards/helpers/__tests__/widget-width-helper.test.ts b/apps/web/src/services/dashboards/helpers/__tests__/widget-width-helper.test.ts index 62895d9eff..ca5f10faa7 100644 --- a/apps/web/src/services/dashboards/helpers/__tests__/widget-width-helper.test.ts +++ b/apps/web/src/services/dashboards/helpers/__tests__/widget-width-helper.test.ts @@ -1,6 +1,6 @@ import { describe, expect } from 'vitest'; -import type { WidgetSize } from '@/schema/dashboard/_types/widget-type'; +import type { WidgetSize } from '@/api-clients/dashboard/_types/widget-type'; import { WIDGET_CONTAINER_MAX_WIDTH, diff --git a/apps/web/src/services/dashboards/helpers/dashboard-global-variables-helper.ts b/apps/web/src/services/dashboards/helpers/dashboard-global-variables-helper.ts index c8925d911f..d0464b125a 100644 --- a/apps/web/src/services/dashboards/helpers/dashboard-global-variables-helper.ts +++ b/apps/web/src/services/dashboards/helpers/dashboard-global-variables-helper.ts @@ -1,6 +1,6 @@ import { orderBy } from 'lodash'; -import type { DashboardGlobalVariable } from '@/schema/dashboard/_types/dashboard-global-variable-type'; +import type { DashboardGlobalVariable } from '@/api-clients/dashboard/_types/dashboard-global-variable-type'; import { DASHBOARD_VARS_SCHEMA_PRESET } from '@/services/dashboards/constants/dashboard-vars-schema-preset'; diff --git a/apps/web/src/services/dashboards/helpers/dashboard-share-helper.ts b/apps/web/src/services/dashboards/helpers/dashboard-share-helper.ts index b0d017e637..b9b3b2793a 100644 --- a/apps/web/src/services/dashboards/helpers/dashboard-share-helper.ts +++ b/apps/web/src/services/dashboards/helpers/dashboard-share-helper.ts @@ -2,13 +2,13 @@ import { cloneDeep, flattenDeep } from 'lodash'; import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; -import type { DashboardLayout } from '@/schema/dashboard/_types/dashboard-type'; -import type { PrivateDataTableModel } from '@/schema/dashboard/private-data-table/model'; -import type { PrivateWidgetModel } from '@/schema/dashboard/private-widget/model'; -import type { DataTableListParameters } from '@/schema/dashboard/public-data-table/api-verbs/list'; -import type { PublicDataTableModel } from '@/schema/dashboard/public-data-table/model'; -import type { PublicWidgetModel } from '@/schema/dashboard/public-widget/model'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; +import type { DashboardLayout } from '@/api-clients/dashboard/_types/dashboard-type'; +import type { PrivateDataTableModel } from '@/api-clients/dashboard/private-data-table/schema/model'; +import type { PrivateWidgetModel } from '@/api-clients/dashboard/private-widget/schema/model'; +import type { DataTableListParameters } from '@/api-clients/dashboard/public-data-table/schema/api-verbs/list'; +import type { PublicDataTableModel } from '@/api-clients/dashboard/public-data-table/schema/model'; +import type { PublicWidgetModel } from '@/api-clients/dashboard/public-widget/schema/model'; import type { CostDataSourceReferenceMap } from '@/store/reference/cost-data-source-reference-store'; diff --git a/apps/web/src/services/dashboards/helpers/dashboard-tree-data-helper.ts b/apps/web/src/services/dashboards/helpers/dashboard-tree-data-helper.ts index 0f42896012..a83f546b5c 100644 --- a/apps/web/src/services/dashboards/helpers/dashboard-tree-data-helper.ts +++ b/apps/web/src/services/dashboards/helpers/dashboard-tree-data-helper.ts @@ -1,7 +1,7 @@ import type { TreeNode } from '@cloudforet/mirinae/src/data-display/tree/tree-view/type'; -import type { DashboardModel } from '@/schema/dashboard/_types/dashboard-type'; -import type { FolderModel } from '@/schema/dashboard/_types/folder-type'; +import type { DashboardModel } from '@/api-clients/dashboard/_types/dashboard-type'; +import type { FolderModel } from '@/api-clients/dashboard/_types/folder-type'; import type { DashboardTreeDataType, DashboardDataTableItem } from '@/services/dashboards/types/dashboard-folder-type'; diff --git a/apps/web/src/services/dashboards/helpers/dashboard-widget-info-helper.ts b/apps/web/src/services/dashboards/helpers/dashboard-widget-info-helper.ts index 490c1bb1b6..5c7d243358 100644 --- a/apps/web/src/services/dashboards/helpers/dashboard-widget-info-helper.ts +++ b/apps/web/src/services/dashboards/helpers/dashboard-widget-info-helper.ts @@ -4,7 +4,7 @@ import { isObjectEqual } from '@cloudforet/utils'; import type { InheritOptions, WidgetConfig, WidgetFiltersMap, WidgetOptions, -} from '@/schema/dashboard/_types/widget-type'; +} from '@/api-clients/dashboard/_types/widget-type'; import { getInheritingOptionKeys } from '@/services/dashboards/widgets/_helpers/widget-inherit-options-helper'; import { getWidgetOptionKeyByVariableKey } from '@/services/dashboards/widgets/_helpers/widget-schema-helper'; diff --git a/apps/web/src/services/dashboards/helpers/widget-width-helper.ts b/apps/web/src/services/dashboards/helpers/widget-width-helper.ts index 1d227186df..5a2e6a3bf3 100644 --- a/apps/web/src/services/dashboards/helpers/widget-width-helper.ts +++ b/apps/web/src/services/dashboards/helpers/widget-width-helper.ts @@ -1,7 +1,7 @@ import { sum, max } from 'lodash'; -import { WIDGET_SIZE } from '@/schema/dashboard/_constants/widget-constant'; -import type { WidgetSize } from '@/schema/dashboard/_types/widget-type'; +import { WIDGET_SIZE } from '@/api-clients/dashboard/_constants/widget-constant'; +import type { WidgetSize } from '@/api-clients/dashboard/_types/widget-type'; import { WIDGET_WIDTH_RANGE_LIST, diff --git a/apps/web/src/services/dashboards/pages/DashboardsMainPage.vue b/apps/web/src/services/dashboards/pages/DashboardsMainPage.vue index 1f1724007d..3e4090f2e6 100644 --- a/apps/web/src/services/dashboards/pages/DashboardsMainPage.vue +++ b/apps/web/src/services/dashboards/pages/DashboardsMainPage.vue @@ -21,9 +21,9 @@ import type { } from '@cloudforet/mirinae/types/controls/search/query-search/type'; import type { ToolboxOptions } from '@cloudforet/mirinae/types/controls/toolbox/type'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; +import type { DashboardListParams, DashboardModel } from '@/api-clients/dashboard/_types/dashboard-type'; import { SpaceRouter } from '@/router'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; -import type { DashboardListParams, DashboardModel } from '@/schema/dashboard/_types/dashboard-type'; import { ROLE_TYPE } from '@/schema/identity/role/constant'; import { useAppContextStore } from '@/store/app-context/app-context-store'; diff --git a/apps/web/src/services/dashboards/stores/dashboard-create-page-store.ts b/apps/web/src/services/dashboards/stores/dashboard-create-page-store.ts index bb2132fc16..ef246438a6 100644 --- a/apps/web/src/services/dashboards/stores/dashboard-create-page-store.ts +++ b/apps/web/src/services/dashboards/stores/dashboard-create-page-store.ts @@ -4,8 +4,8 @@ import { defineStore } from 'pinia'; import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; -import type { DashboardType, AdminDashboardType } from '@/schema/dashboard/_types/dashboard-type'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; +import type { DashboardType, AdminDashboardType } from '@/api-clients/dashboard/_types/dashboard-type'; import type { DashboardTemplateListParameters } from '@/schema/repository/dashboard-template/api-verbs/list'; import type { DashboardTemplateModel } from '@/schema/repository/dashboard-template/model'; diff --git a/apps/web/src/services/dashboards/stores/dashboard-detail-info-store.ts b/apps/web/src/services/dashboards/stores/dashboard-detail-info-store.ts index 1f5f158c17..bf855dc686 100644 --- a/apps/web/src/services/dashboards/stores/dashboard-detail-info-store.ts +++ b/apps/web/src/services/dashboards/stores/dashboard-detail-info-store.ts @@ -6,8 +6,8 @@ import { defineStore } from 'pinia'; import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; import { getCancellableFetcher } from '@cloudforet/core-lib/space-connector/cancellable-fetcher'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; -import type { DashboardGlobalVariable } from '@/schema/dashboard/_types/dashboard-global-variable-type'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; +import type { DashboardGlobalVariable } from '@/api-clients/dashboard/_types/dashboard-global-variable-type'; import type { DashboardLayout, DashboardLayoutWidgetInfo, @@ -18,15 +18,15 @@ import type { DashboardVariablesSchema, DashboardVars, DashboardGlobalVariablesSchema, -} from '@/schema/dashboard/_types/dashboard-type'; -import type { PrivateDashboardGetParameters } from '@/schema/dashboard/private-dashboard/api-verbs/get'; -import type { PrivateDashboardModel } from '@/schema/dashboard/private-dashboard/model'; -import type { PrivateWidgetListParameters } from '@/schema/dashboard/private-widget/api-verbs/list'; -import type { PrivateWidgetModel } from '@/schema/dashboard/private-widget/model'; -import type { PublicDashboardGetParameters } from '@/schema/dashboard/public-dashboard/api-verbs/get'; -import type { PublicDashboardModel } from '@/schema/dashboard/public-dashboard/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/_types/dashboard-type'; +import type { PrivateDashboardGetParameters } from '@/api-clients/dashboard/private-dashboard/schema/api-verbs/get'; +import type { PrivateDashboardModel } from '@/api-clients/dashboard/private-dashboard/schema/model'; +import type { PrivateWidgetListParameters } from '@/api-clients/dashboard/private-widget/schema/api-verbs/list'; +import type { PrivateWidgetModel } from '@/api-clients/dashboard/private-widget/schema/model'; +import type { PublicDashboardGetParameters } from '@/api-clients/dashboard/public-dashboard/schema/api-verbs/get'; +import type { PublicDashboardModel } from '@/api-clients/dashboard/public-dashboard/schema/model'; +import type { PublicWidgetListParameters } from '@/api-clients/dashboard/public-widget/schema/api-verbs/list'; +import type { PublicWidgetModel } from '@/api-clients/dashboard/public-widget/schema/model'; import { ROLE_TYPE } from '@/schema/identity/role/constant'; import { useAppContextStore } from '@/store/app-context/app-context-store'; diff --git a/apps/web/src/services/dashboards/stores/dashboard-page-control-store.ts b/apps/web/src/services/dashboards/stores/dashboard-page-control-store.ts index 60d35de436..c17c827c82 100644 --- a/apps/web/src/services/dashboards/stores/dashboard-page-control-store.ts +++ b/apps/web/src/services/dashboards/stores/dashboard-page-control-store.ts @@ -5,12 +5,12 @@ import { defineStore } from 'pinia'; import type { QueryTag } from '@cloudforet/mirinae/src/controls/search/query-search-tags/type'; import type { TreeNode } from '@cloudforet/mirinae/src/data-display/tree/tree-view/type'; -import type { DashboardModel } from '@/schema/dashboard/_types/dashboard-type'; -import type { FolderModel } from '@/schema/dashboard/_types/folder-type'; -import type { PrivateDashboardModel } from '@/schema/dashboard/private-dashboard/model'; -import type { PrivateFolderModel } from '@/schema/dashboard/private-folder/model'; -import type { PublicDashboardModel } from '@/schema/dashboard/public-dashboard/model'; -import type { PublicFolderModel } from '@/schema/dashboard/public-folder/model'; +import type { DashboardModel } from '@/api-clients/dashboard/_types/dashboard-type'; +import type { FolderModel } from '@/api-clients/dashboard/_types/folder-type'; +import type { PrivateDashboardModel } from '@/api-clients/dashboard/private-dashboard/schema/model'; +import type { PrivateFolderModel } from '@/api-clients/dashboard/private-folder/schema/model'; +import type { PublicDashboardModel } from '@/api-clients/dashboard/public-dashboard/schema/model'; +import type { PublicFolderModel } from '@/api-clients/dashboard/public-folder/schema/model'; import { ROLE_TYPE } from '@/schema/identity/role/constant'; import { useAppContextStore } from '@/store/app-context/app-context-store'; diff --git a/apps/web/src/services/dashboards/stores/widget-form-store.ts b/apps/web/src/services/dashboards/stores/widget-form-store.ts index b1ed3abc77..9bea18d3fa 100644 --- a/apps/web/src/services/dashboards/stores/widget-form-store.ts +++ b/apps/web/src/services/dashboards/stores/widget-form-store.ts @@ -4,10 +4,10 @@ import { computed, reactive } from 'vue'; import { flattenDeep, union } from 'lodash'; import { defineStore } from 'pinia'; -import type { DashboardLayoutWidgetInfo } from '@/schema/dashboard/_types/dashboard-type'; +import type { DashboardLayoutWidgetInfo } from '@/api-clients/dashboard/_types/dashboard-type'; import type { InheritOptions, WidgetConfig, WidgetOptions, -} from '@/schema/dashboard/_types/widget-type'; +} from '@/api-clients/dashboard/_types/widget-type'; import { useAppContextStore } from '@/store/app-context/app-context-store'; diff --git a/apps/web/src/services/dashboards/types/shared-dashboard-type.ts b/apps/web/src/services/dashboards/types/shared-dashboard-type.ts index aacaddec48..3e3131a89e 100644 --- a/apps/web/src/services/dashboards/types/shared-dashboard-type.ts +++ b/apps/web/src/services/dashboards/types/shared-dashboard-type.ts @@ -1,9 +1,9 @@ -import type { PrivateDashboardModel } from '@/schema/dashboard/private-dashboard/model'; -import type { PrivateDataTableModel } from '@/schema/dashboard/private-data-table/model'; -import type { PrivateWidgetModel } from '@/schema/dashboard/private-widget/model'; -import type { PublicDashboardModel } from '@/schema/dashboard/public-dashboard/model'; -import type { PublicDataTableModel } from '@/schema/dashboard/public-data-table/model'; -import type { PublicWidgetModel } from '@/schema/dashboard/public-widget/model'; +import type { PrivateDashboardModel } from '@/api-clients/dashboard/private-dashboard/schema/model'; +import type { PrivateDataTableModel } from '@/api-clients/dashboard/private-data-table/schema/model'; +import type { PrivateWidgetModel } from '@/api-clients/dashboard/private-widget/schema/model'; +import type { PublicDashboardModel } from '@/api-clients/dashboard/public-dashboard/schema/model'; +import type { PublicDataTableModel } from '@/api-clients/dashboard/public-data-table/schema/model'; +import type { PublicWidgetModel } from '@/api-clients/dashboard/public-widget/schema/model'; type DashboardModel = PublicDashboardModel | PrivateDashboardModel; diff --git a/apps/web/src/services/dashboards/widgets/_base-widgets/base-count-of-findings/BaseCountOfFindingsWidget.vue b/apps/web/src/services/dashboards/widgets/_base-widgets/base-count-of-findings/BaseCountOfFindingsWidget.vue index 2ffc77f1e9..0efb27f99f 100644 --- a/apps/web/src/services/dashboards/widgets/_base-widgets/base-count-of-findings/BaseCountOfFindingsWidget.vue +++ b/apps/web/src/services/dashboards/widgets/_base-widgets/base-count-of-findings/BaseCountOfFindingsWidget.vue @@ -13,7 +13,7 @@ import { getCancellableFetcher } from '@cloudforet/core-lib/space-connector/canc import { ApiQueryHelper } from '@cloudforet/core-lib/space-connector/helper'; import { PDataLoader, PTextPagination } from '@cloudforet/mirinae'; -import { ASSET_DATA_FIELD_MAP } from '@/schema/dashboard/_constants/widget-constant'; +import { ASSET_DATA_FIELD_MAP } from '@/api-clients/dashboard/_constants/widget-constant'; import type { CloudServiceAnalyzeParameters } from '@/schema/inventory/cloud-service/api-verbs/analyze'; import type { ReferenceMap } from '@/store/reference/type'; diff --git a/apps/web/src/services/dashboards/widgets/_base-widgets/base-count-of-findings/widget-config.ts b/apps/web/src/services/dashboards/widgets/_base-widgets/base-count-of-findings/widget-config.ts index 92619a9e2b..a9da70f3a6 100644 --- a/apps/web/src/services/dashboards/widgets/_base-widgets/base-count-of-findings/widget-config.ts +++ b/apps/web/src/services/dashboards/widgets/_base-widgets/base-count-of-findings/widget-config.ts @@ -1,5 +1,5 @@ -import { ASSET_DATA_FIELD_MAP, GRANULARITY } from '@/schema/dashboard/_constants/widget-constant'; -import type { WidgetConfig } from '@/schema/dashboard/_types/widget-type'; +import { ASSET_DATA_FIELD_MAP, GRANULARITY } from '@/api-clients/dashboard/_constants/widget-constant'; +import type { WidgetConfig } from '@/api-clients/dashboard/_types/widget-type'; const baseCountOfFindingsWidgetConfig: WidgetConfig = { widget_config_id: 'baseCountOfFindings', diff --git a/apps/web/src/services/dashboards/widgets/_base-widgets/base-pie/BasePieWidget.vue b/apps/web/src/services/dashboards/widgets/_base-widgets/base-pie/BasePieWidget.vue index 15630711da..09a9dc874f 100644 --- a/apps/web/src/services/dashboards/widgets/_base-widgets/base-pie/BasePieWidget.vue +++ b/apps/web/src/services/dashboards/widgets/_base-widgets/base-pie/BasePieWidget.vue @@ -16,7 +16,7 @@ import { ApiQueryHelper } from '@cloudforet/core-lib/space-connector/helper'; import { PDataLoader, PSkeleton } from '@cloudforet/mirinae'; import { numberFormatter } from '@cloudforet/utils'; -import { CHART_TYPE, COST_DATA_FIELD_MAP } from '@/schema/dashboard/_constants/widget-constant'; +import { CHART_TYPE, COST_DATA_FIELD_MAP } from '@/api-clients/dashboard/_constants/widget-constant'; import { useAmcharts5 } from '@/common/composables/amcharts5'; import ErrorHandler from '@/common/composables/error/errorHandler'; diff --git a/apps/web/src/services/dashboards/widgets/_base-widgets/base-pie/widget-config.ts b/apps/web/src/services/dashboards/widgets/_base-widgets/base-pie/widget-config.ts index 799c670423..7ce31ad63f 100644 --- a/apps/web/src/services/dashboards/widgets/_base-widgets/base-pie/widget-config.ts +++ b/apps/web/src/services/dashboards/widgets/_base-widgets/base-pie/widget-config.ts @@ -1,5 +1,5 @@ -import { CHART_TYPE, COST_DATA_FIELD_MAP, GRANULARITY } from '@/schema/dashboard/_constants/widget-constant'; -import type { WidgetConfig } from '@/schema/dashboard/_types/widget-type'; +import { CHART_TYPE, COST_DATA_FIELD_MAP, GRANULARITY } from '@/api-clients/dashboard/_constants/widget-constant'; +import type { WidgetConfig } from '@/api-clients/dashboard/_types/widget-type'; const basePieWidgetConfig: WidgetConfig = { widget_config_id: 'basePie', diff --git a/apps/web/src/services/dashboards/widgets/_base-widgets/base-trend/BaseTrendWidget.vue b/apps/web/src/services/dashboards/widgets/_base-widgets/base-trend/BaseTrendWidget.vue index 242147e75b..632036cced 100644 --- a/apps/web/src/services/dashboards/widgets/_base-widgets/base-trend/BaseTrendWidget.vue +++ b/apps/web/src/services/dashboards/widgets/_base-widgets/base-trend/BaseTrendWidget.vue @@ -17,8 +17,8 @@ import { ApiQueryHelper } from '@cloudforet/core-lib/space-connector/helper'; import { PDataLoader } from '@cloudforet/mirinae'; import { sortArrayInObjectArray } from '@cloudforet/utils'; -import { CHART_TYPE, COST_DATA_FIELD_MAP, WIDGET_SIZE } from '@/schema/dashboard/_constants/widget-constant'; -import type { DateRange } from '@/schema/dashboard/_types/dashboard-type'; +import { CHART_TYPE, COST_DATA_FIELD_MAP, WIDGET_SIZE } from '@/api-clients/dashboard/_constants/widget-constant'; +import type { DateRange } from '@/api-clients/dashboard/_types/dashboard-type'; import { currencyMoneyFormatter } from '@/lib/helper/currency-helper'; import { usageUnitFormatter } from '@/lib/helper/usage-formatter'; diff --git a/apps/web/src/services/dashboards/widgets/_base-widgets/base-trend/widget-config.ts b/apps/web/src/services/dashboards/widgets/_base-widgets/base-trend/widget-config.ts index 3ed4398a02..ffb7644e22 100644 --- a/apps/web/src/services/dashboards/widgets/_base-widgets/base-trend/widget-config.ts +++ b/apps/web/src/services/dashboards/widgets/_base-widgets/base-trend/widget-config.ts @@ -1,5 +1,5 @@ -import { GRANULARITY } from '@/schema/dashboard/_constants/widget-constant'; -import type { WidgetConfig } from '@/schema/dashboard/_types/widget-type'; +import { GRANULARITY } from '@/api-clients/dashboard/_constants/widget-constant'; +import type { WidgetConfig } from '@/api-clients/dashboard/_types/widget-type'; const baseTrendWidgetConfig: WidgetConfig = { widget_config_id: 'baseTrend', diff --git a/apps/web/src/services/dashboards/widgets/_components/WidgetFrame.vue b/apps/web/src/services/dashboards/widgets/_components/WidgetFrame.vue index 17e5d066d1..6dacde9c95 100644 --- a/apps/web/src/services/dashboards/widgets/_components/WidgetFrame.vue +++ b/apps/web/src/services/dashboards/widgets/_components/WidgetFrame.vue @@ -12,9 +12,9 @@ import { } from '@cloudforet/mirinae'; import { ACTION_ICON } from '@cloudforet/mirinae/src/navigation/link/type'; -import { GRANULARITY, WIDGET_SIZE } from '@/schema/dashboard/_constants/widget-constant'; -import type { DateRange } from '@/schema/dashboard/_types/dashboard-type'; -import type { Granularity, WidgetSize } from '@/schema/dashboard/_types/widget-type'; +import { GRANULARITY, WIDGET_SIZE } from '@/api-clients/dashboard/_constants/widget-constant'; +import type { DateRange } from '@/api-clients/dashboard/_types/dashboard-type'; +import type { Granularity, WidgetSize } from '@/api-clients/dashboard/_types/widget-type'; import { i18n } from '@/translations'; import { CURRENCY_SYMBOL } from '@/store/display/constant'; diff --git a/apps/web/src/services/dashboards/widgets/_composables/use-widget-lifecycle.ts b/apps/web/src/services/dashboards/widgets/_composables/use-widget-lifecycle.ts index 651a70f312..1d2e89bbc1 100644 --- a/apps/web/src/services/dashboards/widgets/_composables/use-widget-lifecycle.ts +++ b/apps/web/src/services/dashboards/widgets/_composables/use-widget-lifecycle.ts @@ -9,8 +9,8 @@ import { isEqual, } from 'lodash'; -import type { DashboardVariables } from '@/schema/dashboard/_types/dashboard-type'; -import type { InheritOptions } from '@/schema/dashboard/_types/widget-type'; +import type { DashboardVariables } from '@/api-clients/dashboard/_types/dashboard-type'; +import type { InheritOptions } from '@/api-clients/dashboard/_types/widget-type'; import { i18n } from '@/translations'; import type { Currency } from '@/store/display/type'; diff --git a/apps/web/src/services/dashboards/widgets/_composables/use-widget/merge-base-widget-state.ts b/apps/web/src/services/dashboards/widgets/_composables/use-widget/merge-base-widget-state.ts index b2856e16bd..d3fd9aa713 100644 --- a/apps/web/src/services/dashboards/widgets/_composables/use-widget/merge-base-widget-state.ts +++ b/apps/web/src/services/dashboards/widgets/_composables/use-widget/merge-base-widget-state.ts @@ -5,8 +5,8 @@ import type { DashboardOptions, DashboardVariables, DashboardVariablesSchema, -} from '@/schema/dashboard/_types/dashboard-type'; -import type { InheritOptions, WidgetConfig, WidgetOptions } from '@/schema/dashboard/_types/widget-type'; +} from '@/api-clients/dashboard/_types/dashboard-type'; +import type { InheritOptions, WidgetConfig, WidgetOptions } from '@/api-clients/dashboard/_types/widget-type'; import { getWidgetConfig } from '@/services/dashboards/widgets/_helpers/widget-config-helper'; import { getInitialWidgetInheritOptions } from '@/services/dashboards/widgets/_helpers/widget-inherit-options-helper'; diff --git a/apps/web/src/services/dashboards/widgets/_composables/use-widget/use-base-widget-state.ts b/apps/web/src/services/dashboards/widgets/_composables/use-widget/use-base-widget-state.ts index a1453d6be9..aea1a05272 100644 --- a/apps/web/src/services/dashboards/widgets/_composables/use-widget/use-base-widget-state.ts +++ b/apps/web/src/services/dashboards/widgets/_composables/use-widget/use-base-widget-state.ts @@ -5,7 +5,7 @@ import { import type { AssetDataField, ChartType, CostDataField, Granularity, -} from '@/schema/dashboard/_types/widget-type'; +} from '@/api-clients/dashboard/_types/widget-type'; import { CURRENCY } from '@/store/display/constant'; import type { Currency } from '@/store/display/type'; diff --git a/apps/web/src/services/dashboards/widgets/_composables/use-widget/use-widget-console-filters.ts b/apps/web/src/services/dashboards/widgets/_composables/use-widget/use-widget-console-filters.ts index 52c1f2429a..51ada452c9 100644 --- a/apps/web/src/services/dashboards/widgets/_composables/use-widget/use-widget-console-filters.ts +++ b/apps/web/src/services/dashboards/widgets/_composables/use-widget/use-widget-console-filters.ts @@ -6,7 +6,7 @@ import { flattenDeep, isEmpty } from 'lodash'; import { QueryHelper } from '@cloudforet/core-lib/query'; import type { ConsoleFilter } from '@cloudforet/core-lib/query/type'; -import type { WidgetFiltersMap } from '@/schema/dashboard/_types/widget-type'; +import type { WidgetFiltersMap } from '@/api-clients/dashboard/_types/widget-type'; import type { BaseWidgetState } from '@/services/dashboards/widgets/_composables/use-widget/use-base-widget-state'; import type { OverridableWidgetState } from '@/services/dashboards/widgets/_composables/use-widget/use-widget'; diff --git a/apps/web/src/services/dashboards/widgets/_composables/use-widget/use-widget-date-range.ts b/apps/web/src/services/dashboards/widgets/_composables/use-widget/use-widget-date-range.ts index 126da4cf67..bfbf55324a 100644 --- a/apps/web/src/services/dashboards/widgets/_composables/use-widget/use-widget-date-range.ts +++ b/apps/web/src/services/dashboards/widgets/_composables/use-widget/use-widget-date-range.ts @@ -4,8 +4,8 @@ import { computed, isRef } from 'vue'; import dayjs from 'dayjs'; -import { GRANULARITY } from '@/schema/dashboard/_constants/widget-constant'; -import type { DateRange } from '@/schema/dashboard/_types/dashboard-type'; +import { GRANULARITY } from '@/api-clients/dashboard/_constants/widget-constant'; +import type { DateRange } from '@/api-clients/dashboard/_types/dashboard-type'; import type { BaseWidgetState } from '@/services/dashboards/widgets/_composables/use-widget/use-base-widget-state'; import type { OverridableWidgetState } from '@/services/dashboards/widgets/_composables/use-widget/use-widget'; diff --git a/apps/web/src/services/dashboards/widgets/_composables/use-widget/use-widget-frame.ts b/apps/web/src/services/dashboards/widgets/_composables/use-widget/use-widget-frame.ts index b32f8fe84b..ce84abae61 100644 --- a/apps/web/src/services/dashboards/widgets/_composables/use-widget/use-widget-frame.ts +++ b/apps/web/src/services/dashboards/widgets/_composables/use-widget/use-widget-frame.ts @@ -2,8 +2,8 @@ import type { ComputedRef, UnwrapRef } from 'vue'; import { computed } from 'vue'; import type { Location } from 'vue-router/types/router'; -import { WIDGET_SIZE } from '@/schema/dashboard/_constants/widget-constant'; -import type { DateRange } from '@/schema/dashboard/_types/dashboard-type'; +import { WIDGET_SIZE } from '@/api-clients/dashboard/_constants/widget-constant'; +import type { DateRange } from '@/api-clients/dashboard/_types/dashboard-type'; import { i18n } from '@/translations'; import type { Currency } from '@/store/display/type'; diff --git a/apps/web/src/services/dashboards/widgets/_composables/use-widget/use-widget-location.ts b/apps/web/src/services/dashboards/widgets/_composables/use-widget/use-widget-location.ts index 6a7740937c..98cc340315 100644 --- a/apps/web/src/services/dashboards/widgets/_composables/use-widget/use-widget-location.ts +++ b/apps/web/src/services/dashboards/widgets/_composables/use-widget/use-widget-location.ts @@ -6,7 +6,7 @@ import { flattenDeep } from 'lodash'; import { QueryHelper } from '@cloudforet/core-lib/query'; -import type { DateRange } from '@/schema/dashboard/_types/dashboard-type'; +import type { DateRange } from '@/api-clients/dashboard/_types/dashboard-type'; import { arrayToQueryString, objectToQueryString, primitiveToQueryString } from '@/lib/router-query-string'; diff --git a/apps/web/src/services/dashboards/widgets/_composables/use-widget/use-widget.ts b/apps/web/src/services/dashboards/widgets/_composables/use-widget/use-widget.ts index 64c9a286d1..1f054f6266 100644 --- a/apps/web/src/services/dashboards/widgets/_composables/use-widget/use-widget.ts +++ b/apps/web/src/services/dashboards/widgets/_composables/use-widget/use-widget.ts @@ -10,7 +10,7 @@ import type { Location } from 'vue-router/types/router'; import type { ConsoleFilter } from '@cloudforet/core-lib/query/type'; -import type { DateRange } from '@/schema/dashboard/_types/dashboard-type'; +import type { DateRange } from '@/api-clients/dashboard/_types/dashboard-type'; import type { BaseWidgetState, diff --git a/apps/web/src/services/dashboards/widgets/_constants/managed-widget-options-schema.ts b/apps/web/src/services/dashboards/widgets/_constants/managed-widget-options-schema.ts index 5f2cb335d6..e543991b6a 100644 --- a/apps/web/src/services/dashboards/widgets/_constants/managed-widget-options-schema.ts +++ b/apps/web/src/services/dashboards/widgets/_constants/managed-widget-options-schema.ts @@ -1,7 +1,7 @@ import type { WidgetFilterOptionKey, WidgetOptionKey, WidgetOptionsSchemaProperty, -} from '@/schema/dashboard/_types/widget-type'; +} from '@/api-clients/dashboard/_types/widget-type'; import { MANAGED_VARIABLE_MODEL_KEY_MAP } from '@/lib/variable-models/managed-model-config/base-managed-model-config'; diff --git a/apps/web/src/services/dashboards/widgets/_constants/widget-config-list-constant.ts b/apps/web/src/services/dashboards/widgets/_constants/widget-config-list-constant.ts index a874208c4f..8a45742bfe 100644 --- a/apps/web/src/services/dashboards/widgets/_constants/widget-config-list-constant.ts +++ b/apps/web/src/services/dashboards/widgets/_constants/widget-config-list-constant.ts @@ -25,7 +25,7 @@ import costTrendStacked from '@/services/dashboards/widgets/cost-widgets/cost-tr import costTrend from '@/services/dashboards/widgets/cost-widgets/cost-trend/widget-config'; import monthlyCost from '@/services/dashboards/widgets/cost-widgets/monthly-cost/widget-config'; -import type { WidgetConfig } from '@/schema/dashboard/_types/widget-type'; +import type { WidgetConfig } from '@/api-clients/dashboard/_types/widget-type'; import type { BaseWidgetConfigKey, WidgetConfigKey } from '@/services/dashboards/widgets/_types/widget-list-type'; export const BASE_WIDGET_CONFIG_KEYS = [ diff --git a/apps/web/src/services/dashboards/widgets/_helpers/__tests__/widget-inherit-options-helper.test.ts b/apps/web/src/services/dashboards/widgets/_helpers/__tests__/widget-inherit-options-helper.test.ts index 0ad7de6492..b7f20f2a23 100644 --- a/apps/web/src/services/dashboards/widgets/_helpers/__tests__/widget-inherit-options-helper.test.ts +++ b/apps/web/src/services/dashboards/widgets/_helpers/__tests__/widget-inherit-options-helper.test.ts @@ -1,8 +1,8 @@ import { cloneDeep } from 'lodash'; import { describe, expect, it } from 'vitest'; -import type { DashboardVariablesSchema } from '@/schema/dashboard/_types/dashboard-type'; -import type { InheritOptions, WidgetConfig, WidgetOptionsSchema } from '@/schema/dashboard/_types/widget-type'; +import type { DashboardVariablesSchema } from '@/api-clients/dashboard/_types/dashboard-type'; +import type { InheritOptions, WidgetConfig, WidgetOptionsSchema } from '@/api-clients/dashboard/_types/widget-type'; import { getInheritingOptionKeys, diff --git a/apps/web/src/services/dashboards/widgets/_helpers/__tests__/widget-options-filters-helper.test.ts b/apps/web/src/services/dashboards/widgets/_helpers/__tests__/widget-options-filters-helper.test.ts index 9eaa7af7e0..61d4f9a8a7 100644 --- a/apps/web/src/services/dashboards/widgets/_helpers/__tests__/widget-options-filters-helper.test.ts +++ b/apps/web/src/services/dashboards/widgets/_helpers/__tests__/widget-options-filters-helper.test.ts @@ -1,4 +1,4 @@ -import type { WidgetFilterKey, WidgetFiltersMap } from '@/schema/dashboard/_types/widget-type'; +import type { WidgetFilterKey, WidgetFiltersMap } from '@/api-clients/dashboard/_types/widget-type'; import { setFilterAndGetWidgetFiltersMap } from '@/services/dashboards/widgets/_helpers/widget-options-filters-helper'; diff --git a/apps/web/src/services/dashboards/widgets/_helpers/__tests__/widget-schema-helper.test.ts b/apps/web/src/services/dashboards/widgets/_helpers/__tests__/widget-schema-helper.test.ts index a1fff9193d..611ed71954 100644 --- a/apps/web/src/services/dashboards/widgets/_helpers/__tests__/widget-schema-helper.test.ts +++ b/apps/web/src/services/dashboards/widgets/_helpers/__tests__/widget-schema-helper.test.ts @@ -1,7 +1,7 @@ import { describe, expect, it } from 'vitest'; -import type { DashboardVariableSchemaProperty, DashboardVariablesSchema } from '@/schema/dashboard/_types/dashboard-type'; -import type { InheritOptions, WidgetConfig, WidgetOptions } from '@/schema/dashboard/_types/widget-type'; +import type { DashboardVariableSchemaProperty, DashboardVariablesSchema } from '@/api-clients/dashboard/_types/dashboard-type'; +import type { InheritOptions, WidgetConfig, WidgetOptions } from '@/api-clients/dashboard/_types/widget-type'; import { getInitialSchemaProperties, getNonInheritedWidgetOptionNamesAmongUsedVariables, diff --git a/apps/web/src/services/dashboards/widgets/_helpers/widget-chart-helper.ts b/apps/web/src/services/dashboards/widgets/_helpers/widget-chart-helper.ts index 38c1290959..56b8c76c55 100644 --- a/apps/web/src/services/dashboards/widgets/_helpers/widget-chart-helper.ts +++ b/apps/web/src/services/dashboards/widgets/_helpers/widget-chart-helper.ts @@ -2,9 +2,9 @@ import type { TimeUnit } from '@amcharts/amcharts5/.internal/core/util/Time'; import type { IDateAxisSettings } from '@amcharts/amcharts5/xy'; import dayjs from 'dayjs'; -import { COST_DATA_FIELD_MAP, GRANULARITY } from '@/schema/dashboard/_constants/widget-constant'; -import type { DateRange } from '@/schema/dashboard/_types/dashboard-type'; -import type { Granularity } from '@/schema/dashboard/_types/widget-type'; +import { COST_DATA_FIELD_MAP, GRANULARITY } from '@/api-clients/dashboard/_constants/widget-constant'; +import type { DateRange } from '@/api-clients/dashboard/_types/dashboard-type'; +import type { Granularity } from '@/api-clients/dashboard/_types/widget-type'; import type { AllReferenceTypeInfo } from '@/services/dashboards/stores/all-reference-type-info-store'; import type { diff --git a/apps/web/src/services/dashboards/widgets/_helpers/widget-config-helper.ts b/apps/web/src/services/dashboards/widgets/_helpers/widget-config-helper.ts index 3fec3e09e5..95382780f0 100644 --- a/apps/web/src/services/dashboards/widgets/_helpers/widget-config-helper.ts +++ b/apps/web/src/services/dashboards/widgets/_helpers/widget-config-helper.ts @@ -1,6 +1,6 @@ import { mergeWith } from 'lodash'; -import type { WidgetConfig, BaseConfigInfo } from '@/schema/dashboard/_types/widget-type'; +import type { WidgetConfig, BaseConfigInfo } from '@/api-clients/dashboard/_types/widget-type'; import { BASE_WIDGET_CONFIGS, CONSOLE_WIDGET_CONFIGS } from '@/services/dashboards/widgets/_constants/widget-config-list-constant'; diff --git a/apps/web/src/services/dashboards/widgets/_helpers/widget-inherit-options-helper.ts b/apps/web/src/services/dashboards/widgets/_helpers/widget-inherit-options-helper.ts index 07a8047ad7..2ad9830bc1 100644 --- a/apps/web/src/services/dashboards/widgets/_helpers/widget-inherit-options-helper.ts +++ b/apps/web/src/services/dashboards/widgets/_helpers/widget-inherit-options-helper.ts @@ -1,5 +1,5 @@ -import type { DashboardVariablesSchema } from '@/schema/dashboard/_types/dashboard-type'; -import type { InheritOptions, WidgetConfig } from '@/schema/dashboard/_types/widget-type'; +import type { DashboardVariablesSchema } from '@/api-clients/dashboard/_types/dashboard-type'; +import type { InheritOptions, WidgetConfig } from '@/api-clients/dashboard/_types/widget-type'; export const getInitialWidgetInheritOptions = ( diff --git a/apps/web/src/services/dashboards/widgets/_helpers/widget-location-helper.ts b/apps/web/src/services/dashboards/widgets/_helpers/widget-location-helper.ts index d7acb2ce1d..33f483d994 100644 --- a/apps/web/src/services/dashboards/widgets/_helpers/widget-location-helper.ts +++ b/apps/web/src/services/dashboards/widgets/_helpers/widget-location-helper.ts @@ -4,7 +4,7 @@ import { cloneDeep } from 'lodash'; import type { ConsoleFilter } from '@cloudforet/core-lib/query/type'; -import type { WidgetFiltersMap } from '@/schema/dashboard/_types/widget-type'; +import type { WidgetFiltersMap } from '@/api-clients/dashboard/_types/widget-type'; import { arrayToQueryString, queryStringToArray } from '@/lib/router-query-string'; diff --git a/apps/web/src/services/dashboards/widgets/_helpers/widget-options-filters-helper.ts b/apps/web/src/services/dashboards/widgets/_helpers/widget-options-filters-helper.ts index 8a77bbe360..eea851b520 100644 --- a/apps/web/src/services/dashboards/widgets/_helpers/widget-options-filters-helper.ts +++ b/apps/web/src/services/dashboards/widgets/_helpers/widget-options-filters-helper.ts @@ -1,6 +1,6 @@ import { cloneDeep, union } from 'lodash'; -import type { WidgetFiltersMap, WidgetFilterKey } from '@/schema/dashboard/_types/widget-type'; +import type { WidgetFiltersMap, WidgetFilterKey } from '@/api-clients/dashboard/_types/widget-type'; import { MANAGED_VARIABLE_MODELS } from '@/lib/variable-models/managed-model-config/base-managed-model-config'; diff --git a/apps/web/src/services/dashboards/widgets/_helpers/widget-options-helper.ts b/apps/web/src/services/dashboards/widgets/_helpers/widget-options-helper.ts index 2fbcde928c..693c64929f 100644 --- a/apps/web/src/services/dashboards/widgets/_helpers/widget-options-helper.ts +++ b/apps/web/src/services/dashboards/widgets/_helpers/widget-options-helper.ts @@ -1,9 +1,9 @@ import { isEqual, merge } from 'lodash'; -import type { DashboardVariables } from '@/schema/dashboard/_types/dashboard-type'; +import type { DashboardVariables } from '@/api-clients/dashboard/_types/dashboard-type'; import type { InheritOptions, WidgetConfig, WidgetOptions, WidgetFilterKey, -} from '@/schema/dashboard/_types/widget-type'; +} from '@/api-clients/dashboard/_types/widget-type'; import { setFilterAndGetWidgetFiltersMap } from '@/services/dashboards/widgets/_helpers/widget-options-filters-helper'; diff --git a/apps/web/src/services/dashboards/widgets/_helpers/widget-options-schema-generator.ts b/apps/web/src/services/dashboards/widgets/_helpers/widget-options-schema-generator.ts index 12e0f83870..23bcb62a2d 100644 --- a/apps/web/src/services/dashboards/widgets/_helpers/widget-options-schema-generator.ts +++ b/apps/web/src/services/dashboards/widgets/_helpers/widget-options-schema-generator.ts @@ -1,4 +1,4 @@ -import type { WidgetOptionKey, WidgetOptionsSchema, WidgetOptionsSchemaProperty } from '@/schema/dashboard/_types/widget-type'; +import type { WidgetOptionKey, WidgetOptionsSchema, WidgetOptionsSchemaProperty } from '@/api-clients/dashboard/_types/widget-type'; import { MANAGED_WIDGET_FILTERS_SCHEMA_PROPERTIES, diff --git a/apps/web/src/services/dashboards/widgets/_helpers/widget-schema-helper.ts b/apps/web/src/services/dashboards/widgets/_helpers/widget-schema-helper.ts index e2954bcde6..72b4dad4b8 100644 --- a/apps/web/src/services/dashboards/widgets/_helpers/widget-schema-helper.ts +++ b/apps/web/src/services/dashboards/widgets/_helpers/widget-schema-helper.ts @@ -1,9 +1,9 @@ import { chain, get, union } from 'lodash'; -import type { DashboardVariablesSchema } from '@/schema/dashboard/_types/dashboard-type'; +import type { DashboardVariablesSchema } from '@/api-clients/dashboard/_types/dashboard-type'; import type { InheritOptions, WidgetConfig, WidgetFilterOptionKey, WidgetOptions, WidgetOptionsSchema, -} from '@/schema/dashboard/_types/widget-type'; +} from '@/api-clients/dashboard/_types/widget-type'; import { MANAGED_WIDGET_FILTERS_SCHEMA_PROPERTIES, MANAGED_WIDGET_OPTIONS_SCHEMA_PROPERTIES } from '@/services/dashboards/widgets/_constants/managed-widget-options-schema'; diff --git a/apps/web/src/services/dashboards/widgets/_helpers/widget-table-helper.ts b/apps/web/src/services/dashboards/widgets/_helpers/widget-table-helper.ts index fc93bb3c5a..52a580f5bd 100644 --- a/apps/web/src/services/dashboards/widgets/_helpers/widget-table-helper.ts +++ b/apps/web/src/services/dashboards/widgets/_helpers/widget-table-helper.ts @@ -2,9 +2,9 @@ import type { TimeUnit } from '@amcharts/amcharts5/.internal/core/util/Time'; import dayjs from 'dayjs'; import { cloneDeep, sortBy } from 'lodash'; -import { GRANULARITY } from '@/schema/dashboard/_constants/widget-constant'; -import type { DateRange } from '@/schema/dashboard/_types/dashboard-type'; -import type { Granularity } from '@/schema/dashboard/_types/widget-type'; +import { GRANULARITY } from '@/api-clients/dashboard/_constants/widget-constant'; +import type { DateRange } from '@/api-clients/dashboard/_types/dashboard-type'; +import type { Granularity } from '@/api-clients/dashboard/_types/widget-type'; import type { ManagedVariableModelKey } from '@/lib/variable-models/managed-model-config/base-managed-model-config'; diff --git a/apps/web/src/services/dashboards/widgets/_helpers/widget-validation-helper.ts b/apps/web/src/services/dashboards/widgets/_helpers/widget-validation-helper.ts index 4a37e873cf..75898b3090 100644 --- a/apps/web/src/services/dashboards/widgets/_helpers/widget-validation-helper.ts +++ b/apps/web/src/services/dashboards/widgets/_helpers/widget-validation-helper.ts @@ -2,13 +2,13 @@ import { cloneDeep, isEmpty, isEqual, union, } from 'lodash'; -import type { DashboardLayoutWidgetInfo, DashboardVariablesSchema } from '@/schema/dashboard/_types/dashboard-type'; +import type { DashboardLayoutWidgetInfo, DashboardVariablesSchema } from '@/api-clients/dashboard/_types/dashboard-type'; import type { InheritOptions, WidgetConfig, WidgetFilterOptionKey, WidgetOptionsSchema, -} from '@/schema/dashboard/_types/widget-type'; +} from '@/api-clients/dashboard/_types/widget-type'; import { getUpdatedWidgetInfo } from '@/services/dashboards/helpers/dashboard-widget-info-helper'; import { getInheritingOptionKeys } from '@/services/dashboards/widgets/_helpers/widget-inherit-options-helper'; diff --git a/apps/web/src/services/dashboards/widgets/_types/widget-type.ts b/apps/web/src/services/dashboards/widgets/_types/widget-type.ts index 9c973130bf..108077612a 100644 --- a/apps/web/src/services/dashboards/widgets/_types/widget-type.ts +++ b/apps/web/src/services/dashboards/widgets/_types/widget-type.ts @@ -5,11 +5,11 @@ import type { DashboardOptions, DashboardVariables, DashboardVariablesSchema, -} from '@/schema/dashboard/_types/dashboard-type'; +} from '@/api-clients/dashboard/_types/dashboard-type'; import type { InheritOptions, WidgetOptions, WidgetSize, -} from '@/schema/dashboard/_types/widget-type'; +} from '@/api-clients/dashboard/_types/widget-type'; import type { AllReferenceTypeInfo } from '@/services/dashboards/stores/all-reference-type-info-store'; diff --git a/apps/web/src/services/dashboards/widgets/asset-widgets/compliance-status/widget-config.ts b/apps/web/src/services/dashboards/widgets/asset-widgets/compliance-status/widget-config.ts index 86d55f5b6c..4ef09eecb0 100644 --- a/apps/web/src/services/dashboards/widgets/asset-widgets/compliance-status/widget-config.ts +++ b/apps/web/src/services/dashboards/widgets/asset-widgets/compliance-status/widget-config.ts @@ -1,4 +1,4 @@ -import type { WidgetConfig } from '@/schema/dashboard/_types/widget-type'; +import type { WidgetConfig } from '@/api-clients/dashboard/_types/widget-type'; import { getWidgetOptionsSchema } from '@/services/dashboards/widgets/_helpers/widget-options-schema-generator'; diff --git a/apps/web/src/services/dashboards/widgets/asset-widgets/count-of-fail-findings/widget-config.ts b/apps/web/src/services/dashboards/widgets/asset-widgets/count-of-fail-findings/widget-config.ts index d138286c09..8a7ff243ff 100644 --- a/apps/web/src/services/dashboards/widgets/asset-widgets/count-of-fail-findings/widget-config.ts +++ b/apps/web/src/services/dashboards/widgets/asset-widgets/count-of-fail-findings/widget-config.ts @@ -1,5 +1,5 @@ -import { ASSET_DATA_FIELD_MAP, GRANULARITY } from '@/schema/dashboard/_constants/widget-constant'; -import type { WidgetConfig } from '@/schema/dashboard/_types/widget-type'; +import { ASSET_DATA_FIELD_MAP, GRANULARITY } from '@/api-clients/dashboard/_constants/widget-constant'; +import type { WidgetConfig } from '@/api-clients/dashboard/_types/widget-type'; import { getWidgetOptionsSchema } from '@/services/dashboards/widgets/_helpers/widget-options-schema-generator'; diff --git a/apps/web/src/services/dashboards/widgets/asset-widgets/count-of-pass-and-fail-findings/widget-config.ts b/apps/web/src/services/dashboards/widgets/asset-widgets/count-of-pass-and-fail-findings/widget-config.ts index 7dab775eef..64ee6aaa85 100644 --- a/apps/web/src/services/dashboards/widgets/asset-widgets/count-of-pass-and-fail-findings/widget-config.ts +++ b/apps/web/src/services/dashboards/widgets/asset-widgets/count-of-pass-and-fail-findings/widget-config.ts @@ -1,5 +1,5 @@ -import { ASSET_DATA_FIELD_MAP, GRANULARITY } from '@/schema/dashboard/_constants/widget-constant'; -import type { WidgetConfig } from '@/schema/dashboard/_types/widget-type'; +import { ASSET_DATA_FIELD_MAP, GRANULARITY } from '@/api-clients/dashboard/_constants/widget-constant'; +import type { WidgetConfig } from '@/api-clients/dashboard/_types/widget-type'; import { getWidgetOptionsSchema } from '@/services/dashboards/widgets/_helpers/widget-options-schema-generator'; diff --git a/apps/web/src/services/dashboards/widgets/asset-widgets/severity-status-by-service/widget-config.ts b/apps/web/src/services/dashboards/widgets/asset-widgets/severity-status-by-service/widget-config.ts index 3ddf62bd88..1906823970 100644 --- a/apps/web/src/services/dashboards/widgets/asset-widgets/severity-status-by-service/widget-config.ts +++ b/apps/web/src/services/dashboards/widgets/asset-widgets/severity-status-by-service/widget-config.ts @@ -1,4 +1,4 @@ -import type { WidgetConfig } from '@/schema/dashboard/_types/widget-type'; +import type { WidgetConfig } from '@/api-clients/dashboard/_types/widget-type'; import { getWidgetOptionsSchema } from '@/services/dashboards/widgets/_helpers/widget-options-schema-generator'; diff --git a/apps/web/src/services/dashboards/widgets/asset-widgets/total-fail-findings-history/TotalFailFindingsHistoryWidget.vue b/apps/web/src/services/dashboards/widgets/asset-widgets/total-fail-findings-history/TotalFailFindingsHistoryWidget.vue index f45bf8d4af..1d40db1693 100644 --- a/apps/web/src/services/dashboards/widgets/asset-widgets/total-fail-findings-history/TotalFailFindingsHistoryWidget.vue +++ b/apps/web/src/services/dashboards/widgets/asset-widgets/total-fail-findings-history/TotalFailFindingsHistoryWidget.vue @@ -15,8 +15,8 @@ import { } from '@cloudforet/mirinae'; import { numberFormatter } from '@cloudforet/utils'; -import { GRANULARITY } from '@/schema/dashboard/_constants/widget-constant'; -import type { DateRange } from '@/schema/dashboard/_types/dashboard-type'; +import { GRANULARITY } from '@/api-clients/dashboard/_constants/widget-constant'; +import type { DateRange } from '@/api-clients/dashboard/_types/dashboard-type'; import { i18n } from '@/translations'; import { useAmcharts5 } from '@/common/composables/amcharts5'; diff --git a/apps/web/src/services/dashboards/widgets/asset-widgets/total-fail-findings-history/widget-config.ts b/apps/web/src/services/dashboards/widgets/asset-widgets/total-fail-findings-history/widget-config.ts index dcfbf1569e..7002896ba8 100644 --- a/apps/web/src/services/dashboards/widgets/asset-widgets/total-fail-findings-history/widget-config.ts +++ b/apps/web/src/services/dashboards/widgets/asset-widgets/total-fail-findings-history/widget-config.ts @@ -1,5 +1,5 @@ -import { GRANULARITY } from '@/schema/dashboard/_constants/widget-constant'; -import type { WidgetConfig } from '@/schema/dashboard/_types/widget-type'; +import { GRANULARITY } from '@/api-clients/dashboard/_constants/widget-constant'; +import type { WidgetConfig } from '@/api-clients/dashboard/_types/widget-type'; import { getWidgetOptionsSchema } from '@/services/dashboards/widgets/_helpers/widget-options-schema-generator'; diff --git a/apps/web/src/services/dashboards/widgets/asset-widgets/total-fail-findings-status/widget-config.ts b/apps/web/src/services/dashboards/widgets/asset-widgets/total-fail-findings-status/widget-config.ts index d5fbb83351..ec0db72670 100644 --- a/apps/web/src/services/dashboards/widgets/asset-widgets/total-fail-findings-status/widget-config.ts +++ b/apps/web/src/services/dashboards/widgets/asset-widgets/total-fail-findings-status/widget-config.ts @@ -1,4 +1,4 @@ -import type { WidgetConfig } from '@/schema/dashboard/_types/widget-type'; +import type { WidgetConfig } from '@/api-clients/dashboard/_types/widget-type'; import { getWidgetOptionsSchema } from '@/services/dashboards/widgets/_helpers/widget-options-schema-generator'; diff --git a/apps/web/src/services/dashboards/widgets/asset-widgets/trend-of-pass-and-fail-findings/TrendOfPassAndFailFindingsWidget.vue b/apps/web/src/services/dashboards/widgets/asset-widgets/trend-of-pass-and-fail-findings/TrendOfPassAndFailFindingsWidget.vue index 1f2051b3b6..1fab8fe3cc 100644 --- a/apps/web/src/services/dashboards/widgets/asset-widgets/trend-of-pass-and-fail-findings/TrendOfPassAndFailFindingsWidget.vue +++ b/apps/web/src/services/dashboards/widgets/asset-widgets/trend-of-pass-and-fail-findings/TrendOfPassAndFailFindingsWidget.vue @@ -12,8 +12,8 @@ import { getCancellableFetcher } from '@cloudforet/core-lib/space-connector/canc import { ApiQueryHelper } from '@cloudforet/core-lib/space-connector/helper'; import { PDataLoader } from '@cloudforet/mirinae'; -import { ASSET_DATA_FIELD_MAP, WIDGET_SIZE } from '@/schema/dashboard/_constants/widget-constant'; -import type { DateRange } from '@/schema/dashboard/_types/dashboard-type'; +import { ASSET_DATA_FIELD_MAP, WIDGET_SIZE } from '@/api-clients/dashboard/_constants/widget-constant'; +import type { DateRange } from '@/api-clients/dashboard/_types/dashboard-type'; import { useAmcharts5 } from '@/common/composables/amcharts5'; import { setXYSharedTooltipTextWithRate } from '@/common/composables/amcharts5/xy-chart-helper'; diff --git a/apps/web/src/services/dashboards/widgets/asset-widgets/trend-of-pass-and-fail-findings/widget-config.ts b/apps/web/src/services/dashboards/widgets/asset-widgets/trend-of-pass-and-fail-findings/widget-config.ts index 7622979ce4..2a34f114b7 100644 --- a/apps/web/src/services/dashboards/widgets/asset-widgets/trend-of-pass-and-fail-findings/widget-config.ts +++ b/apps/web/src/services/dashboards/widgets/asset-widgets/trend-of-pass-and-fail-findings/widget-config.ts @@ -1,5 +1,5 @@ -import { ASSET_DATA_FIELD_MAP, GRANULARITY } from '@/schema/dashboard/_constants/widget-constant'; -import type { WidgetConfig } from '@/schema/dashboard/_types/widget-type'; +import { ASSET_DATA_FIELD_MAP, GRANULARITY } from '@/api-clients/dashboard/_constants/widget-constant'; +import type { WidgetConfig } from '@/api-clients/dashboard/_types/widget-type'; import { getWidgetOptionsSchema } from '@/services/dashboards/widgets/_helpers/widget-options-schema-generator'; diff --git a/apps/web/src/services/dashboards/widgets/cost-widgets/budget-status/widget-config.ts b/apps/web/src/services/dashboards/widgets/cost-widgets/budget-status/widget-config.ts index 82e3929fc2..c188ba39d5 100644 --- a/apps/web/src/services/dashboards/widgets/cost-widgets/budget-status/widget-config.ts +++ b/apps/web/src/services/dashboards/widgets/cost-widgets/budget-status/widget-config.ts @@ -1,5 +1,5 @@ -import { CHART_TYPE, GRANULARITY } from '@/schema/dashboard/_constants/widget-constant'; -import type { WidgetConfig } from '@/schema/dashboard/_types/widget-type'; +import { CHART_TYPE, GRANULARITY } from '@/api-clients/dashboard/_constants/widget-constant'; +import type { WidgetConfig } from '@/api-clients/dashboard/_types/widget-type'; import { getWidgetOptionsSchema } from '@/services/dashboards/widgets/_helpers/widget-options-schema-generator'; diff --git a/apps/web/src/services/dashboards/widgets/cost-widgets/budget-usage-by-target/BudgetUsageByTargetWidget.vue b/apps/web/src/services/dashboards/widgets/cost-widgets/budget-usage-by-target/BudgetUsageByTargetWidget.vue index eeca362d66..f0abe2ca57 100644 --- a/apps/web/src/services/dashboards/widgets/cost-widgets/budget-usage-by-target/BudgetUsageByTargetWidget.vue +++ b/apps/web/src/services/dashboards/widgets/cost-widgets/budget-usage-by-target/BudgetUsageByTargetWidget.vue @@ -12,7 +12,7 @@ import { PProgressBar, } from '@cloudforet/mirinae'; -import { COST_DATA_FIELD_MAP } from '@/schema/dashboard/_constants/widget-constant'; +import { COST_DATA_FIELD_MAP } from '@/api-clients/dashboard/_constants/widget-constant'; import ErrorHandler from '@/common/composables/error/errorHandler'; diff --git a/apps/web/src/services/dashboards/widgets/cost-widgets/budget-usage-by-target/widget-config.ts b/apps/web/src/services/dashboards/widgets/cost-widgets/budget-usage-by-target/widget-config.ts index 5649bb5956..379de2dc4c 100644 --- a/apps/web/src/services/dashboards/widgets/cost-widgets/budget-usage-by-target/widget-config.ts +++ b/apps/web/src/services/dashboards/widgets/cost-widgets/budget-usage-by-target/widget-config.ts @@ -1,5 +1,5 @@ -import { COST_DATA_FIELD_MAP, GRANULARITY } from '@/schema/dashboard/_constants/widget-constant'; -import type { WidgetConfig } from '@/schema/dashboard/_types/widget-type'; +import { COST_DATA_FIELD_MAP, GRANULARITY } from '@/api-clients/dashboard/_constants/widget-constant'; +import type { WidgetConfig } from '@/api-clients/dashboard/_types/widget-type'; import { getWidgetOptionsSchema } from '@/services/dashboards/widgets/_helpers/widget-options-schema-generator'; diff --git a/apps/web/src/services/dashboards/widgets/cost-widgets/budget-usage-summary/BudgetUsageSummaryWidget.vue b/apps/web/src/services/dashboards/widgets/cost-widgets/budget-usage-summary/BudgetUsageSummaryWidget.vue index f2188df8d7..489f65c343 100644 --- a/apps/web/src/services/dashboards/widgets/cost-widgets/budget-usage-summary/BudgetUsageSummaryWidget.vue +++ b/apps/web/src/services/dashboards/widgets/cost-widgets/budget-usage-summary/BudgetUsageSummaryWidget.vue @@ -12,7 +12,7 @@ import { getCancellableFetcher } from '@cloudforet/core-lib/space-connector/canc import { ApiQueryHelper } from '@cloudforet/core-lib/space-connector/helper'; import { PDataLoader, PSkeleton, PProgressBar } from '@cloudforet/mirinae'; -import type { DateRange } from '@/schema/dashboard/_types/dashboard-type'; +import type { DateRange } from '@/api-clients/dashboard/_types/dashboard-type'; import { CURRENCY_SYMBOL } from '@/store/display/constant'; import type { CurrencySymbol } from '@/store/display/type'; diff --git a/apps/web/src/services/dashboards/widgets/cost-widgets/budget-usage-summary/widget-config.ts b/apps/web/src/services/dashboards/widgets/cost-widgets/budget-usage-summary/widget-config.ts index f89eb24fda..4ebab30add 100644 --- a/apps/web/src/services/dashboards/widgets/cost-widgets/budget-usage-summary/widget-config.ts +++ b/apps/web/src/services/dashboards/widgets/cost-widgets/budget-usage-summary/widget-config.ts @@ -1,5 +1,5 @@ -import { GRANULARITY } from '@/schema/dashboard/_constants/widget-constant'; -import type { WidgetConfig } from '@/schema/dashboard/_types/widget-type'; +import { GRANULARITY } from '@/api-clients/dashboard/_constants/widget-constant'; +import type { WidgetConfig } from '@/api-clients/dashboard/_types/widget-type'; import { getWidgetOptionsSchema } from '@/services/dashboards/widgets/_helpers/widget-options-schema-generator'; diff --git a/apps/web/src/services/dashboards/widgets/cost-widgets/cost-by-region-multi-fields/CostByRegionMultiFieldsWidget.vue b/apps/web/src/services/dashboards/widgets/cost-widgets/cost-by-region-multi-fields/CostByRegionMultiFieldsWidget.vue index e88b35fbc9..835ce5cddf 100644 --- a/apps/web/src/services/dashboards/widgets/cost-widgets/cost-by-region-multi-fields/CostByRegionMultiFieldsWidget.vue +++ b/apps/web/src/services/dashboards/widgets/cost-widgets/cost-by-region-multi-fields/CostByRegionMultiFieldsWidget.vue @@ -14,7 +14,7 @@ import { getCancellableFetcher } from '@cloudforet/core-lib/space-connector/canc import { ApiQueryHelper } from '@cloudforet/core-lib/space-connector/helper'; import { PDataLoader } from '@cloudforet/mirinae'; -import { COST_DATA_FIELD_MAP } from '@/schema/dashboard/_constants/widget-constant'; +import { COST_DATA_FIELD_MAP } from '@/api-clients/dashboard/_constants/widget-constant'; import type { RegionReferenceMap } from '@/store/reference/region-reference-store'; diff --git a/apps/web/src/services/dashboards/widgets/cost-widgets/cost-by-region-multi-fields/widget-config.ts b/apps/web/src/services/dashboards/widgets/cost-widgets/cost-by-region-multi-fields/widget-config.ts index ca95b2abb5..fb1343ae4d 100644 --- a/apps/web/src/services/dashboards/widgets/cost-widgets/cost-by-region-multi-fields/widget-config.ts +++ b/apps/web/src/services/dashboards/widgets/cost-widgets/cost-by-region-multi-fields/widget-config.ts @@ -1,5 +1,5 @@ -import { CHART_TYPE, COST_DATA_FIELD_MAP, GRANULARITY } from '@/schema/dashboard/_constants/widget-constant'; -import type { WidgetConfig } from '@/schema/dashboard/_types/widget-type'; +import { CHART_TYPE, COST_DATA_FIELD_MAP, GRANULARITY } from '@/api-clients/dashboard/_constants/widget-constant'; +import type { WidgetConfig } from '@/api-clients/dashboard/_types/widget-type'; import { getWidgetOptionsSchema } from '@/services/dashboards/widgets/_helpers/widget-options-schema-generator'; diff --git a/apps/web/src/services/dashboards/widgets/cost-widgets/cost-by-region/CostByRegionWidget.vue b/apps/web/src/services/dashboards/widgets/cost-widgets/cost-by-region/CostByRegionWidget.vue index 5eba75aaff..73f15ff3e8 100644 --- a/apps/web/src/services/dashboards/widgets/cost-widgets/cost-by-region/CostByRegionWidget.vue +++ b/apps/web/src/services/dashboards/widgets/cost-widgets/cost-by-region/CostByRegionWidget.vue @@ -15,7 +15,7 @@ import { ApiQueryHelper } from '@cloudforet/core-lib/space-connector/helper'; import { PDataLoader } from '@cloudforet/mirinae'; import { numberFormatter } from '@cloudforet/utils'; -import { COST_DATA_FIELD_MAP } from '@/schema/dashboard/_constants/widget-constant'; +import { COST_DATA_FIELD_MAP } from '@/api-clients/dashboard/_constants/widget-constant'; import { useAllReferenceStore } from '@/store/reference/all-reference-store'; import type { ProviderReferenceMap } from '@/store/reference/provider-reference-store'; diff --git a/apps/web/src/services/dashboards/widgets/cost-widgets/cost-by-region/widget-config.ts b/apps/web/src/services/dashboards/widgets/cost-widgets/cost-by-region/widget-config.ts index 5cdabd7159..d367986be0 100644 --- a/apps/web/src/services/dashboards/widgets/cost-widgets/cost-by-region/widget-config.ts +++ b/apps/web/src/services/dashboards/widgets/cost-widgets/cost-by-region/widget-config.ts @@ -1,5 +1,5 @@ -import { CHART_TYPE, COST_DATA_FIELD_MAP, GRANULARITY } from '@/schema/dashboard/_constants/widget-constant'; -import type { WidgetConfig } from '@/schema/dashboard/_types/widget-type'; +import { CHART_TYPE, COST_DATA_FIELD_MAP, GRANULARITY } from '@/api-clients/dashboard/_constants/widget-constant'; +import type { WidgetConfig } from '@/api-clients/dashboard/_types/widget-type'; import { getWidgetOptionsSchema } from '@/services/dashboards/widgets/_helpers/widget-options-schema-generator'; diff --git a/apps/web/src/services/dashboards/widgets/cost-widgets/cost-donut/widget-config.ts b/apps/web/src/services/dashboards/widgets/cost-widgets/cost-donut/widget-config.ts index abbb9f235b..b655413936 100644 --- a/apps/web/src/services/dashboards/widgets/cost-widgets/cost-donut/widget-config.ts +++ b/apps/web/src/services/dashboards/widgets/cost-widgets/cost-donut/widget-config.ts @@ -1,5 +1,5 @@ -import { CHART_TYPE, COST_DATA_FIELD_MAP, GRANULARITY } from '@/schema/dashboard/_constants/widget-constant'; -import type { WidgetConfig } from '@/schema/dashboard/_types/widget-type'; +import { CHART_TYPE, COST_DATA_FIELD_MAP, GRANULARITY } from '@/api-clients/dashboard/_constants/widget-constant'; +import type { WidgetConfig } from '@/api-clients/dashboard/_types/widget-type'; import { getWidgetOptionsSchema } from '@/services/dashboards/widgets/_helpers/widget-options-schema-generator'; diff --git a/apps/web/src/services/dashboards/widgets/cost-widgets/cost-map/CostMapWidget.vue b/apps/web/src/services/dashboards/widgets/cost-widgets/cost-map/CostMapWidget.vue index 18849062fe..8fd2a1544f 100644 --- a/apps/web/src/services/dashboards/widgets/cost-widgets/cost-map/CostMapWidget.vue +++ b/apps/web/src/services/dashboards/widgets/cost-widgets/cost-map/CostMapWidget.vue @@ -12,8 +12,8 @@ import { ApiQueryHelper } from '@cloudforet/core-lib/space-connector/helper'; import { PDataLoader } from '@cloudforet/mirinae'; import { numberFormatter } from '@cloudforet/utils'; -import { WIDGET_SIZE } from '@/schema/dashboard/_constants/widget-constant'; -import type { CostDataField } from '@/schema/dashboard/_types/widget-type'; +import { WIDGET_SIZE } from '@/api-clients/dashboard/_constants/widget-constant'; +import type { CostDataField } from '@/api-clients/dashboard/_types/widget-type'; import { useAmcharts5 } from '@/common/composables/amcharts5'; import ErrorHandler from '@/common/composables/error/errorHandler'; diff --git a/apps/web/src/services/dashboards/widgets/cost-widgets/cost-map/costmap-chart-data-helper.ts b/apps/web/src/services/dashboards/widgets/cost-widgets/cost-map/costmap-chart-data-helper.ts index 8fb2e7fcf2..19248f9826 100644 --- a/apps/web/src/services/dashboards/widgets/cost-widgets/cost-map/costmap-chart-data-helper.ts +++ b/apps/web/src/services/dashboards/widgets/cost-widgets/cost-map/costmap-chart-data-helper.ts @@ -1,4 +1,4 @@ -import type { CostDataField } from '@/schema/dashboard/_types/widget-type'; +import type { CostDataField } from '@/api-clients/dashboard/_types/widget-type'; import type { ReferenceMap } from '@/store/reference/type'; diff --git a/apps/web/src/services/dashboards/widgets/cost-widgets/cost-map/widget-config.ts b/apps/web/src/services/dashboards/widgets/cost-widgets/cost-map/widget-config.ts index 3581ca88f0..fb0c097418 100644 --- a/apps/web/src/services/dashboards/widgets/cost-widgets/cost-map/widget-config.ts +++ b/apps/web/src/services/dashboards/widgets/cost-widgets/cost-map/widget-config.ts @@ -1,5 +1,5 @@ -import { COST_DATA_FIELD_MAP, GRANULARITY } from '@/schema/dashboard/_constants/widget-constant'; -import type { WidgetConfig } from '@/schema/dashboard/_types/widget-type'; +import { COST_DATA_FIELD_MAP, GRANULARITY } from '@/api-clients/dashboard/_constants/widget-constant'; +import type { WidgetConfig } from '@/api-clients/dashboard/_types/widget-type'; import { getWidgetOptionsSchema } from '@/services/dashboards/widgets/_helpers/widget-options-schema-generator'; diff --git a/apps/web/src/services/dashboards/widgets/cost-widgets/cost-pie/widget-config.ts b/apps/web/src/services/dashboards/widgets/cost-widgets/cost-pie/widget-config.ts index 93548b0cb8..f1f9c85423 100644 --- a/apps/web/src/services/dashboards/widgets/cost-widgets/cost-pie/widget-config.ts +++ b/apps/web/src/services/dashboards/widgets/cost-widgets/cost-pie/widget-config.ts @@ -1,5 +1,5 @@ -import { CHART_TYPE, COST_DATA_FIELD_MAP, GRANULARITY } from '@/schema/dashboard/_constants/widget-constant'; -import type { WidgetConfig } from '@/schema/dashboard/_types/widget-type'; +import { CHART_TYPE, COST_DATA_FIELD_MAP, GRANULARITY } from '@/api-clients/dashboard/_constants/widget-constant'; +import type { WidgetConfig } from '@/api-clients/dashboard/_types/widget-type'; import { getWidgetOptionsSchema } from '@/services/dashboards/widgets/_helpers/widget-options-schema-generator'; diff --git a/apps/web/src/services/dashboards/widgets/cost-widgets/cost-summary-multi-fields/CostSummaryMultiFieldsWidget.vue b/apps/web/src/services/dashboards/widgets/cost-widgets/cost-summary-multi-fields/CostSummaryMultiFieldsWidget.vue index f9e8b5ab18..75295a02e5 100644 --- a/apps/web/src/services/dashboards/widgets/cost-widgets/cost-summary-multi-fields/CostSummaryMultiFieldsWidget.vue +++ b/apps/web/src/services/dashboards/widgets/cost-widgets/cost-summary-multi-fields/CostSummaryMultiFieldsWidget.vue @@ -15,7 +15,7 @@ import { getCancellableFetcher } from '@cloudforet/core-lib/space-connector/canc import { ApiQueryHelper } from '@cloudforet/core-lib/space-connector/helper'; import { PSkeleton } from '@cloudforet/mirinae'; -import { COST_DATA_FIELD_MAP } from '@/schema/dashboard/_constants/widget-constant'; +import { COST_DATA_FIELD_MAP } from '@/api-clients/dashboard/_constants/widget-constant'; import { currencyMoneyFormatter } from '@/lib/helper/currency-helper'; import { usageUnitFormatter } from '@/lib/helper/usage-formatter'; diff --git a/apps/web/src/services/dashboards/widgets/cost-widgets/cost-summary-multi-fields/widget-config.ts b/apps/web/src/services/dashboards/widgets/cost-widgets/cost-summary-multi-fields/widget-config.ts index b05460b032..d5e77a4697 100644 --- a/apps/web/src/services/dashboards/widgets/cost-widgets/cost-summary-multi-fields/widget-config.ts +++ b/apps/web/src/services/dashboards/widgets/cost-widgets/cost-summary-multi-fields/widget-config.ts @@ -1,5 +1,5 @@ -import { CHART_TYPE, COST_DATA_FIELD_MAP, GRANULARITY } from '@/schema/dashboard/_constants/widget-constant'; -import type { WidgetConfig } from '@/schema/dashboard/_types/widget-type'; +import { CHART_TYPE, COST_DATA_FIELD_MAP, GRANULARITY } from '@/api-clients/dashboard/_constants/widget-constant'; +import type { WidgetConfig } from '@/api-clients/dashboard/_types/widget-type'; import { getWidgetOptionsSchema } from '@/services/dashboards/widgets/_helpers/widget-options-schema-generator'; diff --git a/apps/web/src/services/dashboards/widgets/cost-widgets/cost-trend-stacked/widget-config.ts b/apps/web/src/services/dashboards/widgets/cost-widgets/cost-trend-stacked/widget-config.ts index 3ef7cc4286..3706a2a329 100644 --- a/apps/web/src/services/dashboards/widgets/cost-widgets/cost-trend-stacked/widget-config.ts +++ b/apps/web/src/services/dashboards/widgets/cost-widgets/cost-trend-stacked/widget-config.ts @@ -1,5 +1,5 @@ -import { CHART_TYPE, COST_DATA_FIELD_MAP, GRANULARITY } from '@/schema/dashboard/_constants/widget-constant'; -import type { WidgetConfig } from '@/schema/dashboard/_types/widget-type'; +import { CHART_TYPE, COST_DATA_FIELD_MAP, GRANULARITY } from '@/api-clients/dashboard/_constants/widget-constant'; +import type { WidgetConfig } from '@/api-clients/dashboard/_types/widget-type'; import { getWidgetOptionsSchema } from '@/services/dashboards/widgets/_helpers/widget-options-schema-generator'; diff --git a/apps/web/src/services/dashboards/widgets/cost-widgets/cost-trend/widget-config.ts b/apps/web/src/services/dashboards/widgets/cost-widgets/cost-trend/widget-config.ts index c32e77080b..8ad71ca15f 100644 --- a/apps/web/src/services/dashboards/widgets/cost-widgets/cost-trend/widget-config.ts +++ b/apps/web/src/services/dashboards/widgets/cost-widgets/cost-trend/widget-config.ts @@ -1,5 +1,5 @@ -import { CHART_TYPE, COST_DATA_FIELD_MAP, GRANULARITY } from '@/schema/dashboard/_constants/widget-constant'; -import type { WidgetConfig } from '@/schema/dashboard/_types/widget-type'; +import { CHART_TYPE, COST_DATA_FIELD_MAP, GRANULARITY } from '@/api-clients/dashboard/_constants/widget-constant'; +import type { WidgetConfig } from '@/api-clients/dashboard/_types/widget-type'; import { getWidgetOptionsSchema } from '@/services/dashboards/widgets/_helpers/widget-options-schema-generator'; diff --git a/apps/web/src/services/dashboards/widgets/cost-widgets/monthly-cost/MonthlyCostWidget.vue b/apps/web/src/services/dashboards/widgets/cost-widgets/monthly-cost/MonthlyCostWidget.vue index 9ae7268f18..44eccec8f7 100644 --- a/apps/web/src/services/dashboards/widgets/cost-widgets/monthly-cost/MonthlyCostWidget.vue +++ b/apps/web/src/services/dashboards/widgets/cost-widgets/monthly-cost/MonthlyCostWidget.vue @@ -14,7 +14,7 @@ import { PDivider, PDataLoader, PI, PSkeleton, } from '@cloudforet/mirinae'; -import type { DateRange } from '@/schema/dashboard/_types/dashboard-type'; +import type { DateRange } from '@/api-clients/dashboard/_types/dashboard-type'; import { CURRENCY_SYMBOL } from '@/store/display/constant'; import type { CurrencySymbol } from '@/store/display/type'; diff --git a/apps/web/src/services/dashboards/widgets/cost-widgets/monthly-cost/widget-config.ts b/apps/web/src/services/dashboards/widgets/cost-widgets/monthly-cost/widget-config.ts index 86a12d9556..fcc061cc82 100644 --- a/apps/web/src/services/dashboards/widgets/cost-widgets/monthly-cost/widget-config.ts +++ b/apps/web/src/services/dashboards/widgets/cost-widgets/monthly-cost/widget-config.ts @@ -1,5 +1,5 @@ -import { GRANULARITY } from '@/schema/dashboard/_constants/widget-constant'; -import type { WidgetConfig } from '@/schema/dashboard/_types/widget-type'; +import { GRANULARITY } from '@/api-clients/dashboard/_constants/widget-constant'; +import type { WidgetConfig } from '@/api-clients/dashboard/_types/widget-type'; import { getWidgetOptionsSchema } from '@/services/dashboards/widgets/_helpers/widget-options-schema-generator'; diff --git a/apps/web/src/services/iam/components/AppManagementFormModal.vue b/apps/web/src/services/iam/components/AppManagementFormModal.vue index 7561003cbb..4fd38dbfaa 100644 --- a/apps/web/src/services/iam/components/AppManagementFormModal.vue +++ b/apps/web/src/services/iam/components/AppManagementFormModal.vue @@ -13,10 +13,10 @@ import type { SelectDropdownMenuItem } from '@cloudforet/mirinae/types/controls/ import type { InputItem } from '@cloudforet/mirinae/types/controls/input/text-input/type'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; -import { RESOURCE_GROUP } from '@/schema/_common/constant'; -import type { Tags } from '@/schema/_common/model'; -import type { ResourceGroupType } from '@/schema/_common/type'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; +import { RESOURCE_GROUP } from '@/api-clients/_common/schema/constant'; +import type { Tags } from '@/api-clients/_common/schema/model'; +import type { ResourceGroupType } from '@/api-clients/_common/schema/type'; import type { AppModel } from '@/schema/identity/app/model'; import type { RoleListParameters } from '@/schema/identity/role/api-verbs/list'; import { ROLE_STATE, ROLE_TYPE } from '@/schema/identity/role/constant'; diff --git a/apps/web/src/services/iam/components/RoleDeleteModal.vue b/apps/web/src/services/iam/components/RoleDeleteModal.vue index 62301dda03..9606add357 100644 --- a/apps/web/src/services/iam/components/RoleDeleteModal.vue +++ b/apps/web/src/services/iam/components/RoleDeleteModal.vue @@ -7,7 +7,7 @@ import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; import { PDataTable } from '@cloudforet/mirinae'; import { iso8601Formatter } from '@cloudforet/utils'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { RoleBindingListParameters } from '@/schema/identity/role-binding/api-verbs/list'; import type { RoleBindingModel } from '@/schema/identity/role-binding/model'; import type { RoleDeleteParameters } from '@/schema/identity/role/api-verbs/delete'; diff --git a/apps/web/src/services/iam/components/UserGroupChannelAddFormData.vue b/apps/web/src/services/iam/components/UserGroupChannelAddFormData.vue index 7fe6951364..1b523b6222 100644 --- a/apps/web/src/services/iam/components/UserGroupChannelAddFormData.vue +++ b/apps/web/src/services/iam/components/UserGroupChannelAddFormData.vue @@ -7,7 +7,7 @@ import { ApiQueryHelper } from '@cloudforet/core-lib/space-connector/helper'; import { PJsonSchemaForm } from '@cloudforet/mirinae'; import type { JsonSchema } from '@cloudforet/mirinae/types/inputs/forms/json-schema-form/type'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { NotificationProtocolListParameters } from '@/schema/alert-manager/notification-protocol/api-verbs/list'; import type { NotificationProtocolModel } from '@/schema/alert-manager/notification-protocol/model'; diff --git a/apps/web/src/services/iam/components/UserGroupManagementTabNotificationChannel.vue b/apps/web/src/services/iam/components/UserGroupManagementTabNotificationChannel.vue index 209fea2f63..2e314abec0 100644 --- a/apps/web/src/services/iam/components/UserGroupManagementTabNotificationChannel.vue +++ b/apps/web/src/services/iam/components/UserGroupManagementTabNotificationChannel.vue @@ -11,7 +11,7 @@ import { PHeadingLayout, PHeading, PButton, PToolboxTable, PBadge, PLazyImg, } from '@cloudforet/mirinae'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { NotificationProtocolGetParameters } from '@/schema/alert-manager/notification-protocol/api-verbs/get'; import type { NotificationProtocolListParameters } from '@/schema/alert-manager/notification-protocol/api-verbs/list'; import type { NotificationProtocolModel } from '@/schema/alert-manager/notification-protocol/model'; diff --git a/apps/web/src/services/iam/components/UserGroupManagementTabUsers.vue b/apps/web/src/services/iam/components/UserGroupManagementTabUsers.vue index 0c023bb547..7adf75100e 100644 --- a/apps/web/src/services/iam/components/UserGroupManagementTabUsers.vue +++ b/apps/web/src/services/iam/components/UserGroupManagementTabUsers.vue @@ -13,7 +13,7 @@ import { } from '@cloudforet/mirinae'; import type { DataTableFieldType } from '@cloudforet/mirinae/types/data-display/tables/data-table/type'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { WorkspaceUserListParameters } from '@/schema/identity/workspace-user/api-verbs/list'; import type { WorkspaceUserModel } from '@/schema/identity/workspace-user/model'; import { i18n } from '@/translations'; diff --git a/apps/web/src/services/iam/components/UserManagementAddAdminRole.vue b/apps/web/src/services/iam/components/UserManagementAddAdminRole.vue index 1fdb367283..add5667cf6 100644 --- a/apps/web/src/services/iam/components/UserManagementAddAdminRole.vue +++ b/apps/web/src/services/iam/components/UserManagementAddAdminRole.vue @@ -12,7 +12,7 @@ import type { } from '@cloudforet/mirinae/types/controls/dropdown/select-dropdown/type'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { RoleListParameters } from '@/schema/identity/role/api-verbs/list'; import { ROLE_STATE, ROLE_TYPE } from '@/schema/identity/role/constant'; import type { RoleModel } from '@/schema/identity/role/model'; diff --git a/apps/web/src/services/iam/components/UserManagementAddModal.vue b/apps/web/src/services/iam/components/UserManagementAddModal.vue index 672d83f90d..7fc69a1dcc 100644 --- a/apps/web/src/services/iam/components/UserManagementAddModal.vue +++ b/apps/web/src/services/iam/components/UserManagementAddModal.vue @@ -9,8 +9,8 @@ import { cloneDeep, isEmpty } from 'lodash'; import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; import { PButtonModal } from '@cloudforet/mirinae'; -import { RESOURCE_GROUP } from '@/schema/_common/constant'; -import type { Tags } from '@/schema/_common/model'; +import { RESOURCE_GROUP } from '@/api-clients/_common/schema/constant'; +import type { Tags } from '@/api-clients/_common/schema/model'; import type { RoleCreateParameters } from '@/schema/identity/role-binding/api-verbs/create'; import type { RoleBindingModel } from '@/schema/identity/role-binding/model'; import type { UserCreateParameters } from '@/schema/identity/user/api-verbs/create'; diff --git a/apps/web/src/services/iam/components/UserManagementAddRole.vue b/apps/web/src/services/iam/components/UserManagementAddRole.vue index fbaa4627c1..ec1ebde650 100644 --- a/apps/web/src/services/iam/components/UserManagementAddRole.vue +++ b/apps/web/src/services/iam/components/UserManagementAddRole.vue @@ -9,7 +9,7 @@ import { import type { AutocompleteHandler } from '@cloudforet/mirinae/types/controls/dropdown/select-dropdown/type'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { RoleListParameters } from '@/schema/identity/role/api-verbs/list'; import { ROLE_STATE, ROLE_TYPE } from '@/schema/identity/role/constant'; import type { RoleModel } from '@/schema/identity/role/model'; diff --git a/apps/web/src/services/iam/components/UserManagementAddTag.vue b/apps/web/src/services/iam/components/UserManagementAddTag.vue index db3f828d4b..7433bbaf75 100644 --- a/apps/web/src/services/iam/components/UserManagementAddTag.vue +++ b/apps/web/src/services/iam/components/UserManagementAddTag.vue @@ -5,7 +5,7 @@ import { import { PTextButton } from '@cloudforet/mirinae'; -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; import TagsInput from '@/common/components/inputs/TagsInput.vue'; diff --git a/apps/web/src/services/iam/components/UserManagementFormAdminRole.vue b/apps/web/src/services/iam/components/UserManagementFormAdminRole.vue index 1365831d69..2e627f606d 100644 --- a/apps/web/src/services/iam/components/UserManagementFormAdminRole.vue +++ b/apps/web/src/services/iam/components/UserManagementFormAdminRole.vue @@ -13,7 +13,7 @@ import type { SelectDropdownMenuItem, } from '@cloudforet/mirinae/types/controls/dropdown/select-dropdown/type'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { RoleListParameters } from '@/schema/identity/role/api-verbs/list'; import { ROLE_STATE, ROLE_TYPE } from '@/schema/identity/role/constant'; import type { RoleModel } from '@/schema/identity/role/model'; diff --git a/apps/web/src/services/iam/components/UserManagementFormModal.vue b/apps/web/src/services/iam/components/UserManagementFormModal.vue index 2258a4607a..10ba2df9f7 100644 --- a/apps/web/src/services/iam/components/UserManagementFormModal.vue +++ b/apps/web/src/services/iam/components/UserManagementFormModal.vue @@ -6,9 +6,9 @@ import { cloneDeep, isEmpty } from 'lodash'; import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; import { PButtonModal } from '@cloudforet/mirinae'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; -import { RESOURCE_GROUP } from '@/schema/_common/constant'; -import type { Tags } from '@/schema/_common/model'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; +import { RESOURCE_GROUP } from '@/api-clients/_common/schema/constant'; +import type { Tags } from '@/api-clients/_common/schema/model'; import type { RoleCreateParameters } from '@/schema/identity/role-binding/api-verbs/create'; import type { RoleBindingDeleteParameters } from '@/schema/identity/role-binding/api-verbs/delete'; import type { RoleBindingListParameters } from '@/schema/identity/role-binding/api-verbs/list'; diff --git a/apps/web/src/services/iam/components/UserManagementTab.vue b/apps/web/src/services/iam/components/UserManagementTab.vue index 9b53242e96..4eee2598fe 100644 --- a/apps/web/src/services/iam/components/UserManagementTab.vue +++ b/apps/web/src/services/iam/components/UserManagementTab.vue @@ -14,7 +14,7 @@ import type { } from '@cloudforet/mirinae/types/controls/dropdown/select-dropdown/type'; import type { TabItem } from '@cloudforet/mirinae/types/navigation/tabs/tab/type'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { RoleBindingUpdateRoleParameters } from '@/schema/identity/role-binding/api-verbs/update-role'; import type { RoleBindingModel } from '@/schema/identity/role-binding/model'; import type { RoleListParameters } from '@/schema/identity/role/api-verbs/list'; diff --git a/apps/web/src/services/iam/components/UserManagementTabAssignedRole.vue b/apps/web/src/services/iam/components/UserManagementTabAssignedRole.vue index f4407501e4..b8ad3f4d92 100644 --- a/apps/web/src/services/iam/components/UserManagementTabAssignedRole.vue +++ b/apps/web/src/services/iam/components/UserManagementTabAssignedRole.vue @@ -11,7 +11,7 @@ import { import { ACTION_ICON } from '@cloudforet/mirinae/src/navigation/link/type'; -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; import type { UserGetParameters } from '@/schema/identity/user/api-verbs/get'; import type { UserModel } from '@/schema/identity/user/model'; import { i18n } from '@/translations'; diff --git a/apps/web/src/services/iam/components/UserManagementTabProjects.vue b/apps/web/src/services/iam/components/UserManagementTabProjects.vue index 5120781a16..2239586f57 100644 --- a/apps/web/src/services/iam/components/UserManagementTabProjects.vue +++ b/apps/web/src/services/iam/components/UserManagementTabProjects.vue @@ -7,7 +7,7 @@ import { } from '@cloudforet/mirinae'; import type { DataTableFieldType } from '@cloudforet/mirinae/types/data-display/tables/data-table/type'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { ProjectListParameters } from '@/schema/identity/project/api-verbs/list'; import type { ProjectRemoveUsersParameters } from '@/schema/identity/project/api-verbs/remove-users'; import type { ProjectModel } from '@/schema/identity/project/model'; diff --git a/apps/web/src/services/iam/components/UserManagementTabTag.vue b/apps/web/src/services/iam/components/UserManagementTabTag.vue index c4057cd203..bedd147e7c 100644 --- a/apps/web/src/services/iam/components/UserManagementTabTag.vue +++ b/apps/web/src/services/iam/components/UserManagementTabTag.vue @@ -9,7 +9,7 @@ import { } from '@cloudforet/mirinae'; -import type { Tags, TimeStamp } from '@/schema/_common/model'; +import type { Tags, TimeStamp } from '@/api-clients/_common/schema/model'; import type { UserUpdateParameters } from '@/schema/identity/user/api-verbs/update'; import type { UserModel } from '@/schema/identity/user/model'; import { i18n } from '@/translations'; diff --git a/apps/web/src/services/iam/components/UserManagementTabWorkspace.vue b/apps/web/src/services/iam/components/UserManagementTabWorkspace.vue index da996c6d87..d20242f368 100644 --- a/apps/web/src/services/iam/components/UserManagementTabWorkspace.vue +++ b/apps/web/src/services/iam/components/UserManagementTabWorkspace.vue @@ -16,8 +16,8 @@ import type { import type { DataTableFieldType } from '@cloudforet/mirinae/types/data-display/tables/data-table/type'; import { iso8601Formatter } from '@cloudforet/utils'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; -import { RESOURCE_GROUP } from '@/schema/_common/constant'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; +import { RESOURCE_GROUP } from '@/api-clients/_common/schema/constant'; import type { RoleBindingDeleteParameters } from '@/schema/identity/role-binding/api-verbs/delete'; import type { RoleBindingListParameters } from '@/schema/identity/role-binding/api-verbs/list'; import type { RoleBindingUpdateRoleParameters } from '@/schema/identity/role-binding/api-verbs/update-role'; diff --git a/apps/web/src/services/iam/components/UserManagementTable.vue b/apps/web/src/services/iam/components/UserManagementTable.vue index f25f315fe1..2241cfeff1 100644 --- a/apps/web/src/services/iam/components/UserManagementTable.vue +++ b/apps/web/src/services/iam/components/UserManagementTable.vue @@ -13,7 +13,7 @@ import { import type { SelectDropdownMenuItem, AutocompleteHandler } from '@cloudforet/mirinae/types/controls/dropdown/select-dropdown/type'; import type { DataTableFieldType } from '@cloudforet/mirinae/types/data-display/tables/data-table/type'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { RoleBindingDeleteParameters } from '@/schema/identity/role-binding/api-verbs/delete'; import type { RoleBindingUpdateRoleParameters } from '@/schema/identity/role-binding/api-verbs/update-role'; import type { RoleBindingModel } from '@/schema/identity/role-binding/model'; diff --git a/apps/web/src/services/iam/composables/tag-data.ts b/apps/web/src/services/iam/composables/tag-data.ts index 2b528bd6b4..caafebb55c 100644 --- a/apps/web/src/services/iam/composables/tag-data.ts +++ b/apps/web/src/services/iam/composables/tag-data.ts @@ -1,6 +1,6 @@ import type { InputItem } from '@cloudforet/mirinae/types/controls/input/text-input/type'; -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; export const getInputItemsFromTagKeys = (keys: Tags): InputItem[] => Object.keys(keys).map((key) => ({ label: `${key}:${keys[key]}`, diff --git a/apps/web/src/services/iam/helpers/user-management-form-validations.ts b/apps/web/src/services/iam/helpers/user-management-form-validations.ts index d7d13ab857..8d05d2fe94 100644 --- a/apps/web/src/services/iam/helpers/user-management-form-validations.ts +++ b/apps/web/src/services/iam/helpers/user-management-form-validations.ts @@ -2,7 +2,7 @@ import VueI18n from 'vue-i18n'; import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { UserListParameters } from '@/schema/identity/user/api-verbs/list'; import type { UserModel } from '@/schema/identity/user/model'; import { i18n } from '@/translations'; diff --git a/apps/web/src/services/iam/store/app-page-store.ts b/apps/web/src/services/iam/store/app-page-store.ts index 6e88b22d27..816d6a958e 100644 --- a/apps/web/src/services/iam/store/app-page-store.ts +++ b/apps/web/src/services/iam/store/app-page-store.ts @@ -2,7 +2,7 @@ import { defineStore } from 'pinia'; import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { AppCreateParameters } from '@/schema/identity/app/api-verbs/create'; import type { AppDeleteParameters } from '@/schema/identity/app/api-verbs/delete'; import type { AppDisableParameters } from '@/schema/identity/app/api-verbs/disable'; diff --git a/apps/web/src/services/iam/store/role-page-store.ts b/apps/web/src/services/iam/store/role-page-store.ts index c3a4d332e9..9f812b3c5a 100644 --- a/apps/web/src/services/iam/store/role-page-store.ts +++ b/apps/web/src/services/iam/store/role-page-store.ts @@ -2,7 +2,7 @@ import { defineStore } from 'pinia'; import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { RoleListParameters } from '@/schema/identity/role/api-verbs/list'; import { ROLE_TYPE } from '@/schema/identity/role/constant'; import type { RoleModel } from '@/schema/identity/role/model'; diff --git a/apps/web/src/services/iam/store/user-group-page-store.ts b/apps/web/src/services/iam/store/user-group-page-store.ts index c67e9f9dfe..fdb1d55848 100644 --- a/apps/web/src/services/iam/store/user-group-page-store.ts +++ b/apps/web/src/services/iam/store/user-group-page-store.ts @@ -6,7 +6,7 @@ import { defineStore } from 'pinia'; import type { ConsoleFilter } from '@cloudforet/core-lib/query/type'; import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { UserGroupChannelListParameters } from '@/schema/alert-manager/user-group-channel/api-verbs/list'; import type { UserGroupChannelModel } from '@/schema/alert-manager/user-group-channel/model'; import type { UserGroupGetParameters } from '@/schema/identity/user-group/api-verbs/get'; diff --git a/apps/web/src/services/iam/store/user-page-store.ts b/apps/web/src/services/iam/store/user-page-store.ts index d5489e010f..f1529629bb 100644 --- a/apps/web/src/services/iam/store/user-page-store.ts +++ b/apps/web/src/services/iam/store/user-page-store.ts @@ -6,7 +6,7 @@ import { defineStore } from 'pinia'; import type { ConsoleFilter } from '@cloudforet/core-lib/query/type'; import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { RoleListParameters } from '@/schema/identity/role/api-verbs/list'; import { ROLE_TYPE } from '@/schema/identity/role/constant'; import type { RoleModel } from '@/schema/identity/role/model'; diff --git a/apps/web/src/services/iam/types/user-type.ts b/apps/web/src/services/iam/types/user-type.ts index 5d383fbd3d..411e63fbd5 100644 --- a/apps/web/src/services/iam/types/user-type.ts +++ b/apps/web/src/services/iam/types/user-type.ts @@ -2,7 +2,7 @@ import type { TranslateResult } from 'vue-i18n'; import type { MenuItem } from '@cloudforet/mirinae/src/controls/context-menu/type'; -import type { Tags } from '@/schema/_common/model'; +import type { Tags } from '@/api-clients/_common/schema/model'; import type { RoleType } from '@/schema/identity/role/type'; import type { UserModel } from '@/schema/identity/user/model'; import type { AuthType } from '@/schema/identity/user/type'; diff --git a/apps/web/src/services/info/components/NoticeDetail.vue b/apps/web/src/services/info/components/NoticeDetail.vue index ddb2d8ea36..d48978573e 100644 --- a/apps/web/src/services/info/components/NoticeDetail.vue +++ b/apps/web/src/services/info/components/NoticeDetail.vue @@ -12,8 +12,8 @@ import { } from '@cloudforet/mirinae'; import { iso8601Formatter } from '@cloudforet/utils'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import { SpaceRouter } from '@/router'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; import type { PostListParameters } from '@/schema/board/post/api-verbs/list'; import { POST_BOARD_TYPE } from '@/schema/board/post/constant'; import type { PostModel } from '@/schema/board/post/model'; diff --git a/apps/web/src/services/info/components/NoticeForm.vue b/apps/web/src/services/info/components/NoticeForm.vue index 5424e9539c..f7a0a225c2 100644 --- a/apps/web/src/services/info/components/NoticeForm.vue +++ b/apps/web/src/services/info/components/NoticeForm.vue @@ -15,9 +15,9 @@ import { } from '@cloudforet/mirinae'; import type { MenuItem } from '@cloudforet/mirinae/types/controls/context-menu/type'; +import { RESOURCE_GROUP } from '@/api-clients/_common/schema/constant'; +import type { ContentsType, ResourceGroupType } from '@/api-clients/_common/schema/type'; import { SpaceRouter } from '@/router'; -import { RESOURCE_GROUP } from '@/schema/_common/constant'; -import type { ContentsType, ResourceGroupType } from '@/schema/_common/type'; import type { PostUpdateParameters } from '@/schema/board/post/api-verbs/update'; import { POST_BOARD_TYPE } from '@/schema/board/post/constant'; import type { WorkspaceModel } from '@/schema/identity/workspace/model'; diff --git a/apps/web/src/services/info/components/NoticeList.vue b/apps/web/src/services/info/components/NoticeList.vue index 82205d84b8..ef7858a86c 100644 --- a/apps/web/src/services/info/components/NoticeList.vue +++ b/apps/web/src/services/info/components/NoticeList.vue @@ -14,8 +14,8 @@ import { import type { ValueItem } from '@cloudforet/mirinae/src/controls/search/query-search/type'; import type { ToolboxOptions } from '@cloudforet/mirinae/types/controls/toolbox/type'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import { SpaceRouter } from '@/router'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; import type { PostListParameters } from '@/schema/board/post/api-verbs/list'; import { POST_BOARD_TYPE } from '@/schema/board/post/constant'; import type { PostModel } from '@/schema/board/post/model'; diff --git a/apps/web/src/services/info/components/NoticeWorkspaceDropdown.vue b/apps/web/src/services/info/components/NoticeWorkspaceDropdown.vue index 24cb24ac2d..0d84b52c23 100644 --- a/apps/web/src/services/info/components/NoticeWorkspaceDropdown.vue +++ b/apps/web/src/services/info/components/NoticeWorkspaceDropdown.vue @@ -10,7 +10,7 @@ import { import type { AutocompleteHandler } from '@cloudforet/mirinae/types/controls/dropdown/select-dropdown/type'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { WorkspaceListParameters } from '@/schema/identity/workspace/api-verbs/list'; import type { WorkspaceModel } from '@/schema/identity/workspace/model'; diff --git a/apps/web/src/services/info/pages/admin/AdminNoticeDetailPage.vue b/apps/web/src/services/info/pages/admin/AdminNoticeDetailPage.vue index eccb561b63..09069df348 100644 --- a/apps/web/src/services/info/pages/admin/AdminNoticeDetailPage.vue +++ b/apps/web/src/services/info/pages/admin/AdminNoticeDetailPage.vue @@ -10,7 +10,7 @@ import { } from '@cloudforet/mirinae'; import type { DataTableField } from '@cloudforet/mirinae/types/data-display/tables/data-table/type'; -import { RESOURCE_GROUP } from '@/schema/_common/constant'; +import { RESOURCE_GROUP } from '@/api-clients/_common/schema/constant'; import type { PostSendParameters } from '@/schema/board/post/api-verbs/send'; import type { PostModel } from '@/schema/board/post/model'; import type { WorkspaceModel } from '@/schema/identity/workspace/model'; diff --git a/apps/web/src/services/landing/components/workspace-landing/landing-group-workspaces/LandingGroupWorkspaces.vue b/apps/web/src/services/landing/components/workspace-landing/landing-group-workspaces/LandingGroupWorkspaces.vue index 1f733625d3..c4811b9108 100644 --- a/apps/web/src/services/landing/components/workspace-landing/landing-group-workspaces/LandingGroupWorkspaces.vue +++ b/apps/web/src/services/landing/components/workspace-landing/landing-group-workspaces/LandingGroupWorkspaces.vue @@ -9,7 +9,7 @@ import { PFieldTitle, PButton, PButtonTab, PIconButton, PEmpty, } from '@cloudforet/mirinae'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { UserProfileGetWorkspacesParameters } from '@/schema/identity/user-profile/api-verbs/get-workspaces'; import type { MyWorkspaceModel } from '@/schema/identity/user-profile/model'; import type { WorkspaceGroupModel } from '@/schema/identity/workspace-group/model'; diff --git a/apps/web/src/services/landing/components/workspace-landing/landing-group-workspaces/LandingWorkspaceGroupAddUsersModal.vue b/apps/web/src/services/landing/components/workspace-landing/landing-group-workspaces/LandingWorkspaceGroupAddUsersModal.vue index 0f178d1ff5..2082ed272a 100644 --- a/apps/web/src/services/landing/components/workspace-landing/landing-group-workspaces/LandingWorkspaceGroupAddUsersModal.vue +++ b/apps/web/src/services/landing/components/workspace-landing/landing-group-workspaces/LandingWorkspaceGroupAddUsersModal.vue @@ -9,7 +9,7 @@ import { } from '@cloudforet/mirinae'; import type { MenuItem } from '@cloudforet/mirinae/types/controls/context-menu/type'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { RoleListBasicRoleParameters } from '@/schema/identity/role/api-verbs/list-basic-role'; import { ROLE_STATE, ROLE_TYPE } from '@/schema/identity/role/constant'; import type { BasicRoleModel, RoleModel } from '@/schema/identity/role/model'; diff --git a/apps/web/src/services/landing/components/workspace-landing/landing-group-workspaces/LandingWorkspaceGroupTabGroupUser.vue b/apps/web/src/services/landing/components/workspace-landing/landing-group-workspaces/LandingWorkspaceGroupTabGroupUser.vue index 8a8c43ba8b..99b7759d0a 100644 --- a/apps/web/src/services/landing/components/workspace-landing/landing-group-workspaces/LandingWorkspaceGroupTabGroupUser.vue +++ b/apps/web/src/services/landing/components/workspace-landing/landing-group-workspaces/LandingWorkspaceGroupTabGroupUser.vue @@ -9,7 +9,7 @@ import { PHeading, PButton, PToolboxTable, PStatus, PSelectDropdown, PTooltip, PHeadingLayout, } from '@cloudforet/mirinae'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { RoleListParameters } from '@/schema/identity/role/api-verbs/list'; import { ROLE_STATE, ROLE_TYPE } from '@/schema/identity/role/constant'; import type { BasicRoleModel, RoleModel } from '@/schema/identity/role/model'; diff --git a/apps/web/src/services/landing/components/workspace-landing/landing-group-workspaces/LandingWorkspaceGroupTabWorkspace.vue b/apps/web/src/services/landing/components/workspace-landing/landing-group-workspaces/LandingWorkspaceGroupTabWorkspace.vue index 41803b5814..e5b07cd0e9 100644 --- a/apps/web/src/services/landing/components/workspace-landing/landing-group-workspaces/LandingWorkspaceGroupTabWorkspace.vue +++ b/apps/web/src/services/landing/components/workspace-landing/landing-group-workspaces/LandingWorkspaceGroupTabWorkspace.vue @@ -10,7 +10,7 @@ import { PHeading, PToolboxTable, PLink, PStatus, PTooltip, PI, } from '@cloudforet/mirinae'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { UserProfileGetWorkspacesParameters } from '@/schema/identity/user-profile/api-verbs/get-workspaces'; import type { MyWorkspaceModel } from '@/schema/identity/user-profile/model'; diff --git a/apps/web/src/services/my-page/components/NotificationAddFormData.vue b/apps/web/src/services/my-page/components/NotificationAddFormData.vue index 502ee9df15..ff5a154867 100644 --- a/apps/web/src/services/my-page/components/NotificationAddFormData.vue +++ b/apps/web/src/services/my-page/components/NotificationAddFormData.vue @@ -12,7 +12,7 @@ import { import type { MenuItem } from '@cloudforet/mirinae/types/controls/context-menu/type'; import type { JsonSchema } from '@cloudforet/mirinae/types/controls/forms/json-schema-form/type'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { NotificationProtocolListParameters } from '@/schema/alert-manager/notification-protocol/api-verbs/list'; import type { NotificationProtocolModel } from '@/schema/alert-manager/notification-protocol/model'; import type { NotificationLevel } from '@/schema/notification/notification/type'; diff --git a/apps/web/src/services/my-page/components/NotificationAddMemberGroup.vue b/apps/web/src/services/my-page/components/NotificationAddMemberGroup.vue index 45f121ca76..021124dcce 100644 --- a/apps/web/src/services/my-page/components/NotificationAddMemberGroup.vue +++ b/apps/web/src/services/my-page/components/NotificationAddMemberGroup.vue @@ -9,7 +9,7 @@ import { PSelectDropdown } from '@cloudforet/mirinae'; import type { SelectDropdownMenuItem } from '@cloudforet/mirinae/types/controls/dropdown/select-dropdown/type'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { ProjectGetParameters } from '@/schema/identity/project/api-verbs/get'; import type { ProjectModel } from '@/schema/identity/project/model'; import type { WorkspaceUserListParameters } from '@/schema/identity/workspace-user/api-verbs/list'; diff --git a/apps/web/src/services/my-page/components/NotificationChannelList.vue b/apps/web/src/services/my-page/components/NotificationChannelList.vue index 938ab956ac..1feb0f029e 100644 --- a/apps/web/src/services/my-page/components/NotificationChannelList.vue +++ b/apps/web/src/services/my-page/components/NotificationChannelList.vue @@ -13,8 +13,8 @@ import { } from '@cloudforet/mirinae'; import type { JsonSchema } from '@cloudforet/mirinae/types/controls/forms/json-schema-form/type'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; -import type { Tags } from '@/schema/_common/model'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; +import type { Tags } from '@/api-clients/_common/schema/model'; import type { NotificationProtocolListParameters } from '@/schema/alert-manager/notification-protocol/api-verbs/list'; import type { NotificationProtocolModel } from '@/schema/alert-manager/notification-protocol/model'; import type { UserChannelListParameters } from '@/schema/alert-manager/user-channel/api-verbs/list'; diff --git a/apps/web/src/services/ops-flow/composables/use-task-api.ts b/apps/web/src/services/ops-flow/composables/use-task-api.ts index f1b7c2040b..d27a0707fa 100644 --- a/apps/web/src/services/ops-flow/composables/use-task-api.ts +++ b/apps/web/src/services/ops-flow/composables/use-task-api.ts @@ -1,7 +1,7 @@ import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; import { getCancellableFetcher } from '@cloudforet/core-lib/space-connector/cancellable-fetcher'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { TaskChangeAssigneeParameters } from '@/schema/opsflow/task/api-verbs/change-assignee'; import type { TaskChangeStatusParameters } from '@/schema/opsflow/task/api-verbs/change-status'; import type { TaskCreateParameters } from '@/schema/opsflow/task/api-verbs/create'; diff --git a/apps/web/src/services/ops-flow/stores/admin/package-store.ts b/apps/web/src/services/ops-flow/stores/admin/package-store.ts index 2076fda226..242efc6b73 100644 --- a/apps/web/src/services/ops-flow/stores/admin/package-store.ts +++ b/apps/web/src/services/ops-flow/stores/admin/package-store.ts @@ -6,7 +6,7 @@ import { defineStore } from 'pinia'; import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; import { getCancellableFetcher } from '@cloudforet/core-lib/space-connector/cancellable-fetcher'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { PackageCreateParameters } from '@/schema/identity/package/api-verbs/create'; import type { PackageDeleteParameters } from '@/schema/identity/package/api-verbs/delete'; import type { PackageListParameters } from '@/schema/identity/package/api-verbs/list'; diff --git a/apps/web/src/services/ops-flow/stores/comment-store.ts b/apps/web/src/services/ops-flow/stores/comment-store.ts index 34ff97de07..a510124d37 100644 --- a/apps/web/src/services/ops-flow/stores/comment-store.ts +++ b/apps/web/src/services/ops-flow/stores/comment-store.ts @@ -5,7 +5,7 @@ import { defineStore } from 'pinia'; import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; import { getCancellableFetcher } from '@cloudforet/core-lib/space-connector/cancellable-fetcher'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { CommentCreateParameters } from '@/schema/opsflow/comment/api-verbs/create'; import type { CommentDeleteParameters } from '@/schema/opsflow/comment/api-verbs/delete'; import type { CommentListParameters } from '@/schema/opsflow/comment/api-verbs/list'; diff --git a/apps/web/src/services/ops-flow/stores/task-category-store.ts b/apps/web/src/services/ops-flow/stores/task-category-store.ts index 10cb9fdc12..bfd9e7041d 100644 --- a/apps/web/src/services/ops-flow/stores/task-category-store.ts +++ b/apps/web/src/services/ops-flow/stores/task-category-store.ts @@ -5,7 +5,7 @@ import { defineStore } from 'pinia'; import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; import { getCancellableFetcher } from '@cloudforet/core-lib/space-connector/cancellable-fetcher'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { TaskCategoryCreateParameters } from '@/schema/opsflow/task-category/api-verbs/create'; import type { TaskCategoryDeleteParameters } from '@/schema/opsflow/task-category/api-verbs/delete'; import type { TaskCategoryGetParameters } from '@/schema/opsflow/task-category/api-verbs/get'; diff --git a/apps/web/src/services/ops-flow/stores/task-detail-page-store.ts b/apps/web/src/services/ops-flow/stores/task-detail-page-store.ts index e20fa73d94..670b782e71 100644 --- a/apps/web/src/services/ops-flow/stores/task-detail-page-store.ts +++ b/apps/web/src/services/ops-flow/stores/task-detail-page-store.ts @@ -6,7 +6,7 @@ import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; import { getCancellableFetcher } from '@cloudforet/core-lib/space-connector/cancellable-fetcher'; import { ApiQueryHelper } from '@cloudforet/core-lib/space-connector/helper'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { CommentModel } from '@/schema/opsflow/comment/model'; import type { EventListParameters } from '@/schema/opsflow/event/api-verbs/list'; import type { EventModel } from '@/schema/opsflow/event/model'; diff --git a/apps/web/src/services/ops-flow/stores/task-type-store.ts b/apps/web/src/services/ops-flow/stores/task-type-store.ts index 20f051067f..aa2e5c02b8 100644 --- a/apps/web/src/services/ops-flow/stores/task-type-store.ts +++ b/apps/web/src/services/ops-flow/stores/task-type-store.ts @@ -5,7 +5,7 @@ import { defineStore } from 'pinia'; import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; import { getCancellableFetcher } from '@cloudforet/core-lib/space-connector/cancellable-fetcher'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { TaskTypeCreateParameters } from '@/schema/opsflow/task-type/api-verbs/create'; import type { TaskTypeDeleteParameters } from '@/schema/opsflow/task-type/api-verbs/delete'; import type { TaskTypeGetParameters } from '@/schema/opsflow/task-type/api-verbs/get'; diff --git a/apps/web/src/services/ops-flow/task-fields-form/field-templates/AssetTaskField.vue b/apps/web/src/services/ops-flow/task-fields-form/field-templates/AssetTaskField.vue index b0c8472e2d..4710437712 100644 --- a/apps/web/src/services/ops-flow/task-fields-form/field-templates/AssetTaskField.vue +++ b/apps/web/src/services/ops-flow/task-fields-form/field-templates/AssetTaskField.vue @@ -7,7 +7,7 @@ import { } from '@cloudforet/mirinae'; import type { MenuAttachHandler } from '@cloudforet/mirinae/types/hooks/use-context-menu-attach/use-context-menu-attach'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { CloudServiceListParameters } from '@/schema/inventory/cloud-service/api-verbs/list'; import type { CloudServiceModel } from '@/schema/inventory/cloud-service/model'; import type { OtherTaskField } from '@/schema/opsflow/_types/task-field-type'; diff --git a/apps/web/src/services/project-v1/components/ProjectAlertEventRuleConditionForm.vue b/apps/web/src/services/project-v1/components/ProjectAlertEventRuleConditionForm.vue index dd98ad1659..2551ccf136 100644 --- a/apps/web/src/services/project-v1/components/ProjectAlertEventRuleConditionForm.vue +++ b/apps/web/src/services/project-v1/components/ProjectAlertEventRuleConditionForm.vue @@ -8,7 +8,7 @@ import { } from '@cloudforet/mirinae'; import type { SelectDropdownMenuItem } from '@cloudforet/mirinae/types/controls/dropdown/select-dropdown/type'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { WebhookListParameters } from '@/schema/monitoring/webhook/api-verbs/list'; import type { WebhookModel } from '@/schema/monitoring/webhook/model'; import { i18n } from '@/translations'; diff --git a/apps/web/src/services/project-v1/components/ProjectAlertSettingsEscalationPolicy.vue b/apps/web/src/services/project-v1/components/ProjectAlertSettingsEscalationPolicy.vue index 633bfe275f..9ff1ce62f6 100644 --- a/apps/web/src/services/project-v1/components/ProjectAlertSettingsEscalationPolicy.vue +++ b/apps/web/src/services/project-v1/components/ProjectAlertSettingsEscalationPolicy.vue @@ -16,7 +16,7 @@ import { } from '@cloudforet/mirinae'; import { ACTION_ICON } from '@cloudforet/mirinae/src/navigation/link/type'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import { ESCALATION_POLICY_FINISH_CONDITION } from '@/schema/monitoring/escalation-policy/constant'; import type { EscalationPolicyModel } from '@/schema/monitoring/escalation-policy/model'; import type { EscalationPolicyFinishCondition, EscalationPolicyRule } from '@/schema/monitoring/escalation-policy/type'; diff --git a/apps/web/src/services/project-v1/components/ProjectAlertSettingsTab.vue b/apps/web/src/services/project-v1/components/ProjectAlertSettingsTab.vue index da531ecb7d..e87c02dfb0 100644 --- a/apps/web/src/services/project-v1/components/ProjectAlertSettingsTab.vue +++ b/apps/web/src/services/project-v1/components/ProjectAlertSettingsTab.vue @@ -11,8 +11,8 @@ import { PI, PIconButton, PPaneLayout, PButton, } from '@cloudforet/mirinae'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; -import { RESOURCE_GROUP } from '@/schema/_common/constant'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; +import { RESOURCE_GROUP } from '@/api-clients/_common/schema/constant'; import type { EscalationPolicyGetParameters } from '@/schema/monitoring/escalation-policy/api-verbs/get'; import type { EscalationPolicyModel } from '@/schema/monitoring/escalation-policy/model'; import type { EventRuleListParameters } from '@/schema/monitoring/event-rule/api-verbs/list'; diff --git a/apps/web/src/services/project-v1/components/ProjectAlertWebhookCreateStep2.vue b/apps/web/src/services/project-v1/components/ProjectAlertWebhookCreateStep2.vue index 7ea25a05ae..002f944c89 100644 --- a/apps/web/src/services/project-v1/components/ProjectAlertWebhookCreateStep2.vue +++ b/apps/web/src/services/project-v1/components/ProjectAlertWebhookCreateStep2.vue @@ -11,7 +11,7 @@ import { } from '@cloudforet/mirinae'; import type { JsonSchema } from '@cloudforet/mirinae/types/controls/forms/json-schema-form/type'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { WebhookCreateParameters } from '@/schema/monitoring/webhook/api-verbs/create'; import type { WebhookModel } from '@/schema/monitoring/webhook/model'; import type { PluginGetVersionsParameters } from '@/schema/repository/plugin/api-verbs/get-versions'; diff --git a/apps/web/src/services/project-v1/components/ProjectAlertWebhookTab.vue b/apps/web/src/services/project-v1/components/ProjectAlertWebhookTab.vue index 3624220a19..d39434c4aa 100644 --- a/apps/web/src/services/project-v1/components/ProjectAlertWebhookTab.vue +++ b/apps/web/src/services/project-v1/components/ProjectAlertWebhookTab.vue @@ -24,7 +24,7 @@ import { import type { MenuItem } from '@cloudforet/mirinae/types/controls/context-menu/type'; import type { KeyItemSet } from '@cloudforet/mirinae/types/controls/search/query-search/type'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { WebhookDeleteParameters } from '@/schema/monitoring/webhook/api-verbs/delete'; import type { WebhookDisableParameters } from '@/schema/monitoring/webhook/api-verbs/disable'; import type { WebhookEnableParameters } from '@/schema/monitoring/webhook/api-verbs/enable'; diff --git a/apps/web/src/services/project-v1/components/ProjectDetailTabHeader.vue b/apps/web/src/services/project-v1/components/ProjectDetailTabHeader.vue index 092f566bc2..ea1afe9eb5 100644 --- a/apps/web/src/services/project-v1/components/ProjectDetailTabHeader.vue +++ b/apps/web/src/services/project-v1/components/ProjectDetailTabHeader.vue @@ -13,12 +13,12 @@ import { } from '@cloudforet/mirinae'; import type { MenuItem } from '@cloudforet/mirinae/types/controls/context-menu/type'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import DomainAdminImage from '@/assets/images/role/img_avatar_admin.png'; 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 type { ListResponse } from '@/schema/_common/api-verbs/list'; import type { ProjectGetParameters } from '@/schema/identity/project/api-verbs/get'; import type { ProjectRemoveUsersParameters } from '@/schema/identity/project/api-verbs/remove-users'; import type { ProjectUpdateParameters } from '@/schema/identity/project/api-verbs/udpate'; diff --git a/apps/web/src/services/project-v1/components/ProjectMain.vue b/apps/web/src/services/project-v1/components/ProjectMain.vue index 53ad30d38b..aa0b763490 100644 --- a/apps/web/src/services/project-v1/components/ProjectMain.vue +++ b/apps/web/src/services/project-v1/components/ProjectMain.vue @@ -10,7 +10,7 @@ import { PFieldTitle, PEmpty, PPaneLayout, } from '@cloudforet/mirinae'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { ServiceAccountListParameters } from '@/schema/identity/service-account/api-verbs/list'; import type { ServiceAccountModel } from '@/schema/identity/service-account/model'; diff --git a/apps/web/src/services/project-v1/components/ProjectMainProjectGroupFormModal.vue b/apps/web/src/services/project-v1/components/ProjectMainProjectGroupFormModal.vue index 76924a2cf1..1b7a0cc004 100644 --- a/apps/web/src/services/project-v1/components/ProjectMainProjectGroupFormModal.vue +++ b/apps/web/src/services/project-v1/components/ProjectMainProjectGroupFormModal.vue @@ -8,7 +8,7 @@ import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; import { ApiQueryHelper } from '@cloudforet/core-lib/space-connector/helper'; import { PButtonModal, PFieldGroup, PTextInput } from '@cloudforet/mirinae'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { ProjectGroupCreateParameters } from '@/schema/identity/project-group/api-verbs/create'; import type { ProjectGroupListParameters } from '@/schema/identity/project-group/api-verbs/list'; import type { ProjectGroupUpdateParameters } from '@/schema/identity/project-group/api-verbs/update'; diff --git a/apps/web/src/services/project-v1/components/ProjectMemberInviteModal.vue b/apps/web/src/services/project-v1/components/ProjectMemberInviteModal.vue index eaaa2bce09..12fee8681e 100644 --- a/apps/web/src/services/project-v1/components/ProjectMemberInviteModal.vue +++ b/apps/web/src/services/project-v1/components/ProjectMemberInviteModal.vue @@ -10,12 +10,12 @@ import { import type { SelectDropdownMenuItem } from '@cloudforet/mirinae/types/controls/dropdown/select-dropdown/type'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import DomainAdminImage from '@/assets/images/role/img_avatar_admin.png'; 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 type { ListResponse } from '@/schema/_common/api-verbs/list'; import type { ProjectAddUsersParameters } from '@/schema/identity/project/api-verbs/add-users'; import type { ProjectGetParameters } from '@/schema/identity/project/api-verbs/get'; import type { ProjectModel } from '@/schema/identity/project/model'; diff --git a/apps/web/src/services/project-v1/components/ProjectSummaryAlertWidget.vue b/apps/web/src/services/project-v1/components/ProjectSummaryAlertWidget.vue index ff2bd5e05b..a3e55ffcef 100644 --- a/apps/web/src/services/project-v1/components/ProjectSummaryAlertWidget.vue +++ b/apps/web/src/services/project-v1/components/ProjectSummaryAlertWidget.vue @@ -15,7 +15,7 @@ import { } from '@cloudforet/mirinae'; import { numberFormatter } from '@cloudforet/utils'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { AlertListParameters } from '@/schema/monitoring/alert/api-verbs/list'; import { ALERT_STATE } from '@/schema/monitoring/alert/constants'; import type { AlertModel } from '@/schema/monitoring/alert/model'; diff --git a/apps/web/src/services/project-v1/composables/use-project-tree.ts b/apps/web/src/services/project-v1/composables/use-project-tree.ts index 6fee433b5a..054d4b962e 100644 --- a/apps/web/src/services/project-v1/composables/use-project-tree.ts +++ b/apps/web/src/services/project-v1/composables/use-project-tree.ts @@ -3,7 +3,7 @@ import { cloneDeep, get } from 'lodash'; import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; import type { Query, Sort } from '@cloudforet/core-lib/space-connector/type'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { ProjectGroupListParameters } from '@/schema/identity/project-group/api-verbs/list'; import type { ProjectGroupModel } from '@/schema/identity/project-group/model'; import type { ProjectListParameters } from '@/schema/identity/project/api-verbs/list'; diff --git a/apps/web/src/services/project-v1/pages/ProjectAlertEventRulePage.vue b/apps/web/src/services/project-v1/pages/ProjectAlertEventRulePage.vue index bbc25d73e9..0bdcdf0f6a 100644 --- a/apps/web/src/services/project-v1/pages/ProjectAlertEventRulePage.vue +++ b/apps/web/src/services/project-v1/pages/ProjectAlertEventRulePage.vue @@ -9,7 +9,7 @@ import { } from '@cloudforet/mirinae'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { EventRuleChangeOrderParameters } from '@/schema/monitoring/event-rule/api-verbs/change-order'; import type { EventRuleDeleteParameters } from '@/schema/monitoring/event-rule/api-verbs/delete'; import type { EventRuleListParameters } from '@/schema/monitoring/event-rule/api-verbs/list'; diff --git a/apps/web/src/services/project-v1/pages/ProjectAlertPage.vue b/apps/web/src/services/project-v1/pages/ProjectAlertPage.vue index cbe922236c..287960862f 100644 --- a/apps/web/src/services/project-v1/pages/ProjectAlertPage.vue +++ b/apps/web/src/services/project-v1/pages/ProjectAlertPage.vue @@ -9,7 +9,7 @@ import { PButtonTab, PButton } from '@cloudforet/mirinae'; import type { TabItem } from '@cloudforet/mirinae/types/navigation/tabs/tab/type'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { ProjectAlertConfigCreateParameters } from '@/schema/monitoring/project-alert-config/api-verbs/create'; import type { ProjectAlertConfigListParameters } from '@/schema/monitoring/project-alert-config/api-verbs/list'; import type { ProjectAlertConfigModel } from '@/schema/monitoring/project-alert-config/model'; diff --git a/apps/web/src/services/project-v1/pages/ProjectSummaryPage.vue b/apps/web/src/services/project-v1/pages/ProjectSummaryPage.vue index 5f0e120ddf..73f827b955 100644 --- a/apps/web/src/services/project-v1/pages/ProjectSummaryPage.vue +++ b/apps/web/src/services/project-v1/pages/ProjectSummaryPage.vue @@ -6,7 +6,7 @@ import { import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; import { PI, PIconButton } from '@cloudforet/mirinae'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { ProjectAlertConfigListParameters } from '@/schema/monitoring/project-alert-config/api-verbs/list'; import type { ProjectAlertConfigModel } from '@/schema/monitoring/project-alert-config/model'; diff --git a/apps/web/src/services/project-v1/stores/project-detail-page-store.ts b/apps/web/src/services/project-v1/stores/project-detail-page-store.ts index bf5d916442..15f83dccc2 100644 --- a/apps/web/src/services/project-v1/stores/project-detail-page-store.ts +++ b/apps/web/src/services/project-v1/stores/project-detail-page-store.ts @@ -4,7 +4,7 @@ import { defineStore } from 'pinia'; import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { ProjectGetParameters } from '@/schema/identity/project/api-verbs/get'; import type { ProjectModel } from '@/schema/identity/project/model'; import type { ProjectType } from '@/schema/identity/project/type'; diff --git a/apps/web/src/services/project/components/ProjectDetailTabHeader.vue b/apps/web/src/services/project/components/ProjectDetailTabHeader.vue index 040e313e89..9442a7d4a6 100644 --- a/apps/web/src/services/project/components/ProjectDetailTabHeader.vue +++ b/apps/web/src/services/project/components/ProjectDetailTabHeader.vue @@ -13,12 +13,12 @@ import { } from '@cloudforet/mirinae'; import type { MenuItem } from '@cloudforet/mirinae/types/controls/context-menu/type'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import DomainAdminImage from '@/assets/images/role/img_avatar_admin.png'; 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 type { ListResponse } from '@/schema/_common/api-verbs/list'; import type { ProjectGetParameters } from '@/schema/identity/project/api-verbs/get'; import type { ProjectRemoveUsersParameters } from '@/schema/identity/project/api-verbs/remove-users'; import type { ProjectUpdateParameters } from '@/schema/identity/project/api-verbs/udpate'; diff --git a/apps/web/src/services/project/components/ProjectMain.vue b/apps/web/src/services/project/components/ProjectMain.vue index 35bd02606e..97f2a309cd 100644 --- a/apps/web/src/services/project/components/ProjectMain.vue +++ b/apps/web/src/services/project/components/ProjectMain.vue @@ -10,7 +10,7 @@ import { PFieldTitle, PEmpty, PPaneLayout, } from '@cloudforet/mirinae'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { ServiceAccountListParameters } from '@/schema/identity/service-account/api-verbs/list'; import type { ServiceAccountModel } from '@/schema/identity/service-account/model'; diff --git a/apps/web/src/services/project/components/ProjectMainProjectGroupFormModal.vue b/apps/web/src/services/project/components/ProjectMainProjectGroupFormModal.vue index 76924a2cf1..1b7a0cc004 100644 --- a/apps/web/src/services/project/components/ProjectMainProjectGroupFormModal.vue +++ b/apps/web/src/services/project/components/ProjectMainProjectGroupFormModal.vue @@ -8,7 +8,7 @@ import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; import { ApiQueryHelper } from '@cloudforet/core-lib/space-connector/helper'; import { PButtonModal, PFieldGroup, PTextInput } from '@cloudforet/mirinae'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { ProjectGroupCreateParameters } from '@/schema/identity/project-group/api-verbs/create'; import type { ProjectGroupListParameters } from '@/schema/identity/project-group/api-verbs/list'; import type { ProjectGroupUpdateParameters } from '@/schema/identity/project-group/api-verbs/update'; diff --git a/apps/web/src/services/project/components/ProjectMemberInviteModal.vue b/apps/web/src/services/project/components/ProjectMemberInviteModal.vue index eaaa2bce09..12fee8681e 100644 --- a/apps/web/src/services/project/components/ProjectMemberInviteModal.vue +++ b/apps/web/src/services/project/components/ProjectMemberInviteModal.vue @@ -10,12 +10,12 @@ import { import type { SelectDropdownMenuItem } from '@cloudforet/mirinae/types/controls/dropdown/select-dropdown/type'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import DomainAdminImage from '@/assets/images/role/img_avatar_admin.png'; 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 type { ListResponse } from '@/schema/_common/api-verbs/list'; import type { ProjectAddUsersParameters } from '@/schema/identity/project/api-verbs/add-users'; import type { ProjectGetParameters } from '@/schema/identity/project/api-verbs/get'; import type { ProjectModel } from '@/schema/identity/project/model'; diff --git a/apps/web/src/services/project/composables/use-project-tree.ts b/apps/web/src/services/project/composables/use-project-tree.ts index 98cc275200..8c20ab5a1c 100644 --- a/apps/web/src/services/project/composables/use-project-tree.ts +++ b/apps/web/src/services/project/composables/use-project-tree.ts @@ -3,7 +3,7 @@ import { cloneDeep, get } from 'lodash'; import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; import type { Query, Sort } from '@cloudforet/core-lib/space-connector/type'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { ProjectGroupListParameters } from '@/schema/identity/project-group/api-verbs/list'; import type { ProjectGroupModel } from '@/schema/identity/project-group/model'; import type { ProjectListParameters } from '@/schema/identity/project/api-verbs/list'; diff --git a/apps/web/src/services/project/stores/project-detail-page-store.ts b/apps/web/src/services/project/stores/project-detail-page-store.ts index 4d20ef6599..bddfa46629 100644 --- a/apps/web/src/services/project/stores/project-detail-page-store.ts +++ b/apps/web/src/services/project/stores/project-detail-page-store.ts @@ -4,7 +4,7 @@ import { defineStore } from 'pinia'; import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { ProjectGetParameters } from '@/schema/identity/project/api-verbs/get'; import type { ProjectModel } from '@/schema/identity/project/model'; import type { ProjectType } from '@/schema/identity/project/type'; diff --git a/apps/web/src/services/workspace-home/components/AccountSummary.vue b/apps/web/src/services/workspace-home/components/AccountSummary.vue index 1ccd0e8840..a5b548a0c4 100644 --- a/apps/web/src/services/workspace-home/components/AccountSummary.vue +++ b/apps/web/src/services/workspace-home/components/AccountSummary.vue @@ -14,7 +14,7 @@ import { } from '@cloudforet/mirinae'; import { numberFormatter } from '@cloudforet/utils'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { ServiceAccountListParameters } from '@/schema/identity/service-account/api-verbs/list'; import type { ServiceAccountModel } from '@/schema/identity/service-account/model'; import { i18n } from '@/translations'; diff --git a/apps/web/src/services/workspace-home/components/CostSummary.vue b/apps/web/src/services/workspace-home/components/CostSummary.vue index 96f8b0f1bb..e20365b21e 100644 --- a/apps/web/src/services/workspace-home/components/CostSummary.vue +++ b/apps/web/src/services/workspace-home/components/CostSummary.vue @@ -10,7 +10,7 @@ import { PDivider, PFieldTitle, PLink, PSpinner, PStatus, screens, } from '@cloudforet/mirinae'; -import type { AnalyzeResponse } from '@/schema/_common/api-verbs/analyze'; +import type { AnalyzeResponse } from '@/api-clients/_common/schema/api-verbs/analyze'; import type { UserConfigModel } from '@/schema/config/user-config/model'; import type { CostReportConfigModel } from '@/schema/cost-analysis/cost-report-config/model'; import type { CostDataSourceModel } from '@/schema/cost-analysis/data-source/model'; diff --git a/apps/web/src/services/workspace-home/store/workspace-home-page-store.ts b/apps/web/src/services/workspace-home/store/workspace-home-page-store.ts index dd885a0baa..96083079bd 100644 --- a/apps/web/src/services/workspace-home/store/workspace-home-page-store.ts +++ b/apps/web/src/services/workspace-home/store/workspace-home-page-store.ts @@ -9,8 +9,8 @@ import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; import { getCancellableFetcher } from '@cloudforet/core-lib/space-connector/cancellable-fetcher'; import { ApiQueryHelper } from '@cloudforet/core-lib/space-connector/helper'; -import type { AnalyzeResponse } from '@/schema/_common/api-verbs/analyze'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { AnalyzeResponse } from '@/api-clients/_common/schema/api-verbs/analyze'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { UserConfigListParameters } from '@/schema/config/user-config/api-verbs/list'; import type { UserConfigModel } from '@/schema/config/user-config/model'; import type { CostReportConfigListParameters } from '@/schema/cost-analysis/cost-report-config/api-verbs/list'; diff --git a/apps/web/src/store/app-context/workspace/user-workspace-store.ts b/apps/web/src/store/app-context/workspace/user-workspace-store.ts index 379edc9b81..459cad6e78 100644 --- a/apps/web/src/store/app-context/workspace/user-workspace-store.ts +++ b/apps/web/src/store/app-context/workspace/user-workspace-store.ts @@ -4,7 +4,7 @@ import { defineStore } from 'pinia'; import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { WorkspaceModel } from '@/schema/identity/workspace/model'; interface UserWorkspaceStoreState { diff --git a/apps/web/src/store/config/domain-config-store.ts b/apps/web/src/store/config/domain-config-store.ts index b02f2c279b..1e3fb8e6da 100644 --- a/apps/web/src/store/config/domain-config-store.ts +++ b/apps/web/src/store/config/domain-config-store.ts @@ -4,7 +4,7 @@ import { defineStore } from 'pinia'; import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { DomainConfigCreateParameters } from '@/schema/config/domain-config/api-verbs/create'; import type { DomainConfigListParameters } from '@/schema/config/domain-config/api-verbs/list'; import type { DomainConfigUpdateParameters } from '@/schema/config/domain-config/api-verbs/update'; diff --git a/apps/web/src/store/dashboard/dashboard-store.ts b/apps/web/src/store/dashboard/dashboard-store.ts index 0ea458083d..26393db9b7 100644 --- a/apps/web/src/store/dashboard/dashboard-store.ts +++ b/apps/web/src/store/dashboard/dashboard-store.ts @@ -8,8 +8,8 @@ import { getCancellableFetcher } from '@cloudforet/core-lib/space-connector/canc import { ApiQueryHelper } from '@cloudforet/core-lib/space-connector/helper'; import { getClonedName } from '@cloudforet/utils'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; -import { RESOURCE_GROUP } from '@/schema/_common/constant'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; +import { RESOURCE_GROUP } from '@/api-clients/_common/schema/constant'; import type { DashboardType, DashboardFolderType, @@ -18,15 +18,15 @@ import type { DashboardListParams, DashboardUpdateParams, DashboardDeleteParams, -} from '@/schema/dashboard/_types/dashboard-type'; -import type { FolderCreateParams, FolderModel } from '@/schema/dashboard/_types/folder-type'; -import type { WidgetListParams, WidgetModel } from '@/schema/dashboard/_types/widget-type'; -import type { PrivateDashboardModel } from '@/schema/dashboard/private-dashboard/model'; -import type { PrivateFolderModel } from '@/schema/dashboard/private-folder/model'; -import type { PublicDashboardCreateParameters } from '@/schema/dashboard/public-dashboard/api-verbs/create'; -import type { PublicDashboardModel } from '@/schema/dashboard/public-dashboard/model'; -import type { PublicFolderCreateParameters } from '@/schema/dashboard/public-folder/api-verbs/create'; -import type { PublicFolderModel } from '@/schema/dashboard/public-folder/model'; +} from '@/api-clients/dashboard/_types/dashboard-type'; +import type { FolderCreateParams, FolderModel } from '@/api-clients/dashboard/_types/folder-type'; +import type { WidgetListParams, WidgetModel } from '@/api-clients/dashboard/_types/widget-type'; +import type { PrivateDashboardModel } from '@/api-clients/dashboard/private-dashboard/schema/model'; +import type { PrivateFolderModel } from '@/api-clients/dashboard/private-folder/schema/model'; +import type { PublicDashboardCreateParameters } from '@/api-clients/dashboard/public-dashboard/schema/api-verbs/create'; +import type { PublicDashboardModel } from '@/api-clients/dashboard/public-dashboard/schema/model'; +import type { PublicFolderCreateParameters } from '@/api-clients/dashboard/public-folder/schema/api-verbs/create'; +import type { PublicFolderModel } from '@/api-clients/dashboard/public-folder/schema/model'; import { useAppContextStore } from '@/store/app-context/app-context-store'; import { useUserWorkspaceStore } from '@/store/app-context/workspace/user-workspace-store'; diff --git a/apps/web/src/store/display/display-store.ts b/apps/web/src/store/display/display-store.ts index ecc6398c57..5e41bf3de3 100644 --- a/apps/web/src/store/display/display-store.ts +++ b/apps/web/src/store/display/display-store.ts @@ -13,8 +13,8 @@ import type { ConsoleFilter } from '@cloudforet/core-lib/query/type'; import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; import { ApiQueryHelper } from '@cloudforet/core-lib/space-connector/helper'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import { SpaceRouter } from '@/router'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; import type { NotificationListParameters } from '@/schema/notification/notification/api-verbs/list'; import type { NotificationModel } from '@/schema/notification/notification/model'; import { i18n } from '@/translations'; diff --git a/apps/web/src/store/notice/index.ts b/apps/web/src/store/notice/index.ts index 020d5f258f..ef5628008e 100644 --- a/apps/web/src/store/notice/index.ts +++ b/apps/web/src/store/notice/index.ts @@ -7,7 +7,7 @@ import { defineStore } from 'pinia'; import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; import { ApiQueryHelper } from '@cloudforet/core-lib/space-connector/helper'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { PostListParameters } from '@/schema/board/post/api-verbs/list'; import { POST_BOARD_TYPE } from '@/schema/board/post/constant'; import type { PostModel } from '@/schema/board/post/model'; diff --git a/apps/web/src/store/reference/app-reference-store.ts b/apps/web/src/store/reference/app-reference-store.ts index 828e612ad5..00c25cba9a 100644 --- a/apps/web/src/store/reference/app-reference-store.ts +++ b/apps/web/src/store/reference/app-reference-store.ts @@ -5,7 +5,7 @@ import { defineStore } from 'pinia'; import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { AppListParameters } from '@/schema/identity/app/api-verbs/list'; import type { AppModel } from '@/schema/identity/app/model'; diff --git a/apps/web/src/store/reference/cloud-service-type-reference-store.ts b/apps/web/src/store/reference/cloud-service-type-reference-store.ts index 7035cc6198..1d8a3345c5 100644 --- a/apps/web/src/store/reference/cloud-service-type-reference-store.ts +++ b/apps/web/src/store/reference/cloud-service-type-reference-store.ts @@ -5,7 +5,7 @@ import { defineStore } from 'pinia'; import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { CloudServiceTypeListParameters } from '@/schema/inventory/cloud-service-type/api-verbs/list'; import type { CloudServiceTypeModel } from '@/schema/inventory/cloud-service-type/model'; diff --git a/apps/web/src/store/reference/cloue-service-query-set-reference-store.ts b/apps/web/src/store/reference/cloue-service-query-set-reference-store.ts index fae5bb0436..1d5524a0ae 100644 --- a/apps/web/src/store/reference/cloue-service-query-set-reference-store.ts +++ b/apps/web/src/store/reference/cloue-service-query-set-reference-store.ts @@ -7,7 +7,7 @@ import { defineStore } from 'pinia'; import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { CloudServiceQuerySetListParameters } from '@/schema/inventory/cloud-service-query-set/api-verbs/list'; import type { CloudServiceQuerySetModel } from '@/schema/inventory/cloud-service-query-set/model'; diff --git a/apps/web/src/store/reference/collector-reference-store.ts b/apps/web/src/store/reference/collector-reference-store.ts index 5e3d6d471d..05cfd877bb 100644 --- a/apps/web/src/store/reference/collector-reference-store.ts +++ b/apps/web/src/store/reference/collector-reference-store.ts @@ -5,7 +5,7 @@ import { defineStore } from 'pinia'; import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { CollectorListParameters } from '@/schema/inventory/collector/api-verbs/list'; import type { CollectorModel } from '@/schema/inventory/collector/model'; diff --git a/apps/web/src/store/reference/cost-data-source-reference-store.ts b/apps/web/src/store/reference/cost-data-source-reference-store.ts index 4f353d565c..66466882c2 100644 --- a/apps/web/src/store/reference/cost-data-source-reference-store.ts +++ b/apps/web/src/store/reference/cost-data-source-reference-store.ts @@ -7,7 +7,7 @@ import { defineStore } from 'pinia'; import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { CostDataSourceListParameters } from '@/schema/cost-analysis/data-source/api-verbs/list'; import type { CostDataSourceModel } from '@/schema/cost-analysis/data-source/model'; diff --git a/apps/web/src/store/reference/escalation-policy-reference-store.ts b/apps/web/src/store/reference/escalation-policy-reference-store.ts index 51c54cc316..f096b0aa13 100644 --- a/apps/web/src/store/reference/escalation-policy-reference-store.ts +++ b/apps/web/src/store/reference/escalation-policy-reference-store.ts @@ -5,7 +5,7 @@ import { defineStore } from 'pinia'; import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { EscalationPolicyListParameters } from '@/schema/alert-manager/escalation-policy/api-verbs/list'; import type { EscalationPolicyModel } from '@/schema/alert-manager/escalation-policy/model'; import type { EscalationPolicyListParameters as EscalationPolicyListParametersV1 } from '@/schema/monitoring/escalation-policy/api-verbs/list'; diff --git a/apps/web/src/store/reference/metric-reference-store.ts b/apps/web/src/store/reference/metric-reference-store.ts index 09b1be648d..4a881bfefe 100644 --- a/apps/web/src/store/reference/metric-reference-store.ts +++ b/apps/web/src/store/reference/metric-reference-store.ts @@ -5,7 +5,7 @@ import { defineStore } from 'pinia'; import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { MetricListParameters } from '@/schema/inventory/metric/api-verbs/list'; import type { MetricModel } from '@/schema/inventory/metric/model'; diff --git a/apps/web/src/store/reference/namespace-reference-store.ts b/apps/web/src/store/reference/namespace-reference-store.ts index 62b17b5c5a..ddc98294fe 100644 --- a/apps/web/src/store/reference/namespace-reference-store.ts +++ b/apps/web/src/store/reference/namespace-reference-store.ts @@ -5,7 +5,7 @@ import { defineStore } from 'pinia'; import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { NamespaceListParameters } from '@/schema/inventory/namespace/api-verbs/list'; import type { NamespaceModel } from '@/schema/inventory/namespace/model'; diff --git a/apps/web/src/store/reference/plugin-reference-store.ts b/apps/web/src/store/reference/plugin-reference-store.ts index 368c1716dc..168f9b4396 100644 --- a/apps/web/src/store/reference/plugin-reference-store.ts +++ b/apps/web/src/store/reference/plugin-reference-store.ts @@ -5,7 +5,7 @@ import { defineStore } from 'pinia'; import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { PluginListParameters } from '@/schema/repository/plugin/api-verbs/list'; import type { PluginModel } from '@/schema/repository/plugin/model'; diff --git a/apps/web/src/store/reference/project-group-reference-store.ts b/apps/web/src/store/reference/project-group-reference-store.ts index 32aef6db40..750a5064b5 100644 --- a/apps/web/src/store/reference/project-group-reference-store.ts +++ b/apps/web/src/store/reference/project-group-reference-store.ts @@ -5,7 +5,7 @@ import { defineStore } from 'pinia'; import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { ProjectGroupListParameters } from '@/schema/identity/project-group/api-verbs/list'; import type { ProjectGroupModel } from '@/schema/identity/project-group/model'; diff --git a/apps/web/src/store/reference/project-reference-store.ts b/apps/web/src/store/reference/project-reference-store.ts index 15adcd924a..f49908ada1 100644 --- a/apps/web/src/store/reference/project-reference-store.ts +++ b/apps/web/src/store/reference/project-reference-store.ts @@ -5,7 +5,7 @@ import { defineStore } from 'pinia'; import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { ProjectListParameters } from '@/schema/identity/project/api-verbs/list'; import type { ProjectModel } from '@/schema/identity/project/model'; import type { ProjectType } from '@/schema/identity/project/type'; diff --git a/apps/web/src/store/reference/protocol-reference-store.ts b/apps/web/src/store/reference/protocol-reference-store.ts index f492df8343..ef3453ab5c 100644 --- a/apps/web/src/store/reference/protocol-reference-store.ts +++ b/apps/web/src/store/reference/protocol-reference-store.ts @@ -5,7 +5,7 @@ import { defineStore } from 'pinia'; import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { ProtocolListParameters } from '@/schema/notification/protocol/api-verbs/list'; import type { ProtocolModel } from '@/schema/notification/protocol/model'; diff --git a/apps/web/src/store/reference/provider-reference-store.ts b/apps/web/src/store/reference/provider-reference-store.ts index 5f195f076d..dfc249f9c0 100644 --- a/apps/web/src/store/reference/provider-reference-store.ts +++ b/apps/web/src/store/reference/provider-reference-store.ts @@ -5,7 +5,7 @@ import { defineStore } from 'pinia'; import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { ProviderListParameters } from '@/schema/identity/provider/api-verbs/list'; import type { ProviderModel } from '@/schema/identity/provider/model'; diff --git a/apps/web/src/store/reference/public-dashboard-reference-store.ts b/apps/web/src/store/reference/public-dashboard-reference-store.ts index 49ffbf5cab..a6fa4c16f5 100644 --- a/apps/web/src/store/reference/public-dashboard-reference-store.ts +++ b/apps/web/src/store/reference/public-dashboard-reference-store.ts @@ -5,9 +5,9 @@ import { defineStore } from 'pinia'; import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; -import type { PublicDashboardListParameters } from '@/schema/dashboard/public-dashboard/api-verbs/list'; -import type { PublicDashboardModel } from '@/schema/dashboard/public-dashboard/model'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; +import type { PublicDashboardListParameters } from '@/api-clients/dashboard/public-dashboard/schema/api-verbs/list'; +import type { PublicDashboardModel } from '@/api-clients/dashboard/public-dashboard/schema/model'; import type { ReferenceItem, ReferenceLoadOptions, ReferenceMap, diff --git a/apps/web/src/store/reference/public-folder-reference-store.ts b/apps/web/src/store/reference/public-folder-reference-store.ts index 95e4b11cd4..6b850d5b5e 100644 --- a/apps/web/src/store/reference/public-folder-reference-store.ts +++ b/apps/web/src/store/reference/public-folder-reference-store.ts @@ -5,9 +5,9 @@ import { defineStore } from 'pinia'; import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; -import type { PublicFolderListParameters } from '@/schema/dashboard/public-folder/api-verbs/list'; -import type { PublicFolderModel } from '@/schema/dashboard/public-folder/model'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; +import type { PublicFolderListParameters } from '@/api-clients/dashboard/public-folder/schema/api-verbs/list'; +import type { PublicFolderModel } from '@/api-clients/dashboard/public-folder/schema/model'; import type { ReferenceItem, ReferenceLoadOptions, ReferenceMap, diff --git a/apps/web/src/store/reference/region-reference-store.ts b/apps/web/src/store/reference/region-reference-store.ts index c728f0c2e0..bfc61b386a 100644 --- a/apps/web/src/store/reference/region-reference-store.ts +++ b/apps/web/src/store/reference/region-reference-store.ts @@ -5,7 +5,7 @@ import { defineStore } from 'pinia'; import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { RegionListParameters } from '@/schema/inventory/region/api-verbs/list'; import type { RegionModel } from '@/schema/inventory/region/model'; diff --git a/apps/web/src/store/reference/role-reference-store.ts b/apps/web/src/store/reference/role-reference-store.ts index dca708f93b..8d1a27a7fd 100644 --- a/apps/web/src/store/reference/role-reference-store.ts +++ b/apps/web/src/store/reference/role-reference-store.ts @@ -5,7 +5,7 @@ import { defineStore } from 'pinia'; import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { RoleListParameters } from '@/schema/identity/role/api-verbs/list'; import type { RoleListBasicRoleParameters } from '@/schema/identity/role/api-verbs/list-basic-role'; import type { BasicRoleModel, RoleModel } from '@/schema/identity/role/model'; diff --git a/apps/web/src/store/reference/secret-reference-store.ts b/apps/web/src/store/reference/secret-reference-store.ts index 3eddeb1d34..d595de5168 100644 --- a/apps/web/src/store/reference/secret-reference-store.ts +++ b/apps/web/src/store/reference/secret-reference-store.ts @@ -5,7 +5,7 @@ import { defineStore } from 'pinia'; import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { SecretListParameters } from '@/schema/secret/secret/api-verbs/list'; import type { SecretModel } from '@/schema/secret/secret/model'; diff --git a/apps/web/src/store/reference/service-account-reference-store.ts b/apps/web/src/store/reference/service-account-reference-store.ts index d555290127..fee57cfdd2 100644 --- a/apps/web/src/store/reference/service-account-reference-store.ts +++ b/apps/web/src/store/reference/service-account-reference-store.ts @@ -5,7 +5,7 @@ import { defineStore } from 'pinia'; import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { ServiceAccountListParameters } from '@/schema/identity/service-account/api-verbs/list'; import type { ServiceAccountModel } from '@/schema/identity/service-account/model'; diff --git a/apps/web/src/store/reference/service-reference-store.ts b/apps/web/src/store/reference/service-reference-store.ts index 90e5b48e9b..e9595a2520 100644 --- a/apps/web/src/store/reference/service-reference-store.ts +++ b/apps/web/src/store/reference/service-reference-store.ts @@ -5,7 +5,7 @@ import { defineStore } from 'pinia'; import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { ServiceListParameters } from '@/schema/alert-manager/service/api-verbs/list'; import type { ServiceModel } from '@/schema/alert-manager/service/model'; diff --git a/apps/web/src/store/reference/trusted-account-reference-store.ts b/apps/web/src/store/reference/trusted-account-reference-store.ts index d7e04f6f2b..7832889a72 100644 --- a/apps/web/src/store/reference/trusted-account-reference-store.ts +++ b/apps/web/src/store/reference/trusted-account-reference-store.ts @@ -5,7 +5,7 @@ import { defineStore } from 'pinia'; import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { TrustedAccountListParameters } from '@/schema/identity/trusted-account/api-verbs/list'; import type { TrustedAccountModel } from '@/schema/identity/trusted-account/model'; diff --git a/apps/web/src/store/reference/user-group-reference-store.ts b/apps/web/src/store/reference/user-group-reference-store.ts index cc25d738c6..dd35b49b41 100644 --- a/apps/web/src/store/reference/user-group-reference-store.ts +++ b/apps/web/src/store/reference/user-group-reference-store.ts @@ -5,7 +5,7 @@ import { defineStore } from 'pinia'; import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { UserGroupListParameters } from '@/schema/identity/user-group/api-verbs/list'; import type { UserGroupModel } from '@/schema/identity/user-group/model'; diff --git a/apps/web/src/store/reference/user-reference-store.ts b/apps/web/src/store/reference/user-reference-store.ts index 6c8ad65df2..0b7b0f41a0 100644 --- a/apps/web/src/store/reference/user-reference-store.ts +++ b/apps/web/src/store/reference/user-reference-store.ts @@ -5,7 +5,7 @@ import { defineStore } from 'pinia'; import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { RoleBindingModel } from '@/schema/identity/role-binding/model'; import type { RoleListParameters } from '@/schema/identity/role/api-verbs/list'; import { ROLE_STATE } from '@/schema/identity/role/constant'; diff --git a/apps/web/src/store/reference/webhook-reference-store.ts b/apps/web/src/store/reference/webhook-reference-store.ts index e29a8b9f97..98f347b961 100644 --- a/apps/web/src/store/reference/webhook-reference-store.ts +++ b/apps/web/src/store/reference/webhook-reference-store.ts @@ -5,7 +5,7 @@ import { defineStore } from 'pinia'; import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { WebhookListParameters } from '@/schema/alert-manager/webhook/api-verbs/list'; import type { WebhookModel } from '@/schema/alert-manager/webhook/model'; import type { WebhookListParameters as WebhookListParametersV1 } from '@/schema/monitoring/webhook/api-verbs/list'; diff --git a/apps/web/src/store/reference/workspace-group-reference-store.ts b/apps/web/src/store/reference/workspace-group-reference-store.ts index 2d0510358b..22a82c5b02 100644 --- a/apps/web/src/store/reference/workspace-group-reference-store.ts +++ b/apps/web/src/store/reference/workspace-group-reference-store.ts @@ -5,7 +5,7 @@ import { defineStore } from 'pinia'; import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { WorkspaceGroupListParameters } from '@/schema/identity/workspace-group/api-verbs/list'; import type { WorkspaceGroupModel } from '@/schema/identity/workspace-group/model'; diff --git a/apps/web/src/store/reference/workspace-reference-store.ts b/apps/web/src/store/reference/workspace-reference-store.ts index 77093c10ba..1ce2a3d970 100644 --- a/apps/web/src/store/reference/workspace-reference-store.ts +++ b/apps/web/src/store/reference/workspace-reference-store.ts @@ -5,7 +5,7 @@ import { defineStore } from 'pinia'; import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; -import type { ListResponse } from '@/schema/_common/api-verbs/list'; +import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; import type { WorkspaceListParameters } from '@/schema/identity/workspace/api-verbs/list'; import type { WorkspaceModel } from '@/schema/identity/workspace/model'; From 3136ab2d14f01717a8c530d5a91d0ada43729ff1 Mon Sep 17 00:00:00 2001 From: Yongtae Park Date: Sat, 1 Feb 2025 01:56:14 +0900 Subject: [PATCH 03/62] feat(api-clients): refactor directory (add-ons, cost-analysis, opsflow) Signed-off-by: samuel.park --- .../_common/composables/use-query-key.ts | 22 +++++++++++++++++++ .../add-ons/favorite/schema}/list.ts | 2 +- .../add-ons/favorite/schema}/model.ts | 0 .../composables/use-budget-usage-api.ts | 0 .../budget-usage/schema}/api-verbs/analyze.ts | 0 .../budget-usage/schema}/api-verbs/list.ts | 0 .../budget-usage/schema}/model.ts | 0 .../budget/composables/use-budget-api.ts | 0 .../budget/schema}/api-verbs/create.ts | 2 +- .../budget/schema}/api-verbs/delete.ts | 0 .../budget/schema}/api-verbs/get.ts | 0 .../budget/schema}/api-verbs/list.ts | 2 +- .../schema}/api-verbs/set-notification.ts | 2 +- .../budget/schema}/api-verbs/update.ts | 2 +- .../cost-analysis/budget/schema}/model.ts | 2 +- .../cost-analysis/budget/schema}/type.ts | 0 .../composables/use-cost-query-set-api.ts | 0 .../schema}/api-verbs/create.ts | 2 +- .../schema}/api-verbs/delete.ts | 0 .../cost-query-set/schema}/api-verbs/list.ts | 0 .../schema}/api-verbs/update.ts | 2 +- .../cost-query-set/schema}/model.ts | 2 +- .../cost-query-set/schema}/type.ts | 0 .../composables/use-cost-report-config-api.ts | 0 .../schema}/api-verbs/list.ts | 0 .../schema}/api-verbs/update-recipients.ts | 0 .../schema}/api-verbs/update.ts | 0 .../cost-report-config/schema}/model.ts | 2 +- .../cost-report-config/schema}/type.ts | 0 .../composables/use-cost-report-data-api.ts | 0 .../schema}/api-verbs/analyze.ts | 0 .../schema}/api-verbs/list.ts | 0 .../cost-report-data/schema}/model.ts | 0 .../cost-report-data/schema}/type.ts | 0 .../composables/use-cost-report-api.ts | 0 .../cost-report/schema}/api-verbs/get-url.ts | 0 .../cost-report/schema}/api-verbs/get.ts | 0 .../cost-report/schema}/api-verbs/list.ts | 2 +- .../cost-report/schema}/api-verbs/send.ts | 0 .../cost-report/schema}/model.ts | 2 +- .../cost-analysis/cost-report/schema}/type.ts | 0 .../cost/composables/use-cost-api.ts | 0 .../cost/schema}/api-verbs/analyze.ts | 0 .../cost/schema}/api-verbs/stat.ts | 0 .../cost-analysis/cost/schema}/model.ts | 0 .../use-data-source-account-api.ts | 0 .../schema}/api-verbs/analyze.ts | 0 .../schema}/api-verbs/list.ts | 0 .../schema}/api-verbs/reset.ts | 0 .../schema}/api-verbs/update.ts | 0 .../data-source-account/schema}/model.ts | 0 .../composables/use-data-source-api.ts | 0 .../data-source/schema}/api-verbs/get.ts | 0 .../data-source/schema}/api-verbs/list.ts | 2 +- .../data-source/schema}/api-verbs/sync.ts | 0 .../schema}/api-verbs/update-permissions.ts | 0 .../data-source/schema}/constant.ts | 0 .../data-source/schema}/model.ts | 2 +- .../cost-analysis/data-source/schema}/type.ts | 2 +- .../job/composables/use-job-api.ts | 0 .../job/schema}/api-verbs/cancel.ts | 0 .../job/schema}/api-verbs/list.ts | 0 .../cost-analysis/job/schema}/model.ts | 1 + .../cost-analysis/job/schema}/type.ts | 0 .../composables/use-unified-cost-api.ts | 0 .../unified-cost/schema}/api-verbs/analyze.ts | 0 .../unified-cost/schema}/api-verbs/get.ts | 0 .../unified-cost/schema}/api-verbs/list.ts | 0 .../unified-cost/schema}/api-verbs/stat.ts | 0 .../unified-cost/schema}/model.ts | 0 .../opsflow/_types/task-field-type.ts | 0 .../comment/composables/use-comment-api.ts | 0 .../comment/schema}/api-verbs/create.ts | 2 +- .../comment/schema}/api-verbs/delete.ts | 0 .../opsflow/comment/schema}/api-verbs/get.ts | 0 .../opsflow/comment/schema}/api-verbs/list.ts | 2 +- .../comment/schema}/api-verbs/update.ts | 2 +- .../opsflow/comment/schema}/model.ts | 4 ++-- .../opsflow/comment/schema}/type.ts | 0 .../event/composables/use-event-api.ts | 0 .../opsflow/event/schema}/api-verbs/list.ts | 2 +- .../opsflow/event/schema}/model.ts | 2 +- .../opsflow/event/schema}/type.ts | 2 +- .../composables/use-task-category-api.ts | 0 .../task-category/schema}/api-verbs/create.ts | 6 ++--- .../task-category/schema}/api-verbs/delete.ts | 0 .../task-category/schema}/api-verbs/get.ts | 0 .../task-category/schema}/api-verbs/list.ts | 0 .../task-category/schema}/api-verbs/update.ts | 1 + .../opsflow/task-category/schema}/model.ts | 6 ++--- .../composables/use-task-type-api.ts | 0 .../task-type/schema}/api-verbs/create.ts | 1 + .../task-type/schema}/api-verbs/delete.ts | 0 .../task-type/schema}/api-verbs/get.ts | 0 .../task-type/schema}/api-verbs/list.ts | 0 .../schema}/api-verbs/update-fields.ts | 0 .../task-type/schema}/api-verbs/update.ts | 0 .../opsflow/task-type/schema}/model.ts | 1 + .../opsflow/task/composables/use-task-api.ts | 0 .../task/schema}/api-verbs/change-assignee.ts | 0 .../task/schema}/api-verbs/change-status.ts | 0 .../opsflow/task/schema}/api-verbs/create.ts | 4 ++-- .../opsflow/task/schema}/api-verbs/delete.ts | 0 .../opsflow/task/schema}/api-verbs/get.ts | 0 .../opsflow/task/schema}/api-verbs/list.ts | 2 +- .../schema}/api-verbs/update-description.ts | 4 ++-- .../opsflow/task/schema}/api-verbs/update.ts | 2 +- .../opsflow/task/schema}/constant.ts | 0 .../opsflow/task/schema}/model.ts | 4 ++-- .../opsflow/task/schema}/type.ts | 2 +- .../favorite-button/FavoriteButton.vue | 2 +- .../modules/navigations/stores/gnb-store.ts | 4 ++-- .../modules/TopBarFavoriteContextMenu.vue | 2 +- .../src/common/pages/CostReportDetailPage.vue | 7 +++--- apps/web/src/lib/helper/config-data-helper.ts | 2 +- .../resource-model/cost-variable-model.ts | 2 +- ...nSettingsAutoDormancyConfigurationPage.vue | 4 ++-- .../store/workspace-group-page-store.ts | 4 ++-- .../advanced/store/workspace-page-store.ts | 4 ++-- .../stores/service-account-page-store.ts | 4 ++-- .../stores/service-account-page-store.ts | 4 ++-- .../components/BudgetCreateForm.vue | 4 ++-- .../components/BudgetCreateFormAmountPlan.vue | 2 +- ...dgetCreateFormAmountPlanLastMonthsCost.vue | 2 +- .../BudgetCreateFormAmountPlanUnitSelect.vue | 2 +- .../components/BudgetCreateFormBaseInfo.vue | 2 +- .../components/BudgetCreateProviderSelect.vue | 2 +- .../components/BudgetDetailDeleteModal.vue | 2 +- .../components/BudgetDetailHeading.vue | 2 +- .../components/BudgetDetailInfo.vue | 2 +- ...getDetailInfoAmountPlanningTypePopover.vue | 2 +- ...tailNotificationsConditionSettingModal.vue | 2 +- .../components/BudgetDetailSummaryTable.vue | 4 ++-- .../components/BudgetMainList.vue | 4 ++-- .../components/BudgetMainListCard.vue | 2 +- .../components/CostAnalysisContent.vue | 2 +- .../components/CostAnalysisHeader.vue | 2 +- .../CostAnalysisPeriodSelectDropdown.vue | 2 +- .../components/CostAnalysisQueryFormModal.vue | 2 +- .../components/CostAnalysisQuerySection.vue | 2 +- ...ostReportMonthlyTotalAmountSummaryCard.vue | 7 +++--- .../components/CostReportRecipientsCard.vue | 6 ++--- .../components/CostReportResendModal.vue | 2 +- .../components/CostReportSettingsModal.vue | 4 ++-- .../managed-cost-analysis-query-sets.ts | 2 +- .../budget-usage-analyze-api-query-helper.ts | 2 +- .../cost-explorer/pages/BudgetDetailPage.vue | 2 +- .../pages/admin/AdminBudgetDetailPage.vue | 2 +- .../stores/budget-detail-page-store.ts | 12 +++++----- .../stores/cost-analysis-page-store.ts | 6 ++--- .../stores/cost-query-set-store.ts | 2 +- .../stores/cost-report-page-store.ts | 12 +++++----- .../cost-explorer/types/budget-form-type.ts | 2 +- .../types/cost-report-data-type.ts | 2 +- .../workspace-home/components/CostSummary.vue | 7 +++--- .../components/UserConfigRecent.vue | 2 +- .../store/workspace-home-page-store.ts | 7 +++--- 157 files changed, 147 insertions(+), 117 deletions(-) rename apps/web/src/{schema/add-ons/favorite => api-clients/add-ons/favorite/schema}/list.ts (78%) rename apps/web/src/{schema/add-ons/favorite => api-clients/add-ons/favorite/schema}/model.ts (100%) create mode 100644 apps/web/src/api-clients/cost-analysis/budget-usage/composables/use-budget-usage-api.ts rename apps/web/src/{schema/cost-analysis/budget-usage => api-clients/cost-analysis/budget-usage/schema}/api-verbs/analyze.ts (100%) rename apps/web/src/{schema/cost-analysis/budget-usage => api-clients/cost-analysis/budget-usage/schema}/api-verbs/list.ts (100%) rename apps/web/src/{schema/cost-analysis/budget-usage => api-clients/cost-analysis/budget-usage/schema}/model.ts (100%) create mode 100644 apps/web/src/api-clients/cost-analysis/budget/composables/use-budget-api.ts rename apps/web/src/{schema/cost-analysis/budget => api-clients/cost-analysis/budget/schema}/api-verbs/create.ts (92%) rename apps/web/src/{schema/cost-analysis/budget => api-clients/cost-analysis/budget/schema}/api-verbs/delete.ts (100%) rename apps/web/src/{schema/cost-analysis/budget => api-clients/cost-analysis/budget/schema}/api-verbs/get.ts (100%) rename apps/web/src/{schema/cost-analysis/budget => api-clients/cost-analysis/budget/schema}/api-verbs/list.ts (77%) rename apps/web/src/{schema/cost-analysis/budget => api-clients/cost-analysis/budget/schema}/api-verbs/set-notification.ts (56%) rename apps/web/src/{schema/cost-analysis/budget => api-clients/cost-analysis/budget/schema}/api-verbs/update.ts (71%) rename apps/web/src/{schema/cost-analysis/budget => api-clients/cost-analysis/budget/schema}/model.ts (93%) rename apps/web/src/{schema/cost-analysis/budget => api-clients/cost-analysis/budget/schema}/type.ts (100%) create mode 100644 apps/web/src/api-clients/cost-analysis/cost-query-set/composables/use-cost-query-set-api.ts rename apps/web/src/{schema/cost-analysis/cost-query-set => api-clients/cost-analysis/cost-query-set/schema}/api-verbs/create.ts (68%) rename apps/web/src/{schema/cost-analysis/cost-query-set => api-clients/cost-analysis/cost-query-set/schema}/api-verbs/delete.ts (100%) rename apps/web/src/{schema/cost-analysis/cost-query-set => api-clients/cost-analysis/cost-query-set/schema}/api-verbs/list.ts (100%) rename apps/web/src/{schema/cost-analysis/cost-query-set => api-clients/cost-analysis/cost-query-set/schema}/api-verbs/update.ts (68%) rename apps/web/src/{schema/cost-analysis/cost-query-set => api-clients/cost-analysis/cost-query-set/schema}/model.ts (78%) rename apps/web/src/{schema/cost-analysis/cost-query-set => api-clients/cost-analysis/cost-query-set/schema}/type.ts (100%) create mode 100644 apps/web/src/api-clients/cost-analysis/cost-report-config/composables/use-cost-report-config-api.ts rename apps/web/src/{schema/cost-analysis/cost-report-config => api-clients/cost-analysis/cost-report-config/schema}/api-verbs/list.ts (100%) rename apps/web/src/{schema/cost-analysis/cost-report-config => api-clients/cost-analysis/cost-report-config/schema}/api-verbs/update-recipients.ts (100%) rename apps/web/src/{schema/cost-analysis/cost-report-config => api-clients/cost-analysis/cost-report-config/schema}/api-verbs/update.ts (100%) rename apps/web/src/{schema/cost-analysis/cost-report-config => api-clients/cost-analysis/cost-report-config/schema}/model.ts (86%) rename apps/web/src/{schema/cost-analysis/cost-report-config => api-clients/cost-analysis/cost-report-config/schema}/type.ts (100%) create mode 100644 apps/web/src/api-clients/cost-analysis/cost-report-data/composables/use-cost-report-data-api.ts rename apps/web/src/{schema/cost-analysis/cost-report-data => api-clients/cost-analysis/cost-report-data/schema}/api-verbs/analyze.ts (100%) rename apps/web/src/{schema/cost-analysis/cost-report-data => api-clients/cost-analysis/cost-report-data/schema}/api-verbs/list.ts (100%) rename apps/web/src/{schema/cost-analysis/cost-report-data => api-clients/cost-analysis/cost-report-data/schema}/model.ts (100%) rename apps/web/src/{schema/cost-analysis/cost-report-data => api-clients/cost-analysis/cost-report-data/schema}/type.ts (100%) create mode 100644 apps/web/src/api-clients/cost-analysis/cost-report/composables/use-cost-report-api.ts rename apps/web/src/{schema/cost-analysis/cost-report => api-clients/cost-analysis/cost-report/schema}/api-verbs/get-url.ts (100%) rename apps/web/src/{schema/cost-analysis/cost-report => api-clients/cost-analysis/cost-report/schema}/api-verbs/get.ts (100%) rename apps/web/src/{schema/cost-analysis/cost-report => api-clients/cost-analysis/cost-report/schema}/api-verbs/list.ts (73%) rename apps/web/src/{schema/cost-analysis/cost-report => api-clients/cost-analysis/cost-report/schema}/api-verbs/send.ts (100%) rename apps/web/src/{schema/cost-analysis/cost-report => api-clients/cost-analysis/cost-report/schema}/model.ts (85%) rename apps/web/src/{schema/cost-analysis/cost-report => api-clients/cost-analysis/cost-report/schema}/type.ts (100%) create mode 100644 apps/web/src/api-clients/cost-analysis/cost/composables/use-cost-api.ts rename apps/web/src/{schema/cost-analysis/cost => api-clients/cost-analysis/cost/schema}/api-verbs/analyze.ts (100%) rename apps/web/src/{schema/cost-analysis/cost => api-clients/cost-analysis/cost/schema}/api-verbs/stat.ts (100%) rename apps/web/src/{schema/cost-analysis/cost => api-clients/cost-analysis/cost/schema}/model.ts (100%) create mode 100644 apps/web/src/api-clients/cost-analysis/data-source-account/composables/use-data-source-account-api.ts rename apps/web/src/{schema/cost-analysis/data-source-account => api-clients/cost-analysis/data-source-account/schema}/api-verbs/analyze.ts (100%) rename apps/web/src/{schema/cost-analysis/data-source-account => api-clients/cost-analysis/data-source-account/schema}/api-verbs/list.ts (100%) rename apps/web/src/{schema/cost-analysis/data-source-account => api-clients/cost-analysis/data-source-account/schema}/api-verbs/reset.ts (100%) rename apps/web/src/{schema/cost-analysis/data-source-account => api-clients/cost-analysis/data-source-account/schema}/api-verbs/update.ts (100%) rename apps/web/src/{schema/cost-analysis/data-source-account => api-clients/cost-analysis/data-source-account/schema}/model.ts (100%) create mode 100644 apps/web/src/api-clients/cost-analysis/data-source/composables/use-data-source-api.ts rename apps/web/src/{schema/cost-analysis/data-source => api-clients/cost-analysis/data-source/schema}/api-verbs/get.ts (100%) rename apps/web/src/{schema/cost-analysis/data-source => api-clients/cost-analysis/data-source/schema}/api-verbs/list.ts (88%) rename apps/web/src/{schema/cost-analysis/data-source => api-clients/cost-analysis/data-source/schema}/api-verbs/sync.ts (100%) rename apps/web/src/{schema/cost-analysis/data-source => api-clients/cost-analysis/data-source/schema}/api-verbs/update-permissions.ts (100%) rename apps/web/src/{schema/cost-analysis/data-source => api-clients/cost-analysis/data-source/schema}/constant.ts (100%) rename apps/web/src/{schema/cost-analysis/data-source => api-clients/cost-analysis/data-source/schema}/model.ts (94%) rename apps/web/src/{schema/cost-analysis/data-source => api-clients/cost-analysis/data-source/schema}/type.ts (85%) create mode 100644 apps/web/src/api-clients/cost-analysis/job/composables/use-job-api.ts rename apps/web/src/{schema/cost-analysis/job => api-clients/cost-analysis/job/schema}/api-verbs/cancel.ts (100%) rename apps/web/src/{schema/cost-analysis/job => api-clients/cost-analysis/job/schema}/api-verbs/list.ts (100%) rename apps/web/src/{schema/cost-analysis/job => api-clients/cost-analysis/job/schema}/model.ts (99%) rename apps/web/src/{schema/cost-analysis/job => api-clients/cost-analysis/job/schema}/type.ts (100%) create mode 100644 apps/web/src/api-clients/cost-analysis/unified-cost/composables/use-unified-cost-api.ts rename apps/web/src/{schema/cost-analysis/unified-cost => api-clients/cost-analysis/unified-cost/schema}/api-verbs/analyze.ts (100%) rename apps/web/src/{schema/cost-analysis/unified-cost => api-clients/cost-analysis/unified-cost/schema}/api-verbs/get.ts (100%) rename apps/web/src/{schema/cost-analysis/unified-cost => api-clients/cost-analysis/unified-cost/schema}/api-verbs/list.ts (100%) rename apps/web/src/{schema/cost-analysis/unified-cost => api-clients/cost-analysis/unified-cost/schema}/api-verbs/stat.ts (100%) rename apps/web/src/{schema/cost-analysis/unified-cost => api-clients/cost-analysis/unified-cost/schema}/model.ts (100%) rename apps/web/src/{schema => api-clients}/opsflow/_types/task-field-type.ts (100%) create mode 100644 apps/web/src/api-clients/opsflow/comment/composables/use-comment-api.ts rename apps/web/src/{schema/opsflow/comment => api-clients/opsflow/comment/schema}/api-verbs/create.ts (63%) rename apps/web/src/{schema/opsflow/comment => api-clients/opsflow/comment/schema}/api-verbs/delete.ts (100%) rename apps/web/src/{schema/opsflow/comment => api-clients/opsflow/comment/schema}/api-verbs/get.ts (100%) rename apps/web/src/{schema/opsflow/comment => api-clients/opsflow/comment/schema}/api-verbs/list.ts (82%) rename apps/web/src/{schema/opsflow/comment => api-clients/opsflow/comment/schema}/api-verbs/update.ts (63%) rename apps/web/src/{schema/opsflow/comment => api-clients/opsflow/comment/schema}/model.ts (82%) rename apps/web/src/{schema/opsflow/comment => api-clients/opsflow/comment/schema}/type.ts (100%) create mode 100644 apps/web/src/api-clients/opsflow/event/composables/use-event-api.ts rename apps/web/src/{schema/opsflow/event => api-clients/opsflow/event/schema}/api-verbs/list.ts (83%) rename apps/web/src/{schema/opsflow/event => api-clients/opsflow/event/schema}/model.ts (80%) rename apps/web/src/{schema/opsflow/event => api-clients/opsflow/event/schema}/type.ts (89%) create mode 100644 apps/web/src/api-clients/opsflow/task-category/composables/use-task-category-api.ts rename apps/web/src/{schema/opsflow/task-category => api-clients/opsflow/task-category/schema}/api-verbs/create.ts (63%) rename apps/web/src/{schema/opsflow/task-category => api-clients/opsflow/task-category/schema}/api-verbs/delete.ts (100%) rename apps/web/src/{schema/opsflow/task-category => api-clients/opsflow/task-category/schema}/api-verbs/get.ts (100%) rename apps/web/src/{schema/opsflow/task-category => api-clients/opsflow/task-category/schema}/api-verbs/list.ts (100%) rename apps/web/src/{schema/opsflow/task-category => api-clients/opsflow/task-category/schema}/api-verbs/update.ts (99%) rename apps/web/src/{schema/opsflow/task-category => api-clients/opsflow/task-category/schema}/model.ts (62%) create mode 100644 apps/web/src/api-clients/opsflow/task-type/composables/use-task-type-api.ts rename apps/web/src/{schema/opsflow/task-type => api-clients/opsflow/task-type/schema}/api-verbs/create.ts (99%) rename apps/web/src/{schema/opsflow/task-type => api-clients/opsflow/task-type/schema}/api-verbs/delete.ts (100%) rename apps/web/src/{schema/opsflow/task-type => api-clients/opsflow/task-type/schema}/api-verbs/get.ts (100%) rename apps/web/src/{schema/opsflow/task-type => api-clients/opsflow/task-type/schema}/api-verbs/list.ts (100%) rename apps/web/src/{schema/opsflow/task-type => api-clients/opsflow/task-type/schema}/api-verbs/update-fields.ts (100%) rename apps/web/src/{schema/opsflow/task-type => api-clients/opsflow/task-type/schema}/api-verbs/update.ts (100%) rename apps/web/src/{schema/opsflow/task-type => api-clients/opsflow/task-type/schema}/model.ts (99%) create mode 100644 apps/web/src/api-clients/opsflow/task/composables/use-task-api.ts rename apps/web/src/{schema/opsflow/task => api-clients/opsflow/task/schema}/api-verbs/change-assignee.ts (100%) rename apps/web/src/{schema/opsflow/task => api-clients/opsflow/task/schema}/api-verbs/change-status.ts (100%) rename apps/web/src/{schema/opsflow/task => api-clients/opsflow/task/schema}/api-verbs/create.ts (69%) rename apps/web/src/{schema/opsflow/task => api-clients/opsflow/task/schema}/api-verbs/delete.ts (100%) rename apps/web/src/{schema/opsflow/task => api-clients/opsflow/task/schema}/api-verbs/get.ts (100%) rename apps/web/src/{schema/opsflow/task => api-clients/opsflow/task/schema}/api-verbs/list.ts (82%) rename apps/web/src/{schema/opsflow/task => api-clients/opsflow/task/schema}/api-verbs/update-description.ts (52%) rename apps/web/src/{schema/opsflow/task => api-clients/opsflow/task/schema}/api-verbs/update.ts (72%) rename apps/web/src/{schema/opsflow/task => api-clients/opsflow/task/schema}/constant.ts (100%) rename apps/web/src/{schema/opsflow/task => api-clients/opsflow/task/schema}/model.ts (79%) rename apps/web/src/{schema/opsflow/task => api-clients/opsflow/task/schema}/type.ts (86%) 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 index e69de29bb2..202068c691 100644 --- 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,22 @@ +import type { ComputedRef } from 'vue'; +import { computed, reactive } from 'vue'; + +type QueryKey = Array; + +interface GlobalQueryParams { + workspaceId: string; + mode: string; +} + +export const useQueryKey = ( + resourceKey: string, + additionalGlobalParams?: Partial, +): ComputedRef => { + const globalQueryParams = reactive({ + workspaceId: 'defaultWorkspace', // TODO: develop + mode: 'defaultMode', // TODO: develop + ...additionalGlobalParams, + }); + + return computed(() => [resourceKey, { ...globalQueryParams }]); +}; diff --git a/apps/web/src/schema/add-ons/favorite/list.ts b/apps/web/src/api-clients/add-ons/favorite/schema/list.ts similarity index 78% rename from apps/web/src/schema/add-ons/favorite/list.ts rename to apps/web/src/api-clients/add-ons/favorite/schema/list.ts index bbab1d59ec..58ace2baa1 100644 --- a/apps/web/src/schema/add-ons/favorite/list.ts +++ b/apps/web/src/api-clients/add-ons/favorite/schema/list.ts @@ -1,5 +1,5 @@ import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; -import type { FavoriteModel } from '@/schema/add-ons/favorite/model'; +import type { FavoriteModel } from '@/api-clients/add-ons/favorite/schema/model'; import type { FavoriteType } from '@/common/modules/favorites/favorite-button/type'; diff --git a/apps/web/src/schema/add-ons/favorite/model.ts b/apps/web/src/api-clients/add-ons/favorite/schema/model.ts similarity index 100% rename from apps/web/src/schema/add-ons/favorite/model.ts rename to apps/web/src/api-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 new file mode 100644 index 0000000000..e69de29bb2 diff --git a/apps/web/src/schema/cost-analysis/budget-usage/api-verbs/analyze.ts b/apps/web/src/api-clients/cost-analysis/budget-usage/schema/api-verbs/analyze.ts similarity index 100% rename from apps/web/src/schema/cost-analysis/budget-usage/api-verbs/analyze.ts rename to apps/web/src/api-clients/cost-analysis/budget-usage/schema/api-verbs/analyze.ts diff --git a/apps/web/src/schema/cost-analysis/budget-usage/api-verbs/list.ts b/apps/web/src/api-clients/cost-analysis/budget-usage/schema/api-verbs/list.ts similarity index 100% rename from apps/web/src/schema/cost-analysis/budget-usage/api-verbs/list.ts rename to apps/web/src/api-clients/cost-analysis/budget-usage/schema/api-verbs/list.ts diff --git a/apps/web/src/schema/cost-analysis/budget-usage/model.ts b/apps/web/src/api-clients/cost-analysis/budget-usage/schema/model.ts similarity index 100% rename from apps/web/src/schema/cost-analysis/budget-usage/model.ts rename to apps/web/src/api-clients/cost-analysis/budget-usage/schema/model.ts 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 new file mode 100644 index 0000000000..e69de29bb2 diff --git a/apps/web/src/schema/cost-analysis/budget/api-verbs/create.ts b/apps/web/src/api-clients/cost-analysis/budget/schema/api-verbs/create.ts similarity index 92% rename from apps/web/src/schema/cost-analysis/budget/api-verbs/create.ts rename to apps/web/src/api-clients/cost-analysis/budget/schema/api-verbs/create.ts index 9d74764cbc..23f7c15dfd 100644 --- a/apps/web/src/schema/cost-analysis/budget/api-verbs/create.ts +++ b/apps/web/src/api-clients/cost-analysis/budget/schema/api-verbs/create.ts @@ -2,7 +2,7 @@ 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/apps/web/src/schema/cost-analysis/budget/api-verbs/delete.ts b/apps/web/src/api-clients/cost-analysis/budget/schema/api-verbs/delete.ts similarity index 100% rename from apps/web/src/schema/cost-analysis/budget/api-verbs/delete.ts rename to apps/web/src/api-clients/cost-analysis/budget/schema/api-verbs/delete.ts diff --git a/apps/web/src/schema/cost-analysis/budget/api-verbs/get.ts b/apps/web/src/api-clients/cost-analysis/budget/schema/api-verbs/get.ts similarity index 100% rename from apps/web/src/schema/cost-analysis/budget/api-verbs/get.ts rename to apps/web/src/api-clients/cost-analysis/budget/schema/api-verbs/get.ts diff --git a/apps/web/src/schema/cost-analysis/budget/api-verbs/list.ts b/apps/web/src/api-clients/cost-analysis/budget/schema/api-verbs/list.ts similarity index 77% rename from apps/web/src/schema/cost-analysis/budget/api-verbs/list.ts rename to apps/web/src/api-clients/cost-analysis/budget/schema/api-verbs/list.ts index 19555094ea..5168491fe1 100644 --- a/apps/web/src/schema/cost-analysis/budget/api-verbs/list.ts +++ b/apps/web/src/api-clients/cost-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/apps/web/src/schema/cost-analysis/budget/api-verbs/set-notification.ts b/apps/web/src/api-clients/cost-analysis/budget/schema/api-verbs/set-notification.ts similarity index 56% rename from apps/web/src/schema/cost-analysis/budget/api-verbs/set-notification.ts rename to apps/web/src/api-clients/cost-analysis/budget/schema/api-verbs/set-notification.ts index 27b5098439..050fac8446 100644 --- a/apps/web/src/schema/cost-analysis/budget/api-verbs/set-notification.ts +++ b/apps/web/src/api-clients/cost-analysis/budget/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/apps/web/src/schema/cost-analysis/budget/api-verbs/update.ts b/apps/web/src/api-clients/cost-analysis/budget/schema/api-verbs/update.ts similarity index 71% rename from apps/web/src/schema/cost-analysis/budget/api-verbs/update.ts rename to apps/web/src/api-clients/cost-analysis/budget/schema/api-verbs/update.ts index 64d5b30000..eebbefe2f3 100644 --- a/apps/web/src/schema/cost-analysis/budget/api-verbs/update.ts +++ b/apps/web/src/api-clients/cost-analysis/budget/schema/api-verbs/update.ts @@ -1,5 +1,5 @@ import type { Tags } from '@/api-clients/_common/schema/model'; -import type { BudgetPlannedLimit } from '@/schema/cost-analysis/budget/type'; +import type { BudgetPlannedLimit } from '@/api-clients/cost-analysis/budget/schema/type'; export interface BudgetUpdateParameters { budget_id: string; diff --git a/apps/web/src/schema/cost-analysis/budget/model.ts b/apps/web/src/api-clients/cost-analysis/budget/schema/model.ts similarity index 93% rename from apps/web/src/schema/cost-analysis/budget/model.ts rename to apps/web/src/api-clients/cost-analysis/budget/schema/model.ts index 3251c0500d..0ad8166b9d 100644 --- a/apps/web/src/schema/cost-analysis/budget/model.ts +++ b/apps/web/src/api-clients/cost-analysis/budget/schema/model.ts @@ -2,7 +2,7 @@ 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/apps/web/src/schema/cost-analysis/budget/type.ts b/apps/web/src/api-clients/cost-analysis/budget/schema/type.ts similarity index 100% rename from apps/web/src/schema/cost-analysis/budget/type.ts rename to apps/web/src/api-clients/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 new file mode 100644 index 0000000000..e69de29bb2 diff --git a/apps/web/src/schema/cost-analysis/cost-query-set/api-verbs/create.ts b/apps/web/src/api-clients/cost-analysis/cost-query-set/schema/api-verbs/create.ts similarity index 68% rename from apps/web/src/schema/cost-analysis/cost-query-set/api-verbs/create.ts rename to apps/web/src/api-clients/cost-analysis/cost-query-set/schema/api-verbs/create.ts index 6aa66cc445..8020415030 100644 --- a/apps/web/src/schema/cost-analysis/cost-query-set/api-verbs/create.ts +++ b/apps/web/src/api-clients/cost-analysis/cost-query-set/schema/api-verbs/create.ts @@ -1,5 +1,5 @@ import type { Tags } from '@/api-clients/_common/schema/model'; -import type { CostQuerySetOption } from '@/schema/cost-analysis/cost-query-set/type'; +import type { CostQuerySetOption } from '@/api-clients/cost-analysis/cost-query-set/schema/type'; export interface CostQuerySetCreateParameters { diff --git a/apps/web/src/schema/cost-analysis/cost-query-set/api-verbs/delete.ts b/apps/web/src/api-clients/cost-analysis/cost-query-set/schema/api-verbs/delete.ts similarity index 100% rename from apps/web/src/schema/cost-analysis/cost-query-set/api-verbs/delete.ts rename to apps/web/src/api-clients/cost-analysis/cost-query-set/schema/api-verbs/delete.ts diff --git a/apps/web/src/schema/cost-analysis/cost-query-set/api-verbs/list.ts b/apps/web/src/api-clients/cost-analysis/cost-query-set/schema/api-verbs/list.ts similarity index 100% rename from apps/web/src/schema/cost-analysis/cost-query-set/api-verbs/list.ts rename to apps/web/src/api-clients/cost-analysis/cost-query-set/schema/api-verbs/list.ts diff --git a/apps/web/src/schema/cost-analysis/cost-query-set/api-verbs/update.ts b/apps/web/src/api-clients/cost-analysis/cost-query-set/schema/api-verbs/update.ts similarity index 68% rename from apps/web/src/schema/cost-analysis/cost-query-set/api-verbs/update.ts rename to apps/web/src/api-clients/cost-analysis/cost-query-set/schema/api-verbs/update.ts index 09e7e26a36..da5249ee25 100644 --- a/apps/web/src/schema/cost-analysis/cost-query-set/api-verbs/update.ts +++ b/apps/web/src/api-clients/cost-analysis/cost-query-set/schema/api-verbs/update.ts @@ -1,5 +1,5 @@ import type { Tags } from '@/api-clients/_common/schema/model'; -import type { CostQuerySetOption } from '@/schema/cost-analysis/cost-query-set/type'; +import type { CostQuerySetOption } from '@/api-clients/cost-analysis/cost-query-set/schema/type'; export interface CostQuerySetUpdateParameters { diff --git a/apps/web/src/schema/cost-analysis/cost-query-set/model.ts b/apps/web/src/api-clients/cost-analysis/cost-query-set/schema/model.ts similarity index 78% rename from apps/web/src/schema/cost-analysis/cost-query-set/model.ts rename to apps/web/src/api-clients/cost-analysis/cost-query-set/schema/model.ts index e37c35645f..2649bf5443 100644 --- a/apps/web/src/schema/cost-analysis/cost-query-set/model.ts +++ b/apps/web/src/api-clients/cost-analysis/cost-query-set/schema/model.ts @@ -1,5 +1,5 @@ import type { Tags } from '@/api-clients/_common/schema/model'; -import type { CostQuerySetOption } from '@/schema/cost-analysis/cost-query-set/type'; +import type { CostQuerySetOption } from '@/api-clients/cost-analysis/cost-query-set/schema/type'; export interface CostQuerySetModel { diff --git a/apps/web/src/schema/cost-analysis/cost-query-set/type.ts b/apps/web/src/api-clients/cost-analysis/cost-query-set/schema/type.ts similarity index 100% rename from apps/web/src/schema/cost-analysis/cost-query-set/type.ts rename to apps/web/src/api-clients/cost-analysis/cost-query-set/schema/type.ts 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 new file mode 100644 index 0000000000..e69de29bb2 diff --git a/apps/web/src/schema/cost-analysis/cost-report-config/api-verbs/list.ts b/apps/web/src/api-clients/cost-analysis/cost-report-config/schema/api-verbs/list.ts similarity index 100% rename from apps/web/src/schema/cost-analysis/cost-report-config/api-verbs/list.ts rename to apps/web/src/api-clients/cost-analysis/cost-report-config/schema/api-verbs/list.ts diff --git a/apps/web/src/schema/cost-analysis/cost-report-config/api-verbs/update-recipients.ts b/apps/web/src/api-clients/cost-analysis/cost-report-config/schema/api-verbs/update-recipients.ts similarity index 100% rename from apps/web/src/schema/cost-analysis/cost-report-config/api-verbs/update-recipients.ts rename to apps/web/src/api-clients/cost-analysis/cost-report-config/schema/api-verbs/update-recipients.ts diff --git a/apps/web/src/schema/cost-analysis/cost-report-config/api-verbs/update.ts b/apps/web/src/api-clients/cost-analysis/cost-report-config/schema/api-verbs/update.ts similarity index 100% rename from apps/web/src/schema/cost-analysis/cost-report-config/api-verbs/update.ts rename to apps/web/src/api-clients/cost-analysis/cost-report-config/schema/api-verbs/update.ts diff --git a/apps/web/src/schema/cost-analysis/cost-report-config/model.ts b/apps/web/src/api-clients/cost-analysis/cost-report-config/schema/model.ts similarity index 86% rename from apps/web/src/schema/cost-analysis/cost-report-config/model.ts rename to apps/web/src/api-clients/cost-analysis/cost-report-config/schema/model.ts index 754574d1b7..e755b76087 100644 --- a/apps/web/src/schema/cost-analysis/cost-report-config/model.ts +++ b/apps/web/src/api-clients/cost-analysis/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/apps/web/src/schema/cost-analysis/cost-report-config/type.ts b/apps/web/src/api-clients/cost-analysis/cost-report-config/schema/type.ts similarity index 100% rename from apps/web/src/schema/cost-analysis/cost-report-config/type.ts rename to apps/web/src/api-clients/cost-analysis/cost-report-config/schema/type.ts diff --git a/apps/web/src/api-clients/cost-analysis/cost-report-data/composables/use-cost-report-data-api.ts b/apps/web/src/api-clients/cost-analysis/cost-report-data/composables/use-cost-report-data-api.ts new file mode 100644 index 0000000000..e69de29bb2 diff --git a/apps/web/src/schema/cost-analysis/cost-report-data/api-verbs/analyze.ts b/apps/web/src/api-clients/cost-analysis/cost-report-data/schema/api-verbs/analyze.ts similarity index 100% rename from apps/web/src/schema/cost-analysis/cost-report-data/api-verbs/analyze.ts rename to apps/web/src/api-clients/cost-analysis/cost-report-data/schema/api-verbs/analyze.ts diff --git a/apps/web/src/schema/cost-analysis/cost-report-data/api-verbs/list.ts b/apps/web/src/api-clients/cost-analysis/cost-report-data/schema/api-verbs/list.ts similarity index 100% rename from apps/web/src/schema/cost-analysis/cost-report-data/api-verbs/list.ts rename to apps/web/src/api-clients/cost-analysis/cost-report-data/schema/api-verbs/list.ts diff --git a/apps/web/src/schema/cost-analysis/cost-report-data/model.ts b/apps/web/src/api-clients/cost-analysis/cost-report-data/schema/model.ts similarity index 100% rename from apps/web/src/schema/cost-analysis/cost-report-data/model.ts rename to apps/web/src/api-clients/cost-analysis/cost-report-data/schema/model.ts diff --git a/apps/web/src/schema/cost-analysis/cost-report-data/type.ts b/apps/web/src/api-clients/cost-analysis/cost-report-data/schema/type.ts similarity index 100% rename from apps/web/src/schema/cost-analysis/cost-report-data/type.ts rename to apps/web/src/api-clients/cost-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 new file mode 100644 index 0000000000..e69de29bb2 diff --git a/apps/web/src/schema/cost-analysis/cost-report/api-verbs/get-url.ts b/apps/web/src/api-clients/cost-analysis/cost-report/schema/api-verbs/get-url.ts similarity index 100% rename from apps/web/src/schema/cost-analysis/cost-report/api-verbs/get-url.ts rename to apps/web/src/api-clients/cost-analysis/cost-report/schema/api-verbs/get-url.ts diff --git a/apps/web/src/schema/cost-analysis/cost-report/api-verbs/get.ts b/apps/web/src/api-clients/cost-analysis/cost-report/schema/api-verbs/get.ts similarity index 100% rename from apps/web/src/schema/cost-analysis/cost-report/api-verbs/get.ts rename to apps/web/src/api-clients/cost-analysis/cost-report/schema/api-verbs/get.ts diff --git a/apps/web/src/schema/cost-analysis/cost-report/api-verbs/list.ts b/apps/web/src/api-clients/cost-analysis/cost-report/schema/api-verbs/list.ts similarity index 73% rename from apps/web/src/schema/cost-analysis/cost-report/api-verbs/list.ts rename to apps/web/src/api-clients/cost-analysis/cost-report/schema/api-verbs/list.ts index d99b3f7476..f8f3c6c36e 100644 --- a/apps/web/src/schema/cost-analysis/cost-report/api-verbs/list.ts +++ b/apps/web/src/api-clients/cost-analysis/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/apps/web/src/schema/cost-analysis/cost-report/api-verbs/send.ts b/apps/web/src/api-clients/cost-analysis/cost-report/schema/api-verbs/send.ts similarity index 100% rename from apps/web/src/schema/cost-analysis/cost-report/api-verbs/send.ts rename to apps/web/src/api-clients/cost-analysis/cost-report/schema/api-verbs/send.ts diff --git a/apps/web/src/schema/cost-analysis/cost-report/model.ts b/apps/web/src/api-clients/cost-analysis/cost-report/schema/model.ts similarity index 85% rename from apps/web/src/schema/cost-analysis/cost-report/model.ts rename to apps/web/src/api-clients/cost-analysis/cost-report/schema/model.ts index ae95d5078a..42725077a8 100644 --- a/apps/web/src/schema/cost-analysis/cost-report/model.ts +++ b/apps/web/src/api-clients/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/apps/web/src/schema/cost-analysis/cost-report/type.ts b/apps/web/src/api-clients/cost-analysis/cost-report/schema/type.ts similarity index 100% rename from apps/web/src/schema/cost-analysis/cost-report/type.ts rename to apps/web/src/api-clients/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 new file mode 100644 index 0000000000..e69de29bb2 diff --git a/apps/web/src/schema/cost-analysis/cost/api-verbs/analyze.ts b/apps/web/src/api-clients/cost-analysis/cost/schema/api-verbs/analyze.ts similarity index 100% rename from apps/web/src/schema/cost-analysis/cost/api-verbs/analyze.ts rename to apps/web/src/api-clients/cost-analysis/cost/schema/api-verbs/analyze.ts diff --git a/apps/web/src/schema/cost-analysis/cost/api-verbs/stat.ts b/apps/web/src/api-clients/cost-analysis/cost/schema/api-verbs/stat.ts similarity index 100% rename from apps/web/src/schema/cost-analysis/cost/api-verbs/stat.ts rename to apps/web/src/api-clients/cost-analysis/cost/schema/api-verbs/stat.ts diff --git a/apps/web/src/schema/cost-analysis/cost/model.ts b/apps/web/src/api-clients/cost-analysis/cost/schema/model.ts similarity index 100% rename from apps/web/src/schema/cost-analysis/cost/model.ts rename to apps/web/src/api-clients/cost-analysis/cost/schema/model.ts diff --git a/apps/web/src/api-clients/cost-analysis/data-source-account/composables/use-data-source-account-api.ts b/apps/web/src/api-clients/cost-analysis/data-source-account/composables/use-data-source-account-api.ts new file mode 100644 index 0000000000..e69de29bb2 diff --git a/apps/web/src/schema/cost-analysis/data-source-account/api-verbs/analyze.ts b/apps/web/src/api-clients/cost-analysis/data-source-account/schema/api-verbs/analyze.ts similarity index 100% rename from apps/web/src/schema/cost-analysis/data-source-account/api-verbs/analyze.ts rename to apps/web/src/api-clients/cost-analysis/data-source-account/schema/api-verbs/analyze.ts diff --git a/apps/web/src/schema/cost-analysis/data-source-account/api-verbs/list.ts b/apps/web/src/api-clients/cost-analysis/data-source-account/schema/api-verbs/list.ts similarity index 100% rename from apps/web/src/schema/cost-analysis/data-source-account/api-verbs/list.ts rename to apps/web/src/api-clients/cost-analysis/data-source-account/schema/api-verbs/list.ts diff --git a/apps/web/src/schema/cost-analysis/data-source-account/api-verbs/reset.ts b/apps/web/src/api-clients/cost-analysis/data-source-account/schema/api-verbs/reset.ts similarity index 100% rename from apps/web/src/schema/cost-analysis/data-source-account/api-verbs/reset.ts rename to apps/web/src/api-clients/cost-analysis/data-source-account/schema/api-verbs/reset.ts diff --git a/apps/web/src/schema/cost-analysis/data-source-account/api-verbs/update.ts b/apps/web/src/api-clients/cost-analysis/data-source-account/schema/api-verbs/update.ts similarity index 100% rename from apps/web/src/schema/cost-analysis/data-source-account/api-verbs/update.ts rename to apps/web/src/api-clients/cost-analysis/data-source-account/schema/api-verbs/update.ts diff --git a/apps/web/src/schema/cost-analysis/data-source-account/model.ts b/apps/web/src/api-clients/cost-analysis/data-source-account/schema/model.ts similarity index 100% rename from apps/web/src/schema/cost-analysis/data-source-account/model.ts rename to apps/web/src/api-clients/cost-analysis/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 new file mode 100644 index 0000000000..e69de29bb2 diff --git a/apps/web/src/schema/cost-analysis/data-source/api-verbs/get.ts b/apps/web/src/api-clients/cost-analysis/data-source/schema/api-verbs/get.ts similarity index 100% rename from apps/web/src/schema/cost-analysis/data-source/api-verbs/get.ts rename to apps/web/src/api-clients/cost-analysis/data-source/schema/api-verbs/get.ts diff --git a/apps/web/src/schema/cost-analysis/data-source/api-verbs/list.ts b/apps/web/src/api-clients/cost-analysis/data-source/schema/api-verbs/list.ts similarity index 88% rename from apps/web/src/schema/cost-analysis/data-source/api-verbs/list.ts rename to apps/web/src/api-clients/cost-analysis/data-source/schema/api-verbs/list.ts index dc3ee4414e..fcfc8f2d13 100644 --- a/apps/web/src/schema/cost-analysis/data-source/api-verbs/list.ts +++ b/apps/web/src/api-clients/cost-analysis/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/apps/web/src/schema/cost-analysis/data-source/api-verbs/sync.ts b/apps/web/src/api-clients/cost-analysis/data-source/schema/api-verbs/sync.ts similarity index 100% rename from apps/web/src/schema/cost-analysis/data-source/api-verbs/sync.ts rename to apps/web/src/api-clients/cost-analysis/data-source/schema/api-verbs/sync.ts diff --git a/apps/web/src/schema/cost-analysis/data-source/api-verbs/update-permissions.ts b/apps/web/src/api-clients/cost-analysis/data-source/schema/api-verbs/update-permissions.ts similarity index 100% rename from apps/web/src/schema/cost-analysis/data-source/api-verbs/update-permissions.ts rename to apps/web/src/api-clients/cost-analysis/data-source/schema/api-verbs/update-permissions.ts diff --git a/apps/web/src/schema/cost-analysis/data-source/constant.ts b/apps/web/src/api-clients/cost-analysis/data-source/schema/constant.ts similarity index 100% rename from apps/web/src/schema/cost-analysis/data-source/constant.ts rename to apps/web/src/api-clients/cost-analysis/data-source/schema/constant.ts diff --git a/apps/web/src/schema/cost-analysis/data-source/model.ts b/apps/web/src/api-clients/cost-analysis/data-source/schema/model.ts similarity index 94% rename from apps/web/src/schema/cost-analysis/data-source/model.ts rename to apps/web/src/api-clients/cost-analysis/data-source/schema/model.ts index 521787c1c5..f698bf64fe 100644 --- a/apps/web/src/schema/cost-analysis/data-source/model.ts +++ b/apps/web/src/api-clients/cost-analysis/data-source/schema/model.ts @@ -1,7 +1,7 @@ import type { JsonSchema } from '@cloudforet/mirinae/types/controls/forms/json-schema-form/type'; import type { ResourceGroupType } from '@/api-clients/_common/schema/type'; -import type { CostDataSourceSecretType, CostDataSourceState, CostDataSourceType } from '@/schema/cost-analysis/data-source/type'; +import type { CostDataSourceSecretType, CostDataSourceState, CostDataSourceType } from '@/api-clients/cost-analysis/data-source/schema/type'; interface PluginInfoModel { diff --git a/apps/web/src/schema/cost-analysis/data-source/type.ts b/apps/web/src/api-clients/cost-analysis/data-source/schema/type.ts similarity index 85% rename from apps/web/src/schema/cost-analysis/data-source/type.ts rename to apps/web/src/api-clients/cost-analysis/data-source/schema/type.ts index 944b7811ca..e07e0adb26 100644 --- a/apps/web/src/schema/cost-analysis/data-source/type.ts +++ b/apps/web/src/api-clients/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 new file mode 100644 index 0000000000..e69de29bb2 diff --git a/apps/web/src/schema/cost-analysis/job/api-verbs/cancel.ts b/apps/web/src/api-clients/cost-analysis/job/schema/api-verbs/cancel.ts similarity index 100% rename from apps/web/src/schema/cost-analysis/job/api-verbs/cancel.ts rename to apps/web/src/api-clients/cost-analysis/job/schema/api-verbs/cancel.ts diff --git a/apps/web/src/schema/cost-analysis/job/api-verbs/list.ts b/apps/web/src/api-clients/cost-analysis/job/schema/api-verbs/list.ts similarity index 100% rename from apps/web/src/schema/cost-analysis/job/api-verbs/list.ts rename to apps/web/src/api-clients/cost-analysis/job/schema/api-verbs/list.ts diff --git a/apps/web/src/schema/cost-analysis/job/model.ts b/apps/web/src/api-clients/cost-analysis/job/schema/model.ts similarity index 99% rename from apps/web/src/schema/cost-analysis/job/model.ts rename to apps/web/src/api-clients/cost-analysis/job/schema/model.ts index 8dd1a44154..cc6ab393e1 100644 --- a/apps/web/src/schema/cost-analysis/job/model.ts +++ b/apps/web/src/api-clients/cost-analysis/job/schema/model.ts @@ -1,4 +1,5 @@ import type { ResourceGroupType } from '@/api-clients/_common/schema/type'; + import type { CostJobStatus } from '@/schema/cost-analysis/job/type'; interface SyncedAccount { diff --git a/apps/web/src/schema/cost-analysis/job/type.ts b/apps/web/src/api-clients/cost-analysis/job/schema/type.ts similarity index 100% rename from apps/web/src/schema/cost-analysis/job/type.ts rename to apps/web/src/api-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 new file mode 100644 index 0000000000..e69de29bb2 diff --git a/apps/web/src/schema/cost-analysis/unified-cost/api-verbs/analyze.ts b/apps/web/src/api-clients/cost-analysis/unified-cost/schema/api-verbs/analyze.ts similarity index 100% rename from apps/web/src/schema/cost-analysis/unified-cost/api-verbs/analyze.ts rename to apps/web/src/api-clients/cost-analysis/unified-cost/schema/api-verbs/analyze.ts diff --git a/apps/web/src/schema/cost-analysis/unified-cost/api-verbs/get.ts b/apps/web/src/api-clients/cost-analysis/unified-cost/schema/api-verbs/get.ts similarity index 100% rename from apps/web/src/schema/cost-analysis/unified-cost/api-verbs/get.ts rename to apps/web/src/api-clients/cost-analysis/unified-cost/schema/api-verbs/get.ts diff --git a/apps/web/src/schema/cost-analysis/unified-cost/api-verbs/list.ts b/apps/web/src/api-clients/cost-analysis/unified-cost/schema/api-verbs/list.ts similarity index 100% rename from apps/web/src/schema/cost-analysis/unified-cost/api-verbs/list.ts rename to apps/web/src/api-clients/cost-analysis/unified-cost/schema/api-verbs/list.ts diff --git a/apps/web/src/schema/cost-analysis/unified-cost/api-verbs/stat.ts b/apps/web/src/api-clients/cost-analysis/unified-cost/schema/api-verbs/stat.ts similarity index 100% rename from apps/web/src/schema/cost-analysis/unified-cost/api-verbs/stat.ts rename to apps/web/src/api-clients/cost-analysis/unified-cost/schema/api-verbs/stat.ts diff --git a/apps/web/src/schema/cost-analysis/unified-cost/model.ts b/apps/web/src/api-clients/cost-analysis/unified-cost/schema/model.ts similarity index 100% rename from apps/web/src/schema/cost-analysis/unified-cost/model.ts rename to apps/web/src/api-clients/cost-analysis/unified-cost/schema/model.ts diff --git a/apps/web/src/schema/opsflow/_types/task-field-type.ts b/apps/web/src/api-clients/opsflow/_types/task-field-type.ts similarity index 100% rename from apps/web/src/schema/opsflow/_types/task-field-type.ts rename to apps/web/src/api-clients/opsflow/_types/task-field-type.ts 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 new file mode 100644 index 0000000000..e69de29bb2 diff --git a/apps/web/src/schema/opsflow/comment/api-verbs/create.ts b/apps/web/src/api-clients/opsflow/comment/schema/api-verbs/create.ts similarity index 63% rename from apps/web/src/schema/opsflow/comment/api-verbs/create.ts rename to apps/web/src/api-clients/opsflow/comment/schema/api-verbs/create.ts index 3dfad8bce1..f4892d66f8 100644 --- a/apps/web/src/schema/opsflow/comment/api-verbs/create.ts +++ b/apps/web/src/api-clients/opsflow/comment/schema/api-verbs/create.ts @@ -1,4 +1,4 @@ -import type { MentionTargets } from '@/schema/opsflow/comment/type'; +import type { MentionTargets } from '../type'; export interface CommentCreateParameters { task_id: string; diff --git a/apps/web/src/schema/opsflow/comment/api-verbs/delete.ts b/apps/web/src/api-clients/opsflow/comment/schema/api-verbs/delete.ts similarity index 100% rename from apps/web/src/schema/opsflow/comment/api-verbs/delete.ts rename to apps/web/src/api-clients/opsflow/comment/schema/api-verbs/delete.ts diff --git a/apps/web/src/schema/opsflow/comment/api-verbs/get.ts b/apps/web/src/api-clients/opsflow/comment/schema/api-verbs/get.ts similarity index 100% rename from apps/web/src/schema/opsflow/comment/api-verbs/get.ts rename to apps/web/src/api-clients/opsflow/comment/schema/api-verbs/get.ts diff --git a/apps/web/src/schema/opsflow/comment/api-verbs/list.ts b/apps/web/src/api-clients/opsflow/comment/schema/api-verbs/list.ts similarity index 82% rename from apps/web/src/schema/opsflow/comment/api-verbs/list.ts rename to apps/web/src/api-clients/opsflow/comment/schema/api-verbs/list.ts index 4d58e07bd0..88db0c4a8c 100644 --- a/apps/web/src/schema/opsflow/comment/api-verbs/list.ts +++ b/apps/web/src/api-clients/opsflow/comment/schema/api-verbs/list.ts @@ -1,6 +1,6 @@ import type { Query } from '@cloudforet/core-lib/space-connector/type'; -import type { CommentType } from '@/schema/opsflow/comment/type'; +import type { CommentType } from '../type'; export interface CommentListParameters { query?: Query; diff --git a/apps/web/src/schema/opsflow/comment/api-verbs/update.ts b/apps/web/src/api-clients/opsflow/comment/schema/api-verbs/update.ts similarity index 63% rename from apps/web/src/schema/opsflow/comment/api-verbs/update.ts rename to apps/web/src/api-clients/opsflow/comment/schema/api-verbs/update.ts index bdb9a66df7..ed5aad93bf 100644 --- a/apps/web/src/schema/opsflow/comment/api-verbs/update.ts +++ b/apps/web/src/api-clients/opsflow/comment/schema/api-verbs/update.ts @@ -1,4 +1,4 @@ -import type { MentionTargets } from '@/schema/opsflow/comment/type'; +import type { MentionTargets } from '../type'; export interface CommentUpdateParameters { comment_id: string; diff --git a/apps/web/src/schema/opsflow/comment/model.ts b/apps/web/src/api-clients/opsflow/comment/schema/model.ts similarity index 82% rename from apps/web/src/schema/opsflow/comment/model.ts rename to apps/web/src/api-clients/opsflow/comment/schema/model.ts index 386fb63f81..a2ded68fa4 100644 --- a/apps/web/src/schema/opsflow/comment/model.ts +++ b/apps/web/src/api-clients/opsflow/comment/schema/model.ts @@ -1,5 +1,5 @@ -import type { ResourceGroupType } from '@/api-clients/_common/schema/type'; -import type { CommentType, MentionTargets, MentionSource } from '@/schema/opsflow/comment/type'; +import type { ResourceGroupType } from '../../../_common/schema/type'; +import type { CommentType, MentionTargets, MentionSource } from './type'; export interface CommentModel { comment_id: string; diff --git a/apps/web/src/schema/opsflow/comment/type.ts b/apps/web/src/api-clients/opsflow/comment/schema/type.ts similarity index 100% rename from apps/web/src/schema/opsflow/comment/type.ts rename to apps/web/src/api-clients/opsflow/comment/schema/type.ts 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 new file mode 100644 index 0000000000..e69de29bb2 diff --git a/apps/web/src/schema/opsflow/event/api-verbs/list.ts b/apps/web/src/api-clients/opsflow/event/schema/api-verbs/list.ts similarity index 83% rename from apps/web/src/schema/opsflow/event/api-verbs/list.ts rename to apps/web/src/api-clients/opsflow/event/schema/api-verbs/list.ts index bceb8facb8..7b160e4d70 100644 --- a/apps/web/src/schema/opsflow/event/api-verbs/list.ts +++ b/apps/web/src/api-clients/opsflow/event/schema/api-verbs/list.ts @@ -1,6 +1,6 @@ import type { Query } from '@cloudforet/core-lib/space-connector/type'; -import type { EventType } from '@/schema/opsflow/event/type'; +import type { EventType } from '../type'; export interface EventListParameters { query?: Query; diff --git a/apps/web/src/schema/opsflow/event/model.ts b/apps/web/src/api-clients/opsflow/event/schema/model.ts similarity index 80% rename from apps/web/src/schema/opsflow/event/model.ts rename to apps/web/src/api-clients/opsflow/event/schema/model.ts index 5cfd995baa..0a4d576695 100644 --- a/apps/web/src/schema/opsflow/event/model.ts +++ b/apps/web/src/api-clients/opsflow/event/schema/model.ts @@ -1,4 +1,4 @@ -import type { EventType, EventAdditionalInfo } from '@/schema/opsflow/event/type'; +import type { EventType, EventAdditionalInfo } from './type'; export interface EventModel { event_id: string; diff --git a/apps/web/src/schema/opsflow/event/type.ts b/apps/web/src/api-clients/opsflow/event/schema/type.ts similarity index 89% rename from apps/web/src/schema/opsflow/event/type.ts rename to apps/web/src/api-clients/opsflow/event/schema/type.ts index b3eca6260f..544e2b3e46 100644 --- a/apps/web/src/schema/opsflow/event/type.ts +++ b/apps/web/src/api-clients/opsflow/event/schema/type.ts @@ -1,4 +1,4 @@ -import type { TaskStatusType } from '@/schema/opsflow/task/type'; +import type { TaskStatusType } from '../../task/schema/type'; export type EventType = 'CREATED'|'UPDATED'|'CHANGE_STATUS'|'COMMENTED'; export interface UpdatedDatum { 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 new file mode 100644 index 0000000000..e69de29bb2 diff --git a/apps/web/src/schema/opsflow/task-category/api-verbs/create.ts b/apps/web/src/api-clients/opsflow/task-category/schema/api-verbs/create.ts similarity index 63% rename from apps/web/src/schema/opsflow/task-category/api-verbs/create.ts rename to apps/web/src/api-clients/opsflow/task-category/schema/api-verbs/create.ts index 48dc79ffc4..362a0821d1 100644 --- a/apps/web/src/schema/opsflow/task-category/api-verbs/create.ts +++ b/apps/web/src/api-clients/opsflow/task-category/schema/api-verbs/create.ts @@ -1,6 +1,6 @@ -import type { Tags } from '@/api-clients/_common/schema/model'; -import type { TaskField } from '@/schema/opsflow/_types/task-field-type'; -import type { TaskStatusType, TaskStatusOptionWithOptionalId } from '@/schema/opsflow/task/type'; +import type { Tags } from '../../../../_common/schema/model'; +import type { TaskField } from '../../../_types/task-field-type'; +import type { TaskStatusType, TaskStatusOptionWithOptionalId } from '../../../task/schema/type'; export interface TaskCategoryCreateParameters { diff --git a/apps/web/src/schema/opsflow/task-category/api-verbs/delete.ts b/apps/web/src/api-clients/opsflow/task-category/schema/api-verbs/delete.ts similarity index 100% rename from apps/web/src/schema/opsflow/task-category/api-verbs/delete.ts rename to apps/web/src/api-clients/opsflow/task-category/schema/api-verbs/delete.ts diff --git a/apps/web/src/schema/opsflow/task-category/api-verbs/get.ts b/apps/web/src/api-clients/opsflow/task-category/schema/api-verbs/get.ts similarity index 100% rename from apps/web/src/schema/opsflow/task-category/api-verbs/get.ts rename to apps/web/src/api-clients/opsflow/task-category/schema/api-verbs/get.ts diff --git a/apps/web/src/schema/opsflow/task-category/api-verbs/list.ts b/apps/web/src/api-clients/opsflow/task-category/schema/api-verbs/list.ts similarity index 100% rename from apps/web/src/schema/opsflow/task-category/api-verbs/list.ts rename to apps/web/src/api-clients/opsflow/task-category/schema/api-verbs/list.ts diff --git a/apps/web/src/schema/opsflow/task-category/api-verbs/update.ts b/apps/web/src/api-clients/opsflow/task-category/schema/api-verbs/update.ts similarity index 99% rename from apps/web/src/schema/opsflow/task-category/api-verbs/update.ts rename to apps/web/src/api-clients/opsflow/task-category/schema/api-verbs/update.ts index ef12354274..123d3eec35 100644 --- a/apps/web/src/schema/opsflow/task-category/api-verbs/update.ts +++ b/apps/web/src/api-clients/opsflow/task-category/schema/api-verbs/update.ts @@ -1,4 +1,5 @@ import type { Tags } from '@/api-clients/_common/schema/model'; + import type { TaskField } from '@/schema/opsflow/_types/task-field-type'; import type { TaskStatusOptions, TaskStatusOptionWithOptionalId, TaskStatusType } from '@/schema/opsflow/task/type'; diff --git a/apps/web/src/schema/opsflow/task-category/model.ts b/apps/web/src/api-clients/opsflow/task-category/schema/model.ts similarity index 62% rename from apps/web/src/schema/opsflow/task-category/model.ts rename to apps/web/src/api-clients/opsflow/task-category/schema/model.ts index ca2bd3b97f..b8265c88c9 100644 --- a/apps/web/src/schema/opsflow/task-category/model.ts +++ b/apps/web/src/api-clients/opsflow/task-category/schema/model.ts @@ -1,6 +1,6 @@ -import type { Tags } from '@/api-clients/_common/schema/model'; -import type { TaskField } from '@/schema/opsflow/_types/task-field-type'; -import type { TaskStatusOptions } from '@/schema/opsflow/task/type'; +import type { Tags } from '../../../_common/schema/model'; +import type { TaskField } from '../../_types/task-field-type'; +import type { TaskStatusOptions } from '../../task/schema/type'; export interface TaskCategoryModel { category_id: string; 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 new file mode 100644 index 0000000000..e69de29bb2 diff --git a/apps/web/src/schema/opsflow/task-type/api-verbs/create.ts b/apps/web/src/api-clients/opsflow/task-type/schema/api-verbs/create.ts similarity index 99% rename from apps/web/src/schema/opsflow/task-type/api-verbs/create.ts rename to apps/web/src/api-clients/opsflow/task-type/schema/api-verbs/create.ts index d5bd94b7b2..1586e4f9a9 100644 --- a/apps/web/src/schema/opsflow/task-type/api-verbs/create.ts +++ b/apps/web/src/api-clients/opsflow/task-type/schema/api-verbs/create.ts @@ -1,4 +1,5 @@ import type { Tags } from '@/api-clients/_common/schema/model'; + import type { TaskField } from '@/schema/opsflow/_types/task-field-type'; export interface TaskTypeCreateParameters { diff --git a/apps/web/src/schema/opsflow/task-type/api-verbs/delete.ts b/apps/web/src/api-clients/opsflow/task-type/schema/api-verbs/delete.ts similarity index 100% rename from apps/web/src/schema/opsflow/task-type/api-verbs/delete.ts rename to apps/web/src/api-clients/opsflow/task-type/schema/api-verbs/delete.ts diff --git a/apps/web/src/schema/opsflow/task-type/api-verbs/get.ts b/apps/web/src/api-clients/opsflow/task-type/schema/api-verbs/get.ts similarity index 100% rename from apps/web/src/schema/opsflow/task-type/api-verbs/get.ts rename to apps/web/src/api-clients/opsflow/task-type/schema/api-verbs/get.ts diff --git a/apps/web/src/schema/opsflow/task-type/api-verbs/list.ts b/apps/web/src/api-clients/opsflow/task-type/schema/api-verbs/list.ts similarity index 100% rename from apps/web/src/schema/opsflow/task-type/api-verbs/list.ts rename to apps/web/src/api-clients/opsflow/task-type/schema/api-verbs/list.ts diff --git a/apps/web/src/schema/opsflow/task-type/api-verbs/update-fields.ts b/apps/web/src/api-clients/opsflow/task-type/schema/api-verbs/update-fields.ts similarity index 100% rename from apps/web/src/schema/opsflow/task-type/api-verbs/update-fields.ts rename to apps/web/src/api-clients/opsflow/task-type/schema/api-verbs/update-fields.ts diff --git a/apps/web/src/schema/opsflow/task-type/api-verbs/update.ts b/apps/web/src/api-clients/opsflow/task-type/schema/api-verbs/update.ts similarity index 100% rename from apps/web/src/schema/opsflow/task-type/api-verbs/update.ts rename to apps/web/src/api-clients/opsflow/task-type/schema/api-verbs/update.ts diff --git a/apps/web/src/schema/opsflow/task-type/model.ts b/apps/web/src/api-clients/opsflow/task-type/schema/model.ts similarity index 99% rename from apps/web/src/schema/opsflow/task-type/model.ts rename to apps/web/src/api-clients/opsflow/task-type/schema/model.ts index fb9897ad57..9019f1911a 100644 --- a/apps/web/src/schema/opsflow/task-type/model.ts +++ b/apps/web/src/api-clients/opsflow/task-type/schema/model.ts @@ -1,4 +1,5 @@ import type { Tags } from '@/api-clients/_common/schema/model'; + import type { TaskField } from '@/schema/opsflow/_types/task-field-type'; export interface TaskTypeModel { 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 new file mode 100644 index 0000000000..e69de29bb2 diff --git a/apps/web/src/schema/opsflow/task/api-verbs/change-assignee.ts b/apps/web/src/api-clients/opsflow/task/schema/api-verbs/change-assignee.ts similarity index 100% rename from apps/web/src/schema/opsflow/task/api-verbs/change-assignee.ts rename to apps/web/src/api-clients/opsflow/task/schema/api-verbs/change-assignee.ts diff --git a/apps/web/src/schema/opsflow/task/api-verbs/change-status.ts b/apps/web/src/api-clients/opsflow/task/schema/api-verbs/change-status.ts similarity index 100% rename from apps/web/src/schema/opsflow/task/api-verbs/change-status.ts rename to apps/web/src/api-clients/opsflow/task/schema/api-verbs/change-status.ts diff --git a/apps/web/src/schema/opsflow/task/api-verbs/create.ts b/apps/web/src/api-clients/opsflow/task/schema/api-verbs/create.ts similarity index 69% rename from apps/web/src/schema/opsflow/task/api-verbs/create.ts rename to apps/web/src/api-clients/opsflow/task/schema/api-verbs/create.ts index 95babaecfe..59c63d775f 100644 --- a/apps/web/src/schema/opsflow/task/api-verbs/create.ts +++ b/apps/web/src/api-clients/opsflow/task/schema/api-verbs/create.ts @@ -1,5 +1,5 @@ -import type { MentionTargets } from '@/schema/opsflow/comment/type'; -import type { TaskPriority } from '@/schema/opsflow/task/type'; +import type { MentionTargets } from '../../../comment/schema/type'; +import type { TaskPriority } from '../type'; export interface TaskCreateParameters { task_type_id: string; diff --git a/apps/web/src/schema/opsflow/task/api-verbs/delete.ts b/apps/web/src/api-clients/opsflow/task/schema/api-verbs/delete.ts similarity index 100% rename from apps/web/src/schema/opsflow/task/api-verbs/delete.ts rename to apps/web/src/api-clients/opsflow/task/schema/api-verbs/delete.ts diff --git a/apps/web/src/schema/opsflow/task/api-verbs/get.ts b/apps/web/src/api-clients/opsflow/task/schema/api-verbs/get.ts similarity index 100% rename from apps/web/src/schema/opsflow/task/api-verbs/get.ts rename to apps/web/src/api-clients/opsflow/task/schema/api-verbs/get.ts diff --git a/apps/web/src/schema/opsflow/task/api-verbs/list.ts b/apps/web/src/api-clients/opsflow/task/schema/api-verbs/list.ts similarity index 82% rename from apps/web/src/schema/opsflow/task/api-verbs/list.ts rename to apps/web/src/api-clients/opsflow/task/schema/api-verbs/list.ts index 54fb135cdb..fe2428ccac 100644 --- a/apps/web/src/schema/opsflow/task/api-verbs/list.ts +++ b/apps/web/src/api-clients/opsflow/task/schema/api-verbs/list.ts @@ -1,6 +1,6 @@ import type { Query } from '@cloudforet/core-lib/space-connector/type'; -import type { TaskPriority, TaskStatusType } from '@/schema/opsflow/task/type'; +import type { TaskPriority, TaskStatusType } from '../type'; export interface TaskListParameters { query?: Query; diff --git a/apps/web/src/schema/opsflow/task/api-verbs/update-description.ts b/apps/web/src/api-clients/opsflow/task/schema/api-verbs/update-description.ts similarity index 52% rename from apps/web/src/schema/opsflow/task/api-verbs/update-description.ts rename to apps/web/src/api-clients/opsflow/task/schema/api-verbs/update-description.ts index efa47e204c..3522bf9df9 100644 --- a/apps/web/src/schema/opsflow/task/api-verbs/update-description.ts +++ b/apps/web/src/api-clients/opsflow/task/schema/api-verbs/update-description.ts @@ -1,5 +1,5 @@ -import type { FileModel } from '@/schema/file-manager/model'; -import type { MentionTargets } from '@/schema/opsflow/comment/type'; +import type { FileModel } from '../../../../../schema/file-manager/model'; +import type { MentionTargets } from '../../../comment/schema/type'; export interface TaskUpdateDescriptionParameters { task_id: string; diff --git a/apps/web/src/schema/opsflow/task/api-verbs/update.ts b/apps/web/src/api-clients/opsflow/task/schema/api-verbs/update.ts similarity index 72% rename from apps/web/src/schema/opsflow/task/api-verbs/update.ts rename to apps/web/src/api-clients/opsflow/task/schema/api-verbs/update.ts index 87a62572e0..5aa2fbe6d5 100644 --- a/apps/web/src/schema/opsflow/task/api-verbs/update.ts +++ b/apps/web/src/api-clients/opsflow/task/schema/api-verbs/update.ts @@ -1,4 +1,4 @@ -import type { TaskPriority } from '@/schema/opsflow/task/type'; +import type { TaskPriority } from '../type'; export interface TaskUpdateParameters { task_id: string; diff --git a/apps/web/src/schema/opsflow/task/constant.ts b/apps/web/src/api-clients/opsflow/task/schema/constant.ts similarity index 100% rename from apps/web/src/schema/opsflow/task/constant.ts rename to apps/web/src/api-clients/opsflow/task/schema/constant.ts diff --git a/apps/web/src/schema/opsflow/task/model.ts b/apps/web/src/api-clients/opsflow/task/schema/model.ts similarity index 79% rename from apps/web/src/schema/opsflow/task/model.ts rename to apps/web/src/api-clients/opsflow/task/schema/model.ts index 9d7ed0c9b8..0d0e71b3d5 100644 --- a/apps/web/src/schema/opsflow/task/model.ts +++ b/apps/web/src/api-clients/opsflow/task/schema/model.ts @@ -1,5 +1,5 @@ -import type { FileModel } from '@/schema/file-manager/model'; -import type { TaskPriority, TaskStatusType } from '@/schema/opsflow/task/type'; +import type { FileModel } from '../../../../schema/file-manager/model'; +import type { TaskPriority, TaskStatusType } from './type'; export interface TaskModel { task_id: string; diff --git a/apps/web/src/schema/opsflow/task/type.ts b/apps/web/src/api-clients/opsflow/task/schema/type.ts similarity index 86% rename from apps/web/src/schema/opsflow/task/type.ts rename to apps/web/src/api-clients/opsflow/task/schema/type.ts index 9fdbe2cb88..5df357f08a 100644 --- a/apps/web/src/schema/opsflow/task/type.ts +++ b/apps/web/src/api-clients/opsflow/task/schema/type.ts @@ -1,4 +1,4 @@ -import type { TASK_STATUS_COLOR_NAMES } from '@/schema/opsflow/task/constant'; +import type { TASK_STATUS_COLOR_NAMES } from './constant'; export type TaskStatusType = 'TODO'|'IN_PROGRESS'|'COMPLETED'; export type TaskStatusColorName = typeof TASK_STATUS_COLOR_NAMES[number]; 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 5f6c559ca8..55daf63cf3 100644 --- a/apps/web/src/common/modules/favorites/favorite-button/FavoriteButton.vue +++ b/apps/web/src/common/modules/favorites/favorite-button/FavoriteButton.vue @@ -6,7 +6,7 @@ import { useRoute } from 'vue-router/composables'; import { PI } from '@cloudforet/mirinae'; -import type { CostQuerySetModel } from '@/schema/cost-analysis/cost-query-set/model'; +import type { CostQuerySetModel } from '@/api-clients/cost-analysis/cost-query-set/schema/model'; import type { WorkspaceModel } from '@/schema/identity/workspace/model'; import type { MetricExampleModel } from '@/schema/inventory/metric-example/model'; diff --git a/apps/web/src/common/modules/navigations/stores/gnb-store.ts b/apps/web/src/common/modules/navigations/stores/gnb-store.ts index 0678817c72..02151ac7f9 100644 --- a/apps/web/src/common/modules/navigations/stores/gnb-store.ts +++ b/apps/web/src/common/modules/navigations/stores/gnb-store.ts @@ -5,10 +5,10 @@ import { defineStore } from 'pinia'; import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; +import type { CostQuerySetListParameters } from '@/api-clients/cost-analysis/cost-query-set/schema/api-verbs/list'; +import type { CostQuerySetModel } from '@/api-clients/cost-analysis/cost-query-set/schema/model'; import type { UserConfigListParameters } from '@/schema/config/user-config/api-verbs/list'; import type { UserConfigModel } from '@/schema/config/user-config/model'; -import type { CostQuerySetListParameters } from '@/schema/cost-analysis/cost-query-set/api-verbs/list'; -import type { CostQuerySetModel } from '@/schema/cost-analysis/cost-query-set/model'; import type { MetricExampleListParameters } from '@/schema/inventory/metric-example/api-verbs/list'; import type { MetricExampleModel } from '@/schema/inventory/metric-example/model'; 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 fbbf3a8303..9cbd30eb07 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 @@ -12,7 +12,7 @@ import { } from '@cloudforet/mirinae'; import type { ContextMenuType, MenuItem } from '@cloudforet/mirinae/types/controls/context-menu/type'; -import type { CostQuerySetModel } from '@/schema/cost-analysis/cost-query-set/model'; +import type { CostQuerySetModel } from '@/api-clients/cost-analysis/cost-query-set/schema/model'; import type { MetricExampleModel } from '@/schema/inventory/metric-example/model'; import { i18n } from '@/translations'; diff --git a/apps/web/src/common/pages/CostReportDetailPage.vue b/apps/web/src/common/pages/CostReportDetailPage.vue index 55552814da..9412a1224c 100644 --- a/apps/web/src/common/pages/CostReportDetailPage.vue +++ b/apps/web/src/common/pages/CostReportDetailPage.vue @@ -15,9 +15,8 @@ import type { DataTableFieldType } from '@cloudforet/mirinae/src/data-display/ta import { numberFormatter } from '@cloudforet/utils'; import type { AnalyzeResponse } from '@/api-clients/_common/schema/api-verbs/analyze'; -import type { CostReportDataAnalyzeParameters } from '@/schema/cost-analysis/cost-report-data/api-verbs/analyze'; -import type { CostReportGetParameters } from '@/schema/cost-analysis/cost-report/api-verbs/get'; -import type { CostReportModel } from '@/schema/cost-analysis/cost-report/model'; +import type { CostReportGetParameters } from '@/api-clients/cost-analysis/cost-report/schema/api-verbs/get'; +import type { CostReportModel } from '@/api-clients/cost-analysis/cost-report/schema/model'; import { setI18nLocale } from '@/translations'; import { ERROR_ROUTE } from '@/router/constant'; @@ -39,6 +38,8 @@ import { MASSIVE_CHART_COLORS } from '@/styles/colorsets'; import ConsoleLogo from '@/services/auth/components/ConsoleLogo.vue'; +import type { CostReportDataAnalyzeParameters } from '@/schema/cost-analysis/cost-report-data/api-verbs/analyze'; + const router = useRouter(); diff --git a/apps/web/src/lib/helper/config-data-helper.ts b/apps/web/src/lib/helper/config-data-helper.ts index 8669a343ff..525ebdc75f 100644 --- a/apps/web/src/lib/helper/config-data-helper.ts +++ b/apps/web/src/lib/helper/config-data-helper.ts @@ -1,7 +1,7 @@ import { cloneDeep, find } from 'lodash'; +import type { CostQuerySetModel } from '@/api-clients/cost-analysis/cost-query-set/schema/model'; import type { DashboardModel } from '@/api-clients/dashboard/_types/dashboard-type'; -import type { CostQuerySetModel } from '@/schema/cost-analysis/cost-query-set/model'; import type { WorkspaceModel } from '@/schema/identity/workspace/model'; import type { MetricExampleModel } from '@/schema/inventory/metric-example/model'; diff --git a/apps/web/src/lib/variable-models/managed-model/resource-model/cost-variable-model.ts b/apps/web/src/lib/variable-models/managed-model/resource-model/cost-variable-model.ts index 58ba63cd68..54207dfd3e 100644 --- a/apps/web/src/lib/variable-models/managed-model/resource-model/cost-variable-model.ts +++ b/apps/web/src/lib/variable-models/managed-model/resource-model/cost-variable-model.ts @@ -1,4 +1,4 @@ -import type { CostModel } from '@/schema/cost-analysis/cost/model'; +import type { CostModel } from '@/api-clients/cost-analysis/cost/schema/model'; import ResourceVariableModel from '@/lib/variable-models/_base/resource-variable-model'; import type { VariableModelConstructorConfig } from '@/lib/variable-models/_base/types'; diff --git a/apps/web/src/services/advanced/pages/admin/AdminDomainSettingsAutoDormancyConfigurationPage.vue b/apps/web/src/services/advanced/pages/admin/AdminDomainSettingsAutoDormancyConfigurationPage.vue index 4ce45681f8..b9afdf453d 100644 --- a/apps/web/src/services/advanced/pages/admin/AdminDomainSettingsAutoDormancyConfigurationPage.vue +++ b/apps/web/src/services/advanced/pages/admin/AdminDomainSettingsAutoDormancyConfigurationPage.vue @@ -11,12 +11,12 @@ import { import { getNumberFromString, numberFormatter } from '@cloudforet/utils'; import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; +import type { CostReportConfigListParameters } from '@/api-clients/cost-analysis/cost-report-config/schema/api-verbs/list'; +import type { CostReportConfigModel } from '@/api-clients/cost-analysis/cost-report-config/schema/model'; import type { DomainConfigListParameters } from '@/schema/config/domain-config/api-verbs/list'; import type { DomainConfigUpdateParameters } from '@/schema/config/domain-config/api-verbs/update'; import { DOMAIN_CONFIG_NAMES } from '@/schema/config/domain-config/constant'; import type { DomainConfigModel } from '@/schema/config/domain-config/model'; -import type { CostReportConfigListParameters } from '@/schema/cost-analysis/cost-report-config/api-verbs/list'; -import type { CostReportConfigModel } from '@/schema/cost-analysis/cost-report-config/model'; import { i18n as _i18n } from '@/translations'; import { makeAdminRouteName } from '@/router/helpers/route-helper'; diff --git a/apps/web/src/services/advanced/store/workspace-group-page-store.ts b/apps/web/src/services/advanced/store/workspace-group-page-store.ts index a973a14958..4bba03856e 100644 --- a/apps/web/src/services/advanced/store/workspace-group-page-store.ts +++ b/apps/web/src/services/advanced/store/workspace-group-page-store.ts @@ -8,8 +8,8 @@ import { ApiQueryHelper } from '@cloudforet/core-lib/space-connector/helper'; import type { Query } from '@cloudforet/core-lib/space-connector/type'; import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; -import type { CostReportConfigListParameters } from '@/schema/cost-analysis/cost-report-config/api-verbs/list'; -import type { CostReportConfigModel } from '@/schema/cost-analysis/cost-report-config/model'; +import type { CostReportConfigListParameters } from '@/api-clients/cost-analysis/cost-report-config/schema/api-verbs/list'; +import type { CostReportConfigModel } from '@/api-clients/cost-analysis/cost-report-config/schema/model'; import type { RoleListParameters } from '@/schema/identity/role/api-verbs/list'; import { ROLE_STATE } from '@/schema/identity/role/constant'; import type { RoleModel } from '@/schema/identity/role/model'; diff --git a/apps/web/src/services/advanced/store/workspace-page-store.ts b/apps/web/src/services/advanced/store/workspace-page-store.ts index b8460736ce..c12d90a7e2 100644 --- a/apps/web/src/services/advanced/store/workspace-page-store.ts +++ b/apps/web/src/services/advanced/store/workspace-page-store.ts @@ -4,8 +4,8 @@ import type { ConsoleFilter } from '@cloudforet/core-lib/query/type'; import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; -import type { CostReportConfigListParameters } from '@/schema/cost-analysis/cost-report-config/api-verbs/list'; -import type { CostReportConfigModel } from '@/schema/cost-analysis/cost-report-config/model'; +import type { CostReportConfigListParameters } from '@/api-clients/cost-analysis/cost-report-config/schema/api-verbs/list'; +import type { CostReportConfigModel } from '@/api-clients/cost-analysis/cost-report-config/schema/model'; import type { RoleBindingListParameters, RoleBindingListResponse } from '@/schema/identity/role-binding/api-verbs/list'; import type { RoleBindingModel } from '@/schema/identity/role-binding/model'; import type { RoleListParameters } from '@/schema/identity/role/api-verbs/list'; diff --git a/apps/web/src/services/asset-inventory-v1/stores/service-account-page-store.ts b/apps/web/src/services/asset-inventory-v1/stores/service-account-page-store.ts index 8215168838..34865a0124 100644 --- a/apps/web/src/services/asset-inventory-v1/stores/service-account-page-store.ts +++ b/apps/web/src/services/asset-inventory-v1/stores/service-account-page-store.ts @@ -7,8 +7,8 @@ import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; import type { JsonSchema } from '@cloudforet/mirinae/types/controls/forms/json-schema-form/type'; import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; -import type { CostReportConfigListParameters } from '@/schema/cost-analysis/cost-report-config/api-verbs/list'; -import type { CostReportConfigModel } from '@/schema/cost-analysis/cost-report-config/model'; +import type { CostReportConfigListParameters } from '@/api-clients/cost-analysis/cost-report-config/schema/api-verbs/list'; +import type { CostReportConfigModel } from '@/api-clients/cost-analysis/cost-report-config/schema/model'; import type { IdentityJobListParameters } from '@/schema/identity/job/api-verbs/list'; import type { IdentityJobModel } from '@/schema/identity/job/model'; import type { IdentityJobStatus } from '@/schema/identity/job/type'; diff --git a/apps/web/src/services/asset-inventory/stores/service-account-page-store.ts b/apps/web/src/services/asset-inventory/stores/service-account-page-store.ts index daedc7327c..34939f66ac 100644 --- a/apps/web/src/services/asset-inventory/stores/service-account-page-store.ts +++ b/apps/web/src/services/asset-inventory/stores/service-account-page-store.ts @@ -7,8 +7,8 @@ import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; import type { JsonSchema } from '@cloudforet/mirinae/types/controls/forms/json-schema-form/type'; import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; -import type { CostReportConfigListParameters } from '@/schema/cost-analysis/cost-report-config/api-verbs/list'; -import type { CostReportConfigModel } from '@/schema/cost-analysis/cost-report-config/model'; +import type { CostReportConfigListParameters } from '@/api-clients/cost-analysis/cost-report-config/schema/api-verbs/list'; +import type { CostReportConfigModel } from '@/api-clients/cost-analysis/cost-report-config/schema/model'; import type { IdentityJobListParameters } from '@/schema/identity/job/api-verbs/list'; import type { IdentityJobModel } from '@/schema/identity/job/model'; import type { IdentityJobStatus } from '@/schema/identity/job/type'; diff --git a/apps/web/src/services/cost-explorer/components/BudgetCreateForm.vue b/apps/web/src/services/cost-explorer/components/BudgetCreateForm.vue index b366499d01..0eaab0e5d2 100644 --- a/apps/web/src/services/cost-explorer/components/BudgetCreateForm.vue +++ b/apps/web/src/services/cost-explorer/components/BudgetCreateForm.vue @@ -8,9 +8,9 @@ import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; import { PButton } from '@cloudforet/mirinae'; +import type { BudgetCreateParameters } from '@/api-clients/cost-analysis/budget/schema/api-verbs/create'; +import type { BudgetModel } from '@/api-clients/cost-analysis/budget/schema/model'; import { SpaceRouter } from '@/router'; -import type { BudgetCreateParameters } from '@/schema/cost-analysis/budget/api-verbs/create'; -import type { BudgetModel } from '@/schema/cost-analysis/budget/model'; import { i18n } from '@/translations'; import { useAppContextStore } from '@/store/app-context/app-context-store'; diff --git a/apps/web/src/services/cost-explorer/components/BudgetCreateFormAmountPlan.vue b/apps/web/src/services/cost-explorer/components/BudgetCreateFormAmountPlan.vue index 26269978d9..a142221bc4 100644 --- a/apps/web/src/services/cost-explorer/components/BudgetCreateFormAmountPlan.vue +++ b/apps/web/src/services/cost-explorer/components/BudgetCreateFormAmountPlan.vue @@ -6,7 +6,7 @@ import { import { PPaneLayout, PHeading } from '@cloudforet/mirinae'; -import type { BudgetModel } from '@/schema/cost-analysis/budget/model'; +import type { BudgetModel } from '@/api-clients/cost-analysis/budget/schema/model'; import BudgetCreateFormAmountPlanLastMonthsCost from '@/services/cost-explorer/components/BudgetCreateFormAmountPlanLastMonthsCost.vue'; diff --git a/apps/web/src/services/cost-explorer/components/BudgetCreateFormAmountPlanLastMonthsCost.vue b/apps/web/src/services/cost-explorer/components/BudgetCreateFormAmountPlanLastMonthsCost.vue index e6228845f5..f25627bd21 100644 --- a/apps/web/src/services/cost-explorer/components/BudgetCreateFormAmountPlanLastMonthsCost.vue +++ b/apps/web/src/services/cost-explorer/components/BudgetCreateFormAmountPlanLastMonthsCost.vue @@ -8,7 +8,7 @@ import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; import { ApiQueryHelper } from '@cloudforet/core-lib/space-connector/helper'; -import type { BudgetModel } from '@/schema/cost-analysis/budget/model'; +import type { BudgetModel } from '@/api-clients/cost-analysis/budget/schema/model'; import type { Currency } from '@/store/display/type'; import { useAllReferenceStore } from '@/store/reference/all-reference-store'; diff --git a/apps/web/src/services/cost-explorer/components/BudgetCreateFormAmountPlanUnitSelect.vue b/apps/web/src/services/cost-explorer/components/BudgetCreateFormAmountPlanUnitSelect.vue index 719dd14bff..ce02fb73ac 100644 --- a/apps/web/src/services/cost-explorer/components/BudgetCreateFormAmountPlanUnitSelect.vue +++ b/apps/web/src/services/cost-explorer/components/BudgetCreateFormAmountPlanUnitSelect.vue @@ -4,7 +4,7 @@ import type { TranslateResult } from 'vue-i18n'; import { PFieldTitle, PSelectCard } from '@cloudforet/mirinae'; -import type { BudgetModel } from '@/schema/cost-analysis/budget/model'; +import type { BudgetModel } from '@/api-clients/cost-analysis/budget/schema/model'; import { i18n } from '@/translations'; diff --git a/apps/web/src/services/cost-explorer/components/BudgetCreateFormBaseInfo.vue b/apps/web/src/services/cost-explorer/components/BudgetCreateFormBaseInfo.vue index 419d209468..13f5a23b46 100644 --- a/apps/web/src/services/cost-explorer/components/BudgetCreateFormBaseInfo.vue +++ b/apps/web/src/services/cost-explorer/components/BudgetCreateFormBaseInfo.vue @@ -7,7 +7,7 @@ import { PFieldGroup, PPaneLayout, PHeading, PTextInput, } from '@cloudforet/mirinae'; -import type { BudgetModel } from '@/schema/cost-analysis/budget/model'; +import type { BudgetModel } from '@/api-clients/cost-analysis/budget/schema/model'; import { i18n } from '@/translations'; import { useAppContextStore } from '@/store/app-context/app-context-store'; diff --git a/apps/web/src/services/cost-explorer/components/BudgetCreateProviderSelect.vue b/apps/web/src/services/cost-explorer/components/BudgetCreateProviderSelect.vue index 1dbfe73960..ee872075fd 100644 --- a/apps/web/src/services/cost-explorer/components/BudgetCreateProviderSelect.vue +++ b/apps/web/src/services/cost-explorer/components/BudgetCreateProviderSelect.vue @@ -13,7 +13,7 @@ import type { SelectDropdownMenuItem, } from '@cloudforet/mirinae/types/controls/dropdown/select-dropdown/type'; -import type { BudgetModel } from '@/schema/cost-analysis/budget/model'; +import type { BudgetModel } from '@/api-clients/cost-analysis/budget/schema/model'; import { i18n } from '@/translations'; diff --git a/apps/web/src/services/cost-explorer/components/BudgetDetailDeleteModal.vue b/apps/web/src/services/cost-explorer/components/BudgetDetailDeleteModal.vue index 97392b8463..c6723ee189 100644 --- a/apps/web/src/services/cost-explorer/components/BudgetDetailDeleteModal.vue +++ b/apps/web/src/services/cost-explorer/components/BudgetDetailDeleteModal.vue @@ -17,7 +17,7 @@ import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; import { PDoubleCheckModal } from '@cloudforet/mirinae'; -import type { BudgetDeleteParameters } from '@/schema/cost-analysis/budget/api-verbs/delete'; +import type { BudgetDeleteParameters } from '@/api-clients/cost-analysis/budget/schema/api-verbs/delete'; import ErrorHandler from '@/common/composables/error/errorHandler'; diff --git a/apps/web/src/services/cost-explorer/components/BudgetDetailHeading.vue b/apps/web/src/services/cost-explorer/components/BudgetDetailHeading.vue index d5a6cf5f4d..3eb10a9635 100644 --- a/apps/web/src/services/cost-explorer/components/BudgetDetailHeading.vue +++ b/apps/web/src/services/cost-explorer/components/BudgetDetailHeading.vue @@ -6,7 +6,7 @@ import { PDivider, PHeading, PIconButton, PHeadingLayout, } from '@cloudforet/mirinae'; -import type { BudgetModel } from '@/schema/cost-analysis/budget/model'; +import type { BudgetModel } from '@/api-clients/cost-analysis/budget/schema/model'; import { ROLE_TYPE } from '@/schema/identity/role/constant'; import { useAppContextStore } from '@/store/app-context/app-context-store'; diff --git a/apps/web/src/services/cost-explorer/components/BudgetDetailInfo.vue b/apps/web/src/services/cost-explorer/components/BudgetDetailInfo.vue index 233bd7bb0f..3ace8adf94 100644 --- a/apps/web/src/services/cost-explorer/components/BudgetDetailInfo.vue +++ b/apps/web/src/services/cost-explorer/components/BudgetDetailInfo.vue @@ -9,7 +9,7 @@ import { } from '@cloudforet/mirinae'; import { ACTION_ICON } from '@cloudforet/mirinae/src/navigation/link/type'; -import type { BudgetModel } from '@/schema/cost-analysis/budget/model'; +import type { BudgetModel } from '@/api-clients/cost-analysis/budget/schema/model'; import { useAllReferenceStore } from '@/store/reference/all-reference-store'; import type { ProjectReferenceMap } from '@/store/reference/project-reference-store'; diff --git a/apps/web/src/services/cost-explorer/components/BudgetDetailInfoAmountPlanningTypePopover.vue b/apps/web/src/services/cost-explorer/components/BudgetDetailInfoAmountPlanningTypePopover.vue index a31356c19e..d37d42a0ea 100644 --- a/apps/web/src/services/cost-explorer/components/BudgetDetailInfoAmountPlanningTypePopover.vue +++ b/apps/web/src/services/cost-explorer/components/BudgetDetailInfoAmountPlanningTypePopover.vue @@ -5,7 +5,7 @@ import dayjs from 'dayjs'; import { PPopover } from '@cloudforet/mirinae'; -import type { BudgetModel } from '@/schema/cost-analysis/budget/model'; +import type { BudgetModel } from '@/api-clients/cost-analysis/budget/schema/model'; import { currencyMoneyFormatter } from '@/lib/helper/currency-helper'; diff --git a/apps/web/src/services/cost-explorer/components/BudgetDetailNotificationsConditionSettingModal.vue b/apps/web/src/services/cost-explorer/components/BudgetDetailNotificationsConditionSettingModal.vue index 2a418a1864..411f36ecc0 100644 --- a/apps/web/src/services/cost-explorer/components/BudgetDetailNotificationsConditionSettingModal.vue +++ b/apps/web/src/services/cost-explorer/components/BudgetDetailNotificationsConditionSettingModal.vue @@ -8,7 +8,7 @@ import { } from '@cloudforet/mirinae'; import type { SelectDropdownMenuItem } from '@cloudforet/mirinae/types/controls/dropdown/select-dropdown/type'; -import type { BudgetModel } from '@/schema/cost-analysis/budget/model'; +import type { BudgetModel } from '@/api-clients/cost-analysis/budget/schema/model'; import { i18n } from '@/translations'; import ErrorHandler from '@/common/composables/error/errorHandler'; diff --git a/apps/web/src/services/cost-explorer/components/BudgetDetailSummaryTable.vue b/apps/web/src/services/cost-explorer/components/BudgetDetailSummaryTable.vue index bad2760720..5f58ec91de 100644 --- a/apps/web/src/services/cost-explorer/components/BudgetDetailSummaryTable.vue +++ b/apps/web/src/services/cost-explorer/components/BudgetDetailSummaryTable.vue @@ -8,8 +8,8 @@ import cloneDeep from 'lodash/cloneDeep'; import type { ConsoleFilter } from '@cloudforet/core-lib/query/type'; import { PCollapsibleToggle, PDataTable, PLink } from '@cloudforet/mirinae'; -import type { BudgetUsageModel } from '@/schema/cost-analysis/budget-usage/model'; -import type { BudgetModel } from '@/schema/cost-analysis/budget/model'; +import type { BudgetUsageModel } from '@/api-clients/cost-analysis/budget-usage/schema/model'; +import type { BudgetModel } from '@/api-clients/cost-analysis/budget/schema/model'; import { i18n } from '@/translations'; diff --git a/apps/web/src/services/cost-explorer/components/BudgetMainList.vue b/apps/web/src/services/cost-explorer/components/BudgetMainList.vue index 78fa41415e..6884206ac7 100644 --- a/apps/web/src/services/cost-explorer/components/BudgetMainList.vue +++ b/apps/web/src/services/cost-explorer/components/BudgetMainList.vue @@ -14,11 +14,11 @@ import { import type { AnalyzeResponse } from '@/api-clients/_common/schema/api-verbs/analyze'; import { RESOURCE_GROUP } from '@/api-clients/_common/schema/constant'; -import { SpaceRouter } from '@/router'; import type { BudgetUsageAnalyzeParameters, BudgetUsageAnalyzeResult, -} from '@/schema/cost-analysis/budget-usage/api-verbs/analyze'; +} from '@/api-clients/cost-analysis/budget-usage/schema/api-verbs/analyze'; +import { SpaceRouter } from '@/router'; import { useAppContextStore } from '@/store/app-context/app-context-store'; import { useUserStore } from '@/store/user/user-store'; diff --git a/apps/web/src/services/cost-explorer/components/BudgetMainListCard.vue b/apps/web/src/services/cost-explorer/components/BudgetMainListCard.vue index 91422a9e5a..35ad0e25ac 100644 --- a/apps/web/src/services/cost-explorer/components/BudgetMainListCard.vue +++ b/apps/web/src/services/cost-explorer/components/BudgetMainListCard.vue @@ -6,7 +6,7 @@ import { PDivider, PI, PBadge, PStatus, } from '@cloudforet/mirinae'; -import type { BudgetUsageAnalyzeResult } from '@/schema/cost-analysis/budget-usage/api-verbs/analyze'; +import type { BudgetUsageAnalyzeResult } from '@/api-clients/cost-analysis/budget-usage/schema/api-verbs/analyze'; import type { WorkspaceModel } from '@/schema/identity/workspace/model'; import { useAppContextStore } from '@/store/app-context/app-context-store'; diff --git a/apps/web/src/services/cost-explorer/components/CostAnalysisContent.vue b/apps/web/src/services/cost-explorer/components/CostAnalysisContent.vue index eb0b44cdee..f86b969357 100644 --- a/apps/web/src/services/cost-explorer/components/CostAnalysisContent.vue +++ b/apps/web/src/services/cost-explorer/components/CostAnalysisContent.vue @@ -4,7 +4,7 @@ import { } from 'vue'; import { useRoute, useRouter } from 'vue-router/composables'; -import type { CostQuerySetModel } from '@/schema/cost-analysis/cost-query-set/model'; +import type { CostQuerySetModel } from '@/api-clients/cost-analysis/cost-query-set/schema/model'; import { queryStringToArray, diff --git a/apps/web/src/services/cost-explorer/components/CostAnalysisHeader.vue b/apps/web/src/services/cost-explorer/components/CostAnalysisHeader.vue index 7c2d066974..6a72853630 100644 --- a/apps/web/src/services/cost-explorer/components/CostAnalysisHeader.vue +++ b/apps/web/src/services/cost-explorer/components/CostAnalysisHeader.vue @@ -8,8 +8,8 @@ import { PIconButton, PHeading, PLazyImg, PDivider, PI, PHeadingLayout, PScopedNotification, } from '@cloudforet/mirinae'; +import type { CostQuerySetDeleteParameters } from '@/api-clients/cost-analysis/cost-query-set/schema/api-verbs/delete'; import { SpaceRouter } from '@/router'; -import type { CostQuerySetDeleteParameters } from '@/schema/cost-analysis/cost-query-set/api-verbs/delete'; import { i18n } from '@/translations'; import { makeAdminRouteName } from '@/router/helpers/route-helper'; diff --git a/apps/web/src/services/cost-explorer/components/CostAnalysisPeriodSelectDropdown.vue b/apps/web/src/services/cost-explorer/components/CostAnalysisPeriodSelectDropdown.vue index f97c733404..3a4cc8ec60 100644 --- a/apps/web/src/services/cost-explorer/components/CostAnalysisPeriodSelectDropdown.vue +++ b/apps/web/src/services/cost-explorer/components/CostAnalysisPeriodSelectDropdown.vue @@ -11,7 +11,7 @@ import { PSelectDropdown } from '@cloudforet/mirinae'; import type { MenuItem } from '@cloudforet/mirinae/types/controls/context-menu/type'; import type { SelectDropdownMenuItem } from '@cloudforet/mirinae/types/controls/dropdown/select-dropdown/type'; -import type { CostQuerySetModel } from '@/schema/cost-analysis/cost-query-set/model'; +import type { CostQuerySetModel } from '@/api-clients/cost-analysis/cost-query-set/schema/model'; import { i18n } from '@/translations'; import { queryStringToObject, queryStringToString } from '@/lib/router-query-string'; diff --git a/apps/web/src/services/cost-explorer/components/CostAnalysisQueryFormModal.vue b/apps/web/src/services/cost-explorer/components/CostAnalysisQueryFormModal.vue index e2aebb1585..ed5ea05ebb 100644 --- a/apps/web/src/services/cost-explorer/components/CostAnalysisQueryFormModal.vue +++ b/apps/web/src/services/cost-explorer/components/CostAnalysisQueryFormModal.vue @@ -7,7 +7,7 @@ import { PButtonModal, PFieldGroup, PTextInput, } from '@cloudforet/mirinae'; -import type { CostQuerySetModel } from '@/schema/cost-analysis/cost-query-set/model'; +import type { CostQuerySetModel } from '@/api-clients/cost-analysis/cost-query-set/schema/model'; import { i18n } from '@/translations'; import { showSuccessMessage } from '@/lib/helper/notice-alert-helper'; diff --git a/apps/web/src/services/cost-explorer/components/CostAnalysisQuerySection.vue b/apps/web/src/services/cost-explorer/components/CostAnalysisQuerySection.vue index 57a1f74e7a..f94431d234 100644 --- a/apps/web/src/services/cost-explorer/components/CostAnalysisQuerySection.vue +++ b/apps/web/src/services/cost-explorer/components/CostAnalysisQuerySection.vue @@ -13,8 +13,8 @@ import { } from '@cloudforet/mirinae'; import type { MenuItem } from '@cloudforet/mirinae/types/controls/context-menu/type'; +import type { CostQuerySetUpdateParameters } from '@/api-clients/cost-analysis/cost-query-set/schema/api-verbs/update'; import { SpaceRouter } from '@/router'; -import type { CostQuerySetUpdateParameters } from '@/schema/cost-analysis/cost-query-set/api-verbs/update'; import { i18n } from '@/translations'; import { useAppContextStore } from '@/store/app-context/app-context-store'; diff --git a/apps/web/src/services/cost-explorer/components/CostReportMonthlyTotalAmountSummaryCard.vue b/apps/web/src/services/cost-explorer/components/CostReportMonthlyTotalAmountSummaryCard.vue index 3ac50995f0..02aa6822b6 100644 --- a/apps/web/src/services/cost-explorer/components/CostReportMonthlyTotalAmountSummaryCard.vue +++ b/apps/web/src/services/cost-explorer/components/CostReportMonthlyTotalAmountSummaryCard.vue @@ -23,9 +23,8 @@ import { numberFormatter } from '@cloudforet/utils'; import type { AnalyzeResponse } from '@/api-clients/_common/schema/api-verbs/analyze'; import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list'; -import type { CostReportDataAnalyzeParameters } from '@/schema/cost-analysis/cost-report-data/api-verbs/analyze'; -import type { CostReportListParameters } from '@/schema/cost-analysis/cost-report/api-verbs/list'; -import type { CostReportModel } from '@/schema/cost-analysis/cost-report/model'; +import type { CostReportListParameters } from '@/api-clients/cost-analysis/cost-report/schema/api-verbs/list'; +import type { CostReportModel } from '@/api-clients/cost-analysis/cost-report/schema/model'; import { i18n } from '@/translations'; import { useAppContextStore } from '@/store/app-context/app-context-store'; @@ -53,6 +52,8 @@ import { useAllReferenceTypeInfoStore, } from '@/services/dashboards/stores/all-reference-type-info-store'; +import type { CostReportDataAnalyzeParameters } from '@/schema/cost-analysis/cost-report-data/api-verbs/analyze'; + type CostReportDataAnalyzeResult = { diff --git a/apps/web/src/services/cost-explorer/components/CostReportRecipientsCard.vue b/apps/web/src/services/cost-explorer/components/CostReportRecipientsCard.vue index 9229030c4a..54f53160a2 100644 --- a/apps/web/src/services/cost-explorer/components/CostReportRecipientsCard.vue +++ b/apps/web/src/services/cost-explorer/components/CostReportRecipientsCard.vue @@ -8,11 +8,11 @@ import { import { ACTION_ICON } from '@cloudforet/mirinae/src/navigation/link/type'; -import WorkspaceOwnerImage from '@/assets/images/role/img_avatar_workspace-owner.png'; import type { CostReportConfigUpdateRecipientsParameters, -} from '@/schema/cost-analysis/cost-report-config/api-verbs/update-recipients'; -import type { CostReportConfigModel } from '@/schema/cost-analysis/cost-report-config/model'; +} from '@/api-clients/cost-analysis/cost-report-config/schema/api-verbs/update-recipients'; +import type { CostReportConfigModel } from '@/api-clients/cost-analysis/cost-report-config/schema/model'; +import WorkspaceOwnerImage from '@/assets/images/role/img_avatar_workspace-owner.png'; import { i18n } from '@/translations'; import { makeAdminRouteName } from '@/router/helpers/route-helper'; diff --git a/apps/web/src/services/cost-explorer/components/CostReportResendModal.vue b/apps/web/src/services/cost-explorer/components/CostReportResendModal.vue index b35115ebcb..e41a05693e 100644 --- a/apps/web/src/services/cost-explorer/components/CostReportResendModal.vue +++ b/apps/web/src/services/cost-explorer/components/CostReportResendModal.vue @@ -6,7 +6,7 @@ import { import { SpaceConnector } from '@cloudforet/core-lib/space-connector'; import { PButtonModal, PDefinitionTable, PLink } from '@cloudforet/mirinae'; -import type { CostReportSendParameters } from '@/schema/cost-analysis/cost-report/api-verbs/send'; +import type { CostReportSendParameters } from '@/api-clients/cost-analysis/cost-report/schema/api-verbs/send'; import { ROLE_TYPE } from '@/schema/identity/role/constant'; import type { RoleType } from '@/schema/identity/role/type'; import { i18n } from '@/translations'; diff --git a/apps/web/src/services/cost-explorer/components/CostReportSettingsModal.vue b/apps/web/src/services/cost-explorer/components/CostReportSettingsModal.vue index aa9c2f29f6..85cc865817 100644 --- a/apps/web/src/services/cost-explorer/components/CostReportSettingsModal.vue +++ b/apps/web/src/services/cost-explorer/components/CostReportSettingsModal.vue @@ -10,8 +10,8 @@ import { } from '@cloudforet/mirinae'; import type { SelectDropdownMenuItem } from '@cloudforet/mirinae/types/controls/dropdown/select-dropdown/type'; -import type { CostReportConfigUpdateParameters } from '@/schema/cost-analysis/cost-report-config/api-verbs/update'; -import type { CostReportConfigModel } from '@/schema/cost-analysis/cost-report-config/model'; +import type { CostReportConfigUpdateParameters } from '@/api-clients/cost-analysis/cost-report-config/schema/api-verbs/update'; +import type { CostReportConfigModel } from '@/api-clients/cost-analysis/cost-report-config/schema/model'; import { i18n } from '@/translations'; import { CURRENCY, CURRENCY_SYMBOL } from '@/store/display/constant'; diff --git a/apps/web/src/services/cost-explorer/constants/managed-cost-analysis-query-sets.ts b/apps/web/src/services/cost-explorer/constants/managed-cost-analysis-query-sets.ts index 0ecc1c28a3..1caea60b8c 100644 --- a/apps/web/src/services/cost-explorer/constants/managed-cost-analysis-query-sets.ts +++ b/apps/web/src/services/cost-explorer/constants/managed-cost-analysis-query-sets.ts @@ -1,4 +1,4 @@ -import type { CostQuerySetModel } from '@/schema/cost-analysis/cost-query-set/model'; +import type { CostQuerySetModel } from '@/api-clients/cost-analysis/cost-query-set/schema/model'; import { GRANULARITY, GROUP_BY, GROUP_BY_FILTER_ITEM_MAP, diff --git a/apps/web/src/services/cost-explorer/helpers/budget-usage-analyze-api-query-helper.ts b/apps/web/src/services/cost-explorer/helpers/budget-usage-analyze-api-query-helper.ts index 29a65ef3de..dd0f50012c 100644 --- a/apps/web/src/services/cost-explorer/helpers/budget-usage-analyze-api-query-helper.ts +++ b/apps/web/src/services/cost-explorer/helpers/budget-usage-analyze-api-query-helper.ts @@ -3,7 +3,7 @@ import { isEmpty } from 'lodash'; import type { Query } from '@cloudforet/core-lib/space-connector/type'; -import type { BudgetUsageAnalyzeResult } from '@/schema/cost-analysis/budget-usage/api-verbs/analyze'; +import type { BudgetUsageAnalyzeResult } from '@/api-clients/cost-analysis/budget-usage/schema/api-verbs/analyze'; import { GRANULARITY } from '@/services/cost-explorer/constants/cost-explorer-constant'; import type { Period } from '@/services/cost-explorer/types/cost-explorer-query-type'; diff --git a/apps/web/src/services/cost-explorer/pages/BudgetDetailPage.vue b/apps/web/src/services/cost-explorer/pages/BudgetDetailPage.vue index 8ba268cd51..ed88429aac 100644 --- a/apps/web/src/services/cost-explorer/pages/BudgetDetailPage.vue +++ b/apps/web/src/services/cost-explorer/pages/BudgetDetailPage.vue @@ -5,7 +5,7 @@ import type { Location } from 'vue-router'; import { PLink, PScopedNotification } from '@cloudforet/mirinae'; import { ACTION_ICON } from '@cloudforet/mirinae/src/navigation/link/type'; -import type { BudgetModel } from '@/schema/cost-analysis/budget/model'; +import type { BudgetModel } from '@/api-clients/cost-analysis/budget/schema/model'; import { i18n } from '@/translations'; import { makeAdminRouteName } from '@/router/helpers/route-helper'; diff --git a/apps/web/src/services/cost-explorer/pages/admin/AdminBudgetDetailPage.vue b/apps/web/src/services/cost-explorer/pages/admin/AdminBudgetDetailPage.vue index 55ff854114..d66c090535 100644 --- a/apps/web/src/services/cost-explorer/pages/admin/AdminBudgetDetailPage.vue +++ b/apps/web/src/services/cost-explorer/pages/admin/AdminBudgetDetailPage.vue @@ -1,7 +1,7 @@ diff --git a/apps/web/src/services/dashboards/components/dashboard-create/DashboardCreateStep1.vue b/apps/web/src/services/dashboards/components/dashboard-create/DashboardCreateStep1.vue index c449162582..4c4ce0a3d5 100644 --- a/apps/web/src/services/dashboards/components/dashboard-create/DashboardCreateStep1.vue +++ b/apps/web/src/services/dashboards/components/dashboard-create/DashboardCreateStep1.vue @@ -14,15 +14,17 @@ import type { DashboardModel } from '@/api-clients/dashboard/_types/dashboard-ty import type { DashboardTemplateModel } from '@/schema/repository/dashboard-template/model'; import { i18n } from '@/translations'; +import { useAppContextStore } from '@/store/app-context/app-context-store'; + import { useProperRouteLocation } from '@/common/composables/proper-route-location'; import DashboardCreateBlankBoardItem from '@/services/dashboards/components/dashboard-create/DashboardCreateBlankBoardItem.vue'; import type { FilterLabelItem } from '@/services/dashboards/components/dashboard-create/DashboardCreateStep1SearchFilter.vue'; import DashboardCreateStep1SearchFilter from '@/services/dashboards/components/dashboard-create/DashboardCreateStep1SearchFilter.vue'; import DashboardFolderTree from '@/services/dashboards/components/dashboard-folder/DashboardFolderTree.vue'; +import { useDashboardQuery } from '@/services/dashboards/composables/use-dashboard-query'; import { DASHBOARDS_ROUTE } from '@/services/dashboards/routes/route-constant'; import { useDashboardCreatePageStore } from '@/services/dashboards/stores/dashboard-create-page-store'; -import { useDashboardPageControlStore } from '@/services/dashboards/stores/dashboard-page-control-store'; import type { DashboardTreeDataType } from '@/services/dashboards/types/dashboard-folder-type'; @@ -31,11 +33,31 @@ const emit = defineEmits<{(e: 'click-next'): void }>(); const router = useRouter(); const { getProperRouteLocation } = useProperRouteLocation(); +const appContextStore = useAppContextStore(); const dashboardCreatePageStore = useDashboardCreatePageStore(); const dashboardCreatePageState = dashboardCreatePageStore.state; const dashboardCreatePageGetters = dashboardCreatePageStore.getters; -const dashboardPageControlStore = useDashboardPageControlStore(); -const dashboardPageControlGetters = dashboardPageControlStore.getters; + +/* Query */ +const { + publicDashboardItems, + privateDashboardItems, +} = useDashboardQuery(); + +const queryState = reactive({ + publicDashboardItems: computed(() => { + const _v2DashboardItems = publicDashboardItems.value.filter((d) => d.version !== '1.0'); + if (storeState.isAdminMode) return _v2DashboardItems; + return _v2DashboardItems.filter((d) => !(d.resource_group === 'DOMAIN' && !!d.shared && d.scope === 'PROJECT')); + }), + privateDashboardItems: computed(() => privateDashboardItems.value.filter((d) => d.version !== '1.0')), + allDashboardItems: computed(() => [...queryState.publicDashboardItems, ...queryState.privateDashboardItems]), +}); + +const storeState = reactive({ + isAdminMode: computed(() => appContextStore.getters.isAdminMode), +}); + const state = reactive({ templates: [] as DashboardTemplateModel[], blankTemplate: computed(() => ([{ @@ -61,7 +83,7 @@ const state = reactive({ }), allExistingLabels: computed(() => { const _ootbTemplates = getFilteredTemplates(dashboardCreatePageState.dashboardTemplates, '', [], []); - const _existingTemplates = getFilteredTemplates(dashboardPageControlGetters.allDashboardItems, '', [], []); + const _existingTemplates = getFilteredTemplates(queryState.allDashboardItems, '', [], []); const _ootbLabels = flatMapDeep(_ootbTemplates.map((d) => d.labels ?? [])); const _existingLabels = flatMapDeep(_existingTemplates.map((d) => d.labels ?? [])); diff --git a/apps/web/src/services/dashboards/components/dashboard-create/DashboardCreateStep2BundleCase.vue b/apps/web/src/services/dashboards/components/dashboard-create/DashboardCreateStep2BundleCase.vue index b75c816b9c..5823d2814b 100644 --- a/apps/web/src/services/dashboards/components/dashboard-create/DashboardCreateStep2BundleCase.vue +++ b/apps/web/src/services/dashboards/components/dashboard-create/DashboardCreateStep2BundleCase.vue @@ -27,6 +27,7 @@ import { useProperRouteLocation } from '@/common/composables/proper-route-locati import { gray } from '@/styles/colors'; +import { useDashboardQuery } from '@/services/dashboards/composables/use-dashboard-query'; import { DASHBOARD_VARS_SCHEMA_PRESET, } from '@/services/dashboards/constants/dashboard-vars-schema-preset'; @@ -48,14 +49,26 @@ const dashboardCreatePageStore = useDashboardCreatePageStore(); const dashboardCreatePageState = dashboardCreatePageStore.state; const dashboardPageControlStore = useDashboardPageControlStore(); const dashboardPageControlState = dashboardPageControlStore.state; -const dashboardPageControlGetters = dashboardPageControlStore.getters; const userStore = useUserStore(); + +/* Query */ +const { + publicDashboardItems, + privateDashboardItems, +} = useDashboardQuery(); + const storeState = reactive({ isAdminMode: computed(() => appContextStore.getters.isAdminMode), isWorkspaceMember: computed(() => userStore.state.currentRoleInfo?.roleType === ROLE_TYPE.WORKSPACE_MEMBER), }); const state = reactive({ loading: false, + publicDashboardItems: computed(() => { + const _v2DashboardItems = publicDashboardItems.value.filter((d) => d.version !== '1.0'); + if (storeState.isAdminMode) return _v2DashboardItems; + return _v2DashboardItems.filter((d) => !(d.resource_group === 'DOMAIN' && !!d.shared && d.scope === 'PROJECT')); + }), + privateDashboardItems: computed(() => privateDashboardItems.value.filter((d) => d.version !== '1.0')), bundleCaseType: computed(() => { if (!isEmpty(dashboardCreatePageState.selectedOotbIdMap)) return 'TEMPLATE'; return 'EXISTING'; @@ -75,8 +88,8 @@ const state = reactive({ type: 'DASHBOARD', })); }), - existingPublicDashboardNameList: computed(() => dashboardPageControlGetters.publicDashboardItems.map((d) => d.name)), - existingPrivateDashboardNameList: computed(() => dashboardPageControlGetters.privateDashboardItems.map((d) => d.name)), + existingPublicDashboardNameList: computed(() => state.publicDashboardItems.map((d) => d.name)), + existingPrivateDashboardNameList: computed(() => state.privateDashboardItems.map((d) => d.name)), }); /* Util */ diff --git a/apps/web/src/services/dashboards/components/dashboard-create/DashboardCreateStep2SingleCase.vue b/apps/web/src/services/dashboards/components/dashboard-create/DashboardCreateStep2SingleCase.vue index 54913918da..7d3778f8ed 100644 --- a/apps/web/src/services/dashboards/components/dashboard-create/DashboardCreateStep2SingleCase.vue +++ b/apps/web/src/services/dashboards/components/dashboard-create/DashboardCreateStep2SingleCase.vue @@ -26,12 +26,12 @@ import { useProperRouteLocation } from '@/common/composables/proper-route-locati import { useProxyValue } from '@/common/composables/proxy-state'; import DashboardCreateScopeForm from '@/services/dashboards/components/dashboard-create/DashboardCreateScopeForm.vue'; +import { useDashboardQuery } from '@/services/dashboards/composables/use-dashboard-query'; import { DASHBOARD_VARS_SCHEMA_PRESET, } from '@/services/dashboards/constants/dashboard-vars-schema-preset'; import { DASHBOARDS_ROUTE } from '@/services/dashboards/routes/route-constant'; import { useDashboardCreatePageStore } from '@/services/dashboards/stores/dashboard-create-page-store'; -import { useDashboardPageControlStore } from '@/services/dashboards/stores/dashboard-page-control-store'; @@ -48,14 +48,24 @@ const dashboardStore = useDashboardStore(); const dashboardCreatePageStore = useDashboardCreatePageStore(); const dashboardCreatePageState = dashboardCreatePageStore.state; const dashboardCreatePageGetters = dashboardCreatePageStore.getters; -const dashboardPageControlStore = useDashboardPageControlStore(); -const dashboardPageControlGetters = dashboardPageControlStore.getters; const userStore = useUserStore(); + +/* Query */ +const { + publicFolderItems, + privateFolderItems, +} = useDashboardQuery(); + const storeState = reactive({ isAdminMode: computed(() => appContextStore.getters.isAdminMode), }); const state = reactive({ proxyIsValid: useProxyValue('isValid', props, emit), + publicFolderItems: computed(() => { + if (storeState.isAdminMode) return publicFolderItems.value; + return publicFolderItems.value.filter((d) => !(d.resource_group === 'DOMAIN' && !!d.shared && d.scope === 'PROJECT')); + }), + privateFolderItems: computed(() => privateFolderItems.value), dashboardNameList: computed(() => dashboardStore.getDashboardNameList(dashboardCreatePageGetters.dashboardType)), labels: [] as InputItem[], folderMenuItems: computed(() => { @@ -66,7 +76,7 @@ const state = reactive({ if (dashboardCreatePageState.dashboardScope === 'PRIVATE') { return [ defaultItem, - ...dashboardPageControlGetters.privateFolderItems.map((folder) => ({ + ...state.privateFolderItems.map((folder) => ({ label: folder.name, name: folder.folder_id, })), @@ -74,7 +84,7 @@ const state = reactive({ } return [ defaultItem, - ...dashboardPageControlGetters.publicFolderItems.map((folder) => ({ + ...state.publicFolderItems.map((folder) => ({ label: folder.name, name: folder.folder_id, })), diff --git a/apps/web/src/services/dashboards/components/dashboard-detail/DashboardDetailHeader.vue b/apps/web/src/services/dashboards/components/dashboard-detail/DashboardDetailHeader.vue index 46d3ffa096..3ca662c108 100644 --- a/apps/web/src/services/dashboards/components/dashboard-detail/DashboardDetailHeader.vue +++ b/apps/web/src/services/dashboards/components/dashboard-detail/DashboardDetailHeader.vue @@ -19,6 +19,7 @@ import { gray } from '@/styles/colors'; import DashboardControlButtons from '@/services/dashboards/components/dashboard-detail/DashboardControlButtons.vue'; import DashboardLabelsButton from '@/services/dashboards/components/dashboard-detail/DashboardLabelsButton.vue'; import { useDashboardControlMenuItems } from '@/services/dashboards/composables/use-dashboard-control-menu-items'; +import { useDashboardQuery } from '@/services/dashboards/composables/use-dashboard-query'; import { useDashboardDetailInfoStore } from '@/services/dashboards/stores/dashboard-detail-info-store'; import { useDashboardPageControlStore } from '@/services/dashboards/stores/dashboard-page-control-store'; @@ -33,9 +34,33 @@ const dashboardDetailStore = useDashboardDetailInfoStore(); const dashboardDetailState = dashboardDetailStore.state; const dashboardDetailGetters = dashboardDetailStore.getters; const dashboardPageControlStore = useDashboardPageControlStore(); -const dashboardPageControlGetters = dashboardPageControlStore.getters; const appContextStore = useAppContextStore(); const userStore = useUserStore(); + +/* Query */ +const { + publicDashboardItems, + privateDashboardItems, + publicFolderItems, + privateFolderItems, +} = useDashboardQuery(); + +const queryState = reactive({ + publicDashboardItems: computed(() => { + const _v2DashboardItems = publicDashboardItems.value.filter((d) => d.version !== '1.0'); + if (storeState.isAdminMode) return _v2DashboardItems; + return _v2DashboardItems.filter((d) => !(d.resource_group === 'DOMAIN' && !!d.shared && d.scope === 'PROJECT')); + }), + privateDashboardItems: computed(() => privateDashboardItems.value.filter((d) => d.version !== '1.0')), + allDashboardItems: computed(() => [...queryState.publicDashboardItems, ...queryState.privateDashboardItems]), + publicFolderItems: computed(() => { + if (storeState.isAdminMode) return publicFolderItems.value; + return publicFolderItems.value.filter((d) => !(d.resource_group === 'DOMAIN' && !!d.shared && d.scope === 'PROJECT')); + }), + privateFolderItems: computed(() => privateFolderItems.value), + allFolderItems: computed(() => [...queryState.publicFolderItems, ...queryState.privateFolderItems]), +}); + const storeState = reactive({ isAdminMode: computed(() => appContextStore.getters.isAdminMode), isWorkspaceOwner: computed(() => userStore.state.currentRoleInfo?.roleType === ROLE_TYPE.WORKSPACE_OWNER), @@ -43,7 +68,6 @@ const storeState = reactive({ const { getControlMenuItems } = useDashboardControlMenuItems({ isAdminMode: computed(() => storeState.isAdminMode), isWorkspaceOwner: computed(() => storeState.isWorkspaceOwner), - dashboardList: computed(() => dashboardPageControlGetters.allDashboardItems), }); const state = reactive({ isSharedDashboard: computed(() => !!dashboardDetailGetters.dashboardInfo?.shared), @@ -74,8 +98,8 @@ const state = reactive({ return ''; }), folderName: computed(() => { - const _folderId = dashboardPageControlGetters.allDashboardItems.find((d) => d.dashboard_id === props.dashboardId)?.folder_id; - const folder = dashboardPageControlGetters.allFolderItems.find((d) => d.folder_id === _folderId); + const _folderId = queryState.allDashboardItems.find((d) => d.dashboard_id === props.dashboardId)?.folder_id; + const folder = queryState.allFolderItems.find((d) => d.folder_id === _folderId); return folder?.name; }), }); diff --git a/apps/web/src/services/dashboards/components/dashboard-detail/DashboardFolderSingleMoveModal.vue b/apps/web/src/services/dashboards/components/dashboard-detail/DashboardFolderSingleMoveModal.vue index b22eb18321..980639f242 100644 --- a/apps/web/src/services/dashboards/components/dashboard-detail/DashboardFolderSingleMoveModal.vue +++ b/apps/web/src/services/dashboards/components/dashboard-detail/DashboardFolderSingleMoveModal.vue @@ -12,12 +12,14 @@ import type { SelectDropdownMenuItem } from '@cloudforet/mirinae/types/controls/ import type { DashboardChangeFolderParams } from '@/api-clients/dashboard/_types/dashboard-type'; import { i18n } from '@/translations'; +import { useAppContextStore } from '@/store/app-context/app-context-store'; import { useDashboardStore } from '@/store/dashboard/dashboard-store'; import { showErrorMessage, showSuccessMessage } from '@/lib/helper/notice-alert-helper'; import { useProxyValue } from '@/common/composables/proxy-state'; +import { useDashboardQuery } from '@/services/dashboards/composables/use-dashboard-query'; import { useDashboardPageControlStore } from '@/services/dashboards/stores/dashboard-page-control-store'; @@ -32,12 +34,26 @@ const props = withDefaults(defineProps(), { }); const emit = defineEmits<{(e: 'update:visible', visible: boolean): void; }>(); - +const appContextStore = useAppContextStore(); const dashboardStore = useDashboardStore(); const dashboardPageControlStore = useDashboardPageControlStore(); -const dashboardPageControlGetters = dashboardPageControlStore.getters; + +/* Query */ +const { + publicFolderItems, + privateFolderItems, +} = useDashboardQuery(); + +const storeState = reactive({ + isAdminMode: computed(() => appContextStore.getters.isAdminMode), +}); const state = reactive({ proxyVisible: useProxyValue('visible', props, emit), + publicFolderItems: computed(() => { + if (storeState.isAdminMode) return publicFolderItems.value; + return publicFolderItems.value.filter((d) => !(d.resource_group === 'DOMAIN' && !!d.shared && d.scope === 'PROJECT')); + }), + privateFolderItems: computed(() => privateFolderItems.value), menuItems: computed(() => { const defaultItem = { label: i18n.t('DASHBOARDS.ALL_DASHBOARDS.NO_PARENT_FOLDER'), @@ -46,7 +62,7 @@ const state = reactive({ if (props.dashboardId.startsWith('public')) { return [ defaultItem, - ...dashboardPageControlGetters.publicFolderItems.map((folder) => ({ + ...state.publicFolderItems.map((folder) => ({ label: folder.name, name: folder.folder_id, })), @@ -54,7 +70,7 @@ const state = reactive({ } return [ defaultItem, - ...dashboardPageControlGetters.privateFolderItems.map((folder) => ({ + ...state.privateFolderItems.map((folder) => ({ label: folder.name, name: folder.folder_id, })), @@ -94,7 +110,7 @@ watch(() => state.proxyVisible, (visible) => { state.selectedFolderId = ''; dashboardPageControlStore.reset(); } else { - const _folderId = dashboardPageControlGetters.allDashboardItems.find((d) => d.dashboard_id === props.dashboardId)?.folder_id; + const _folderId = [...state.publicFolderItems, ...state.privateFolderItems].find((d) => d.dashboard_id === props.dashboardId)?.folder_id; if (_folderId) state.selectedFolderId = _folderId; } }, { immediate: true }); diff --git a/apps/web/src/services/dashboards/components/dashboard-detail/DashboardManageVariableImportModal.vue b/apps/web/src/services/dashboards/components/dashboard-detail/DashboardManageVariableImportModal.vue index 7210e10ff6..4591878ae3 100644 --- a/apps/web/src/services/dashboards/components/dashboard-detail/DashboardManageVariableImportModal.vue +++ b/apps/web/src/services/dashboards/components/dashboard-detail/DashboardManageVariableImportModal.vue @@ -12,6 +12,7 @@ import type { PrivateDashboardModel } from '@/api-clients/dashboard/private-dash import type { PublicDashboardModel } from '@/api-clients/dashboard/public-dashboard/schema/model'; import { i18n } from '@/translations'; +import { useAppContextStore } from '@/store/app-context/app-context-store'; import { useDashboardStore } from '@/store/dashboard/dashboard-store'; import { useUserStore } from '@/store/user/user-store'; @@ -23,18 +24,17 @@ import LSBCollapsibleMenuItem from '@/common/modules/navigations/lsb/modules/LSB import DashboardManageVariableImportModalTree from '@/services/dashboards/components/dashboard-detail/DashboardManageVariableImportModalTree.vue'; +import { useDashboardQuery } from '@/services/dashboards/composables/use-dashboard-query'; import { getOrderedGlobalVariables } from '@/services/dashboards/helpers/dashboard-global-variables-helper'; import { useDashboardDetailInfoStore } from '@/services/dashboards/stores/dashboard-detail-info-store'; -import { useDashboardPageControlStore } from '@/services/dashboards/stores/dashboard-page-control-store'; interface Props { visible: boolean; } +const appContextStore = useAppContextStore(); const dashboardStore = useDashboardStore(); -const dashboardPageControlStore = useDashboardPageControlStore(); -const dashboardPageControlGetters = dashboardPageControlStore.getters; const dashboardDetailStore = useDashboardDetailInfoStore(); const dashboardDetailState = dashboardDetailStore.state; const dashboardDetailGetters = dashboardDetailStore.getters; @@ -42,14 +42,35 @@ const userStore = useUserStore(); const props = defineProps(); const emit = defineEmits<{(e: 'update:visible', value: boolean): void;}>(); +/* Query */ +const { + publicDashboardItems, + privateDashboardItems, + publicFolderItems, + privateFolderItems, +} = useDashboardQuery(); + +const storeState = reactive({ + isAdminMode: computed(() => appContextStore.getters.isAdminMode), +}); + const state = reactive({ proxyVisible: useProxyValue('visible', props, emit), currentDashboardId: computed(() => dashboardDetailState.dashboardId || ''), currentDashboardVariables: computed(() => Object.values(dashboardDetailGetters.dashboardVarsSchemaProperties)), keyword: '', selectedDashboardId: '' as string|undefined, - publicDashboardItems: computed(() => dashboardPageControlGetters.publicDashboardItems.filter((item) => item.dashboard_id !== state.currentDashboardId)), - privateDashboardItems: computed(() => dashboardPageControlGetters.privateDashboardItems.filter((item) => item.dashboard_id !== state.currentDashboardId)), + publicDashboardItems: computed(() => { + const _v2DashboardItems = publicDashboardItems.value.filter((d) => d.version !== '1.0' && d.dashboard_id !== state.currentDashboardId); + if (storeState.isAdminMode) return _v2DashboardItems; + return _v2DashboardItems.filter((d) => !(d.resource_group === 'DOMAIN' && !!d.shared && d.scope === 'PROJECT')); + }), + privateDashboardItems: computed(() => privateDashboardItems.value.filter((d) => d.version !== '1.0' && d.dashboard_id !== state.currentDashboardId)), + publicFolderItems: computed(() => { + if (storeState.isAdminMode) return publicFolderItems.value; + return publicFolderItems.value.filter((d) => !(d.resource_group === 'DOMAIN' && !!d.shared && d.scope === 'PROJECT')); + }), + privateFolderItems: computed(() => privateFolderItems.value), allDashboardItems: computed(() => [...state.publicDashboardItems, ...state.privateDashboardItems]), selectedDashboardVariables: computed(() => { const selectedDashboard = state.allDashboardItems.find((item) => item.dashboard_id === state.selectedDashboardId); @@ -135,7 +156,7 @@ watch(() => state.selectedDashboardId, () => { - diff --git a/apps/web/src/services/dashboards/components/dashboard-detail/DashboardManageVariableImportModalTree.vue b/apps/web/src/services/dashboards/components/dashboard-detail/DashboardManageVariableImportModalTree.vue index 04939a63c0..2f187099ae 100644 --- a/apps/web/src/services/dashboards/components/dashboard-detail/DashboardManageVariableImportModalTree.vue +++ b/apps/web/src/services/dashboards/components/dashboard-detail/DashboardManageVariableImportModalTree.vue @@ -8,19 +8,20 @@ import type { TreeNode } from '@cloudforet/mirinae/src/data-display/tree/tree-vi import type { TreeDisplayMap } from '@cloudforet/mirinae/types/data-display/tree/tree-view/type'; import type { DashboardModel } from '@/api-clients/dashboard/_types/dashboard-type'; +import type { FolderModel } from '@/api-clients/dashboard/_types/folder-type'; import { useProxyValue } from '@/common/composables/proxy-state'; import { gray } from '@/styles/colors'; import { getDashboardTreeData } from '@/services/dashboards/helpers/dashboard-tree-data-helper'; -import { useDashboardPageControlStore } from '@/services/dashboards/stores/dashboard-page-control-store'; import type { DashboardTreeDataType } from '@/services/dashboards/types/dashboard-folder-type'; interface Props { dashboards: DashboardModel[]; + folders: FolderModel[]; type: 'PRIVATE' | 'PUBLIC'; selected: string|undefined; } @@ -31,19 +32,12 @@ const props = withDefaults(defineProps(), { }); const emit = defineEmits<{e: 'update:selected', value: string|undefined}>(); -const dashboardPageControlStore = useDashboardPageControlStore(); -const dashboardPageControlGetters = dashboardPageControlStore.getters; const state = reactive({ currentParentPathIds: [] as string[], currentFolderId: undefined as string|undefined, treeDisplayMap: {} as TreeDisplayMap, - dashboardTreeData: computed[]>(() => { - if (props.type === 'PRIVATE') { - return getDashboardTreeData(dashboardPageControlGetters.privateFolderItems, props.dashboards); - } - return getDashboardTreeData(dashboardPageControlGetters.publicFolderItems, props.dashboards); - }), + dashboardTreeData: computed[]>(() => getDashboardTreeData(props.folders, props.dashboards)), proxySelected: useProxyValue('selected', props, emit), }); diff --git a/apps/web/src/services/dashboards/components/dashboard-detail/DashboardNameEditModal.vue b/apps/web/src/services/dashboards/components/dashboard-detail/DashboardNameEditModal.vue index 58c87cf6dd..9f3b20cf78 100644 --- a/apps/web/src/services/dashboards/components/dashboard-detail/DashboardNameEditModal.vue +++ b/apps/web/src/services/dashboards/components/dashboard-detail/DashboardNameEditModal.vue @@ -8,13 +8,14 @@ import { PButtonModal, PFieldGroup, PTextInput } from '@cloudforet/mirinae'; import type { DashboardModel } from '@/api-clients/dashboard/_types/dashboard-type'; import { i18n } from '@/translations'; +import { useAppContextStore } from '@/store/app-context/app-context-store'; import { useDashboardStore } from '@/store/dashboard/dashboard-store'; import ErrorHandler from '@/common/composables/error/errorHandler'; import { useFormValidator } from '@/common/composables/form-validator'; import { useProxyValue } from '@/common/composables/proxy-state'; -import { useDashboardPageControlStore } from '@/services/dashboards/stores/dashboard-page-control-store'; +import { useDashboardQuery } from '@/services/dashboards/composables/use-dashboard-query'; interface Props { @@ -29,9 +30,14 @@ const emit = defineEmits<{(e: 'update:visible', value: boolean): void; (e: 'confirm', value: string): void; }>(); +/* Query */ +const { + publicDashboardItems, + privateDashboardItems, +} = useDashboardQuery(); + +const appContextStore = useAppContextStore(); const dashboardStore = useDashboardStore(); -const dashboardPageControlStore = useDashboardPageControlStore(); -const dashboardPageControlGetters = dashboardPageControlStore.getters; const { forms: { _name, @@ -52,16 +58,25 @@ const { return ''; }, }); +const storeState = reactive({ + isAdminMode: computed(() => appContextStore.getters.isAdminMode), +}); const state = reactive({ loading: false, proxyVisible: useProxyValue('visible', props, emit), + publicDashboardItems: computed(() => { + const _v2DashboardItems = publicDashboardItems.value.filter((d) => d.version !== '1.0'); + if (storeState.isAdminMode) return _v2DashboardItems; + return _v2DashboardItems.filter((d) => !(d.resource_group === 'DOMAIN' && !!d.shared && d.scope === 'PROJECT')); + }), + privateDashboardItems: computed(() => privateDashboardItems.value.filter((d) => d.version !== '1.0')), originName: computed(() => { - const _dashboard = dashboardPageControlGetters.allDashboardItems.find((item: DashboardModel) => item.dashboard_id === props.dashboardId); + const _dashboard = [...state.publicDashboardItems, ...state.privateDashboardItems].find((item: DashboardModel) => item.dashboard_id === props.dashboardId); return _dashboard?.name || ''; }), dashboardNameList: computed(() => { - if (props.dashboardId.startsWith('private')) return dashboardPageControlGetters.privateDashboardItems.map((d) => d.name); - return dashboardPageControlGetters.publicDashboardItems.map((d) => d.name); + if (props.dashboardId.startsWith('private')) return state.privateDashboardItems.map((d) => d.name); + return state.publicDashboardItems.map((d) => d.name); }), }); diff --git a/apps/web/src/services/dashboards/components/dashboard-detail/DashboardShareWithCodeModal.vue b/apps/web/src/services/dashboards/components/dashboard-detail/DashboardShareWithCodeModal.vue index 27e33a120a..ca4f665d7a 100644 --- a/apps/web/src/services/dashboards/components/dashboard-detail/DashboardShareWithCodeModal.vue +++ b/apps/web/src/services/dashboards/components/dashboard-detail/DashboardShareWithCodeModal.vue @@ -14,6 +14,7 @@ import type { PrivateWidgetListParameters } from '@/api-clients/dashboard/privat import type { PublicDataTableModel } from '@/api-clients/dashboard/public-data-table/schema/model'; import type { PublicWidgetListParameters } from '@/api-clients/dashboard/public-widget/schema/api-verbs/list'; +import { useAppContextStore } from '@/store/app-context/app-context-store'; import { useAllReferenceStore } from '@/store/reference/all-reference-store'; import type { CostDataSourceReferenceMap } from '@/store/reference/cost-data-source-reference-store'; @@ -22,8 +23,8 @@ import { copyAnyData } from '@/lib/helper/copy-helper'; import ErrorHandler from '@/common/composables/error/errorHandler'; import { useProxyValue } from '@/common/composables/proxy-state'; +import { useDashboardQuery } from '@/services/dashboards/composables/use-dashboard-query'; import { getSharedDashboardLayouts } from '@/services/dashboards/helpers/dashboard-share-helper'; -import { useDashboardPageControlStore } from '@/services/dashboards/stores/dashboard-page-control-store'; import type { SharedDashboardInfo } from '@/services/dashboards/types/shared-dashboard-type'; @@ -41,15 +42,32 @@ const emit = defineEmits<{(e: 'update:visible', value: boolean): void; (e: 'confirm', value: string): void; }>(); +const appContextStore = useAppContextStore(); const allReferenceStore = useAllReferenceStore(); -const dashboardPageControlStore = useDashboardPageControlStore(); -const dashboardPageControlGetters = dashboardPageControlStore.getters; + +/* Query */ +const { + publicDashboardItems, + privateDashboardItems, +} = useDashboardQuery(); + +const queryState = reactive({ + publicDashboardItems: computed(() => { + const _v2DashboardItems = publicDashboardItems.value.filter((d) => d.version !== '1.0'); + if (storeState.isAdminMode) return _v2DashboardItems; + return _v2DashboardItems.filter((d) => !(d.resource_group === 'DOMAIN' && !!d.shared && d.scope === 'PROJECT')); + }), + privateDashboardItems: computed(() => privateDashboardItems.value.filter((d) => d.version !== '1.0')), + allDashboardItems: computed(() => [...queryState.publicDashboardItems, ...queryState.privateDashboardItems]), +}); + const storeState = reactive({ + isAdminMode: computed(() => appContextStore.getters.isAdminMode), costDataSource: computed(() => allReferenceStore.getters.costDataSource), }); const state = reactive({ proxyVisible: useProxyValue('visible', props, emit), - targetDashboard: computed(() => dashboardPageControlGetters.allDashboardItems.find((item: DashboardModel) => item.dashboard_id === props.dashboardId)), + targetDashboard: computed(() => queryState.allDashboardItems.find((item: DashboardModel) => item.dashboard_id === props.dashboardId)), loading: false, isCopied: false, sharedDashboard: {} as SharedDashboardInfo, diff --git a/apps/web/src/services/dashboards/components/dashboard-folder/DashboardFolderFormModal.vue b/apps/web/src/services/dashboards/components/dashboard-folder/DashboardFolderFormModal.vue index 2a55c026ab..c4ec8a6900 100644 --- a/apps/web/src/services/dashboards/components/dashboard-folder/DashboardFolderFormModal.vue +++ b/apps/web/src/services/dashboards/components/dashboard-folder/DashboardFolderFormModal.vue @@ -28,6 +28,7 @@ import ErrorHandler from '@/common/composables/error/errorHandler'; import { useFormValidator } from '@/common/composables/form-validator'; import { useProxyValue } from '@/common/composables/proxy-state'; +import { useDashboardQuery } from '@/services/dashboards/composables/use-dashboard-query'; import { useDashboardPageControlStore } from '@/services/dashboards/stores/dashboard-page-control-store'; @@ -51,7 +52,13 @@ const userStore = useUserStore(); const dashboardStore = useDashboardStore(); const dashboardPageControlStore = useDashboardPageControlStore(); const dashboardPageControlState = dashboardPageControlStore.state; -const dashboardPageControlGetters = dashboardPageControlStore.getters; + +/* Query */ +const { + publicFolderItems, + privateFolderItems, +} = useDashboardQuery(); + const storeState = reactive({ isAdminMode: computed(() => appContextStore.getters.isAdminMode), isWorkspaceMember: computed(() => userStore.state.currentRoleInfo?.roleType === ROLE_TYPE.WORKSPACE_MEMBER), @@ -59,17 +66,22 @@ const storeState = reactive({ const state = reactive({ proxyVisible: useProxyValue('visible', props, emit), isPrivate: false, + publicFolderItems: computed(() => { + if (storeState.isAdminMode) return publicFolderItems.value; + return publicFolderItems.value.filter((d) => !(d.resource_group === 'DOMAIN' && !!d.shared && d.scope === 'PROJECT')); + }), + privateFolderItems: computed(() => privateFolderItems.value), selectedFolder: computed(() => { if (dashboardPageControlState.folderFormModalType === 'UPDATE') { if (props.folderId?.startsWith('private')) { - return dashboardPageControlGetters.privateFolderItems.find((d) => d.folder_id === props.folderId); + return state.privateFolderItems.find((d) => d.folder_id === props.folderId); } - return dashboardPageControlGetters.publicFolderItems.find((d) => d.folder_id === props.folderId); + return state.publicFolderItems.find((d) => d.folder_id === props.folderId); } return undefined; }), existingNameList: computed(() => { - const _targetFolderItems = state.isPrivate ? dashboardPageControlGetters.privateFolderItems : dashboardPageControlGetters.publicFolderItems; + const _targetFolderItems = state.isPrivate ? state.privateFolderItems : state.publicFolderItems; if (dashboardPageControlState.folderFormModalType === 'UPDATE') { return _targetFolderItems.filter((d) => d.folder_id !== state.selectedFolder?.folder_id).map((d) => d.name); } diff --git a/apps/web/src/services/dashboards/components/dashboard-folder/DashboardFolderTreeItem.vue b/apps/web/src/services/dashboards/components/dashboard-folder/DashboardFolderTreeItem.vue index 9a60b5be3a..d7048c7e60 100644 --- a/apps/web/src/services/dashboards/components/dashboard-folder/DashboardFolderTreeItem.vue +++ b/apps/web/src/services/dashboards/components/dashboard-folder/DashboardFolderTreeItem.vue @@ -45,15 +45,13 @@ const { getProperRouteLocation } = useProperRouteLocation(); const appContextStore = useAppContextStore(); const dashboardPageControlStore = useDashboardPageControlStore(); const dashboardPageControlState = dashboardPageControlStore.state; -const dashboardPageControlGetters = dashboardPageControlStore.getters; const userStore = useUserStore(); const { getControlMenuItems } = useDashboardControlMenuItems({ isAdminMode: computed(() => storeState.isAdminMode), isWorkspaceOwner: computed(() => storeState.isWorkspaceOwner), - dashboardList: computed(() => dashboardPageControlGetters.allDashboardItems), - folderList: computed(() => dashboardPageControlGetters.allFolderItems), }); + const storeState = reactive({ isAdminMode: computed(() => appContextStore.getters.isAdminMode), isWorkspaceOwner: computed(() => userStore.state.currentRoleInfo?.roleType === ROLE_TYPE.WORKSPACE_OWNER), diff --git a/apps/web/src/services/dashboards/components/dashboard-main/DashboardBundleCloneModal.vue b/apps/web/src/services/dashboards/components/dashboard-main/DashboardBundleCloneModal.vue index f830abcf50..aa79c65769 100644 --- a/apps/web/src/services/dashboards/components/dashboard-main/DashboardBundleCloneModal.vue +++ b/apps/web/src/services/dashboards/components/dashboard-main/DashboardBundleCloneModal.vue @@ -26,6 +26,7 @@ import { useProxyValue } from '@/common/composables/proxy-state'; import { gray } from '@/styles/colors'; +import { useDashboardQuery } from '@/services/dashboards/composables/use-dashboard-query'; import { getSelectedDataTableItems } from '@/services/dashboards/helpers/dashboard-tree-data-helper'; import { useDashboardPageControlStore } from '@/services/dashboards/stores/dashboard-page-control-store'; import type { DashboardDataTableItem } from '@/services/dashboards/types/dashboard-folder-type'; @@ -67,12 +68,37 @@ const appContextStore = useAppContextStore(); const dashboardStore = useDashboardStore(); const dashboardPageControlStore = useDashboardPageControlStore(); const dashboardPageControlState = dashboardPageControlStore.state; -const dashboardPageControlGetters = dashboardPageControlStore.getters; const userStore = useUserStore(); + +/* Query */ +const { + publicDashboardItems, + privateDashboardItems, + publicFolderItems, + privateFolderItems, +} = useDashboardQuery(); + const storeState = reactive({ isAdminMode: computed(() => appContextStore.getters.isAdminMode), isWorkspaceMember: computed(() => userStore.state.currentRoleInfo?.roleType === ROLE_TYPE.WORKSPACE_MEMBER), }); + +const queryState = reactive({ + publicDashboardItems: computed(() => { + const _v2DashboardItems = publicDashboardItems.value.filter((d) => d.version !== '1.0'); + if (storeState.isAdminMode) return _v2DashboardItems; + return _v2DashboardItems.filter((d) => !(d.resource_group === 'DOMAIN' && !!d.shared && d.scope === 'PROJECT')); + }), + privateDashboardItems: computed(() => privateDashboardItems.value.filter((d) => d.version !== '1.0')), + allDashboardItems: computed(() => [...queryState.publicDashboardItems, ...queryState.privateDashboardItems]), + publicFolderItems: computed(() => { + if (storeState.isAdminMode) return publicFolderItems.value; + return publicFolderItems.value.filter((d) => !(d.resource_group === 'DOMAIN' && !!d.shared && d.scope === 'PROJECT')); + }), + privateFolderItems: computed(() => privateFolderItems.value), + allFolderItems: computed(() => [...queryState.publicFolderItems, ...queryState.privateFolderItems]), +}); + const state = reactive({ loading: false, proxyVisible: useProxyValue('visible', props, emit), @@ -97,7 +123,7 @@ const state = reactive({ if (!state.changeFolderStructure) { let _selectedIdMap = dashboardPageControlState.selectedPublicIdMap; if (props.folderId) { - const _childrenIdList = dashboardPageControlGetters.allDashboardItems.filter((d) => d.folder_id === props.folderId); + const _childrenIdList = queryState.allDashboardItems.filter((d) => d.folder_id === props.folderId); _selectedIdMap = { [props.folderId]: true, ..._childrenIdList.reduce((acc, d) => ({ ...acc, [d.dashboard_id]: true }), {}), @@ -105,7 +131,7 @@ const state = reactive({ } else if (dashboardPageControlState.folderModalType === 'PRIVATE') { _selectedIdMap = dashboardPageControlState.selectedPrivateIdMap; } - return getSelectedDataTableItems(dashboardPageControlGetters.allFolderItems, dashboardPageControlGetters.allDashboardItems, _selectedIdMap); + return getSelectedDataTableItems(queryState.allFolderItems, queryState.allDashboardItems, _selectedIdMap); } // 2. Change Folder Structure @@ -114,9 +140,9 @@ const state = reactive({ _targetDashboardList = _targetDashboardList.filter((d) => d.folder_id === props.folderId); } else { const _selectedIdMap = dashboardPageControlState.folderModalType === 'PRIVATE' ? dashboardPageControlState.selectedPrivateIdMap : dashboardPageControlState.selectedPublicIdMap; - _targetDashboardList = dashboardPageControlGetters.allDashboardItems.filter((d) => _selectedIdMap[d.dashboard_id]); + _targetDashboardList = queryState.allDashboardItems.filter((d) => _selectedIdMap[d.dashboard_id]); } - return getChangedFolderModalTableItems(dashboardPageControlGetters.allFolderItems, _targetDashboardList); + return getChangedFolderModalTableItems(queryState.allFolderItems, _targetDashboardList); }), disableModalConfirm: computed(() => { if (!state.changeFolderStructure) return false; // 1. Use Existing Folder Structure @@ -136,13 +162,13 @@ const state = reactive({ if (!state.changeFolderStructure) return undefined; if (state.selectedFolderStructure === 'new_folder') return folderName.value; if (state.selectedFolderStructure === 'select_folder') { - return dashboardPageControlGetters.allFolderItems.find((f) => f.folder_id === state.selectedFolderId); + return queryState.allFolderItems.find((f) => f.folder_id === state.selectedFolderId); } return undefined; }), // 2.1. Create New Folder existingNameList: computed(() => { // NOTE: only for 'create new folder' case - const _targetFolderItems = state.isNewFolderPrivate ? dashboardPageControlGetters.privateFolderItems : dashboardPageControlGetters.publicFolderItems; + const _targetFolderItems = state.isNewFolderPrivate ? queryState.privateFolderItems : queryState.publicFolderItems; if (dashboardPageControlState.folderFormModalType === 'UPDATE') { return _targetFolderItems.filter((d) => d.folder_id !== state.selectedFolder?.folder_id).map((d) => d.name); } @@ -151,7 +177,7 @@ const state = reactive({ isNewFolderPrivate: false, // 2.2. Select Existing Folder existingFolderMenuItems: computed(() => { - const _allFolderItems: FolderModel[] = [...dashboardPageControlGetters.publicFolderItems, ...dashboardPageControlGetters.privateFolderItems]; + const _allFolderItems: FolderModel[] = [...queryState.publicFolderItems, ...queryState.privateFolderItems]; return _allFolderItems.map((folder) => ({ label: folder.name, name: folder.folder_id, diff --git a/apps/web/src/services/dashboards/components/dashboard-main/DashboardBundleDeleteModal.vue b/apps/web/src/services/dashboards/components/dashboard-main/DashboardBundleDeleteModal.vue index 8502dc368a..564be03c91 100644 --- a/apps/web/src/services/dashboards/components/dashboard-main/DashboardBundleDeleteModal.vue +++ b/apps/web/src/services/dashboards/components/dashboard-main/DashboardBundleDeleteModal.vue @@ -8,6 +8,7 @@ import type { PrivateFolderDeleteParameters } from '@/api-clients/dashboard/priv import type { PublicFolderDeleteParameters } from '@/api-clients/dashboard/public-folder/schema/api-verbs/delete'; import { i18n } from '@/translations'; +import { useAppContextStore } from '@/store/app-context/app-context-store'; import { useDashboardStore } from '@/store/dashboard/dashboard-store'; import { showSuccessMessage } from '@/lib/helper/notice-alert-helper'; @@ -18,6 +19,7 @@ import { useProxyValue } from '@/common/composables/proxy-state'; import { gray } from '@/styles/colors'; +import { useDashboardQuery } from '@/services/dashboards/composables/use-dashboard-query'; import { getSelectedDataTableItems } from '@/services/dashboards/helpers/dashboard-tree-data-helper'; import { useDashboardPageControlStore } from '@/services/dashboards/stores/dashboard-page-control-store'; import type { DashboardDataTableItem } from '@/services/dashboards/types/dashboard-folder-type'; @@ -43,10 +45,39 @@ const props = withDefaults(defineProps(), { }); const emit = defineEmits<{(e: 'update:visible', visible: boolean): void, }>(); +const appContextStore = useAppContextStore(); const dashboardStore = useDashboardStore(); const dashboardPageControlStore = useDashboardPageControlStore(); const dashboardPageControlState = dashboardPageControlStore.state; -const dashboardPageControlGetters = dashboardPageControlStore.getters; + +/* Query */ +const { + publicDashboardItems, + privateDashboardItems, + publicFolderItems, + privateFolderItems, +} = useDashboardQuery(); + +const queryState = reactive({ + publicDashboardItems: computed(() => { + const _v2DashboardItems = publicDashboardItems.value.filter((d) => d.version !== '1.0'); + if (storeState.isAdminMode) return _v2DashboardItems; + return _v2DashboardItems.filter((d) => !(d.resource_group === 'DOMAIN' && !!d.shared && d.scope === 'PROJECT')); + }), + privateDashboardItems: computed(() => privateDashboardItems.value.filter((d) => d.version !== '1.0')), + allDashboardItems: computed(() => [...queryState.publicDashboardItems, ...queryState.privateDashboardItems]), + publicFolderItems: computed(() => { + if (storeState.isAdminMode) return publicFolderItems.value; + return publicFolderItems.value.filter((d) => !(d.resource_group === 'DOMAIN' && !!d.shared && d.scope === 'PROJECT')); + }), + privateFolderItems: computed(() => privateFolderItems.value), + allFolderItems: computed(() => [...queryState.publicFolderItems, ...queryState.privateFolderItems]), +}); + +const storeState = reactive({ + isAdminMode: computed(() => appContextStore.getters.isAdminMode), +}); + const state = reactive({ loading: false, proxyVisible: useProxyValue('visible', props, emit), @@ -54,7 +85,7 @@ const state = reactive({ let _selectedIdMap = dashboardPageControlState.selectedPublicIdMap; // single case if (props.folderId) { - const _childrenIdList = dashboardPageControlGetters.allDashboardItems.filter((d) => d.folder_id === props.folderId); + const _childrenIdList = queryState.allDashboardItems.filter((d) => d.folder_id === props.folderId); _selectedIdMap = { [props.folderId]: true, ..._childrenIdList.reduce((acc, d) => ({ ...acc, [d.dashboard_id]: true }), {}), @@ -62,7 +93,7 @@ const state = reactive({ } else if (dashboardPageControlState.folderModalType === 'PRIVATE') { // bundle case _selectedIdMap = dashboardPageControlState.selectedPrivateIdMap; } - return getSelectedDataTableItems(dashboardPageControlGetters.allFolderItems, dashboardPageControlGetters.allDashboardItems, _selectedIdMap); + return getSelectedDataTableItems(queryState.allFolderItems, queryState.allDashboardItems, _selectedIdMap); }), }); diff --git a/apps/web/src/services/dashboards/components/dashboard-main/DashboardBundleMoveModal.vue b/apps/web/src/services/dashboards/components/dashboard-main/DashboardBundleMoveModal.vue index d81b1eb68f..91ea2de163 100644 --- a/apps/web/src/services/dashboards/components/dashboard-main/DashboardBundleMoveModal.vue +++ b/apps/web/src/services/dashboards/components/dashboard-main/DashboardBundleMoveModal.vue @@ -22,6 +22,7 @@ import { showSuccessMessage } from '@/lib/helper/notice-alert-helper'; import ErrorHandler from '@/common/composables/error/errorHandler'; import { useProxyValue } from '@/common/composables/proxy-state'; +import { useDashboardQuery } from '@/services/dashboards/composables/use-dashboard-query'; import { useDashboardPageControlStore } from '@/services/dashboards/stores/dashboard-page-control-store'; @@ -38,12 +39,23 @@ const appContextStore = useAppContextStore(); const dashboardStore = useDashboardStore(); const dashboardPageControlStore = useDashboardPageControlStore(); const dashboardPageControlState = dashboardPageControlStore.state; -const dashboardPageControlGetters = dashboardPageControlStore.getters; + +/* Query */ +const { + publicFolderItems, + privateFolderItems, +} = useDashboardQuery(); + const storeState = reactive({ isAdminMode: computed(() => appContextStore.getters.isAdminMode), }); const state = reactive({ proxyVisible: useProxyValue('visible', props, emit), + publicFolderItems: computed(() => { + if (storeState.isAdminMode) return publicFolderItems.value; + return publicFolderItems.value.filter((d) => !(d.resource_group === 'DOMAIN' && !!d.shared && d.scope === 'PROJECT')); + }), + privateFolderItems: computed(() => privateFolderItems.value), selectedIdMap: computed>(() => { if (dashboardPageControlState.folderModalType === 'PUBLIC') { return dashboardPageControlState.selectedPublicIdMap; @@ -55,9 +67,9 @@ const state = reactive({ .filter(([key]) => key.includes('dash')) .map(([key]) => key)), availableFolderItems: computed(() => { - if (dashboardPageControlState.folderModalType === 'PRIVATE') return dashboardPageControlGetters.privateFolderItems; - if (storeState.isAdminMode) return dashboardPageControlGetters.publicFolderItems; - return dashboardPageControlGetters.publicFolderItems.filter((d) => !(d.shared && d.scope === 'WORKSPACE')); + if (dashboardPageControlState.folderModalType === 'PRIVATE') return state.privateFolderItems; + if (storeState.isAdminMode) return state.publicFolderItems; + return state.publicFolderItems.filter((d) => !(d.shared && d.scope === 'WORKSPACE')); }), headerTitle: computed(() => i18n.t('DASHBOARDS.ALL_DASHBOARDS.MOVE_DASHBOARDS', { count: state.targetDashboardIdList.length })), menuItems: computed(() => { diff --git a/apps/web/src/services/dashboards/components/dashboard-main/DashboardBundleShareModal.vue b/apps/web/src/services/dashboards/components/dashboard-main/DashboardBundleShareModal.vue index 80d014416e..7c3e701774 100644 --- a/apps/web/src/services/dashboards/components/dashboard-main/DashboardBundleShareModal.vue +++ b/apps/web/src/services/dashboards/components/dashboard-main/DashboardBundleShareModal.vue @@ -26,6 +26,7 @@ import { useProxyValue } from '@/common/composables/proxy-state'; import { gray } from '@/styles/colors'; +import { useDashboardQuery } from '@/services/dashboards/composables/use-dashboard-query'; import { useDashboardPageControlStore } from '@/services/dashboards/stores/dashboard-page-control-store'; import type { DashboardDataTableItem } from '@/services/dashboards/types/dashboard-folder-type'; @@ -50,7 +51,31 @@ const emit = defineEmits<{(e: 'update:visible', visible: boolean): void, const appContextStore = useAppContextStore(); const dashboardStore = useDashboardStore(); const dashboardPageControlStore = useDashboardPageControlStore(); -const dashboardPageControlGetters = dashboardPageControlStore.getters; + +/* Query */ +const { + publicDashboardItems, + privateDashboardItems, + publicFolderItems, + privateFolderItems, +} = useDashboardQuery(); + +const queryState = reactive({ + publicDashboardItems: computed(() => { + const _v2DashboardItems = publicDashboardItems.value.filter((d) => d.version !== '1.0'); + if (storeState.isAdminMode) return _v2DashboardItems; + return _v2DashboardItems.filter((d) => !(d.resource_group === 'DOMAIN' && !!d.shared && d.scope === 'PROJECT')); + }), + privateDashboardItems: computed(() => privateDashboardItems.value.filter((d) => d.version !== '1.0')), + allDashboardItems: computed(() => [...queryState.publicDashboardItems, ...queryState.privateDashboardItems]), + publicFolderItems: computed(() => { + if (storeState.isAdminMode) return publicFolderItems.value; + return publicFolderItems.value.filter((d) => !(d.resource_group === 'DOMAIN' && !!d.shared && d.scope === 'PROJECT')); + }), + privateFolderItems: computed(() => privateFolderItems.value), + allFolderItems: computed(() => [...queryState.publicFolderItems, ...queryState.privateFolderItems]), +}); + const storeState = reactive({ isAdminMode: computed(() => appContextStore.getters.isAdminMode), }); @@ -58,8 +83,8 @@ const state = reactive({ loading: false, proxyVisible: useProxyValue('visible', props, emit), targetFolderId: computed(() => props.folderId || state.targetDashboardItem?.folder_id), - targetFolderItem: computed(() => dashboardPageControlGetters.allFolderItems.find((f) => f.folder_id === state.targetFolderId)), - targetDashboardItem: computed(() => dashboardPageControlGetters.allDashboardItems.find((d) => d.dashboard_id === props.dashboardId)), + targetFolderItem: computed(() => queryState.allFolderItems.find((f) => f.folder_id === state.targetFolderId)), + targetDashboardItem: computed(() => queryState.allDashboardItems.find((d) => d.dashboard_id === props.dashboardId)), isShared: computed(() => { if (props.folderId) return !!state.targetFolderItem?.shared; return !!state.targetDashboardItem?.shared; @@ -81,7 +106,7 @@ const state = reactive({ name: _folderName, type: 'FOLDER', }]; - const _dashboardItems: DashboardDataTableItem[] = dashboardPageControlGetters.allDashboardItems + const _dashboardItems: DashboardDataTableItem[] = queryState.allDashboardItems .filter((d) => d.folder_id === state.targetFolderId) .map((d) => ({ id: d.dashboard_id, diff --git a/apps/web/src/services/dashboards/components/dashboard-main/DashboardLSBTree.vue b/apps/web/src/services/dashboards/components/dashboard-main/DashboardLSBTree.vue index 69ada238e1..f44332fccc 100644 --- a/apps/web/src/services/dashboards/components/dashboard-main/DashboardLSBTree.vue +++ b/apps/web/src/services/dashboards/components/dashboard-main/DashboardLSBTree.vue @@ -10,6 +10,8 @@ import type { MenuItem } from '@cloudforet/mirinae/types/controls/context-menu/t import type { TreeDisplayMap } from '@cloudforet/mirinae/types/data-display/tree/tree-view/type'; import type { DashboardModel } from '@/api-clients/dashboard/_types/dashboard-type'; +import type { PrivateFolderModel } from '@/api-clients/dashboard/private-folder/schema/model'; +import type { PublicFolderModel } from '@/api-clients/dashboard/public-folder/schema/model'; import { ROLE_TYPE } from '@/schema/identity/role/constant'; import { useAppContextStore } from '@/store/app-context/app-context-store'; @@ -31,6 +33,7 @@ import type { DashboardTreeDataType } from '@/services/dashboards/types/dashboar interface Props { dashboards: DashboardModel[]; + folders: (PrivateFolderModel|PublicFolderModel)[]; type: 'PRIVATE' | 'PUBLIC'; } const props = withDefaults(defineProps(), { @@ -41,7 +44,6 @@ const route = useRoute(); const router = useRouter(); const { getProperRouteLocation } = useProperRouteLocation(); const dashboardPageControlStore = useDashboardPageControlStore(); -const dashboardPageControlGetters = dashboardPageControlStore.getters; const appContextStore = useAppContextStore(); const userStore = useUserStore(); @@ -52,19 +54,12 @@ const storeState = reactive({ const { getControlMenuItems } = useDashboardControlMenuItems({ isAdminMode: computed(() => storeState.isAdminMode), isWorkspaceOwner: computed(() => storeState.isWorkspaceOwner), - dashboardList: computed(() => dashboardPageControlGetters.allDashboardItems), - folderList: computed(() => dashboardPageControlGetters.allFolderItems), }); const state = reactive({ currentParentPathIds: [] as string[], currentFolderId: undefined as string|undefined, treeDisplayMap: {} as TreeDisplayMap, - dashboardTreeData: computed[]>(() => { - if (props.type === 'PRIVATE') { - return getDashboardTreeData(dashboardPageControlGetters.privateFolderItems, props.dashboards); - } - return getDashboardTreeData(dashboardPageControlGetters.publicFolderItems, props.dashboards); - }), + dashboardTreeData: computed[]>(() => getDashboardTreeData(props.folders, props.dashboards)), selectedTreeId: undefined as string|undefined, }); @@ -80,7 +75,7 @@ const init = (dashboardId?: string, _onMounted?: boolean) => { return; } state.selectedTreeId = dashboardId as string; - const folderId = dashboardPageControlGetters.allDashboardItems.find((d) => d.dashboard_id === dashboardId)?.folder_id; + const folderId = props.dashboards.find((d) => d.dashboard_id === dashboardId)?.folder_id; if (_onMounted && folderId) { updateTreeDisplayMap(folderId); } diff --git a/apps/web/src/services/dashboards/composables/use-dashboard-control-menu-items.ts b/apps/web/src/services/dashboards/composables/use-dashboard-control-menu-items.ts index a63dc381bb..bdd7f59aa2 100644 --- a/apps/web/src/services/dashboards/composables/use-dashboard-control-menu-items.ts +++ b/apps/web/src/services/dashboards/composables/use-dashboard-control-menu-items.ts @@ -1,5 +1,5 @@ import type { ComputedRef } from 'vue'; -import { computed } from 'vue'; +import { reactive, computed } from 'vue'; import type { MenuItem } from '@cloudforet/mirinae/types/controls/context-menu/type'; @@ -7,21 +7,49 @@ import type { DashboardModel } from '@/api-clients/dashboard/_types/dashboard-ty import type { FolderModel } from '@/api-clients/dashboard/_types/folder-type'; import { i18n } from '@/translations'; +import { useAppContextStore } from '@/store/app-context/app-context-store'; + +import { useDashboardQuery } from '@/services/dashboards/composables/use-dashboard-query'; + interface UseDashboardControlMenuItems { isAdminMode: ComputedRef; isWorkspaceOwner: ComputedRef; - dashboardList?: ComputedRef; - folderList?: ComputedRef; } interface UseDashboardControlMenuItemsReturn { getControlMenuItems: (id: string) => ComputedRef|MenuItem[]; } export const useDashboardControlMenuItems = ({ - isAdminMode, isWorkspaceOwner, dashboardList, folderList, + isAdminMode, isWorkspaceOwner, }: UseDashboardControlMenuItems): UseDashboardControlMenuItemsReturn => { + const appContextStore = useAppContextStore(); + + /* Query */ + const { + publicDashboardItems, + privateDashboardItems, + publicFolderItems, + privateFolderItems, + } = useDashboardQuery(); + + const queryState = reactive({ + publicDashboardItems: computed(() => { + const _v2DashboardItems = publicDashboardItems.value.filter((d) => d.version !== '1.0'); + if (appContextStore.getters.isAdminMode) return _v2DashboardItems; + return _v2DashboardItems.filter((d) => !(d.resource_group === 'DOMAIN' && !!d.shared && d.scope === 'PROJECT')); + }), + privateDashboardItems: computed(() => privateDashboardItems.value.filter((d) => d.version !== '1.0')), + dashboardList: computed(() => [...queryState.publicDashboardItems, ...queryState.privateDashboardItems]), + publicFolderItems: computed(() => { + if (appContextStore.getters.isAdminMode) return publicFolderItems.value; + return publicFolderItems.value.filter((d) => !(d.resource_group === 'DOMAIN' && !!d.shared && d.scope === 'PROJECT')); + }), + privateFolderItems: computed(() => privateFolderItems.value), + folderList: computed(() => [...queryState.publicFolderItems, ...queryState.privateFolderItems]), + }); + const _getDashboardManageable = (dashboard: DashboardModel): boolean => { if (dashboard.dashboard_id.startsWith('private')) return true; if (isAdminMode.value) return true; @@ -40,7 +68,7 @@ export const useDashboardControlMenuItems = ({ }; const _getDashboardControlMenuItems = (dashboardId: string): ComputedRef|MenuItem[] => { const _isPrivate = dashboardId.startsWith('private'); - const _dashboard = dashboardList?.value.find((item) => item.dashboard_id === dashboardId); + const _dashboard = queryState.dashboardList.find((item) => item.dashboard_id === dashboardId); if (!_dashboard) return []; const _isDeprecated = _dashboard.version === '1.0'; @@ -94,7 +122,7 @@ export const useDashboardControlMenuItems = ({ }; const _getFolderControlMenuItems = (folderId: string): ComputedRef|MenuItem[] => { const _isPrivate = folderId.startsWith('private'); - const _folder = folderList?.value.find((item) => item.folder_id === folderId); + const _folder = queryState.folderList.find((item) => item.folder_id === folderId); if (!_folder) return []; const _isFolderManageable = _getFolderManageable(_folder); diff --git a/apps/web/src/services/dashboards/helpers/dashboard-tree-data-helper.ts b/apps/web/src/services/dashboards/helpers/dashboard-tree-data-helper.ts index a83f546b5c..cfa0b5ff8f 100644 --- a/apps/web/src/services/dashboards/helpers/dashboard-tree-data-helper.ts +++ b/apps/web/src/services/dashboards/helpers/dashboard-tree-data-helper.ts @@ -120,3 +120,27 @@ export const getSelectedDataTableItems = (folderItems: FolderModel[], dashboardI return _results; }; + +export const isPublicControlButtonDisabled = (dashboardItems: DashboardModel[], selectedIdMap: Record): boolean => { + const _selectedIdList: string[] = Object.entries(selectedIdMap).filter(([, isSelected]) => isSelected).map(([id]) => id); + if (_selectedIdList.length === 0) return true; + let result = false; + _selectedIdList.forEach((id) => { + if (result) return; + const _isFolder = id.includes('folder'); + if (_isFolder) { + const _childrenDashboards = dashboardItems.filter((d) => d.folder_id === id); + _childrenDashboards?.forEach((child) => { + if (child?.shared && child?.scope === 'WORKSPACE') { + result = true; + } + }); + } else { + const _dashboard = dashboardItems.find((d) => d.dashboard_id === id); + if (_dashboard?.shared && _dashboard?.scope === 'WORKSPACE') { + result = true; + } + } + }); + return result; +}; diff --git a/apps/web/src/services/dashboards/pages/DashboardsMainPage.vue b/apps/web/src/services/dashboards/pages/DashboardsMainPage.vue index 3e4090f2e6..35961f3dba 100644 --- a/apps/web/src/services/dashboards/pages/DashboardsMainPage.vue +++ b/apps/web/src/services/dashboards/pages/DashboardsMainPage.vue @@ -39,6 +39,11 @@ import { useQueryTags } from '@/common/composables/query-tags'; import DashboardFolderTree from '@/services/dashboards/components/dashboard-folder/DashboardFolderTree.vue'; import DashboardFolderTreeTitle from '@/services/dashboards/components/dashboard-folder/DashboardFolderTreeTitle.vue'; import DashboardMainBoardList from '@/services/dashboards/components/dashboard-main/DashboardMainBoardList.vue'; +import { useDashboardQuery } from '@/services/dashboards/composables/use-dashboard-query'; +import { + getDashboardTreeData, + isPublicControlButtonDisabled, +} from '@/services/dashboards/helpers/dashboard-tree-data-helper'; import { DASHBOARDS_ROUTE } from '@/services/dashboards/routes/route-constant'; import { useDashboardPageControlStore } from '@/services/dashboards/stores/dashboard-page-control-store'; import type { DashboardTreeDataType } from '@/services/dashboards/types/dashboard-folder-type'; @@ -46,7 +51,6 @@ import type { DashboardTreeDataType } from '@/services/dashboards/types/dashboar const appContextStore = useAppContextStore(); const dashboardPageControlStore = useDashboardPageControlStore(); const dashboardPageControlState = dashboardPageControlStore.state; -const dashboardPageControlGetters = dashboardPageControlStore.getters; const userStore = useUserStore(); const { hasReadWriteAccess } = usePageEditableStatus(); @@ -62,43 +66,94 @@ const queryTagsHelper = useQueryTags({ }], }); +/* Query */ +const { + publicDashboardItems, + privateDashboardItems, + publicFolderItems, + privateFolderItems, + loading, +} = useDashboardQuery(); + const storeState = reactive({ isWorkspaceOwner: computed(() => userStore.state.currentRoleInfo?.roleType === ROLE_TYPE.WORKSPACE_OWNER), isWorkspaceMember: computed(() => userStore.state.currentRoleInfo?.roleType === ROLE_TYPE.WORKSPACE_MEMBER), isAdminMode: computed(() => appContextStore.getters.isAdminMode), }); + + const state = reactive({ isAdminMode: computed(() => appContextStore.getters.isAdminMode), + publicDashboardItems: computed(() => { + const _v2DashboardItems = publicDashboardItems.value.filter((d) => d.version !== '1.0'); + if (storeState.isAdminMode) return _v2DashboardItems; + return _v2DashboardItems.filter((d) => !(d.resource_group === 'DOMAIN' && !!d.shared && d.scope === 'PROJECT')); + }), + privateDashboardItems: computed(() => privateDashboardItems.value.filter((d) => d.version !== '1.0')), + publicFolderItems: computed(() => { + if (storeState.isAdminMode) return publicFolderItems.value; + return publicFolderItems.value.filter((d) => !(d.resource_group === 'DOMAIN' && !!d.shared && d.scope === 'PROJECT')); + }), + privateFolderItems: computed(() => privateFolderItems.value), + deprecatedDashboardItems: computed(() => { + const _public = publicDashboardItems.value.filter((d) => d.version === '1.0'); + const _private = privateDashboardItems.value.filter((d) => d.version === '1.0'); + return [..._public, ..._private]; + }), + publicDashboardTreeData: computed[]>(() => getDashboardTreeData(publicFolderItems.value, publicDashboardItems.value, dashboardPageControlState.newIdList)), + privateDashboardTreeData: computed[]>(() => getDashboardTreeData(privateFolderItems.value, privateDashboardItems.value, dashboardPageControlState.newIdList)), + publicTreeControlButtonDisableMap: computed>(() => { + if (storeState.isAdminMode) { + const _selectedPublicIdList: string[] = Object.entries(dashboardPageControlState.selectedPublicIdMap).filter(([, isSelected]) => isSelected).map(([id]) => id); + return { + clone: _selectedPublicIdList.length === 0, + move: _selectedPublicIdList.length === 0, + delete: _selectedPublicIdList.length === 0, + }; + } + const _selectedPublicIdList: string[] = Object.entries(dashboardPageControlState.selectedPublicIdMap).filter(([, isSelected]) => isSelected).map(([id]) => id); + return { + clone: _selectedPublicIdList.length === 0, + move: isPublicControlButtonDisabled(state.publicDashboardItems, dashboardPageControlState.selectedPublicIdMap), + delete: isPublicControlButtonDisabled(state.publicDashboardItems, dashboardPageControlState.selectedPublicIdMap), + }; + }), + privateTreeControlButtonDisableMap: computed>(() => { + const _selectedPrivateIdList: string[] = Object.entries(dashboardPageControlState.selectedPrivateIdMap).filter(([, isSelected]) => isSelected).map(([id]) => id); + return { + clone: _selectedPrivateIdList.length === 0, + move: _selectedPrivateIdList.length === 0, + delete: _selectedPrivateIdList.length === 0, + }; + }), + refinedPublicTreeData: computed[]>(() => { if (state.isSearching.PUBLIC) return []; - if (!state.searchFilters.length) return dashboardPageControlGetters.publicDashboardTreeData; - return getSearchedTreeData(dashboardPageControlGetters.publicDashboardTreeData, state.searchedDashboardIdList); + if (!state.searchFilters.length) return state.publicDashboardTreeData; + return getSearchedTreeData(state.publicDashboardTreeData, state.searchedDashboardIdList); }), refinedPrivateTreeData: computed[]>(() => { if (state.isSearching.PRIVATE) return []; - if (!state.searchFilters.length) return dashboardPageControlGetters.privateDashboardTreeData; - return getSearchedTreeData(dashboardPageControlGetters.privateDashboardTreeData, state.searchedDashboardIdList); + if (!state.searchFilters.length) return state.privateDashboardTreeData; + return getSearchedTreeData(state.privateDashboardTreeData, state.searchedDashboardIdList); }), isDashboardExist: computed(() => { if (state.isAdminMode) { - return !!dashboardPageControlGetters.publicDashboardItems.length || !!dashboardPageControlGetters.publicFolderItems.length; + return !!state.publicDashboardItems.length || !!state.publicFolderItems.length; } return !!( - dashboardPageControlGetters.publicDashboardItems.length - || dashboardPageControlGetters.privateDashboardItems.length - || dashboardPageControlGetters.deprecatedDashboardItems.length - || dashboardPageControlGetters.publicFolderItems.length - || dashboardPageControlGetters.privateFolderItems.length + state.publicDashboardItems.length + || state.privateDashboardItems.length + || state.deprecatedDashboardItems.length + || state.publicFolderItems.length + || state.privateFolderItems.length ); }), treeCollapseMap: { public: false, private: false, } as Record, - publicTreeControlButtonDisableMap: computed>(() => { - if (storeState.isAdminMode) return dashboardPageControlGetters.adminTreeControlButtonDisableMap; - return dashboardPageControlGetters.publicTreeControlButtonDisableMap; - }), + // search isSearching: { PUBLIC: false, @@ -299,7 +354,7 @@ onUnmounted(() => { @change="handleQueryChange" @refresh="handleQueryChange()" /> - @@ -352,7 +407,7 @@ onUnmounted(() => { { @click-move="dashboardPageControlStore.openBundleMoveModal('PRIVATE')" /> - From d24db6cb349fdbd16899a4280eb628bf9519ff06 Mon Sep 17 00:00:00 2001 From: Yongtae Park Date: Sun, 2 Feb 2025 19:34:08 +0900 Subject: [PATCH 07/62] chore: small fix Signed-off-by: samuel.park --- .../composables/use-private-dashboard-api.ts | 8 ++++---- .../composables/use-public-dashboard-api.ts | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/apps/web/src/api-clients/dashboard/private-dashboard/composables/use-private-dashboard-api.ts b/apps/web/src/api-clients/dashboard/private-dashboard/composables/use-private-dashboard-api.ts index 9f4650781f..4fb1892d0e 100644 --- a/apps/web/src/api-clients/dashboard/private-dashboard/composables/use-private-dashboard-api.ts +++ b/apps/web/src/api-clients/dashboard/private-dashboard/composables/use-private-dashboard-api.ts @@ -16,7 +16,7 @@ export const usePrivateDashboardApi = () => { const actions = { async create(params: PrivateDashboardCreateParameters) { - return SpaceConnector.clientV2.dashboard.privateDashboard.list(params); + return SpaceConnector.clientV2.dashboard.privateDashboard.create(params); }, async update(params: PrivateDashboardUpdateParameters) { return SpaceConnector.clientV2.dashboard.privateDashboard.update(params); @@ -25,13 +25,13 @@ export const usePrivateDashboardApi = () => { return SpaceConnector.clientV2.dashboard.privateDashboard.changeFolder(params); }, async delete(params: PrivateDashboardDeleteParameters) { - return SpaceConnector.clientV2.dashboard.privateDashboard.unshare(params); + return SpaceConnector.clientV2.dashboard.privateDashboard.delete(params); }, async get(params: PrivateDashboardGetParameters) { - return SpaceConnector.clientV2.dashboard.privateDashboard.unshare(params); + return SpaceConnector.clientV2.dashboard.privateDashboard.get(params); }, async list(params: PrivateDashboardListParameters) { - return SpaceConnector.clientV2.dashboard.privateDashboard.unshare>(params); + return SpaceConnector.clientV2.dashboard.privateDashboard.list>(params); }, }; diff --git a/apps/web/src/api-clients/dashboard/public-dashboard/composables/use-public-dashboard-api.ts b/apps/web/src/api-clients/dashboard/public-dashboard/composables/use-public-dashboard-api.ts index 0fa7c1d48c..cb0a1db5b7 100644 --- a/apps/web/src/api-clients/dashboard/public-dashboard/composables/use-public-dashboard-api.ts +++ b/apps/web/src/api-clients/dashboard/public-dashboard/composables/use-public-dashboard-api.ts @@ -39,7 +39,6 @@ export const usePublicDashboardApi = () => { return SpaceConnector.clientV2.dashboard.publicDashboard.get(params); }, async list(params: PublicDashboardListParameters) { - console.debug('[LIST TRIGGER]'); return SpaceConnector.clientV2.dashboard.publicDashboard.list>(params); }, }; From b885b44ac85b1e0869d2a665be82ab8bcff48613 Mon Sep 17 00:00:00 2001 From: Yongtae Park Date: Sun, 2 Feb 2025 19:47:00 +0900 Subject: [PATCH 08/62] fix(dashboard): remove dashboard data getters in dashboard-page-control-store Signed-off-by: samuel.park --- .../stores/dashboard-page-control-store.ts | 107 +----------------- 1 file changed, 1 insertion(+), 106 deletions(-) diff --git a/apps/web/src/services/dashboards/stores/dashboard-page-control-store.ts b/apps/web/src/services/dashboards/stores/dashboard-page-control-store.ts index c17c827c82..b2c118f8ee 100644 --- a/apps/web/src/services/dashboards/stores/dashboard-page-control-store.ts +++ b/apps/web/src/services/dashboards/stores/dashboard-page-control-store.ts @@ -1,62 +1,10 @@ -import { computed, reactive } from 'vue'; +import { reactive } from 'vue'; import { defineStore } from 'pinia'; import type { QueryTag } from '@cloudforet/mirinae/src/controls/search/query-search-tags/type'; -import type { TreeNode } from '@cloudforet/mirinae/src/data-display/tree/tree-view/type'; - -import type { DashboardModel } from '@/api-clients/dashboard/_types/dashboard-type'; -import type { FolderModel } from '@/api-clients/dashboard/_types/folder-type'; -import type { PrivateDashboardModel } from '@/api-clients/dashboard/private-dashboard/schema/model'; -import type { PrivateFolderModel } from '@/api-clients/dashboard/private-folder/schema/model'; -import type { PublicDashboardModel } from '@/api-clients/dashboard/public-dashboard/schema/model'; -import type { PublicFolderModel } from '@/api-clients/dashboard/public-folder/schema/model'; -import { ROLE_TYPE } from '@/schema/identity/role/constant'; - -import { useAppContextStore } from '@/store/app-context/app-context-store'; -import { useDashboardStore } from '@/store/dashboard/dashboard-store'; -import { useUserStore } from '@/store/user/user-store'; - -import { - getDashboardTreeData, -} from '@/services/dashboards/helpers/dashboard-tree-data-helper'; -import type { DashboardTreeDataType } from '@/services/dashboards/types/dashboard-folder-type'; - - - -const _isPublicControlButtonDisabled = (dashboardItems: DashboardModel[], selectedIdMap: Record): boolean => { - const _selectedIdList: string[] = Object.entries(selectedIdMap).filter(([, isSelected]) => isSelected).map(([id]) => id); - if (_selectedIdList.length === 0) return true; - let result = false; - _selectedIdList.forEach((id) => { - if (result) return; - const _isFolder = id.includes('folder'); - if (_isFolder) { - const _childrenDashboards = dashboardItems.filter((d) => d.folder_id === id); - _childrenDashboards?.forEach((child) => { - if (child?.shared && child?.scope === 'WORKSPACE') { - result = true; - } - }); - } else { - const _dashboard = dashboardItems.find((d) => d.dashboard_id === id); - if (_dashboard?.shared && _dashboard?.scope === 'WORKSPACE') { - result = true; - } - } - }); - return result; -}; export const useDashboardPageControlStore = defineStore('page-dashboard-control', () => { - const appContextStore = useAppContextStore(); - const dashboardStore = useDashboardStore(); - const dashboardState = dashboardStore.state; - const userStore = useUserStore(); - const storeState = reactive({ - isAdminMode: computed(() => appContextStore.getters.isAdminMode), - isWorkspaceOwner: computed(() => userStore.state.currentRoleInfo?.roleType === ROLE_TYPE.WORKSPACE_OWNER), - }); const state = reactive({ // folder folderFormModalVisible: false, @@ -81,58 +29,6 @@ export const useDashboardPageControlStore = defineStore('page-dashboard-control' newIdList: [] as string[], searchQueryTags: [] as QueryTag[], }); - const getters = reactive({ - // admin - adminTreeControlButtonDisableMap: computed>(() => { - const _selectedPublicIdList: string[] = Object.entries(state.selectedPublicIdMap).filter(([, isSelected]) => isSelected).map(([id]) => id); - return { - clone: _selectedPublicIdList.length === 0, - move: _selectedPublicIdList.length === 0, - delete: _selectedPublicIdList.length === 0, - }; - }), - // public (only for dashboard page, so project dashboards are excluded) - publicDashboardItems: computed(() => { - const _v2DashboardItems = dashboardState.publicDashboardItems.filter((d) => d.version !== '1.0'); - if (storeState.isAdminMode) return _v2DashboardItems; - return _v2DashboardItems.filter((d) => !(d.resource_group === 'DOMAIN' && !!d.shared && d.scope === 'PROJECT')); - }), - publicFolderItems: computed(() => { - if (storeState.isAdminMode) return dashboardState.publicFolderItems; - return dashboardState.publicFolderItems.filter((d) => !(d.resource_group === 'DOMAIN' && !!d.shared && d.scope === 'PROJECT')); - }), - publicDashboardTreeData: computed[]>(() => getDashboardTreeData(getters.publicFolderItems, getters.publicDashboardItems, state.newIdList)), - publicTreeControlButtonDisableMap: computed>(() => { - const _selectedPublicIdList: string[] = Object.entries(state.selectedPublicIdMap).filter(([, isSelected]) => isSelected).map(([id]) => id); - return { - clone: _selectedPublicIdList.length === 0, - move: _isPublicControlButtonDisabled(getters.publicDashboardItems, state.selectedPublicIdMap), - delete: _isPublicControlButtonDisabled(getters.publicDashboardItems, state.selectedPublicIdMap), - }; - }), - // private - privateDashboardItems: computed(() => dashboardState.privateDashboardItems.filter((d) => d.version !== '1.0')), - privateFolderItems: computed(() => dashboardState.privateFolderItems), - privateDashboardTreeData: computed[]>(() => getDashboardTreeData(getters.privateFolderItems, getters.privateDashboardItems, state.newIdList)), - privateTreeControlButtonDisableMap: computed>(() => { - const _selectedPrivateIdList: string[] = Object.entries(state.selectedPrivateIdMap).filter(([, isSelected]) => isSelected).map(([id]) => id); - return { - clone: _selectedPrivateIdList.length === 0, - move: _selectedPrivateIdList.length === 0, - delete: _selectedPrivateIdList.length === 0, - }; - }), - // deprecated (version 1.0) - deprecatedDashboardItems: computed>(() => { - const _publicDeprecated = dashboardState.publicDashboardItems.filter((d) => d.version === '1.0'); - const _privateDeprecated = dashboardState.privateDashboardItems.filter((d) => d.version === '1.0'); - return [..._publicDeprecated, ..._privateDeprecated]; - }), - // etc - allDashboardItems: computed(() => [...getters.publicDashboardItems, ...getters.privateDashboardItems]), - allFolderItems: computed(() => [...getters.publicFolderItems, ...getters.privateFolderItems]), - loading: computed(() => dashboardState.loading), - }); /* Mutations */ const setFolderFormModalVisible = (visible: boolean) => { @@ -304,7 +200,6 @@ export const useDashboardPageControlStore = defineStore('page-dashboard-control' return { state, - getters, ...mutations, ...actions, }; From e0789d2ec98dba4d7bf8eb67479973cdaad4d398 Mon Sep 17 00:00:00 2001 From: Yongtae Park Date: Sun, 2 Feb 2025 19:47:46 +0900 Subject: [PATCH 09/62] feat(mutation): apply mutation and sync query data in clone modal Signed-off-by: samuel.park --- .../composables/use-public-dashboard-api.ts | 2 +- .../dashboard-detail/DashboardCloneModal.vue | 131 +++++++++++------- 2 files changed, 80 insertions(+), 53 deletions(-) diff --git a/apps/web/src/api-clients/dashboard/public-dashboard/composables/use-public-dashboard-api.ts b/apps/web/src/api-clients/dashboard/public-dashboard/composables/use-public-dashboard-api.ts index cb0a1db5b7..f80c02be82 100644 --- a/apps/web/src/api-clients/dashboard/public-dashboard/composables/use-public-dashboard-api.ts +++ b/apps/web/src/api-clients/dashboard/public-dashboard/composables/use-public-dashboard-api.ts @@ -18,7 +18,7 @@ export const usePublicDashboardApi = () => { const actions = { async create(params: PublicDashboardCreateParameters) { - return SpaceConnector.clientV2.dashboard.publicDashboard.list(params); + return SpaceConnector.clientV2.dashboard.publicDashboard.create(params); }, async update(params: PublicDashboardUpdateParameters) { return SpaceConnector.clientV2.dashboard.publicDashboard.update(params); diff --git a/apps/web/src/services/dashboards/components/dashboard-detail/DashboardCloneModal.vue b/apps/web/src/services/dashboards/components/dashboard-detail/DashboardCloneModal.vue index 0e1392b532..a695d228e7 100644 --- a/apps/web/src/services/dashboards/components/dashboard-detail/DashboardCloneModal.vue +++ b/apps/web/src/services/dashboards/components/dashboard-detail/DashboardCloneModal.vue @@ -1,6 +1,8 @@ diff --git a/apps/web/src/services/dashboards/components/dashboard-create/DashboardCreateStep2SingleCase.vue b/apps/web/src/services/dashboards/components/dashboard-create/DashboardCreateStep2SingleCase.vue index 7d3778f8ed..ffd2175afb 100644 --- a/apps/web/src/services/dashboards/components/dashboard-create/DashboardCreateStep2SingleCase.vue +++ b/apps/web/src/services/dashboards/components/dashboard-create/DashboardCreateStep2SingleCase.vue @@ -3,6 +3,8 @@ import { computed, defineExpose, reactive, watch, } from 'vue'; +import { useMutation } from '@tanstack/vue-query'; + import { PI, PFieldGroup, PTextInput, PSelectDropdown, } from '@cloudforet/mirinae'; @@ -11,7 +13,12 @@ import type { InputItem } from '@cloudforet/mirinae/types/controls/input/text-in import { RESOURCE_GROUP } from '@/api-clients/_common/schema/constant'; import type { DashboardCreateParams } from '@/api-clients/dashboard/_types/dashboard-type'; +import type { + PrivateDashboardCreateParameters, +} from '@/api-clients/dashboard/private-dashboard/schema/api-verbs/create'; +import type { PrivateDashboardModel } from '@/api-clients/dashboard/private-dashboard/schema/model'; import type { PublicDashboardCreateParameters } from '@/api-clients/dashboard/public-dashboard/schema/api-verbs/create'; +import type { PublicDashboardModel } from '@/api-clients/dashboard/public-dashboard/schema/model'; import { SpaceRouter } from '@/router'; import { i18n } from '@/translations'; @@ -33,7 +40,8 @@ import { import { DASHBOARDS_ROUTE } from '@/services/dashboards/routes/route-constant'; import { useDashboardCreatePageStore } from '@/services/dashboards/stores/dashboard-create-page-store'; - +type DashboardCreateParameters = PublicDashboardCreateParameters | PrivateDashboardCreateParameters; +type DashboardModel = PublicDashboardModel | PrivateDashboardModel; interface Props { isValid: boolean; @@ -54,6 +62,9 @@ const userStore = useUserStore(); const { publicFolderItems, privateFolderItems, + keys, + api, + queryClient, } = useDashboardQuery(); const storeState = reactive({ @@ -113,7 +124,39 @@ const { }); /* Api */ -const createSingleDashboard = async () => { +const createDashboard = (params: DashboardCreateParameters): Promise => { + if (dashboardCreatePageState.dashboardScope === 'PRIVATE') { + return api.privateDashboardAPI.create(params as PrivateDashboardCreateParameters); + } + return api.publicDashboardAPI.create(params as PublicDashboardCreateParameters); +}; + +const { mutate } = useMutation( + { + mutationFn: createDashboard, + onSuccess: (dashboard: DashboardModel) => { + dashboardCreatePageStore.setDashboardCreated(true); + const isPrivate = dashboard.dashboard_id.startsWith('private'); + const dashboardListQueryKey = isPrivate ? keys.privateDashboardListQueryKey : keys.publicDashboardListQueryKey; + queryClient.invalidateQueries({ queryKey: dashboardListQueryKey.value }); + }, + onError: (e) => { + showErrorMessage(i18n.t('DASHBOARDS.FORM.ALT_E_CREATE_DASHBOARD'), e); + }, + onSettled(data) { + if (data?.dashboard_id) { + SpaceRouter.router.push(getProperRouteLocation({ + name: DASHBOARDS_ROUTE.DETAIL._NAME, + params: { dashboardId: data.dashboard_id }, + })); + } + }, + }, +); + +/* Event */ +const handleConfirm = async () => { + dashboardCreatePageStore.setLoading(true); const _dashboardParams: DashboardCreateParams = { name: dashboardName.value, labels: state.labels.map((item) => item.name), @@ -121,35 +164,12 @@ const createSingleDashboard = async () => { folder_id: state.selectedFolderId, vars_schema: DASHBOARD_VARS_SCHEMA_PRESET, }; - try { - if (storeState.isAdminMode) { - (_dashboardParams as PublicDashboardCreateParameters).resource_group = RESOURCE_GROUP.DOMAIN; - } else if (dashboardCreatePageState.dashboardScope !== 'PRIVATE') { - (_dashboardParams as PublicDashboardCreateParameters).resource_group = dashboardCreatePageState.dashboardScope || RESOURCE_GROUP.WORKSPACE; - } - const _dashboardType = dashboardCreatePageState.dashboardScope === 'PRIVATE' ? 'PRIVATE' : 'PUBLIC'; - const res = await dashboardStore.createDashboard(_dashboardType, _dashboardParams); - dashboardCreatePageStore.setDashboardCreated(true); - return res.dashboard_id; - } catch (e) { - showErrorMessage(i18n.t('DASHBOARDS.FORM.ALT_E_CREATE_DASHBOARD'), e); - return undefined; - } -}; - -/* Event */ -const handleConfirm = async () => { - dashboardCreatePageStore.setLoading(true); - const createdDashboardId = await createSingleDashboard(); - await dashboardStore.load(); - if (createdDashboardId) { - await SpaceRouter.router.push(getProperRouteLocation({ - name: DASHBOARDS_ROUTE.DETAIL._NAME, - params: { - dashboardId: createdDashboardId, - }, - })); + if (storeState.isAdminMode) { + (_dashboardParams as PublicDashboardCreateParameters).resource_group = RESOURCE_GROUP.DOMAIN; + } else if (dashboardCreatePageState.dashboardScope !== 'PRIVATE') { + (_dashboardParams as PublicDashboardCreateParameters).resource_group = dashboardCreatePageState.dashboardScope || RESOURCE_GROUP.WORKSPACE; } + mutate(_dashboardParams as DashboardCreateParameters); }; /* Watcher */ diff --git a/apps/web/src/services/dashboards/stores/dashboard-detail-info-store.ts b/apps/web/src/services/dashboards/stores/dashboard-detail-info-store.ts index bf855dc686..4e6b6c3a91 100644 --- a/apps/web/src/services/dashboards/stores/dashboard-detail-info-store.ts +++ b/apps/web/src/services/dashboards/stores/dashboard-detail-info-store.ts @@ -347,9 +347,6 @@ export const useDashboardDetailInfoStore = defineStore('dashboard-detail-info', setVariablesInitMap(_variablesInitMap); }; // - const deleteDashboard = async (dashboardId: string) => { - await dashboardStore.deleteDashboard(dashboardId); - }; const listDashboardWidgets = async () => { if (!state.dashboardId) return; try { @@ -385,7 +382,6 @@ export const useDashboardDetailInfoStore = defineStore('dashboard-detail-info', getDashboardInfo, deleteDashboardWidget, resetVariables, - deleteDashboard, listDashboardWidgets, }; From 14f096510a3debd8d71176337046ead9cda7a2f1 Mon Sep 17 00:00:00 2001 From: Yongtae Park Date: Mon, 3 Feb 2025 00:36:23 +0900 Subject: [PATCH 11/62] feat(dashboard): apply mutations Signed-off-by: samuel.park --- .../DashboardCreateStep2SingleCase.vue | 15 +- .../DashboardLabelsButton.vue | 40 +++-- .../DashboardManageVariableImportModal.vue | 68 ++++---- .../DashboardManageVariableOverlay.vue | 156 ++++++++++-------- .../DashboardNameEditModal.vue | 55 +++--- .../DashboardRefreshDropdown.vue | 30 +++- .../DashboardReorderSidebar.vue | 34 +++- .../DashboardToolsetDateDropdown.vue | 30 +++- .../DashboardVariablesFormModal.vue | 134 ++++++++------- .../DashboardVariablesMoreButton.vue | 91 ++++++---- .../DashboardWidgetContainerV2.vue | 30 +++- .../DashboardFolderFormModal.vue | 102 +++++++----- .../composables/use-dashboard-query.ts | 154 ++++------------- .../dashboards/pages/DashboardDetailPage.vue | 46 ++++-- .../stores/dashboard-detail-info-store.ts | 11 +- 15 files changed, 571 insertions(+), 425 deletions(-) diff --git a/apps/web/src/services/dashboards/components/dashboard-create/DashboardCreateStep2SingleCase.vue b/apps/web/src/services/dashboards/components/dashboard-create/DashboardCreateStep2SingleCase.vue index ffd2175afb..1da0eb1ec5 100644 --- a/apps/web/src/services/dashboards/components/dashboard-create/DashboardCreateStep2SingleCase.vue +++ b/apps/web/src/services/dashboards/components/dashboard-create/DashboardCreateStep2SingleCase.vue @@ -12,7 +12,7 @@ import type { SelectDropdownMenuItem } from '@cloudforet/mirinae/types/controls/ import type { InputItem } from '@cloudforet/mirinae/types/controls/input/text-input/type'; import { RESOURCE_GROUP } from '@/api-clients/_common/schema/constant'; -import type { DashboardCreateParams } from '@/api-clients/dashboard/_types/dashboard-type'; +import type { DashboardCreateParams, DashboardType } from '@/api-clients/dashboard/_types/dashboard-type'; import type { PrivateDashboardCreateParameters, } from '@/api-clients/dashboard/private-dashboard/schema/api-verbs/create'; @@ -23,7 +23,6 @@ import { SpaceRouter } from '@/router'; import { i18n } from '@/translations'; import { useAppContextStore } from '@/store/app-context/app-context-store'; -import { useDashboardStore } from '@/store/dashboard/dashboard-store'; import { useUserStore } from '@/store/user/user-store'; import { showErrorMessage } from '@/lib/helper/notice-alert-helper'; @@ -52,7 +51,6 @@ const emit = defineEmits<{(e: 'update:is-valid', value: boolean): void const { getProperRouteLocation } = useProperRouteLocation(); const appContextStore = useAppContextStore(); -const dashboardStore = useDashboardStore(); const dashboardCreatePageStore = useDashboardCreatePageStore(); const dashboardCreatePageState = dashboardCreatePageStore.state; const dashboardCreatePageGetters = dashboardCreatePageStore.getters; @@ -60,6 +58,8 @@ const userStore = useUserStore(); /* Query */ const { + publicDashboardItems, + privateDashboardItems, publicFolderItems, privateFolderItems, keys, @@ -67,6 +67,13 @@ const { queryClient, } = useDashboardQuery(); +const getDashboardNameList = (dashboardType: DashboardType) => { + if (dashboardType === 'PRIVATE') { + return (privateDashboardItems.value.filter((i) => i.version !== '1.0')).map((item) => item.name); + } + return publicDashboardItems.value.filter((i) => i.version !== '1.0').map((item) => item.name); +}; + const storeState = reactive({ isAdminMode: computed(() => appContextStore.getters.isAdminMode), }); @@ -77,7 +84,7 @@ const state = reactive({ return publicFolderItems.value.filter((d) => !(d.resource_group === 'DOMAIN' && !!d.shared && d.scope === 'PROJECT')); }), privateFolderItems: computed(() => privateFolderItems.value), - dashboardNameList: computed(() => dashboardStore.getDashboardNameList(dashboardCreatePageGetters.dashboardType)), + dashboardNameList: computed(() => getDashboardNameList(dashboardCreatePageGetters.dashboardType)), labels: [] as InputItem[], folderMenuItems: computed(() => { const defaultItem = { diff --git a/apps/web/src/services/dashboards/components/dashboard-detail/DashboardLabelsButton.vue b/apps/web/src/services/dashboards/components/dashboard-detail/DashboardLabelsButton.vue index 55ed40b7fc..95003e7462 100644 --- a/apps/web/src/services/dashboards/components/dashboard-detail/DashboardLabelsButton.vue +++ b/apps/web/src/services/dashboards/components/dashboard-detail/DashboardLabelsButton.vue @@ -2,13 +2,17 @@ import { onClickOutside } from '@vueuse/core'; import { reactive, ref } from 'vue'; +import { useMutation } from '@tanstack/vue-query'; + import { PButton, PBadge, PPopover } from '@cloudforet/mirinae'; -import { useDashboardStore } from '@/store/dashboard/dashboard-store'; +import type { PrivateDashboardModel } from '@/api-clients/dashboard/private-dashboard/schema/model'; +import type { PublicDashboardModel } from '@/api-clients/dashboard/public-dashboard/schema/model'; import ErrorHandler from '@/common/composables/error/errorHandler'; import DashboardLabels from '@/services/dashboards/components/dashboard-detail/DashboardLabels.vue'; +import { useDashboardQuery } from '@/services/dashboards/composables/use-dashboard-query'; import { useDashboardDetailInfoStore } from '@/services/dashboards/stores/dashboard-detail-info-store'; @@ -18,26 +22,42 @@ interface Props { } const props = defineProps(); -const dashboardStore = useDashboardStore(); const dashboardDetailStore = useDashboardDetailInfoStore(); const dashboardDetailGetters = dashboardDetailStore.getters; const labelPopoverRef = ref(null); +/* Query */ +const { + keys, + functions, + queryClient, +} = useDashboardQuery(); + const state = reactive({ visible: false, }); const handleUpdateLabels = async (labels: string[]) => { - try { - await dashboardStore.updateDashboard(props.dashboardId, { - dashboard_id: props.dashboardId, - labels, - }); - } catch (e) { - ErrorHandler.handleError(e); - } + mutate({ + dashboard_id: props.dashboardId, + labels, + }); }; +const { mutate } = useMutation( + { + mutationFn: functions.updateDashboardFn, + onSuccess: (dashboard: PublicDashboardModel|PrivateDashboardModel) => { + const isPrivate = dashboard.dashboard_id.startsWith('private'); + const dashboardListQueryKey = isPrivate ? keys.privateDashboardListQueryKey : keys.publicDashboardListQueryKey; + queryClient.invalidateQueries({ queryKey: dashboardListQueryKey.value }); + }, + onError: (e) => { + ErrorHandler.handleError(e); + }, + }, +); + onClickOutside(labelPopoverRef, () => { state.visible = false; }); diff --git a/apps/web/src/services/dashboards/components/dashboard-detail/DashboardManageVariableImportModal.vue b/apps/web/src/services/dashboards/components/dashboard-detail/DashboardManageVariableImportModal.vue index 4591878ae3..5874215058 100644 --- a/apps/web/src/services/dashboards/components/dashboard-detail/DashboardManageVariableImportModal.vue +++ b/apps/web/src/services/dashboards/components/dashboard-detail/DashboardManageVariableImportModal.vue @@ -1,6 +1,7 @@ diff --git a/apps/web/src/services/dashboards/components/dashboard-detail/DashboardNameEditModal.vue b/apps/web/src/services/dashboards/components/dashboard-detail/DashboardNameEditModal.vue index 9f3b20cf78..f2f5f3d78f 100644 --- a/apps/web/src/services/dashboards/components/dashboard-detail/DashboardNameEditModal.vue +++ b/apps/web/src/services/dashboards/components/dashboard-detail/DashboardNameEditModal.vue @@ -3,13 +3,15 @@ import { computed, reactive, watch, } from 'vue'; +import { useMutation } from '@tanstack/vue-query'; + import { PButtonModal, PFieldGroup, PTextInput } from '@cloudforet/mirinae'; -import type { DashboardModel } from '@/api-clients/dashboard/_types/dashboard-type'; +import type { PrivateDashboardModel } from '@/api-clients/dashboard/private-dashboard/schema/model'; +import type { PublicDashboardModel } from '@/api-clients/dashboard/public-dashboard/schema/model'; import { i18n } from '@/translations'; import { useAppContextStore } from '@/store/app-context/app-context-store'; -import { useDashboardStore } from '@/store/dashboard/dashboard-store'; import ErrorHandler from '@/common/composables/error/errorHandler'; import { useFormValidator } from '@/common/composables/form-validator'; @@ -18,6 +20,8 @@ import { useProxyValue } from '@/common/composables/proxy-state'; import { useDashboardQuery } from '@/services/dashboards/composables/use-dashboard-query'; + +type DashboardModel = PrivateDashboardModel | PublicDashboardModel; interface Props { visible: boolean; dashboardId: string; @@ -34,10 +38,12 @@ const emit = defineEmits<{(e: 'update:visible', value: boolean): void; const { publicDashboardItems, privateDashboardItems, + keys, + functions, + queryClient, } = useDashboardQuery(); const appContextStore = useAppContextStore(); -const dashboardStore = useDashboardStore(); const { forms: { _name, @@ -50,7 +56,7 @@ const { _name: '', }, { _name(value: string) { - if (state.loading) return ''; + if (loading.value) return ''; if (value === state.originName) return ''; if (value.length > 100) return i18n.t('DASHBOARDS.FORM.VALIDATION_DASHBOARD_NAME_LENGTH'); if (!value.trim().length) return i18n.t('DASHBOARDS.FORM.VALIDATION_DASHBOARD_NAME_INPUT'); @@ -62,7 +68,6 @@ const storeState = reactive({ isAdminMode: computed(() => appContextStore.getters.isAdminMode), }); const state = reactive({ - loading: false, proxyVisible: useProxyValue('visible', props, emit), publicDashboardItems: computed(() => { const _v2DashboardItems = publicDashboardItems.value.filter((d) => d.version !== '1.0'); @@ -80,25 +85,31 @@ const state = reactive({ }), }); -const updateDashboard = async () => { - try { - await dashboardStore.updateDashboard(props.dashboardId, { - dashboard_id: props.dashboardId, - name: _name.value, - }); - } catch (e) { - ErrorHandler.handleRequestError(e, i18n.t('DASHBOARDS.FORM.ALT_E_EDIT_NAME')); - } -}; +const { mutate, isPending: loading } = useMutation( + { + mutationFn: functions.updateDashboardFn, + onSuccess: (dashboard: DashboardModel) => { + const isPrivate = dashboard.dashboard_id.startsWith('private'); + const dashboardListQueryKey = isPrivate ? keys.privateDashboardListQueryKey : keys.publicDashboardListQueryKey; + queryClient.invalidateQueries({ queryKey: dashboardListQueryKey.value }); + }, + onError: (e) => { + ErrorHandler.handleRequestError(e, i18n.t('DASHBOARDS.FORM.ALT_E_EDIT_NAME')); + }, + onSettled() { + state.proxyVisible = false; + }, + }, +); const handleConfirm = async () => { - state.loading = true; - await updateDashboard(); - state.proxyVisible = false; - state.loading = false; + mutate({ + dashboard_id: props.dashboardId, + name: _name.value, + }); }; -const handleUpdateVisible = (visible) => { +const handleUpdateVisible = (visible: boolean) => { state.proxyVisible = visible; }; @@ -118,8 +129,8 @@ watch(() => props.visible, (visible) => { >