diff --git a/public/apps/account/password-reset-panel.tsx b/public/apps/account/password-reset-panel.tsx index 3a79bdf68..5ca0f44dd 100644 --- a/public/apps/account/password-reset-panel.tsx +++ b/public/apps/account/password-reset-panel.tsx @@ -15,13 +15,13 @@ import React from 'react'; import { - EuiButton, - EuiButtonEmpty, + EuiSmallButton, + EuiSmallButtonEmpty, EuiCallOut, - EuiFieldPassword, + EuiCompressedFieldPassword, EuiFlexGroup, EuiFlexItem, - EuiFormRow, + EuiCompressedFormRow, EuiModal, EuiModalBody, EuiModalFooter, @@ -116,7 +116,7 @@ export function PasswordResetPanel(props: PasswordResetPanelProps) { isInvalid={isCurrentPasswordInvalid} error={currentPasswordError} > - ) { setCurrentPassword(e.target.value); @@ -135,7 +135,7 @@ export function PasswordResetPanel(props: PasswordResetPanelProps) { helpText={passwordHelpText} isInvalid={isNewPasswordInvalid} > - ) { setNewPassword(e.target.value); @@ -146,9 +146,9 @@ export function PasswordResetPanel(props: PasswordResetPanelProps) { isInvalid={isNewPasswordInvalid} /> - + - + @@ -156,7 +156,7 @@ export function PasswordResetPanel(props: PasswordResetPanelProps) { headerText="Re-enter new password" helpText="The password must be identical to what you entered above." > - ) { @@ -177,18 +177,18 @@ export function PasswordResetPanel(props: PasswordResetPanelProps) { )} - + Cancel - + - Reset - + diff --git a/public/apps/account/tenant-switch-panel.tsx b/public/apps/account/tenant-switch-panel.tsx index 103647ec8..cff48b27e 100755 --- a/public/apps/account/tenant-switch-panel.tsx +++ b/public/apps/account/tenant-switch-panel.tsx @@ -14,16 +14,16 @@ */ import { - EuiButton, - EuiButtonEmpty, + EuiSmallButton, + EuiSmallButtonEmpty, EuiCallOut, - EuiComboBox, + EuiCompressedComboBox, EuiComboBoxOptionOption, EuiModal, EuiModalBody, EuiModalFooter, EuiOverlayMask, - EuiRadioGroup, + EuiCompressedRadioGroup, EuiSpacer, EuiText, EuiTitle, @@ -247,7 +247,7 @@ export function TenantSwitchPanel(props: TenantSwitchPanelProps) { if (isMultiTenancyEnabled) { content = ( <> - - Cancel + Cancel - Confirm - + diff --git a/public/apps/account/test/__snapshots__/tenant-switch-panel.test.tsx.snap b/public/apps/account/test/__snapshots__/tenant-switch-panel.test.tsx.snap index 37a7a14df..0ee1048a2 100644 --- a/public/apps/account/test/__snapshots__/tenant-switch-panel.test.tsx.snap +++ b/public/apps/account/test/__snapshots__/tenant-switch-panel.test.tsx.snap @@ -21,7 +21,7 @@ exports[`Account menu -tenant switch panel confirm button and renders renders wh Tenants are useful for safely sharing your work with other OpenSearch Dashboards users. You can switch your tenant anytime by clicking the user avatar on top right. - - - Cancel - - + Confirm - + @@ -133,7 +133,7 @@ exports[`Account menu -tenant switch panel confirm button and renders renders wh Tenants are useful for safely sharing your work with other OpenSearch Dashboards users. You can switch your tenant anytime by clicking the user avatar on top right. - - - Cancel - - + Confirm - + @@ -248,7 +248,7 @@ exports[`Account menu -tenant switch panel confirm button and renders renders wh Tenants are useful for safely sharing your work with other OpenSearch Dashboards users. You can switch your tenant anytime by clicking the user avatar on top right. - - - Cancel - - + Confirm - + @@ -363,7 +363,7 @@ exports[`Account menu -tenant switch panel confirm button and renders renders wh Tenants are useful for safely sharing your work with other OpenSearch Dashboards users. You can switch your tenant anytime by clicking the user avatar on top right. - - - Cancel - - + Confirm - + @@ -478,7 +478,7 @@ exports[`Account menu -tenant switch panel confirm button and renders renders wh Tenants are useful for safely sharing your work with other OpenSearch Dashboards users. You can switch your tenant anytime by clicking the user avatar on top right. - - - Cancel - - + Confirm - + diff --git a/public/apps/configuration/panels/audit-logging/audit-logging-edit-settings.tsx b/public/apps/configuration/panels/audit-logging/audit-logging-edit-settings.tsx index 05f705e24..7f2ab07aa 100644 --- a/public/apps/configuration/panels/audit-logging/audit-logging-edit-settings.tsx +++ b/public/apps/configuration/panels/audit-logging/audit-logging-edit-settings.tsx @@ -15,7 +15,7 @@ import React, { useContext } from 'react'; import { - EuiButton, + EuiSmallButton, EuiFlexGroup, EuiFlexItem, EuiGlobalToastList, @@ -83,17 +83,17 @@ export function AuditLoggingEditSettings(props: AuditLoggingEditSettingProps) { <> - { window.location.href = buildHashUrl(ResourceType.auditLogging); }} > Cancel - + - Save - + diff --git a/public/apps/configuration/panels/audit-logging/audit-logging.tsx b/public/apps/configuration/panels/audit-logging/audit-logging.tsx index 344400a4b..4db106373 100644 --- a/public/apps/configuration/panels/audit-logging/audit-logging.tsx +++ b/public/apps/configuration/panels/audit-logging/audit-logging.tsx @@ -14,19 +14,19 @@ */ import { - EuiButton, + EuiSmallButton, EuiCode, EuiDescribedFormGroup, EuiFlexGroup, EuiFlexItem, EuiForm, - EuiFormRow, + EuiCompressedFormRow, EuiHorizontalRule, EuiLoadingContent, EuiPageHeader, EuiPanel, EuiSpacer, - EuiSwitch, + EuiCompressedSwitch, EuiText, EuiTitle, } from '@elastic/eui'; @@ -59,7 +59,7 @@ function renderStatusPanel(onSwitchChange: () => void, auditLoggingEnabled: bool Storage location} className="described-form-group"> - + void, auditLoggingEnabled: bool />{' '} - + Enable audit logging} className="described-form-group" > - - + - + @@ -206,7 +206,7 @@ export function AuditLogging(props: AuditLoggingProps) { - { window.location.href = @@ -214,7 +214,7 @@ export function AuditLogging(props: AuditLoggingProps) { }} > Configure - + @@ -231,7 +231,7 @@ export function AuditLogging(props: AuditLoggingProps) { - { window.location.href = @@ -239,7 +239,7 @@ export function AuditLogging(props: AuditLoggingProps) { }} > Configure - + diff --git a/public/apps/configuration/panels/audit-logging/edit-setting-group.tsx b/public/apps/configuration/panels/audit-logging/edit-setting-group.tsx index 8caefbfd4..815c2fab5 100644 --- a/public/apps/configuration/panels/audit-logging/edit-setting-group.tsx +++ b/public/apps/configuration/panels/audit-logging/edit-setting-group.tsx @@ -16,11 +16,11 @@ import React, { Fragment } from 'react'; import { EuiCodeBlock, - EuiComboBox, + EuiCompressedComboBox, EuiDescribedFormGroup, - EuiFormRow, + EuiCompressedFormRow, EuiSpacer, - EuiSwitch, + EuiCompressedSwitch, EuiTitle, } from '@elastic/eui'; import { get, isEmpty } from 'lodash'; @@ -63,7 +63,7 @@ export function EditSettingGroup(props: { val = val || false; return ( - {/* @ts-ignore*/} - + {/* @ts-ignore*/} {renderField(props.config, setting, props.handleChange, props.handleInvalid)} - + ); diff --git a/public/apps/configuration/panels/audit-logging/test/__snapshots__/audit-logging.test.tsx.snap b/public/apps/configuration/panels/audit-logging/test/__snapshots__/audit-logging.test.tsx.snap index c93f11948..c5b689b96 100644 --- a/public/apps/configuration/panels/audit-logging/test/__snapshots__/audit-logging.test.tsx.snap +++ b/public/apps/configuration/panels/audit-logging/test/__snapshots__/audit-logging.test.tsx.snap @@ -276,10 +276,10 @@ exports[`Audit logs render when AuditLoggingSettings.enabled is true 1`] = ` } > - - + } > - - - + @@ -352,12 +352,12 @@ exports[`Audit logs render when AuditLoggingSettings.enabled is true 1`] = ` - Configure - + - Configure - + { ); - const switchFound = component.find(EuiSwitch); + const switchFound = component.find(EuiCompressedSwitch); expect(switchFound.prop('checked')).toBeFalsy(); expect(switchFound.prop('label')).toBe('Disabled'); diff --git a/public/apps/configuration/panels/audit-logging/test/edit-setting-group.test.tsx b/public/apps/configuration/panels/audit-logging/test/edit-setting-group.test.tsx index 291a0722c..60aa4b2cd 100644 --- a/public/apps/configuration/panels/audit-logging/test/edit-setting-group.test.tsx +++ b/public/apps/configuration/panels/audit-logging/test/edit-setting-group.test.tsx @@ -18,7 +18,7 @@ import React from 'react'; import { EditSettingGroup } from '../edit-setting-group'; import { CONFIG, SettingContent, SettingGroup } from '../constants'; import { AuditLoggingSettings, ComplianceSettings, GeneralSettings } from '../types'; -import { EuiComboBox, EuiSwitch } from '@elastic/eui'; +import { EuiCompressedComboBox, EuiCompressedSwitch } from '@elastic/eui'; import { stringToComboBoxOption } from '../../../utils/combo-box-utils'; import { JsonCodeEditor } from '../code-editor'; import { displayObject } from '../../../utils/display-utils'; @@ -82,15 +82,15 @@ describe('Edit setting', () => { /> ); - expect(component.find(EuiSwitch).prop('checked')).toBeTruthy(); + expect(component.find(EuiCompressedSwitch).prop('checked')).toBeTruthy(); - expect(component.find(EuiComboBox).length).toEqual(2); + expect(component.find(EuiCompressedComboBox).length).toEqual(2); - expect(component.find(EuiComboBox).at(0).prop('selectedOptions')).toEqual( + expect(component.find(EuiCompressedComboBox).at(0).prop('selectedOptions')).toEqual( audit.disabled_rest_categories?.map(stringToComboBoxOption) ); - expect(component.find(EuiComboBox).at(1).prop('selectedOptions')).toEqual( + expect(component.find(EuiCompressedComboBox).at(1).prop('selectedOptions')).toEqual( compliance.read_ignore_users?.map(stringToComboBoxOption) ); diff --git a/public/apps/configuration/panels/get-started.tsx b/public/apps/configuration/panels/get-started.tsx index 5903f88f6..4918bc165 100644 --- a/public/apps/configuration/panels/get-started.tsx +++ b/public/apps/configuration/panels/get-started.tsx @@ -14,7 +14,7 @@ */ import { - EuiButton, + EuiSmallButton, EuiCode, EuiFlexGroup, EuiFlexItem, @@ -64,14 +64,14 @@ const addBackendStep = { /> - { window.location.href = buildHashUrl(ResourceType.auth); }} > Review authentication and authorization - + @@ -95,7 +95,7 @@ const setOfSteps = [ - { @@ -103,17 +103,17 @@ const setOfSteps = [ }} > Explore existing roles - + - { window.location.href = buildHashUrl(ResourceType.roles, Action.create); }} > Create new role - + @@ -135,7 +135,7 @@ const setOfSteps = [ - { @@ -143,17 +143,17 @@ const setOfSteps = [ }} > Map users to a role - + - { window.location.href = buildHashUrl(ResourceType.users, Action.create); }} > Create internal user - + @@ -219,7 +219,7 @@ export function GetStarted(props: AppDependencies) { />{' '}

- { @@ -227,7 +227,7 @@ export function GetStarted(props: AppDependencies) { }} > Review Audit Log Configuration - + @@ -242,7 +242,7 @@ export function GetStarted(props: AppDependencies) { By default, the security plugin caches authenticated users, along with their roles and permissions. This option will purge cached users, roles and permissions.

- Purge cache - + @@ -289,23 +289,23 @@ export function GetStarted(props: AppDependencies) {

- { window.location.href = buildHashUrl(ResourceType.tenants); }} > Manage Multi-tenancy - + - { window.location.href = buildHashUrl(ResourceType.tenantsConfigureTab); }} > Configure Multi-tenancy - + diff --git a/public/apps/configuration/panels/internal-user-edit/attribute-panel.tsx b/public/apps/configuration/panels/internal-user-edit/attribute-panel.tsx index 4e2ac1acc..8e8e8eace 100644 --- a/public/apps/configuration/panels/internal-user-edit/attribute-panel.tsx +++ b/public/apps/configuration/panels/internal-user-edit/attribute-panel.tsx @@ -14,12 +14,12 @@ */ import { - EuiButton, - EuiFieldText, + EuiSmallButton, + EuiCompressedFieldText, EuiFlexGroup, EuiFlexItem, EuiSpacer, - EuiFormRow, + EuiCompressedFormRow, } from '@elastic/eui'; import { map, isEmpty } from 'lodash'; import React, { Dispatch, Fragment, SetStateAction } from 'react'; @@ -68,7 +68,7 @@ function generateAttributesPanels( - onValueChangeHandler('key')(e.target.value)} @@ -78,7 +78,7 @@ function generateAttributesPanels( - onValueChangeHandler('value')(e.target.value)} @@ -87,15 +87,15 @@ function generateAttributesPanels( - - + removeElementFromArray(setAttributes, [], arrayIndex)} > Remove - - + + @@ -116,22 +116,22 @@ export function AttributePanel(props: { return ( {generateAttributesPanels(state, setState)} - { appendElementToArray(setState, [], getEmptyAttribute()); }} > Add another attribute - + ); } diff --git a/public/apps/configuration/panels/internal-user-edit/backend-role-panel.tsx b/public/apps/configuration/panels/internal-user-edit/backend-role-panel.tsx index 5dae5dc13..2176b72cc 100644 --- a/public/apps/configuration/panels/internal-user-edit/backend-role-panel.tsx +++ b/public/apps/configuration/panels/internal-user-edit/backend-role-panel.tsx @@ -14,12 +14,12 @@ */ import { - EuiButton, - EuiFieldText, + EuiSmallButton, + EuiCompressedFieldText, EuiFlexGroup, EuiFlexItem, EuiSpacer, - EuiFormRow, + EuiCompressedFormRow, } from '@elastic/eui'; import { isEmpty } from 'lodash'; import React, { Dispatch, Fragment, SetStateAction, useState } from 'react'; @@ -43,12 +43,12 @@ function generateBackendRolesPanels( - - - + - - + removeElementFromArray(setBackendRoles, [], arrayIndex)} > Remove - - + + @@ -105,7 +105,7 @@ export function BackendRolePanel(props: { setRoleEmptyErrorMessage )} - { if (state.indexOf('') !== -1) { @@ -118,7 +118,7 @@ export function BackendRolePanel(props: { }} > Add another backend role - + ); } diff --git a/public/apps/configuration/panels/internal-user-edit/internal-user-edit.tsx b/public/apps/configuration/panels/internal-user-edit/internal-user-edit.tsx index 986ff8e05..5b122f384 100644 --- a/public/apps/configuration/panels/internal-user-edit/internal-user-edit.tsx +++ b/public/apps/configuration/panels/internal-user-edit/internal-user-edit.tsx @@ -14,7 +14,7 @@ */ import { - EuiButton, + EuiSmallButton, EuiFlexGroup, EuiFlexItem, EuiForm, @@ -198,16 +198,16 @@ export function InternalUserEdit(props: InternalUserEditDeps) { - { window.location.href = buildHashUrl(ResourceType.users); }} > Cancel - + - {props.action === 'edit' ? 'Save changes' : 'Create'} - + diff --git a/public/apps/configuration/panels/internal-user-edit/test/__snapshots__/backend-role-panel.test.tsx.snap b/public/apps/configuration/panels/internal-user-edit/test/__snapshots__/backend-role-panel.test.tsx.snap index 39a209a27..a9b6bdfb2 100644 --- a/public/apps/configuration/panels/internal-user-edit/test/__snapshots__/backend-role-panel.test.tsx.snap +++ b/public/apps/configuration/panels/internal-user-edit/test/__snapshots__/backend-role-panel.test.tsx.snap @@ -11,9 +11,9 @@ exports[`User editing - backend role panel BackendRolePanel add backend role whe - - - + - - Remove - - + + - - - + - - Remove - - + + - Add another backend role - + `; @@ -115,11 +115,11 @@ exports[`User editing - backend role panel BackendRolePanel add backend role whe optional={true} > - Add another backend role - + `; diff --git a/public/apps/configuration/panels/internal-user-edit/test/attribute-panel.test.tsx b/public/apps/configuration/panels/internal-user-edit/test/attribute-panel.test.tsx index b9cdfed14..a9f4290e5 100644 --- a/public/apps/configuration/panels/internal-user-edit/test/attribute-panel.test.tsx +++ b/public/apps/configuration/panels/internal-user-edit/test/attribute-panel.test.tsx @@ -13,7 +13,7 @@ * permissions and limitations under the License. */ -import { EuiFieldText, EuiFlexGroup } from '@elastic/eui'; +import { EuiCompressedFieldText, EuiFlexGroup } from '@elastic/eui'; import { shallow } from 'enzyme'; import React from 'react'; import { @@ -66,10 +66,10 @@ describe('User editing - attribute panel', () => { const component = shallow(); expect(component.find(EuiFlexGroup).length).toBe(2); - expect(component.find(EuiFieldText).at(0).prop('value')).toBe(attr1); - expect(component.find(EuiFieldText).at(1).prop('value')).toBe(value1); - expect(component.find(EuiFieldText).at(2).prop('value')).toBe(attr2); - expect(component.find(EuiFieldText).at(3).prop('value')).toBe(value2); + expect(component.find(EuiCompressedFieldText).at(0).prop('value')).toBe(attr1); + expect(component.find(EuiCompressedFieldText).at(1).prop('value')).toBe(value1); + expect(component.find(EuiCompressedFieldText).at(2).prop('value')).toBe(attr2); + expect(component.find(EuiCompressedFieldText).at(3).prop('value')).toBe(value2); }); it('add row', () => { diff --git a/public/apps/configuration/panels/internal-user-edit/test/backend-role-panel.test.tsx b/public/apps/configuration/panels/internal-user-edit/test/backend-role-panel.test.tsx index d24f81d6e..0a44acac4 100644 --- a/public/apps/configuration/panels/internal-user-edit/test/backend-role-panel.test.tsx +++ b/public/apps/configuration/panels/internal-user-edit/test/backend-role-panel.test.tsx @@ -13,7 +13,7 @@ * permissions and limitations under the License. */ -import { EuiFieldText, EuiFlexGroup } from '@elastic/eui'; +import { EuiCompressedFieldText, EuiFlexGroup } from '@elastic/eui'; import { shallow } from 'enzyme'; import React from 'react'; import { @@ -48,8 +48,8 @@ describe('User editing - backend role panel', () => { const component = shallow(); expect(component.find(EuiFlexGroup).length).toBe(2); - expect(component.find(EuiFieldText).at(0).prop('value')).toBe(backendRole1); - expect(component.find(EuiFieldText).at(1).prop('value')).toBe(backendRole2); + expect(component.find(EuiCompressedFieldText).at(0).prop('value')).toBe(backendRole1); + expect(component.find(EuiCompressedFieldText).at(1).prop('value')).toBe(backendRole2); }); it('add row', () => { diff --git a/public/apps/configuration/panels/permission-list/edit-modal.tsx b/public/apps/configuration/panels/permission-list/edit-modal.tsx index 99e3fc448..1086dc982 100644 --- a/public/apps/configuration/panels/permission-list/edit-modal.tsx +++ b/public/apps/configuration/panels/permission-list/edit-modal.tsx @@ -14,8 +14,8 @@ */ import { - EuiButton, - EuiButtonEmpty, + EuiSmallButton, + EuiSmallButtonEmpty, EuiModal, EuiModalBody, EuiModalFooter, @@ -23,7 +23,7 @@ import { EuiModalHeaderTitle, EuiOverlayMask, EuiForm, - EuiComboBox, + EuiCompressedComboBox, } from '@elastic/eui'; import React, { useState } from 'react'; import { ComboBoxOptions, Action } from '../../types'; @@ -76,7 +76,7 @@ export function PermissionEditModal(props: PermissionEditModalDeps) { setIsFormValid={setIsFormValid} /> - - Cancel + Cancel - { await props.handleSave(groupName, allowedActions.map(comboBoxOptionToString)); @@ -98,7 +98,7 @@ export function PermissionEditModal(props: PermissionEditModalDeps) { disabled={!isFormValid} > {props.action === Action.create ? 'Create' : 'Save'} - + diff --git a/public/apps/configuration/panels/permission-list/permission-list.tsx b/public/apps/configuration/panels/permission-list/permission-list.tsx index 41d1515ba..17116dd3e 100644 --- a/public/apps/configuration/panels/permission-list/permission-list.tsx +++ b/public/apps/configuration/panels/permission-list/permission-list.tsx @@ -15,7 +15,7 @@ import { EuiBasicTableColumn, - EuiButtonIcon, + EuiSmallButtonIcon, EuiFlexGroup, EuiFlexItem, EuiGlobalToastList, @@ -30,7 +30,7 @@ import { EuiText, EuiTitle, RIGHT_ALIGNMENT, - EuiButtonEmpty, + EuiSmallButtonEmpty, Query, EuiLoadingContent, } from '@elastic/eui'; @@ -95,7 +95,7 @@ export function renderRowExpansionArrow( ) { return (item: PermissionListingItem) => item.type === 'Action group' && ( - toggleRowDetails(item, actionGroupDict, setItemIdToExpandedRowMap)} aria-label={itemIdToExpandedRowMap[item.name] ? 'Collapse' : 'Expand'} iconType={itemIdToExpandedRowMap[item.name] ? 'arrowUp' : 'arrowDown'} @@ -249,15 +249,15 @@ export function PermissionList(props: AppDependencies) { ); const actionsMenuItems = [ - showEditModal(selection[0].name, Action.edit, selection[0].allowedActions)} disabled={selection.length !== 1 || selection[0].reserved} > Edit - , - , + @@ -270,15 +270,15 @@ export function PermissionList(props: AppDependencies) { disabled={selection.length !== 1 || selection[0].type !== 'Action group'} > Duplicate - , - , + group.reserved)} > Delete - , + , ]; const [actionsMenu, closeActionsMenu] = useContextMenuState('Actions', {}, actionsMenuItems); @@ -331,10 +331,13 @@ export function PermissionList(props: AppDependencies) { }; const createActionGroupMenuItems = [ - showEditModal('', Action.create, [])}> + showEditModal('', Action.create, [])} + > Create from blank - , - , + @@ -347,7 +350,7 @@ export function PermissionList(props: AppDependencies) { disabled={selection.length === 0} > Create from selection - , + , ]; const [createActionGroupMenu] = useContextMenuState( diff --git a/public/apps/configuration/panels/permission-list/test/permission-list.test.tsx b/public/apps/configuration/panels/permission-list/test/permission-list.test.tsx index b875b90f6..daa6a86fe 100644 --- a/public/apps/configuration/panels/permission-list/test/permission-list.test.tsx +++ b/public/apps/configuration/panels/permission-list/test/permission-list.test.tsx @@ -21,7 +21,7 @@ import { toggleRowDetails, renderRowExpansionArrow, } from '../permission-list'; -import { EuiInMemoryTable, EuiButtonIcon } from '@elastic/eui'; +import { EuiInMemoryTable, EuiSmallButtonIcon } from '@elastic/eui'; import { requestDeleteActionGroups, fetchActionGroups, @@ -82,7 +82,7 @@ describe('Permission list page ', () => { const Wrapper = () => <>{renderFunc(sampleActionGroup)}; const component = shallow(); - expect(component.find(EuiButtonIcon).prop('iconType')).toBe('arrowDown'); + expect(component.find(EuiSmallButtonIcon).prop('iconType')).toBe('arrowDown'); }); it('should render up arrow when expanded', () => { @@ -94,7 +94,7 @@ describe('Permission list page ', () => { const Wrapper = () => <>{renderFunc(sampleActionGroup)}; const component = shallow(); - expect(component.find(EuiButtonIcon).prop('iconType')).toBe('arrowUp'); + expect(component.find(EuiSmallButtonIcon).prop('iconType')).toBe('arrowUp'); }); }); diff --git a/public/apps/configuration/panels/role-edit/cluster-permission-panel.tsx b/public/apps/configuration/panels/role-edit/cluster-permission-panel.tsx index 3ac52f6d3..683163c4f 100644 --- a/public/apps/configuration/panels/role-edit/cluster-permission-panel.tsx +++ b/public/apps/configuration/panels/role-edit/cluster-permission-panel.tsx @@ -14,7 +14,7 @@ */ import React, { Dispatch, SetStateAction } from 'react'; -import { EuiForm, EuiFlexGroup, EuiFlexItem, EuiComboBox } from '@elastic/eui'; +import { EuiForm, EuiFlexGroup, EuiFlexItem, EuiCompressedComboBox } from '@elastic/eui'; import { ComboBoxOptions } from '../../types'; import { ResourceType } from '../../../../../common'; import { PanelWithHeader } from '../../utils/panel-with-header'; @@ -45,7 +45,7 @@ export function ClusterPermissionPanel(props: { > - - - - - - - removeElementFromArray(setRoleIndexPermission, [], arrayIndex)} > Remove - + } > {generateIndexPermissionPanels(state, optionUniverse, setState)} - { appendElementToArray(setState, [], getEmptyIndexPermission()); }} > Add another index permission - + ); } diff --git a/public/apps/configuration/panels/role-edit/role-edit.tsx b/public/apps/configuration/panels/role-edit/role-edit.tsx index 384a2e95c..e025cda07 100644 --- a/public/apps/configuration/panels/role-edit/role-edit.tsx +++ b/public/apps/configuration/panels/role-edit/role-edit.tsx @@ -14,7 +14,7 @@ */ import { - EuiButton, + EuiSmallButton, EuiFlexGroup, EuiFlexItem, EuiForm, @@ -288,23 +288,23 @@ export function RoleEdit(props: RoleEditDeps) { - { window.location.href = buildHashUrl(ResourceType.roles); }} > Cancel - + - {props.action === 'edit' ? 'Update' : 'Create'} - + diff --git a/public/apps/configuration/panels/role-edit/tenant-panel.tsx b/public/apps/configuration/panels/role-edit/tenant-panel.tsx index 6183a27b7..677a656ec 100644 --- a/public/apps/configuration/panels/role-edit/tenant-panel.tsx +++ b/public/apps/configuration/panels/role-edit/tenant-panel.tsx @@ -13,7 +13,13 @@ * permissions and limitations under the License. */ -import { EuiButton, EuiComboBox, EuiFlexGroup, EuiFlexItem, EuiSuperSelect } from '@elastic/eui'; +import { + EuiSmallButton, + EuiCompressedComboBox, + EuiFlexGroup, + EuiFlexItem, + EuiCompressedSuperSelect, +} from '@elastic/eui'; import React, { Dispatch, Fragment, SetStateAction, useEffect } from 'react'; import { isEmpty } from 'lodash'; import { RoleTenantPermission, TenantPermissionType, ComboBoxOptions } from '../../types'; @@ -85,7 +91,7 @@ function generateTenantPermissionPanels( - - - removeElementFromArray(setPermissions, [], arrayIndex)} > Remove - + @@ -145,13 +151,13 @@ export function TenantPanel(props: { {generateTenantPermissionPanels(state, optionUniverse, setState)} - { appendElementToArray(setState, [], getEmptyTenantPermission()); }} > Add another tenant permission - + ); } diff --git a/public/apps/configuration/panels/role-edit/test/cluster-permission-panel.test.tsx b/public/apps/configuration/panels/role-edit/test/cluster-permission-panel.test.tsx index 29a81ab24..3a9bdd3bc 100644 --- a/public/apps/configuration/panels/role-edit/test/cluster-permission-panel.test.tsx +++ b/public/apps/configuration/panels/role-edit/test/cluster-permission-panel.test.tsx @@ -13,7 +13,7 @@ * permissions and limitations under the License. */ -import { EuiComboBox } from '@elastic/eui'; +import { EuiCompressedComboBox } from '@elastic/eui'; import { shallow } from 'enzyme'; import React from 'react'; import { ComboBoxOptions } from '../../../types'; @@ -34,7 +34,7 @@ describe('Role edit - cluster permission panel', () => { ); - const comboBox = component.find(EuiComboBox).first(); + const comboBox = component.find(EuiCompressedComboBox).first(); expect(comboBox.prop('selectedOptions')).toBe(state); expect(comboBox.prop('options')).toBe(optionUniverse); expect(comboBox.prop('onChange')).toBe(setState); diff --git a/public/apps/configuration/panels/role-edit/test/index-permission-panel.test.tsx b/public/apps/configuration/panels/role-edit/test/index-permission-panel.test.tsx index d24d8526c..f09e23775 100644 --- a/public/apps/configuration/panels/role-edit/test/index-permission-panel.test.tsx +++ b/public/apps/configuration/panels/role-edit/test/index-permission-panel.test.tsx @@ -29,7 +29,12 @@ import { AnonymizationRow, } from '../index-permission-panel'; import { RoleIndexPermissionStateClass } from '../types'; -import { EuiComboBox, EuiSuperSelect, EuiButton, EuiTextArea } from '@elastic/eui'; +import { + EuiCompressedComboBox, + EuiCompressedSuperSelect, + EuiSmallButton, + EuiCompressedTextArea, +} from '@elastic/eui'; jest.mock('../../../utils/array-state-utils'); // eslint-disable-next-line @@ -123,7 +128,7 @@ describe('Role edit - index permission panel', () => { const component = shallow(); - expect(component.find(EuiComboBox).first().prop('selectedOptions')).toBe(value); + expect(component.find(EuiCompressedComboBox).first().prop('selectedOptions')).toBe(value); }); it('IndexPermissionRow', () => { @@ -135,7 +140,7 @@ describe('Role edit - index permission panel', () => { ); - expect(component.find(EuiComboBox).first().prop('selectedOptions')).toBe(value); + expect(component.find(EuiCompressedComboBox).first().prop('selectedOptions')).toBe(value); }); it('DocLevelSecurityRow', () => { @@ -144,7 +149,7 @@ describe('Role edit - index permission panel', () => { const component = shallow(); - expect(component.find(EuiTextArea).first().prop('value')).toBe(value); + expect(component.find(EuiCompressedTextArea).first().prop('value')).toBe(value); }); it('FieldLevelSecurityRow', () => { @@ -160,8 +165,8 @@ describe('Role edit - index permission panel', () => { /> ); - expect(component.find(EuiSuperSelect).first().prop('valueOfSelected')).toBe(method); - expect(component.find(EuiComboBox).first().prop('selectedOptions')).toBe(fields); + expect(component.find(EuiCompressedSuperSelect).first().prop('valueOfSelected')).toBe(method); + expect(component.find(EuiCompressedComboBox).first().prop('selectedOptions')).toBe(fields); }); it('AnonymizationRow', () => { @@ -173,7 +178,7 @@ describe('Role edit - index permission panel', () => { ); - expect(component.find(EuiComboBox).first().prop('selectedOptions')).toBe(value); + expect(component.find(EuiCompressedComboBox).first().prop('selectedOptions')).toBe(value); }); describe('IndexPermissionPanel', () => { @@ -230,7 +235,7 @@ describe('Role edit - index permission panel', () => { const optionUniverse = [allowedAction1, allowedAction2].map(stringToComboBoxOption); const component = shallow(); - component.find(EuiButton).last().simulate('click'); + component.find(EuiSmallButton).last().simulate('click'); expect(arrayStateUtils.appendElementToArray).toHaveBeenCalledTimes(1); }); diff --git a/public/apps/configuration/panels/role-edit/test/role-edit.test.tsx b/public/apps/configuration/panels/role-edit/test/role-edit.test.tsx index 6e0b61237..d5051809e 100644 --- a/public/apps/configuration/panels/role-edit/test/role-edit.test.tsx +++ b/public/apps/configuration/panels/role-edit/test/role-edit.test.tsx @@ -13,7 +13,7 @@ * permissions and limitations under the License. */ -import { EuiButton } from '@elastic/eui'; +import { EuiSmallButton } from '@elastic/eui'; import { shallow } from 'enzyme'; import React from 'react'; import { updateRole } from '../../../utils/role-detail-utils'; @@ -118,7 +118,7 @@ describe('Role edit', () => { /> ); // click update - component.find(EuiButton).last().simulate('click'); + component.find(EuiSmallButton).last().simulate('click'); expect(updateRole).toBeCalledWith( mockCoreStart.http, diff --git a/public/apps/configuration/panels/role-edit/test/tenant-panel.test.tsx b/public/apps/configuration/panels/role-edit/test/tenant-panel.test.tsx index d7ad8f36c..3edb87e89 100644 --- a/public/apps/configuration/panels/role-edit/test/tenant-panel.test.tsx +++ b/public/apps/configuration/panels/role-edit/test/tenant-panel.test.tsx @@ -23,7 +23,7 @@ import { } from '../tenant-panel'; import { shallow } from 'enzyme'; import React from 'react'; -import { EuiComboBox, EuiButton, EuiSuperSelect } from '@elastic/eui'; +import { EuiCompressedComboBox, EuiSmallButton, EuiCompressedSuperSelect } from '@elastic/eui'; import { render } from '@testing-library/react'; jest.mock('../../../utils/array-state-utils'); @@ -103,12 +103,12 @@ describe('Role edit - tenant panel', () => { ); - const comboBoxArray = component.find(EuiComboBox); + const comboBoxArray = component.find(EuiCompressedComboBox); expect(comboBoxArray.length).toEqual(2); expect(comboBoxArray.at(0).prop('selectedOptions')).toBe(state[0].tenantPatterns); expect(comboBoxArray.at(1).prop('selectedOptions')).toBe(state[1].tenantPatterns); - const superSelectArray = component.find(EuiSuperSelect); + const superSelectArray = component.find(EuiCompressedSuperSelect); expect(superSelectArray.at(0).prop('valueOfSelected')).toBe(state[0].permissionType); expect(superSelectArray.at(1).prop('valueOfSelected')).toBe(state[1].permissionType); }); @@ -118,7 +118,7 @@ describe('Role edit - tenant panel', () => { ); - const addRowButton = component.find(EuiButton).last(); + const addRowButton = component.find(EuiSmallButton).last(); addRowButton.simulate('click'); expect(arrayStateUtils.appendElementToArray).toHaveBeenCalledTimes(1); }); @@ -135,7 +135,7 @@ describe('Role edit - tenant panel', () => { ); - const removeRowButton = component.find(EuiButton).first(); + const removeRowButton = component.find(EuiSmallButton).first(); removeRowButton.simulate('click'); expect(arrayStateUtils.removeElementFromArray).toHaveBeenCalledTimes(1); }); diff --git a/public/apps/configuration/panels/role-list.tsx b/public/apps/configuration/panels/role-list.tsx index a0e64d088..2d7e2a85f 100644 --- a/public/apps/configuration/panels/role-list.tsx +++ b/public/apps/configuration/panels/role-list.tsx @@ -23,11 +23,11 @@ import { EuiPageContentHeader, EuiPageContentHeaderSection, EuiFlexItem, - EuiButton, + EuiSmallButton, EuiPageBody, EuiInMemoryTable, EuiBasicTableColumn, - EuiButtonEmpty, + EuiSmallButtonEmpty, EuiSearchBarProps, Query, EuiLoadingContent, @@ -159,7 +159,7 @@ export function RoleList(props: AppDependencies) { ); const actionsMenuItems = [ - { @@ -168,9 +168,9 @@ export function RoleList(props: AppDependencies) { disabled={selection.length !== 1 || selection[0].reserved} > Edit - , + , // TODO: Change duplication to a popup window - { @@ -183,15 +183,15 @@ export function RoleList(props: AppDependencies) { disabled={selection.length !== 1} > Duplicate - , - , + e.reserved)} > Delete - , + , ]; const [actionsMenu, closeActionsMenu] = useContextMenuState('Actions', {}, actionsMenuItems); @@ -301,13 +301,13 @@ export function RoleList(props: AppDependencies) { {actionsMenu} - Create role - + diff --git a/public/apps/configuration/panels/role-mapping/external-identities-panel.tsx b/public/apps/configuration/panels/role-mapping/external-identities-panel.tsx index 5b11d04eb..73ccd439a 100644 --- a/public/apps/configuration/panels/role-mapping/external-identities-panel.tsx +++ b/public/apps/configuration/panels/role-mapping/external-identities-panel.tsx @@ -17,9 +17,9 @@ import React, { Dispatch, SetStateAction, Fragment } from 'react'; import { EuiFlexGroup, EuiFlexItem, - EuiFieldText, - EuiButton, - EuiFormRow, + EuiCompressedFieldText, + EuiSmallButton, + EuiCompressedFormRow, EuiSpacer, } from '@elastic/eui'; import { isEmpty, map } from 'lodash'; @@ -72,7 +72,7 @@ export function ExternalIdentitiesPanel(props: { - onValueChangeHandler('externalIdentity')(e.target.value)} @@ -81,15 +81,15 @@ export function ExternalIdentitiesPanel(props: { - - + removeElementFromArray(setExternalIdentities, [], arrayIndex)} > Remove - - + + @@ -104,14 +104,14 @@ export function ExternalIdentitiesPanel(props: { > {panel} - { appendElementToArray(setExternalIdentities, [], getEmptyExternalIdentity()); }} > Add another backend role - + ); } diff --git a/public/apps/configuration/panels/role-mapping/role-edit-mapped-user.tsx b/public/apps/configuration/panels/role-mapping/role-edit-mapped-user.tsx index d00faf3cb..a99689fd7 100644 --- a/public/apps/configuration/panels/role-mapping/role-edit-mapped-user.tsx +++ b/public/apps/configuration/panels/role-mapping/role-edit-mapped-user.tsx @@ -14,7 +14,7 @@ */ import { - EuiButton, + EuiSmallButton, EuiFlexGroup, EuiFlexItem, EuiPageHeader, @@ -174,18 +174,18 @@ export function RoleEditMappedUser(props: RoleEditMappedUserProps) { - { window.location.href = buildHashUrl(ResourceType.roles, Action.view, props.roleName); }} > Cancel - + - + Map - + diff --git a/public/apps/configuration/panels/role-mapping/test/external-identities-panel.test.tsx b/public/apps/configuration/panels/role-mapping/test/external-identities-panel.test.tsx index d06fd2f98..7c9e813ea 100644 --- a/public/apps/configuration/panels/role-mapping/test/external-identities-panel.test.tsx +++ b/public/apps/configuration/panels/role-mapping/test/external-identities-panel.test.tsx @@ -21,7 +21,7 @@ import { import { shallow } from 'enzyme'; import { ExternalIdentityStateClass } from '../types'; import React from 'react'; -import { EuiFieldText, EuiFlexGroup } from '@elastic/eui'; +import { EuiCompressedFieldText, EuiFlexGroup } from '@elastic/eui'; import { appendElementToArray, removeElementFromArray, @@ -91,8 +91,8 @@ describe('Role mapping - external identities panel', () => { ); expect(component.find(EuiFlexGroup).length).toBe(2); - expect(component.find(EuiFieldText).at(0).prop('value')).toBe(externalIdentity1); - expect(component.find(EuiFieldText).at(1).prop('value')).toBe(externalIdentity2); + expect(component.find(EuiCompressedFieldText).at(0).prop('value')).toBe(externalIdentity1); + expect(component.find(EuiCompressedFieldText).at(1).prop('value')).toBe(externalIdentity2); }); it('add row', () => { diff --git a/public/apps/configuration/panels/role-mapping/test/users-panel.test.tsx b/public/apps/configuration/panels/role-mapping/test/users-panel.test.tsx index bae48fcf2..abb491d34 100644 --- a/public/apps/configuration/panels/role-mapping/test/users-panel.test.tsx +++ b/public/apps/configuration/panels/role-mapping/test/users-panel.test.tsx @@ -13,7 +13,7 @@ * permissions and limitations under the License. */ -import { EuiComboBox } from '@elastic/eui'; +import { EuiCompressedComboBox } from '@elastic/eui'; import { shallow } from 'enzyme'; import React from 'react'; import { ComboBoxOptions } from '../../../types'; @@ -31,7 +31,7 @@ describe('Role mapping - Internal users panel', () => { ); - const comboBox = component.find(EuiComboBox).first(); + const comboBox = component.find(EuiCompressedComboBox).first(); expect(comboBox.prop('selectedOptions')).toBe(state); expect(comboBox.prop('options')).toBe(optionUniverse); expect(comboBox.prop('onChange')).toBe(setState); diff --git a/public/apps/configuration/panels/role-mapping/users-panel.tsx b/public/apps/configuration/panels/role-mapping/users-panel.tsx index 6c65a152b..19e1fb1c8 100644 --- a/public/apps/configuration/panels/role-mapping/users-panel.tsx +++ b/public/apps/configuration/panels/role-mapping/users-panel.tsx @@ -14,7 +14,7 @@ */ import React, { Dispatch, SetStateAction } from 'react'; -import { EuiForm, EuiFlexGroup, EuiFlexItem, EuiComboBox } from '@elastic/eui'; +import { EuiForm, EuiFlexGroup, EuiFlexItem, EuiCompressedComboBox } from '@elastic/eui'; import { ComboBoxOptions } from '../../types'; import { PanelWithHeader } from '../../utils/panel-with-header'; import { FormRow } from '../../utils/form-row'; @@ -47,7 +47,7 @@ export function InternalUsersPanel(props: { > - No cluster permission} titleSize="s" actions={ - { @@ -45,7 +45,7 @@ export function ClusterPermissionPanel(props: ClusterPermissionPanelProps) { }} > Add cluster permission - + } /> ); diff --git a/public/apps/configuration/panels/role-view/index-permission-panel.tsx b/public/apps/configuration/panels/role-view/index-permission-panel.tsx index 8c622afd3..65fea9ae7 100644 --- a/public/apps/configuration/panels/role-view/index-permission-panel.tsx +++ b/public/apps/configuration/panels/role-view/index-permission-panel.tsx @@ -18,11 +18,11 @@ import { EuiInMemoryTable, EuiBasicTableColumn, RIGHT_ALIGNMENT, - EuiButtonIcon, + EuiSmallButtonIcon, EuiText, EuiFlexGroup, EuiEmptyPrompt, - EuiButton, + EuiSmallButton, } from '@elastic/eui'; import { PanelWithHeader } from '../../utils/panel-with-header'; import { @@ -66,7 +66,7 @@ export function renderRowExpanstionArrow( setItemIdToExpandedRowMap: Dispatch> ) { return (item: RoleIndexPermissionView) => ( - toggleRowDetails(item, actionGroupDict, setItemIdToExpandedRowMap)} aria-label={itemIdToExpandedRowMap[item.id] ? 'Collapse' : 'Expand'} iconType={itemIdToExpandedRowMap[item.id] ? 'arrowUp' : 'arrowDown'} @@ -188,7 +188,7 @@ export function IndexPermissionPanel(props: IndexPermissionPanelProps) { title={

No index permission

} titleSize="s" actions={ - { @@ -196,7 +196,7 @@ export function IndexPermissionPanel(props: IndexPermissionPanelProps) { }} > Add index permission - + } /> ); diff --git a/public/apps/configuration/panels/role-view/role-view.tsx b/public/apps/configuration/panels/role-view/role-view.tsx index 0b29c3469..7e41f27cf 100644 --- a/public/apps/configuration/panels/role-view/role-view.tsx +++ b/public/apps/configuration/panels/role-view/role-view.tsx @@ -15,7 +15,7 @@ import React, { useState, useContext } from 'react'; import { - EuiButton, + EuiSmallButton, EuiPageContentHeader, EuiPageContentHeaderSection, EuiSpacer, @@ -32,7 +32,7 @@ import { EuiCallOut, EuiGlobalToastList, EuiHorizontalRule, - EuiButtonEmpty, + EuiSmallButtonEmpty, } from '@elastic/eui'; import { difference } from 'lodash'; import { BreadcrumbsPageDependencies } from '../../../types'; @@ -195,7 +195,7 @@ export function RoleView(props: RoleViewProps) { /> - { @@ -208,7 +208,7 @@ export function RoleView(props: RoleViewProps) { }} > Map users - + } @@ -302,12 +302,15 @@ export function RoleView(props: RoleViewProps) { - + Delete mapping - + - { window.location.href = buildHashUrl( @@ -319,7 +322,7 @@ export function RoleView(props: RoleViewProps) { }} > Manage mapping - + @@ -350,10 +353,10 @@ export function RoleView(props: RoleViewProps) { let pageActions; const actionsMenuItems: React.ReactElement[] = [ - + duplicate - , - , + delete - , + , ]; const [actionsMenu] = useContextMenuState('Actions', {}, actionsMenuItems); if (isReserved) { - pageActions = Duplicate role; + pageActions = Duplicate role; } else { pageActions = ( {actionsMenu} - + Edit role - + ); diff --git a/public/apps/configuration/panels/role-view/tenants-panel.tsx b/public/apps/configuration/panels/role-view/tenants-panel.tsx index 2e5094028..3adba1b12 100644 --- a/public/apps/configuration/panels/role-view/tenants-panel.tsx +++ b/public/apps/configuration/panels/role-view/tenants-panel.tsx @@ -21,7 +21,7 @@ import { EuiGlobalToastList, EuiBasicTableColumn, EuiEmptyPrompt, - EuiButton, + EuiSmallButton, } from '@elastic/eui'; import { CoreStart } from 'opensearch-dashboards/public'; import { getCurrentUser } from '../../../../utils/auth-info-utils'; @@ -171,7 +171,7 @@ export function TenantsPanel(props: RoleViewTenantsPanelProps) { title={

No tenant permission

} titleSize="s" actions={ - { @@ -179,7 +179,7 @@ export function TenantsPanel(props: RoleViewTenantsPanelProps) { }} > Add tenant permission - + } /> ); diff --git a/public/apps/configuration/panels/role-view/test/__snapshots__/index-permission-panel.test.tsx.snap b/public/apps/configuration/panels/role-view/test/__snapshots__/index-permission-panel.test.tsx.snap index a4fbd530e..a349ac33c 100644 --- a/public/apps/configuration/panels/role-view/test/__snapshots__/index-permission-panel.test.tsx.snap +++ b/public/apps/configuration/panels/role-view/test/__snapshots__/index-permission-panel.test.tsx.snap @@ -29,7 +29,7 @@ exports[`Role view - index permission panel Render document level security rende exports[`Role view - index permission panel Render row expanstion arrow renders when arrow expanded 1`] = ` - - duplicate - - + delete - + - Edit role - + @@ -211,20 +211,20 @@ exports[`Role view basic rendering when permission tab is selected 1`] = ` - Delete mapping - + - Manage mapping - + @@ -268,13 +268,13 @@ exports[`Role view basic rendering when permission tab is selected 1`] = ` /> - Map users - + } @@ -378,27 +378,27 @@ exports[`Role view renders when mapped user tab is selected 1`] = ` gutterSize="s" > - duplicate - - + delete - + - Edit role - + @@ -441,20 +441,20 @@ exports[`Role view renders when mapped user tab is selected 1`] = ` - Delete mapping - + - Manage mapping - + @@ -498,13 +498,13 @@ exports[`Role view renders when mapped user tab is selected 1`] = ` /> - Map users - + } @@ -629,20 +629,20 @@ exports[`Role view renders when mapped user tab is selected 1`] = ` - Delete mapping - + - Manage mapping - + @@ -686,13 +686,13 @@ exports[`Role view renders when mapped user tab is selected 1`] = ` /> - Map users - + } diff --git a/public/apps/configuration/panels/role-view/test/cluster-permission-panel.test.tsx b/public/apps/configuration/panels/role-view/test/cluster-permission-panel.test.tsx index 8e7d5be0c..7f7bb2680 100644 --- a/public/apps/configuration/panels/role-view/test/cluster-permission-panel.test.tsx +++ b/public/apps/configuration/panels/role-view/test/cluster-permission-panel.test.tsx @@ -16,7 +16,7 @@ import React from 'react'; import { shallow } from 'enzyme'; import { ClusterPermissionPanel } from '../cluster-permission-panel'; -import { EuiButton, EuiEmptyPrompt, EuiLoadingSpinner } from '@elastic/eui'; +import { EuiSmallButton, EuiEmptyPrompt, EuiLoadingSpinner } from '@elastic/eui'; import { PermissionTree } from '../../permission-tree'; import { Action } from '../../../types'; import { ResourceType } from '../../../../../../common'; @@ -63,7 +63,7 @@ describe('Role view - cluster permission panel', () => { /> ); const prompt = wrapper.find(EuiEmptyPrompt).dive(); - expect(prompt.find(EuiButton)).toHaveLength(1); + expect(prompt.find(EuiSmallButton)).toHaveLength(1); const button = prompt.find('[data-test-subj="addClusterPermission"]'); expect(button.prop('disabled')).toBe(true); }); diff --git a/public/apps/configuration/panels/role-view/test/index-permission-panel.test.tsx b/public/apps/configuration/panels/role-view/test/index-permission-panel.test.tsx index dc9632eb2..d9295d6b4 100644 --- a/public/apps/configuration/panels/role-view/test/index-permission-panel.test.tsx +++ b/public/apps/configuration/panels/role-view/test/index-permission-panel.test.tsx @@ -24,7 +24,7 @@ import { IndexPermissionPanel, renderDocumentLevelSecurity, } from '../index-permission-panel'; -import { EuiButtonIcon, EuiEmptyPrompt, EuiInMemoryTable } from '@elastic/eui'; +import { EuiSmallButtonIcon, EuiEmptyPrompt, EuiInMemoryTable } from '@elastic/eui'; import { buildHashUrl } from '../../../utils/url-builder'; describe('Role view - index permission panel', () => { @@ -51,7 +51,7 @@ describe('Role view - index permission panel', () => { const Wrapper = () => <>{renderFunc(sampleRoleIndexPermission)}; const component = shallow(); - expect(component.find(EuiButtonIcon).prop('iconType')).toBe('arrowDown'); + expect(component.find(EuiSmallButtonIcon).prop('iconType')).toBe('arrowDown'); }); it('should render up arrow when expanded', () => { @@ -63,7 +63,7 @@ describe('Role view - index permission panel', () => { const Wrapper = () => <>{renderFunc(sampleRoleIndexPermission)}; const component = shallow(); - expect(component.find(EuiButtonIcon).prop('iconType')).toBe('arrowUp'); + expect(component.find(EuiSmallButtonIcon).prop('iconType')).toBe('arrowUp'); }); it('renders when arrow expanded', () => { @@ -74,7 +74,7 @@ describe('Role view - index permission panel', () => { ); const Wrapper = () => <>{renderFunc(sampleRoleIndexPermission)}; const component = shallow(); - component.find(EuiButtonIcon).simulate('click'); + component.find(EuiSmallButtonIcon).simulate('click'); expect(component).toMatchSnapshot(); }); }); diff --git a/public/apps/configuration/panels/tenant-list/configure_tab1.tsx b/public/apps/configuration/panels/tenant-list/configure_tab1.tsx index 770496d85..bf647d32a 100644 --- a/public/apps/configuration/panels/tenant-list/configure_tab1.tsx +++ b/public/apps/configuration/panels/tenant-list/configure_tab1.tsx @@ -27,10 +27,10 @@ import { EuiHorizontalRule, EuiDescribedFormGroup, EuiSpacer, - EuiCheckbox, + EuiCompressedCheckbox, EuiCallOut, EuiBottomBar, - EuiComboBox, + EuiCompressedComboBox, EuiIcon, EuiLoadingContent, } from '@elastic/eui'; @@ -373,7 +373,7 @@ export function ConfigureTab1(props: AppDependencies) { } className="described-form-group1" > - - - - - Cancel + Cancel - { await props.handleSave(tenantName, tenantDescription); @@ -102,7 +102,7 @@ export function TenantEditModal(props: TenantEditModalDeps) { disabled={!isFormValid} > {props.action === Action.create ? 'Create' : 'Save'} - + diff --git a/public/apps/configuration/panels/tenant-list/manage_tab.tsx b/public/apps/configuration/panels/tenant-list/manage_tab.tsx index ab30bf0ee..1d9a4918f 100644 --- a/public/apps/configuration/panels/tenant-list/manage_tab.tsx +++ b/public/apps/configuration/panels/tenant-list/manage_tab.tsx @@ -15,8 +15,8 @@ import { EuiBadge, - EuiButton, - EuiButtonEmpty, + EuiSmallButton, + EuiSmallButtonEmpty, EuiFlexGroup, EuiFlexItem, EuiInMemoryTable, @@ -237,13 +237,13 @@ export function ManageTab(props: AppDependencies) { Tenancy is currently disabled and users don't have access to this feature. To create, edit tenants you must enabled tenanc throught he configure tenancy page.

- renderConfigurePage().then()} > Configure tenancy - + ); } @@ -387,23 +387,23 @@ export function ManageTab(props: AppDependencies) { ]; const actionsMenuItems = [ - switchToSelectedTenant(selection[0].tenantValue, selection[0].tenant)} > Switch to selected tenant - , - , + showEditModal(selection[0].tenant, Action.edit, selection[0].description)} > Edit - , - , + Duplicate - , - , + viewOrCreateDashboard(selection[0].tenantValue, Action.create)} > Create dashboard - , - , + viewOrCreateVisualization(selection[0].tenantValue, Action.create)} > Create visualizations - , - , + Set as Default Tenant - , - , + tenant.reserved)} > Delete - , + , ]; const [actionsMenu, closeActionsMenu] = useContextMenuState('Actions', {}, actionsMenuItems); @@ -529,13 +529,13 @@ export function ManageTab(props: AppDependencies) { {actionsMenu} - showEditModal('', Action.create, '')} > Create tenant - + diff --git a/public/apps/configuration/panels/tenant-list/save_changes_modal.tsx b/public/apps/configuration/panels/tenant-list/save_changes_modal.tsx index ba5c08fa7..8395f4dfb 100644 --- a/public/apps/configuration/panels/tenant-list/save_changes_modal.tsx +++ b/public/apps/configuration/panels/tenant-list/save_changes_modal.tsx @@ -16,7 +16,7 @@ import { EuiPageContentHeader, EuiHorizontalRule, - EuiCheckbox, + EuiCompressedCheckbox, EuiConfirmModal, } from '@elastic/eui'; import React from 'react'; @@ -92,7 +92,7 @@ export function SaveChangesModalGenerator(props: SaveChangesModalDeps) { 'global tenant.'; } tenancyChangeCheckbox = ( - - onSelectedTabChanged('Configure')} > Configure tenancy - + ); diff --git a/public/apps/configuration/panels/tenant-list/test/__snapshots__/edit-modal.test.tsx.snap b/public/apps/configuration/panels/tenant-list/test/__snapshots__/edit-modal.test.tsx.snap index dfda4d2b9..a99d79623 100644 --- a/public/apps/configuration/panels/tenant-list/test/__snapshots__/edit-modal.test.tsx.snap +++ b/public/apps/configuration/panels/tenant-list/test/__snapshots__/edit-modal.test.tsx.snap @@ -1,31 +1,25 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP exports[`Permission edit modal Submit button text should be Create when user is creating tenant 1`] = ` - Create - + `; exports[`Permission edit modal Submit button text should be Save when user is updating tenant 1`] = ` - Save - + `; diff --git a/public/apps/configuration/panels/tenant-list/test/__snapshots__/tenant-list.test.tsx.snap b/public/apps/configuration/panels/tenant-list/test/__snapshots__/tenant-list.test.tsx.snap index 3f40c1b34..a098f42d4 100644 --- a/public/apps/configuration/panels/tenant-list/test/__snapshots__/tenant-list.test.tsx.snap +++ b/public/apps/configuration/panels/tenant-list/test/__snapshots__/tenant-list.test.tsx.snap @@ -45,55 +45,55 @@ exports[`Tenant list Action menu click Duplicate click 1`] = ` - Switch to selected tenant - - + Edit - - + Duplicate - - + Create dashboard - - + Create visualizations - - + Set as Default Tenant - - + Delete - + - Create tenant - + @@ -233,55 +233,55 @@ exports[`Tenant list Action menu click Edit click 1`] = ` - Switch to selected tenant - - + Edit - - + Duplicate - - + Create dashboard - - + Create visualizations - - + Set as Default Tenant - - + Delete - + - Create tenant - + diff --git a/public/apps/configuration/panels/test/__snapshots__/get-started.test.tsx.snap b/public/apps/configuration/panels/test/__snapshots__/get-started.test.tsx.snap index b7bb4bc7b..d380f6153 100644 --- a/public/apps/configuration/panels/test/__snapshots__/get-started.test.tsx.snap +++ b/public/apps/configuration/panels/test/__snapshots__/get-started.test.tsx.snap @@ -85,23 +85,23 @@ exports[`Get started (landing page) renders when backend configuration is disabl - Explore existing roles - + - Create new role - + - Map users to a role - + - Create internal user - + , @@ -185,13 +185,13 @@ exports[`Get started (landing page) renders when backend configuration is disabl href="https://opensearch.org/docs/latest/security-plugin/audit-logs/" />

- Review Audit Log Configuration - + By default, the security plugin caches authenticated users, along with their roles and permissions. This option will purge cached users, roles and permissions.

- Purge cache - + - Manage Multi-tenancy - + - Configure Multi-tenancy - + @@ -396,12 +396,12 @@ exports[`Get started (landing page) renders when backend configuration is enable - Review authentication and authorization - + - Explore existing roles - + - Create new role - + - Map users to a role - + - Create internal user - + , @@ -531,13 +531,13 @@ exports[`Get started (landing page) renders when backend configuration is enable href="https://opensearch.org/docs/latest/security-plugin/audit-logs/" />

- Review Audit Log Configuration - + By default, the security plugin caches authenticated users, along with their roles and permissions. This option will purge cached users, roles and permissions.

- Purge cache - + - Manage Multi-tenancy - + - Configure Multi-tenancy - + diff --git a/public/apps/configuration/panels/test/__snapshots__/role-list.test.tsx.snap b/public/apps/configuration/panels/test/__snapshots__/role-list.test.tsx.snap index 4e4035617..52233ddc7 100644 --- a/public/apps/configuration/panels/test/__snapshots__/role-list.test.tsx.snap +++ b/public/apps/configuration/panels/test/__snapshots__/role-list.test.tsx.snap @@ -61,39 +61,39 @@ exports[`Role list AccessError component should load access error component 1`] - Edit - - + Duplicate - - + Delete - + - Create role - + diff --git a/public/apps/configuration/panels/user-list.tsx b/public/apps/configuration/panels/user-list.tsx index f9388fb53..1d1aedf3d 100644 --- a/public/apps/configuration/panels/user-list.tsx +++ b/public/apps/configuration/panels/user-list.tsx @@ -15,8 +15,8 @@ import { EuiBadge, - EuiButton, - EuiButtonEmpty, + EuiSmallButton, + EuiSmallButtonEmpty, EuiFlexGroup, EuiFlexItem, EuiInMemoryTable, @@ -156,7 +156,7 @@ export function UserList(props: AppDependencies) { ); const actionsMenuItems = [ - { @@ -165,8 +165,8 @@ export function UserList(props: AppDependencies) { disabled={selection.length !== 1} > Edit - , - , + { @@ -179,8 +179,8 @@ export function UserList(props: AppDependencies) { disabled={selection.length !== 1} > Duplicate - , - , + Export JSON - , - , + e.username === currentUsername)} > Delete - , + , ]; const [actionsMenu, closeActionsMenu] = useContextMenuState('Actions', {}, actionsMenuItems); @@ -247,13 +247,13 @@ export function UserList(props: AppDependencies) { {actionsMenu} - Create internal user - + diff --git a/public/apps/configuration/utils/context-menu.tsx b/public/apps/configuration/utils/context-menu.tsx index 985e0e28d..b0a199a89 100644 --- a/public/apps/configuration/utils/context-menu.tsx +++ b/public/apps/configuration/utils/context-menu.tsx @@ -17,7 +17,7 @@ import { EuiButtonProps, EuiPopover, EuiContextMenuPanel, - EuiButton, + EuiSmallButton, EuiFlexGroup, EuiFlexItem, } from '@elastic/eui'; @@ -33,7 +33,7 @@ export function useContextMenuState( const closeContextMenu = () => setContextMenuOpen(false); const button = ( - { @@ -42,7 +42,7 @@ export function useContextMenuState( {...buttonProps} > {buttonText} - + ); const items = [ diff --git a/public/apps/configuration/utils/display-utils.tsx b/public/apps/configuration/utils/display-utils.tsx index 236bcf555..b1be5bfee 100644 --- a/public/apps/configuration/utils/display-utils.tsx +++ b/public/apps/configuration/utils/display-utils.tsx @@ -20,7 +20,7 @@ import { EuiText, EuiIcon, EuiFlexGroup, - EuiButton, + EuiSmallButton, EuiButtonProps, EuiToolTip, EuiLink, @@ -134,9 +134,9 @@ export const displayHeaderWithTooltip = (columnHeader: string, tooltipText: stri export function ExternalLinkButton(props: { text: string; href: string } & EuiButtonProps) { const { text, ...buttonProps } = props; return ( - + {props.text} - + ); } diff --git a/public/apps/configuration/utils/form-row.tsx b/public/apps/configuration/utils/form-row.tsx index 3bc9880cb..8a8a69fe0 100644 --- a/public/apps/configuration/utils/form-row.tsx +++ b/public/apps/configuration/utils/form-row.tsx @@ -13,7 +13,7 @@ * permissions and limitations under the License. */ -import { EuiFormRow, EuiText } from '@elastic/eui'; +import { EuiCompressedFormRow, EuiText } from '@elastic/eui'; import React from 'react'; import { ExternalLink } from './display-utils'; import { FormRowDeps } from '../types'; @@ -26,7 +26,7 @@ export interface FormRowWithChildComponentDeps extends FormRowDeps { export function FormRow(props: FormRowWithChildComponentDeps) { return ( - @@ -50,6 +50,6 @@ export function FormRow(props: FormRowWithChildComponentDeps) { error={props.error} > {props.children} - + ); } diff --git a/public/apps/configuration/utils/name-row.tsx b/public/apps/configuration/utils/name-row.tsx index 7f5ddc9f1..f24c67e95 100644 --- a/public/apps/configuration/utils/name-row.tsx +++ b/public/apps/configuration/utils/name-row.tsx @@ -14,7 +14,7 @@ */ import React from 'react'; -import { EuiFieldText } from '@elastic/eui'; +import { EuiCompressedFieldText } from '@elastic/eui'; import { FormRow } from './form-row'; import { resourceNameHelpText, validateResourceName } from './resource-validation-util'; import { FormRowDeps } from '../types'; @@ -45,7 +45,7 @@ export function NameRow(props: NameRowDeps) { isInvalid={errors.length > 0} error={errors} > - - - + - + @@ -81,7 +86,7 @@ export function PasswordEditPanel(props: { headerText="Re-enter password" helpText="The password must be identical to what you entered above." > - Test - + `; exports[`Display utils Render expression when expression is non-empty 1`] = ` diff --git a/public/apps/configuration/utils/test/__snapshots__/form-row.test.tsx.snap b/public/apps/configuration/utils/test/__snapshots__/form-row.test.tsx.snap index 50a384b62..ac1726b84 100644 --- a/public/apps/configuration/utils/test/__snapshots__/form-row.test.tsx.snap +++ b/public/apps/configuration/utils/test/__snapshots__/form-row.test.tsx.snap @@ -1,9 +1,9 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP exports[`Form row renders 1`] = ` - Test - + `; diff --git a/public/apps/configuration/utils/test/__snapshots__/password-edit-panel.test.tsx.snap b/public/apps/configuration/utils/test/__snapshots__/password-edit-panel.test.tsx.snap index d6e879b84..ff90a9021 100644 --- a/public/apps/configuration/utils/test/__snapshots__/password-edit-panel.test.tsx.snap +++ b/public/apps/configuration/utils/test/__snapshots__/password-edit-panel.test.tsx.snap @@ -12,18 +12,15 @@ exports[`Password edit panel repeat password field update 1`] = ` headerText="Password" helpText="Password should be at least 8 characters long and contain at least one uppercase letter, one lowercase letter, one digit, and one special character." > - - - + - diff --git a/public/apps/customerror/custom-error.tsx b/public/apps/customerror/custom-error.tsx index 4d1729efb..dfb15300b 100644 --- a/public/apps/customerror/custom-error.tsx +++ b/public/apps/customerror/custom-error.tsx @@ -13,7 +13,7 @@ * permissions and limitations under the License. */ -import { EuiButton, EuiImage, EuiListGroup, EuiSpacer, EuiText } from '@elastic/eui'; +import { EuiSmallButton, EuiImage, EuiListGroup, EuiSpacer, EuiText } from '@elastic/eui'; import { AppMountParameters, CoreStart } from 'opensearch-dashboards/public'; import React from 'react'; import ReactDOM from 'react-dom'; @@ -47,14 +47,14 @@ export function CustomErrorPage(props: CustomErrorDeps) { {props.subtitle} - logout(props.http, '')} data-test-subj="error-logout-button" fullWidth > Logout - + ); } @@ -81,4 +81,4 @@ export async function renderPage( ); return () => ReactDOM.unmountComponentAtNode(params.element); } -export { EuiButton }; +export { EuiSmallButton }; diff --git a/public/apps/customerror/test/__snapshots__/custom-error.test.tsx.snap b/public/apps/customerror/test/__snapshots__/custom-error.test.tsx.snap index ceb888fc1..3149a3578 100644 --- a/public/apps/customerror/test/__snapshots__/custom-error.test.tsx.snap +++ b/public/apps/customerror/test/__snapshots__/custom-error.test.tsx.snap @@ -27,13 +27,13 @@ exports[`Custom error page test renders and clicks the button on the error page - Logout - + `; diff --git a/public/apps/customerror/test/custom-error.test.tsx b/public/apps/customerror/test/custom-error.test.tsx index 18291c351..a6228cba8 100644 --- a/public/apps/customerror/test/custom-error.test.tsx +++ b/public/apps/customerror/test/custom-error.test.tsx @@ -17,7 +17,7 @@ import React from 'react'; import { CustomErrorPage } from '../custom-error'; import { cleanup } from '@testing-library/react'; import '@testing-library/jest-dom'; -import { EuiButton } from '../custom-error'; +import { EuiSmallButton } from '../custom-error'; import { logout } from '../../account/utils'; afterEach(() => { @@ -29,9 +29,9 @@ describe('Custom error page test', () => { beforeEach(() => { component = shallow( - + Logout - + ); }); diff --git a/public/apps/login/login-page.tsx b/public/apps/login/login-page.tsx index 66915dd9f..d53329cd3 100644 --- a/public/apps/login/login-page.tsx +++ b/public/apps/login/login-page.tsx @@ -16,15 +16,15 @@ import React, { useState } from 'react'; import { EuiText, - EuiFieldText, + EuiCompressedFieldText, EuiSpacer, EuiButton, EuiImage, EuiListGroup, EuiForm, - EuiFormRow, + EuiCompressedFormRow, EuiHorizontalRule, - EuiFieldPassword, + EuiCompressedFieldPassword, } from '@elastic/eui'; import { CoreStart } from '../../../../../src/core/public'; import { ClientConfigType } from '../../types'; @@ -149,7 +149,7 @@ export function LoginPage(props: LoginPageDeps) { const buttonId = `${authType}_login_button`; const loginEndPointWithPath = `${props.http.basePath.serverBasePath}${loginEndPoint}`; return ( - + {buttonConfig.buttonname} - + ); }; @@ -188,8 +188,8 @@ export function LoginPage(props: LoginPageDeps) { switch (authOpts[i].toLowerCase()) { case AuthType.BASIC: { formBody.push( - - + - + ); formBody.push( - - + - + ); const buttonId = `${AuthType.BASIC}_login_button`; formBody.push( - + Log in - + ); if (props.config.auth.anonymous_auth_enabled) { diff --git a/public/apps/login/test/__snapshots__/login-page.test.tsx.snap b/public/apps/login/test/__snapshots__/login-page.test.tsx.snap index e75489902..d36178728 100644 --- a/public/apps/login/test/__snapshots__/login-page.test.tsx.snap +++ b/public/apps/login/test/__snapshots__/login-page.test.tsx.snap @@ -33,15 +33,15 @@ exports[`Login page renders renders with config value for multiauth 1`] = ` - - - - + - - - + Log in - + @@ -103,9 +100,9 @@ exports[`Login page renders renders with config value for multiauth 1`] = ` - Button1 - - + Button2 - + `; @@ -180,15 +177,15 @@ exports[`Login page renders renders with config value for multiauth with anonymo - - - - + - - - + Log in - - + - + @@ -268,9 +262,9 @@ exports[`Login page renders renders with config value for multiauth with anonymo - Button1 - - + Button2 - + `; @@ -345,15 +339,15 @@ exports[`Login page renders renders with config value with anonymous auth enable - - - - + - - - + Log in - - + - + `; @@ -460,15 +451,15 @@ exports[`Login page renders renders with config value with anonymous auth enable - - - - + - - - + Log in - - + - + `; @@ -575,15 +563,15 @@ exports[`Login page renders renders with config value: string 1`] = ` - - - - + - - - + Log in - + `; @@ -672,15 +657,15 @@ exports[`Login page renders renders with config value: string array 1`] = ` - - - - + - - - + Log in - + `; @@ -769,15 +751,15 @@ exports[`Login page renders renders with default value: string 1`] = ` - - - - + - - - + Log in - + `; @@ -866,15 +845,15 @@ exports[`Login page renders renders with default value: string array 1`] = ` - - - - + - - - + Log in - + `;