Skip to content

Commit

Permalink
feat: add extension console
Browse files Browse the repository at this point in the history 
Signed-off-by: ks-ci-bot <[email protected]>
  • Loading branch information
joyceliu authored and ks-ci-bot committed Sep 14, 2024
1 parent eed56a1 commit e644468
Show file tree
Hide file tree
Showing 26 changed files with 491 additions and 445 deletions.
2 changes: 1 addition & 1 deletion .licenserc.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

header:
license:
spdx-id: KubeSphere
spdx-id: Apache-2.0
copyright-owner: KubeSphere Authors
content: |
Please refer to the LICENSE file in the root directory of the project.
Expand Down
5 changes: 0 additions & 5 deletions .prettierrc
View file

This file was deleted.

16 changes: 8 additions & 8 deletions ...p/assets/v3dist/0.d7a3290f4d3bc8962d0b.js → ...p/assets/v3dist/0.cc161243f950d032a2b5.js
View file

Large diffs are not rendered by default.

0 .../assets/v3dist/1.671c89393de8760a794c.css → .../assets/v3dist/1.8cbf21c1541175071c9a.css
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...p/assets/v3dist/1.1619b23d47a1a7dae70d.js → ...p/assets/v3dist/1.f16adde57f23c657cd1a.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ...p/assets/v3dist/3.c460c4ca2a60b8926bd8.js → ...p/assets/v3dist/3.4fb6de84a626e363f762.js
View file

Large diffs are not rendered by default.

0 .../assets/v3dist/3.45f35b9627aa86ab8091.css → .../assets/v3dist/3.86559ac9e27afdf34616.css
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ssets/v3dist/main.2ee63a32676d7278d1b2.js → ...ssets/v3dist/main.5dd298a89557391f5e39.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 ...sets/v3dist/main.cffdce643fbbc878f0c5.css → ...sets/v3dist/main.91e5f545e48fe618c903.css
View file
File renamed without changes.
18 changes: 9 additions & 9 deletions packages/bootstrap/assets/v3dist/manifest.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
"abc.js": "37e37aa178d97ffcd94eeee1e1a25967.js",
"access.css": "2.06b56e741f038a383eb0.css",
"access.js": "2.d124fbef44aa34a378c7.js",
"actions.css": "3.45f35b9627aa86ab8091.css",
"actions.js": "3.c460c4ca2a60b8926bd8.js",
"actions.css": "3.86559ac9e27afdf34616.css",
"actions.js": "3.4fb6de84a626e363f762.js",
"actionscript.js": "b4bd28ac3a7935d0c52a6cb19c89aced.js",
"ada.js": "64f93b6b093bba4147485023263cf65f.js",
"alda.js": "fffbc895129cdb3efeafa5b234743aa0.js",
Expand All @@ -44,8 +44,8 @@
"cobol.js": "214a729dcea91ee8a56f8ef43e17243a.js",
"coffee.js": "243d8101969c933d25388b5287bb3425.js",
"coldfusion.js": "a311e02008e0f00a37305a12d479159a.js",
"common.css": "1.671c89393de8760a794c.css",
"common.js": "1.1619b23d47a1a7dae70d.js",
"common.css": "1.8cbf21c1541175071c9a.css",
"common.js": "1.f16adde57f23c657cd1a.js",
"console.css": "5.465ac38e2c35293a3d9f.css",
"console.js": "5.f991d4f254b44ccead8a.js",
"crystal.js": "e4d51c8b4202d444cb39db4e7642d7d9.js",
Expand Down Expand Up @@ -75,10 +75,10 @@
"entrypoints": {
"main": {
"css": [
"main.cffdce643fbbc878f0c5.css"
"main.91e5f545e48fe618c903.css"
],
"js": [
"main.2ee63a32676d7278d1b2.js"
"main.5dd298a89557391f5e39.js"
]
}
},
Expand Down Expand Up @@ -157,8 +157,8 @@
"lua.js": "aa2f98073a8d9f266f3928b5d9c457d1.js",
"luapage.js": "f5292be525fc36a337ce7bfb792070de.js",
"lucene.js": "8833a126ef9d8892bfb372d227f7f088.js",
"main.css": "main.cffdce643fbbc878f0c5.css",
"main.js": "main.2ee63a32676d7278d1b2.js",
"main.css": "main.91e5f545e48fe618c903.css",
"main.js": "main.5dd298a89557391f5e39.js",
"makefile.js": "b26738d581e044c69f7a4392906e6843.js",
"markdown.js": "4750f0ff62cbd59f35aac31b996194e6.js",
"mask.js": "d7889907dbb51f58ceadb3e1eec03a5d.js",
Expand Down Expand Up @@ -454,7 +454,7 @@
"vala.js": "3f9e3ae9d4ee540b9fb067b6fd29d529.js",
"vbscript.js": "5f6f5026d13b2a9b884a8144a119cf9e.js",
"velocity.js": "be2fbe775b19bdc18e4f78de18beb433.js",
"vendor.js": "0.d7a3290f4d3bc8962d0b.js",
"vendor.js": "0.cc161243f950d032a2b5.js",
"verilog.js": "119d8ff08e82b0f391f59f1fe657130f.js",
"vhdl.js": "c3b0cd15adcc12a549e7ac5d165ac1f4.js",
"visualforce.js": "35dc4119f9e28cb9baba1475537460bb.js",
Expand Down
54 changes: 27 additions & 27 deletions packages/console/src/pages/clusters/containers/ClusterSetting/routes.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import Gateway from './EmbedGateway';

