Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

修复服务详情页面集群列表获取只获取groupName=DEFAULT_GROUP的数据 #1201

Merged
merged 3 commits into from
May 14, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -52,14 +52,15 @@ class InstanceTable extends React.Component {
}

getInstanceList() {
const { clusterName, serviceName } = this.props;
const { clusterName, serviceName, groupName } = this.props;
if (!clusterName) return;
const { pageSize, pageNum } = this.state;
request({
url: 'v1/ns/catalog/instances',
data: {
serviceName,
clusterName,
groupName,
pageSize,
pageNo: pageNum,
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ class ServiceDetail extends React.Component {

render() {
const { locale = {} } = this.props;
const { serviceName, loading, service = {}, clusters } = this.state;
const { serviceName, groupName, loading, service = {}, clusters } = this.state;
const { metadata = {}, selector = {} } = service;
const metadataText = processMetaData(METADATA_ENTER)(metadata);
return (
Expand Down Expand Up @@ -169,7 +169,11 @@ class ServiceDetail extends React.Component {
</Button>
}
>
<InstanceTable clusterName={cluster.name} serviceName={serviceName} />
<InstanceTable
clusterName={cluster.name}
serviceName={serviceName}
groupName={groupName}
/>
</Card>
))}
</Loading>
Expand Down
2 changes: 1 addition & 1 deletion console/src/main/resources/static/css/main.css

Large diffs are not rendered by default.

28 changes: 14 additions & 14 deletions console/src/main/resources/static/js/main.js

Large diffs are not rendered by default.