Skip to content
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

Jump to bottom

[Enterprise Search] Add notices for deactivated users and SMTP callout #103285

Merged
merged 10 commits into from
Jun 24, 2021
Merged

[Enterprise Search] Add notices for deactivated users and SMTP callout #103285

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
37832fe
Port #3904 to Kibana
scottybollinger Jun 24, 2021
f75af53
DRY out logic interfaces
scottybollinger Jun 24, 2021
6da677e
Port #3920 to Kibana
scottybollinger Jun 24, 2021
5d840ce
Lint fixes
scottybollinger Jun 24, 2021
96507ee
Remove error state from form
scottybollinger Jun 24, 2021
b56354a
Add loading states
scottybollinger Jun 24, 2021
cd51c6d
Remove manual disabling of button
scottybollinger Jun 24, 2021
f085304
Remove manual disabling of other button
scottybollinger Jun 24, 2021
cb218e6
Lint fixes
scottybollinger Jun 24, 2021
5f958eb
Lint
scottybollinger Jun 24, 2021
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: 2 additions & 0 deletions ...nterprise_search/public/applications/app_search/components/role_mappings/role_mapping.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ export const RoleMapping: React.FC = () => {
selectedEngines,
selectedAuthProviders,
roleMappingErrors,
formLoading,
} = useValues(RoleMappingsLogic);

