diff --git a/apps/web/src/common/modules/navigations/gnb/GNBToolbox.vue b/apps/web/src/common/modules/navigations/gnb/GNBToolbox.vue index 343b1c0b0b..48e6b0a6ec 100644 --- a/apps/web/src/common/modules/navigations/gnb/GNBToolbox.vue +++ b/apps/web/src/common/modules/navigations/gnb/GNBToolbox.vue @@ -60,7 +60,7 @@ const state = reactive({ routes.push({ name: i18n.t('MENU.CONSOLE_HOME'), to: { - name: LANDING_ROUTE._NAME, + name: LANDING_ROUTE.DOMAIN._NAME, }, }); } else if (!storeState.isAdminMode && storeState.currentWorkspaceId) { diff --git a/apps/web/src/common/modules/navigations/top-bar/modules/top-bar-header/TopBarWorkspaces.vue b/apps/web/src/common/modules/navigations/top-bar/modules/top-bar-header/TopBarWorkspaces.vue index db0123e056..b404bcd1b9 100644 --- a/apps/web/src/common/modules/navigations/top-bar/modules/top-bar-header/TopBarWorkspaces.vue +++ b/apps/web/src/common/modules/navigations/top-bar/modules/top-bar-header/TopBarWorkspaces.vue @@ -1,5 +1,5 @@ + + + + + diff --git a/apps/web/src/services/cost-explorer/components/DataSourceManagementTabDataCollectionHistoryModal.vue b/apps/web/src/services/cost-explorer/components/DataSourceManagementTabDataCollectionHistoryModal.vue new file mode 100644 index 0000000000..731d8bbdd9 --- /dev/null +++ b/apps/web/src/services/cost-explorer/components/DataSourceManagementTabDataCollectionHistoryModal.vue @@ -0,0 +1,288 @@ + + + + + + diff --git a/apps/web/src/services/cost-explorer/components/DataSourceManagementTabDetailJob.vue b/apps/web/src/services/cost-explorer/components/DataSourceManagementTabDetailJob.vue deleted file mode 100644 index 3ec7030fc2..0000000000 --- a/apps/web/src/services/cost-explorer/components/DataSourceManagementTabDetailJob.vue +++ /dev/null @@ -1,251 +0,0 @@ - - - - - - diff --git a/apps/web/src/services/cost-explorer/components/DataSourceManagementTable.vue b/apps/web/src/services/cost-explorer/components/DataSourceManagementTable.vue index a7e9c61a55..dc04bd5ce5 100644 --- a/apps/web/src/services/cost-explorer/components/DataSourceManagementTable.vue +++ b/apps/web/src/services/cost-explorer/components/DataSourceManagementTable.vue @@ -1,18 +1,20 @@ @@ -110,11 +109,17 @@ onUnmounted(() => { - - - - - + + + + + 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 65456d9e6d..2fb25fe8eb 100644 --- a/apps/web/src/services/iam/store/user-page-store.ts +++ b/apps/web/src/services/iam/store/user-page-store.ts @@ -67,6 +67,26 @@ export const useUserPageStore = defineStore('page-user', () => { }); const actions = { // User + reset() { + state.isAdminMode = false; + state.loading = true; + state.users = [] as UserListItemType[]; + state.selectedUser = {} as UserListItemType; + state.roles = [] as RoleModel[]; + state.totalCount = 0; + state.selectedIndices = []; + state.pageStart = 1; + state.pageLimit = 15; + state.searchFilters = [] as ConsoleFilter[]; + state.afterWorkspaceCreated = false; + state.createdWorkspaceId = undefined as string | undefined; + state.modal = { + type: '', + title: '', + themeColor: 'primary', + visible: undefined, + } as ModalState; + }, async listUsers(params: UserListParameters) { try { const res = await SpaceConnector.clientV2.identity.user.list>(params); diff --git a/apps/web/src/services/landing/components/DomainLandingRecommendation.vue b/apps/web/src/services/landing/components/DomainLandingRecommendation.vue index d3af3f53bc..87d34f2bcf 100644 --- a/apps/web/src/services/landing/components/DomainLandingRecommendation.vue +++ b/apps/web/src/services/landing/components/DomainLandingRecommendation.vue @@ -1,7 +1,6 @@