From a74066785632172c304d7979e715a46b67e2b56d Mon Sep 17 00:00:00 2001 From: xusongfu Date: Mon, 25 Jul 2022 16:43:19 +0800 Subject: [PATCH] fix: fix trove instance create 1. Remove some useless codes 2. Update context if size change 3. Remove max value of size Change-Id: I8c6c15749e2f1f2487c89124cf8906386d557725 --- .../actions/StepCreate/StepDetails/index.jsx | 56 ++++++------------- 1 file changed, 16 insertions(+), 40 deletions(-) diff --git a/src/pages/database/containers/Instances/actions/StepCreate/StepDetails/index.jsx b/src/pages/database/containers/Instances/actions/StepCreate/StepDetails/index.jsx index b2a5ff1e..a0a39c99 100644 --- a/src/pages/database/containers/Instances/actions/StepCreate/StepDetails/index.jsx +++ b/src/pages/database/containers/Instances/actions/StepCreate/StepDetails/index.jsx @@ -73,23 +73,17 @@ export class StepDetails extends Base { globalInstancesStore.listDatastores(); } - onChangeDatastoresTypeChange = (value) => { - this.setState({ - datastoreType: value, - }); - this.resetFormValue(['datastore_version']); - }; - get datastoresVersion() { - const dizi = this.datastores - .filter((item) => item.label === this.state.datastore_type) - .map((it) => { - return it.originData.versions.map((e) => ({ - label: e.name, - value: e.name, - })); - }); - return dizi[0]; + if (!this.state.datastore_type) { + return []; + } + const current = this.datastores.find( + (item) => item.label === this.state.datastore_type + ); + return (current.originData.versions || []).map((it) => ({ + label: it.name, + value: it.name, + })); } getFlavorComponent() { @@ -102,26 +96,6 @@ export class StepDetails extends Base { }); }; - checkSystemDisk = (rule, value) => { - if (!value.type) { - // eslint-disable-next-line prefer-promise-reject-errors - return Promise.reject(''); - } - return Promise.resolve(); - }; - - getSystemDiskMinSize() { - const flavorSize = (this.state.flavor || {}).disk || 0; - const imageSize = 0; - return Math.max(flavorSize, imageSize, 1); - } - - onSystemDiskChange = (value) => { - this.updateContext({ - volume_type: value, - }); - }; - get formItems() { return [ { @@ -151,7 +125,6 @@ export class StepDetails extends Base { label: t('Size (GiB)'), type: 'input-int', min: 1, - max: 50, placeholder: t('Size'), required: true, wrapperCol: { @@ -162,6 +135,10 @@ export class StepDetails extends Base { span: 18, }, }, + onChange: (val) => + this.updateContext({ + size: val, + }), }, { type: 'divider', @@ -171,8 +148,8 @@ export class StepDetails extends Base { label: t('Datastore Type'), type: 'select', options: this.datastores, - onChange: (value) => { - this.onChangeDatastoresTypeChange(value); + onChange: () => { + this.resetFormValue(['datastore_version']); }, required: true, tip: t('Type of datastore'), @@ -200,7 +177,6 @@ export class StepDetails extends Base { span: 18, }, }, - tip: t('Size of image to launch'), required: true, }, {