Skip to content

changed to validators #23628

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
jonkoops merged 2 commits into from
Oct 2, 2023
Merged

changed to validators #23628

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a1d612f
changed to validators
edewit Sep 14, 2023
0011a11
fixed merge error
edewit Oct 2, 2023
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/src/user/components/OptionsComponent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export const OptionComponent = (attr: UserProfileAttribute) => {
const isMultiSelect = type.includes("multiselect");
const Component = isMultiSelect ? Checkbox : Radio;

const options = (attr.validations?.options as Options).options || [];
const options = (attr.validators?.options as Options).options || [];

return (
<UserProfileGroup {...attr}>
Expand Down
8 changes: 7 additions & 1 deletion js/apps/admin-ui/src/user/components/UserProfileGroup.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,15 @@ export type UserProfileFieldsProps = UserProfileAttribute & {
roles?: string[];
};

type LengthValidator =
| {
min: number;
}
| undefined;

const isRequired = (attribute: UserProfileAttribute) =>
Object.keys(attribute.required || {}).length !== 0 ||
((attribute.validations?.length?.min as number) || 0) > 0;
(((attribute.validators?.length as LengthValidator)?.min as number) || 0) > 0;

export const UserProfileGroup = ({
children,
Expand Down
1 change: 1 addition & 0 deletions js/libs/keycloak-admin-client/src/defs/userProfileConfig.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ export default interface UserProfileConfig {
export interface UserProfileAttribute {
name?: string;
validations?: Record<string, Record<string, unknown>>;
validators?: Record<string, unknown>;
annotations?: Record<string, unknown>;
required?: UserProfileAttributeRequired;
readOnly?: boolean;
Expand Down