Skip to content
Merged
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
2 changes: 1 addition & 1 deletion app/javascript/FormAdmin/FormItemUtils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ export type MultipleChoiceProperties = CommonQuestionProperties & {
};

export type MultipleChoiceFormItem = WithRequiredIdentifier<
ParsedFormItem<MultipleChoiceProperties, string | string[], 'multiple_choice'>
ParsedFormItem<MultipleChoiceProperties, string | boolean | (string | boolean)[], 'multiple_choice'>
>;

export function valueIsMultipleChoiceValue(value: unknown): value is FormItemValueType<MultipleChoiceFormItem> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@ function FormItemChangeDisplay<FormItemType extends TypedFormItem>({
typeof change.new_value === 'string' ||
typeof change.previous_value === 'number' ||
typeof change.new_value === 'number' ||
typeof change.previous_value === 'boolean' ||
typeof change.new_value === 'boolean' ||
Array.isArray(change.previous_value) ||
Array.isArray(change.new_value)
) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ function castSingleValue(value: FormItemValueType<MultipleChoiceFormItem> | null
return null;
}

if (typeof value === 'string') {
return value;
if (typeof value === 'string' || typeof value === 'boolean') {
return value.toString();
}

if (Array.isArray(value)) {
return value.length > 0 ? value[0] : null;
return value.length > 0 ? value[0].toString() : null;
}

assertNever(value);
Expand All @@ -30,11 +30,11 @@ function castMultipleValue(value: FormItemValueType<MultipleChoiceFormItem> | nu
let arrayValue: string[];

if (Array.isArray(value)) {
arrayValue = value;
arrayValue = value.map((item) => item.toString());
} else if (value == null) {
arrayValue = [];
} else {
arrayValue = [value];
arrayValue = [value.toString()];
}

return arrayValue;
Expand Down
Loading