baha/skyline
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix keypair in magnum

Browse Source 
1.The form items value will be resetted, when create a new keypair
2.Same issue when create instance

Closes-Bug: #1998077
Change-Id: Ie0021cbddc4c8730d604e4892a8cfa878a5bcb95
This commit is contained in:
xusongfu 2022-11-28 16:00:46 +08:00
parent 8401c5b546
commit ac1edd6e97
6 changed files with 15 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/pages/compute/containers/Instance/actions/StepCreate/SystemStep/index.jsx
View File

@ -154,10 +154,7 @@ export class SystemStep extends Base {
selectedRows: this.serverGroups.filter((it) => it.id === servergroup), selectedRows: this.serverGroups.filter((it) => it.id === servergroup),
}; };
} }
const { initKeyPair, name } = this.state; const { name } = this.state;
if (initKeyPair) {
data.keypair = initKeyPair;
}
if (name) { if (name) {
data.name = name; data.name = name;
} }

9
src/pages/container-infra/containers/ClusterTemplates/actions/StepCreate/StepNodeSpec/index.jsx
View File

@ -102,11 +102,6 @@ export class StepNodeSpec extends Base {
get defaultValue() { get defaultValue() {
let values = {}; let values = {};
const { initKeyPair } = this.state;
if (initKeyPair) {
values.keypairs = initKeyPair;
}
if (this.isEdit) { if (this.isEdit) {
const { const {
extra: { extra: {
@ -134,7 +129,7 @@ export class StepNodeSpec extends Base {
values.images = { selectedRowKeys: [image_id] }; values.images = { selectedRowKeys: [image_id] };
} }
if (keypair_id) { if (keypair_id) {
values.keypairs = { selectedRowKeys: [keypair_id] }; values.keypair = { selectedRowKeys: [keypair_id] };
} }
} }
return values; return values;
@ -169,7 +164,7 @@ export class StepNodeSpec extends Base {
columns: this.imageColumns, columns: this.imageColumns,
}, },
{ {
name: 'keypairs', name: 'keypair',
label: t('Keypair'), label: t('Keypair'),
type: 'select-table', type: 'select-table',
data: this.keypairs, data: this.keypairs,

6
src/pages/container-infra/containers/ClusterTemplates/actions/StepCreate/index.jsx
View File

@ -98,7 +98,7 @@ export class StepCreate extends StepAction {
masterFlavor, masterFlavor,
additionalLabels, additionalLabels,
images, images,
keypairs, keypair,
externalNetwork, externalNetwork,
fixedNetwork, fixedNetwork,
fixedSubnet, fixedSubnet,
@ -127,8 +127,8 @@ export class StepCreate extends StepAction {
if (images) { if (images) {
body.image_id = images.selectedRowKeys[0]; body.image_id = images.selectedRowKeys[0];
} }
if (keypairs) { if (keypair) {
body.keypair_id = keypairs.selectedRowKeys[0]; body.keypair_id = keypair.selectedRowKeys[0];
} }
if (fixedNetwork) { if (fixedNetwork) {
body.fixed_network = fixedNetwork.selectedRowKeys[0]; body.fixed_network = fixedNetwork.selectedRowKeys[0];

4
src/pages/container-infra/containers/Clusters/actions/StepCreate/StepInfo/index.jsx
View File

@ -63,10 +63,6 @@ export class StepInfo extends Base {
get defaultValue() { get defaultValue() {
const values = {}; const values = {};
const { initKeyPair } = this.state;
if (initKeyPair) {
values.keypair = initKeyPair;
}
const { template } = this.locationParams; const { template } = this.locationParams;
if (template) { if (template) {

4
src/resources/nova/keypair.jsx
View File

@ -17,7 +17,7 @@ import ItemActionButtons from 'components/Tables/Base/ItemActionButtons';
import CreateKeyPair from 'pages/compute/containers/Keypair/actions/Create'; import CreateKeyPair from 'pages/compute/containers/Keypair/actions/Create';
import styles from './keypair.less'; import styles from './keypair.less';
export const getKeyPairHeader = (self) => { export const getKeyPairHeader = (self, name = 'keypair') => {
const onFinishCreateKeyPair = async () => { const onFinishCreateKeyPair = async () => {
await self.getKeypairs(); // refresh keypairs await self.getKeypairs(); // refresh keypairs
const { createdItem } = self.keyPairStore; const { createdItem } = self.keyPairStore;
@ -34,7 +34,7 @@ export const getKeyPairHeader = (self) => {
initKeyPair, initKeyPair,
}, },
() => { () => {
self.updateDefaultValue(); self.updateFormValue(name, newItem);
} }
); );
} }

8
src/stores/magnum/clusterTemplates.js
View File

@ -15,6 +15,7 @@
import Base from 'stores/base'; import Base from 'stores/base';
import client from 'client'; import client from 'client';
import { action } from 'mobx'; import { action } from 'mobx';
import { isBoolean } from 'lodash';
export class ClusterTemplatesStore extends Base { export class ClusterTemplatesStore extends Base {
get client() { get client() {
@ -43,7 +44,12 @@ export class ClusterTemplatesStore extends Base {
) )
.map((key) => ({ .map((key) => ({
path: `/${key}`, path: `/${key}`,
value: key === 'labels' ? JSON.stringify(body[key] || {}) : body[key], value:
key === 'labels'
? JSON.stringify(body[key] || {})
: isBoolean(body[key])
? `${body[key]}`
: body[key],
op: [null, undefined, ''].includes(body[key]) ? 'remove' : 'replace', op: [null, undefined, ''].includes(body[key]) ? 'remove' : 'replace',
})); }));
return this.submitting(this.client.patch(id, newBody)); return this.submitting(this.client.patch(id, newBody));