Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 7 additions & 2 deletions src/actions/sponsor-forms-actions.js
Original file line number Diff line number Diff line change
Expand Up @@ -537,10 +537,15 @@ export const saveSponsorManagedForm =
const normalizeSponsorManagedForm = (entity) => {
const normalizedEntity = {
show_form_ids: entity.forms,
apply_to_all_add_ons: true,
allowed_add_ons: entity.add_ons.map((a) => a.id)
allowed_add_ons: entity.add_ons.map((a) => a.id),
apply_to_all_add_ons: false
};

if (entity.add_ons.includes("all")) {
normalizedEntity.apply_to_all_add_ons = true;
normalizedEntity.allowed_add_ons = [];
}

return normalizedEntity;
};

Expand Down
41 changes: 25 additions & 16 deletions src/components/mui/formik-inputs/mui-formik-select-group.js
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,9 @@ const MuiFormikSelectGroup = ({
const [groupedOptions, setGroupedOptions] = useState([]);
const [loading, setLoading] = useState(false);

const value = field.value || [];
const isAllSelected =
Array.isArray(field.value) && field.value.includes("all");
const value = isAllSelected ? options : field.value || [];
const error = meta.touched && meta.error;

const fetchOptions = async () => {
Expand Down Expand Up @@ -106,13 +108,14 @@ const MuiFormikSelectGroup = ({
const selectedValues = event.target.value;

if (selectedValues.includes("selectAll")) {
const allValues = options.map(getOptionValue);
const currentValues = value.map(getOptionValue);
const currentValues = Array.isArray(value)
? value.map(getOptionValue)
: [];

if (currentValues.length === allValues.length) {
if (isAllSelected || currentValues.length === options.length) {
helpers.setValue([]);
} else {
helpers.setValue(options);
helpers.setValue(["all"]);
}
return;
}
Expand All @@ -129,10 +132,11 @@ const MuiFormikSelectGroup = ({
helpers.setValue(selectedItems);
};

const selectedValues = value.map((item) => getOptionValue(item));

const isAllSelected = () =>
selectedValues.length === options.length && options.length > 0;
const selectedValues = isAllSelected
? options.map(getOptionValue)
: Array.isArray(value)
? value.map((item) => getOptionValue(item))
: [];

const renderGroupedOptions = () =>
groupedOptions
Expand Down Expand Up @@ -163,9 +167,16 @@ const MuiFormikSelectGroup = ({
value={optionValue}
sx={{ pl: 2 }}
onClick={() => {
const newValues = isChecked
? selectedValues.filter((v) => v !== optionValue)
: [...selectedValues, optionValue];
let newValues;
if (isAllSelected) {
newValues = options
.filter((opt) => getOptionValue(opt) !== optionValue)
.map(getOptionValue);
} else {
newValues = isChecked
? selectedValues.filter((v) => v !== optionValue)
: [...selectedValues, optionValue];
}
handleChange({ target: { value: newValues } });
}}
>
Expand Down Expand Up @@ -254,10 +265,8 @@ const MuiFormikSelectGroup = ({
}}
>
<Checkbox
checked={isAllSelected()}
indeterminate={
selectedValues.length > 0 && !isAllSelected()
}
checked={isAllSelected}
indeterminate={selectedValues.length > 0 && !isAllSelected}
sx={{
p: 1,
"& svg": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,13 @@ const AddSponsorFormTemplatePopup = ({
add_ons: []
},
validationSchema: yup.object({
add_ons: yup.array().min(1, "Select at least one add-on")
add_ons: yup
.array()
.test(
"add_ons-required",
"Select at least one add-on",
(value) => value?.includes("all") || value?.length > 0
)
}),
onSubmit: (values) => {
const { add_ons } = values;
Expand Down