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

Role mapping cleanup #23

Open
wants to merge 1 commit into
base: security/role-mapping-ui
Choose a base branch
from
Open

Role mapping cleanup #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions ...ment/role_mappings/edit_role_mapping/components/mapping_info_panel/mapping_info_panel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ export class MappingInfoPanel extends Component<Props, State> {
defaultMessage="Choose which roles to assign to your users."
/>
</span>
<EuiSpacer size="xs" />
<EuiSpacer size="m" />
<EuiLink
onClick={() => {
this.setState({ rolesMode: 'templates' });
Expand Down Expand Up @@ -208,7 +208,7 @@ export class MappingInfoPanel extends Component<Props, State> {
/>
</EuiLink>
</span>
<EuiSpacer size="xs" />
<EuiSpacer size="m" />
<EuiLink
onClick={() => {
this.setState({ rolesMode: 'roles' });
Expand Down
32 changes: 19 additions & 13 deletions ...agement/role_mappings/edit_role_mapping/components/role_selector/role_template_editor.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,15 @@
import React, { Fragment } from 'react';
import { FormattedMessage } from '@kbn/i18n/react';
import {
EuiButtonEmpty,
EuiFlexGroup,
EuiFlexItem,
EuiFormRow,
EuiFieldText,
EuiCallOut,
EuiText,
EuiSwitch,
EuiLink,
EuiSpacer,
} from '@elastic/eui';
import { i18n } from '@kbn/i18n';
import { RoleTemplate } from '../../../../../../../common/model';
Expand Down Expand Up @@ -45,18 +46,23 @@ export const RoleTemplateEditor = ({
{getTemplateConfigurationFields()}
{getEditorForTemplate()}
<EuiFlexItem grow={false}>
<EuiFormRow>
<EuiLink
color="danger"
onClick={() => onDelete(roleTemplate)}
data-test-subj="deleteRoleTemplateButton"
>
<FormattedMessage
id="xpack.security.management.editRoleMapping.deleteRoleTemplateButton"
defaultMessage="Delete role template"
/>
</EuiLink>
</EuiFormRow>
<EuiSpacer size="s" />
<EuiFlexGroup justifyContent="flexEnd">
<EuiFlexItem grow={false}>
<EuiButtonEmpty
iconType="trash"
color="danger"
size="xs"
onClick={() => onDelete(roleTemplate)}
data-test-subj="deleteRoleTemplateButton"
>
<FormattedMessage
id="xpack.security.management.editRoleMapping.deleteRoleTemplateButton"
defaultMessage="Delete role template"
/>
</EuiButtonEmpty>
</EuiFlexItem>
</EuiFlexGroup>
</EuiFlexItem>
</EuiFlexGroup>
);
Expand Down
46 changes: 24 additions & 22 deletions ...gement/role_mappings/edit_role_mapping/components/rule_editor_panel/field_rule_editor.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import {
EuiFormRow,
EuiFieldText,
EuiComboBox,
EuiButton,
EuiButtonEmpty,
EuiSelect,
EuiSpacer,
EuiFieldNumber,
Expand Down Expand Up @@ -137,12 +137,34 @@ export class FieldRuleEditor extends Component<Props, {}> {
<EuiFlexItem grow={1}>
{this.renderFieldValueInput(type, rowRuleValue, valueIndex)}
</EuiFlexItem>
<EuiFlexItem grow={false}>
<EuiFormRow hasEmptyLabelSpace={true}>
{renderAddValueButton ? (
<EuiButtonIcon
iconSize="s"
iconType="plusInCircle"
onClick={this.onAddAlternateValue}
color="primary"
data-test-subj="addAlternateValueButton"
aria-label={i18n.translate(
'xpack.security.management.editRoleMapping.fieldRuleEditor.addAlternateValueButton',
{
defaultMessage: 'Add alternate value',
}
)}
/>
) : (
<EuiSpacer />
)}
</EuiFormRow>
</EuiFlexItem>
{renderDeleteButton && (
<EuiFlexItem grow={false}>
<EuiFlexItem grow={1}>
<EuiFormRow hasEmptyLabelSpace={true}>
<EuiButtonIcon
iconType="trash"
color="danger"
iconSize="s"
data-test-subj={`fieldRuleEditorDeleteValue fieldRuleEditorDeleteValue-${valueIndex}`}
aria-label={i18n.translate(
'xpack.security.management.editRoleMapping.fieldRuleEditor.deleteValueLabel',
Expand All @@ -155,26 +177,6 @@ export class FieldRuleEditor extends Component<Props, {}> {
</EuiFormRow>
</EuiFlexItem>
)}
<EuiFlexItem grow={1}>
<EuiFormRow hasEmptyLabelSpace={true}>
{renderAddValueButton ? (
<EuiButton
onClick={this.onAddAlternateValue}
iconType="plusInCircle"
color="primary"
size="s"
data-test-subj="addAlternateValueButton"
>
<FormattedMessage
id="xpack.security.management.editRoleMapping.fieldRuleEditor.addAlternateValueButton"
defaultMessage="add alternate value"
/>
</EuiButton>
) : (
<EuiSpacer />
)}
</EuiFormRow>
</EuiFlexItem>
</EuiFlexGroup>
);
};
Expand Down
2 changes: 1 addition & 1 deletion ...gement/role_mappings/edit_role_mapping/components/rule_editor_panel/rule_editor_panel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ export class RuleEditorPanel extends Component<Props, State> {
<Fragment>
{validationWarning}
{this.getEditor()}
<EuiSpacer />
<EuiSpacer size="xl" />
{this.getModeToggle()}
{this.getConfirmModeChangePrompt()}
</Fragment>
Expand Down
3 changes: 2 additions & 1 deletion ...gement/role_mappings/edit_role_mapping/components/rule_editor_panel/rule_group_editor.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,12 @@ export class RuleGroupEditor extends Component<Props, {}> {
color="danger"
onClick={this.props.onDelete}
size="s"
iconType="trash"
data-test-subj="deleteRuleGroupButton"
>
<FormattedMessage
id="xpack.security.management.editRoleMapping.deleteRuleGroupButton"
defaultMessage="Delete rule group"
defaultMessage="Delete"
/>
</EuiButtonEmpty>
</EuiFlexItem>
Expand Down
Loading