[Merged after v4.1.1] fix: cluster alias name (kubesphere#3914) (kube…

…sphere#4147) * fix: cluster alias name * fix: add useGetClusterAliasName useGetProjectAliasName
Leioy · Jul 10, 2024 · e2282e2 · e2282e2
1 parent edda42e
commit e2282e2
Show file tree

Hide file tree

Showing 27 changed files with 168 additions and 48 deletions.
diff --git a/packages/console/src/pages/clusters/containers/ClusterSetting/Gateway/Detail/index.tsx b/packages/console/src/pages/clusters/containers/ClusterSetting/Gateway/Detail/index.tsx
@@ -10,7 +10,7 @@ import {
   formatTime,
   gatewayStore,
 } from '@ks-console/shared';
-import { useCacheStore as useStore } from '@ks-console/shared';
+import { useCacheStore as useStore, ClusterAliasName } from '@ks-console/shared';
 import { GatewayConfig } from '..';
 import GatewaySetting from '../GatewaySetting';
 
@@ -83,7 +83,7 @@ const Detail = () => {
     return [
       {
         label: t('CLUSTER'),
-        value: currentCluster || '',
+        value: <ClusterAliasName cluster={currentCluster} />,
       },
       {
         label: t('CREATION_TIME'),

diff --git a/packages/console/src/pages/clusters/containers/CustomResources/Detail/index.tsx b/packages/console/src/pages/clusters/containers/CustomResources/Detail/index.tsx
@@ -2,7 +2,13 @@ import React, { useRef } from 'react';
 import { useParams } from 'react-router-dom';
 import { Select } from '@kubed/icons';
 import { isEmpty } from 'lodash';
-import { crdStore, DetailPage, FormattedCRD, formatTime } from '@ks-console/shared';
+import {
+  crdStore,
+  DetailPage,
+  FormattedCRD,
+  formatTime,
+  ClusterAliasName,
+} from '@ks-console/shared';
 
 const Detail = () => {
   const { cluster, name } = useParams();
@@ -16,7 +22,7 @@ const Detail = () => {
     return [
       {
         label: t('CLUSTER'),
-        value: cluster || '',
+        value: <ClusterAliasName cluster={cluster} />,
       },
       {
         label: t('SCOPE_TCAP'),

diff --git a/packages/console/src/pages/clusters/containers/Projects/detail/index.tsx b/packages/console/src/pages/clusters/containers/Projects/detail/index.tsx
@@ -8,6 +8,7 @@ import {
   useCommonActions,
   quotaStore,
   limitRangesStore,
+  ClusterAliasName,
 } from '@ks-console/shared';
 import { notify } from '@kubed/components';
 import { Pen, Project, Trash } from '@kubed/icons';
@@ -108,7 +109,7 @@ const ProjectDetail = () => {
       },
       {
         label: t('CLUSTER'),
-        value: cluster!,
+        value: <ClusterAliasName cluster={cluster} />,
       },
       {
         label: t('WORKSPACE'),

diff --git a/packages/console/src/pages/clusters/containers/SystemComponents/Detail/index.tsx b/packages/console/src/pages/clusters/containers/SystemComponents/Detail/index.tsx
@@ -7,6 +7,8 @@ import {
   getComponentStatus,
   StatusIndicator,
   SystemComponent,
+  ClusterAliasName,
+  ProjectAliasName,
 } from '@ks-console/shared';
 import { Components } from '@kubed/icons';
 
@@ -27,11 +29,11 @@ function ServiceComponentDetail() {
       },
       {
         label: t('CLUSTER'),
-        value: params.cluster,
+        value: <ClusterAliasName cluster={params.cluster} />,
       },
       {
         label: t('PROJECT'),
-        value: data?.namespace,
+        value: <ProjectAliasName project={data?.namespace} />,
       },
       {
         label: t('REPLICA_COUNT'),

diff --git a/packages/console/src/pages/clusters/containers/Workload/CronJobs/Detail/index.tsx b/packages/console/src/pages/clusters/containers/Workload/CronJobs/Detail/index.tsx
@@ -2,7 +2,7 @@ import { isEmpty, get } from 'lodash';
 import React, { useEffect, useMemo, useState } from 'react';
 import { useNavigate, useParams } from 'react-router-dom';
 import { Loading, notify } from '@kubed/components';
-import { useCacheStore as useStore } from '@ks-console/shared';
+import { useCacheStore as useStore, ClusterAliasName, ProjectAliasName } from '@ks-console/shared';
 import {
   Icon,
   EditYamlModal,
@@ -149,11 +149,11 @@ const DaemonSetDetail = () => {
     return [
       {
         label: t('CLUSTER'),
-        value: cluster,
+        value: <ClusterAliasName cluster={cluster} />,
       },
       {
         label: t('PROJECT'),
-        value: namespace,
+        value: <ProjectAliasName project={namespace} />,
       },
       {
         label: t('STATUS'),

diff --git a/packages/console/src/pages/clusters/containers/Workload/DaemonSets/Detail/index.tsx b/packages/console/src/pages/clusters/containers/Workload/DaemonSets/Detail/index.tsx
@@ -13,6 +13,8 @@ import {
   getDisplayName,
   formatTime,
   yaml,
+  ClusterAliasName,
+  ProjectAliasName,
 } from '@ks-console/shared';
 import { useRollbackModal, useBaseInfoModal } from '../../../../hooks/useModal';
 import type { FormattedWorkload } from '@ks-console/shared';
@@ -175,11 +177,11 @@ const DaemonSetDetail = () => {
     return [
       {
         label: t('CLUSTER'),
-        value: cluster,
+        value: <ClusterAliasName cluster={cluster} />,
       },
       {
         label: t('PROJECT'),
-        value: namespace,
+        value: <ProjectAliasName project={namespace} />,
       },
       {
         label: t('APP'),

diff --git a/packages/console/src/pages/clusters/containers/Workload/Deployments/Detail/index.tsx b/packages/console/src/pages/clusters/containers/Workload/Deployments/Detail/index.tsx
@@ -14,6 +14,8 @@ import {
   getDisplayName,
   formatTime,
   yaml,
+  ClusterAliasName,
+  ProjectAliasName,
 } from '@ks-console/shared';
 import {
   useBaseInfoModal,
@@ -211,11 +213,11 @@ const DeploymentDetail = () => {
     return [
       {
         label: t('CLUSTER'),
-        value: cluster,
+        value: <ClusterAliasName cluster={cluster} />,
       },
       {
         label: t('PROJECT'),
-        value: namespace,
+        value: <ProjectAliasName project={namespace} />,
       },
       {
         label: t('APP'),

diff --git a/packages/console/src/pages/clusters/containers/Workload/Jobs/Detail/index.tsx b/packages/console/src/pages/clusters/containers/Workload/Jobs/Detail/index.tsx
@@ -14,6 +14,8 @@ import {
   formatTime,
   yaml,
   getJobStatus,
+  ClusterAliasName,
+  ProjectAliasName,
 } from '@ks-console/shared';
 import type { FormattedWorkload } from '@ks-console/shared';
 import type { EditYamlConfig, ModalBaseConfig } from '../../../../types/workload';
@@ -147,11 +149,11 @@ const DaemonSetDetail = () => {
     return [
       {
         label: t('CLUSTER'),
-        value: cluster,
+        value: <ClusterAliasName cluster={cluster} />,
       },
       {
         label: t('PROJECT'),
-        value: namespace,
+        value: <ProjectAliasName project={namespace} />,
       },
       {
         label: t('STATUS'),

diff --git a/packages/console/src/pages/clusters/containers/Workload/Pods/Detail/index.tsx b/packages/console/src/pages/clusters/containers/Workload/Pods/Detail/index.tsx
diff --git a/packages/console/src/pages/clusters/containers/Workload/Routes/Detail/index.tsx b/packages/console/src/pages/clusters/containers/Workload/Routes/Detail/index.tsx
@@ -13,6 +13,8 @@ import {
   formatTime,
   yaml,
   useBaseInfoModal,
+  ClusterAliasName,
+  ProjectAliasName,
 } from '@ks-console/shared';
 import type { IngressDetail } from '@ks-console/shared';
 import type { EditYamlConfig, ModalBaseConfig } from '../../../../types/workload';
@@ -125,11 +127,11 @@ const PodsDetail = () => {
     return [
       {
         label: t('CLUSTER'),
-        value: cluster,
+        value: <ClusterAliasName cluster={cluster} />,
       },
       {
         label: t('PROJECT'),
-        value: namespace,
+        value: <ProjectAliasName project={namespace} />,
       },
       {
         label: t('APP'),

diff --git a/packages/console/src/pages/clusters/containers/Workload/Services/Detail/index.tsx b/packages/console/src/pages/clusters/containers/Workload/Services/Detail/index.tsx
@@ -15,6 +15,8 @@ import {
   joinSelector,
   IFormatEndPoint,
   useBaseInfoModal,
+  ClusterAliasName,
+  ProjectAliasName,
 } from '@ks-console/shared';
 import type { IServiceDetail } from '@ks-console/shared';
 import type { EditYamlConfig, ModalBaseConfig } from '../../../../types/workload';
@@ -174,11 +176,11 @@ const PodsDetail = () => {
     return [
       {
         label: t('CLUSTER'),
-        value: cluster,
+        value: <ClusterAliasName cluster={cluster} />,
       },
       {
         label: t('PROJECT'),
-        value: namespace,
+        value: <ProjectAliasName project={namespace} />,
       },
       {
         label: t('TYPE'),

diff --git a/packages/console/src/pages/clusters/containers/Workload/StatefulSets/Detail/index.tsx b/packages/console/src/pages/clusters/containers/Workload/StatefulSets/Detail/index.tsx
@@ -13,6 +13,8 @@ import {
   getDisplayName,
   formatTime,
   yaml,
+  ClusterAliasName,
+  ProjectAliasName,
 } from '@ks-console/shared';
 import { useBaseInfoModal, useRollbackModal } from '../../../../hooks/useModal';
 import type { FormattedWorkload } from '@ks-console/shared';
@@ -173,11 +175,11 @@ const DaemonSetDetail = () => {
     return [
       {
         label: t('CLUSTER'),
-        value: cluster,
+        value: <ClusterAliasName cluster={cluster} />,
       },
       {
         label: t('PROJECT'),
-        value: namespace,
+        value: <ProjectAliasName project={namespace} />,
       },
       {
         label: t('APP'),

diff --git a/.../console/src/pages/projects/containers/ApplicationWorkloads/Jobs/CronJob/Detail/index.tsx b/.../console/src/pages/projects/containers/ApplicationWorkloads/Jobs/CronJob/Detail/index.tsx
@@ -12,6 +12,8 @@ import {
   getCronJobStatus,
   useCommonActions,
   ClusterDetail,
+  ClusterAliasName,
+  ProjectAliasName,
 } from '@ks-console/shared';
 
 const WORKLOAD_TYPE = 'CRONJOB';
@@ -103,11 +105,11 @@ const DaemonSetDetail = () => {
     return [
       {
         label: t('CLUSTER'),
-        value: cluster,
+        value: <ClusterAliasName cluster={cluster} />,
       },
       {
         label: t('PROJECT'),
-        value: namespace,
+        value: <ProjectAliasName workspace={workspace} project={namespace} />,
       },
       {
         label: t('STATUS'),

diff --git a/...ages/console/src/pages/projects/containers/ApplicationWorkloads/Jobs/Job/Detail/index.tsx b/...ages/console/src/pages/projects/containers/ApplicationWorkloads/Jobs/Job/Detail/index.tsx
@@ -12,6 +12,8 @@ import {
   formatTime,
   getJobStatus,
   useCommonActions,
+  ClusterAliasName,
+  ProjectAliasName,
 } from '@ks-console/shared';
 
 const WORKLOAD_TYPE = 'JOB';
@@ -104,11 +106,11 @@ const DaemonSetDetail = () => {
     return [
       {
         label: t('CLUSTER'),
-        value: cluster,
+        value: <ClusterAliasName cluster={cluster} />,
       },
       {
         label: t('PROJECT'),
-        value: namespace,
+        value: <ProjectAliasName project={namespace} />,
       },
       {
         label: t('STATUS'),

diff --git a/packages/console/src/pages/projects/containers/ApplicationWorkloads/Routes/Detail/index.tsx b/packages/console/src/pages/projects/containers/ApplicationWorkloads/Routes/Detail/index.tsx
@@ -10,6 +10,8 @@ import {
   getDisplayName,
   formatTime,
   useCommonActions,
+  ClusterAliasName,
+  ProjectAliasName,
 } from '@ks-console/shared';
 import type { IngressDetail } from '@ks-console/shared';
 import useRoutesAnnotations from '../../../../../clusters/hooks/useRoutesAnnotations';
@@ -93,11 +95,11 @@ const IngressRoutesDetail = () => {
     return [
       {
         label: t('CLUSTER'),
-        value: cluster,
+        value: <ClusterAliasName cluster={cluster} />,
       },
       {
         label: t('PROJECT'),
-        value: namespace,
+        value: <ProjectAliasName project={namespace} />,
       },
       {
         label: t('APP'),

diff --git a/...ages/console/src/pages/projects/containers/ApplicationWorkloads/Services/Detail/index.tsx b/...ages/console/src/pages/projects/containers/ApplicationWorkloads/Services/Detail/index.tsx
@@ -12,6 +12,8 @@ import {
   joinSelector,
   IFormatEndPoint,
   useCommonActions,
+  ClusterAliasName,
+  ProjectAliasName,
 } from '@ks-console/shared';
 import useServiceGateway from '../../../../../clusters/hooks/useServiceGateway';
 import useServiceModal from '../../../../../clusters/hooks/useServiceModal';
@@ -138,11 +140,11 @@ const ServiceDetail = () => {
     return [
       {
         label: t('CLUSTER'),
-        value: cluster,
+        value: <ClusterAliasName cluster={cluster} />,
       },
       {
         label: t('PROJECT'),
-        value: namespace,
+        value: <ProjectAliasName project={namespace} />,
       },
       {
         label: t('TYPE'),

diff --git a/.../src/pages/projects/containers/ApplicationWorkloads/Workloads/DaemonSets/Detail/index.tsx b/.../src/pages/projects/containers/ApplicationWorkloads/Workloads/DaemonSets/Detail/index.tsx
@@ -15,6 +15,8 @@ import {
   getDisplayName,
   formatTime,
   useCommonActions,
+  ClusterAliasName,
+  ProjectAliasName,
 } from '@ks-console/shared';
 import { useRollbackModal, useBaseInfoModal } from '../../../../../../clusters/hooks/useModal';
 import type { FormattedWorkload } from '@ks-console/shared';
@@ -168,11 +170,11 @@ const DaemonSetDetail = () => {
     return [
       {
         label: t('CLUSTER'),
-        value: cluster,
+        value: <ClusterAliasName cluster={cluster} />,
       },
       {
         label: t('PROJECT'),
-        value: namespace,
+        value: <ProjectAliasName project={namespace} />,
       },
       {
         label: t('APP'),