diff --git a/console-ui/src/pages/NameSpace/NameSpace.js b/console-ui/src/pages/NameSpace/NameSpace.js index 33cb914e521..0825579d84a 100644 --- 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)} /> + > 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 index d762d1f164c..0a13166f633 100644 --- 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 index 73732622397..92d9c8fd53d 100644 --- 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); } }