Merge pull request alibaba#905 from loadchange/fe/v1.0

Fix: ServiceDetail groupName
LuanLouis · Mar 15, 2019 · 5d66857 · 5d66857
2 parents 01feb23 + a3406a0
commit 5d66857
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/...in/resources/static/console-fe/src/pages/ServiceManagement/ServiceDetail/ServiceDetail.js b/...in/resources/static/console-fe/src/pages/ServiceManagement/ServiceDetail/ServiceDetail.js
@@ -45,6 +45,7 @@ class ServiceDetail extends React.Component {
     this.editClusterDialog = React.createRef();
     this.state = {
       serviceName: getParameter(props.location.search, 'name'),
+      groupName: getParameter(props.location.search, 'groupName'),
       loading: false,
       currentPage: 1,
       clusters: [],
@@ -64,9 +65,9 @@ class ServiceDetail extends React.Component {
   }
 
   getServiceDetail() {
-    const { serviceName } = this.state;
+    const { serviceName, groupName } = this.state;
     request({
-      url: `v1/ns/catalog/service?serviceName=${serviceName}`,
+      url: `v1/ns/catalog/service?serviceName=${serviceName}&groupName=${groupName}`,
       beforeSend: () => this.openLoading(),
       success: ({ clusters = [], service = {} }) => this.setState({ service, clusters }),
       error: e => Message.error(e.responseText || 'error'),

diff --git a/...c/main/resources/static/console-fe/src/pages/ServiceManagement/ServiceList/ServiceList.js b/...c/main/resources/static/console-fe/src/pages/ServiceManagement/ServiceList/ServiceList.js
@@ -231,7 +231,9 @@ class ServiceList extends React.Component {
                       <Button
                         type="normal"
                         onClick={() =>
-                          this.props.history.push(`/serviceDetail?name=${record.name}`)
+                          this.props.history.push(
+                            `/serviceDetail?name=${record.name}&groupName=${record.groupName}`
+                          )
                         }
                       >
                         {detail}

diff --git a/console/src/main/resources/static/js/main.js b/console/src/main/resources/static/js/main.js