Thanks to visit codestin.com
Credit goes to github.com

Skip to content

better unset check #32062

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
edewit merged 4 commits into from
Aug 16, 2024
Merged

better unset check #32062

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
86e8154
better unset check
edewit Aug 12, 2024
8c78569
better explanation
edewit Aug 13, 2024
1a6e768
fix min value
edewit Aug 14, 2024
2c4a3c9
Steal some code from `react-hook-form`
jonkoops Aug 15, 2024
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 js/apps/admin-ui/maven-resources/theme/keycloak.v2/admin/messages/messages_en.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2777,7 +2777,7 @@ javaKeystore=java-keystore
updatedUserProfileSuccess=User Profile configuration has been saved
deleteProviderMapper=Delete mapper?
clientsPermissionsHint=Fine grained permissions for administrators that want to manage this client or apply roles defined by this client.
lookAroundHelp=How far around should the server look just in case the token generator and server are out of time sync or counter sync?
lookAroundHelp=How far around (extra token periods or counts) should the server look just in case the token generator and server are out of time sync or counter sync?
usersLeft_one={{count}} user left the group
sync-keycloak-groups-to-ldap=Sync Keycloak groups to LDAP
saveError=User federation provider could not be saved\: {{error}}
Expand Down
4 changes: 3 additions & 1 deletion js/apps/admin-ui/src/clients/initial-access/CreateInitialAccessToken.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,11 @@ export default function CreateInitialAccessToken() {
label={t("count")}
labelIcon={t("countHelp")}
controller={{
rules: {
min: 1,
},
defaultValue: 1,
}}
min={1}
/>
<ActionGroup>
<Button
Expand Down
12 changes: 8 additions & 4 deletions js/libs/ui-shared/src/controls/NumberControl.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ import {
UseControllerProps,
useFormContext,
} from "react-hook-form";

import { getRuleValue } from "../utils/getRuleValue";
import { FormLabel } from "./FormLabel";

export type NumberControlOption = {
Expand Down Expand Up @@ -43,6 +45,7 @@ export const NumberControl = <
control,
formState: { errors },
} = useFormContext();

return (
<FormLabel
name={name}
Expand All @@ -57,11 +60,12 @@ export const NumberControl = <
control={control}
render={({ field }) => {
const required = !!controller.rules?.required;
const min = controller.rules?.min;
const value =
field.value === 0 ? controller.defaultValue : field.value;
const min = getRuleValue(controller.rules?.min);
const value = field.value ?? controller.defaultValue;
const setValue = (newValue: number) =>
field.onChange(min ? Math.max(newValue, Number(min)) : newValue);
field.onChange(
min !== undefined ? Math.max(newValue, Number(min)) : newValue,
);

return (
<NumberInput
Expand Down
17 changes: 17 additions & 0 deletions js/libs/ui-shared/src/utils/getRuleValue.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import type { ValidationRule, ValidationValue } from "react-hook-form";

// Simplified version of https://github.com/react-hook-form/react-hook-form/blob/ea0f3ed86457691f79987a703ae8d50b9e16e2ad/src/logic/getRuleValue.ts#L10-L21
// TODO: Can be removed if https://github.com/react-hook-form/react-hook-form/issues/12178 is resolved
export function getRuleValue<T extends ValidationValue>(
rule?: ValidationRule<T>,
): T | undefined {
if (typeof rule === "undefined" || rule instanceof RegExp) {
return;
}

if (typeof rule === "object") {
return rule.value;
}

return rule;
}