libre.sh/keycloak-scim
2
0
Fork 0
Code Issues 14 Pull requests Releases Packages Activity Actions 6

don't do multi select when type isn't multi (#29297)

Browse source 
* remove invalid attributes from switch

Signed-off-by: Erik Jan de Wit <erikjan.dewit@gmail.com>

* don't do multi select when variant is not multi

fixes: #29237
Signed-off-by: Erik Jan de Wit <erikjan.dewit@gmail.com>

---------

Signed-off-by: Erik Jan de Wit <erikjan.dewit@gmail.com>
This commit is contained in:
Erik Jan de Wit 2024-05-14 12:54:10 +02:00 committed by GitHub
parent 701e49e4a5
commit 51522248a3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
js/libs/ui-shared/src/controls/SelectControl.tsx
View file

@ -115,7 +115,7 @@ export const SelectControl = <
}
onSelect={(event, v) => {
event.stopPropagation();
if (Array.isArray(value)) {
if (variant.includes("multi") && Array.isArray(value)) {
const option = v.toString();
const key = isSelectBasedOptions(options)
? options.find((o) => o.value === option)?.key

24
js/libs/ui-shared/src/controls/SwitchControl.tsx
View file

@ -25,11 +25,15 @@ export type SwitchControlProps<
export const SwitchControl = <
T extends FieldValues,
P extends FieldPath<T> = FieldPath<T>,
>(
props: SwitchControlProps<T, P>,
) => {
const fallbackValue = props.stringify ? "false" : false;
const defaultValue = props.defaultValue ?? (fallbackValue as PathValue<T, P>);
>({
labelOn,
stringify,
defaultValue,
labelIcon,
...props
}: SwitchControlProps<T, P>) => {
const fallbackValue = stringify ? "false" : false;
const defValue = defaultValue ?? (fallbackValue as PathValue<T, P>);
const { control } = useFormContext();
return (
<FormLabel
@ -37,21 +41,21 @@ export const SwitchControl = <
name={props.name}
isRequired={props.rules?.required === true}
label={props.label}
labelIcon={props.labelIcon}
labelIcon={labelIcon}
>
<Controller
control={control}
name={props.name}
defaultValue={defaultValue}
defaultValue={defValue}
render={({ field: { onChange, value } }) => (
<Switch
{...props}
id={props.name}
data-testid={props.name}
label={props.labelOn}
isChecked={props.stringify ? value === "true" : value}
label={labelOn}
isChecked={stringify ? value === "true" : value}
onChange={(e, checked) => {
const value = props.stringify ? checked.toString() : checked;
const value = stringify ? checked.toString() : checked;
props.onChange?.(e, checked);
onChange(value);
}}