diff --git a/package.json b/package.json index 92a4d23b910..b90aa1f3b24 100644 --- a/package.json +++ b/package.json @@ -140,7 +140,7 @@ "dependencies": { "@aws-crypto/client-node": "^3.1.1", "@elastic/datemath": "5.0.3", - "@elastic/eui": "npm:@opensearch-project/oui@1.5.1", + "@elastic/eui": "npm:@opensearch-project/oui@1.7.0", "@elastic/good": "^9.0.1-kibana3", "@elastic/numeral": "npm:@amoo-miki/numeral@2.6.0", "@elastic/request-crypto": "2.0.0", diff --git a/packages/osd-plugin-generator/template/public/components/app.tsx.ejs b/packages/osd-plugin-generator/template/public/components/app.tsx.ejs index 876b3f8c5e7..2029a69dd8d 100644 --- a/packages/osd-plugin-generator/template/public/components/app.tsx.ejs +++ b/packages/osd-plugin-generator/template/public/components/app.tsx.ejs @@ -4,7 +4,7 @@ import { FormattedMessage, I18nProvider } from '@osd/i18n/react'; import { BrowserRouter as Router } from 'react-router-dom'; import { -EuiButton, +EuiSmallButton, EuiHorizontalRule, EuiPage, EuiPageBody, diff --git a/packages/osd-ui-framework/package.json b/packages/osd-ui-framework/package.json index 68b2950369d..860a50d39c4 100644 --- a/packages/osd-ui-framework/package.json +++ b/packages/osd-ui-framework/package.json @@ -23,7 +23,7 @@ "enzyme-adapter-react-16": "^1.9.1" }, "devDependencies": { - "@elastic/eui": "npm:@opensearch-project/oui@1.5.1", + "@elastic/eui": "npm:@opensearch-project/oui@1.7.0", "@osd/babel-preset": "1.0.0", "@osd/optimizer": "1.0.0", "comment-stripper": "^0.0.4", diff --git a/packages/osd-ui-shared-deps/package.json b/packages/osd-ui-shared-deps/package.json index bc1a256a9bc..1d4092f7df5 100644 --- a/packages/osd-ui-shared-deps/package.json +++ b/packages/osd-ui-shared-deps/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@elastic/charts": "31.1.0", - "@elastic/eui": "npm:@opensearch-project/oui@1.5.1", + "@elastic/eui": "npm:@opensearch-project/oui@1.7.0", "@elastic/numeral": "npm:@amoo-miki/numeral@2.6.0", "@opensearch/datemath": "5.0.3", "@osd/i18n": "1.0.0", diff --git a/src/core/public/fatal_errors/__snapshots__/fatal_errors_screen.test.tsx.snap b/src/core/public/fatal_errors/__snapshots__/fatal_errors_screen.test.tsx.snap index 2165a2112f2..5fd679baf7e 100644 --- a/src/core/public/fatal_errors/__snapshots__/fatal_errors_screen.test.tsx.snap +++ b/src/core/public/fatal_errors/__snapshots__/fatal_errors_screen.test.tsx.snap @@ -18,7 +18,7 @@ exports[`FatalErrorsScreen rendering render matches snapshot 1`] = ` - , - , + @@ -39,7 +39,7 @@ exports[`FatalErrorsScreen rendering render matches snapshot 1`] = ` id="core.fatalErrors.goBackButtonLabel" values={Object {}} /> - , + , ] } body={ diff --git a/src/core/public/fatal_errors/fatal_errors_screen.tsx b/src/core/public/fatal_errors/fatal_errors_screen.tsx index ecb95f3217e..2333bf00681 100644 --- a/src/core/public/fatal_errors/fatal_errors_screen.tsx +++ b/src/core/public/fatal_errors/fatal_errors_screen.tsx @@ -29,8 +29,8 @@ */ import { - EuiButton, - EuiButtonEmpty, + EuiSmallButton, + EuiSmallButtonEmpty, EuiCallOut, EuiCodeBlock, EuiEmptyPrompt, @@ -125,7 +125,7 @@ export class FatalErrorsScreen extends React.Component { } actions={[ - { id="core.fatalErrors.clearYourSessionButtonLabel" defaultMessage="Clear your session" /> - , - + , + - , + , ]} /> {this.state.errors.map((error, i) => ( diff --git a/src/core/public/notifications/toasts/error_toast.tsx b/src/core/public/notifications/toasts/error_toast.tsx index 4f4debbb28c..5924543b8eb 100644 --- a/src/core/public/notifications/toasts/error_toast.tsx +++ b/src/core/public/notifications/toasts/error_toast.tsx @@ -32,6 +32,7 @@ import React from 'react'; import ReactDOM from 'react-dom'; import { + EuiSmallButton, EuiButton, EuiCallOut, EuiCodeBlock, @@ -107,12 +108,12 @@ function showErrorDialog({ )} - modal.close()} fill> + modal.close()} fill> - + diff --git a/src/plugins/advanced_settings/public/management_app/components/field/__snapshots__/field.test.tsx.snap b/src/plugins/advanced_settings/public/management_app/components/field/__snapshots__/field.test.tsx.snap index 9ab66e07807..0e08b53cc28 100644 --- a/src/plugins/advanced_settings/public/management_app/components/field/__snapshots__/field.test.tsx.snap +++ b/src/plugins/advanced_settings/public/management_app/components/field/__snapshots__/field.test.tsx.snap @@ -28,10 +28,10 @@ exports[`Field for array setting should render as read only if saving is disable } > - - - + `; @@ -101,10 +101,10 @@ exports[`Field for array setting should render as read only with help text if ov } > - - - + `; @@ -173,10 +173,10 @@ exports[`Field for array setting should render custom setting icon if it is cust } > - - - + `; @@ -224,10 +224,10 @@ exports[`Field for array setting should render default value if there is no user } > - - - + `; @@ -292,10 +292,10 @@ exports[`Field for array setting should render unsaved value if there are unsave } > - - - + `; @@ -377,10 +377,10 @@ exports[`Field for array setting should render user value if there is user value } > - - - + `; @@ -445,10 +445,10 @@ exports[`Field for boolean setting should render as read only if saving is disab } > - - - + `; @@ -524,10 +524,10 @@ exports[`Field for boolean setting should render as read only with help text if } > - - - + `; @@ -602,10 +602,10 @@ exports[`Field for boolean setting should render custom setting icon if it is cu } > - - - + `; @@ -659,10 +659,10 @@ exports[`Field for boolean setting should render default value if there is no us } > - - - + `; @@ -733,10 +733,10 @@ exports[`Field for boolean setting should render unsaved value if there are unsa } > - - - + `; @@ -820,10 +820,10 @@ exports[`Field for boolean setting should render user value if there is user val } > - - - + `; @@ -894,10 +894,10 @@ exports[`Field for image setting should render as read only if saving is disable } > - - - + `; @@ -970,10 +970,10 @@ exports[`Field for image setting should render as read only with help text if ov } > - - + `; @@ -1040,10 +1040,10 @@ exports[`Field for image setting should render custom setting icon if it is cust } > - - - + `; @@ -1094,10 +1094,10 @@ exports[`Field for image setting should render default value if there is no user } > - - - + `; @@ -1165,10 +1165,10 @@ exports[`Field for image setting should render unsaved value if there are unsave } > - - - + `; @@ -1248,10 +1248,10 @@ exports[`Field for image setting should render user value if there is user value } > - - + `; @@ -1352,10 +1352,10 @@ exports[`Field for json setting should render as read only if saving is disabled } > - - + `; @@ -1448,10 +1448,10 @@ exports[`Field for json setting should render as read only with help text if ove } > - - + `; @@ -1540,10 +1540,10 @@ exports[`Field for json setting should render custom setting icon if it is custo } > - - + `; @@ -1636,10 +1636,10 @@ exports[`Field for json setting should render default value if there is no user } > - - + `; @@ -1741,10 +1741,10 @@ exports[`Field for json setting should render unsaved value if there are unsaved } > - - + `; @@ -1849,10 +1849,10 @@ exports[`Field for json setting should render user value if there is user value } > - - + `; @@ -1937,10 +1937,10 @@ exports[`Field for markdown setting should render as read only if saving is disa } > - - + `; @@ -2030,10 +2030,10 @@ exports[`Field for markdown setting should render as read only with help text if } > - - + `; @@ -2122,10 +2122,10 @@ exports[`Field for markdown setting should render custom setting icon if it is c } > - - + `; @@ -2193,10 +2193,10 @@ exports[`Field for markdown setting should render default value if there is no u } > - - + `; @@ -2281,10 +2281,10 @@ exports[`Field for markdown setting should render unsaved value if there are uns } > - - + `; @@ -2382,10 +2382,10 @@ exports[`Field for markdown setting should render user value if there is user va } > - - + `; @@ -2470,10 +2470,10 @@ exports[`Field for number setting should render as read only if saving is disabl } > - - - + `; @@ -2543,10 +2543,10 @@ exports[`Field for number setting should render as read only with help text if o } > - - - + `; @@ -2615,10 +2615,10 @@ exports[`Field for number setting should render custom setting icon if it is cus } > - - - + `; @@ -2666,10 +2666,10 @@ exports[`Field for number setting should render default value if there is no use } > - - - + `; @@ -2734,10 +2734,10 @@ exports[`Field for number setting should render unsaved value if there are unsav } > - - - + `; @@ -2815,10 +2815,10 @@ exports[`Field for number setting should render user value if there is user valu } > - - - + `; @@ -2883,10 +2883,10 @@ exports[`Field for select setting should render as read only if saving is disabl } > - - - + `; @@ -2972,10 +2972,10 @@ exports[`Field for select setting should render as read only with help text if o } > - - - + `; @@ -3060,10 +3060,10 @@ exports[`Field for select setting should render custom setting icon if it is cus } > - - - + `; @@ -3127,10 +3127,10 @@ exports[`Field for select setting should render default value if there is no use } > - - - + `; @@ -3211,10 +3211,10 @@ exports[`Field for select setting should render unsaved value if there are unsav } > - - - + `; @@ -3308,10 +3308,10 @@ exports[`Field for select setting should render user value if there is user valu } > - - - + `; @@ -3392,10 +3392,10 @@ exports[`Field for string setting should render as read only if saving is disabl } > - - - + `; @@ -3465,10 +3465,10 @@ exports[`Field for string setting should render as read only with help text if o } > - - - + `; @@ -3537,10 +3537,10 @@ exports[`Field for string setting should render custom setting icon if it is cus } > - - - + `; @@ -3588,10 +3588,10 @@ exports[`Field for string setting should render default value if there is no use } > - - - + `; @@ -3656,10 +3656,10 @@ exports[`Field for string setting should render unsaved value if there are unsav } > - - - + `; @@ -3737,10 +3737,10 @@ exports[`Field for string setting should render user value if there is user valu } > - - - + `; @@ -3805,10 +3805,10 @@ exports[`Field for stringWithValidation setting should render as read only if sa } > - - - + `; @@ -3878,10 +3878,10 @@ exports[`Field for stringWithValidation setting should render as read only with } > - - - + `; @@ -3950,10 +3950,10 @@ exports[`Field for stringWithValidation setting should render custom setting ico } > - - - + `; @@ -4001,10 +4001,10 @@ exports[`Field for stringWithValidation setting should render default value if t } > - - - + `; @@ -4069,10 +4069,10 @@ exports[`Field for stringWithValidation setting should render unsaved value if t } > - - - + `; @@ -4150,10 +4150,10 @@ exports[`Field for stringWithValidation setting should render user value if ther } > - - - + `; diff --git a/src/plugins/advanced_settings/public/management_app/components/field/field.tsx b/src/plugins/advanced_settings/public/management_app/components/field/field.tsx index c21c81cafa2..75dd18fffde 100644 --- a/src/plugins/advanced_settings/public/management_app/components/field/field.tsx +++ b/src/plugins/advanced_settings/public/management_app/components/field/field.tsx @@ -42,17 +42,17 @@ import { EuiScreenReaderOnly, EuiCodeEditor, EuiDescribedFormGroup, - EuiFieldNumber, - EuiFieldText, - EuiFilePicker, - EuiFormRow, + EuiCompressedFieldNumber, + EuiCompressedFieldText, + EuiCompressedFilePicker, + EuiCompressedFormRow, EuiIconTip, EuiImage, EuiLink, EuiSpacer, EuiText, - EuiSelect, - EuiSwitch, + EuiCompressedSelect, + EuiCompressedSwitch, EuiSwitchEvent, EuiToolTip, } from '@elastic/eui'; @@ -100,7 +100,7 @@ export const getEditableValue = ( }; export class Field extends PureComponent { - private changeImageForm = React.createRef(); + private changeImageForm = React.createRef(); getDisplayedDefaultValue( type: UiSettingsType, @@ -326,7 +326,7 @@ export class Field extends PureComponent { switch (type) { case 'boolean': return ( - @@ -373,7 +373,7 @@ export class Field extends PureComponent { return ; } else { return ( - { } case 'select': return ( - { @@ -404,7 +404,7 @@ export class Field extends PureComponent { ); case 'number': return ( - { ); default: return ( - { description={this.renderDescription(setting)} fullWidth > - { )} - + ); } diff --git a/src/plugins/console/public/application/components/__snapshots__/import_flyout.test.tsx.snap b/src/plugins/console/public/application/components/__snapshots__/import_flyout.test.tsx.snap index bac6be2733f..04bb8ddcff9 100644 --- a/src/plugins/console/public/application/components/__snapshots__/import_flyout.test.tsx.snap +++ b/src/plugins/console/public/application/components/__snapshots__/import_flyout.test.tsx.snap @@ -61,9 +61,9 @@ exports[`ImportFlyout Component renders correctly 1`] = `
-
-
- +
- - +
- -
- -
+
+ -
- -
- - -
+
+ +
+ + -
- -
- -
- + +
+ +
+ +
+ +
- +
diff --git a/src/plugins/console/public/application/components/__snapshots__/import_mode_control.test.tsx.snap b/src/plugins/console/public/application/components/__snapshots__/import_mode_control.test.tsx.snap index 343c6b35122..29e14c2c986 100644 --- a/src/plugins/console/public/application/components/__snapshots__/import_mode_control.test.tsx.snap +++ b/src/plugins/console/public/application/components/__snapshots__/import_mode_control.test.tsx.snap @@ -14,7 +14,7 @@ exports[`ImportModeControl Component should render correclty 1`] = ` } } > - { return ( - { /> } > - { onChange={setImportFile} data-test-subj="queryFilePicker" /> - - + + setImportMode(newValues)} /> - + ); }; diff --git a/src/plugins/console/public/application/components/import_mode_control.test.tsx b/src/plugins/console/public/application/components/import_mode_control.test.tsx index 219cc2f1c5f..32ab6322d7e 100644 --- a/src/plugins/console/public/application/components/import_mode_control.test.tsx +++ b/src/plugins/console/public/application/components/import_mode_control.test.tsx @@ -10,7 +10,7 @@ import { nextTick, shallowWithIntl } from 'test_utils/enzyme_helpers'; import { ImportModeControl } from './import_mode_control'; import { EuiFormLegendProps, EuiRadioGroupProps } from '@elastic/eui'; -const radioGroupIdentifier = 'EuiRadioGroup'; +const radioGroupIdentifier = 'EuiCompressedRadioGroup'; describe('ImportModeControl Component', () => { let component: ShallowWrapper, React.Component<{}, {}, any>>; diff --git a/src/plugins/console/public/application/components/import_mode_control.tsx b/src/plugins/console/public/application/components/import_mode_control.tsx index 0b543a9c593..603a37f51fa 100644 --- a/src/plugins/console/public/application/components/import_mode_control.tsx +++ b/src/plugins/console/public/application/components/import_mode_control.tsx @@ -4,7 +4,7 @@ */ import React, { useState } from 'react'; -import { EuiFormFieldset, EuiTitle, EuiRadioGroup } from '@elastic/eui'; +import { EuiFormFieldset, EuiTitle, EuiCompressedRadioGroup } from '@elastic/eui'; import { i18n } from '@osd/i18n'; export interface ImportModeControlProps { @@ -43,7 +43,7 @@ export const ImportModeControl = ({ initialValues, updateSelection }: ImportMode }; const overwriteRadio = ( - onChange({ overwrite: id === overwriteEnabled.id })} diff --git a/src/plugins/console/public/application/components/settings_modal.tsx b/src/plugins/console/public/application/components/settings_modal.tsx index 15405a7e6c7..d97b7c72a03 100644 --- a/src/plugins/console/public/application/components/settings_modal.tsx +++ b/src/plugins/console/public/application/components/settings_modal.tsx @@ -34,17 +34,17 @@ import { i18n } from '@osd/i18n'; import { FormattedMessage } from '@osd/i18n/react'; import { - EuiButton, - EuiButtonEmpty, - EuiFieldNumber, - EuiFormRow, - EuiCheckboxGroup, + EuiSmallButton, + EuiSmallButtonEmpty, + EuiCompressedFieldNumber, + EuiCompressedFormRow, + EuiCompressedCheckboxGroup, EuiModal, EuiModalBody, EuiModalFooter, EuiModalHeader, EuiModalHeaderTitle, - EuiSwitch, + EuiCompressedSwitch, } from '@elastic/eui'; import { DevToolsSettings } from '../../services'; @@ -122,7 +122,7 @@ export function DevToolsSettingsModal(props: Props) { const pollingFields = fields || indices || templates ? ( - } > - setPolling(e.target.checked)} /> - + - { @@ -167,7 +167,7 @@ export function DevToolsSettingsModal(props: Props) { defaultMessage="Refresh autocomplete suggestions" id="console.settingsPage.refreshButtonLabel" /> - + ) : undefined; @@ -184,12 +184,12 @@ export function DevToolsSettingsModal(props: Props) { - } > - - + - - + setWrapMode(e.target.checked)} /> - + - } > - setTripleQuotes(e.target.checked)} /> - + - } > - { const { stateSetter, ...rest } = opts; return rest; @@ -259,19 +259,19 @@ export function DevToolsSettingsModal(props: Props) { onAutocompleteChange(e as AutocompleteOptions); }} /> - + {pollingFields} - + - + - + - + ); diff --git a/src/plugins/console/public/application/components/something_went_wrong_callout.tsx b/src/plugins/console/public/application/components/something_went_wrong_callout.tsx index f12d5b9cda8..b868164e5c8 100644 --- a/src/plugins/console/public/application/components/something_went_wrong_callout.tsx +++ b/src/plugins/console/public/application/components/something_went_wrong_callout.tsx @@ -31,7 +31,7 @@ import React, { FunctionComponent, useEffect } from 'react'; import { FormattedMessage } from '@osd/i18n/react'; import { i18n } from '@osd/i18n'; -import { EuiCallOut, EuiText, EuiButton, EuiSpacer } from '@elastic/eui'; +import { EuiCallOut, EuiText, EuiSmallButton, EuiSpacer } from '@elastic/eui'; interface Props { error: Error; @@ -61,9 +61,9 @@ export const SomethingWentWrongCallout: FunctionComponent = ({ error, onB

- onButtonClick()}> + onButtonClick()}> - + ); }; diff --git a/src/plugins/console/public/application/components/welcome_panel.tsx b/src/plugins/console/public/application/components/welcome_panel.tsx index bc30539e57c..ba9e499b03b 100644 --- a/src/plugins/console/public/application/components/welcome_panel.tsx +++ b/src/plugins/console/public/application/components/welcome_panel.tsx @@ -37,7 +37,7 @@ import { EuiFlyoutHeader, EuiFlyoutBody, EuiTitle, - EuiButton, + EuiSmallButton, EuiText, EuiFlyoutFooter, } from '@elastic/eui'; @@ -131,14 +131,14 @@ export function WelcomePanel(props: Props) { - - + ); diff --git a/src/plugins/console/public/application/containers/console_history/console_history.tsx b/src/plugins/console/public/application/containers/console_history/console_history.tsx index 08704c442bb..925224c5378 100644 --- a/src/plugins/console/public/application/containers/console_history/console_history.tsx +++ b/src/plugins/console/public/application/containers/console_history/console_history.tsx @@ -39,8 +39,8 @@ import { EuiTitle, EuiFlexItem, EuiFlexGroup, - EuiButtonEmpty, - EuiButton, + EuiSmallButtonEmpty, + EuiSmallButton, } from '@elastic/eui'; import { useServicesContext } from '../../contexts'; @@ -210,25 +210,25 @@ export function ConsoleHistory({ close }: Props) { - clear()}> + clear()}> {i18n.translate('console.historyPage.clearHistoryButtonLabel', { defaultMessage: 'Clear', })} - + - close()}> + close()}> {i18n.translate('console.historyPage.closehistoryButtonLabel', { defaultMessage: 'Close', })} - + - restoreRequestFromHistory(selectedReq.current)} @@ -236,7 +236,7 @@ export function ConsoleHistory({ close }: Props) { {i18n.translate('console.historyPage.applyHistoryButtonLabel', { defaultMessage: 'Apply', })} - + diff --git a/src/plugins/dashboard/public/application/components/dashboard_listing/__snapshots__/create_button.test.tsx.snap b/src/plugins/dashboard/public/application/components/dashboard_listing/__snapshots__/create_button.test.tsx.snap index 4512135a492..1ca3fd80e89 100644 --- a/src/plugins/dashboard/public/application/components/dashboard_listing/__snapshots__/create_button.test.tsx.snap +++ b/src/plugins/dashboard/public/application/components/dashboard_listing/__snapshots__/create_button.test.tsx.snap @@ -245,7 +245,7 @@ exports[`create button with props renders button dropdown menu when two provider - + } closePopover={[Function]} display="inlineBlock" @@ -274,79 +274,89 @@ exports[`create button with props renders button dropdown menu when two provider
- - - - - + + + + +
@@ -480,78 +490,87 @@ exports[`create button with props renders single button when one provider given diff --git a/src/plugins/dashboard/public/application/components/dashboard_listing/__snapshots__/dashboard_listing.test.tsx.snap b/src/plugins/dashboard/public/application/components/dashboard_listing/__snapshots__/dashboard_listing.test.tsx.snap index 1726e357eeb..678ddcaf574 100644 --- a/src/plugins/dashboard/public/application/components/dashboard_listing/__snapshots__/dashboard_listing.test.tsx.snap +++ b/src/plugins/dashboard/public/application/components/dashboard_listing/__snapshots__/dashboard_listing.test.tsx.snap @@ -2309,7 +2309,7 @@ exports[`dashboard listing render table listing with initial filters from URL 1` noItemsFragment={ - + } body={ @@ -3560,7 +3560,7 @@ exports[`dashboard listing renders call to action when no dashboards exist 1`] = noItemsFragment={ - + } body={ @@ -4811,7 +4811,7 @@ exports[`dashboard listing renders table rows 1`] = ` noItemsFragment={ - + } body={ @@ -6062,7 +6062,7 @@ exports[`dashboard listing renders warning when listingLimit is exceeded 1`] = ` noItemsFragment={ - + } body={ diff --git a/src/plugins/dashboard/public/application/components/dashboard_listing/create_button.tsx b/src/plugins/dashboard/public/application/components/dashboard_listing/create_button.tsx index 5baf945e3b5..83f055b0ac3 100644 --- a/src/plugins/dashboard/public/application/components/dashboard_listing/create_button.tsx +++ b/src/plugins/dashboard/public/application/components/dashboard_listing/create_button.tsx @@ -5,7 +5,7 @@ import React, { useState } from 'react'; import { FormattedMessage } from '@osd/i18n/react'; import { - EuiButton, + EuiSmallButton, EuiContextMenuItem, EuiContextMenuPanel, EuiFlexItem, @@ -47,7 +47,7 @@ const CreateButton = (props: CreateButtonProps) => { const renderCreateMenuDropDown = () => { const button = ( - { data-test-subj="createMenuDropdown" > - + ); return ( @@ -78,10 +78,15 @@ const CreateButton = (props: CreateButtonProps) => { const provider: DashboardProvider = Object.values(props.dashboardProviders!)[0]; return ( - +  {provider.createLinkText} - + ); }; diff --git a/src/plugins/dashboard/public/application/components/dashboard_top_nav/top_nav/__snapshots__/clone_modal.test.js.snap b/src/plugins/dashboard/public/application/components/dashboard_top_nav/top_nav/__snapshots__/clone_modal.test.js.snap index 1ea30b7fe0a..559f69752b6 100644 --- a/src/plugins/dashboard/public/application/components/dashboard_top_nav/top_nav/__snapshots__/clone_modal.test.js.snap +++ b/src/plugins/dashboard/public/application/components/dashboard_top_nav/top_nav/__snapshots__/clone_modal.test.js.snap @@ -34,7 +34,7 @@ exports[`renders DashboardCloneModal 1`] = `

- - @@ -53,8 +53,8 @@ exports[`renders DashboardCloneModal 1`] = ` id="dashboard.topNav.cloneModal.cancelButtonLabel" values={Object {}} /> - - + - + `; diff --git a/src/plugins/dashboard/public/application/components/dashboard_top_nav/top_nav/__snapshots__/save_modal.test.js.snap b/src/plugins/dashboard/public/application/components/dashboard_top_nav/top_nav/__snapshots__/save_modal.test.js.snap index bc4ed477d9e..727dae147a9 100644 --- a/src/plugins/dashboard/public/application/components/dashboard_top_nav/top_nav/__snapshots__/save_modal.test.js.snap +++ b/src/plugins/dashboard/public/application/components/dashboard_top_nav/top_nav/__snapshots__/save_modal.test.js.snap @@ -7,9 +7,9 @@ exports[`renders DashboardSaveModal 1`] = ` onSave={[Function]} options={ - - - - + - - + } showCopyOnSave={true} diff --git a/src/plugins/dashboard/public/application/components/dashboard_top_nav/top_nav/clone_modal.tsx b/src/plugins/dashboard/public/application/components/dashboard_top_nav/top_nav/clone_modal.tsx index fb1aefab776..c4e2b2d3265 100644 --- a/src/plugins/dashboard/public/application/components/dashboard_top_nav/top_nav/clone_modal.tsx +++ b/src/plugins/dashboard/public/application/components/dashboard_top_nav/top_nav/clone_modal.tsx @@ -33,9 +33,9 @@ import { i18n } from '@osd/i18n'; import { FormattedMessage } from '@osd/i18n/react'; import { - EuiButton, - EuiButtonEmpty, - EuiFieldText, + EuiSmallButton, + EuiSmallButtonEmpty, + EuiCompressedFieldText, EuiModal, EuiModalBody, EuiModalFooter, @@ -191,7 +191,7 @@ export class DashboardCloneModal extends React.Component { - { - + - + - { id="dashboard.topNav.cloneModal.confirmButtonLabel" defaultMessage="Confirm Clone" /> - + ); diff --git a/src/plugins/dashboard/public/application/components/dashboard_top_nav/top_nav/options.tsx b/src/plugins/dashboard/public/application/components/dashboard_top_nav/top_nav/options.tsx index 2ea2c6f841f..02534e06e62 100644 --- a/src/plugins/dashboard/public/application/components/dashboard_top_nav/top_nav/options.tsx +++ b/src/plugins/dashboard/public/application/components/dashboard_top_nav/top_nav/options.tsx @@ -31,7 +31,7 @@ import React, { Component } from 'react'; import { i18n } from '@osd/i18n'; -import { EuiForm, EuiFormRow, EuiSwitch } from '@elastic/eui'; +import { EuiForm, EuiCompressedFormRow, EuiCompressedSwitch } from '@elastic/eui'; interface Props { useMargins: boolean; @@ -70,8 +70,8 @@ export class OptionsMenu extends Component { render() { return ( - - + { onChange={this.handleUseMarginsChange} data-test-subj="dashboardMarginsCheckbox" /> - + - - + { onChange={this.handleHidePanelTitlesChange} data-test-subj="dashboardPanelTitlesCheckbox" /> - + ); } diff --git a/src/plugins/dashboard/public/application/components/dashboard_top_nav/top_nav/save_modal.tsx b/src/plugins/dashboard/public/application/components/dashboard_top_nav/top_nav/save_modal.tsx index f8e0fe674df..3a8aa0538bb 100644 --- a/src/plugins/dashboard/public/application/components/dashboard_top_nav/top_nav/save_modal.tsx +++ b/src/plugins/dashboard/public/application/components/dashboard_top_nav/top_nav/save_modal.tsx @@ -30,7 +30,7 @@ import React, { Fragment } from 'react'; import { FormattedMessage } from '@osd/i18n/react'; -import { EuiFormRow, EuiTextArea, EuiSwitch } from '@elastic/eui'; +import { EuiCompressedFormRow, EuiCompressedTextArea, EuiCompressedSwitch } from '@elastic/eui'; import { SavedObjectSaveModal } from '../../../../../../saved_objects/public'; @@ -110,7 +110,7 @@ export class DashboardSaveModal extends React.Component { renderDashboardSaveOptions() { return ( - { /> } > - - + - { /> } > - { /> } /> - + ); } diff --git a/src/plugins/dashboard/public/application/utils/get_nav_actions.tsx b/src/plugins/dashboard/public/application/utils/get_nav_actions.tsx index 205489739ea..32bfef08351 100644 --- a/src/plugins/dashboard/public/application/utils/get_nav_actions.tsx +++ b/src/plugins/dashboard/public/application/utils/get_nav_actions.tsx @@ -5,7 +5,7 @@ import React, { ReactElement, useState } from 'react'; import { i18n } from '@osd/i18n'; -import { EUI_MODAL_CANCEL_BUTTON, EuiCheckboxGroup } from '@elastic/eui'; +import { EUI_MODAL_CANCEL_BUTTON, EuiCompressedCheckboxGroup } from '@elastic/eui'; import { EuiCheckboxGroupIdToSelectedMap } from '@elastic/eui/src/components/form/checkbox/checkbox_group'; import { SaveResult, @@ -265,7 +265,7 @@ export const getNavActions = ( }; return ( - } actions={ - - + } /> ); diff --git a/src/plugins/data/public/data_sources/datasource_selector/data_selector_refresher.tsx b/src/plugins/data/public/data_sources/datasource_selector/data_selector_refresher.tsx index 1cc5acd6f9d..bab5f152458 100644 --- a/src/plugins/data/public/data_sources/datasource_selector/data_selector_refresher.tsx +++ b/src/plugins/data/public/data_sources/datasource_selector/data_selector_refresher.tsx @@ -6,7 +6,7 @@ import React from 'react'; import { i18n } from '@osd/i18n'; import { - EuiButtonIcon, + EuiSmallButtonIcon, EuiButtonIconProps, EuiText, EuiToolTip, @@ -33,7 +33,7 @@ export const DataSelectorRefresher: React.FC = Reac data-test-subj="sourceRefreshButtonToolTip" {...toolTipProps} > - const form = ( {mappedFilters.map((filter, i) => ( - - + this.toggleFilterSelected(i)} /> - + ))} ); @@ -115,18 +116,18 @@ export default class ApplyFiltersPopoverContent extends Component {form} - + - - + + - + ); diff --git a/src/plugins/data/public/ui/filter_bar/filter_editor/generic_combo_box.tsx b/src/plugins/data/public/ui/filter_bar/filter_editor/generic_combo_box.tsx index 2df1b1e7c15..59c906e2bb1 100644 --- a/src/plugins/data/public/ui/filter_bar/filter_editor/generic_combo_box.tsx +++ b/src/plugins/data/public/ui/filter_bar/filter_editor/generic_combo_box.tsx @@ -28,7 +28,7 @@ * under the License. */ -import { EuiComboBox, EuiComboBoxOptionOption } from '@elastic/eui'; +import { EuiCompressedComboBox, EuiComboBoxOptionOption } from '@elastic/eui'; import React from 'react'; export interface GenericComboBoxProps { @@ -66,7 +66,7 @@ export function GenericComboBox(props: GenericComboBoxProps) { }; return ( - { - { {this.state.useCustomLabel && (
- - - +
)} @@ -181,7 +182,7 @@ class FilterEditorUI extends Component { - { id="data.filter.filterEditor.saveButtonLabel" defaultMessage="Save" /> - + - { id="data.filter.filterEditor.cancelButtonLabel" defaultMessage="Cancel" /> - + @@ -231,7 +232,7 @@ class FilterEditorUI extends Component { return ( - { isClearable={false} data-test-subj="filterIndexPatternsSelect" /> - + ); @@ -276,7 +277,7 @@ class FilterEditorUI extends Component { const fields = selectedIndexPattern ? getFilterableFields(selectedIndexPattern) : []; return ( - { className="globalFilterEditor__fieldInput" data-test-subj="filterFieldSuggestionList" /> - + ); } @@ -307,7 +308,7 @@ class FilterEditorUI extends Component { const { selectedField, selectedOperator } = this.state; const operators = selectedField ? getOperatorOptions(selectedField) : []; return ( - { isClearable={false} data-test-subj="filterOperatorList" /> - + ); } private renderCustomEditor() { return ( - { width="100%" height="250px" /> - + ); } diff --git a/src/plugins/data/public/ui/filter_bar/filter_editor/phrase_value_input.tsx b/src/plugins/data/public/ui/filter_bar/filter_editor/phrase_value_input.tsx index 624f478821d..74dcfa493b5 100644 --- a/src/plugins/data/public/ui/filter_bar/filter_editor/phrase_value_input.tsx +++ b/src/plugins/data/public/ui/filter_bar/filter_editor/phrase_value_input.tsx @@ -28,7 +28,7 @@ * under the License. */ -import { EuiFormRow } from '@elastic/eui'; +import { EuiCompressedFormRow } from '@elastic/eui'; import { InjectedIntl, injectI18n } from '@osd/i18n/react'; import { uniq } from 'lodash'; import React from 'react'; @@ -46,7 +46,7 @@ interface Props extends PhraseSuggestorProps { class PhraseValueInputUI extends PhraseSuggestorUI { public render() { return ( - { type={this.props.field ? this.props.field.type : 'string'} /> )} - + ); } diff --git a/src/plugins/data/public/ui/filter_bar/filter_editor/phrases_values_input.tsx b/src/plugins/data/public/ui/filter_bar/filter_editor/phrases_values_input.tsx index 0ac1af97a1c..1e9e8001237 100644 --- a/src/plugins/data/public/ui/filter_bar/filter_editor/phrases_values_input.tsx +++ b/src/plugins/data/public/ui/filter_bar/filter_editor/phrases_values_input.tsx @@ -28,7 +28,7 @@ * under the License. */ -import { EuiFormRow } from '@elastic/eui'; +import { EuiCompressedFormRow } from '@elastic/eui'; import { InjectedIntl, injectI18n } from '@osd/i18n/react'; import { uniq } from 'lodash'; import React from 'react'; @@ -48,7 +48,7 @@ class PhrasesValuesInputUI extends PhraseSuggestorUI { const { values, intl, onChange } = this.props; const options = values ? uniq([...values, ...suggestions]) : suggestions; return ( - { data-test-subj="filterParamsComboBox phrasesParamsComboxBox" delimiter="," /> - + ); } } diff --git a/src/plugins/data/public/ui/filter_bar/filter_editor/value_input_type.tsx b/src/plugins/data/public/ui/filter_bar/filter_editor/value_input_type.tsx index 1bd1a653e02..9d7709a5f66 100644 --- a/src/plugins/data/public/ui/filter_bar/filter_editor/value_input_type.tsx +++ b/src/plugins/data/public/ui/filter_bar/filter_editor/value_input_type.tsx @@ -28,7 +28,11 @@ * under the License. */ -import { EuiFieldNumber, EuiFieldText, EuiSelect } from '@elastic/eui'; +import { + EuiCompressedFieldNumber, + EuiCompressedFieldText, + EuiCompressedSelect, +} from '@elastic/eui'; import { InjectedIntl, injectI18n } from '@osd/i18n/react'; import { isEmpty } from 'lodash'; import React, { Component } from 'react'; @@ -53,7 +57,7 @@ class ValueInputTypeUI extends Component { switch (this.props.type) { case 'string': inputElement = ( - { break; case 'number': inputElement = ( - { break; case 'date': inputElement = ( - { break; case 'ip': inputElement = ( - { break; case 'boolean': inputElement = ( - { isOpen={this.state.isPopoverOpen} closePopover={this.closePopover} button={ - { }, }) ); - const euiComboBox = component.find(EuiComboBox); + const euiComboBox = component.find(EuiCompressedComboBox); expect(euiComboBox.prop('selectedOptions')).toEqual( expect.arrayContaining([ { @@ -72,7 +72,7 @@ describe('LanguageSelector', () => { }, }) ); - const euiComboBox = component.find(EuiComboBox); + const euiComboBox = component.find(EuiCompressedComboBox); expect(euiComboBox.prop('selectedOptions')).toEqual( expect.arrayContaining([ { diff --git a/src/plugins/data/public/ui/query_editor/language_selector.tsx b/src/plugins/data/public/ui/query_editor/language_selector.tsx index 7ea82fe2b24..0f35b84ff59 100644 --- a/src/plugins/data/public/ui/query_editor/language_selector.tsx +++ b/src/plugins/data/public/ui/query_editor/language_selector.tsx @@ -3,7 +3,11 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { EuiComboBox, EuiComboBoxOptionOption, PopoverAnchorPosition } from '@elastic/eui'; +import { + EuiCompressedComboBox, + EuiComboBoxOptionOption, + PopoverAnchorPosition, +} from '@elastic/eui'; import { i18n } from '@osd/i18n'; import React from 'react'; import { getUiService } from '../../services'; @@ -73,7 +77,7 @@ export const QueryLanguageSelector = (props: Props) => { uiService.Settings.setUserQueryLanguage(props.language); return ( - ; dataSource?: DataSource; isLoading?: boolean; - prepend?: React.ComponentProps['prepend']; + prepend?: React.ComponentProps['prepend']; showQueryEditor?: boolean; showDatePicker?: boolean; dateRangeFrom?: string; diff --git a/src/plugins/data/public/ui/query_string_input/language_switcher.tsx b/src/plugins/data/public/ui/query_string_input/language_switcher.tsx index d9c398acb63..c31a40db8dd 100644 --- a/src/plugins/data/public/ui/query_string_input/language_switcher.tsx +++ b/src/plugins/data/public/ui/query_string_input/language_switcher.tsx @@ -32,12 +32,12 @@ import { i18n } from '@osd/i18n'; import { EuiButtonEmpty, EuiForm, - EuiFormRow, + EuiCompressedFormRow, EuiLink, EuiPopover, EuiPopoverTitle, EuiSpacer, - EuiSwitch, + EuiCompressedSwitch, EuiText, PopoverAnchorPosition, } from '@elastic/eui'; @@ -122,8 +122,8 @@ export function QueryLanguageSwitcher(props: Props) { - - + - +
diff --git a/src/plugins/data/public/ui/query_string_input/query_bar_top_row.tsx b/src/plugins/data/public/ui/query_string_input/query_bar_top_row.tsx index c0ec95325a7..72b28830652 100644 --- a/src/plugins/data/public/ui/query_string_input/query_bar_top_row.tsx +++ b/src/plugins/data/public/ui/query_string_input/query_bar_top_row.tsx @@ -39,7 +39,7 @@ import { EuiFlexItem, EuiLink, EuiSuperDatePicker, - EuiFieldText, + EuiCompressedFieldText, prettyDuration, } from '@elastic/eui'; // @ts-ignore @@ -70,7 +70,7 @@ export interface QueryBarTopRowProps { screenTitle?: string; indexPatterns?: Array; isLoading?: boolean; - prepend?: React.ComponentProps['prepend']; + prepend?: React.ComponentProps['prepend']; showQueryInput?: boolean; showDatePicker?: boolean; dateRangeFrom?: string; diff --git a/src/plugins/data/public/ui/query_string_input/query_string_input.tsx b/src/plugins/data/public/ui/query_string_input/query_string_input.tsx index b2750e855b0..dbbaad9cc3d 100644 --- a/src/plugins/data/public/ui/query_string_input/query_string_input.tsx +++ b/src/plugins/data/public/ui/query_string_input/query_string_input.tsx @@ -33,7 +33,7 @@ import { i18n } from '@osd/i18n'; import classNames from 'classnames'; import { - EuiTextArea, + EuiCompressedTextArea, EuiOutsideClickDetector, PopoverAnchorPosition, EuiFlexGroup, @@ -642,7 +642,7 @@ export default class QueryStringInputUI extends Component { className="euiFormControlLayout__childrenWrapper osdQueryBar__textareaWrap" ref={this.queryBarInputDivRefInstance} > - { isInvalid={this.props.isInvalid} > {this.getQueryString()} - + - + {savedQueryDescriptionText} - - + - - + - - { @@ -195,10 +195,10 @@ export function SaveQueryForm({ }} data-test-subj="saveQueryFormDescription" /> - + {showFilterOption && ( - - + - + )} {showTimeFilterOption && ( - - + - + )} ); @@ -247,13 +247,13 @@ export function SaveQueryForm({ {saveQueryForm} - + {i18n.translate('data.search.searchBar.savedQueryFormCancelButtonText', { defaultMessage: 'Cancel', })} - + - + ); diff --git a/src/plugins/data/public/ui/saved_query_management/saved_query_management_component.tsx b/src/plugins/data/public/ui/saved_query_management/saved_query_management_component.tsx index da7c25254ad..77643ac6413 100644 --- a/src/plugins/data/public/ui/saved_query_management/saved_query_management_component.tsx +++ b/src/plugins/data/public/ui/saved_query_management/saved_query_management_component.tsx @@ -32,6 +32,7 @@ import { EuiPopover, EuiPopoverTitle, EuiPopoverFooter, + EuiSmallButtonEmpty, EuiButtonEmpty, EuiButton, EuiFlexGroup, @@ -171,7 +172,7 @@ export function SavedQueryManagementComponent({ }; const savedQueryPopoverButton = ( - - + ); const savedQueryRows = () => { diff --git a/src/plugins/data/public/ui/shard_failure_modal/__snapshots__/shard_failure_modal.test.tsx.snap b/src/plugins/data/public/ui/shard_failure_modal/__snapshots__/shard_failure_modal.test.tsx.snap index f7f3d1c1fbd..ef9d1f0fb92 100644 --- a/src/plugins/data/public/ui/shard_failure_modal/__snapshots__/shard_failure_modal.test.tsx.snap +++ b/src/plugins/data/public/ui/shard_failure_modal/__snapshots__/shard_failure_modal.test.tsx.snap @@ -173,7 +173,7 @@ exports[`ShardFailureModal renders matching snapshot given valid properties 1`] > - - + `; diff --git a/src/plugins/data/public/ui/shard_failure_modal/shard_failure_modal.tsx b/src/plugins/data/public/ui/shard_failure_modal/shard_failure_modal.tsx index 6c7ff95f29f..f4b7d1fd098 100644 --- a/src/plugins/data/public/ui/shard_failure_modal/shard_failure_modal.tsx +++ b/src/plugins/data/public/ui/shard_failure_modal/shard_failure_modal.tsx @@ -35,12 +35,12 @@ import { EuiCodeBlock, EuiTabbedContent, EuiCopy, - EuiButton, + EuiSmallButton, EuiModalBody, EuiModalHeader, EuiModalHeaderTitle, EuiModalFooter, - EuiButtonEmpty, + EuiSmallButtonEmpty, EuiCallOut, } from '@elastic/eui'; import { SearchResponse } from 'elasticsearch'; @@ -121,21 +121,21 @@ export function ShardFailureModal({ request, response, title, onClose }: Props) {(copy) => ( - + - + )} - onClose()} fill data-test-sub="closeShardFailureModal"> + onClose()} fill data-test-sub="closeShardFailureModal"> - + ); diff --git a/src/plugins/data/public/ui/shard_failure_modal/shard_failure_table.tsx b/src/plugins/data/public/ui/shard_failure_modal/shard_failure_table.tsx index 2414a409591..057a17c4a52 100644 --- a/src/plugins/data/public/ui/shard_failure_modal/shard_failure_table.tsx +++ b/src/plugins/data/public/ui/shard_failure_modal/shard_failure_table.tsx @@ -30,7 +30,7 @@ import React, { useState, ReactElement } from 'react'; // @ts-ignore -import { EuiInMemoryTable, EuiButtonIcon } from '@elastic/eui'; +import { EuiInMemoryTable, EuiSmallButtonIcon } from '@elastic/eui'; // @ts-ignore import { RIGHT_ALIGNMENT } from '@elastic/eui/lib/services'; import { i18n } from '@osd/i18n'; @@ -74,7 +74,7 @@ export function ShardFailureTable({ failures }: { failures: ShardFailure[] }) { ); return ( - { // toggle displaying the expanded view of the given list item const map = Object.assign({}, expandMap); diff --git a/src/plugins/data_source_management/public/components/create_button/__snapshots__/create_button.test.tsx.snap b/src/plugins/data_source_management/public/components/create_button/__snapshots__/create_button.test.tsx.snap index f0e2965c667..03c20a8093e 100644 --- a/src/plugins/data_source_management/public/components/create_button/__snapshots__/create_button.test.tsx.snap +++ b/src/plugins/data_source_management/public/components/create_button/__snapshots__/create_button.test.tsx.snap @@ -1,7 +1,7 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP exports[`CreateButton should render normally 1`] = ` - - + `; diff --git a/src/plugins/data_source_management/public/components/create_button/create_button.tsx b/src/plugins/data_source_management/public/components/create_button/create_button.tsx index 7c893af0209..303379a0c89 100644 --- a/src/plugins/data_source_management/public/components/create_button/create_button.tsx +++ b/src/plugins/data_source_management/public/components/create_button/create_button.tsx @@ -6,7 +6,7 @@ import React from 'react'; import { History } from 'history'; -import { EuiButton } from '@elastic/eui'; +import { EuiSmallButton } from '@elastic/eui'; import { FormattedMessage } from '@osd/i18n/react'; interface Props { @@ -17,7 +17,7 @@ interface Props { export const CreateButton = ({ history, isEmptyState, dataTestSubj }: Props) => { return ( - history.push('/create')} @@ -26,6 +26,6 @@ export const CreateButton = ({ history, isEmptyState, dataTestSubj }: Props) => id="dataSourcesManagement.dataSourceListing.createButton" defaultMessage="Create data source connection" /> - + ); }; diff --git a/src/plugins/data_source_management/public/components/create_data_source_wizard/components/create_form/__snapshots__/create_data_source_form.test.tsx.snap b/src/plugins/data_source_management/public/components/create_data_source_wizard/components/create_form/__snapshots__/create_data_source_form.test.tsx.snap index 2bb1bd8053d..be2a18192fe 100644 --- a/src/plugins/data_source_management/public/components/create_data_source_wizard/components/create_form/__snapshots__/create_data_source_form.test.tsx.snap +++ b/src/plugins/data_source_management/public/components/create_data_source_wizard/components/create_form/__snapshots__/create_data_source_form.test.tsx.snap @@ -1,8 +1,8 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP exports[`Datasource Management: Create Datasource form with different authType configurations should render normally with all authMethod combinations 1`] = ` -