Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: modify the path of the extension center #4413

Merged
merged 1 commit into from
Jan 6, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
8 changes: 4 additions & 4 deletions packages/core/src/constants/extension.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
}),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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)}
/>
);
}
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,9 @@ function Extensions() {
return (
<ExtensionField
value={
<Link to={EXTENSIONS_PAGE_PATHS.manager.getDetail(name)}>{localeDisplayName}</Link>
<Link to={EXTENSIONS_PAGE_PATHS.management.getDetail(name)}>
{localeDisplayName}
</Link>
}
label={localeDescription}
avatar={<Icon src={displayIcon} alt={localeDisplayName} />}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ function ExternalDependency({
const localeDescription = dependencyFormattedExtension?.localeDescription;

const nameContent = isExtensionExists ? (
<Link to={EXTENSIONS_PAGE_PATHS.manager.getDetail(name)}>{dependencyLocaleDisplayName}</Link>
<Link to={EXTENSIONS_PAGE_PATHS.management.getDetail(name)}>{dependencyLocaleDisplayName}</Link>
) : (
<ExtensionNotExistsNameWrapper>
<span>{dependencyLocaleDisplayName}</span>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
<Wrapper>
<Banner
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ function ActionButtons({ page, formattedExtension, formattedMarketplaceConfig }:
}
};

const handleManageButtonClick = () => navigate(EXTENSIONS_PAGE_PATHS.manager.getDetail(name));
const handleManageButtonClick = () => navigate(EXTENSIONS_PAGE_PATHS.management.getDetail(name));

if (actionType === 'subscribe') {
return (
Expand All @@ -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}
>
<ConfirmModalContent>{t('BIND_MARKETPLACE_ACCOUNT_DESCRIPTION')}</ConfirmModalContent>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<HTMLParagraphElement>(null);
Expand Down
16 changes: 8 additions & 8 deletions packages/core/src/containers/Extensions/routes/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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[] = [
{
Expand All @@ -26,16 +26,16 @@ const routes: RouteObject[] = [
element: <ExtensionsMarketplaceDetail />,
},
{
path: EXTENSIONS_PAGE_PATHS.manager.index,
element: <ExtensionsManager />,
path: EXTENSIONS_PAGE_PATHS.management.index,
element: <ExtensionsManagement />,
},
{
path: EXTENSIONS_PAGE_PATHS.manager.getDetail(':name'),
element: <ExtensionsManagerDetail />,
path: EXTENSIONS_PAGE_PATHS.management.getDetail(':name'),
element: <ExtensionsManagementDetail />,
},
{
path: EXTENSIONS_PAGE_PATHS.manager.getDetail(':name', { version: ':version' }),
element: <ExtensionsManagerDetail />,
path: EXTENSIONS_PAGE_PATHS.management.getDetail(':name', { version: ':version' }),
element: <ExtensionsManagementDetail />,
},
];

Expand Down
6 changes: 3 additions & 3 deletions packages/shared/src/utils/checker.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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}/`);
};
Expand All @@ -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) => {
Expand Down