From e9cd1482c2e76c56bb6b0fd96f1cc0d6e129639c Mon Sep 17 00:00:00 2001 From: "Jingwei.Zhang" Date: Thu, 26 May 2022 15:10:02 +0800 Subject: [PATCH] fix: fix image required when create ironic 1. Set image is required when create ironic 2. Add image info in confirm step when create ironic Change-Id: I57de4e5317aab2ee96e012327bb9a5a79f5e7656 --- .../Instance/actions/CreateIronic/BaseStep/index.jsx | 2 +- .../Instance/actions/CreateIronic/ConfirmStep/index.jsx | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/pages/compute/containers/Instance/actions/CreateIronic/BaseStep/index.jsx b/src/pages/compute/containers/Instance/actions/CreateIronic/BaseStep/index.jsx index 73d740e6..dda36656 100644 --- a/src/pages/compute/containers/Instance/actions/CreateIronic/BaseStep/index.jsx +++ b/src/pages/compute/containers/Instance/actions/CreateIronic/BaseStep/index.jsx @@ -191,7 +191,7 @@ export class BaseStep extends Base { type: 'select-table', data: this.images, isLoading: imageLoading, - isMulti: false, + required: true, filterParams: [ { label: t('Name'), diff --git a/src/pages/compute/containers/Instance/actions/CreateIronic/ConfirmStep/index.jsx b/src/pages/compute/containers/Instance/actions/CreateIronic/ConfirmStep/index.jsx index a2f90875..e4097d36 100644 --- a/src/pages/compute/containers/Instance/actions/CreateIronic/ConfirmStep/index.jsx +++ b/src/pages/compute/containers/Instance/actions/CreateIronic/ConfirmStep/index.jsx @@ -39,8 +39,7 @@ export class ConfirmStep extends Base { getSourceValue() { const { context } = this.props; - const { source } = context; - const { selectedRows = [], selectedRowKeys = [] } = context[source.value]; + const { selectedRows = [], selectedRowKeys = [] } = context.image; return selectedRows.length ? selectedRows[0].name : selectedRowKeys[0]; } @@ -116,6 +115,10 @@ export class ConfirmStep extends Base { label: t('Flavor'), value: this.getFlavor(), }, + { + label: t('Image Name'), + value: this.getSourceValue(), + }, ], }, {