From d1c1cf3c6baac5d055bcb8358e8ddf17c52afea2 Mon Sep 17 00:00:00 2001 From: donniean <12584040+donniean@users.noreply.github.com> Date: Mon, 6 Jan 2025 17:41:23 +0800 Subject: [PATCH] refactor: modify the path of the extension center (#4413) refactor: change extensions management path Signed-off-by: donniean --- .../containers/Dashboard/DashboardCard/index.tsx | 2 +- packages/core/src/constants/extension.ts | 8 ++++---- .../{Manager => Management}/Detail/index.tsx | 6 +++--- .../{Manager => Management}/Detail/styles.ts | 0 .../{Manager => Management}/actions/index.ts | 0 .../ClusterLogsModal/ClusterLog.styles.ts | 0 .../components/ClusterLogsModal/ClusterLog.tsx | 0 .../ClusterLogsModal/ClusterLogsModal.styles.ts | 0 .../ClusterLogsModal/ClusterLogsModal.tsx | 0 .../ClusterLogsModal/ClusterTabLabel.styles.ts | 0 .../ClusterLogsModal/ClusterTabLabel.tsx | 0 .../ClusterLogsModal/Progress.styles.ts | 0 .../components/ClusterLogsModal/Progress.tsx | 0 .../components/ClusterLogsModal/index.ts | 0 .../components/ClusterLogsModal/shared.styles.ts | 0 .../DetailActionButtons/ActionButton.styles.ts | 0 .../DetailActionButtons/ActionButton.tsx | 0 .../DetailActionButtons/ActionMenus.styles.ts | 0 .../DetailActionButtons/ActionMenus.tsx | 0 .../DetailActionButtons.styles.ts | 0 .../DetailActionButtons/DetailActionButtons.tsx | 0 .../components/DetailActionButtons/LogButton.tsx | 0 .../DetailActionButtons/UpdateTip.styles.ts | 0 .../components/DetailActionButtons/UpdateTip.tsx | 0 .../components/DetailActionButtons/index.ts | 0 .../ExtensionConfig/ExtensionConfig.styles.ts | 0 .../ExtensionConfig/ExtensionConfig.tsx | 0 .../components/ExtensionConfig/index.ts | 0 .../ExtensionConfigModal.styles.ts | 0 .../ExtensionConfigModal.tsx | 0 .../components/ExtensionConfigModal/index.ts | 0 .../ExtensionForceUninstallConfirmModal.tsx | 0 .../ExtensionForceUninstallConfirmModal/index.ts | 0 .../ExtensionLogButton.styles.ts | 0 .../ExtensionLogButton/ExtensionLogButton.tsx | 0 .../components/ExtensionLogButton/index.ts | 0 .../ExtensionLogModal.styles.ts | 0 .../ExtensionLogModal/ExtensionLogModal.tsx | 0 .../components/ExtensionLogModal/index.ts | 0 .../ExtensionMultiClusterLogsButton.styles.ts | 0 .../ExtensionMultiClusterLogsButton.tsx | 0 .../PopoverContent.styles.ts | 0 .../PopoverContent.tsx | 0 .../ExtensionMultiClusterLogsButton/index.ts | 0 .../ExtensionUninstallConfirmModal.tsx | 0 .../ExtensionUninstallConfirmModal/index.ts | 0 .../DEPRECATED_ListActionButtons.styles.ts | 0 .../Extensions/DEPRECATED_ListActionButtons.tsx | 0 .../Extensions/ExtensionStatus.styles.ts | 0 .../components/Extensions/ExtensionStatus.tsx | 0 .../components/Extensions/Extensions.styles.ts | 0 .../components/Extensions/Extensions.tsx | 4 +++- .../Extensions/ExtensionsEmpty.styles.ts | 0 .../components/Extensions/ExtensionsEmpty.tsx | 0 .../Extensions/ListActionButtons.styles.ts | 0 .../components/Extensions/ListActionButtons.tsx | 0 .../Extensions/MarketplaceAccount.styles.ts | 0 .../components/Extensions/MarketplaceAccount.tsx | 0 .../Extensions/MarketplaceUserEmpty.styles.ts | 0 .../Extensions/MarketplaceUserEmpty.tsx | 0 .../components/Extensions/index.ts | 0 .../components/Extensions/shared.styles.ts | 0 .../InstallModal/ClusterConfigEditor.styles.ts | 0 .../InstallModal/ClusterConfigEditor.tsx | 0 .../InstallModal/ClusterConfigs.styles.ts | 0 .../components/InstallModal/ClusterConfigs.tsx | 0 .../InstallModal/ClusterSelections.styles.ts | 0 .../InstallModal/ClusterSelections.tsx | 0 .../InstallModal/ExtensionAction.helpers.ts | 0 .../InstallModal/ExtensionAction.styles.ts | 0 .../components/InstallModal/ExtensionAction.tsx | 0 .../ExtensionVersionSelection.helpers.ts | 0 .../ExtensionVersionSelection.shared.helpers.ts | 0 .../ExtensionVersionSelection.styles.ts | 0 .../InstallModal/ExtensionVersionSelection.tsx | 0 .../InstallModal/ExtensionVersions.styles.ts | 0 .../InstallModal/ExtensionVersions.tsx | 0 .../InstallModal/ExternalDependency.helpers.ts | 0 .../InstallModal/ExternalDependency.styles.ts | 0 .../InstallModal/ExternalDependency.tsx | 2 +- .../InstallModal/InstallModal.helpers.ts | 0 .../InstallModal/InstallModal.styles.ts | 0 .../components/InstallModal/InstallModal.tsx | 0 .../components/InstallModal/index.ts | 0 .../components/LogViewer/LogViewer.styles.ts | 0 .../components/LogViewer/LogViewer.tsx | 0 .../components/LogViewer/index.ts | 0 .../ResetDefaultConfigConfirmModal.styles.ts | 0 .../ResetDefaultConfigConfirmModal.tsx | 0 .../ResetDefaultConfigTip.styles.ts | 0 .../ResetDefaultConfigTip.tsx | 0 .../components/ResetDefaultConfigTip/index.ts | 0 .../components/shared.styles.ts | 0 .../{Manager => Management}/constants/index.ts | 0 .../hooks/useLocalExtensionStatusItems/index.ts | 0 .../Extensions/{Manager => Management}/index.tsx | 2 +- .../Extensions/{Manager => Management}/styles.ts | 0 .../utils/installation.ts | 0 .../{Manager => Management}/utils/status.tsx | 0 .../{Manager => Management}/utils/version.ts | 0 .../components/ActionButtons/ActionButtons.tsx | 4 ++-- .../components/Extensions/Extension.tsx | 2 +- .../src/containers/Extensions/routes/index.tsx | 16 ++++++++-------- packages/shared/src/utils/checker.ts | 6 +++--- 104 files changed, 27 insertions(+), 25 deletions(-) rename packages/core/src/containers/Extensions/{Manager => Management}/Detail/index.tsx (98%) rename packages/core/src/containers/Extensions/{Manager => Management}/Detail/styles.ts (100%) rename packages/core/src/containers/Extensions/{Manager => Management}/actions/index.ts (100%) rename packages/core/src/containers/Extensions/{Manager => Management}/components/ClusterLogsModal/ClusterLog.styles.ts (100%) rename packages/core/src/containers/Extensions/{Manager => Management}/components/ClusterLogsModal/ClusterLog.tsx (100%) rename packages/core/src/containers/Extensions/{Manager => Management}/components/ClusterLogsModal/ClusterLogsModal.styles.ts (100%) rename packages/core/src/containers/Extensions/{Manager => Management}/components/ClusterLogsModal/ClusterLogsModal.tsx (100%) rename packages/core/src/containers/Extensions/{Manager => Management}/components/ClusterLogsModal/ClusterTabLabel.styles.ts (100%) rename packages/core/src/containers/Extensions/{Manager => Management}/components/ClusterLogsModal/ClusterTabLabel.tsx (100%) rename packages/core/src/containers/Extensions/{Manager => Management}/components/ClusterLogsModal/Progress.styles.ts (100%) rename packages/core/src/containers/Extensions/{Manager => Management}/components/ClusterLogsModal/Progress.tsx (100%) rename packages/core/src/containers/Extensions/{Manager => Management}/components/ClusterLogsModal/index.ts (100%) rename packages/core/src/containers/Extensions/{Manager => Management}/components/ClusterLogsModal/shared.styles.ts (100%) rename packages/core/src/containers/Extensions/{Manager => Management}/components/DetailActionButtons/ActionButton.styles.ts (100%) rename packages/core/src/containers/Extensions/{Manager => Management}/components/DetailActionButtons/ActionButton.tsx (100%) rename packages/core/src/containers/Extensions/{Manager => Management}/components/DetailActionButtons/ActionMenus.styles.ts (100%) rename packages/core/src/containers/Extensions/{Manager => Management}/components/DetailActionButtons/ActionMenus.tsx (100%) rename packages/core/src/containers/Extensions/{Manager => Management}/components/DetailActionButtons/DetailActionButtons.styles.ts (100%) rename packages/core/src/containers/Extensions/{Manager => Management}/components/DetailActionButtons/DetailActionButtons.tsx (100%) rename packages/core/src/containers/Extensions/{Manager => Management}/components/DetailActionButtons/LogButton.tsx (100%) rename packages/core/src/containers/Extensions/{Manager => Management}/components/DetailActionButtons/UpdateTip.styles.ts (100%) rename packages/core/src/containers/Extensions/{Manager => Management}/components/DetailActionButtons/UpdateTip.tsx (100%) rename packages/core/src/containers/Extensions/{Manager => Management}/components/DetailActionButtons/index.ts (100%) rename packages/core/src/containers/Extensions/{Manager => Management}/components/ExtensionConfig/ExtensionConfig.styles.ts (100%) rename packages/core/src/containers/Extensions/{Manager => Management}/components/ExtensionConfig/ExtensionConfig.tsx (100%) rename packages/core/src/containers/Extensions/{Manager => Management}/components/ExtensionConfig/index.ts (100%) rename packages/core/src/containers/Extensions/{Manager => Management}/components/ExtensionConfigModal/ExtensionConfigModal.styles.ts (100%) rename packages/core/src/containers/Extensions/{Manager => Management}/components/ExtensionConfigModal/ExtensionConfigModal.tsx (100%) rename packages/core/src/containers/Extensions/{Manager => Management}/components/ExtensionConfigModal/index.ts (100%) rename packages/core/src/containers/Extensions/{Manager => Management}/components/ExtensionForceUninstallConfirmModal/ExtensionForceUninstallConfirmModal.tsx (100%) rename packages/core/src/containers/Extensions/{Manager => Management}/components/ExtensionForceUninstallConfirmModal/index.ts (100%) rename packages/core/src/containers/Extensions/{Manager => Management}/components/ExtensionLogButton/ExtensionLogButton.styles.ts (100%) rename packages/core/src/containers/Extensions/{Manager => Management}/components/ExtensionLogButton/ExtensionLogButton.tsx (100%) rename packages/core/src/containers/Extensions/{Manager => Management}/components/ExtensionLogButton/index.ts (100%) rename packages/core/src/containers/Extensions/{Manager => Management}/components/ExtensionLogModal/ExtensionLogModal.styles.ts (100%) rename packages/core/src/containers/Extensions/{Manager => Management}/components/ExtensionLogModal/ExtensionLogModal.tsx (100%) rename packages/core/src/containers/Extensions/{Manager => Management}/components/ExtensionLogModal/index.ts (100%) rename packages/core/src/containers/Extensions/{Manager => Management}/components/ExtensionMultiClusterLogsButton/ExtensionMultiClusterLogsButton.styles.ts (100%) rename packages/core/src/containers/Extensions/{Manager => Management}/components/ExtensionMultiClusterLogsButton/ExtensionMultiClusterLogsButton.tsx (100%) rename packages/core/src/containers/Extensions/{Manager => Management}/components/ExtensionMultiClusterLogsButton/PopoverContent.styles.ts (100%) rename packages/core/src/containers/Extensions/{Manager => Management}/components/ExtensionMultiClusterLogsButton/PopoverContent.tsx (100%) rename packages/core/src/containers/Extensions/{Manager => Management}/components/ExtensionMultiClusterLogsButton/index.ts (100%) rename packages/core/src/containers/Extensions/{Manager => Management}/components/ExtensionUninstallConfirmModal/ExtensionUninstallConfirmModal.tsx (100%) rename packages/core/src/containers/Extensions/{Manager => Management}/components/ExtensionUninstallConfirmModal/index.ts (100%) rename packages/core/src/containers/Extensions/{Manager => Management}/components/Extensions/DEPRECATED_ListActionButtons.styles.ts (100%) rename packages/core/src/containers/Extensions/{Manager => Management}/components/Extensions/DEPRECATED_ListActionButtons.tsx (100%) rename packages/core/src/containers/Extensions/{Manager => Management}/components/Extensions/ExtensionStatus.styles.ts (100%) rename packages/core/src/containers/Extensions/{Manager => Management}/components/Extensions/ExtensionStatus.tsx (100%) rename packages/core/src/containers/Extensions/{Manager => Management}/components/Extensions/Extensions.styles.ts (100%) rename packages/core/src/containers/Extensions/{Manager => Management}/components/Extensions/Extensions.tsx (99%) rename packages/core/src/containers/Extensions/{Manager => Management}/components/Extensions/ExtensionsEmpty.styles.ts (100%) rename packages/core/src/containers/Extensions/{Manager => Management}/components/Extensions/ExtensionsEmpty.tsx (100%) rename packages/core/src/containers/Extensions/{Manager => Management}/components/Extensions/ListActionButtons.styles.ts (100%) rename packages/core/src/containers/Extensions/{Manager => Management}/components/Extensions/ListActionButtons.tsx (100%) rename packages/core/src/containers/Extensions/{Manager => Management}/components/Extensions/MarketplaceAccount.styles.ts (100%) rename packages/core/src/containers/Extensions/{Manager => Management}/components/Extensions/MarketplaceAccount.tsx (100%) rename packages/core/src/containers/Extensions/{Manager => Management}/components/Extensions/MarketplaceUserEmpty.styles.ts (100%) rename packages/core/src/containers/Extensions/{Manager => Management}/components/Extensions/MarketplaceUserEmpty.tsx (100%) rename packages/core/src/containers/Extensions/{Manager => Management}/components/Extensions/index.ts (100%) rename packages/core/src/containers/Extensions/{Manager => Management}/components/Extensions/shared.styles.ts (100%) rename packages/core/src/containers/Extensions/{Manager => Management}/components/InstallModal/ClusterConfigEditor.styles.ts (100%) rename packages/core/src/containers/Extensions/{Manager => Management}/components/InstallModal/ClusterConfigEditor.tsx (100%) rename packages/core/src/containers/Extensions/{Manager => Management}/components/InstallModal/ClusterConfigs.styles.ts (100%) rename packages/core/src/containers/Extensions/{Manager => Management}/components/InstallModal/ClusterConfigs.tsx (100%) rename packages/core/src/containers/Extensions/{Manager => Management}/components/InstallModal/ClusterSelections.styles.ts (100%) rename packages/core/src/containers/Extensions/{Manager => Management}/components/InstallModal/ClusterSelections.tsx (100%) rename packages/core/src/containers/Extensions/{Manager => Management}/components/InstallModal/ExtensionAction.helpers.ts (100%) rename packages/core/src/containers/Extensions/{Manager => Management}/components/InstallModal/ExtensionAction.styles.ts (100%) rename packages/core/src/containers/Extensions/{Manager => Management}/components/InstallModal/ExtensionAction.tsx (100%) rename packages/core/src/containers/Extensions/{Manager => Management}/components/InstallModal/ExtensionVersionSelection.helpers.ts (100%) rename packages/core/src/containers/Extensions/{Manager => Management}/components/InstallModal/ExtensionVersionSelection.shared.helpers.ts (100%) rename packages/core/src/containers/Extensions/{Manager => Management}/components/InstallModal/ExtensionVersionSelection.styles.ts (100%) rename packages/core/src/containers/Extensions/{Manager => Management}/components/InstallModal/ExtensionVersionSelection.tsx (100%) rename packages/core/src/containers/Extensions/{Manager => Management}/components/InstallModal/ExtensionVersions.styles.ts (100%) rename packages/core/src/containers/Extensions/{Manager => Management}/components/InstallModal/ExtensionVersions.tsx (100%) rename packages/core/src/containers/Extensions/{Manager => Management}/components/InstallModal/ExternalDependency.helpers.ts (100%) rename packages/core/src/containers/Extensions/{Manager => Management}/components/InstallModal/ExternalDependency.styles.ts (100%) rename packages/core/src/containers/Extensions/{Manager => Management}/components/InstallModal/ExternalDependency.tsx (96%) rename packages/core/src/containers/Extensions/{Manager => Management}/components/InstallModal/InstallModal.helpers.ts (100%) rename packages/core/src/containers/Extensions/{Manager => Management}/components/InstallModal/InstallModal.styles.ts (100%) rename packages/core/src/containers/Extensions/{Manager => Management}/components/InstallModal/InstallModal.tsx (100%) rename packages/core/src/containers/Extensions/{Manager => Management}/components/InstallModal/index.ts (100%) rename packages/core/src/containers/Extensions/{Manager => Management}/components/LogViewer/LogViewer.styles.ts (100%) rename packages/core/src/containers/Extensions/{Manager => Management}/components/LogViewer/LogViewer.tsx (100%) rename packages/core/src/containers/Extensions/{Manager => Management}/components/LogViewer/index.ts (100%) rename packages/core/src/containers/Extensions/{Manager => Management}/components/ResetDefaultConfigTip/ResetDefaultConfigConfirmModal.styles.ts (100%) rename packages/core/src/containers/Extensions/{Manager => Management}/components/ResetDefaultConfigTip/ResetDefaultConfigConfirmModal.tsx (100%) rename packages/core/src/containers/Extensions/{Manager => Management}/components/ResetDefaultConfigTip/ResetDefaultConfigTip.styles.ts (100%) rename packages/core/src/containers/Extensions/{Manager => Management}/components/ResetDefaultConfigTip/ResetDefaultConfigTip.tsx (100%) rename packages/core/src/containers/Extensions/{Manager => Management}/components/ResetDefaultConfigTip/index.ts (100%) rename packages/core/src/containers/Extensions/{Manager => Management}/components/shared.styles.ts (100%) rename packages/core/src/containers/Extensions/{Manager => Management}/constants/index.ts (100%) rename packages/core/src/containers/Extensions/{Manager => Management}/hooks/useLocalExtensionStatusItems/index.ts (100%) rename packages/core/src/containers/Extensions/{Manager => Management}/index.tsx (92%) rename packages/core/src/containers/Extensions/{Manager => Management}/styles.ts (100%) rename packages/core/src/containers/Extensions/{Manager => Management}/utils/installation.ts (100%) rename packages/core/src/containers/Extensions/{Manager => Management}/utils/status.tsx (100%) rename packages/core/src/containers/Extensions/{Manager => Management}/utils/version.ts (100%) diff --git a/packages/console/src/pages/platform/containers/Dashboard/DashboardCard/index.tsx b/packages/console/src/pages/platform/containers/Dashboard/DashboardCard/index.tsx index 885f1375a7a..d427eca4353 100644 --- a/packages/console/src/pages/platform/containers/Dashboard/DashboardCard/index.tsx +++ b/packages/console/src/pages/platform/containers/Dashboard/DashboardCard/index.tsx @@ -76,7 +76,7 @@ const DashboardCard = () => { title: 'EXTENSIONS_CENTER', desc: 'EXTENSION_DESC', name: 'INSTALLED_COMPONENT', - link: '/extensions/manager', + link: '/extensions/management', metric: 'platform_installplan_count', label: 'Powered by LuBan', hide: hideExtensions, diff --git a/packages/core/src/constants/extension.ts b/packages/core/src/constants/extension.ts index 8b92bd8d665..c02b0ffbde7 100644 --- a/packages/core/src/constants/extension.ts +++ b/packages/core/src/constants/extension.ts @@ -43,7 +43,7 @@ function getDetail({ } const EXTENSIONS_MARKETPLACE_PATH = `/extensions/marketplace`; -const EXTENSIONS_MANAGER_PATH = `/extensions/manager`; +const EXTENSIONS_MANAGEMENT_PATH = `/extensions/management`; const EXTENSIONS_PAGE_PATHS = { marketplace: { index: EXTENSIONS_MARKETPLACE_PATH, @@ -54,11 +54,11 @@ const EXTENSIONS_PAGE_PATHS = { version: options?.version, }), }, - manager: { - index: EXTENSIONS_MANAGER_PATH, + management: { + index: EXTENSIONS_MANAGEMENT_PATH, getDetail: (extensionName: string, options?: { version?: string }) => getDetail({ - basePath: EXTENSIONS_MANAGER_PATH, + basePath: EXTENSIONS_MANAGEMENT_PATH, extensionName, version: options?.version, }), diff --git a/packages/core/src/containers/Extensions/Manager/Detail/index.tsx b/packages/core/src/containers/Extensions/Management/Detail/index.tsx similarity index 98% rename from packages/core/src/containers/Extensions/Manager/Detail/index.tsx rename to packages/core/src/containers/Extensions/Management/Detail/index.tsx index d1a142a0e04..a413b2bb1d4 100644 --- a/packages/core/src/containers/Extensions/Manager/Detail/index.tsx +++ b/packages/core/src/containers/Extensions/Management/Detail/index.tsx @@ -30,7 +30,7 @@ import { DetailActionButtons } from '../components/DetailActionButtons'; import { InstalledVersionWrapper } from './styles'; import { useMarketplaceConfigQuery } from '../../../../stores/marketplace'; -export default function ExtensionsManagerDetail() { +export function ExtensionsManagementDetail() { const navigate = useNavigate(); const { name: extensionName = '', version: pathVersion } = useParams(); const { @@ -257,11 +257,11 @@ export default function ExtensionsManagerDetail() { isShowInstalledClusters={Boolean(isInstalled && isMultiClusterInstallation)} onVersionChange={(selectedVersion: string) => navigate( - EXTENSIONS_PAGE_PATHS.manager.getDetail(extensionName, { version: selectedVersion }), + EXTENSIONS_PAGE_PATHS.management.getDetail(extensionName, { version: selectedVersion }), { replace: true }, ) } - onBackButtonClick={() => navigate(EXTENSIONS_PAGE_PATHS.manager.index)} + onBackButtonClick={() => navigate(EXTENSIONS_PAGE_PATHS.management.index)} /> ); } diff --git a/packages/core/src/containers/Extensions/Manager/Detail/styles.ts b/packages/core/src/containers/Extensions/Management/Detail/styles.ts similarity index 100% rename from packages/core/src/containers/Extensions/Manager/Detail/styles.ts rename to packages/core/src/containers/Extensions/Management/Detail/styles.ts diff --git a/packages/core/src/containers/Extensions/Manager/actions/index.ts b/packages/core/src/containers/Extensions/Management/actions/index.ts similarity index 100% rename from packages/core/src/containers/Extensions/Manager/actions/index.ts rename to packages/core/src/containers/Extensions/Management/actions/index.ts diff --git a/packages/core/src/containers/Extensions/Manager/components/ClusterLogsModal/ClusterLog.styles.ts b/packages/core/src/containers/Extensions/Management/components/ClusterLogsModal/ClusterLog.styles.ts similarity index 100% rename from packages/core/src/containers/Extensions/Manager/components/ClusterLogsModal/ClusterLog.styles.ts rename to packages/core/src/containers/Extensions/Management/components/ClusterLogsModal/ClusterLog.styles.ts diff --git a/packages/core/src/containers/Extensions/Manager/components/ClusterLogsModal/ClusterLog.tsx b/packages/core/src/containers/Extensions/Management/components/ClusterLogsModal/ClusterLog.tsx similarity index 100% rename from packages/core/src/containers/Extensions/Manager/components/ClusterLogsModal/ClusterLog.tsx rename to packages/core/src/containers/Extensions/Management/components/ClusterLogsModal/ClusterLog.tsx diff --git a/packages/core/src/containers/Extensions/Manager/components/ClusterLogsModal/ClusterLogsModal.styles.ts b/packages/core/src/containers/Extensions/Management/components/ClusterLogsModal/ClusterLogsModal.styles.ts similarity index 100% rename from packages/core/src/containers/Extensions/Manager/components/ClusterLogsModal/ClusterLogsModal.styles.ts rename to packages/core/src/containers/Extensions/Management/components/ClusterLogsModal/ClusterLogsModal.styles.ts diff --git a/packages/core/src/containers/Extensions/Manager/components/ClusterLogsModal/ClusterLogsModal.tsx b/packages/core/src/containers/Extensions/Management/components/ClusterLogsModal/ClusterLogsModal.tsx similarity index 100% rename from packages/core/src/containers/Extensions/Manager/components/ClusterLogsModal/ClusterLogsModal.tsx rename to packages/core/src/containers/Extensions/Management/components/ClusterLogsModal/ClusterLogsModal.tsx diff --git a/packages/core/src/containers/Extensions/Manager/components/ClusterLogsModal/ClusterTabLabel.styles.ts b/packages/core/src/containers/Extensions/Management/components/ClusterLogsModal/ClusterTabLabel.styles.ts similarity index 100% rename from packages/core/src/containers/Extensions/Manager/components/ClusterLogsModal/ClusterTabLabel.styles.ts rename to packages/core/src/containers/Extensions/Management/components/ClusterLogsModal/ClusterTabLabel.styles.ts diff --git a/packages/core/src/containers/Extensions/Manager/components/ClusterLogsModal/ClusterTabLabel.tsx b/packages/core/src/containers/Extensions/Management/components/ClusterLogsModal/ClusterTabLabel.tsx similarity index 100% rename from packages/core/src/containers/Extensions/Manager/components/ClusterLogsModal/ClusterTabLabel.tsx rename to packages/core/src/containers/Extensions/Management/components/ClusterLogsModal/ClusterTabLabel.tsx diff --git a/packages/core/src/containers/Extensions/Manager/components/ClusterLogsModal/Progress.styles.ts b/packages/core/src/containers/Extensions/Management/components/ClusterLogsModal/Progress.styles.ts similarity index 100% rename from packages/core/src/containers/Extensions/Manager/components/ClusterLogsModal/Progress.styles.ts rename to packages/core/src/containers/Extensions/Management/components/ClusterLogsModal/Progress.styles.ts diff --git a/packages/core/src/containers/Extensions/Manager/components/ClusterLogsModal/Progress.tsx b/packages/core/src/containers/Extensions/Management/components/ClusterLogsModal/Progress.tsx similarity index 100% rename from packages/core/src/containers/Extensions/Manager/components/ClusterLogsModal/Progress.tsx rename to packages/core/src/containers/Extensions/Management/components/ClusterLogsModal/Progress.tsx diff --git a/packages/core/src/containers/Extensions/Manager/components/ClusterLogsModal/index.ts b/packages/core/src/containers/Extensions/Management/components/ClusterLogsModal/index.ts similarity index 100% rename from packages/core/src/containers/Extensions/Manager/components/ClusterLogsModal/index.ts rename to packages/core/src/containers/Extensions/Management/components/ClusterLogsModal/index.ts diff --git a/packages/core/src/containers/Extensions/Manager/components/ClusterLogsModal/shared.styles.ts b/packages/core/src/containers/Extensions/Management/components/ClusterLogsModal/shared.styles.ts similarity index 100% rename from packages/core/src/containers/Extensions/Manager/components/ClusterLogsModal/shared.styles.ts rename to packages/core/src/containers/Extensions/Management/components/ClusterLogsModal/shared.styles.ts diff --git a/packages/core/src/containers/Extensions/Manager/components/DetailActionButtons/ActionButton.styles.ts b/packages/core/src/containers/Extensions/Management/components/DetailActionButtons/ActionButton.styles.ts similarity index 100% rename from packages/core/src/containers/Extensions/Manager/components/DetailActionButtons/ActionButton.styles.ts rename to packages/core/src/containers/Extensions/Management/components/DetailActionButtons/ActionButton.styles.ts diff --git a/packages/core/src/containers/Extensions/Manager/components/DetailActionButtons/ActionButton.tsx b/packages/core/src/containers/Extensions/Management/components/DetailActionButtons/ActionButton.tsx similarity index 100% rename from packages/core/src/containers/Extensions/Manager/components/DetailActionButtons/ActionButton.tsx rename to packages/core/src/containers/Extensions/Management/components/DetailActionButtons/ActionButton.tsx diff --git a/packages/core/src/containers/Extensions/Manager/components/DetailActionButtons/ActionMenus.styles.ts b/packages/core/src/containers/Extensions/Management/components/DetailActionButtons/ActionMenus.styles.ts similarity index 100% rename from packages/core/src/containers/Extensions/Manager/components/DetailActionButtons/ActionMenus.styles.ts rename to packages/core/src/containers/Extensions/Management/components/DetailActionButtons/ActionMenus.styles.ts diff --git a/packages/core/src/containers/Extensions/Manager/components/DetailActionButtons/ActionMenus.tsx b/packages/core/src/containers/Extensions/Management/components/DetailActionButtons/ActionMenus.tsx similarity index 100% rename from packages/core/src/containers/Extensions/Manager/components/DetailActionButtons/ActionMenus.tsx rename to packages/core/src/containers/Extensions/Management/components/DetailActionButtons/ActionMenus.tsx diff --git a/packages/core/src/containers/Extensions/Manager/components/DetailActionButtons/DetailActionButtons.styles.ts b/packages/core/src/containers/Extensions/Management/components/DetailActionButtons/DetailActionButtons.styles.ts similarity index 100% rename from packages/core/src/containers/Extensions/Manager/components/DetailActionButtons/DetailActionButtons.styles.ts rename to packages/core/src/containers/Extensions/Management/components/DetailActionButtons/DetailActionButtons.styles.ts diff --git a/packages/core/src/containers/Extensions/Manager/components/DetailActionButtons/DetailActionButtons.tsx b/packages/core/src/containers/Extensions/Management/components/DetailActionButtons/DetailActionButtons.tsx similarity index 100% rename from packages/core/src/containers/Extensions/Manager/components/DetailActionButtons/DetailActionButtons.tsx rename to packages/core/src/containers/Extensions/Management/components/DetailActionButtons/DetailActionButtons.tsx diff --git a/packages/core/src/containers/Extensions/Manager/components/DetailActionButtons/LogButton.tsx b/packages/core/src/containers/Extensions/Management/components/DetailActionButtons/LogButton.tsx similarity index 100% rename from packages/core/src/containers/Extensions/Manager/components/DetailActionButtons/LogButton.tsx rename to packages/core/src/containers/Extensions/Management/components/DetailActionButtons/LogButton.tsx diff --git a/packages/core/src/containers/Extensions/Manager/components/DetailActionButtons/UpdateTip.styles.ts b/packages/core/src/containers/Extensions/Management/components/DetailActionButtons/UpdateTip.styles.ts similarity index 100% rename from packages/core/src/containers/Extensions/Manager/components/DetailActionButtons/UpdateTip.styles.ts rename to packages/core/src/containers/Extensions/Management/components/DetailActionButtons/UpdateTip.styles.ts diff --git a/packages/core/src/containers/Extensions/Manager/components/DetailActionButtons/UpdateTip.tsx b/packages/core/src/containers/Extensions/Management/components/DetailActionButtons/UpdateTip.tsx similarity index 100% rename from packages/core/src/containers/Extensions/Manager/components/DetailActionButtons/UpdateTip.tsx rename to packages/core/src/containers/Extensions/Management/components/DetailActionButtons/UpdateTip.tsx diff --git a/packages/core/src/containers/Extensions/Manager/components/DetailActionButtons/index.ts b/packages/core/src/containers/Extensions/Management/components/DetailActionButtons/index.ts similarity index 100% rename from packages/core/src/containers/Extensions/Manager/components/DetailActionButtons/index.ts rename to packages/core/src/containers/Extensions/Management/components/DetailActionButtons/index.ts diff --git a/packages/core/src/containers/Extensions/Manager/components/ExtensionConfig/ExtensionConfig.styles.ts b/packages/core/src/containers/Extensions/Management/components/ExtensionConfig/ExtensionConfig.styles.ts similarity index 100% rename from packages/core/src/containers/Extensions/Manager/components/ExtensionConfig/ExtensionConfig.styles.ts rename to packages/core/src/containers/Extensions/Management/components/ExtensionConfig/ExtensionConfig.styles.ts diff --git a/packages/core/src/containers/Extensions/Manager/components/ExtensionConfig/ExtensionConfig.tsx b/packages/core/src/containers/Extensions/Management/components/ExtensionConfig/ExtensionConfig.tsx similarity index 100% rename from packages/core/src/containers/Extensions/Manager/components/ExtensionConfig/ExtensionConfig.tsx rename to packages/core/src/containers/Extensions/Management/components/ExtensionConfig/ExtensionConfig.tsx diff --git a/packages/core/src/containers/Extensions/Manager/components/ExtensionConfig/index.ts b/packages/core/src/containers/Extensions/Management/components/ExtensionConfig/index.ts similarity index 100% rename from packages/core/src/containers/Extensions/Manager/components/ExtensionConfig/index.ts rename to packages/core/src/containers/Extensions/Management/components/ExtensionConfig/index.ts diff --git a/packages/core/src/containers/Extensions/Manager/components/ExtensionConfigModal/ExtensionConfigModal.styles.ts b/packages/core/src/containers/Extensions/Management/components/ExtensionConfigModal/ExtensionConfigModal.styles.ts similarity index 100% rename from packages/core/src/containers/Extensions/Manager/components/ExtensionConfigModal/ExtensionConfigModal.styles.ts rename to packages/core/src/containers/Extensions/Management/components/ExtensionConfigModal/ExtensionConfigModal.styles.ts diff --git a/packages/core/src/containers/Extensions/Manager/components/ExtensionConfigModal/ExtensionConfigModal.tsx b/packages/core/src/containers/Extensions/Management/components/ExtensionConfigModal/ExtensionConfigModal.tsx similarity index 100% rename from packages/core/src/containers/Extensions/Manager/components/ExtensionConfigModal/ExtensionConfigModal.tsx rename to packages/core/src/containers/Extensions/Management/components/ExtensionConfigModal/ExtensionConfigModal.tsx diff --git a/packages/core/src/containers/Extensions/Manager/components/ExtensionConfigModal/index.ts b/packages/core/src/containers/Extensions/Management/components/ExtensionConfigModal/index.ts similarity index 100% rename from packages/core/src/containers/Extensions/Manager/components/ExtensionConfigModal/index.ts rename to packages/core/src/containers/Extensions/Management/components/ExtensionConfigModal/index.ts diff --git a/packages/core/src/containers/Extensions/Manager/components/ExtensionForceUninstallConfirmModal/ExtensionForceUninstallConfirmModal.tsx b/packages/core/src/containers/Extensions/Management/components/ExtensionForceUninstallConfirmModal/ExtensionForceUninstallConfirmModal.tsx similarity index 100% rename from packages/core/src/containers/Extensions/Manager/components/ExtensionForceUninstallConfirmModal/ExtensionForceUninstallConfirmModal.tsx rename to packages/core/src/containers/Extensions/Management/components/ExtensionForceUninstallConfirmModal/ExtensionForceUninstallConfirmModal.tsx diff --git a/packages/core/src/containers/Extensions/Manager/components/ExtensionForceUninstallConfirmModal/index.ts b/packages/core/src/containers/Extensions/Management/components/ExtensionForceUninstallConfirmModal/index.ts similarity index 100% rename from packages/core/src/containers/Extensions/Manager/components/ExtensionForceUninstallConfirmModal/index.ts rename to packages/core/src/containers/Extensions/Management/components/ExtensionForceUninstallConfirmModal/index.ts diff --git a/packages/core/src/containers/Extensions/Manager/components/ExtensionLogButton/ExtensionLogButton.styles.ts b/packages/core/src/containers/Extensions/Management/components/ExtensionLogButton/ExtensionLogButton.styles.ts similarity index 100% rename from packages/core/src/containers/Extensions/Manager/components/ExtensionLogButton/ExtensionLogButton.styles.ts rename to packages/core/src/containers/Extensions/Management/components/ExtensionLogButton/ExtensionLogButton.styles.ts diff --git a/packages/core/src/containers/Extensions/Manager/components/ExtensionLogButton/ExtensionLogButton.tsx b/packages/core/src/containers/Extensions/Management/components/ExtensionLogButton/ExtensionLogButton.tsx similarity index 100% rename from packages/core/src/containers/Extensions/Manager/components/ExtensionLogButton/ExtensionLogButton.tsx rename to packages/core/src/containers/Extensions/Management/components/ExtensionLogButton/ExtensionLogButton.tsx diff --git a/packages/core/src/containers/Extensions/Manager/components/ExtensionLogButton/index.ts b/packages/core/src/containers/Extensions/Management/components/ExtensionLogButton/index.ts similarity index 100% rename from packages/core/src/containers/Extensions/Manager/components/ExtensionLogButton/index.ts rename to packages/core/src/containers/Extensions/Management/components/ExtensionLogButton/index.ts diff --git a/packages/core/src/containers/Extensions/Manager/components/ExtensionLogModal/ExtensionLogModal.styles.ts b/packages/core/src/containers/Extensions/Management/components/ExtensionLogModal/ExtensionLogModal.styles.ts similarity index 100% rename from packages/core/src/containers/Extensions/Manager/components/ExtensionLogModal/ExtensionLogModal.styles.ts rename to packages/core/src/containers/Extensions/Management/components/ExtensionLogModal/ExtensionLogModal.styles.ts diff --git a/packages/core/src/containers/Extensions/Manager/components/ExtensionLogModal/ExtensionLogModal.tsx b/packages/core/src/containers/Extensions/Management/components/ExtensionLogModal/ExtensionLogModal.tsx similarity index 100% rename from packages/core/src/containers/Extensions/Manager/components/ExtensionLogModal/ExtensionLogModal.tsx rename to packages/core/src/containers/Extensions/Management/components/ExtensionLogModal/ExtensionLogModal.tsx diff --git a/packages/core/src/containers/Extensions/Manager/components/ExtensionLogModal/index.ts b/packages/core/src/containers/Extensions/Management/components/ExtensionLogModal/index.ts similarity index 100% rename from packages/core/src/containers/Extensions/Manager/components/ExtensionLogModal/index.ts rename to packages/core/src/containers/Extensions/Management/components/ExtensionLogModal/index.ts diff --git a/packages/core/src/containers/Extensions/Manager/components/ExtensionMultiClusterLogsButton/ExtensionMultiClusterLogsButton.styles.ts b/packages/core/src/containers/Extensions/Management/components/ExtensionMultiClusterLogsButton/ExtensionMultiClusterLogsButton.styles.ts similarity index 100% rename from packages/core/src/containers/Extensions/Manager/components/ExtensionMultiClusterLogsButton/ExtensionMultiClusterLogsButton.styles.ts rename to packages/core/src/containers/Extensions/Management/components/ExtensionMultiClusterLogsButton/ExtensionMultiClusterLogsButton.styles.ts diff --git a/packages/core/src/containers/Extensions/Manager/components/ExtensionMultiClusterLogsButton/ExtensionMultiClusterLogsButton.tsx b/packages/core/src/containers/Extensions/Management/components/ExtensionMultiClusterLogsButton/ExtensionMultiClusterLogsButton.tsx similarity index 100% rename from packages/core/src/containers/Extensions/Manager/components/ExtensionMultiClusterLogsButton/ExtensionMultiClusterLogsButton.tsx rename to packages/core/src/containers/Extensions/Management/components/ExtensionMultiClusterLogsButton/ExtensionMultiClusterLogsButton.tsx diff --git a/packages/core/src/containers/Extensions/Manager/components/ExtensionMultiClusterLogsButton/PopoverContent.styles.ts b/packages/core/src/containers/Extensions/Management/components/ExtensionMultiClusterLogsButton/PopoverContent.styles.ts similarity index 100% rename from packages/core/src/containers/Extensions/Manager/components/ExtensionMultiClusterLogsButton/PopoverContent.styles.ts rename to packages/core/src/containers/Extensions/Management/components/ExtensionMultiClusterLogsButton/PopoverContent.styles.ts diff --git a/packages/core/src/containers/Extensions/Manager/components/ExtensionMultiClusterLogsButton/PopoverContent.tsx b/packages/core/src/containers/Extensions/Management/components/ExtensionMultiClusterLogsButton/PopoverContent.tsx similarity index 100% rename from packages/core/src/containers/Extensions/Manager/components/ExtensionMultiClusterLogsButton/PopoverContent.tsx rename to packages/core/src/containers/Extensions/Management/components/ExtensionMultiClusterLogsButton/PopoverContent.tsx diff --git a/packages/core/src/containers/Extensions/Manager/components/ExtensionMultiClusterLogsButton/index.ts b/packages/core/src/containers/Extensions/Management/components/ExtensionMultiClusterLogsButton/index.ts similarity index 100% rename from packages/core/src/containers/Extensions/Manager/components/ExtensionMultiClusterLogsButton/index.ts rename to packages/core/src/containers/Extensions/Management/components/ExtensionMultiClusterLogsButton/index.ts diff --git a/packages/core/src/containers/Extensions/Manager/components/ExtensionUninstallConfirmModal/ExtensionUninstallConfirmModal.tsx b/packages/core/src/containers/Extensions/Management/components/ExtensionUninstallConfirmModal/ExtensionUninstallConfirmModal.tsx similarity index 100% rename from packages/core/src/containers/Extensions/Manager/components/ExtensionUninstallConfirmModal/ExtensionUninstallConfirmModal.tsx rename to packages/core/src/containers/Extensions/Management/components/ExtensionUninstallConfirmModal/ExtensionUninstallConfirmModal.tsx diff --git a/packages/core/src/containers/Extensions/Manager/components/ExtensionUninstallConfirmModal/index.ts b/packages/core/src/containers/Extensions/Management/components/ExtensionUninstallConfirmModal/index.ts similarity index 100% rename from packages/core/src/containers/Extensions/Manager/components/ExtensionUninstallConfirmModal/index.ts rename to packages/core/src/containers/Extensions/Management/components/ExtensionUninstallConfirmModal/index.ts diff --git a/packages/core/src/containers/Extensions/Manager/components/Extensions/DEPRECATED_ListActionButtons.styles.ts b/packages/core/src/containers/Extensions/Management/components/Extensions/DEPRECATED_ListActionButtons.styles.ts similarity index 100% rename from packages/core/src/containers/Extensions/Manager/components/Extensions/DEPRECATED_ListActionButtons.styles.ts rename to packages/core/src/containers/Extensions/Management/components/Extensions/DEPRECATED_ListActionButtons.styles.ts diff --git a/packages/core/src/containers/Extensions/Manager/components/Extensions/DEPRECATED_ListActionButtons.tsx b/packages/core/src/containers/Extensions/Management/components/Extensions/DEPRECATED_ListActionButtons.tsx similarity index 100% rename from packages/core/src/containers/Extensions/Manager/components/Extensions/DEPRECATED_ListActionButtons.tsx rename to packages/core/src/containers/Extensions/Management/components/Extensions/DEPRECATED_ListActionButtons.tsx diff --git a/packages/core/src/containers/Extensions/Manager/components/Extensions/ExtensionStatus.styles.ts b/packages/core/src/containers/Extensions/Management/components/Extensions/ExtensionStatus.styles.ts similarity index 100% rename from packages/core/src/containers/Extensions/Manager/components/Extensions/ExtensionStatus.styles.ts rename to packages/core/src/containers/Extensions/Management/components/Extensions/ExtensionStatus.styles.ts diff --git a/packages/core/src/containers/Extensions/Manager/components/Extensions/ExtensionStatus.tsx b/packages/core/src/containers/Extensions/Management/components/Extensions/ExtensionStatus.tsx similarity index 100% rename from packages/core/src/containers/Extensions/Manager/components/Extensions/ExtensionStatus.tsx rename to packages/core/src/containers/Extensions/Management/components/Extensions/ExtensionStatus.tsx diff --git a/packages/core/src/containers/Extensions/Manager/components/Extensions/Extensions.styles.ts b/packages/core/src/containers/Extensions/Management/components/Extensions/Extensions.styles.ts similarity index 100% rename from packages/core/src/containers/Extensions/Manager/components/Extensions/Extensions.styles.ts rename to packages/core/src/containers/Extensions/Management/components/Extensions/Extensions.styles.ts diff --git a/packages/core/src/containers/Extensions/Manager/components/Extensions/Extensions.tsx b/packages/core/src/containers/Extensions/Management/components/Extensions/Extensions.tsx similarity index 99% rename from packages/core/src/containers/Extensions/Manager/components/Extensions/Extensions.tsx rename to packages/core/src/containers/Extensions/Management/components/Extensions/Extensions.tsx index 6ce1bd4b485..a9e4ddeb412 100644 --- a/packages/core/src/containers/Extensions/Manager/components/Extensions/Extensions.tsx +++ b/packages/core/src/containers/Extensions/Management/components/Extensions/Extensions.tsx @@ -209,7 +209,9 @@ function Extensions() { return ( {localeDisplayName} + + {localeDisplayName} + } label={localeDescription} avatar={} diff --git a/packages/core/src/containers/Extensions/Manager/components/Extensions/ExtensionsEmpty.styles.ts b/packages/core/src/containers/Extensions/Management/components/Extensions/ExtensionsEmpty.styles.ts similarity index 100% rename from packages/core/src/containers/Extensions/Manager/components/Extensions/ExtensionsEmpty.styles.ts rename to packages/core/src/containers/Extensions/Management/components/Extensions/ExtensionsEmpty.styles.ts diff --git a/packages/core/src/containers/Extensions/Manager/components/Extensions/ExtensionsEmpty.tsx b/packages/core/src/containers/Extensions/Management/components/Extensions/ExtensionsEmpty.tsx similarity index 100% rename from packages/core/src/containers/Extensions/Manager/components/Extensions/ExtensionsEmpty.tsx rename to packages/core/src/containers/Extensions/Management/components/Extensions/ExtensionsEmpty.tsx diff --git a/packages/core/src/containers/Extensions/Manager/components/Extensions/ListActionButtons.styles.ts b/packages/core/src/containers/Extensions/Management/components/Extensions/ListActionButtons.styles.ts similarity index 100% rename from packages/core/src/containers/Extensions/Manager/components/Extensions/ListActionButtons.styles.ts rename to packages/core/src/containers/Extensions/Management/components/Extensions/ListActionButtons.styles.ts diff --git a/packages/core/src/containers/Extensions/Manager/components/Extensions/ListActionButtons.tsx b/packages/core/src/containers/Extensions/Management/components/Extensions/ListActionButtons.tsx similarity index 100% rename from packages/core/src/containers/Extensions/Manager/components/Extensions/ListActionButtons.tsx rename to packages/core/src/containers/Extensions/Management/components/Extensions/ListActionButtons.tsx diff --git a/packages/core/src/containers/Extensions/Manager/components/Extensions/MarketplaceAccount.styles.ts b/packages/core/src/containers/Extensions/Management/components/Extensions/MarketplaceAccount.styles.ts similarity index 100% rename from packages/core/src/containers/Extensions/Manager/components/Extensions/MarketplaceAccount.styles.ts rename to packages/core/src/containers/Extensions/Management/components/Extensions/MarketplaceAccount.styles.ts diff --git a/packages/core/src/containers/Extensions/Manager/components/Extensions/MarketplaceAccount.tsx b/packages/core/src/containers/Extensions/Management/components/Extensions/MarketplaceAccount.tsx similarity index 100% rename from packages/core/src/containers/Extensions/Manager/components/Extensions/MarketplaceAccount.tsx rename to packages/core/src/containers/Extensions/Management/components/Extensions/MarketplaceAccount.tsx diff --git a/packages/core/src/containers/Extensions/Manager/components/Extensions/MarketplaceUserEmpty.styles.ts b/packages/core/src/containers/Extensions/Management/components/Extensions/MarketplaceUserEmpty.styles.ts similarity index 100% rename from packages/core/src/containers/Extensions/Manager/components/Extensions/MarketplaceUserEmpty.styles.ts rename to packages/core/src/containers/Extensions/Management/components/Extensions/MarketplaceUserEmpty.styles.ts diff --git a/packages/core/src/containers/Extensions/Manager/components/Extensions/MarketplaceUserEmpty.tsx b/packages/core/src/containers/Extensions/Management/components/Extensions/MarketplaceUserEmpty.tsx similarity index 100% rename from packages/core/src/containers/Extensions/Manager/components/Extensions/MarketplaceUserEmpty.tsx rename to packages/core/src/containers/Extensions/Management/components/Extensions/MarketplaceUserEmpty.tsx diff --git a/packages/core/src/containers/Extensions/Manager/components/Extensions/index.ts b/packages/core/src/containers/Extensions/Management/components/Extensions/index.ts similarity index 100% rename from packages/core/src/containers/Extensions/Manager/components/Extensions/index.ts rename to packages/core/src/containers/Extensions/Management/components/Extensions/index.ts diff --git a/packages/core/src/containers/Extensions/Manager/components/Extensions/shared.styles.ts b/packages/core/src/containers/Extensions/Management/components/Extensions/shared.styles.ts similarity index 100% rename from packages/core/src/containers/Extensions/Manager/components/Extensions/shared.styles.ts rename to packages/core/src/containers/Extensions/Management/components/Extensions/shared.styles.ts diff --git a/packages/core/src/containers/Extensions/Manager/components/InstallModal/ClusterConfigEditor.styles.ts b/packages/core/src/containers/Extensions/Management/components/InstallModal/ClusterConfigEditor.styles.ts similarity index 100% rename from packages/core/src/containers/Extensions/Manager/components/InstallModal/ClusterConfigEditor.styles.ts rename to packages/core/src/containers/Extensions/Management/components/InstallModal/ClusterConfigEditor.styles.ts diff --git a/packages/core/src/containers/Extensions/Manager/components/InstallModal/ClusterConfigEditor.tsx b/packages/core/src/containers/Extensions/Management/components/InstallModal/ClusterConfigEditor.tsx similarity index 100% rename from packages/core/src/containers/Extensions/Manager/components/InstallModal/ClusterConfigEditor.tsx rename to packages/core/src/containers/Extensions/Management/components/InstallModal/ClusterConfigEditor.tsx diff --git a/packages/core/src/containers/Extensions/Manager/components/InstallModal/ClusterConfigs.styles.ts b/packages/core/src/containers/Extensions/Management/components/InstallModal/ClusterConfigs.styles.ts similarity index 100% rename from packages/core/src/containers/Extensions/Manager/components/InstallModal/ClusterConfigs.styles.ts rename to packages/core/src/containers/Extensions/Management/components/InstallModal/ClusterConfigs.styles.ts diff --git a/packages/core/src/containers/Extensions/Manager/components/InstallModal/ClusterConfigs.tsx b/packages/core/src/containers/Extensions/Management/components/InstallModal/ClusterConfigs.tsx similarity index 100% rename from packages/core/src/containers/Extensions/Manager/components/InstallModal/ClusterConfigs.tsx rename to packages/core/src/containers/Extensions/Management/components/InstallModal/ClusterConfigs.tsx diff --git a/packages/core/src/containers/Extensions/Manager/components/InstallModal/ClusterSelections.styles.ts b/packages/core/src/containers/Extensions/Management/components/InstallModal/ClusterSelections.styles.ts similarity index 100% rename from packages/core/src/containers/Extensions/Manager/components/InstallModal/ClusterSelections.styles.ts rename to packages/core/src/containers/Extensions/Management/components/InstallModal/ClusterSelections.styles.ts diff --git a/packages/core/src/containers/Extensions/Manager/components/InstallModal/ClusterSelections.tsx b/packages/core/src/containers/Extensions/Management/components/InstallModal/ClusterSelections.tsx similarity index 100% rename from packages/core/src/containers/Extensions/Manager/components/InstallModal/ClusterSelections.tsx rename to packages/core/src/containers/Extensions/Management/components/InstallModal/ClusterSelections.tsx diff --git a/packages/core/src/containers/Extensions/Manager/components/InstallModal/ExtensionAction.helpers.ts b/packages/core/src/containers/Extensions/Management/components/InstallModal/ExtensionAction.helpers.ts similarity index 100% rename from packages/core/src/containers/Extensions/Manager/components/InstallModal/ExtensionAction.helpers.ts rename to packages/core/src/containers/Extensions/Management/components/InstallModal/ExtensionAction.helpers.ts diff --git a/packages/core/src/containers/Extensions/Manager/components/InstallModal/ExtensionAction.styles.ts b/packages/core/src/containers/Extensions/Management/components/InstallModal/ExtensionAction.styles.ts similarity index 100% rename from packages/core/src/containers/Extensions/Manager/components/InstallModal/ExtensionAction.styles.ts rename to packages/core/src/containers/Extensions/Management/components/InstallModal/ExtensionAction.styles.ts diff --git a/packages/core/src/containers/Extensions/Manager/components/InstallModal/ExtensionAction.tsx b/packages/core/src/containers/Extensions/Management/components/InstallModal/ExtensionAction.tsx similarity index 100% rename from packages/core/src/containers/Extensions/Manager/components/InstallModal/ExtensionAction.tsx rename to packages/core/src/containers/Extensions/Management/components/InstallModal/ExtensionAction.tsx diff --git a/packages/core/src/containers/Extensions/Manager/components/InstallModal/ExtensionVersionSelection.helpers.ts b/packages/core/src/containers/Extensions/Management/components/InstallModal/ExtensionVersionSelection.helpers.ts similarity index 100% rename from packages/core/src/containers/Extensions/Manager/components/InstallModal/ExtensionVersionSelection.helpers.ts rename to packages/core/src/containers/Extensions/Management/components/InstallModal/ExtensionVersionSelection.helpers.ts diff --git a/packages/core/src/containers/Extensions/Manager/components/InstallModal/ExtensionVersionSelection.shared.helpers.ts b/packages/core/src/containers/Extensions/Management/components/InstallModal/ExtensionVersionSelection.shared.helpers.ts similarity index 100% rename from packages/core/src/containers/Extensions/Manager/components/InstallModal/ExtensionVersionSelection.shared.helpers.ts rename to packages/core/src/containers/Extensions/Management/components/InstallModal/ExtensionVersionSelection.shared.helpers.ts diff --git a/packages/core/src/containers/Extensions/Manager/components/InstallModal/ExtensionVersionSelection.styles.ts b/packages/core/src/containers/Extensions/Management/components/InstallModal/ExtensionVersionSelection.styles.ts similarity index 100% rename from packages/core/src/containers/Extensions/Manager/components/InstallModal/ExtensionVersionSelection.styles.ts rename to packages/core/src/containers/Extensions/Management/components/InstallModal/ExtensionVersionSelection.styles.ts diff --git a/packages/core/src/containers/Extensions/Manager/components/InstallModal/ExtensionVersionSelection.tsx b/packages/core/src/containers/Extensions/Management/components/InstallModal/ExtensionVersionSelection.tsx similarity index 100% rename from packages/core/src/containers/Extensions/Manager/components/InstallModal/ExtensionVersionSelection.tsx rename to packages/core/src/containers/Extensions/Management/components/InstallModal/ExtensionVersionSelection.tsx diff --git a/packages/core/src/containers/Extensions/Manager/components/InstallModal/ExtensionVersions.styles.ts b/packages/core/src/containers/Extensions/Management/components/InstallModal/ExtensionVersions.styles.ts similarity index 100% rename from packages/core/src/containers/Extensions/Manager/components/InstallModal/ExtensionVersions.styles.ts rename to packages/core/src/containers/Extensions/Management/components/InstallModal/ExtensionVersions.styles.ts diff --git a/packages/core/src/containers/Extensions/Manager/components/InstallModal/ExtensionVersions.tsx b/packages/core/src/containers/Extensions/Management/components/InstallModal/ExtensionVersions.tsx similarity index 100% rename from packages/core/src/containers/Extensions/Manager/components/InstallModal/ExtensionVersions.tsx rename to packages/core/src/containers/Extensions/Management/components/InstallModal/ExtensionVersions.tsx diff --git a/packages/core/src/containers/Extensions/Manager/components/InstallModal/ExternalDependency.helpers.ts b/packages/core/src/containers/Extensions/Management/components/InstallModal/ExternalDependency.helpers.ts similarity index 100% rename from packages/core/src/containers/Extensions/Manager/components/InstallModal/ExternalDependency.helpers.ts rename to packages/core/src/containers/Extensions/Management/components/InstallModal/ExternalDependency.helpers.ts diff --git a/packages/core/src/containers/Extensions/Manager/components/InstallModal/ExternalDependency.styles.ts b/packages/core/src/containers/Extensions/Management/components/InstallModal/ExternalDependency.styles.ts similarity index 100% rename from packages/core/src/containers/Extensions/Manager/components/InstallModal/ExternalDependency.styles.ts rename to packages/core/src/containers/Extensions/Management/components/InstallModal/ExternalDependency.styles.ts diff --git a/packages/core/src/containers/Extensions/Manager/components/InstallModal/ExternalDependency.tsx b/packages/core/src/containers/Extensions/Management/components/InstallModal/ExternalDependency.tsx similarity index 96% rename from packages/core/src/containers/Extensions/Manager/components/InstallModal/ExternalDependency.tsx rename to packages/core/src/containers/Extensions/Management/components/InstallModal/ExternalDependency.tsx index 74db06550c5..e315f399203 100644 --- a/packages/core/src/containers/Extensions/Manager/components/InstallModal/ExternalDependency.tsx +++ b/packages/core/src/containers/Extensions/Management/components/InstallModal/ExternalDependency.tsx @@ -40,7 +40,7 @@ function ExternalDependency({ const localeDescription = dependencyFormattedExtension?.localeDescription; const nameContent = isExtensionExists ? ( - {dependencyLocaleDisplayName} + {dependencyLocaleDisplayName} ) : ( {dependencyLocaleDisplayName} diff --git a/packages/core/src/containers/Extensions/Manager/components/InstallModal/InstallModal.helpers.ts b/packages/core/src/containers/Extensions/Management/components/InstallModal/InstallModal.helpers.ts similarity index 100% rename from packages/core/src/containers/Extensions/Manager/components/InstallModal/InstallModal.helpers.ts rename to packages/core/src/containers/Extensions/Management/components/InstallModal/InstallModal.helpers.ts diff --git a/packages/core/src/containers/Extensions/Manager/components/InstallModal/InstallModal.styles.ts b/packages/core/src/containers/Extensions/Management/components/InstallModal/InstallModal.styles.ts similarity index 100% rename from packages/core/src/containers/Extensions/Manager/components/InstallModal/InstallModal.styles.ts rename to packages/core/src/containers/Extensions/Management/components/InstallModal/InstallModal.styles.ts diff --git a/packages/core/src/containers/Extensions/Manager/components/InstallModal/InstallModal.tsx b/packages/core/src/containers/Extensions/Management/components/InstallModal/InstallModal.tsx similarity index 100% rename from packages/core/src/containers/Extensions/Manager/components/InstallModal/InstallModal.tsx rename to packages/core/src/containers/Extensions/Management/components/InstallModal/InstallModal.tsx diff --git a/packages/core/src/containers/Extensions/Manager/components/InstallModal/index.ts b/packages/core/src/containers/Extensions/Management/components/InstallModal/index.ts similarity index 100% rename from packages/core/src/containers/Extensions/Manager/components/InstallModal/index.ts rename to packages/core/src/containers/Extensions/Management/components/InstallModal/index.ts diff --git a/packages/core/src/containers/Extensions/Manager/components/LogViewer/LogViewer.styles.ts b/packages/core/src/containers/Extensions/Management/components/LogViewer/LogViewer.styles.ts similarity index 100% rename from packages/core/src/containers/Extensions/Manager/components/LogViewer/LogViewer.styles.ts rename to packages/core/src/containers/Extensions/Management/components/LogViewer/LogViewer.styles.ts diff --git a/packages/core/src/containers/Extensions/Manager/components/LogViewer/LogViewer.tsx b/packages/core/src/containers/Extensions/Management/components/LogViewer/LogViewer.tsx similarity index 100% rename from packages/core/src/containers/Extensions/Manager/components/LogViewer/LogViewer.tsx rename to packages/core/src/containers/Extensions/Management/components/LogViewer/LogViewer.tsx diff --git a/packages/core/src/containers/Extensions/Manager/components/LogViewer/index.ts b/packages/core/src/containers/Extensions/Management/components/LogViewer/index.ts similarity index 100% rename from packages/core/src/containers/Extensions/Manager/components/LogViewer/index.ts rename to packages/core/src/containers/Extensions/Management/components/LogViewer/index.ts diff --git a/packages/core/src/containers/Extensions/Manager/components/ResetDefaultConfigTip/ResetDefaultConfigConfirmModal.styles.ts b/packages/core/src/containers/Extensions/Management/components/ResetDefaultConfigTip/ResetDefaultConfigConfirmModal.styles.ts similarity index 100% rename from packages/core/src/containers/Extensions/Manager/components/ResetDefaultConfigTip/ResetDefaultConfigConfirmModal.styles.ts rename to packages/core/src/containers/Extensions/Management/components/ResetDefaultConfigTip/ResetDefaultConfigConfirmModal.styles.ts diff --git a/packages/core/src/containers/Extensions/Manager/components/ResetDefaultConfigTip/ResetDefaultConfigConfirmModal.tsx b/packages/core/src/containers/Extensions/Management/components/ResetDefaultConfigTip/ResetDefaultConfigConfirmModal.tsx similarity index 100% rename from packages/core/src/containers/Extensions/Manager/components/ResetDefaultConfigTip/ResetDefaultConfigConfirmModal.tsx rename to packages/core/src/containers/Extensions/Management/components/ResetDefaultConfigTip/ResetDefaultConfigConfirmModal.tsx diff --git a/packages/core/src/containers/Extensions/Manager/components/ResetDefaultConfigTip/ResetDefaultConfigTip.styles.ts b/packages/core/src/containers/Extensions/Management/components/ResetDefaultConfigTip/ResetDefaultConfigTip.styles.ts similarity index 100% rename from packages/core/src/containers/Extensions/Manager/components/ResetDefaultConfigTip/ResetDefaultConfigTip.styles.ts rename to packages/core/src/containers/Extensions/Management/components/ResetDefaultConfigTip/ResetDefaultConfigTip.styles.ts diff --git a/packages/core/src/containers/Extensions/Manager/components/ResetDefaultConfigTip/ResetDefaultConfigTip.tsx b/packages/core/src/containers/Extensions/Management/components/ResetDefaultConfigTip/ResetDefaultConfigTip.tsx similarity index 100% rename from packages/core/src/containers/Extensions/Manager/components/ResetDefaultConfigTip/ResetDefaultConfigTip.tsx rename to packages/core/src/containers/Extensions/Management/components/ResetDefaultConfigTip/ResetDefaultConfigTip.tsx diff --git a/packages/core/src/containers/Extensions/Manager/components/ResetDefaultConfigTip/index.ts b/packages/core/src/containers/Extensions/Management/components/ResetDefaultConfigTip/index.ts similarity index 100% rename from packages/core/src/containers/Extensions/Manager/components/ResetDefaultConfigTip/index.ts rename to packages/core/src/containers/Extensions/Management/components/ResetDefaultConfigTip/index.ts diff --git a/packages/core/src/containers/Extensions/Manager/components/shared.styles.ts b/packages/core/src/containers/Extensions/Management/components/shared.styles.ts similarity index 100% rename from packages/core/src/containers/Extensions/Manager/components/shared.styles.ts rename to packages/core/src/containers/Extensions/Management/components/shared.styles.ts diff --git a/packages/core/src/containers/Extensions/Manager/constants/index.ts b/packages/core/src/containers/Extensions/Management/constants/index.ts similarity index 100% rename from packages/core/src/containers/Extensions/Manager/constants/index.ts rename to packages/core/src/containers/Extensions/Management/constants/index.ts diff --git a/packages/core/src/containers/Extensions/Manager/hooks/useLocalExtensionStatusItems/index.ts b/packages/core/src/containers/Extensions/Management/hooks/useLocalExtensionStatusItems/index.ts similarity index 100% rename from packages/core/src/containers/Extensions/Manager/hooks/useLocalExtensionStatusItems/index.ts rename to packages/core/src/containers/Extensions/Management/hooks/useLocalExtensionStatusItems/index.ts diff --git a/packages/core/src/containers/Extensions/Manager/index.tsx b/packages/core/src/containers/Extensions/Management/index.tsx similarity index 92% rename from packages/core/src/containers/Extensions/Manager/index.tsx rename to packages/core/src/containers/Extensions/Management/index.tsx index 1d0fa6f617f..f3818680a6f 100644 --- a/packages/core/src/containers/Extensions/Manager/index.tsx +++ b/packages/core/src/containers/Extensions/Management/index.tsx @@ -10,7 +10,7 @@ import { PlugCircle } from '@kubed/icons'; import { Extensions } from './components/Extensions'; import { Wrapper } from './styles'; -export default function ExtensionsManager() { +export function ExtensionsManagement() { return ( navigate(EXTENSIONS_PAGE_PATHS.manager.getDetail(name)); + const handleManageButtonClick = () => navigate(EXTENSIONS_PAGE_PATHS.management.getDetail(name)); if (actionType === 'subscribe') { return ( @@ -82,7 +82,7 @@ function ActionButtons({ page, formattedExtension, formattedMarketplaceConfig }: visible={modal.isOpen} title={t('BIND_MARKETPLACE_ACCOUNT')} okText={t('GO')} - onOk={() => navigate(EXTENSIONS_PAGE_PATHS.manager.index)} + onOk={() => navigate(EXTENSIONS_PAGE_PATHS.management.index)} onCancel={modal.close} > {t('BIND_MARKETPLACE_ACCOUNT_DESCRIPTION')} diff --git a/packages/core/src/containers/Extensions/Marketplace/components/Extensions/Extension.tsx b/packages/core/src/containers/Extensions/Marketplace/components/Extensions/Extension.tsx index 4e443dfe719..aa9701d0ab7 100644 --- a/packages/core/src/containers/Extensions/Marketplace/components/Extensions/Extension.tsx +++ b/packages/core/src/containers/Extensions/Marketplace/components/Extensions/Extension.tsx @@ -39,7 +39,7 @@ function Extension({ formattedExtension, formattedMarketplaceConfig }: Extension const localeProviderName = localeProvider?.name; // const isSubscribed = marketplace?.isSubscribed; // const detailPath = - // EXTENSIONS_PAGE_PATHS[isSubscribed ? 'manager' : 'marketplace'].getDetail(name); + // EXTENSIONS_PAGE_PATHS[isSubscribed ? 'management' : 'marketplace'].getDetail(name); const detailPath = EXTENSIONS_PAGE_PATHS.marketplace.getDetail(name); const ref = useRef(null); diff --git a/packages/core/src/containers/Extensions/routes/index.tsx b/packages/core/src/containers/Extensions/routes/index.tsx index ee4e84c0b5d..04c6ec8d624 100644 --- a/packages/core/src/containers/Extensions/routes/index.tsx +++ b/packages/core/src/containers/Extensions/routes/index.tsx @@ -9,8 +9,8 @@ import type { RouteObject } from 'react-router-dom'; import { EXTENSIONS_PAGE_PATHS } from '../../../constants/extension'; import ExtensionsMarketplace from '../Marketplace'; import ExtensionsMarketplaceDetail from '../Marketplace/Detail'; -import ExtensionsManager from '../Manager'; -import ExtensionsManagerDetail from '../Manager/Detail'; +import { ExtensionsManagement } from '../Management'; +import { ExtensionsManagementDetail } from '../Management/Detail'; const routes: RouteObject[] = [ { @@ -26,16 +26,16 @@ const routes: RouteObject[] = [ element: , }, { - path: EXTENSIONS_PAGE_PATHS.manager.index, - element: , + path: EXTENSIONS_PAGE_PATHS.management.index, + element: , }, { - path: EXTENSIONS_PAGE_PATHS.manager.getDetail(':name'), - element: , + path: EXTENSIONS_PAGE_PATHS.management.getDetail(':name'), + element: , }, { - path: EXTENSIONS_PAGE_PATHS.manager.getDetail(':name', { version: ':version' }), - element: , + path: EXTENSIONS_PAGE_PATHS.management.getDetail(':name', { version: ':version' }), + element: , }, ]; diff --git a/packages/shared/src/utils/checker.ts b/packages/shared/src/utils/checker.ts index 823b55b5194..1f9e4187d32 100644 --- a/packages/shared/src/utils/checker.ts +++ b/packages/shared/src/utils/checker.ts @@ -62,8 +62,8 @@ export const isExtensionsMarketplacePage = (path = location.pathname, isIndex?: return path === indexPage || path.startsWith(`${indexPage}/`); }; -const isExtensionsManagerDetailPage = (path = location.pathname) => { - const indexPage = '/extensions/manager'; +const isExtensionsManagementDetailPage = (path = location.pathname) => { + const indexPage = '/extensions/management'; return path.startsWith(`${indexPage}/`); }; @@ -73,7 +73,7 @@ export const isDarkHeader = (path = location.pathname) => { }; export const isTransparentHeader = (path = location.pathname) => { - return isExtensionsMarketplacePage(path) || isExtensionsManagerDetailPage(path); + return isExtensionsMarketplacePage(path) || isExtensionsManagementDetailPage(path); }; export const isMemberClusterPage = (path = location.pathname, message: string) => {