import RoleDetail from './Roles/Detail';
import LogCollectionDetail from './LogCollection/Detail/Embed';
// import GatewayDetail from './EmbedGateway/Detail';
import GatewayDetail from './EmbedGateway/Detail';
const PATH = '/clusters/:cluster';

const clusterSettingListRoutes = [
Expand Down Expand Up @@ -96,32 +96,32 @@ const clusterSettingDetailRoutes = [
},
],
},
// {
// path: `${PATH}/gateways/:component/:gatewayName`,
// element: <GatewayDetail />,
// children: [
// {
// path: 'monitors',
// element: <></>,
// },
// {
// path: 'gateway-configs',
// element: <></>,
// },
// {
// path: 'logs',
// element: <></>,
// },
// {
// path: 'resource-status',
// element: <></>,
// },
// {
// path: 'metadata',
// element: <></>,
// },
// ],
// },
{
path: `${PATH}/gateways/:component/:gatewayName`,
element: <GatewayDetail />,
children: [
{
path: 'monitors',
element: <></>,
},
{
path: 'gateway-configs',
element: <></>,
},
{
path: 'logs',
element: <></>,
},
{
path: 'resource-status',
element: <></>,
},
{
path: 'metadata',
element: <></>,
},
],
},
{
path: `${PATH}/log-collections/:component/:name`,
element: <LogCollectionDetail />,
Expand Down
65 changes: 34 additions & 31 deletions packages/console/src/pages/clusters/routes/index.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

import React from 'react';
import { Navigate, RouteObject } from 'react-router-dom';
// import { alertingDetailRoutes, alertingListRoutes } from '../containers/Alerting/routes';
import { alertingDetailRoutes, alertingListRoutes } from '../containers/Alerting/routes';
import BaseLayout from '../containers/Base/BaseLayout';
import ListLayout from '../containers/Base/ListLayout';
// import projectList from '../../workspaces/containers/Members/Detail/ProjectList';
Expand All @@ -20,17 +20,20 @@ import CustomResourcesDetail from '../containers/CustomResources/Detail';
import ResourceStatus from '../containers/CustomResources/Detail/ResourceStatus';

import KubeConfig from '../containers/KubeConfig';
// import MonitorRoutes from '../containers/Monitor/routes';
import MonitorRoutes from '../containers/Monitor/routes';

// import { networkDetailRoutes, networkListRoutes } from '../containers/Network/routes';
import { networkDetailRoutes, networkListRoutes } from '../containers/Network/routes';
import Nodes from '../containers/Nodes';
import NodesDetailRoutes from '../containers/Nodes/Detail/routes';
// import EdgeNodes from '../containers/KubeEdge/index';
// import EdgeNodesRoutes from '../containers/KubeEdge/Detail/routes';
import EdgeNodes from '../containers/KubeEdge/index';
import EdgeNodesRoutes from '../containers/KubeEdge/Detail/routes';
import Overview from '../containers/Overview/';
import { projectDetailRoutes, projectListRoutes } from '../containers/Projects/routes';
import { storageDetailRoutes, storageListRoutes } from '../containers/Storage/routes';

import SystemComponents from '../containers/SystemComponents';
import SystemComponentDetail from '../containers/SystemComponents/Detail';
import SystemComponentDetailTab from '../containers/SystemComponents/Detail/ServiceDetail';
// import CronJobsDetail from '../containers/Workload/CronJobs/Detail/routes';
// import DaemonSets from '../containers/Workload/DaemonSets/Embed';

Expand Down Expand Up @@ -76,10 +79,10 @@ const routes: RouteObject[] = [
path: `${PATH}/nodes`,
element: <Nodes />,
},
/* {
{
path: `${PATH}/edgenodes`,
element: <EdgeNodes />,
}, */
},
{
path: `${PATH}/customresources`,
element: <CustomResources />,
Expand All @@ -88,10 +91,10 @@ const routes: RouteObject[] = [
// path: `${PATH}/projects`,
// element: <Projects />,
// },
// {
// path: `${PATH}/components`,
// element: <SystemComponents />,
// },
{
path: `${PATH}/components`,
element: <SystemComponents />,
},
// ...WorkloadRoutes,
{
path: `${PATH}/workloads`,
Expand All @@ -102,12 +105,12 @@ const routes: RouteObject[] = [
path: `${PATH}/pods`,
element: <Pods />,
},
// ...networkListRoutes,
...networkListRoutes,
...configListRoutes,
...storageListRoutes,
// ...MonitorRoutes,
...MonitorRoutes,
...clusterSettingListRoutes,
// ...alertingListRoutes,
...alertingListRoutes,
...projectListRoutes,
],
},
Expand All @@ -130,20 +133,20 @@ const routes: RouteObject[] = [
},
],
},
// {
// path: `${PATH}/components/:namespace/:name`,
// element: <SystemComponentDetail />,
// children: [
// {
// index: true,
// element: <Navigate to="service-details" replace />,
// },
// {
// path: 'service-details',
// element: <SystemComponentDetailTab />,
// },
// ],
// },
{
path: `${PATH}/components/:namespace/:name`,
element: <SystemComponentDetail />,
children: [
{
index: true,
element: <Navigate to="service-details" replace />,
},
{
path: 'service-details',
element: <SystemComponentDetailTab />,
},
],
},

