Skip to content

Commit 21a5eb7

Browse files
ks-ci-botdonniean
andauthored
[master] refactor: modify the path of the extension center (#4414)
refactor: change extensions management path Signed-off-by: donniean <donniean1@gmail.com> Co-authored-by: donniean <donniean1@gmail.com>
1 parent 231e913 commit 21a5eb7

File tree

104 files changed

+27
-25
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

104 files changed

+27
-25
lines changed

packages/console/src/pages/platform/containers/Dashboard/DashboardCard/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ const DashboardCard = () => {
7676
title: 'EXTENSIONS_CENTER',
7777
desc: 'EXTENSION_DESC',
7878
name: 'INSTALLED_COMPONENT',
79-
link: '/extensions/manager',
79+
link: '/extensions/management',
8080
metric: 'platform_installplan_count',
8181
label: 'Powered by LuBan',
8282
hide: hideExtensions,

packages/core/src/constants/extension.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ function getDetail({
4343
}
4444

4545
const EXTENSIONS_MARKETPLACE_PATH = `/extensions/marketplace`;
46-
const EXTENSIONS_MANAGER_PATH = `/extensions/manager`;
46+
const EXTENSIONS_MANAGEMENT_PATH = `/extensions/management`;
4747
const EXTENSIONS_PAGE_PATHS = {
4848
marketplace: {
4949
index: EXTENSIONS_MARKETPLACE_PATH,
@@ -54,11 +54,11 @@ const EXTENSIONS_PAGE_PATHS = {
5454
version: options?.version,
5555
}),
5656
},
57-
manager: {
58-
index: EXTENSIONS_MANAGER_PATH,
57+
management: {
58+
index: EXTENSIONS_MANAGEMENT_PATH,
5959
getDetail: (extensionName: string, options?: { version?: string }) =>
6060
getDetail({
61-
basePath: EXTENSIONS_MANAGER_PATH,
61+
basePath: EXTENSIONS_MANAGEMENT_PATH,
6262
extensionName,
6363
version: options?.version,
6464
}),

packages/core/src/containers/Extensions/Manager/Detail/index.tsx renamed to packages/core/src/containers/Extensions/Management/Detail/index.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import { DetailActionButtons } from '../components/DetailActionButtons';
3030
import { InstalledVersionWrapper } from './styles';
3131
import { useMarketplaceConfigQuery } from '../../../../stores/marketplace';
3232

33-
export default function ExtensionsManagerDetail() {
33+
export function ExtensionsManagementDetail() {
3434
const navigate = useNavigate();
3535
const { name: extensionName = '', version: pathVersion } = useParams();
3636
const {
@@ -257,11 +257,11 @@ export default function ExtensionsManagerDetail() {
257257
isShowInstalledClusters={Boolean(isInstalled && isMultiClusterInstallation)}
258258
onVersionChange={(selectedVersion: string) =>
259259
navigate(
260-
EXTENSIONS_PAGE_PATHS.manager.getDetail(extensionName, { version: selectedVersion }),
260+
EXTENSIONS_PAGE_PATHS.management.getDetail(extensionName, { version: selectedVersion }),
261261
{ replace: true },
262262
)
263263
}
264-
onBackButtonClick={() => navigate(EXTENSIONS_PAGE_PATHS.manager.index)}
264+
onBackButtonClick={() => navigate(EXTENSIONS_PAGE_PATHS.management.index)}
265265
/>
266266
);
267267
}

packages/core/src/containers/Extensions/Manager/components/Extensions/Extensions.tsx renamed to packages/core/src/containers/Extensions/Management/components/Extensions/Extensions.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,9 @@ function Extensions() {
209209
return (
210210
<ExtensionField
211211
value={
212-
<Link to={EXTENSIONS_PAGE_PATHS.manager.getDetail(name)}>{localeDisplayName}</Link>
212+
<Link to={EXTENSIONS_PAGE_PATHS.management.getDetail(name)}>
213+
{localeDisplayName}
214+
</Link>
213215
}
214216
label={localeDescription}
215217
avatar={<Icon src={displayIcon} alt={localeDisplayName} />}

packages/core/src/containers/Extensions/Manager/components/InstallModal/ExternalDependency.tsx renamed to packages/core/src/containers/Extensions/Management/components/InstallModal/ExternalDependency.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ function ExternalDependency({
4040
const localeDescription = dependencyFormattedExtension?.localeDescription;
4141

4242
const nameContent = isExtensionExists ? (
43-
<Link to={EXTENSIONS_PAGE_PATHS.manager.getDetail(name)}>{dependencyLocaleDisplayName}</Link>
43+
<Link to={EXTENSIONS_PAGE_PATHS.management.getDetail(name)}>{dependencyLocaleDisplayName}</Link>
4444
) : (
4545
<ExtensionNotExistsNameWrapper>
4646
<span>{dependencyLocaleDisplayName}</span>

packages/core/src/containers/Extensions/Manager/index.tsx renamed to packages/core/src/containers/Extensions/Management/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { PlugCircle } from '@kubed/icons';
1010
import { Extensions } from './components/Extensions';
1111
import { Wrapper } from './styles';
1212

13-
export default function ExtensionsManager() {
13+
export function ExtensionsManagement() {
1414
return (
1515
<Wrapper>
1616
<Banner

packages/core/src/containers/Extensions/Marketplace/components/ActionButtons/ActionButtons.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ function ActionButtons({ page, formattedExtension, formattedMarketplaceConfig }:
5858
}
5959
};
6060

61-
const handleManageButtonClick = () => navigate(EXTENSIONS_PAGE_PATHS.manager.getDetail(name));
61+
const handleManageButtonClick = () => navigate(EXTENSIONS_PAGE_PATHS.management.getDetail(name));
6262

6363
if (actionType === 'subscribe') {
6464
return (
@@ -82,7 +82,7 @@ function ActionButtons({ page, formattedExtension, formattedMarketplaceConfig }:
8282
visible={modal.isOpen}
8383
title={t('BIND_MARKETPLACE_ACCOUNT')}
8484
okText={t('GO')}
85-
onOk={() => navigate(EXTENSIONS_PAGE_PATHS.manager.index)}
85+
onOk={() => navigate(EXTENSIONS_PAGE_PATHS.management.index)}
8686
onCancel={modal.close}
8787
>
8888
<ConfirmModalContent>{t('BIND_MARKETPLACE_ACCOUNT_DESCRIPTION')}</ConfirmModalContent>

packages/core/src/containers/Extensions/Marketplace/components/Extensions/Extension.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ function Extension({ formattedExtension, formattedMarketplaceConfig }: Extension
3939
const localeProviderName = localeProvider?.name;
4040
// const isSubscribed = marketplace?.isSubscribed;
4141
// const detailPath =
42-
// EXTENSIONS_PAGE_PATHS[isSubscribed ? 'manager' : 'marketplace'].getDetail(name);
42+
// EXTENSIONS_PAGE_PATHS[isSubscribed ? 'management' : 'marketplace'].getDetail(name);
4343
const detailPath = EXTENSIONS_PAGE_PATHS.marketplace.getDetail(name);
4444

4545
const ref = useRef<HTMLParagraphElement>(null);

packages/core/src/containers/Extensions/routes/index.tsx

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import type { RouteObject } from 'react-router-dom';
99
import { EXTENSIONS_PAGE_PATHS } from '../../../constants/extension';
1010
import ExtensionsMarketplace from '../Marketplace';
1111
import ExtensionsMarketplaceDetail from '../Marketplace/Detail';
12-
import ExtensionsManager from '../Manager';
13-
import ExtensionsManagerDetail from '../Manager/Detail';
12+
import { ExtensionsManagement } from '../Management';
13+
import { ExtensionsManagementDetail } from '../Management/Detail';
1414

1515
const routes: RouteObject[] = [
1616
{
@@ -26,16 +26,16 @@ const routes: RouteObject[] = [
2626
element: <ExtensionsMarketplaceDetail />,
2727
},
2828
{
29-
path: EXTENSIONS_PAGE_PATHS.manager.index,
30-
element: <ExtensionsManager />,
29+
path: EXTENSIONS_PAGE_PATHS.management.index,
30+
element: <ExtensionsManagement />,
3131
},
3232
{
33-
path: EXTENSIONS_PAGE_PATHS.manager.getDetail(':name'),
34-
element: <ExtensionsManagerDetail />,
33+
path: EXTENSIONS_PAGE_PATHS.management.getDetail(':name'),
34+
element: <ExtensionsManagementDetail />,
3535
},
3636
{
37-
path: EXTENSIONS_PAGE_PATHS.manager.getDetail(':name', { version: ':version' }),
38-
element: <ExtensionsManagerDetail />,
37+
path: EXTENSIONS_PAGE_PATHS.management.getDetail(':name', { version: ':version' }),
38+
element: <ExtensionsManagementDetail />,
3939
},
4040
];
4141

packages/shared/src/utils/checker.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@ export const isExtensionsMarketplacePage = (path = location.pathname, isIndex?:
6262
return path === indexPage || path.startsWith(`${indexPage}/`);
6363
};
6464

65-
const isExtensionsManagerDetailPage = (path = location.pathname) => {
66-
const indexPage = '/extensions/manager';
65+
const isExtensionsManagementDetailPage = (path = location.pathname) => {
66+
const indexPage = '/extensions/management';
6767

6868
return path.startsWith(`${indexPage}/`);
6969
};
@@ -73,7 +73,7 @@ export const isDarkHeader = (path = location.pathname) => {
7373
};
7474

7575
export const isTransparentHeader = (path = location.pathname) => {
76-
return isExtensionsMarketplacePage(path) || isExtensionsManagerDetailPage(path);
76+
return isExtensionsMarketplacePage(path) || isExtensionsManagementDetailPage(path);
7777
};
7878

7979
export const isMemberClusterPage = (path = location.pathname, message: string) => {

0 commit comments

Comments
 (0)