Make combobox required on new plus suggestion

Closes #842
This commit is contained in:
Kalle
2022-08-14 11:08:21 +03:00
parent 431f5b525b
commit a4aa217271
2 changed files with 7 additions and 2 deletions

View File

@@ -16,6 +16,7 @@ interface ComboboxProps<T> {
className?: string;
id?: string;
isLoading?: boolean;
required?: boolean;
initialValue?: ComboboxOption<T>;
onChange?: (selectedOption?: ComboboxOption<T>) => void;
}
@@ -26,6 +27,7 @@ export function Combobox<T extends Record<string, string | null | number>>({
placeholder,
initialValue,
onChange,
required,
className,
id,
isLoading = false,
@@ -71,6 +73,7 @@ export function Combobox<T extends Record<string, string | null | number>>({
}
data-cy={`${inputName}-combobox-input`}
id={id}
required={required}
/>
<HeadlessCombobox.Options
className={clsx("combobox-options", {
@@ -109,10 +112,11 @@ export function UserCombobox({
onChange,
userIdsToOmit,
className,
required,
id,
}: Pick<
ComboboxProps<Pick<UserWithPlusTier, "discordId" | "plusTier">>,
"inputName" | "onChange" | "className" | "id"
"inputName" | "onChange" | "className" | "id" | "required"
> & { userIdsToOmit?: Set<number>; initialUserId?: number }) {
const { users, isLoading, isError } = useUsers();
@@ -154,6 +158,7 @@ export function UserCombobox({
onChange={onChange}
className={className}
id={id}
required={required}
/>
);
}

View File

@@ -145,7 +145,7 @@ export default function PlusNewSuggestionModalPage() {
</div>
<div>
<label htmlFor="user">Suggested user</label>
<UserCombobox inputName="user" onChange={setSelectedUser} />
<UserCombobox inputName="user" onChange={setSelectedUser} required />
{selectedUserErrorMessage ? (
<FormMessage type="error">{selectedUserErrorMessage}</FormMessage>
) : null}