public/harvester-ui-extension
1
0
Fork 0
mirror of https://github.com/harvester/harvester-ui-extension.git synced 2025-12-13 21:21:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix undefined error in VM edit as yaml page (#233)

Browse Source 
* fix undefined error whenclick save in  edit as yaml

Signed-off-by: Andy Lee <andy.lee@suse.com>

* fix VM isEqual logic and fix undefined error

Signed-off-by: Andy Lee <andy.lee@suse.com>

---------

Signed-off-by: Andy Lee <andy.lee@suse.com>
This commit is contained in:
Andy Lee 2025-04-07 15:30:59 +08:00 committed by GitHub
parent 19bea97106
commit 238c660796
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/harvester/edit/kubevirt.io.virtualmachine/VirtualMachinePciDevices/index.vue
View File

@ -97,12 +97,14 @@ export default {
}); });
const devices = [ const devices = [
...this.otherDevices(this.value.domain.devices.hostDevices || []), ...this.otherDevices(this.value?.domain?.devices?.hostDevices || []),
...formatted, ...formatted,
]; ];
if (devices.length > 0) {
set(this.value.domain.devices, 'hostDevices', devices); set(this.value.domain.devices, 'hostDevices', devices);
} }
}
}, },
computed: { computed: {
@ -121,7 +123,9 @@ export default {
return inUse; return inUse;
} }
vm.hostDevices.forEach((device) => { const hostDevices = vm?.hostDevices || [];
hostDevices.forEach((device) => {
inUse[device.name] = { usedBy: [vm.metadata.name] }; inUse[device.name] = { usedBy: [vm.metadata.name] };
}); });

8
pkg/harvester/edit/kubevirt.io.virtualmachine/VirtualMachineUSBDevices/index.vue
View File

@ -80,12 +80,14 @@ export default {
}); });
const devices = [ const devices = [
...this.otherDevices(this.value.domain.devices.hostDevices || []), ...this.otherDevices(this.value?.domain?.devices?.hostDevices || []),
...formatted, ...formatted,
]; ];
if (devices.length > 0) {
set(this.value.domain.devices, 'hostDevices', devices); set(this.value.domain.devices, 'hostDevices', devices);
} }
}
}, },
computed: { computed: {
@ -121,7 +123,9 @@ export default {
return inUse; return inUse;
} }
vm.hostDevices.forEach((device) => { const hostDevices = vm?.hostDevices || [];
hostDevices.forEach((device) => {
inUse[device.name] = { usedBy: [vm.metadata.name] }; inUse[device.name] = { usedBy: [vm.metadata.name] };
}); });

10
pkg/harvester/edit/kubevirt.io.virtualmachine/index.vue
View File

@ -2,6 +2,7 @@
import { isEqual } from 'lodash'; import { isEqual } from 'lodash';
import { mapGetters } from 'vuex'; import { mapGetters } from 'vuex';
import Tabbed from '@shell/components/Tabbed'; import Tabbed from '@shell/components/Tabbed';
import { clone } from '@shell/utils/object';
import Tab from '@shell/components/Tabbed/Tab'; import Tab from '@shell/components/Tabbed/Tab';
import { Checkbox } from '@components/Form/Checkbox'; import { Checkbox } from '@components/Form/Checkbox';
import CruResource from '@shell/components/CruResource'; import CruResource from '@shell/components/CruResource';
@ -17,7 +18,6 @@ import UsbDevices from './VirtualMachineUSBDevices/index';
import KeyValue from '@shell/components/form/KeyValue'; import KeyValue from '@shell/components/form/KeyValue';
import { clear } from '@shell/utils/array'; import { clear } from '@shell/utils/array';
import { clone } from '@shell/utils/object';
import { saferDump } from '@shell/utils/create-yaml'; import { saferDump } from '@shell/utils/create-yaml';
import { exceptionToErrorsArray } from '@shell/utils/error'; import { exceptionToErrorsArray } from '@shell/utils/error';
import { HCI as HCI_ANNOTATIONS } from '@pkg/harvester/config/labels-annotations'; import { HCI as HCI_ANNOTATIONS } from '@pkg/harvester/config/labels-annotations';
@ -410,12 +410,16 @@ export default {
const cloneDeepNewVM = clone(this.value); const cloneDeepNewVM = clone(this.value);
delete cloneDeepNewVM?.metadata; delete cloneDeepNewVM?.metadata;
delete cloneDeepNewVM?.__clone;
delete this.cloneVM?.metadata; delete this.cloneVM?.metadata;
delete this.cloneVM?.__clone; delete this.cloneVM?.__clone;
const oldVM = JSON.parse(JSON.stringify(this.cloneVM)); const oldVM = JSON.parse(JSON.stringify(this.cloneVM));
const newVM = JSON.parse(JSON.stringify(cloneDeepNewVM)); const newVM = JSON.parse(JSON.stringify(cloneDeepNewVM));
// we won't show restart dialog in yaml page as we don't have a way to detect change in yaml editor.
// only check VM is changed in form page.
if (isEqual(oldVM, newVM)) { if (isEqual(oldVM, newVM)) {
return; return;
} }
@ -424,7 +428,11 @@ export default {
this.isOpen = true; this.isOpen = true;
this.$nextTick(() => { this.$nextTick(() => {
if (this?.$refs?.restartDialog) {
this.$refs.restartDialog.resolve = resolve; this.$refs.restartDialog.resolve = resolve;
} else {
return resolve();
}
}); });
}); });
}, },

2
pkg/harvester/mixins/harvester-vm/index.js
View File

@ -871,7 +871,7 @@ export default {
} }
} }
if (out.length === 0 && !!this.spec.template.spec.accessCredentials) { if (out.length === 0 && !!this.spec.template.spec.accessCredentials === false) {
delete this.spec.template.spec.accessCredentials; delete this.spec.template.spec.accessCredentials;
} else { } else {
this.spec.template.spec.accessCredentials = out; this.spec.template.spec.accessCredentials = out;