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.

Sign up for GitHub

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

fix: No data when change pods of helm cluster #472

Merged
merged 1 commit into from
Oct 10, 2018
Merged

fix: No data when change pods of helm cluster #472

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions src/locales/zh/translation.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,9 +344,9 @@

"Choose category": "选择分类",
"Deployment Name": "部署名称",
"Deployment Node": "部署节点",
"StatefulSet Node": "状态节点",
"DaemonSet Node": "守护节点",
"Deployment Pods": "部署",
"StatefulSet Pods": "有状态副本集",
"DaemonSet Pods": "守护进程集",
"Rollback cluster": "回滚集群",
"Update_env cluster": "修改集群环境",
"Update cluster env": "修改集群环境",
Expand Down
13 changes: 10 additions & 3 deletions src/pages/Admin/Clusters/Detail/Helm/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,10 @@ export default class HelmCluster extends React.Component {
const { onChangeK8sTag } = this.props.clusterDetailStore;

return (
<DetailTabs tabs={['Deployments', 'StatefulSets', 'DaemonSets']} changeTab={onChangeK8sTag} />
<DetailTabs
tabs={['Deployment Pods', 'StatefulSet Pods', 'DaemonSet Pods']}
changeTab={onChangeK8sTag}
/>
);
}

Expand Down Expand Up @@ -71,11 +74,11 @@ export default class HelmCluster extends React.Component {

const props = {
isLoading,
columns: columns(t, onChangeNodeStatus, extendedRowKeys),
columns: columns(t, onChangeExtend, extendedRowKeys),
dataSource: clusterNodes,
filterList: getFilterOptions({
trans: t,
onChange: onChangeExtend,
onChange: onChangeNodeStatus,
selectValue: selectNodeStatus
}),
pagination: {
Expand Down Expand Up @@ -124,6 +127,10 @@ export default class HelmCluster extends React.Component {
}

render() {
const { clusterDetailStore } = this.props;
const { isLoading } = clusterDetailStore;
if (isLoading) return null;

return (
<div>
{this.renderDetailTabs()}
Expand Down