Pegoku commented on code in PR #36764:
URL: https://github.com/apache/superset/pull/36764#discussion_r2777541145
##########
superset-frontend/src/features/users/UserListModal.tsx:
##########
@@ -135,99 +177,110 @@ function UserListModal({
>
{(form: FormInstance) => (
<>
- <FormItem
- name="first_name"
- label={t('First name')}
- rules={[{ required: true, message: t('First name is required') }]}
- >
- <Input
- name="first_name"
- placeholder={t("Enter the user's first name")}
- />
- </FormItem>
- <FormItem
- name="last_name"
- label={t('Last name')}
- rules={[{ required: true, message: t('Last name is required') }]}
- >
- <Input
- name="last_name"
- placeholder={t("Enter the user's last name")}
- />
- </FormItem>
- <FormItem
- name="username"
- label={t('Username')}
- rules={[{ required: true, message: t('Username is required') }]}
- >
- <Input
- name="username"
- placeholder={t("Enter the user's username")}
- />
- </FormItem>
- <FormItem
- name="active"
- label={t('Is active?')}
- valuePropName="checked"
- >
- <Checkbox
- onChange={checked => {
- form.setFieldsValue({ isActive: checked });
- }}
- />
- </FormItem>
- <FormItem
- name="email"
- label={t('Email')}
- rules={[
- { required: true, message: t('Email is required') },
- {
- type: 'email',
- message: t('Please enter a valid email address'),
- },
- ]}
- >
- <Input name="email" placeholder={t("Enter the user's email")} />
- </FormItem>
- <FormItem
- name="roles"
- label={t('Roles')}
- dependencies={['groups']}
- rules={[atLeastOneRoleOrGroup('groups')]}
- >
- <Select
- name="roles"
- mode="multiple"
- placeholder={t('Select roles')}
- options={roles.map(role => ({
- value: role.id,
- label: role.name,
- }))}
- getPopupContainer={trigger =>
- trigger.closest('.ant-modal-content')
- }
- />
- </FormItem>
- <FormItem
- name="groups"
- label={t('Groups')}
- dependencies={['roles']}
- rules={[atLeastOneRoleOrGroup('roles')]}
- >
- <Select
- name="groups"
- mode="multiple"
- placeholder={t('Select groups')}
- options={groups.map(group => ({
- value: group.id,
- label: group.name,
- }))}
- getPopupContainer={trigger =>
- trigger.closest('.ant-modal-content')
- }
- />
- </FormItem>
- {!isEditMode && (
+ {showProfileFields && (
+ <>
+ <FormItem
+ name="first_name"
+ label={t('First name')}
+ rules={[{ required: true, message: t('First name is required')
}]}
+ >
+ <Input
+ name="first_name"
+ placeholder={t("Enter the user's first name")}
+ />
+ </FormItem>
+ <FormItem
+ name="last_name"
+ label={t('Last name')}
+ rules={[{ required: true, message: t('Last name is required')
}]}
+ >
+ <Input
+ name="last_name"
+ placeholder={t("Enter the user's last name")}
+ />
+ </FormItem>
+ <FormItem
+ name="username"
+ label={t('Username')}
+ rules={[{ required: true, message: t('Username is required')
}]}
+ >
+ <Input
+ name="username"
+ placeholder={t("Enter the user's username")}
+ />
+ </FormItem>
+ <FormItem
+ name="active"
+ label={t('Is active?')}
+ valuePropName="checked"
+ >
+ <Checkbox
Review Comment:
This was already present in the old code. I intentionally didn’t change it
to keep the modifications as minimal as possible, but I can update it if you
prefer.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
