diff --git a/examples/bfetch_explorer/public/components/page/index.tsx b/examples/bfetch_explorer/public/components/page/index.tsx index 76484dfd6903..fa3624a2d6e7 100644 --- a/examples/bfetch_explorer/public/components/page/index.tsx +++ b/examples/bfetch_explorer/public/components/page/index.tsx @@ -4,6 +4,9 @@ * The OpenSearch Contributors require contributions made to * this file be licensed under the Apache-2.0 license or a * compatible open source license. + * + * Modifications Copyright OpenSearch Contributors. See + * GitHub history for details. */ /* @@ -25,11 +28,6 @@ * under the License. */ -/* - * Modifications Copyright OpenSearch Contributors. See - * GitHub history for details. - */ - import * as React from 'react'; import { EuiPageBody, @@ -46,7 +44,7 @@ export interface PageProps { export const Page: React.FC = ({ title = 'Untitled', children }) => { return ( - + diff --git a/examples/embeddable_explorer/public/embeddable_panel_example.tsx b/examples/embeddable_explorer/public/embeddable_panel_example.tsx index 69d60056c260..556317a974fb 100644 --- a/examples/embeddable_explorer/public/embeddable_panel_example.tsx +++ b/examples/embeddable_explorer/public/embeddable_panel_example.tsx @@ -4,6 +4,9 @@ * The OpenSearch Contributors require contributions made to * this file be licensed under the Apache-2.0 license or a * compatible open source license. + * + * Modifications Copyright OpenSearch Contributors. See + * GitHub history for details. */ /* @@ -25,11 +28,6 @@ * under the License. */ -/* - * Modifications Copyright OpenSearch Contributors. See - * GitHub history for details. - */ - import React, { useState, useEffect, useRef } from 'react'; import { EuiPanel, @@ -140,7 +138,7 @@ export function EmbeddablePanelExample({ embeddableServices, searchListContainer }); return ( - + diff --git a/examples/embeddable_explorer/public/hello_world_embeddable_example.tsx b/examples/embeddable_explorer/public/hello_world_embeddable_example.tsx index 2e91fbdf9382..b356cee87030 100644 --- a/examples/embeddable_explorer/public/hello_world_embeddable_example.tsx +++ b/examples/embeddable_explorer/public/hello_world_embeddable_example.tsx @@ -4,6 +4,9 @@ * The OpenSearch Contributors require contributions made to * this file be licensed under the Apache-2.0 license or a * compatible open source license. + * + * Modifications Copyright OpenSearch Contributors. See + * GitHub history for details. */ /* @@ -25,11 +28,6 @@ * under the License. */ -/* - * Modifications Copyright OpenSearch Contributors. See - * GitHub history for details. - */ - import React from 'react'; import { EuiPageBody, @@ -53,7 +51,7 @@ interface Props { export function HelloWorldEmbeddableExample({ helloWorldEmbeddableFactory }: Props) { return ( - + diff --git a/examples/embeddable_explorer/public/list_container_example.tsx b/examples/embeddable_explorer/public/list_container_example.tsx index cd2eabbd68a2..cc7c695805d2 100644 --- a/examples/embeddable_explorer/public/list_container_example.tsx +++ b/examples/embeddable_explorer/public/list_container_example.tsx @@ -4,6 +4,9 @@ * The OpenSearch Contributors require contributions made to * this file be licensed under the Apache-2.0 license or a * compatible open source license. + * + * Modifications Copyright OpenSearch Contributors. See + * GitHub history for details. */ /* @@ -25,11 +28,6 @@ * under the License. */ -/* - * Modifications Copyright OpenSearch Contributors. See - * GitHub history for details. - */ - import React from 'react'; import { EuiPageBody, @@ -128,7 +126,7 @@ export function ListContainerExample({ }; return ( - + diff --git a/examples/embeddable_explorer/public/todo_embeddable_example.tsx b/examples/embeddable_explorer/public/todo_embeddable_example.tsx index 1fbddacbeb75..c4ec11b9e0b4 100644 --- a/examples/embeddable_explorer/public/todo_embeddable_example.tsx +++ b/examples/embeddable_explorer/public/todo_embeddable_example.tsx @@ -4,6 +4,9 @@ * The OpenSearch Contributors require contributions made to * this file be licensed under the Apache-2.0 license or a * compatible open source license. + * + * Modifications Copyright OpenSearch Contributors. See + * GitHub history for details. */ /* @@ -25,11 +28,6 @@ * under the License. */ -/* - * Modifications Copyright OpenSearch Contributors. See - * GitHub history for details. - */ - import React from 'react'; import { EuiButton, @@ -85,7 +83,7 @@ export class TodoEmbeddableExample extends React.Component { public render() { return ( - + diff --git a/examples/routing_example/public/app.tsx b/examples/routing_example/public/app.tsx index 2df5dd4c5950..dbc206884b3a 100644 --- a/examples/routing_example/public/app.tsx +++ b/examples/routing_example/public/app.tsx @@ -4,6 +4,9 @@ * The OpenSearch Contributors require contributions made to * this file be licensed under the Apache-2.0 license or a * compatible open source license. + * + * Modifications Copyright OpenSearch Contributors. See + * GitHub history for details. */ /* @@ -25,11 +28,6 @@ * under the License. */ -/* - * Modifications Copyright OpenSearch Contributors. See - * GitHub history for details. - */ - import React from 'react'; import ReactDOM from 'react-dom'; import { AppMountParameters } from 'opensearch-dashboards/public'; @@ -59,7 +57,7 @@ function RoutingExplorer({ }: Props) { return ( - + diff --git a/examples/search_examples/public/components/app.tsx b/examples/search_examples/public/components/app.tsx index 837dabb5dd98..16d0d6d6b4aa 100644 --- a/examples/search_examples/public/components/app.tsx +++ b/examples/search_examples/public/components/app.tsx @@ -4,6 +4,9 @@ * The OpenSearch Contributors require contributions made to * this file be licensed under the Apache-2.0 license or a * compatible open source license. + * + * Modifications Copyright OpenSearch Contributors. See + * GitHub history for details. */ /* @@ -25,11 +28,6 @@ * under the License. */ -/* - * Modifications Copyright OpenSearch Contributors. See - * GitHub history for details. - */ - import React, { useState, useEffect } from 'react'; import { i18n } from '@osd/i18n'; import { FormattedMessage, I18nProvider } from '@osd/i18n/react'; @@ -226,7 +224,7 @@ export const SearchExamplesApp = ({ indexPatterns={indexPattern ? [indexPattern] : undefined} /> - +

diff --git a/examples/state_containers_examples/public/todo/todo.tsx b/examples/state_containers_examples/public/todo/todo.tsx index 120331e28a26..2e85b98a8458 100644 --- a/examples/state_containers_examples/public/todo/todo.tsx +++ b/examples/state_containers_examples/public/todo/todo.tsx @@ -4,6 +4,9 @@ * The OpenSearch Contributors require contributions made to * this file be licensed under the Apache-2.0 license or a * compatible open source license. + * + * Modifications Copyright OpenSearch Contributors. See + * GitHub history for details. */ /* @@ -25,11 +28,6 @@ * under the License. */ -/* - * Modifications Copyright OpenSearch Contributors. See - * GitHub history for details. - */ - import React, { useEffect } from 'react'; import { Link, Route, Router, Switch, useLocation } from 'react-router-dom'; import { History } from 'history'; @@ -289,7 +287,7 @@ export const TodoAppPage: React.FC<{ - + diff --git a/examples/state_containers_examples/public/with_data_services/components/app.tsx b/examples/state_containers_examples/public/with_data_services/components/app.tsx index bacccfccfd4d..1359f518fa03 100644 --- a/examples/state_containers_examples/public/with_data_services/components/app.tsx +++ b/examples/state_containers_examples/public/with_data_services/components/app.tsx @@ -4,6 +4,9 @@ * The OpenSearch Contributors require contributions made to * this file be licensed under the Apache-2.0 license or a * compatible open source license. + * + * Modifications Copyright OpenSearch Contributors. See + * GitHub history for details. */ /* @@ -25,11 +28,6 @@ * under the License. */ -/* - * Modifications Copyright OpenSearch Contributors. See - * GitHub history for details. - */ - import React, { useEffect, useRef, useState } from 'react'; import { History } from 'history'; import { FormattedMessage, I18nProvider } from '@osd/i18n/react'; @@ -116,7 +114,7 @@ const App = ({ navigation, data, history, osdUrlStateStorage }: StateDemoAppDeps showSaveQuery={true} /> - +

diff --git a/examples/ui_actions_explorer/public/app.tsx b/examples/ui_actions_explorer/public/app.tsx index 88f4abbf1d52..7705470577c0 100644 --- a/examples/ui_actions_explorer/public/app.tsx +++ b/examples/ui_actions_explorer/public/app.tsx @@ -4,6 +4,9 @@ * The OpenSearch Contributors require contributions made to * this file be licensed under the Apache-2.0 license or a * compatible open source license. + * + * Modifications Copyright OpenSearch Contributors. See + * GitHub history for details. */ /* @@ -25,11 +28,6 @@ * under the License. */ -/* - * Modifications Copyright OpenSearch Contributors. See - * GitHub history for details. - */ - import React, { useState } from 'react'; import ReactDOM from 'react-dom'; @@ -62,7 +60,7 @@ const ActionsExplorer = ({ uiActionsApi, openModal }: Props) => { const [confirmationText, setConfirmationText] = useState(''); return ( - + Ui Actions Explorer diff --git a/examples/ui_actions_explorer/public/page.tsx b/examples/ui_actions_explorer/public/page.tsx index 4433fd353256..559abd2593d4 100644 --- a/examples/ui_actions_explorer/public/page.tsx +++ b/examples/ui_actions_explorer/public/page.tsx @@ -4,6 +4,9 @@ * The OpenSearch Contributors require contributions made to * this file be licensed under the Apache-2.0 license or a * compatible open source license. + * + * Modifications Copyright OpenSearch Contributors. See + * GitHub history for details. */ /* @@ -25,11 +28,6 @@ * under the License. */ -/* - * Modifications Copyright OpenSearch Contributors. See - * GitHub history for details. - */ - import React from 'react'; import { @@ -48,7 +46,7 @@ interface PageProps { export function Page({ title, children }: PageProps) { return ( - + diff --git a/examples/url_generators_examples/public/app.tsx b/examples/url_generators_examples/public/app.tsx index ea54e62d7c14..b3f26d474da3 100644 --- a/examples/url_generators_examples/public/app.tsx +++ b/examples/url_generators_examples/public/app.tsx @@ -4,6 +4,9 @@ * The OpenSearch Contributors require contributions made to * this file be licensed under the Apache-2.0 license or a * compatible open source license. + * + * Modifications Copyright OpenSearch Contributors. See + * GitHub history for details. */ /* @@ -25,11 +28,6 @@ * under the License. */ -/* - * Modifications Copyright OpenSearch Contributors. See - * GitHub history for details. - */ - import React from 'react'; import ReactDOM from 'react-dom'; @@ -60,7 +58,7 @@ export const Routes: React.FC<{}> = () => { const query = useQuery(); return ( - + diff --git a/examples/url_generators_explorer/public/app.tsx b/examples/url_generators_explorer/public/app.tsx index 9f81cfc14983..7f3a5fcd898a 100644 --- a/examples/url_generators_explorer/public/app.tsx +++ b/examples/url_generators_explorer/public/app.tsx @@ -4,6 +4,9 @@ * The OpenSearch Contributors require contributions made to * this file be licensed under the Apache-2.0 license or a * compatible open source license. + * + * Modifications Copyright OpenSearch Contributors. See + * GitHub history for details. */ /* @@ -25,11 +28,6 @@ * under the License. */ -/* - * Modifications Copyright OpenSearch Contributors. See - * GitHub history for details. - */ - import React, { useState, useEffect } from 'react'; import ReactDOM from 'react-dom'; @@ -113,7 +111,7 @@ const ActionsExplorer = ({ getLinkGenerator }: Props) => { return ( - + Access links explorer diff --git a/examples/url_generators_explorer/public/page.tsx b/examples/url_generators_explorer/public/page.tsx index 4433fd353256..559abd2593d4 100644 --- a/examples/url_generators_explorer/public/page.tsx +++ b/examples/url_generators_explorer/public/page.tsx @@ -4,6 +4,9 @@ * The OpenSearch Contributors require contributions made to * this file be licensed under the Apache-2.0 license or a * compatible open source license. + * + * Modifications Copyright OpenSearch Contributors. See + * GitHub history for details. */ /* @@ -25,11 +28,6 @@ * under the License. */ -/* - * Modifications Copyright OpenSearch Contributors. See - * GitHub history for details. - */ - import React from 'react'; import { @@ -48,7 +46,7 @@ interface PageProps { export function Page({ title, children }: PageProps) { return ( - + diff --git a/package.json b/package.json index d34f798cfee1..8dfc00a75576 100644 --- a/package.json +++ b/package.json @@ -115,7 +115,7 @@ "dependencies": { "@elastic/datemath": "5.0.3", "@elastic/elasticsearch": "7.10.0-rc.1", - "@elastic/eui": "29.3.2", + "@elastic/eui": "34.6.0", "@elastic/good": "^9.0.1-kibana3", "@elastic/numeral": "^2.5.0", "@elastic/request-crypto": "2.0.0", @@ -219,7 +219,7 @@ "@babel/register": "^7.16.5", "@babel/types": "^7.16.0", "@elastic/apm-rum": "^5.6.1", - "@elastic/charts": "23.2.2", + "@elastic/charts": "31.1.0", "@elastic/ems-client": "7.10.0", "@elastic/eslint-config-kibana": "0.15.0", "@elastic/eslint-plugin-eui": "0.0.2", 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 9f29b4fa6969..876b3f8c5e75 100644 --- a/packages/osd-plugin-generator/template/public/components/app.tsx.ejs +++ b/packages/osd-plugin-generator/template/public/components/app.tsx.ejs @@ -58,7 +58,7 @@ import { CoreStart } from '<%= importFromRoot('src/core/public') %>'; - +

@@ -101,4 +101,4 @@ import { CoreStart } from '<%= importFromRoot('src/core/public') %>'; ); - }; \ No newline at end of file + }; diff --git a/packages/osd-ui-framework/package.json b/packages/osd-ui-framework/package.json index 5ee583ba1295..2ca58fea8d89 100644 --- a/packages/osd-ui-framework/package.json +++ b/packages/osd-ui-framework/package.json @@ -24,7 +24,7 @@ "enzyme-adapter-react-16": "^1.9.1" }, "devDependencies": { - "@elastic/eui": "29.3.2", + "@elastic/eui": "34.6.0", "@osd/babel-preset": "1.0.0", "@osd/optimizer": "1.0.0", "babel-loader": "^8.2.3", diff --git a/packages/osd-ui-shared-deps/package.json b/packages/osd-ui-shared-deps/package.json index 3ccf33a624fb..5b155d40ff4b 100644 --- a/packages/osd-ui-shared-deps/package.json +++ b/packages/osd-ui-shared-deps/package.json @@ -9,8 +9,8 @@ "osd:watch": "node scripts/build --dev --watch" }, "dependencies": { - "@elastic/charts": "23.2.2", - "@elastic/eui": "29.3.2", + "@elastic/charts": "31.1.0", + "@elastic/eui": "34.6.0", "@elastic/numeral": "^2.5.0", "@osd/i18n": "1.0.0", "@osd/monaco": "1.0.0", diff --git a/src/core/public/application/ui/app_not_found_screen.tsx b/src/core/public/application/ui/app_not_found_screen.tsx index da39d5273393..1df917b98c28 100644 --- a/src/core/public/application/ui/app_not_found_screen.tsx +++ b/src/core/public/application/ui/app_not_found_screen.tsx @@ -4,6 +4,9 @@ * The OpenSearch Contributors require contributions made to * this file be licensed under the Apache-2.0 license or a * compatible open source license. + * + * Modifications Copyright OpenSearch Contributors. See + * GitHub history for details. */ /* @@ -25,18 +28,13 @@ * under the License. */ -/* - * Modifications Copyright OpenSearch Contributors. See - * GitHub history for details. - */ - import { EuiEmptyPrompt, EuiPage, EuiPageBody, EuiPageContent } from '@elastic/eui'; import React from 'react'; import { FormattedMessage } from '@osd/i18n/react'; export const AppNotFound = () => ( - + - - - - } - /> - - -
-
+ + +
+ + +
-
-
-
- - - -
+ className="euiListGroupItem__icon" + color="inherit" + data-euiicon-type="home" + /> + + + Home + + + + + +
- -
- - + +
+ + + + + +

+ Recently viewed +

+ + + + } + className="euiCollapsibleNavGroup euiCollapsibleNavGroup--light euiCollapsibleNavGroup--withHeading" data-test-subj="collapsibleNavGroup-recentlyViewed" + id="mockId" initialIsOpen={true} - isCollapsible={true} - key="recentlyViewed" + isLoading={false} + isLoadingMessage={false} onToggle={[Function]} - title="Recently viewed" + paddingSize="none" > - - - -

- Recently viewed -

- - - - } - className="euiCollapsibleNavGroup euiCollapsibleNavGroup--light euiCollapsibleNavGroup--withHeading" +
-
- -
-
+ +
+ +
+ + + +
+
+ - -
+
+
-
- - - -
+ recent 2 + + + + + +
- -
+
+
- - - -
- - + + + +
+ + +
-
- + + + + + +

+ OpenSearch Dashboards +

+ + + + } + className="euiCollapsibleNavGroup euiCollapsibleNavGroup--withHeading" data-test-opensearch-logo="/defaultModeLogo" data-test-subj="collapsibleNavGroup-opensearchDashboards" - iconType="/defaultModeLogo" + id="mockId" initialIsOpen={true} - isCollapsible={true} - key="opensearchDashboards" + isLoading={false} + isLoadingMessage={false} onToggle={[Function]} - title="OpenSearch Dashboards" + paddingSize="none" > - - - - - - -

- OpenSearch Dashboards -

- - - - } - className="euiCollapsibleNavGroup euiCollapsibleNavGroup--withHeading" +
-
- -
-
+ +
+ +
+ + + +
+
+ - -
+
+
-
- - - -
+ dashboard + + + + + +
- -
+
+
- - - + + + + + + + + + +

+ Observability +

+ + + + } + className="euiCollapsibleNavGroup euiCollapsibleNavGroup--withHeading" data-test-opensearch-logo="logoObservability" data-test-subj="collapsibleNavGroup-observability" - iconType="logoObservability" + id="mockId" initialIsOpen={true} - isCollapsible={true} - key="observability" + isLoading={false} + isLoadingMessage={false} onToggle={[Function]} - title="Observability" + paddingSize="none" > - - - - - - -

- Observability -

- - - - } - className="euiCollapsibleNavGroup euiCollapsibleNavGroup--withHeading" +
-
- -
-
+ +
+ +
+ + + +
+
+ - -
+
+
-
- - - -
+ logs + + + + + +
- -
+
+
- - - + + + + + + + + + +

+ Security +

+ + + + } + className="euiCollapsibleNavGroup euiCollapsibleNavGroup--withHeading" data-test-opensearch-logo="logoSecurity" data-test-subj="collapsibleNavGroup-securitySolution" - iconType="logoSecurity" + id="mockId" initialIsOpen={true} - isCollapsible={true} - key="securitySolution" + isLoading={false} + isLoadingMessage={false} onToggle={[Function]} - title="Security" + paddingSize="none" > - - - - - - -

- Security -

- - - - } - className="euiCollapsibleNavGroup euiCollapsibleNavGroup--withHeading" +
-
- -
-
+ +
+ +
+ + + +
+
+ - -
+
+
-
- - - -
+ siem + + + + + +
- -
+
+
- - - + + + + + + + + + +

+ Management +

+ + + + } + className="euiCollapsibleNavGroup euiCollapsibleNavGroup--withHeading" data-test-opensearch-logo="managementApp" data-test-subj="collapsibleNavGroup-management" - iconType="managementApp" + id="mockId" initialIsOpen={true} - isCollapsible={true} - key="management" + isLoading={false} + isLoadingMessage={false} onToggle={[Function]} - title="Management" + paddingSize="none" > - - - - - - -

- Management -

- - - - } - className="euiCollapsibleNavGroup euiCollapsibleNavGroup--withHeading" +
-
- -
-
+ +
+ +
+ + + +
+
+ - -
+
+
-
- - - -
+ monitoring + + + + + +
- -
+
+
- - - + + + +
+
+ + + +
+
+ + +
+ + + Dock navigation + + , + } + } + color="subdued" + data-test-subj="collapsible-nav-lock" + iconType="lockOpen" + label="Dock navigation" onClick={[Function]} - size="s" + size="xs" >
  • - + + + - canvas + Dock navigation - +
    • @@ -1889,157 +1994,11 @@ exports[`CollapsibleNav renders links grouped by category 1`] = `
    - - -
    -
    - -
      - -
      - - Dock navigation - - , - } - } - color="subdued" - data-test-subj="collapsible-nav-lock" - iconType="lockOpen" - label="Dock navigation" - onClick={[Function]} - size="xs" - > -
    • - -
      • - -
    -     -
    -
    -     -     -
    - - - - - - - -
    -     + + + + + `; @@ -2775,42 +2734,57 @@ exports[`CollapsibleNav renders the default nav 3`] = ` isOpen={false} onClose={[Function]} > - - -
    -
    + + + + + +

    + Recently viewed +

    +     +     + + } + className="euiCollapsibleNavGroup euiCollapsibleNavGroup--light euiCollapsibleNavGroup--withHeading" data-test-subj="collapsibleNavGroup-recentlyViewed" + id="mockId" initialIsOpen={true} - isCollapsible={true} - key="recentlyViewed" + isLoading={false} + isLoadingMessage={false} onToggle={[Function]} - title="Recently viewed" + paddingSize="none" > - - - -

    - Recently viewed -

    -     -     - - } - className="euiCollapsibleNavGroup euiCollapsibleNavGroup--light euiCollapsibleNavGroup--withHeading" +
    -
    - -
    -
    + +
    + +
    + + + +
    +
    + - -
    +
    +
    -
    - -
    - -
    -

    - No recently viewed items -

    -
    -     -
    -     -
    +

    + No recently viewed items +

    +
    + +
    +
    -     -
    + + -     -     - -
    -     - + + + +
    +     + +
    -
    - - + +
    -
    - -
      - -
      - - Undock navigation - - , - } - } - color="subdued" - data-test-subj="collapsible-nav-lock" - iconType="lock" - label="Undock navigation" - onClick={[Function]} - size="xs" - > -
    • - -
      • - -
    -     -
    + , + } + } + color="subdued" + data-test-subj="collapsible-nav-lock" + iconType="lock" + label="Undock navigation" + onClick={[Function]} + size="xs" + > +
  • + +
    • + + +
    - - -
    - - - - - - - -
    - +
    + + + +     + + `; @@ -3501,54 +3414,62 @@ exports[`CollapsibleNav renders the nav bar with custom logo in dark mode 1`] = isOpen={true} onClose={[Function]} > - - - - } - /> - - -
    -
    +     + + + + +

    + Recently viewed +

    +     +     + + } + className="euiCollapsibleNavGroup euiCollapsibleNavGroup--light euiCollapsibleNavGroup--withHeading" data-test-subj="collapsibleNavGroup-recentlyViewed" + id="mockId" initialIsOpen={true} - isCollapsible={true} - key="recentlyViewed" + isLoading={false} + isLoadingMessage={false} onToggle={[Function]} - title="Recently viewed" + paddingSize="none" > - - - -

    - Recently viewed -

    -     -     - - } - className="euiCollapsibleNavGroup euiCollapsibleNavGroup--light euiCollapsibleNavGroup--withHeading" +
    -
    - -
    -
    + +
    + +
    + + + +
    +
    + - -
    +
    +
    -
    - - - -
    + recent + + + + + +
    - -
    +
    +
    -     -     - -
    -     - + + + +
    +     + +
    -
    - + + + + + +

    + OpenSearch Dashboards +

    +     +     + + } + className="euiCollapsibleNavGroup euiCollapsibleNavGroup--withHeading" data-test-opensearch-logo="/darkModeLogo" data-test-subj="collapsibleNavGroup-opensearchDashboards" - iconType="/darkModeLogo" + id="mockId" initialIsOpen={true} - isCollapsible={true} - key="opensearchDashboards" + isLoading={false} + isLoadingMessage={false} onToggle={[Function]} - title="OpenSearch Dashboards" + paddingSize="none" > - - - - - - -

    - OpenSearch Dashboards -

    -     -     - - } - className="euiCollapsibleNavGroup euiCollapsibleNavGroup--withHeading" +
    -
    - -
    -
    + +
    + +
    + + + +
    +
    + - -
    +
    +
    -
    - - - -
    + discover + + + + + +
    - -
    +
    +
    -     -     - + + + + + + + + + +

    + Observability +

    +     +     + + } + className="euiCollapsibleNavGroup euiCollapsibleNavGroup--withHeading" data-test-opensearch-logo="logoObservability" data-test-subj="collapsibleNavGroup-observability" - iconType="logoObservability" + id="mockId" initialIsOpen={true} - isCollapsible={true} - key="observability" + isLoading={false} + isLoadingMessage={false} onToggle={[Function]} - title="Observability" + paddingSize="none" > - - - - - - -

    - Observability -

    -     -     - - } - className="euiCollapsibleNavGroup euiCollapsibleNavGroup--withHeading" +
    -
    - -
    -
    + +
    + +
    + + + +
    +
    + - -
    +
    +
    -
    - - - -
    + discover + + + + + +
    - -
    +
    +
    -     -     - - +
    + + + + +
    -
    - -
      - -
      - - Dock navigation - - , - } - } - color="subdued" - data-test-subj="collapsible-nav-lock" - iconType="lockOpen" - label="Dock navigation" - onClick={[Function]} - size="xs" - > -
    • - -
      • - -
    -     -
    + , + } + } + color="subdued" + data-test-subj="collapsible-nav-lock" + iconType="lockOpen" + label="Dock navigation" + onClick={[Function]} + size="xs" + > +
  • + +
    • + + +
    - - -
    - - - - - - - -
    -     + + + + + + + `; @@ -4702,54 +4568,62 @@ exports[`CollapsibleNav renders the nav bar with custom logo in dark mode 2`] = isOpen={true} onClose={[Function]} > - - - - } - /> - - -
    -
    + + + + + +

    + Recently viewed +

    +     +     + + } + className="euiCollapsibleNavGroup euiCollapsibleNavGroup--light euiCollapsibleNavGroup--withHeading" data-test-subj="collapsibleNavGroup-recentlyViewed" + id="mockId" initialIsOpen={true} - isCollapsible={true} - key="recentlyViewed" + isLoading={false} + isLoadingMessage={false} onToggle={[Function]} - title="Recently viewed" + paddingSize="none" > - - - -

    - Recently viewed -

    -     -     - - } - className="euiCollapsibleNavGroup euiCollapsibleNavGroup--light euiCollapsibleNavGroup--withHeading" +
    -
    - -
    -
    + +
    + +
    + + + +
    +
    + - -
    +
    +
    -
    - - - -
    + recent + + + + + +
    - -
    +
    +
    -     -     - -
    -     - + + + +
    +     + +
    -
    - + + + + + +

    + OpenSearch Dashboards +

    +     +     + + } + className="euiCollapsibleNavGroup euiCollapsibleNavGroup--withHeading" data-test-opensearch-logo="/defaultModeLogo" data-test-subj="collapsibleNavGroup-opensearchDashboards" - iconType="/defaultModeLogo" + id="mockId" initialIsOpen={true} - isCollapsible={true} - key="opensearchDashboards" + isLoading={false} + isLoadingMessage={false} onToggle={[Function]} - title="OpenSearch Dashboards" + paddingSize="none" > - - - - - - -

    - OpenSearch Dashboards -

    -     -     - - } - className="euiCollapsibleNavGroup euiCollapsibleNavGroup--withHeading" +
    -
    - -
    -
    + +
    + +
    + + + +
    +
    + - -
    +
    +
    -
    - - - -
    + discover + + + + + +
    - -
    +
    +
    -     -     - + + + + + + + + + +

    + Observability +

    +     +     + + } + className="euiCollapsibleNavGroup euiCollapsibleNavGroup--withHeading" data-test-opensearch-logo="logoObservability" data-test-subj="collapsibleNavGroup-observability" - iconType="logoObservability" + id="mockId" initialIsOpen={true} - isCollapsible={true} - key="observability" + isLoading={false} + isLoadingMessage={false} onToggle={[Function]} - title="Observability" + paddingSize="none" > - - - - - - -

    - Observability -

    -     -     - - } - className="euiCollapsibleNavGroup euiCollapsibleNavGroup--withHeading" +
    -
    - -
    -
    + +
    + +
    + + + +
    +
    + - -
    +
    +
    -
    - - - -
    + discover + + + + + +
    - -
    +
    +
    -     -     - - +
    + + + + +
    -
    - -
      - -
      - - Dock navigation - - , - } - } - color="subdued" - data-test-subj="collapsible-nav-lock" - iconType="lockOpen" - label="Dock navigation" - onClick={[Function]} - size="xs" - > -
    • - -
      • - -
    -     -
    -
    - - -
    - - - - - - - -
    -     + , + } + } + color="subdued" + data-test-subj="collapsible-nav-lock" + iconType="lockOpen" + label="Dock navigation" + onClick={[Function]} + size="xs" + > +
  • + +
    • + + + + + + + + + + + `; @@ -5901,54 +5720,62 @@ exports[`CollapsibleNav renders the nav bar with custom logo in dark mode 3`] = isOpen={true} onClose={[Function]} > - - - - } - /> - - -
    -
    + + + + + +

    + Recently viewed +

    +     +     + + } + className="euiCollapsibleNavGroup euiCollapsibleNavGroup--light euiCollapsibleNavGroup--withHeading" data-test-subj="collapsibleNavGroup-recentlyViewed" + id="mockId" initialIsOpen={true} - isCollapsible={true} - key="recentlyViewed" + isLoading={false} + isLoadingMessage={false} onToggle={[Function]} - title="Recently viewed" + paddingSize="none" > - - - -

    - Recently viewed -

    -     -     - - } - className="euiCollapsibleNavGroup euiCollapsibleNavGroup--light euiCollapsibleNavGroup--withHeading" +
    -
    - -
    -
    + +
    + +
    + + + +
    +
    + - -
    +
    +
    -
    - - - -
    + recent + + + + + +
    - -
    +
    +
    -     -     - -
    -     - + + + +
    +     + +
    -
    - + + + + + +

    + OpenSearch Dashboards +

    +     +     + + } + className="euiCollapsibleNavGroup euiCollapsibleNavGroup--withHeading" data-test-opensearch-logo="undefined/opensearch_mark_default_mode.svg" data-test-subj="collapsibleNavGroup-opensearchDashboards" - iconType="undefined/opensearch_mark_default_mode.svg" + id="mockId" initialIsOpen={true} - isCollapsible={true} - key="opensearchDashboards" + isLoading={false} + isLoadingMessage={false} onToggle={[Function]} - title="OpenSearch Dashboards" + paddingSize="none" > - - - - - - -

    - OpenSearch Dashboards -

    -     -     - - } - className="euiCollapsibleNavGroup euiCollapsibleNavGroup--withHeading" +
    -
    - -
    -
    + +
    + +
    + + + +
    +
    + - -
    +
    +
    -
    - - - -
    + discover + + + + + +
    - -
    +
    +
    -     -     - + + + + + + + + + +

    + Observability +

    +     +     + + } + className="euiCollapsibleNavGroup euiCollapsibleNavGroup--withHeading" data-test-opensearch-logo="logoObservability" data-test-subj="collapsibleNavGroup-observability" - iconType="logoObservability" + id="mockId" initialIsOpen={true} - isCollapsible={true} - key="observability" + isLoading={false} + isLoadingMessage={false} onToggle={[Function]} - title="Observability" + paddingSize="none" > - - - - - - -

    - Observability -

    -     -     - - } - className="euiCollapsibleNavGroup euiCollapsibleNavGroup--withHeading" +
    -
    - -
    -
    + +
    + +
    + + + +
    +
    + - -
    +
    +
    -
    - - - -
    + discover + + + + + +
    - -
    +
    +
    -     -     - - +
    + + + + +
    -
    - -
      - -
      - - Dock navigation - - , - } - } - color="subdued" - data-test-subj="collapsible-nav-lock" - iconType="lockOpen" - label="Dock navigation" - onClick={[Function]} - size="xs" - > -
    • - -
      • - -
    -     -
    + , + } + } + color="subdued" + data-test-subj="collapsible-nav-lock" + iconType="lockOpen" + label="Dock navigation" + onClick={[Function]} + size="xs" + > +
  • + +
    • + + +
    - - -
    - - - - - - - -
    -     + + + + + + + `; @@ -7103,54 +6875,62 @@ exports[`CollapsibleNav renders the nav bar with custom logo in default mode 1`] isOpen={true} onClose={[Function]} > - - - - } - /> - - -
    -
    + + + + + +

    + Recently viewed +

    +     +     + + } + className="euiCollapsibleNavGroup euiCollapsibleNavGroup--light euiCollapsibleNavGroup--withHeading" data-test-subj="collapsibleNavGroup-recentlyViewed" + id="mockId" initialIsOpen={true} - isCollapsible={true} - key="recentlyViewed" + isLoading={false} + isLoadingMessage={false} onToggle={[Function]} - title="Recently viewed" + paddingSize="none" > - - - -

    - Recently viewed -

    -     -     - - } - className="euiCollapsibleNavGroup euiCollapsibleNavGroup--light euiCollapsibleNavGroup--withHeading" +
    -
    - -
    -
    + +
    + +
    + + + +
    +
    + - -
    +
    +
    -
    - - - -
    + recent + + + + + +
    - -
    +
    +
    -     -     - -
    -     - + + + +
    +     + +
    -
    - + + + + + +

    + OpenSearch Dashboards +

    +     +     + + } + className="euiCollapsibleNavGroup euiCollapsibleNavGroup--withHeading" data-test-opensearch-logo="/defaultModeLogo" data-test-subj="collapsibleNavGroup-opensearchDashboards" - iconType="/defaultModeLogo" + id="mockId" initialIsOpen={true} - isCollapsible={true} - key="opensearchDashboards" + isLoading={false} + isLoadingMessage={false} onToggle={[Function]} - title="OpenSearch Dashboards" + paddingSize="none" > - - - - - - -

    - OpenSearch Dashboards -

    -     -     - - } - className="euiCollapsibleNavGroup euiCollapsibleNavGroup--withHeading" +
    -
    - -
    -
    + +
    + +
    + + + +
    +
    + - -
    +
    +
    -
    - - - -
    + discover + + + + + +
    - -
    +
    +
    -     -     - + + + + + + + + + +

    + Observability +

    +     +     + + } + className="euiCollapsibleNavGroup euiCollapsibleNavGroup--withHeading" data-test-opensearch-logo="logoObservability" data-test-subj="collapsibleNavGroup-observability" - iconType="logoObservability" + id="mockId" initialIsOpen={true} - isCollapsible={true} - key="observability" + isLoading={false} + isLoadingMessage={false} onToggle={[Function]} - title="Observability" + paddingSize="none" > - - - - - - -

    - Observability -

    -     -     - - } - className="euiCollapsibleNavGroup euiCollapsibleNavGroup--withHeading" +
    -
    - -
    -
    + +
    + +
    + + + +
    +
    + - -
    +
    +
    -
    - - - -
    + discover + + + + + +
    - -
    +
    +
    -     -     - - +
    + + + + +
    -
    - -
      - -
      - - Dock navigation - - , - } - } - color="subdued" - data-test-subj="collapsible-nav-lock" - iconType="lockOpen" - label="Dock navigation" - onClick={[Function]} - size="xs" - > -
    • - -
      • - -
    -     -
    + , + } + } + color="subdued" + data-test-subj="collapsible-nav-lock" + iconType="lockOpen" + label="Dock navigation" + onClick={[Function]} + size="xs" + > +
  • + +
    • + + +
    - - -
    - - - - - - - -
    -     + + + + + + + `; @@ -8302,54 +8027,62 @@ exports[`CollapsibleNav renders the nav bar with custom logo in default mode 2`] isOpen={true} onClose={[Function]} > - - - - } - /> - - -
    -
    + + + + + +

    + Recently viewed +

    +     +     + + } + className="euiCollapsibleNavGroup euiCollapsibleNavGroup--light euiCollapsibleNavGroup--withHeading" data-test-subj="collapsibleNavGroup-recentlyViewed" + id="mockId" initialIsOpen={true} - isCollapsible={true} - key="recentlyViewed" + isLoading={false} + isLoadingMessage={false} onToggle={[Function]} - title="Recently viewed" + paddingSize="none" > - - - -

    - Recently viewed -

    -     -     - - } - className="euiCollapsibleNavGroup euiCollapsibleNavGroup--light euiCollapsibleNavGroup--withHeading" +
    -
    - -
    -
    + +
    + +
    + + + +
    +
    + - -
    +
    +
    -
    - - - -
    + recent + + + + + +
    - -
    +
    +
    -     -     - -
    -     - + + + +
    +     + +
    -
    - + + + + + +

    + OpenSearch Dashboards +

    +     +     + + } + className="euiCollapsibleNavGroup euiCollapsibleNavGroup--withHeading" data-test-opensearch-logo="undefined/opensearch_mark_default_mode.svg" data-test-subj="collapsibleNavGroup-opensearchDashboards" - iconType="undefined/opensearch_mark_default_mode.svg" + id="mockId" initialIsOpen={true} - isCollapsible={true} - key="opensearchDashboards" + isLoading={false} + isLoadingMessage={false} onToggle={[Function]} - title="OpenSearch Dashboards" + paddingSize="none" > - - - - - - -

    - OpenSearch Dashboards -

    -     -     - - } - className="euiCollapsibleNavGroup euiCollapsibleNavGroup--withHeading" +
    -
    - -
    -
    + +
    + +
    + + + +
    +
    + - -
    +
    +
    -
    - - - -
    + discover + + + + + +
    - -
    +
    +
    -     -     - + + + + + + + + + +

    + Observability +

    +     +     + + } + className="euiCollapsibleNavGroup euiCollapsibleNavGroup--withHeading" data-test-opensearch-logo="logoObservability" data-test-subj="collapsibleNavGroup-observability" - iconType="logoObservability" + id="mockId" initialIsOpen={true} - isCollapsible={true} - key="observability" + isLoading={false} + isLoadingMessage={false} onToggle={[Function]} - title="Observability" + paddingSize="none" > - - - - - - -

    - Observability -

    -     -     - - } - className="euiCollapsibleNavGroup euiCollapsibleNavGroup--withHeading" +
    -
    - -
    -
    + +
    + +
    + + + +
    +
    + - -
    +
    +
    -
    - - - -
    + discover + + + + + +
    - -
    +
    +
    -     -     - - +
    + + + + +
    -
    - -
      - -
      - - Dock navigation - - , - } - } - color="subdued" - data-test-subj="collapsible-nav-lock" - iconType="lockOpen" - label="Dock navigation" - onClick={[Function]} - size="xs" - > -
    • - -
      • - -
    -     -
    + , + } + } + color="subdued" + data-test-subj="collapsible-nav-lock" + iconType="lockOpen" + label="Dock navigation" + onClick={[Function]} + size="xs" + > +
  • + +
    • + + +
    - - -
    - - - - - - - -
    -     + + + + + + + `; diff --git a/src/core/public/chrome/ui/header/__snapshots__/header.test.tsx.snap b/src/core/public/chrome/ui/header/__snapshots__/header.test.tsx.snap index 5ad89191b0c9..e75f736fbb15 100644 --- a/src/core/public/chrome/ui/header/__snapshots__/header.test.tsx.snap +++ b/src/core/public/chrome/ui/header/__snapshots__/header.test.tsx.snap @@ -4709,51 +4709,101 @@ exports[`Header renders 1`] = ` panelPaddingSize="m" repositionOnScroll={true} > -
    -
    - + + + + + + + + , + } + } + className="euiHeaderSectionItemButton" + color="text" onClick={[Function]} > - -
    + +
    -     + @@ -4850,26 +4900,90 @@ exports[`Header renders 1`] = ` data-test-subj="toggleNavButton" onClick={[Function]} > - , + } + } + className="euiHeaderSectionItemButton" + color="text" data-test-subj="toggleNavButton" onClick={[Function]} - type="button" > - -
    - - + + + + + + + + + + + + +
    @@ -5493,42 +5607,57 @@ exports[`Header renders 1`] = ` isOpen={false} onClose={[Function]} > - - -
    -
    + + +
    +     + +
    -
    -
    -
    - - - -
    + className="euiListGroupItem__icon" + color="inherit" + data-euiicon-type="home" + /> + + + Home + + + + + +
    -     -
    - - + +
    +     + + + + +

    + Recently viewed +

    +     +     + + } + className="euiCollapsibleNavGroup euiCollapsibleNavGroup--light euiCollapsibleNavGroup--withHeading" data-test-subj="collapsibleNavGroup-recentlyViewed" + id="mockId" initialIsOpen={true} - isCollapsible={true} - key="recentlyViewed" + isLoading={false} + isLoadingMessage={false} onToggle={[Function]} - title="Recently viewed" + paddingSize="none" > - - - -

    - Recently viewed -

    -     -     - - } - className="euiCollapsibleNavGroup euiCollapsibleNavGroup--light euiCollapsibleNavGroup--withHeading" +
    -
    - -
    -
    + +
    + +
    + + + +
    +
    + - -
    +
    +
    -
    - - - -
    + dashboard + + + + + +
    - -
    +
    +
    -     -     - -
    -     - + + + +
    +     + +
    -
    - +
    + +
      + +
    • + +
      • +       +
    +     +
    +
    + + +
    + + + Undock navigation + + , + } + } + color="subdued" + data-test-subj="collapsible-nav-lock" + iconType="lock" + label="Undock navigation" onClick={[Function]} - size="s" + size="xs" >
    • @@ -5983,157 +6197,11 @@ exports[`Header renders 1`] = `
    - - -
    -
    - -
      - -
      - - Undock navigation - - , - } - } - color="subdued" - data-test-subj="collapsible-nav-lock" - iconType="lock" - label="Undock navigation" - onClick={[Function]} - size="xs" - > -
    • - -
      • - -
    -     -
    -
    -     -     -
    -     - - - - - - - -     + + + + + diff --git a/src/core/public/chrome/ui/header/header.test.tsx b/src/core/public/chrome/ui/header/header.test.tsx index 740e9d9145dc..e162e6c94045 100644 --- a/src/core/public/chrome/ui/header/header.test.tsx +++ b/src/core/public/chrome/ui/header/header.test.tsx @@ -4,6 +4,9 @@ * The OpenSearch Contributors require contributions made to * this file be licensed under the Apache-2.0 license or a * compatible open source license. + * + * Modifications Copyright OpenSearch Contributors. See + * GitHub history for details. */ /* @@ -25,11 +28,6 @@ * under the License. */ -/* - * Modifications Copyright OpenSearch Contributors. See - * GitHub history for details. - */ - import React from 'react'; import { act } from 'react-dom/test-utils'; import { BehaviorSubject } from 'rxjs'; @@ -117,11 +115,11 @@ describe('Header', () => { act(() => isVisible$.next(true)); component.update(); expect(component.find('EuiHeader').exists()).toBeTruthy(); - expect(component.find('nav[aria-label="Primary"]').exists()).toBeFalsy(); + expect(component.find('EuiFlyout[aria-label="Primary"]').exists()).toBeFalsy(); act(() => isLocked$.next(true)); component.update(); - expect(component.find('nav[aria-label="Primary"]').exists()).toBeTruthy(); + expect(component.find('EuiFlyout[aria-label="Primary"]').exists()).toBeTruthy(); expect(component).toMatchSnapshot(); }); }); diff --git a/src/core/public/chrome/ui/header/header.tsx b/src/core/public/chrome/ui/header/header.tsx index 2946b4eaa130..41bb15b93ef4 100644 --- a/src/core/public/chrome/ui/header/header.tsx +++ b/src/core/public/chrome/ui/header/header.tsx @@ -4,6 +4,9 @@ * The OpenSearch Contributors require contributions made to * this file be licensed under the Apache-2.0 license or a * compatible open source license. + * + * Modifications Copyright OpenSearch Contributors. See + * GitHub history for details. */ /* @@ -25,11 +28,6 @@ * under the License. */ -/* - * Modifications Copyright OpenSearch Contributors. See - * GitHub history for details. - */ - import { EuiHeader, EuiHeaderSection, @@ -108,7 +106,7 @@ export function Header({ return ; } - const toggleCollapsibleNavRef = createRef(); + const toggleCollapsibleNavRef = createRef void }>(); const navId = htmlIdGenerator()(); const className = classnames('hide-for-sharing', 'headerGlobalNav'); diff --git a/src/core/public/chrome/ui/header/recent_links.tsx b/src/core/public/chrome/ui/header/recent_links.tsx deleted file mode 100644 index c31b5adbfef8..000000000000 --- a/src/core/public/chrome/ui/header/recent_links.tsx +++ /dev/null @@ -1,65 +0,0 @@ -/* - * SPDX-License-Identifier: Apache-2.0 - * - * The OpenSearch Contributors require contributions made to - * this file be licensed under the Apache-2.0 license or a - * compatible open source license. - */ - -/* - * Licensed to Elasticsearch B.V. under one or more contributor - * license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright - * ownership. Elasticsearch B.V. licenses this file to you under - * the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -/* - * Modifications Copyright OpenSearch Contributors. See - * GitHub history for details. - */ - -import React from 'react'; -import { i18n } from '@osd/i18n'; -import { EuiNavDrawerGroup } from '@elastic/eui'; -import { RecentNavLink } from './nav_link'; - -interface Props { - recentNavLinks: RecentNavLink[]; -} - -export function RecentLinks({ recentNavLinks }: Props) { - return ( - - ); -} diff --git a/src/core/public/core_app/errors/error_application.tsx b/src/core/public/core_app/errors/error_application.tsx index cd777c50af04..823a85e9ed4f 100644 --- a/src/core/public/core_app/errors/error_application.tsx +++ b/src/core/public/core_app/errors/error_application.tsx @@ -4,6 +4,9 @@ * The OpenSearch Contributors require contributions made to * this file be licensed under the Apache-2.0 license or a * compatible open source license. + * + * Modifications Copyright OpenSearch Contributors. See + * GitHub history for details. */ /* @@ -25,11 +28,6 @@ * under the License. */ -/* - * Modifications Copyright OpenSearch Contributors. See - * GitHub history for details. - */ - import React, { ReactChild, useState, useLayoutEffect } from 'react'; import ReactDOM from 'react-dom'; import { History } from 'history'; @@ -55,7 +53,7 @@ const ErrorPage: React.FC = ({ title, children }) => { return ( - + { return ( - + 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 7b7debc128fb..1f86c71d1a9e 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 @@ -8,7 +8,9 @@ exports[`FatalErrorsScreen rendering render matches snapshot 1`] = ` } } > - + { public render() { return ( - +
    Flyout content
    "`; +exports[`FlyoutService openFlyout() renders a flyout to the DOM 2`] = `"
    Flyout content
    "`; exports[`FlyoutService openFlyout() with a currently active flyout replaces the current flyout with a new one 1`] = ` Array [ @@ -59,4 +59,4 @@ Array [ ] `; -exports[`FlyoutService openFlyout() with a currently active flyout replaces the current flyout with a new one 2`] = `"
    Flyout content 2
    "`; +exports[`FlyoutService openFlyout() with a currently active flyout replaces the current flyout with a new one 2`] = `"
    Flyout content 2
    "`; diff --git a/src/core/public/overlays/modal/__snapshots__/modal_service.test.tsx.snap b/src/core/public/overlays/modal/__snapshots__/modal_service.test.tsx.snap index a62d94a30c67..ab3a55d432c4 100644 --- a/src/core/public/overlays/modal/__snapshots__/modal_service.test.tsx.snap +++ b/src/core/public/overlays/modal/__snapshots__/modal_service.test.tsx.snap @@ -11,80 +11,72 @@ Array [ exports[`ModalService openConfirm() renders a mountpoint confirm message 1`] = ` Array [ Array [ - - - - - - - , + + + + + ,
    , ], ] `; -exports[`ModalService openConfirm() renders a mountpoint confirm message 2`] = `"
    Modal content
    "`; +exports[`ModalService openConfirm() renders a mountpoint confirm message 2`] = `"
    Modal content
    "`; exports[`ModalService openConfirm() renders a string confirm message 1`] = ` Array [ Array [ - - - - Some message - - - , + + + Some message + + ,
    , ], ] `; -exports[`ModalService openConfirm() renders a string confirm message 2`] = `"

    Some message

    "`; +exports[`ModalService openConfirm() renders a string confirm message 2`] = `"

    Some message

    "`; exports[`ModalService openConfirm() with a currently active confirm replaces the current confirm with the new one 1`] = ` Array [ Array [ - - - - confirm 1 - - - , + + + confirm 1 + + ,
    , ], Array [ - - - - some confirm - - - , + + + some confirm + + ,
    , ], ] @@ -93,33 +85,29 @@ Array [ exports[`ModalService openConfirm() with a currently active modal replaces the current modal with the new confirm 1`] = ` Array [ Array [ - - - - - - - , + + + + + ,
    , ], Array [ - - - - some confirm - - - , + + + some confirm + + ,
    , ], ] @@ -128,55 +116,49 @@ Array [ exports[`ModalService openModal() renders a modal to the DOM 1`] = ` Array [ Array [ - - - - - - - , + + + + + ,
    , ], ] `; -exports[`ModalService openModal() renders a modal to the DOM 2`] = `"
    Modal content
    "`; +exports[`ModalService openModal() renders a modal to the DOM 2`] = `"
    Modal content
    "`; exports[`ModalService openModal() with a currently active confirm replaces the current confirm with the new one 1`] = ` Array [ Array [ - - - - confirm 1 - - - , + + + confirm 1 + + ,
    , ], Array [ - - - - some confirm - - - , + + + some confirm + + ,
    , ], ] @@ -185,33 +167,29 @@ Array [ exports[`ModalService openModal() with a currently active modal replaces the current modal with a new one 1`] = ` Array [ Array [ - - - - - - - , + + + + + ,
    , ], Array [ - - - - - - - , + + + + + ,
    , ], ] diff --git a/src/core/public/overlays/modal/modal_service.tsx b/src/core/public/overlays/modal/modal_service.tsx index 13e61785d232..cea06b17b024 100644 --- a/src/core/public/overlays/modal/modal_service.tsx +++ b/src/core/public/overlays/modal/modal_service.tsx @@ -4,6 +4,9 @@ * The OpenSearch Contributors require contributions made to * this file be licensed under the Apache-2.0 license or a * compatible open source license. + * + * Modifications Copyright OpenSearch Contributors. See + * GitHub history for details. */ /* @@ -25,15 +28,10 @@ * under the License. */ -/* - * Modifications Copyright OpenSearch Contributors. See - * GitHub history for details. - */ - /* eslint-disable max-classes-per-file */ import { i18n as t } from '@osd/i18n'; -import { EuiModal, EuiConfirmModal, EuiOverlayMask, EuiConfirmModalProps } from '@elastic/eui'; +import { EuiModal, EuiConfirmModal, EuiConfirmModalProps } from '@elastic/eui'; import React from 'react'; import { render, unmountComponentAtNode } from 'react-dom'; import { Subject } from 'rxjs'; @@ -152,13 +150,11 @@ export class ModalService { this.activeModal = modal; render( - - - modal.close()}> - - - - , + + modal.close()}> + + + , targetDomElement ); @@ -214,11 +210,9 @@ export class ModalService { }; render( - - - - - , + + + , targetDomElement ); }); diff --git a/src/core/public/styles/_base.scss b/src/core/public/styles/_base.scss index 37e3447fda8c..e0781e1162cd 100644 --- a/src/core/public/styles/_base.scss +++ b/src/core/public/styles/_base.scss @@ -1,3 +1,14 @@ +/*! + * SPDX-License-Identifier: Apache-2.0 + * + * The OpenSearch Contributors require contributions made to + * this file be licensed under the Apache-2.0 license or a + * compatible open source license. + * + * Modifications Copyright OpenSearch Contributors. See + * GitHub history for details. + */ + // Charts themes available app-wide @import '@elastic/charts/dist/theme'; @import '@elastic/eui/src/themes/charts/theme'; @@ -6,6 +17,7 @@ @import '@elastic/eui/src/components/collapsible_nav/variables'; // Application Layout +$euiCollapsibleNavWidth: $euiSize * 20; .application, .app-container { @@ -51,3 +63,13 @@ .euiBody--collapsibleNavIsDocked .euiBottomBar { margin-left: $euiCollapsibleNavWidth; } + +/* + Override for default size and style of EuiButtonIcon + Todo: Address via size prop after folding EUI in + */ +.euiButtonIcon.euiButtonIcon--SizeUnset { + height: auto; + width: auto; + padding: 4px; +} diff --git a/src/plugins/charts/public/static/components/number_input.tsx b/src/plugins/charts/public/static/components/number_input.tsx index b08fd459c185..c4422653a164 100644 --- a/src/plugins/charts/public/static/components/number_input.tsx +++ b/src/plugins/charts/public/static/components/number_input.tsx @@ -4,6 +4,9 @@ * The OpenSearch Contributors require contributions made to * this file be licensed under the Apache-2.0 license or a * compatible open source license. + * + * Modifications Copyright OpenSearch Contributors. See + * GitHub history for details. */ /* @@ -25,11 +28,6 @@ * under the License. */ -/* - * Modifications Copyright OpenSearch Contributors. See - * GitHub history for details. - */ - import React, { ReactNode } from 'react'; import { EuiFormRow, EuiFieldNumber } from '@elastic/eui'; @@ -67,7 +65,13 @@ function NumberInputOption({ 'data-test-subj': dataTestSubj, }: NumberInputOptionProps) { return ( - + ({ } }; return ( - + ({ ); return ( - + ({ setValue, }: SwitchOptionProps) { return ( - + ({ setValue, }: TextInputOptionProps) { return ( - + - - - - - - + + + + + + + + + + } + > + { + const val = parseInt(e.target.value, 10); + if (!val) return; + setFontSize(val); + }} + /> + - - + } - > - { - const val = parseInt(e.target.value, 10); - if (!val) return; - setFontSize(val); - }} - /> - + onChange={(e) => setWrapMode(e.target.checked)} + /> + - - - } - onChange={(e) => setWrapMode(e.target.checked)} + - - - + } - > - - } - onChange={(e) => setTripleQuotes(e.target.checked)} - /> - + onChange={(e) => setTripleQuotes(e.target.checked)} + /> + - - } - > - { - const { stateSetter, ...rest } = opts; - return rest; - })} - idToSelectedMap={checkboxIdToSelectedMap} - onChange={(e: any) => { - onAutocompleteChange(e as AutocompleteOptions); - }} + - + } + > + { + const { stateSetter, ...rest } = opts; + return rest; + })} + idToSelectedMap={checkboxIdToSelectedMap} + onChange={(e: any) => { + onAutocompleteChange(e as AutocompleteOptions); + }} + /> + - {pollingFields} - + {pollingFields} + - - - - + + + + - - - - - - + + + + + ); } diff --git a/src/plugins/dashboard/public/application/__snapshots__/dashboard_empty_screen.test.tsx.snap b/src/plugins/dashboard/public/application/__snapshots__/dashboard_empty_screen.test.tsx.snap index 8f1d091c0554..04120e429393 100644 --- a/src/plugins/dashboard/public/application/__snapshots__/dashboard_empty_screen.test.tsx.snap +++ b/src/plugins/dashboard/public/application/__snapshots__/dashboard_empty_screen.test.tsx.snap @@ -275,16 +275,18 @@ exports[`DashboardEmptyScreen renders correctly with readonly mode 1`] = ` restrictWidth="500px" >
    - +
    -
    @@ -992,16 +1004,18 @@ exports[`DashboardEmptyScreen renders correctly without visualize paragraph 1`] restrictWidth="500px" >
    - +
    { return ( - + - - - - - - - - -

    - -

    -     - - + + + -     - - - - - + + + + +

    - - - - +

    +     + + +     + + + + + + + + +     `; diff --git a/src/plugins/dashboard/public/application/top_nav/clone_modal.tsx b/src/plugins/dashboard/public/application/top_nav/clone_modal.tsx index 04068edde16d..e5222caa4bca 100644 --- a/src/plugins/dashboard/public/application/top_nav/clone_modal.tsx +++ b/src/plugins/dashboard/public/application/top_nav/clone_modal.tsx @@ -4,6 +4,9 @@ * The OpenSearch Contributors require contributions made to * this file be licensed under the Apache-2.0 license or a * compatible open source license. + * + * Modifications Copyright OpenSearch Contributors. See + * GitHub history for details. */ /* @@ -25,11 +28,6 @@ * under the License. */ -/* - * Modifications Copyright OpenSearch Contributors. See - * GitHub history for details. - */ - import React, { Fragment } from 'react'; import { i18n } from '@osd/i18n'; import { FormattedMessage } from '@osd/i18n/react'; @@ -43,7 +41,6 @@ import { EuiModalFooter, EuiModalHeader, EuiModalHeaderTitle, - EuiOverlayMask, EuiSpacer, EuiText, EuiCallOut, @@ -162,69 +159,67 @@ export class DashboardCloneModal extends React.Component { render() { return ( - - - - - - - - - - -

    - -

    -     - - - - + + + + + - {this.renderDuplicateTitleCallout()} -     - - - - - - - + + +

    - - - - +

    +     + + + + + + {this.renderDuplicateTitleCallout()} +     + + + + + + + + + + +     ); } } diff --git a/src/plugins/data/public/ui/filter_bar/filter_bar.tsx b/src/plugins/data/public/ui/filter_bar/filter_bar.tsx index 1ecea0442f81..bc3f0167ef4d 100644 --- a/src/plugins/data/public/ui/filter_bar/filter_bar.tsx +++ b/src/plugins/data/public/ui/filter_bar/filter_bar.tsx @@ -4,6 +4,9 @@ * The OpenSearch Contributors require contributions made to * this file be licensed under the Apache-2.0 license or a * compatible open source license. + * + * Modifications Copyright OpenSearch Contributors. See + * GitHub history for details. */ /* @@ -25,11 +28,6 @@ * under the License. */ -/* - * Modifications Copyright OpenSearch Contributors. See - * GitHub history for details. - */ - import { EuiButtonEmpty, EuiFlexGroup, @@ -131,7 +129,6 @@ function FilterBarUI(props: Props) { isOpen={isAddFilterPopoverOpen} closePopover={() => setIsAddFilterPopoverOpen(false)} anchorPosition="downLeft" - withTitle panelPaddingSize="none" ownFocus={true} initialFocus=".globalFilterEditor__fieldInput input" diff --git a/src/plugins/data/public/ui/filter_bar/filter_item.tsx b/src/plugins/data/public/ui/filter_bar/filter_item.tsx index 805958d2be1e..3f7417cca2e3 100644 --- a/src/plugins/data/public/ui/filter_bar/filter_item.tsx +++ b/src/plugins/data/public/ui/filter_bar/filter_item.tsx @@ -4,6 +4,9 @@ * The OpenSearch Contributors require contributions made to * this file be licensed under the Apache-2.0 license or a * compatible open source license. + * + * Modifications Copyright OpenSearch Contributors. See + * GitHub history for details. */ /* @@ -25,11 +28,6 @@ * under the License. */ -/* - * Modifications Copyright OpenSearch Contributors. See - * GitHub history for details. - */ - import { EuiContextMenu, EuiPopover } from '@elastic/eui'; import { InjectedIntl } from '@osd/i18n/react'; import classNames from 'classnames'; @@ -364,7 +362,6 @@ export function FilterItem(props: Props) { }} button={badge} anchorPosition="downLeft" - withTitle={true} panelPaddingSize="none" > diff --git a/src/plugins/data/public/ui/filter_bar/filter_options.tsx b/src/plugins/data/public/ui/filter_bar/filter_options.tsx index aaa90cd02756..2c15c3ab6b41 100644 --- a/src/plugins/data/public/ui/filter_bar/filter_options.tsx +++ b/src/plugins/data/public/ui/filter_bar/filter_options.tsx @@ -4,6 +4,9 @@ * The OpenSearch Contributors require contributions made to * this file be licensed under the Apache-2.0 license or a * compatible open source license. + * + * Modifications Copyright OpenSearch Contributors. See + * GitHub history for details. */ /* @@ -25,11 +28,6 @@ * under the License. */ -/* - * Modifications Copyright OpenSearch Contributors. See - * GitHub history for details. - */ - import { EuiButtonIcon, EuiContextMenu, EuiPopover, EuiPopoverTitle } from '@elastic/eui'; import { FormattedMessage, InjectedIntl, injectI18n } from '@osd/i18n/react'; import { Component } from 'react'; @@ -179,7 +177,6 @@ class FilterOptionsUI extends Component { } anchorPosition="rightUp" panelPaddingSize="none" - withTitle repositionOnScroll > diff --git a/src/plugins/data/public/ui/query_string_input/_query_bar.scss b/src/plugins/data/public/ui/query_string_input/_query_bar.scss index 240e92be5141..e694f31e96a2 100644 --- a/src/plugins/data/public/ui/query_string_input/_query_bar.scss +++ b/src/plugins/data/public/ui/query_string_input/_query_bar.scss @@ -1,3 +1,14 @@ +/*! + * SPDX-License-Identifier: Apache-2.0 + * + * The OpenSearch Contributors require contributions made to + * this file be licensed under the Apache-2.0 license or a + * compatible open source license. + * + * Modifications Copyright OpenSearch Contributors. See + * GitHub history for details. + */ + .osdQueryBar__wrap { max-width: 100%; z-index: $euiZContentMenu; @@ -61,7 +72,6 @@ // sass-lint:disable-block no-important flex-grow: 0 !important; flex-basis: auto !important; - margin-right: -$euiSizeXS !important; &.osdQueryBar__datePickerWrapper-isHidden { width: 0; 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 c764a568ba47..d40b4d46202a 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 @@ -4,6 +4,9 @@ * The OpenSearch Contributors require contributions made to * this file be licensed under the Apache-2.0 license or a * compatible open source license. + * + * Modifications Copyright OpenSearch Contributors. See + * GitHub history for details. */ /* @@ -25,11 +28,6 @@ * under the License. */ -/* - * Modifications Copyright OpenSearch Contributors. See - * GitHub history for details. - */ - import { EuiButtonEmpty, EuiForm, @@ -89,7 +87,6 @@ export function QueryLanguageSwitcher(props: Props) { button={button} isOpen={isPopoverOpen} closePopover={() => setIsPopoverOpen(false)} - withTitle repositionOnScroll > diff --git a/src/plugins/data/public/ui/saved_query_form/save_query_form.tsx b/src/plugins/data/public/ui/saved_query_form/save_query_form.tsx index e6f4d2a36cff..1c01f5dbdfcb 100644 --- a/src/plugins/data/public/ui/saved_query_form/save_query_form.tsx +++ b/src/plugins/data/public/ui/saved_query_form/save_query_form.tsx @@ -4,6 +4,9 @@ * The OpenSearch Contributors require contributions made to * this file be licensed under the Apache-2.0 license or a * compatible open source license. + * + * Modifications Copyright OpenSearch Contributors. See + * GitHub history for details. */ /* @@ -25,15 +28,9 @@ * under the License. */ -/* - * Modifications Copyright OpenSearch Contributors. See - * GitHub history for details. - */ - import React, { useEffect, useState, useCallback } from 'react'; import { EuiButtonEmpty, - EuiOverlayMask, EuiModal, EuiButton, EuiModalHeader, @@ -232,37 +229,35 @@ export function SaveQueryForm({ ); return ( - - - - - {i18n.translate('data.search.searchBar.savedQueryFormTitle', { - defaultMessage: 'Save query', - })} - - + + + + {i18n.translate('data.search.searchBar.savedQueryFormTitle', { + defaultMessage: 'Save query', + })} + + - {saveQueryForm} + {saveQueryForm} - - - {i18n.translate('data.search.searchBar.savedQueryFormCancelButtonText', { - defaultMessage: 'Cancel', - })} - + + + {i18n.translate('data.search.searchBar.savedQueryFormCancelButtonText', { + defaultMessage: 'Cancel', + })} + - - {i18n.translate('data.search.searchBar.savedQueryFormSaveButtonText', { - defaultMessage: 'Save', - })} - - - - + + {i18n.translate('data.search.searchBar.savedQueryFormSaveButtonText', { + defaultMessage: 'Save', + })} + + + ); } diff --git a/src/plugins/data/public/ui/saved_query_management/saved_query_list_item.tsx b/src/plugins/data/public/ui/saved_query_management/saved_query_list_item.tsx index d411a1708c6b..ab2b691decaa 100644 --- a/src/plugins/data/public/ui/saved_query_management/saved_query_list_item.tsx +++ b/src/plugins/data/public/ui/saved_query_management/saved_query_list_item.tsx @@ -4,6 +4,9 @@ * The OpenSearch Contributors require contributions made to * this file be licensed under the Apache-2.0 license or a * compatible open source license. + * + * Modifications Copyright OpenSearch Contributors. See + * GitHub history for details. */ /* @@ -25,12 +28,7 @@ * under the License. */ -/* - * Modifications Copyright OpenSearch Contributors. See - * GitHub history for details. - */ - -import { EuiListGroupItem, EuiConfirmModal, EuiOverlayMask, EuiIconTip } from '@elastic/eui'; +import { EuiListGroupItem, EuiConfirmModal, EuiIconTip } from '@elastic/eui'; import React, { Fragment, useState } from 'react'; import classNames from 'classnames'; @@ -138,36 +136,34 @@ export const SavedQueryListItem = ({ /> {showDeletionConfirmationModal && ( - - { - onDelete(savedQuery); - setShowDeletionConfirmationModal(false); - }} - buttonColor="danger" - onCancel={() => { - setShowDeletionConfirmationModal(false); - }} - /> - + { + onDelete(savedQuery); + setShowDeletionConfirmationModal(false); + }} + buttonColor="danger" + onCancel={() => { + setShowDeletionConfirmationModal(false); + }} + /> )} ); diff --git a/src/plugins/discover/public/application/angular/context/components/action_bar/action_bar.tsx b/src/plugins/discover/public/application/angular/context/components/action_bar/action_bar.tsx index 103f3a7d7ce3..e3fb2f05cae2 100644 --- a/src/plugins/discover/public/application/angular/context/components/action_bar/action_bar.tsx +++ b/src/plugins/discover/public/application/angular/context/components/action_bar/action_bar.tsx @@ -4,6 +4,9 @@ * The OpenSearch Contributors require contributions made to * this file be licensed under the Apache-2.0 license or a * compatible open source license. + * + * Modifications Copyright OpenSearch Contributors. See + * GitHub history for details. */ /* @@ -25,10 +28,6 @@ * under the License. */ -/* - * Modifications Copyright OpenSearch Contributors. See - * GitHub history for details. - */ import React, { useState } from 'react'; import { i18n } from '@osd/i18n'; import { FormattedMessage, I18nProvider } from '@osd/i18n/react'; @@ -158,7 +157,7 @@ export function ActionBar({ - + {isSuccessor ? ( -