From 2ef37a7eaf9bd5a2bac5b2ed19c45e1353df0485 Mon Sep 17 00:00:00 2001 From: Or Gur Date: Sun, 4 Jun 2023 13:04:06 +0300 Subject: [PATCH] fixed bugs in `host-initiator-form.schema.js` (ui) and in `HostInitiator.raw_create_host_initiator` (provider) --- .../host-initiator-form.schema.js | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/app/javascript/components/host-initiator-form/host-initiator-form.schema.js b/app/javascript/components/host-initiator-form/host-initiator-form.schema.js index 09bcf2f0853..5912a72bc52 100644 --- a/app/javascript/components/host-initiator-form/host-initiator-form.schema.js +++ b/app/javascript/components/host-initiator-form/host-initiator-form.schema.js @@ -24,8 +24,11 @@ const loadStorages = (id) => API.get(`/api/providers/${id}?attributes=type,physi const loadGroups = (id) => API.get(`/api/physical_storages/${id}?attributes=host_initiator_groups`) // eslint-disable-next-line camelcase .then(({ host_initiator_groups }) => { - const groupOptions = host_initiator_groups.map(({ id, name }) => ({ label: name, value: id })); - groupOptions.unshift({ label: `<${__('None')}>`, value: '' }); + const groupOptions = host_initiator_groups.map(({ name }) => ({ label: name, value: name })); + groupOptions.unshift( + { label: `<${__('Choose')}>`, value: '-1' }, + { label: `<${__('None')}>`, value: 'none' } + ); return groupOptions; }); @@ -284,9 +287,11 @@ const createSchema = (state, setState, ems, initialValues, storageId, setStorage name: 'host_initiator_group', label: __('Host Initiator Group:'), isRequired: true, - validate: [{ type: validatorTypes.REQUIRED }], + validate: [ + { type: validatorTypes.REQUIRED }, + { type: validatorTypes.PATTERN, pattern: '^(?!-)', message: __('Required') }, + ], loadOptions: () => (storageId ? loadGroups(storageId) : Promise.resolve([])), - isSearchable: true, condition: { and: [{ when: 'physical_storage_id', isNotEmpty: true }, { when: 'port_type', isNotEmpty: true }] }, }, ],