From dc319cd1d9b2bc077dd0d772e97ead236df46e04 Mon Sep 17 00:00:00 2001
From: Lizhen <88174078+bluewang@users.noreply.github.com>
Date: Fri, 7 Jul 2023 15:58:41 +0800
Subject: [PATCH] [INLONG-8461][Dashboard] Cluster management tag optimization
 (#8465)

---
 inlong-dashboard/src/configs/menus/conf.tsx               | 8 ++++----
 .../src/ui/components/Layout/Tenant/index.tsx             | 3 ++-
 .../src/ui/pages/TenantManagement/DetailModal.tsx         | 3 ++-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/inlong-dashboard/src/configs/menus/conf.tsx b/inlong-dashboard/src/configs/menus/conf.tsx
index 0552624d1eb..00b1bb441fa 100644
--- a/inlong-dashboard/src/configs/menus/conf.tsx
+++ b/inlong-dashboard/src/configs/menus/conf.tsx
@@ -55,14 +55,14 @@ const conf: MenuItemType[] = [
     name: i18n.t('configs.menus.Clusters'),
     icon: <DeploymentUnitOutlined />,
     children: [
-      {
-        path: '/clusters',
-        name: i18n.t('configs.menus.Clusters'),
-      },
       {
         path: '/clusterTags',
         name: i18n.t('configs.menus.ClusterTags'),
       },
+      {
+        path: '/clusters',
+        name: i18n.t('configs.menus.Clusters'),
+      },
     ],
   },
   {
diff --git a/inlong-dashboard/src/ui/components/Layout/Tenant/index.tsx b/inlong-dashboard/src/ui/components/Layout/Tenant/index.tsx
index b2da26d48ad..f800fc57cec 100644
--- a/inlong-dashboard/src/ui/components/Layout/Tenant/index.tsx
+++ b/inlong-dashboard/src/ui/components/Layout/Tenant/index.tsx
@@ -54,9 +54,10 @@ const Comp: React.FC = () => {
 
   const { run: getStreamData } = useRequest(
     {
-      url: '/tenant/listByUser',
+      url: '/tenant/list',
       method: 'POST',
       data: {
+        listByLoginUser: true,
         ...options,
       },
     },
diff --git a/inlong-dashboard/src/ui/pages/TenantManagement/DetailModal.tsx b/inlong-dashboard/src/ui/pages/TenantManagement/DetailModal.tsx
index 64e8cfef41f..72e5d7b06be 100644
--- a/inlong-dashboard/src/ui/pages/TenantManagement/DetailModal.tsx
+++ b/inlong-dashboard/src/ui/pages/TenantManagement/DetailModal.tsx
@@ -58,12 +58,13 @@ const Comp: React.FC<Props> = ({ id, ...modalProps }) => {
           options: {
             requestTrigger: ['onOpen', 'onSearch'],
             requestService: keyword => ({
-              url: '/tenant/listByUser',
+              url: '/tenant/list',
               method: 'POST',
               data: {
                 keyword,
                 pageNum: 1,
                 pageSize: 10,
+                listByLoginUser: true,
               },
             }),
             requestParams: {