e.g. on aarch64 it makes only sense to use virtio-scsi or virtio-scsi-single, so hide all other values, by adding a filter on the internal store that allows only certain values.
Default to 'x86_64' for the architecture. By using a setter for 'nodename' and 'arch' this also works in a context where we can bind the values to these fields, e.g. in the wizard. To properly trigger validation, we have to check the state before and after setting the filter, since just a filter change, does not trigger a validity change in the form field it seems. Signed-off-by: Dominik Csapak <[email protected]> --- www/manager6/form/ScsiHwSelector.js | 63 +++++++++++++++++++++++++++++ www/manager6/qemu/ScsiHwEdit.js | 1 + www/manager6/qemu/SystemEdit.js | 2 + 3 files changed, 66 insertions(+) diff --git a/www/manager6/form/ScsiHwSelector.js b/www/manager6/form/ScsiHwSelector.js index d35a5b3a..10d9f4db 100644 --- a/www/manager6/form/ScsiHwSelector.js +++ b/www/manager6/form/ScsiHwSelector.js @@ -10,4 +10,67 @@ Ext.define('PVE.form.ScsiHwSelector', { ['virtio-scsi-single', PVE.Utils.render_scsihw('virtio-scsi-single')], ['pvscsi', PVE.Utils.render_scsihw('pvscsi')], ], + + controllersPerArchitecture: { + x86_64: [ + '__default__', + 'lsi', + 'lsi53c810', + 'megasas', + 'virtio-scsi-pci', + 'virtio-scsi-single', + 'pvscsi', + ], + aarch64: ['virtio-scsi-pci', 'virtio-scsi-single'], + }, + + // defaults to hostArch + arch: undefined, + + // depends on the node + hostArch: 'x86_64', + + nodename: undefined, + + setNodename: function (nodename) { + let me = this; + let node = PVE.data.ResourceStore.getNodeById(nodename); + if (node) { + me.hostArch = node.data.architecture; + me.setArch(me.arch); // recalculate the filter + } + }, + + setArch: function (arch) { + let me = this; + if (arch === '__default__') { + arch = undefined; + } + me.arch = arch; + arch ??= me.hostArch; + let wasValid = me.isValid(); + me.store.clearFilter(); + let allowedControllers = me.controllersPerArchitecture[arch]; + me.store.addFilter((rec) => allowedControllers.indexOf(rec.data.key) !== -1); + // update default value with new arch + let record = me.store.findRecord('key', '__default__'); + if (record) { + record.set('value', PVE.Utils.render_scsihw('', arch)); + record.commit(); + } + let isValid = me.isValid(); + + // for some reason, adding/changing filters does not trigger this, even though + // it show the field as invalid, so simply track and fire the event manually. + if (wasValid !== isValid) { + me.fireEvent('validitychange', isValid); + } + }, + + initComponent: function () { + let me = this; + + me.callParent(); + me.setArch(me.arch); + }, }); diff --git a/www/manager6/qemu/ScsiHwEdit.js b/www/manager6/qemu/ScsiHwEdit.js index 48dcb228..212343c0 100644 --- a/www/manager6/qemu/ScsiHwEdit.js +++ b/www/manager6/qemu/ScsiHwEdit.js @@ -11,6 +11,7 @@ Ext.define('PVE.qemu.ScsiHwEdit', { name: 'scsihw', value: '__default__', fieldLabel: gettext('Type'), + arch: me.arch, }, }); diff --git a/www/manager6/qemu/SystemEdit.js b/www/manager6/qemu/SystemEdit.js index 2cf17e8e..a2ad8494 100644 --- a/www/manager6/qemu/SystemEdit.js +++ b/www/manager6/qemu/SystemEdit.js @@ -140,6 +140,8 @@ Ext.define('PVE.qemu.SystemInputPanel', { value: '__default__', bind: { value: '{current.scsihw}', + arch: '{current.architecture}', + nodename: '{nodename}', }, fieldLabel: gettext('SCSI Controller'), }, -- 2.47.3 _______________________________________________ pve-devel mailing list [email protected] https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
