[ISSUE alibaba#8150] Add the namespace description item to the namesp…

…ace list page (alibaba#8155) * [ISSUE alibaba#8150] Add the namespace description item to the namespace list page Close alibaba#8150 * [ISSUE alibaba#8150] resolve conflict Close alibaba#8150 * [ISSUE alibaba#8150] Rebuild console-ui
onewe · Apr 29, 2022 · 5926c67 · 5926c67
1 parent 2e0eca4
commit 5926c67
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 21 deletions.
diff --git a/console-ui/src/pages/NameSpace/NameSpace.js b/console-ui/src/pages/NameSpace/NameSpace.js
@@ -288,6 +288,7 @@ class NameSpace extends React.Component {
       namespace,
       namespaceAdd,
       namespaceNames,
+      description,
       namespaceNumber,
       configuration,
       namespaceOperation,
@@ -328,6 +329,7 @@ class NameSpace extends React.Component {
                     cell={this.renderName.bind(this)}
                   />
                   <Table.Column title={namespaceNumber} dataIndex="namespace" />
+                  <Table.Column title={description} dataIndex="namespaceDesc" />
                   <Table.Column title={configuration} dataIndex="configCount" />
                   <Table.Column
                     title={namespaceOperation}

diff --git a/console/src/main/java/com/alibaba/nacos/console/controller/NamespaceController.java b/console/src/main/java/com/alibaba/nacos/console/controller/NamespaceController.java
@@ -17,7 +17,6 @@
 package com.alibaba.nacos.console.controller;
 
 import com.alibaba.nacos.auth.annotation.Secured;
-import com.alibaba.nacos.plugin.auth.constant.ActionTypes;
 import com.alibaba.nacos.common.model.RestResult;
 import com.alibaba.nacos.common.model.RestResultUtils;
 import com.alibaba.nacos.common.utils.StringUtils;
@@ -26,6 +25,7 @@
 import com.alibaba.nacos.console.enums.NamespaceTypeEnum;
 import com.alibaba.nacos.console.model.Namespace;
 import com.alibaba.nacos.console.model.NamespaceAllInfo;
+import com.alibaba.nacos.plugin.auth.constant.ActionTypes;
 import com.alibaba.nacos.plugin.auth.impl.constant.AuthConstants;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -86,8 +86,8 @@ public RestResult<List<Namespace>> getNamespaces() {
         namespaces.add(namespace0);
         for (TenantInfo tenantInfo : tenantInfos) {
             int configCount = persistService.configInfoCount(tenantInfo.getTenantId());
-            Namespace namespaceTmp = new Namespace(tenantInfo.getTenantId(), tenantInfo.getTenantName(), DEFAULT_QUOTA,
-                    configCount, NamespaceTypeEnum.CUSTOM.getType());
+            Namespace namespaceTmp = new Namespace(tenantInfo.getTenantId(), tenantInfo.getTenantName(),
+                    tenantInfo.getTenantDesc(), DEFAULT_QUOTA, configCount, NamespaceTypeEnum.CUSTOM.getType());
             namespaces.add(namespaceTmp);
         }
         return RestResultUtils.success(namespaces);

diff --git a/console/src/main/java/com/alibaba/nacos/console/model/Namespace.java b/console/src/main/java/com/alibaba/nacos/console/model/Namespace.java
@@ -27,6 +27,8 @@ public class Namespace {
 
     private String namespaceShowName;
 
+    private String namespaceDesc;
+
     private int quota;
 
     private int configCount;
@@ -68,6 +70,24 @@ public Namespace(String namespace, String namespaceShowName, int quota, int conf
         this.type = type;
     }
 
+    public Namespace(String namespace, String namespaceShowName, String namespaceDesc, int quota, int configCount,
+            int type) {
+        this.namespace = namespace;
+        this.namespaceShowName = namespaceShowName;
+        this.quota = quota;
+        this.configCount = configCount;
+        this.type = type;
+        this.namespaceDesc = namespaceDesc;
+    }
+
+    public String getNamespaceDesc() {
+        return namespaceDesc;
+    }
+
+    public void setNamespaceDesc(String namespaceDesc) {
+        this.namespaceDesc = namespaceDesc;
+    }
+
     public int getQuota() {
         return quota;
     }

diff --git a/console/src/main/java/com/alibaba/nacos/console/model/NamespaceAllInfo.java b/console/src/main/java/com/alibaba/nacos/console/model/NamespaceAllInfo.java
@@ -23,23 +23,9 @@
  */
 public class NamespaceAllInfo extends Namespace {
 
-    private String namespaceDesc;
-
-    public String getNamespaceDesc() {
-        return namespaceDesc;
-    }
-
-    public void setNamespaceDesc(String namespaceDesc) {
-        this.namespaceDesc = namespaceDesc;
-    }
-
-    public NamespaceAllInfo() {
-    }
-
     public NamespaceAllInfo(String namespace, String namespaceShowName, int quota, int configCount, int type,
             String namespaceDesc) {
-        super(namespace, namespaceShowName, quota, configCount, type);
-        this.namespaceDesc = namespaceDesc;
+        super(namespace, namespaceShowName, namespaceDesc, quota, configCount, type);
     }
 
 }
diff --git a/console/src/main/resources/static/index.html b/console/src/main/resources/static/index.html
@@ -35,7 +35,7 @@
 	<link rel="stylesheet" type="text/css" href="console-ui/public/css/icon.css">
 	<link rel="stylesheet" type="text/css" href="console-ui/public/css/font-awesome.css">
 	<!-- 第三方css结束 -->
-<link href="./css/main.css?fd60064fb047286c26f3" rel="stylesheet"></head>
+<link href="./css/main.css?1cbbea1b0db3eec7912c" rel="stylesheet"></head>
 
 <body>
 	<div id="root" style="overflow:hidden"></div>
@@ -56,6 +56,6 @@
 	<script src="console-ui/public/js/merge.js"></script>
 	<script src="console-ui/public/js/loader.js"></script>
 	<!-- 第三方js结束 -->
-<script type="text/javascript" src="./js/main.js?fd60064fb047286c26f3"></script></body>
+<script type="text/javascript" src="./js/main.js?1cbbea1b0db3eec7912c"></script></body>
 
 </html>
diff --git a/console/src/main/resources/static/js/main.js b/console/src/main/resources/static/js/main.js