diff --git a/src/pages/compute/containers/Instance/actions/StepCreate/SystemStep/index.jsx b/src/pages/compute/containers/Instance/actions/StepCreate/SystemStep/index.jsx index 2f1bff0d..28ab3878 100644 --- a/src/pages/compute/containers/Instance/actions/StepCreate/SystemStep/index.jsx +++ b/src/pages/compute/containers/Instance/actions/StepCreate/SystemStep/index.jsx @@ -12,7 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -import React from 'react'; import { inject, observer } from 'mobx-react'; import globalKeyPairStore from 'stores/nova/keypair'; import globalServerStore from 'stores/nova/instance'; @@ -27,10 +26,8 @@ import { } from 'resources/nova/hypervisor'; import { physicalNodeTypes } from 'resources/nova/instance'; import { getOptions } from 'utils'; -import CreateKeyPair from 'pages/compute/containers/Keypair/actions/Create'; -import ItemActionButtons from 'components/Tables/Base/ItemActionButtons'; +import { getKeyPairHeader } from 'resources/nova/keypair'; import { has } from 'lodash'; -import styles from '../index.less'; export class SystemStep extends Base { init() { @@ -184,7 +181,7 @@ export class SystemStep extends Base { allowed = () => Promise.resolve(); async getKeypairs() { - return this.keyPairStore.fetchList(); + await this.keyPairStore.fetchList(); } getHypervisors() { @@ -216,26 +213,6 @@ export class SystemStep extends Base { return this.sourceInfo && this.sourceInfo.os_admin_user; } - onFinishCreateKeyPair = async () => { - const { createdItem } = this.keyPairStore; - const result = await this.getKeypairs(); - const newItem = result.find((it) => it.name === (createdItem || {}).name); - if (newItem) { - const initKeyPair = { - selectedRowKeys: [newItem.id], - selectedRows: [newItem], - }; - this.setState( - { - initKeyPair, - }, - () => { - this.updateDefaultValue(); - } - ); - } - }; - onValuesChange = (changedFields) => { if (has(changedFields, 'serverGroup')) { this.onServerGroupChange(changedFields.serverGroup); @@ -249,28 +226,6 @@ export class SystemStep extends Base { }); }; - getKeyPairHeader() { - const { isLoading } = this.keyPairStore.list || {}; - if (isLoading) { - return null; - } - return ( -