Skip to content

host initiator creation: bug in the group/cluster field #8812

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
agrare merged 1 commit into from
Jun 14, 2023
Merged

host initiator creation: bug in the group/cluster field #8812

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions app/javascript/components/host-initiator-form/host-initiator-form.schema.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
});

Expand Down Expand Up @@ -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 }] },
},
],
Expand Down