const isNew = !roleMapping;
Expand All @@ -67,6 +68,7 @@ export const RoleMapping: React.FC = () => {
return (
<RoleMappingFlyout
disabled={attributeValueInvalid || !hasEngineAssignment}
formLoading={formLoading}
isNew={isNew}
closeUsersAndRolesFlyout={closeUsersAndRolesFlyout}
handleSaveMapping={handleSaveMapping}
Expand Down
1 change: 1 addition & 0 deletions ...earch/public/applications/app_search/components/role_mappings/role_mappings_logic.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ describe('RoleMappingsLogic', () => {
userFormIsNewUser: true,
userFormUserIsExisting: true,
smtpSettingsPresent: false,
formLoading: false,
};

const mappingsServerProps = {
Expand Down
9 changes: 9 additions & 0 deletions ...ise_search/public/applications/app_search/components/role_mappings/role_mappings_logic.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,6 +330,15 @@ export const RoleMappingsLogic = kea<MakeLogicType<RoleMappingsValues, RoleMappi
setRoleMappingsData: (_, { smtpSettingsPresent }) => smtpSettingsPresent,
},
],
formLoading: [
false,
{
handleSaveMapping: () => true,
handleSaveUser: () => true,
initializeRoleMappings: () => false,
setRoleMappingErrors: () => false,
},
],
},
selectors: ({ selectors }) => ({
selectedOptions: [
Expand Down
2 changes: 2 additions & 0 deletions ...lugins/enterprise_search/public/applications/app_search/components/role_mappings/user.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ export const User: React.FC = () => {
userCreated,
userFormIsNewUser,
smtpSettingsPresent,
formLoading,
} = useValues(RoleMappingsLogic);

const roleTypes = hasAdvancedRoles ? [...standardRoles, ...advancedRoles] : standardRoles;
Expand Down Expand Up @@ -102,6 +103,7 @@ export const User: React.FC = () => {
return (
<UserFlyout
disabled={flyoutDisabled}
formLoading={formLoading}
isComplete={userCreated}
isNew={userFormIsNewUser}
closeUserFlyout={closeUsersAndRolesFlyout}
Expand Down
5 changes: 4 additions & 1 deletion ...plugins/enterprise_search/public/applications/shared/role_mapping/role_mapping_flyout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ interface Props {
children: React.ReactNode;
isNew: boolean;
disabled: boolean;
formLoading: boolean;
closeUsersAndRolesFlyout(): void;
handleSaveMapping(): void;
}
Expand All @@ -44,6 +45,7 @@ export const RoleMappingFlyout: React.FC<Props> = ({
children,
isNew,
disabled,
formLoading,
closeUsersAndRolesFlyout,
handleSaveMapping,
}) => (
Expand Down Expand Up @@ -77,7 +79,8 @@ export const RoleMappingFlyout: React.FC<Props> = ({
</EuiFlexItem>
<EuiFlexItem grow={false}>
<EuiButton
disabled={disabled}
disabled={disabled || formLoading}
isLoading={formLoading}
onClick={handleSaveMapping}
fill
data-test-subj="FlyoutButton"
Expand Down
1 change: 1 addition & 0 deletions x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,4 +62,5 @@ export interface RoleMappingsBaseValues extends RoleMappingsBaseServerDetails {
userCreated: boolean;
userFormIsNewUser: boolean;
accessAllEngines: boolean;
formLoading: boolean;
}
9 changes: 8 additions & 1 deletion x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/user_flyout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ interface Props {
isNew: boolean;
isComplete: boolean;
disabled: boolean;
formLoading: boolean;
closeUserFlyout(): void;
handleSaveUser(): void;
}
Expand All @@ -49,6 +50,7 @@ export const UserFlyout: React.FC<Props> = ({
isNew,
isComplete,
disabled,
formLoading,
closeUserFlyout,
handleSaveUser,
}) => {
Expand All @@ -75,7 +77,12 @@ export const UserFlyout: React.FC<Props> = ({
<EuiButtonEmpty onClick={closeUserFlyout}>{CANCEL_BUTTON_LABEL}</EuiButtonEmpty>
</EuiFlexItem>
<EuiFlexItem grow={false}>
<EuiButton disabled={disabled} onClick={handleSaveUser} fill>
<EuiButton
disabled={disabled || formLoading}
isLoading={formLoading}
scottybollinger marked this conversation as resolved.
Show resolved Hide resolved
onClick={handleSaveUser}
fill
>
{isNew ? ADD_USER_LABEL : UPDATE_USER_LABEL}
</EuiButton>
</EuiFlexItem>
Expand Down
2 changes: 2 additions & 0 deletions ...terprise_search/public/applications/workplace_search/views/role_mappings/role_mapping.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ export const RoleMapping: React.FC = () => {
selectedAuthProviders,
roleMapping,
roleMappingErrors,
formLoading,
} = useValues(RoleMappingsLogic);

const isNew = !roleMapping;
Expand All @@ -69,6 +70,7 @@ export const RoleMapping: React.FC = () => {
return (
<RoleMappingFlyout
disabled={attributeValueInvalid || !hasGroupAssignment}
formLoading={formLoading}
isNew={isNew}
closeUsersAndRolesFlyout={closeUsersAndRolesFlyout}
handleSaveMapping={handleSaveMapping}
Expand Down
1 change: 1 addition & 0 deletions ...arch/public/applications/workplace_search/views/role_mappings/role_mappings_logic.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ describe('RoleMappingsLogic', () => {
userFormIsNewUser: true,
userFormUserIsExisting: true,
smtpSettingsPresent: false,
formLoading: false,
};
const roleGroup = {
id: '123',
Expand Down
9 changes: 9 additions & 0 deletions ...se_search/public/applications/workplace_search/views/role_mappings/role_mappings_logic.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,6 +330,15 @@ export const RoleMappingsLogic = kea<MakeLogicType<RoleMappingsValues, RoleMappi
setRoleMappingsData: (_, { smtpSettingsPresent }) => smtpSettingsPresent,
},
],
formLoading: [
false,
{
handleSaveMapping: () => true,
handleSaveUser: () => true,
initializeRoleMappings: () => false,
setRoleMappingErrors: () => false,
},
],
},
selectors: ({ selectors }) => ({
selectedOptions: [
Expand Down
2 changes: 2 additions & 0 deletions ...ugins/enterprise_search/public/applications/workplace_search/views/role_mappings/user.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ export const User: React.FC = () => {
userCreated,
userFormIsNewUser,
smtpSettingsPresent,
formLoading,
} = useValues(RoleMappingsLogic);

const showGroupAssignmentSelector = availableGroups.length > 0;
Expand Down Expand Up @@ -99,6 +100,7 @@ export const User: React.FC = () => {
return (
<UserFlyout
disabled={flyoutDisabled}
formLoading={formLoading}
isComplete={userCreated}
isNew={userFormIsNewUser}
closeUserFlyout={closeUsersAndRolesFlyout}
Expand Down