// {
// path: `${PATH}/projects/:namespace/services/:name/`,
Expand All @@ -157,15 +160,15 @@ const routes: RouteObject[] = [
// },
...projectDetailRoutes,
...NodesDetailRoutes,
// ...networkDetailRoutes,
...networkDetailRoutes,
...configDetailRoutes,
...storageDetailRoutes,
...clusterSettingDetailRoutes,
...ApplicationWorkloadDetailRoutes(PATH),
...PodDetail,
...IngressDetail,
// ...alertingDetailRoutes,
// ...EdgeNodesRoutes,
...alertingDetailRoutes,
...EdgeNodesRoutes,
],
},
];
Expand Down
78 changes: 39 additions & 39 deletions packages/console/src/pages/platform/routes/index.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ import { Navigate, RouteObject } from 'react-router-dom';
import BaseInfo from '../containers/BaseInfo';
// import BaseInfo from '../containers/BaseInfo/Embed';
import SettingsLayout from '../containers/SettingsLayout';
// import NotificationConfigurationRoutes from './notificationConfig';
// import NotificationSubscriptionRoutes from './subscriptionConfig';
// import NotificationConfiguration from '../containers/NotificationConfiguration';
import NotificationConfigurationRoutes from './notificationConfig';
import NotificationSubscriptionRoutes from './subscriptionConfig';
import NotificationConfiguration from '../containers/NotificationConfiguration';
import Dashboard from '../containers/Dashboard';
// import History from '../containers/History';
// import SilentPolicy from '../containers/SilentPolicy';
// import NotificationLanguage from '../containers/NotificationLanguage';
import History from '../containers/History';
import SilentPolicy from '../containers/SilentPolicy';
import NotificationLanguage from '../containers/NotificationLanguage';

// import SilentPolicyRoutes from '../containers/SilentPolicy/Detail/routes';
import SilentPolicyRoutes from '../containers/SilentPolicy/Detail/routes';

const routes: RouteObject[] = [
{
Expand All @@ -36,40 +36,40 @@ const routes: RouteObject[] = [
path: 'base-info',
element: <BaseInfo />,
},
// {
// path: 'channel-configuration',
// element: <NotificationConfiguration />,
// children: NotificationConfigurationRoutes,
// },
// {
// path: 'notification-history',
// element: <History />,
// },
// {
// path: 'silent-policy',
// element: <SilentPolicy />,
// },
// {
// path: 'notification-language',
// element: <NotificationLanguage />,
// },
// {
// path: 'notification-subscription',
// children: NotificationSubscriptionRoutes,
// },
{
path: 'channel-configuration',
element: <NotificationConfiguration />,
children: NotificationConfigurationRoutes,
},
{
path: 'notification-history',
element: <History />,
},
{
path: 'silent-policy',
element: <SilentPolicy />,
},
{
path: 'notification-language',
element: <NotificationLanguage />,
},
{
path: 'notification-subscription',
children: NotificationSubscriptionRoutes,
},
],
},
{
path: '/settings/notification-configuration',
element: <SettingsLayout />,
children: [
{
index: true,
element: <Navigate to="/settings/silent-policy" replace />,
},
],
},
// {
// path: '/settings/notification-configuration',
// element: <SettingsLayout />,
// children: [
// {
// index: true,
// element: <Navigate to="/settings/silent-policy" replace />,
// },
// ],
// },
// ...SilentPolicyRoutes,
...SilentPolicyRoutes,
];

export default routes;
Loading

0 comments on commit e644468

Please sign in to comment.