diff --git a/src/locales/en.json b/src/locales/en.json index e5d1a622..efa0f3fe 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -761,7 +761,6 @@ "Docker Storage Driver": "Docker Storage Driver", "Docker Swarm": "Docker Swarm", "Docker Swarm Mode": "Docker Swarm Mode", - "Docker Volume Size": "Docker Volume Size", "Docker Volume Size (GiB)": "Docker Volume Size (GiB)", "Domain": "Domain", "Domain Detail": "Domain Detail", diff --git a/src/locales/zh.json b/src/locales/zh.json index c69d8699..1dec55c0 100644 --- a/src/locales/zh.json +++ b/src/locales/zh.json @@ -761,7 +761,6 @@ "Docker Storage Driver": "Docker存储驱动", "Docker Swarm": "Docker Swarm", "Docker Swarm Mode": "Docker Swarm Mode", - "Docker Volume Size": "Docker硬盘大小", "Docker Volume Size (GiB)": "Docker硬盘大小(GiB)", "Domain": "域", "Domain Detail": "域详情", diff --git a/src/pages/container-infra/containers/ClusterTemplates/Detail/BaseDetail.jsx b/src/pages/container-infra/containers/ClusterTemplates/Detail/BaseDetail.jsx index babed127..98648485 100644 --- a/src/pages/container-infra/containers/ClusterTemplates/Detail/BaseDetail.jsx +++ b/src/pages/container-infra/containers/ClusterTemplates/Detail/BaseDetail.jsx @@ -184,7 +184,7 @@ export class BaseDetail extends Base { dataIndex: 'docker_storage_driver', }, { - label: t('Docker Volume Size'), + label: t('Docker Volume Size (GiB)'), dataIndex: 'docker_volume_size', }, { diff --git a/src/pages/container-infra/containers/Clusters/Detail/BaseDetail.jsx b/src/pages/container-infra/containers/Clusters/Detail/BaseDetail.jsx index 26dc76db..2d14fc99 100644 --- a/src/pages/container-infra/containers/Clusters/Detail/BaseDetail.jsx +++ b/src/pages/container-infra/containers/Clusters/Detail/BaseDetail.jsx @@ -107,7 +107,7 @@ export class BaseDetail extends Base { content: keypairUrl, }, { - label: t('Docker Volume Size'), + label: t('Docker Volume Size (GiB)'), dataIndex: 'docker_volume_size', }, { diff --git a/src/pages/container-infra/containers/Clusters/actions/StepCreate/StepInfo/index.jsx b/src/pages/container-infra/containers/Clusters/actions/StepCreate/StepInfo/index.jsx index 532789de..ee9c3bfd 100644 --- a/src/pages/container-infra/containers/Clusters/actions/StepCreate/StepInfo/index.jsx +++ b/src/pages/container-infra/containers/Clusters/actions/StepCreate/StepInfo/index.jsx @@ -34,6 +34,8 @@ export class StepInfo extends Base { async getClustertemplates() { await globalClusterTemplateStore.fetchList(); + this.updateDefaultValue(); + this.updateState(); } get clusterTemplates() { @@ -53,18 +55,18 @@ export class StepInfo extends Base { return globalKeypairStore.list.data || []; } - handleTemplateChange = (e) => { - const { selectedRows = [] } = e; - this.setState({ - clusterTemplate: selectedRows[0], - }); - }; + get nameForStateUpdate() { + return ['clusterTemplate']; + } get defaultValue() { const { template } = this.locationParams; if (template) { return { - clusterTemplate: { selectedRowKeys: [template] }, + clusterTemplate: { + selectedRowKeys: [template], + selectedRows: this.clusterTemplates, + }, }; } return {}; @@ -96,7 +98,6 @@ export class StepInfo extends Base { }, ], columns: getBaseTemplateColumns(this), - onChange: this.handleTemplateChange, }, { name: 'keypair', diff --git a/src/resources/skyline/policy.js b/src/resources/skyline/policy.js index a6f161db..975937db 100644 --- a/src/resources/skyline/policy.js +++ b/src/resources/skyline/policy.js @@ -64,7 +64,7 @@ export const policyMap = { octavia: ['os_load-balancer_api'], // keystone: ['identity:'], heat: ['stacks:', 'resource:index'], - magnum: ['cluster', 'clustertemplate'], + magnum: ['cluster:', 'clustertemplate:'], barbican: [ 'secret:get', 'secret:decrypt',