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

Skip to content

Enhance user profile attribute form UX #24083

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 18, 2023
Merged

Enhance user profile attribute form UX #24083

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
d66209b
Enhance user profile attribute form UX
jonkoops Oct 18, 2023
8d4dd94
Don't send internal form values to the REST API
jonkoops Oct 18, 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
72 changes: 42 additions & 30 deletions js/apps/admin-ui/src/realm-settings/NewAttributeSettings.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,16 @@ export type IndexedValidations = {
value?: Record<string, unknown>;
};

type UserProfileAttributeType = Omit<
type UserProfileAttributeFormFields = Omit<
UserProfileAttribute,
"validations" | "annotations"
> &
Attribute &
Permission & {
validations: IndexedValidations[];
annotations: IndexedAnnotations[];
hasSelector: boolean;
hasRequiredScopes: boolean;
};

type Attribute = {
Expand Down Expand Up @@ -123,7 +125,7 @@ const CreateAttributeFormContent = ({

export default function NewAttributeSettings() {
const { realm, attributeName } = useParams<AttributeParams>();
const form = useForm<UserProfileAttributeType>();
const form = useForm<UserProfileAttributeFormFields>();
const { t } = useTranslation();
const navigate = useNavigate();
const { addAlert, addError } = useAlerts();
Expand All @@ -141,11 +143,17 @@ export default function NewAttributeSettings() {
selector,
required,
...values
} =
config.attributes!.find(
(attribute) => attribute.name === attributeName,
) || {};
convertToFormValues(values, form.setValue);
} = config.attributes!.find(
(attribute) => attribute.name === attributeName,
) || { permissions: { edit: ["admin"] } };
convertToFormValues(
{
...values,
hasSelector: typeof selector !== "undefined",
hasRequiredScopes: typeof required?.scopes !== "undefined",
},
form.setValue,
);
Object.entries(
flatten<any, any>({ permissions, selector, required }, { safe: true }),
).map(([key, value]) => form.setValue(key as any, value));
Expand All @@ -168,8 +176,20 @@ export default function NewAttributeSettings() {
[],
);

const save = async (profileConfig: UserProfileAttributeType) => {
const validations = profileConfig.validations.reduce(
const save = async ({
hasSelector,
hasRequiredScopes,
...formFields
}: UserProfileAttributeFormFields) => {
if (!hasSelector) {
delete formFields.selector;
}

if (!hasRequiredScopes) {
delete formFields.required?.scopes;
}

const validations = formFields.validations.reduce(
(prevValidations, currentValidations) => {
prevValidations[currentValidations.key] =
currentValidations.value || {};
Expand All @@ -178,7 +198,7 @@ export default function NewAttributeSettings() {
{} as Record<string, unknown>,
);

const annotations = profileConfig.annotations.reduce(
const annotations = formFields.annotations.reduce(
(obj, item) => Object.assign(obj, { [item.key]: item.value }),
{},
);
Expand All @@ -194,39 +214,31 @@ export default function NewAttributeSettings() {
{
...attribute,
name: attributeName,
displayName: profileConfig.displayName!,
selector: profileConfig.selector,
permissions: profileConfig.permissions!,
displayName: formFields.displayName!,
selector: formFields.selector,
permissions: formFields.permissions!,
annotations,
validations,
},
profileConfig.isRequired
? { required: profileConfig.required }
: undefined,
profileConfig.group
? { group: profileConfig.group }
: { group: null },
formFields.isRequired ? { required: formFields.required } : undefined,
formFields.group ? { group: formFields.group } : { group: null },
);
});

const addAttribute = () =>
config?.attributes!.concat([
Object.assign(
{
name: profileConfig.name,
displayName: profileConfig.displayName!,
required: profileConfig.isRequired
? profileConfig.required
: undefined,
selector: profileConfig.selector,
permissions: profileConfig.permissions!,
name: formFields.name,
displayName: formFields.displayName!,
required: formFields.isRequired ? formFields.required : undefined,
selector: formFields.selector,
permissions: formFields.permissions!,
annotations,
validations,
},
profileConfig.isRequired
? { required: profileConfig.required }
: undefined,
profileConfig.group ? { group: profileConfig.group } : undefined,
formFields.isRequired ? { required: formFields.required } : undefined,
formFields.group ? { group: formFields.group } : undefined,
),
] as UserProfileAttribute);

Expand Down
Loading