From 20306e160af76ee7cfe346a5433f849a58e70113 Mon Sep 17 00:00:00 2001 From: Shenoy Pratik Date: Wed, 21 Aug 2024 16:23:06 -0700 Subject: [PATCH 1/5] Adding Ryan, Sean and Adam as dashboards-observability maintainers (#2082) * adding Ryan, Sean and Adam as dashboards-observability maintainers Signed-off-by: Shenoy Pratik * move pjfitzgibbons to emeritus list and fix ryan's github link Signed-off-by: Shenoy Pratik --------- Signed-off-by: Shenoy Pratik --- .github/CODEOWNERS | 3 ++- MAINTAINERS.md | 54 ++++++++++++++++++++++++---------------------- 2 files changed, 30 insertions(+), 27 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 0362760f1d..306754cc1b 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1,2 +1,3 @@ # This should match the owning team set up in https://github.com/orgs/opensearch-project/teams -* @pjfitzgibbons @ps48 @kavithacm @derek-ho @joshuali925 @dai-chen @YANG-DB @rupal-bq @mengweieric @vamsi-amazon @swiddis @penghuo @seankao-az @anirudha @paulstn @sumukhswamy + +- @ps48 @kavithacm @derek-ho @joshuali925 @dai-chen @YANG-DB @rupal-bq @mengweieric @vamsi-amazon @swiddis @penghuo @seankao-az @anirudha @paulstn @sumukhswamy @sejli @TackAdam @RyanL1997 diff --git a/MAINTAINERS.md b/MAINTAINERS.md index daba95b027..f609f9d3eb 100644 --- a/MAINTAINERS.md +++ b/MAINTAINERS.md @@ -4,32 +4,34 @@ This document contains a list of maintainers in this repo. See [opensearch-proje ## Current Maintainers -| Maintainer | GitHub ID | Affiliation | -| ----------------------- | ------------------------------------------------- | ----------- | -| Eric Wei | [mengweieric](https://github.com/mengweieric) | Amazon | -| Joshua Li | [joshuali925](https://github.com/joshuali925) | Amazon | -| Shenoy Pratik | [ps48](https://github.com/ps48) | Amazon | -| Kavitha Mohan | [kavithacm](https://github.com/kavithacm) | Amazon | -| Rupal Mahajan | [rupal-bq](https://github.com/rupal-bq) | Amazon | -| Derek Ho | [derek-ho](https://github.com/derek-ho) | Amazon | -| Lior Perry | [YANG-DB](https://github.com/YANG-DB) | Amazon | -| Peter Fitzgibbons | [pjfitzgibbons](https://github.com/pjfitzgibbons) | Amazon | -| Simeon Widdis | [swiddis](https://github.com/swiddis) | Amazon | -| Chen Dai | [dai-chen](https://github.com/dai-chen) | Amazon | -| Vamsi Manohar | [vamsi-amazon](https://github.com/vamsi-amazon) | Amazon | -| Peng Huo | [penghuo](https://github.com/penghuo) | Amazon | -| Sean Kao | [seankao-az](https://github.com/seankao-az) | Amazon | -| Anirudha Jadhav | [anirudha](https://github.com/anirudha) | Amazon | -| Paul Sebastian | [paulstn](https://github.com/paulstn) | Amazon | -| Sumukh Hanumantha Swamy | [sumukhswamy](https://github.com/sumukhswamy) | Amazon | +| Maintainer | GitHub ID | Affiliation | +| ----------------------- | ----------------------------------------------- | ----------- | +| Eric Wei | [mengweieric](https://github.com/mengweieric) | Amazon | +| Joshua Li | [joshuali925](https://github.com/joshuali925) | Amazon | +| Shenoy Pratik | [ps48](https://github.com/ps48) | Amazon | +| Kavitha Mohan | [kavithacm](https://github.com/kavithacm) | Amazon | +| Rupal Mahajan | [rupal-bq](https://github.com/rupal-bq) | Amazon | +| Derek Ho | [derek-ho](https://github.com/derek-ho) | Amazon | +| Lior Perry | [YANG-DB](https://github.com/YANG-DB) | Amazon | +| Simeon Widdis | [swiddis](https://github.com/swiddis) | Amazon | +| Chen Dai | [dai-chen](https://github.com/dai-chen) | Amazon | +| Vamsi Manohar | [vamsi-amazon](https://github.com/vamsi-amazon) | Amazon | +| Peng Huo | [penghuo](https://github.com/penghuo) | Amazon | +| Sean Kao | [seankao-az](https://github.com/seankao-az) | Amazon | +| Anirudha Jadhav | [anirudha](https://github.com/anirudha) | Amazon | +| Paul Sebastian | [paulstn](https://github.com/paulstn) | Amazon | +| Sumukh Hanumantha Swamy | [sumukhswamy](https://github.com/sumukhswamy) | Amazon | +| Sean Li | [sejli](https://github.com/sejli) | Amazon | +| Adam Tackett | [TackAdam](https://github.com/TackAdam) | Amazon | +| Jialiang Liang | [RyanL1997](https://github.com/RyanL1997) | Amazon | ## Emeritus Maintainers -| Maintainer | GitHub ID | Affiliation | -| ----------------- | ------------------------------------------------------- | ----------- | -| Charlotte Henkle | [CEHENKLE](https://github.com/CEHENKLE) | Amazon | -| Nick Knize | [nknize](https://github.com/nknize) | Amazon | -| David Cui | [davidcui1225](https://github.com/davidcui1225) | Amazon | -| Eugene Lee | [eugenesk24](https://github.com/eugenesk24) | Amazon | -| Zhongnan Su | [zhongnansu](https://github.com/zhongnansu) | Amazon | -| Sean Li | [sejli](https://github.com/sejli) | Amazon | \ No newline at end of file +| Maintainer | GitHub ID | Affiliation | +| ----------------- | ------------------------------------------------- | ----------- | +| Charlotte Henkle | [CEHENKLE](https://github.com/CEHENKLE) | Amazon | +| Nick Knize | [nknize](https://github.com/nknize) | Amazon | +| David Cui | [davidcui1225](https://github.com/davidcui1225) | Amazon | +| Eugene Lee | [eugenesk24](https://github.com/eugenesk24) | Amazon | +| Zhongnan Su | [zhongnansu](https://github.com/zhongnansu) | Amazon | +| Peter Fitzgibbons | [pjfitzgibbons](https://github.com/pjfitzgibbons) | Amazon | From 7cdcacb36cebb4c602626ed69068665edbee11a7 Mon Sep 17 00:00:00 2001 From: Dan Dong <58446449+danieldong51@users.noreply.github.com> Date: Wed, 21 Aug 2024 16:42:36 -0700 Subject: [PATCH 2/5] [Look&Feel] Integrations Density and Consistency Improvements (#2071) * Merged Main Signed-off-by: Dan Dong * Reverted change Signed-off-by: Dan Dong * Fixed error Signed-off-by: Dan Dong * Updated snapshot testing Signed-off-by: Dan Dong * Fix lint errors Signed-off-by: Dan Dong --------- Signed-off-by: Dan Dong --- .../added_integration.test.tsx.snap | 14 +-- .../added_integration_flyout.test.tsx.snap | 65 ++++++++----- .../integration_details.test.tsx.snap | 96 ++++++++++--------- .../integration_header.test.tsx.snap | 19 ++-- .../setup_integration.test.tsx.snap | 16 ++-- .../setup_integration_inputs.test.tsx.snap | 18 ++-- .../__snapshots__/upload_flyout.test.tsx.snap | 8 +- .../components/add_integration_flyout.tsx | 12 ++- .../components/added_integration.tsx | 5 +- .../integrations/components/integration.tsx | 4 +- .../components/integration_details_panel.tsx | 12 ++- .../components/integration_header.tsx | 11 ++- .../components/integration_overview_panel.tsx | 6 +- .../components/setup_integration_inputs.tsx | 5 +- .../integrations/components/upload_flyout.tsx | 7 +- 15 files changed, 175 insertions(+), 123 deletions(-) diff --git a/public/components/integrations/components/__tests__/__snapshots__/added_integration.test.tsx.snap b/public/components/integrations/components/__tests__/__snapshots__/added_integration.test.tsx.snap index 86d99ea846..6b89012fd1 100644 --- a/public/components/integrations/components/__tests__/__snapshots__/added_integration.test.tsx.snap +++ b/public/components/integrations/components/__tests__/__snapshots__/added_integration.test.tsx.snap @@ -126,15 +126,17 @@ exports[`Added Integration View Test Renders added integration view using dummy
- -

- + > +

+

+ -

- Add Integration -

+

+ Add Integration +

+
-

- Add Integration -

+

+ Add Integration +

+
-

- Add Integration -

+

+ Add Integration +

+
-

- Add Integration -

+

+ Add Integration +

+
-

- Add Integration -

+

+ Add Integration +

+
- -

- Add Integration -

- +

+ Add Integration +

+
+ diff --git a/public/components/integrations/components/__tests__/__snapshots__/integration_details.test.tsx.snap b/public/components/integrations/components/__tests__/__snapshots__/integration_details.test.tsx.snap index 819112188d..745acbf148 100644 --- a/public/components/integrations/components/__tests__/__snapshots__/integration_details.test.tsx.snap +++ b/public/components/integrations/components/__tests__/__snapshots__/integration_details.test.tsx.snap @@ -147,52 +147,60 @@ exports[`Available Integration Table View Test Renders nginx integration table v - - - John Doe - - - - - - - - - + + + + + + + + + + @@ -209,10 +217,10 @@ exports[`Available Integration Table View Test Renders nginx integration table v
Apache-2.0
@@ -235,10 +243,10 @@ exports[`Available Integration Table View Test Renders nginx integration table v
Nginx HTTP server collector
diff --git a/public/components/integrations/components/__tests__/__snapshots__/integration_header.test.tsx.snap b/public/components/integrations/components/__tests__/__snapshots__/integration_header.test.tsx.snap index cd01eee6c1..d1264395c2 100644 --- a/public/components/integrations/components/__tests__/__snapshots__/integration_header.test.tsx.snap +++ b/public/components/integrations/components/__tests__/__snapshots__/integration_header.test.tsx.snap @@ -11,17 +11,19 @@ exports[`Integration Header Test Renders integration header as expected 1`] = `
- -

- Integrations -

- +

+ Integrations +

+
+ @@ -234,9 +236,10 @@ exports[`Integration Header Test Renders integration header as expected 1`] = `
- -

+
- Set Up Integration -

- +

+ Set Up Integration +

+
+
- +

Set Up Integration

- + @@ -233,11 +235,13 @@ exports[`Integration Setup Inputs Renders the S3 connector form as expected 1`] exports[`Integration Setup Inputs Renders the S3 connector form without workflows 1`] = ` - +

Set Up Integration

- + @@ -1746,11 +1750,13 @@ exports[`Integration Setup Inputs Renders the details inputs 1`] = ` exports[`Integration Setup Inputs Renders the index form as expected 1`] = ` - +

Set Up Integration

- + diff --git a/public/components/integrations/components/__tests__/__snapshots__/upload_flyout.test.tsx.snap b/public/components/integrations/components/__tests__/__snapshots__/upload_flyout.test.tsx.snap index a784634fa5..6d7e7878a7 100644 --- a/public/components/integrations/components/__tests__/__snapshots__/upload_flyout.test.tsx.snap +++ b/public/components/integrations/components/__tests__/__snapshots__/upload_flyout.test.tsx.snap @@ -6,7 +6,13 @@ exports[`Integration Upload Flyout Renders integration upload flyout as expected size="s" > - Upload Integrations + +

+ Upload Integrations +

+ (null); @@ -99,7 +98,10 @@ export function AddIntegrationFlyout(props: IntegrationFlyoutProps) { } /> - + - +

Add Integration

- + {renderContent()} diff --git a/public/components/integrations/components/added_integration.tsx b/public/components/integrations/components/added_integration.tsx index 8633477dec..99d3e35509 100644 --- a/public/components/integrations/components/added_integration.tsx +++ b/public/components/integrations/components/added_integration.tsx @@ -21,7 +21,6 @@ import { EuiSpacer, EuiTableFieldDataColumnType, EuiText, - EuiTitle, } from '@elastic/eui'; import React, { useEffect, useState } from 'react'; import truncate from 'lodash/truncate'; @@ -125,9 +124,9 @@ export function AddedIntegration(props: AddedIntegrationProps) { - +

{data?.name}

- + diff --git a/public/components/integrations/components/integration.tsx b/public/components/integrations/components/integration.tsx index 5120581618..d7b74dec0c 100644 --- a/public/components/integrations/components/integration.tsx +++ b/public/components/integrations/components/integration.tsx @@ -164,7 +164,9 @@ export function Integration(props: AvailableIntegrationProps) { {IntegrationScreenshots({ integration, http })} - {renderTabs()} + + {renderTabs()} + {selectedTabId === 'assets' ? IntegrationAssets({ integration, integrationAssets }) diff --git a/public/components/integrations/components/integration_details_panel.tsx b/public/components/integrations/components/integration_details_panel.tsx index 49a36e2ca1..70a6cb2e49 100644 --- a/public/components/integrations/components/integration_details_panel.tsx +++ b/public/components/integrations/components/integration_details_panel.tsx @@ -71,22 +71,24 @@ export function IntegrationDetails(props: { integration: IntegrationConfig }) {

Contributer

 - - {config.author} - + + + {config.author} + +

License

 - {config.license} + {config.license}

Description

 - {config.description} + {config.description} ); diff --git a/public/components/integrations/components/integration_header.tsx b/public/components/integrations/components/integration_header.tsx index a9ec217fd6..8b12b866a5 100644 --- a/public/components/integrations/components/integration_header.tsx +++ b/public/components/integrations/components/integration_header.tsx @@ -15,7 +15,6 @@ import { EuiTab, EuiTabs, EuiText, - EuiTitle, } from '@elastic/eui'; import React, { useState } from 'react'; import { @@ -60,7 +59,7 @@ export const IntegrationHeaderActions = ({ onShowUpload }: { onShowUpload: () => panelPaddingSize="none" anchorPosition="downLeft" > - + ); }; @@ -106,9 +105,9 @@ export const IntegrationHeader = () => {
- +

Integrations

- + setShowUploadFlyout(true)} /> @@ -122,7 +121,9 @@ export const IntegrationHeader = () => { - {renderTabs()} + + {renderTabs()} + {showUploadFlyout ? ( setShowUploadFlyout(false)} /> diff --git a/public/components/integrations/components/integration_overview_panel.tsx b/public/components/integrations/components/integration_overview_panel.tsx index 8c6cb5d798..1eb301f193 100644 --- a/public/components/integrations/components/integration_overview_panel.tsx +++ b/public/components/integrations/components/integration_overview_panel.tsx @@ -9,9 +9,9 @@ import { EuiPageHeader, EuiPageHeaderSection, EuiSpacer, - EuiTitle, EuiFlexItem, EuiPageContentHeaderSection, + EuiText, } from '@elastic/eui'; import React from 'react'; @@ -32,9 +32,9 @@ export function IntegrationOverview(props: any) { - +

{config.displayName || config.name}

- + - +

Set Up Integration

- + {setupCallout.show ? ( diff --git a/public/components/integrations/components/upload_flyout.tsx b/public/components/integrations/components/upload_flyout.tsx index 815dc3b2ee..88a2f36209 100644 --- a/public/components/integrations/components/upload_flyout.tsx +++ b/public/components/integrations/components/upload_flyout.tsx @@ -14,6 +14,7 @@ import { EuiFlyoutHeader, EuiForm, EuiCompressedFormRow, + EuiText, } from '@elastic/eui'; import React, { useEffect, useState } from 'react'; import { useToast } from '../../../../public/components/common/toast'; @@ -136,7 +137,11 @@ export const IntegrationUploadFlyout = ({ onClose }: { onClose: () => void }) => return ( - Upload Integrations + + +

Upload Integrations

+ + Date: Wed, 21 Aug 2024 16:45:04 -0700 Subject: [PATCH 3/5] [Look&Feel] Traces Density and Consistency Improvements (#2072) * Updated Traces Look & Feel Signed-off-by: Dan Dong * Look&Feel for Metrics Signed-off-by: Dan Dong * Fixed error Signed-off-by: Dan Dong * Fixed snapshot testing Signed-off-by: Dan Dong --------- Signed-off-by: Dan Dong --- .../__snapshots__/create.test.tsx.snap | 64 ++++----- .../service_config.test.tsx.snap | 20 ++- .../__snapshots__/trace_config.test.tsx.snap | 20 ++- .../metrics_export.test.tsx.snap | 2 +- .../__snapshots__/top_menu.test.tsx.snap | 2 +- .../metrics/top_menu/metrics_export.tsx | 1 + .../helper_functions.test.tsx.snap | 12 +- .../components/common/filters/filters.tsx | 2 +- .../components/common/helper_functions.tsx | 10 +- .../common/plots/service_map_node_details.tsx | 6 +- .../__snapshots__/dashboard.test.tsx.snap | 80 +++++++---- .../dashboard_table.test.tsx.snap | 10 +- .../top_error_rates_table.test.tsx.snap | 10 +- .../top_latency_table.test.tsx.snap | 10 +- .../__snapshots__/service_view.test.tsx.snap | 10 +- .../__snapshots__/services.test.tsx.snap | 50 +++++-- .../services_table.test.tsx.snap | 20 ++- .../services/service_trends_plots.tsx | 1 + .../components/services/service_view.tsx | 13 +- .../span_detail_flyout.test.tsx.snap | 66 +++++---- .../span_detail_table.test.tsx.snap | 10 +- .../__snapshots__/trace_view.test.tsx.snap | 10 +- .../__snapshots__/traces.test.tsx.snap | 30 ++-- .../__snapshots__/traces_table.test.tsx.snap | 129 ++++++++---------- .../components/traces/span_detail_flyout.tsx | 5 +- .../components/traces/trace_view.tsx | 7 +- 26 files changed, 356 insertions(+), 244 deletions(-) diff --git a/public/components/application_analytics/__tests__/__snapshots__/create.test.tsx.snap b/public/components/application_analytics/__tests__/__snapshots__/create.test.tsx.snap index 83a0140a86..d069db6c4f 100644 --- a/public/components/application_analytics/__tests__/__snapshots__/create.test.tsx.snap +++ b/public/components/application_analytics/__tests__/__snapshots__/create.test.tsx.snap @@ -728,7 +728,7 @@ Object { class="euiText euiText--medium" >
No data matches the selected filter. Clear the filter and/or increase the time range to see more results.
@@ -1051,7 +1051,7 @@ Object { class="euiText euiText--medium" >
No data matches the selected filter. Clear the filter and/or increase the time range to see more results.
@@ -1985,7 +1985,7 @@ Object { class="euiText euiText--medium" >
No data matches the selected filter. Clear the filter and/or increase the time range to see more results.
@@ -2308,7 +2308,7 @@ Object { class="euiText euiText--medium" >
No data matches the selected filter. Clear the filter and/or increase the time range to see more results.
@@ -3181,7 +3181,7 @@ Object { class="euiText euiText--medium" >
No data matches the selected filter. Clear the filter and/or increase the time range to see more results.
@@ -3538,7 +3538,7 @@ Object { class="euiText euiText--medium" >
No data matches the selected filter. Clear the filter and/or increase the time range to see more results.
@@ -4352,7 +4352,7 @@ Object { class="euiText euiText--medium" >
No data matches the selected filter. Clear the filter and/or increase the time range to see more results.
@@ -4709,7 +4709,7 @@ Object { class="euiText euiText--medium" >
No data matches the selected filter. Clear the filter and/or increase the time range to see more results.
@@ -5616,7 +5616,7 @@ Object { class="euiText euiText--medium" >
No data matches the selected filter. Clear the filter and/or increase the time range to see more results.
@@ -5939,7 +5939,7 @@ Object { class="euiText euiText--medium" >
No data matches the selected filter. Clear the filter and/or increase the time range to see more results.
@@ -6787,7 +6787,7 @@ Object { class="euiText euiText--medium" >
No data matches the selected filter. Clear the filter and/or increase the time range to see more results.
@@ -7110,7 +7110,7 @@ Object { class="euiText euiText--medium" >
No data matches the selected filter. Clear the filter and/or increase the time range to see more results.
@@ -7978,7 +7978,7 @@ Object { class="euiText euiText--medium" >
No data matches the selected filter. Clear the filter and/or increase the time range to see more results.
@@ -8299,7 +8299,7 @@ Object { class="euiText euiText--medium" >
No data matches the selected filter. Clear the filter and/or increase the time range to see more results.
@@ -9110,7 +9110,7 @@ Object { class="euiText euiText--medium" >
No data matches the selected filter. Clear the filter and/or increase the time range to see more results.
@@ -9431,7 +9431,7 @@ Object { class="euiText euiText--medium" >
No data matches the selected filter. Clear the filter and/or increase the time range to see more results.
@@ -10304,7 +10304,7 @@ Object { class="euiText euiText--medium" >
No data matches the selected filter. Clear the filter and/or increase the time range to see more results.
@@ -10627,7 +10627,7 @@ Object { class="euiText euiText--medium" >
No data matches the selected filter. Clear the filter and/or increase the time range to see more results.
@@ -11441,7 +11441,7 @@ Object { class="euiText euiText--medium" >
No data matches the selected filter. Clear the filter and/or increase the time range to see more results.
@@ -11764,7 +11764,7 @@ Object { class="euiText euiText--medium" >
No data matches the selected filter. Clear the filter and/or increase the time range to see more results.
@@ -12669,7 +12669,7 @@ Object { class="euiText euiText--medium" >
No data matches the selected filter. Clear the filter and/or increase the time range to see more results.
@@ -12992,7 +12992,7 @@ Object { class="euiText euiText--medium" >
No data matches the selected filter. Clear the filter and/or increase the time range to see more results.
@@ -13840,7 +13840,7 @@ Object { class="euiText euiText--medium" >
No data matches the selected filter. Clear the filter and/or increase the time range to see more results.
@@ -14163,7 +14163,7 @@ Object { class="euiText euiText--medium" >
No data matches the selected filter. Clear the filter and/or increase the time range to see more results.
@@ -15036,7 +15036,7 @@ Object { class="euiText euiText--medium" >
No data matches the selected filter. Clear the filter and/or increase the time range to see more results.
@@ -15393,7 +15393,7 @@ Object { class="euiText euiText--medium" >
No data matches the selected filter. Clear the filter and/or increase the time range to see more results.
@@ -16207,7 +16207,7 @@ Object { class="euiText euiText--medium" >
No data matches the selected filter. Clear the filter and/or increase the time range to see more results.
@@ -16564,7 +16564,7 @@ Object { class="euiText euiText--medium" >
No data matches the selected filter. Clear the filter and/or increase the time range to see more results.
@@ -17441,7 +17441,7 @@ Object { class="euiText euiText--medium" >
No data matches the selected filter. Clear the filter and/or increase the time range to see more results.
@@ -17764,7 +17764,7 @@ Object { class="euiText euiText--medium" >
No data matches the selected filter. Clear the filter and/or increase the time range to see more results.
@@ -18698,7 +18698,7 @@ Object { class="euiText euiText--medium" >
No data matches the selected filter. Clear the filter and/or increase the time range to see more results.
@@ -19021,7 +19021,7 @@ Object { class="euiText euiText--medium" >
No data matches the selected filter. Clear the filter and/or increase the time range to see more results.
diff --git a/public/components/application_analytics/__tests__/__snapshots__/service_config.test.tsx.snap b/public/components/application_analytics/__tests__/__snapshots__/service_config.test.tsx.snap index 34a531e58b..893ac479d0 100644 --- a/public/components/application_analytics/__tests__/__snapshots__/service_config.test.tsx.snap +++ b/public/components/application_analytics/__tests__/__snapshots__/service_config.test.tsx.snap @@ -1124,7 +1124,9 @@ exports[`Service Config component renders empty service config 1`] = ` + No data matches the selected filter. Clear the filter and/or increase the time range to see more results. } @@ -1163,9 +1165,11 @@ exports[`Service Config component renders empty service config 1`] = `
- +
No data matches the selected filter. Clear the filter and/or increase the time range to see more results.
@@ -2345,7 +2349,9 @@ exports[`Service Config component renders with one service selected 1`] = ` + No data matches the selected filter. Clear the filter and/or increase the time range to see more results. } @@ -2384,9 +2390,11 @@ exports[`Service Config component renders with one service selected 1`] = `
- +
No data matches the selected filter. Clear the filter and/or increase the time range to see more results.
diff --git a/public/components/application_analytics/__tests__/__snapshots__/trace_config.test.tsx.snap b/public/components/application_analytics/__tests__/__snapshots__/trace_config.test.tsx.snap index db13f48f7a..db81c133ee 100644 --- a/public/components/application_analytics/__tests__/__snapshots__/trace_config.test.tsx.snap +++ b/public/components/application_analytics/__tests__/__snapshots__/trace_config.test.tsx.snap @@ -845,7 +845,9 @@ exports[`Trace Config component renders empty trace config 1`] = ` + No data matches the selected filter. Clear the filter and/or increase the time range to see more results. } @@ -884,9 +886,11 @@ exports[`Trace Config component renders empty trace config 1`] = `
- +
No data matches the selected filter. Clear the filter and/or increase the time range to see more results.
@@ -1779,7 +1783,9 @@ exports[`Trace Config component renders with one trace selected 1`] = ` + No data matches the selected filter. Clear the filter and/or increase the time range to see more results. } @@ -1818,9 +1824,11 @@ exports[`Trace Config component renders with one trace selected 1`] = `
- +
No data matches the selected filter. Clear the filter and/or increase the time range to see more results.
diff --git a/public/components/metrics/top_menu/__tests__/__snapshots__/metrics_export.test.tsx.snap b/public/components/metrics/top_menu/__tests__/__snapshots__/metrics_export.test.tsx.snap index fd5df251ea..0a8a8bf74d 100644 --- a/public/components/metrics/top_menu/__tests__/__snapshots__/metrics_export.test.tsx.snap +++ b/public/components/metrics/top_menu/__tests__/__snapshots__/metrics_export.test.tsx.snap @@ -27,7 +27,7 @@ exports[`Export Metrics Panel Component renders Export Metrics Panel Component 1 hasArrow={true} isOpen={false} ownFocus={true} - panelPaddingSize="m" + panelPaddingSize="s" >
{ button={} isOpen={isPanelOpen} closePopover={() => setIsPanelOpen(false)} + panelPaddingSize="s" > + No data matches the selected filter. Clear the filter and/or increase the time range to see more results. } @@ -93,17 +95,19 @@ exports[`Helper functions renders no match and missing configuration messages 2` Learn more - + } body={ - + The indices required for trace analytics (otel-v1-apm-span-* and otel-v1-apm-service-map*) do not exist or you do not have permission to access them. } diff --git a/public/components/trace_analytics/components/common/filters/filters.tsx b/public/components/trace_analytics/components/common/filters/filters.tsx index 052ff06a8e..5d2a82922b 100644 --- a/public/components/trace_analytics/components/common/filters/filters.tsx +++ b/public/components/trace_analytics/components/common/filters/filters.tsx @@ -210,7 +210,7 @@ export function Filters(props: FiltersOwnProps) { withTitle data-test-subj="global-filter-button" > - + ); }; diff --git a/public/components/trace_analytics/components/common/helper_functions.tsx b/public/components/trace_analytics/components/common/helper_functions.tsx index fdc00053c9..9747eb110e 100644 --- a/public/components/trace_analytics/components/common/helper_functions.tsx +++ b/public/components/trace_analytics/components/common/helper_functions.tsx @@ -5,7 +5,7 @@ /* eslint-disable radix */ import dateMath from '@elastic/datemath'; -import { EuiSmallButton, EuiEmptyPrompt, EuiSpacer, EuiText } from '@elastic/eui'; +import { EuiSmallButtonEmpty, EuiEmptyPrompt, EuiSpacer, EuiText } from '@elastic/eui'; import { SpacerSize } from '@elastic/eui/src/components/spacer/spacer'; import { isEmpty, round } from 'lodash'; import React from 'react'; @@ -45,7 +45,7 @@ export function NoMatchMessage(props: { size: SpacerSize }) { No matches} body={ - + No data matches the selected filter. Clear the filter and/or increase the time range to see more results. @@ -65,16 +65,16 @@ export function MissingConfigurationMessage(props: { mode: TraceAnalyticsMode }) <> Trace Analytics not set up} - body={{missingConfigurationBody}} + body={{missingConfigurationBody}} actions={ - window.open(TRACE_ANALYTICS_DOCUMENTATION_LINK, '_blank')} > Learn more - + } /> diff --git a/public/components/trace_analytics/components/common/plots/service_map_node_details.tsx b/public/components/trace_analytics/components/common/plots/service_map_node_details.tsx index 509c1757c3..e061f1d78b 100644 --- a/public/components/trace_analytics/components/common/plots/service_map_node_details.tsx +++ b/public/components/trace_analytics/components/common/plots/service_map_node_details.tsx @@ -46,9 +46,9 @@ export const ServiceMapNodeDetails = ({ - {selectedNodeDetails?.average_latency} - {selectedNodeDetails?.error_rate} - {selectedNodeDetails?.throughput} + {selectedNodeDetails?.average_latency} + {selectedNodeDetails?.error_rate} + {selectedNodeDetails?.throughput} diff --git a/public/components/trace_analytics/components/dashboard/__tests__/__snapshots__/dashboard.test.tsx.snap b/public/components/trace_analytics/components/dashboard/__tests__/__snapshots__/dashboard.test.tsx.snap index 87ff562cc1..1a24a137d0 100644 --- a/public/components/trace_analytics/components/dashboard/__tests__/__snapshots__/dashboard.test.tsx.snap +++ b/public/components/trace_analytics/components/dashboard/__tests__/__snapshots__/dashboard.test.tsx.snap @@ -791,7 +791,9 @@ exports[`Dashboard component renders dashboard 1`] = ` + No data matches the selected filter. Clear the filter and/or increase the time range to see more results. } @@ -830,9 +832,11 @@ exports[`Dashboard component renders dashboard 1`] = `
- +
No data matches the selected filter. Clear the filter and/or increase the time range to see more results.
@@ -982,7 +986,9 @@ exports[`Dashboard component renders dashboard 1`] = ` + No data matches the selected filter. Clear the filter and/or increase the time range to see more results. } @@ -1021,9 +1027,11 @@ exports[`Dashboard component renders dashboard 1`] = `
- +
No data matches the selected filter. Clear the filter and/or increase the time range to see more results.
@@ -1156,7 +1164,9 @@ exports[`Dashboard component renders dashboard 1`] = ` + No data matches the selected filter. Clear the filter and/or increase the time range to see more results. } @@ -1195,9 +1205,11 @@ exports[`Dashboard component renders dashboard 1`] = `
- +
No data matches the selected filter. Clear the filter and/or increase the time range to see more results.
@@ -2023,7 +2035,9 @@ exports[`Dashboard component renders empty dashboard 1`] = ` + No data matches the selected filter. Clear the filter and/or increase the time range to see more results. } @@ -2062,9 +2076,11 @@ exports[`Dashboard component renders empty dashboard 1`] = `
- +
No data matches the selected filter. Clear the filter and/or increase the time range to see more results.
@@ -2214,7 +2230,9 @@ exports[`Dashboard component renders empty dashboard 1`] = ` + No data matches the selected filter. Clear the filter and/or increase the time range to see more results. } @@ -2253,9 +2271,11 @@ exports[`Dashboard component renders empty dashboard 1`] = `
- +
No data matches the selected filter. Clear the filter and/or increase the time range to see more results.
@@ -2388,7 +2408,9 @@ exports[`Dashboard component renders empty dashboard 1`] = ` + No data matches the selected filter. Clear the filter and/or increase the time range to see more results. } @@ -2427,9 +2449,11 @@ exports[`Dashboard component renders empty dashboard 1`] = `
- +
No data matches the selected filter. Clear the filter and/or increase the time range to see more results.
@@ -3420,7 +3444,9 @@ exports[`Dashboard component renders empty jaeger dashboard 1`] = ` + No data matches the selected filter. Clear the filter and/or increase the time range to see more results. } @@ -3459,9 +3485,11 @@ exports[`Dashboard component renders empty jaeger dashboard 1`] = `
- +
No data matches the selected filter. Clear the filter and/or increase the time range to see more results.
@@ -3581,7 +3609,9 @@ exports[`Dashboard component renders empty jaeger dashboard 1`] = ` + No data matches the selected filter. Clear the filter and/or increase the time range to see more results. } @@ -3620,9 +3650,11 @@ exports[`Dashboard component renders empty jaeger dashboard 1`] = `
- +
No data matches the selected filter. Clear the filter and/or increase the time range to see more results.
diff --git a/public/components/trace_analytics/components/dashboard/__tests__/__snapshots__/dashboard_table.test.tsx.snap b/public/components/trace_analytics/components/dashboard/__tests__/__snapshots__/dashboard_table.test.tsx.snap index d6b17d1f8f..4d458a7d72 100644 --- a/public/components/trace_analytics/components/dashboard/__tests__/__snapshots__/dashboard_table.test.tsx.snap +++ b/public/components/trace_analytics/components/dashboard/__tests__/__snapshots__/dashboard_table.test.tsx.snap @@ -3444,7 +3444,9 @@ exports[`Dashboard table component renders empty dashboard table message 1`] = ` + No data matches the selected filter. Clear the filter and/or increase the time range to see more results. } @@ -3483,9 +3485,11 @@ exports[`Dashboard table component renders empty dashboard table message 1`] = `
- +
No data matches the selected filter. Clear the filter and/or increase the time range to see more results.
diff --git a/public/components/trace_analytics/components/dashboard/__tests__/__snapshots__/top_error_rates_table.test.tsx.snap b/public/components/trace_analytics/components/dashboard/__tests__/__snapshots__/top_error_rates_table.test.tsx.snap index dee301c004..db75e43492 100644 --- a/public/components/trace_analytics/components/dashboard/__tests__/__snapshots__/top_error_rates_table.test.tsx.snap +++ b/public/components/trace_analytics/components/dashboard/__tests__/__snapshots__/top_error_rates_table.test.tsx.snap @@ -92,7 +92,9 @@ exports[`Error Rates Table component renders empty top error rates table 1`] = ` + No data matches the selected filter. Clear the filter and/or increase the time range to see more results. } @@ -131,9 +133,11 @@ exports[`Error Rates Table component renders empty top error rates table 1`] = `
- +
No data matches the selected filter. Clear the filter and/or increase the time range to see more results.
diff --git a/public/components/trace_analytics/components/dashboard/__tests__/__snapshots__/top_latency_table.test.tsx.snap b/public/components/trace_analytics/components/dashboard/__tests__/__snapshots__/top_latency_table.test.tsx.snap index 5907b021b8..57295af2e1 100644 --- a/public/components/trace_analytics/components/dashboard/__tests__/__snapshots__/top_latency_table.test.tsx.snap +++ b/public/components/trace_analytics/components/dashboard/__tests__/__snapshots__/top_latency_table.test.tsx.snap @@ -184,7 +184,9 @@ exports[`Latency Table component renders empty top error rates table 1`] = ` + No data matches the selected filter. Clear the filter and/or increase the time range to see more results. } @@ -223,9 +225,11 @@ exports[`Latency Table component renders empty top error rates table 1`] = `
- +
No data matches the selected filter. Clear the filter and/or increase the time range to see more results.
diff --git a/public/components/trace_analytics/components/services/__tests__/__snapshots__/service_view.test.tsx.snap b/public/components/trace_analytics/components/services/__tests__/__snapshots__/service_view.test.tsx.snap index 9f577a7521..71b0944b00 100644 --- a/public/components/trace_analytics/components/services/__tests__/__snapshots__/service_view.test.tsx.snap +++ b/public/components/trace_analytics/components/services/__tests__/__snapshots__/service_view.test.tsx.snap @@ -9,15 +9,15 @@ exports[`Service view component renders service view 1`] = ` gutterSize="s" > - -

order -

- + + + No data matches the selected filter. Clear the filter and/or increase the time range to see more results. } @@ -1674,9 +1676,11 @@ exports[`Services component renders empty services page 1`] = `
- +
No data matches the selected filter. Clear the filter and/or increase the time range to see more results.
@@ -2168,7 +2172,9 @@ exports[`Services component renders empty services page 1`] = ` + No data matches the selected filter. Clear the filter and/or increase the time range to see more results. } @@ -2207,9 +2213,11 @@ exports[`Services component renders empty services page 1`] = `
- +
No data matches the selected filter. Clear the filter and/or increase the time range to see more results.
@@ -3845,7 +3853,9 @@ exports[`Services component renders jaeger services page 1`] = ` + No data matches the selected filter. Clear the filter and/or increase the time range to see more results. } @@ -3884,9 +3894,11 @@ exports[`Services component renders jaeger services page 1`] = `
- +
No data matches the selected filter. Clear the filter and/or increase the time range to see more results.
@@ -5557,7 +5569,9 @@ exports[`Services component renders services page 1`] = ` + No data matches the selected filter. Clear the filter and/or increase the time range to see more results. } @@ -5596,9 +5610,11 @@ exports[`Services component renders services page 1`] = `
- +
No data matches the selected filter. Clear the filter and/or increase the time range to see more results.
@@ -6090,7 +6106,9 @@ exports[`Services component renders services page 1`] = ` + No data matches the selected filter. Clear the filter and/or increase the time range to see more results. } @@ -6129,9 +6147,11 @@ exports[`Services component renders services page 1`] = `
- +
No data matches the selected filter. Clear the filter and/or increase the time range to see more results.
diff --git a/public/components/trace_analytics/components/services/__tests__/__snapshots__/services_table.test.tsx.snap b/public/components/trace_analytics/components/services/__tests__/__snapshots__/services_table.test.tsx.snap index 16eca8ff31..a28ef243b1 100644 --- a/public/components/trace_analytics/components/services/__tests__/__snapshots__/services_table.test.tsx.snap +++ b/public/components/trace_analytics/components/services/__tests__/__snapshots__/services_table.test.tsx.snap @@ -149,7 +149,9 @@ exports[`Services table component renders empty jaeger services table message 1` + No data matches the selected filter. Clear the filter and/or increase the time range to see more results. } @@ -188,9 +190,11 @@ exports[`Services table component renders empty jaeger services table message 1`
- +
No data matches the selected filter. Clear the filter and/or increase the time range to see more results.
@@ -401,7 +405,9 @@ exports[`Services table component renders empty services table message 1`] = ` + No data matches the selected filter. Clear the filter and/or increase the time range to see more results. } @@ -440,9 +446,11 @@ exports[`Services table component renders empty services table message 1`] = `
- +
No data matches the selected filter. Clear the filter and/or increase the time range to see more results.
diff --git a/public/components/trace_analytics/components/services/service_trends_plots.tsx b/public/components/trace_analytics/components/services/service_trends_plots.tsx index de916aab9b..fd48a72f39 100644 --- a/public/components/trace_analytics/components/services/service_trends_plots.tsx +++ b/public/components/trace_analytics/components/services/service_trends_plots.tsx @@ -58,6 +58,7 @@ export const ServiceTrendsPlots = ({ anchorPosition="downCenter" isOpen={isPopoverOpen} closePopover={() => setIsPopoverOpen(false)} + panelPaddingSize="s" > diff --git a/public/components/trace_analytics/components/services/service_view.tsx b/public/components/trace_analytics/components/services/service_view.tsx index 6c8f1241c2..4b5e96902c 100644 --- a/public/components/trace_analytics/components/services/service_view.tsx +++ b/public/components/trace_analytics/components/services/service_view.tsx @@ -23,7 +23,6 @@ import { EuiPopover, EuiSpacer, EuiText, - EuiTitle, } from '@elastic/eui'; import round from 'lodash/round'; import React, { useEffect, useMemo, useState } from 'react'; @@ -220,9 +219,9 @@ export function ServiceView(props: ServiceViewProps) { - +

{serviceName}

- + setActionsMenuPopover(false)} > - + @@ -240,9 +239,9 @@ export function ServiceView(props: ServiceViewProps) { ) : ( - -

{serviceName}

- + +

{serviceName}

+ {renderDatePicker(startTime, setStartTime, endTime, setEndTime)} diff --git a/public/components/trace_analytics/components/traces/__tests__/__snapshots__/span_detail_flyout.test.tsx.snap b/public/components/trace_analytics/components/traces/__tests__/__snapshots__/span_detail_flyout.test.tsx.snap index b18bec860a..0e8dae7bae 100644 --- a/public/components/trace_analytics/components/traces/__tests__/__snapshots__/span_detail_flyout.test.tsx.snap +++ b/public/components/trace_analytics/components/traces/__tests__/__snapshots__/span_detail_flyout.test.tsx.snap @@ -78,11 +78,13 @@ exports[` spec renders the empty component 1`] = `
-

- Span detail -

+

+ Span detail +

+
spec renders the empty component 1`] = `
-

- Span detail -

+

+ Span detail +

+
spec renders the empty component 1`] = `
-

- Span detail -

+

+ Span detail +

+
spec renders the empty component 1`] = `
-

- Span detail -

+

+ Span detail +

+
spec renders the empty component 1`] = `
-

- Span detail -

+

+ Span detail +

+
spec renders the empty component 1`] = `
- -

+
- Span detail -

- +

+ Span detail +

+
+
diff --git a/public/components/trace_analytics/components/traces/__tests__/__snapshots__/span_detail_table.test.tsx.snap b/public/components/trace_analytics/components/traces/__tests__/__snapshots__/span_detail_table.test.tsx.snap index ea56ecacb2..481f1325ab 100644 --- a/public/components/trace_analytics/components/traces/__tests__/__snapshots__/span_detail_table.test.tsx.snap +++ b/public/components/trace_analytics/components/traces/__tests__/__snapshots__/span_detail_table.test.tsx.snap @@ -260,7 +260,9 @@ exports[` spec renders the empty component 1`] = ` + No data matches the selected filter. Clear the filter and/or increase the time range to see more results. } @@ -299,9 +301,11 @@ exports[` spec renders the empty component 1`] = `
- +
No data matches the selected filter. Clear the filter and/or increase the time range to see more results.
diff --git a/public/components/trace_analytics/components/traces/__tests__/__snapshots__/trace_view.test.tsx.snap b/public/components/trace_analytics/components/traces/__tests__/__snapshots__/trace_view.test.tsx.snap index 3874c4a497..e51feab606 100644 --- a/public/components/trace_analytics/components/traces/__tests__/__snapshots__/trace_view.test.tsx.snap +++ b/public/components/trace_analytics/components/traces/__tests__/__snapshots__/trace_view.test.tsx.snap @@ -9,15 +9,15 @@ exports[`Trace view component renders trace view 1`] = ` gutterSize="s" > - -

test -

- + + + No data matches the selected filter. Clear the filter and/or increase the time range to see more results. } @@ -1686,9 +1688,11 @@ exports[`Traces component renders empty traces page 1`] = `
- +
No data matches the selected filter. Clear the filter and/or increase the time range to see more results.
@@ -3367,7 +3371,9 @@ exports[`Traces component renders jaeger traces page 1`] = ` + No data matches the selected filter. Clear the filter and/or increase the time range to see more results. } @@ -3406,9 +3412,11 @@ exports[`Traces component renders jaeger traces page 1`] = `
- +
No data matches the selected filter. Clear the filter and/or increase the time range to see more results.
@@ -5084,7 +5092,9 @@ exports[`Traces component renders traces page 1`] = ` + No data matches the selected filter. Clear the filter and/or increase the time range to see more results. } @@ -5123,9 +5133,11 @@ exports[`Traces component renders traces page 1`] = `
- +
No data matches the selected filter. Clear the filter and/or increase the time range to see more results.
diff --git a/public/components/trace_analytics/components/traces/__tests__/__snapshots__/traces_table.test.tsx.snap b/public/components/trace_analytics/components/traces/__tests__/__snapshots__/traces_table.test.tsx.snap index bb86e197a7..4f8935e887 100644 --- a/public/components/trace_analytics/components/traces/__tests__/__snapshots__/traces_table.test.tsx.snap +++ b/public/components/trace_analytics/components/traces/__tests__/__snapshots__/traces_table.test.tsx.snap @@ -73,17 +73,19 @@ exports[`Traces table component renders empty traces table message 1`] = ` > Learn more - + } body={ - + The indices required for trace analytics (otel-v1-apm-span-* and otel-v1-apm-service-map*) do not exist or you do not have permission to access them. } @@ -122,9 +124,11 @@ exports[`Traces table component renders empty traces table message 1`] = `
- +
The indices required for trace analytics (otel-v1-apm-span-* and otel-v1-apm-service-map*) do not exist or you do not have permission to access them.
@@ -140,96 +144,79 @@ exports[`Traces table component renders empty traces table message 1`] = ` className="euiSpacer euiSpacer--l" /> - - - - - - - + + + + +
@@ -318,7 +305,9 @@ exports[`Traces table component renders empty traces table message 2`] = ` + No data matches the selected filter. Clear the filter and/or increase the time range to see more results. } @@ -357,9 +346,11 @@ exports[`Traces table component renders empty traces table message 2`] = `
- +
No data matches the selected filter. Clear the filter and/or increase the time range to see more results.
diff --git a/public/components/trace_analytics/components/traces/span_detail_flyout.tsx b/public/components/trace_analytics/components/traces/span_detail_flyout.tsx index 04bbba6348..6ecab2b150 100644 --- a/public/components/trace_analytics/components/traces/span_detail_flyout.tsx +++ b/public/components/trace_analytics/components/traces/span_detail_flyout.tsx @@ -16,7 +16,6 @@ import { EuiHorizontalRule, EuiSpacer, EuiText, - EuiTitle, } from '@elastic/eui'; import get from 'lodash/get'; import isEmpty from 'lodash/isEmpty'; @@ -314,9 +313,9 @@ export function SpanDetailFlyout(props: { - +

Span detail

- + {mode === 'data_prepper' && ( diff --git a/public/components/trace_analytics/components/traces/trace_view.tsx b/public/components/trace_analytics/components/traces/trace_view.tsx index 282b3e69bc..761f93a21b 100644 --- a/public/components/trace_analytics/components/traces/trace_view.tsx +++ b/public/components/trace_analytics/components/traces/trace_view.tsx @@ -16,7 +16,6 @@ import { EuiPanel, EuiSpacer, EuiText, - EuiTitle, } from '@elastic/eui'; import round from 'lodash/round'; import React, { useEffect, useState } from 'react'; @@ -55,9 +54,9 @@ export function TraceView(props: TraceViewProps) { return ( <> - -

{traceId}

- + +

{traceId}

+ ); From 8ac7ea067baed8c9bfcba00cc0d427c130a7e6f8 Mon Sep 17 00:00:00 2001 From: Dan Dong <58446449+danieldong51@users.noreply.github.com> Date: Wed, 21 Aug 2024 19:27:14 -0700 Subject: [PATCH 4/5] [Look&Feel] Notebooks Density and Consistency Improvements (#2073) * Updated Notebooks Look & Feel Signed-off-by: Dan Dong * Fixed error Signed-off-by: Dan Dong * Fixed error Signed-off-by: Dan Dong * Fixed lint and cypress test errors Signed-off-by: Dan Dong --------- Signed-off-by: Dan Dong --- .../notebooks_test/notebooks.spec.js | 20 ++++++------- .../__snapshots__/note_table.test.tsx.snap | 22 ++++++++------ .../__snapshots__/notebook.test.tsx.snap | 26 ++++++++++------- .../modal_containers.test.tsx.snap | 24 ++++++++++++--- .../custom_input_modal.test.tsx.snap | 16 ++++++++-- .../custom_modals/custom_input_modal.tsx | 28 ++++++++++++++---- .../custom_modals/reporting_loading_modal.tsx | 29 +++++++++---------- .../components/helpers/modal_containers.tsx | 27 +++++++++++------ .../notebooks/components/note_table.tsx | 8 ++--- .../notebooks/components/notebook.tsx | 17 +++++------ .../__snapshots__/para_output.test.tsx.snap | 2 +- .../__snapshots__/paragraphs.test.tsx.snap | 6 ++-- .../paragraph_components/para_input.tsx | 10 +++++-- .../paragraph_components/para_output.tsx | 1 + .../paragraph_components/paragraphs.tsx | 9 +++--- 15 files changed, 155 insertions(+), 90 deletions(-) diff --git a/.cypress/integration/notebooks_test/notebooks.spec.js b/.cypress/integration/notebooks_test/notebooks.spec.js index f1a6d044c9..6e21785c1f 100644 --- a/.cypress/integration/notebooks_test/notebooks.spec.js +++ b/.cypress/integration/notebooks_test/notebooks.spec.js @@ -135,7 +135,7 @@ describe('Testing paragraphs', () => { cy.get('a[data-test-subj="createNotebookPrimaryBtn"]').click(); cy.get('input[data-test-subj="custom-input-modal-input"]').focus().type(TEST_NOTEBOOK); cy.get('button[data-test-subj="custom-input-modal-confirm-button"]').click(); - cy.get('h1[data-test-subj="notebookTitle"]').contains(TEST_NOTEBOOK).should('exist'); + cy.get('div[data-test-subj="notebookTitle"]').contains(TEST_NOTEBOOK).should('exist'); }); beforeEach(() => { @@ -166,7 +166,7 @@ describe('Testing paragraphs', () => { it('Has working breadcrumbs', () => { cy.get('a[data-test-subj="breadcrumb last"]').contains(TEST_NOTEBOOK).click(); - cy.get('h1[data-test-subj="notebookTitle"]').contains(TEST_NOTEBOOK).should('exist'); + cy.get('div[data-test-subj="notebookTitle"]').contains(TEST_NOTEBOOK).should('exist'); cy.get('a[data-test-subj="breadcrumb"]').contains('Notebooks').click(); cy.get('h3[data-test-subj="notebookTableTitle"]').should('exist'); cy.get('a[data-test-subj="breadcrumb first"]').contains('Observability').click(); @@ -336,7 +336,7 @@ describe('Testing paragraphs', () => { }); it('Clears outputs', () => { - cy.get('h1[data-test-subj="notebookTitle"]').contains(TEST_NOTEBOOK).should('exist'); + cy.get('div[data-test-subj="notebookTitle"]').contains(TEST_NOTEBOOK).should('exist'); cy.get('[data-test-subj="notebook-paragraph-actions-button"]').should('exist'); cy.get('[data-test-subj="notebook-paragraph-actions-button"]').click(); cy.get('.euiContextMenuItem__text').contains('Clear all outputs').click(); @@ -346,7 +346,7 @@ describe('Testing paragraphs', () => { }); it('Runs all paragraphs', () => { - cy.get('h1[data-test-subj="notebookTitle"]').contains(TEST_NOTEBOOK).should('exist'); + cy.get('div[data-test-subj="notebookTitle"]').contains(TEST_NOTEBOOK).should('exist'); cy.get('[data-test-subj="notebook-paragraph-actions-button"]').click(); cy.get('.euiContextMenuItem__text').contains('Run all paragraphs').click(); @@ -354,7 +354,7 @@ describe('Testing paragraphs', () => { }); it('Adds paragraph to top', () => { - cy.get('h1[data-test-subj="notebookTitle"]').contains(TEST_NOTEBOOK).should('exist'); + cy.get('div[data-test-subj="notebookTitle"]').contains(TEST_NOTEBOOK).should('exist'); cy.get('[data-test-subj="notebook-paragraph-actions-button"]').click(); cy.get('.euiContextMenuItem__text').contains('Add paragraph to top').click(); @@ -364,7 +364,7 @@ describe('Testing paragraphs', () => { }); it('Adds paragraph to bottom', () => { - cy.get('h1[data-test-subj="notebookTitle"]').contains(TEST_NOTEBOOK).should('exist'); + cy.get('div[data-test-subj="notebookTitle"]').contains(TEST_NOTEBOOK).should('exist'); cy.get('[data-test-subj="notebook-paragraph-actions-button"]').click(); cy.get('.euiContextMenuItem__text').contains('Add paragraph to bottom').click(); cy.get('.euiContextMenuItem__text').contains('Code block').click(); @@ -374,7 +374,7 @@ describe('Testing paragraphs', () => { }); it('Moves paragraphs', () => { - cy.get('h1[data-test-subj="notebookTitle"]').contains(TEST_NOTEBOOK).should('exist'); + cy.get('div[data-test-subj="notebookTitle"]').contains(TEST_NOTEBOOK).should('exist'); cy.get('.euiButtonIcon[aria-label="Open paragraph menu"').eq(0).click(); cy.get('.euiContextMenuItem-isDisabled').should('have.length.gte', 2); cy.get('.euiContextMenuItem__text').contains('Move to bottom').click(); @@ -383,7 +383,7 @@ describe('Testing paragraphs', () => { }); it('Duplicates and renames the notebook', () => { - cy.get('h1[data-test-subj="notebookTitle"]').contains(TEST_NOTEBOOK).should('exist'); + cy.get('div[data-test-subj="notebookTitle"]').contains(TEST_NOTEBOOK).should('exist'); cy.get('[data-test-subj="notebook-notebook-actions-button"]').click(); cy.get('.euiContextMenuItem__text').contains('Duplicate notebook').click(); cy.get('.euiButton__text').contains('Duplicate').click(); @@ -394,14 +394,14 @@ describe('Testing paragraphs', () => { cy.get('.euiButton__text').last().contains('Rename').click(); cy.reload(); - cy.get('.euiTitle') + cy.get('.euiText') .contains(TEST_NOTEBOOK + ' (rename)') .should('exist'); cy.get(`a[href="${SAMPLE_URL}"]`).should('have.length.gte', 2); }); it('Deletes paragraphs', () => { - cy.get('h1[data-test-subj="notebookTitle"]').contains(TEST_NOTEBOOK).should('exist'); + cy.get('div[data-test-subj="notebookTitle"]').contains(TEST_NOTEBOOK).should('exist'); cy.get('[data-test-subj="notebook-paragraph-actions-button"]').click(); cy.get('.euiContextMenuItem__text').contains('Delete all paragraphs').click(); cy.get('button[data-test-subj="confirmModalConfirmButton"]').click(); diff --git a/public/components/notebooks/components/__tests__/__snapshots__/note_table.test.tsx.snap b/public/components/notebooks/components/__tests__/__snapshots__/note_table.test.tsx.snap index 59bd9e38f2..508ac33e8f 100644 --- a/public/components/notebooks/components/__tests__/__snapshots__/note_table.test.tsx.snap +++ b/public/components/notebooks/components/__tests__/__snapshots__/note_table.test.tsx.snap @@ -16,11 +16,13 @@ exports[` spec renders the component 1`] = `
-

- Notebooks -

+

+ Notebooks +

+
spec renders the empty component 1`] = `
-

- Notebooks -

+

+ Notebooks +

+
spec renders the empty component 1`] = ` class="euiSpacer euiSpacer--m" />
spec Renders the empty component 1`] = `
-

- sample-notebook-1 -

+

+ sample-notebook-1 +

+
@@ -171,7 +173,7 @@ exports[` spec Renders the empty component 1`] = ` class="euiFlexItem euiFlexItem--flexGrowZero" >

@@ -203,7 +205,7 @@ exports[` spec Renders the empty component 1`] = ` No paragraphs

Add a paragraph to compose your document or story. Notebooks now support two types of input:
@@ -426,10 +428,12 @@ exports[` spec Renders the visualization component 1`] = `
-

+ > +

+

@@ -485,7 +489,7 @@ exports[` spec Renders the visualization component 1`] = ` class="euiFlexItem euiFlexItem--flexGrowZero" >

@@ -517,7 +521,7 @@ exports[` spec Renders the visualization component 1`] = ` No paragraphs

Add a paragraph to compose your document or story. Notebooks now support two types of input:
diff --git a/public/components/notebooks/components/helpers/__tests__/__snapshots__/modal_containers.test.tsx.snap b/public/components/notebooks/components/helpers/__tests__/__snapshots__/modal_containers.test.tsx.snap index e4bd51e8a1..ff1a3680a0 100644 --- a/public/components/notebooks/components/helpers/__tests__/__snapshots__/modal_containers.test.tsx.snap +++ b/public/components/notebooks/components/helpers/__tests__/__snapshots__/modal_containers.test.tsx.snap @@ -8,14 +8,24 @@ exports[`modal_containers spec render delete notebooks modal 1`] = ` > - title + +

+ title +

+ - + message - + The action cannot be undone. @@ -69,7 +79,13 @@ exports[`modal_containers spec render get custom modal 1`] = ` > - title + +

+ title +

+ diff --git a/public/components/notebooks/components/helpers/custom_modals/__tests__/__snapshots__/custom_input_modal.test.tsx.snap b/public/components/notebooks/components/helpers/custom_modals/__tests__/__snapshots__/custom_input_modal.test.tsx.snap index e90e493993..4f15d856d0 100644 --- a/public/components/notebooks/components/helpers/custom_modals/__tests__/__snapshots__/custom_input_modal.test.tsx.snap +++ b/public/components/notebooks/components/helpers/custom_modals/__tests__/__snapshots__/custom_input_modal.test.tsx.snap @@ -8,7 +8,13 @@ exports[` spec renders the component 1`] = ` > - title + +

+ title +

+ @@ -58,7 +64,13 @@ exports[` spec renders the component 2`] = ` > - title + +

+ title +

+ diff --git a/public/components/notebooks/components/helpers/custom_modals/custom_input_modal.tsx b/public/components/notebooks/components/helpers/custom_modals/custom_input_modal.tsx index 10ade574a4..a3fdaea88c 100644 --- a/public/components/notebooks/components/helpers/custom_modals/custom_input_modal.tsx +++ b/public/components/notebooks/components/helpers/custom_modals/custom_input_modal.tsx @@ -16,6 +16,7 @@ import { EuiCompressedFormRow, EuiCompressedFieldText, EuiSmallButton, + EuiText, } from '@elastic/eui'; /* @@ -30,7 +31,7 @@ import { * btn2txt - string as content to fill "confirm button" * openNoteName - Default input value for the field */ -type CustomInputModalProps = { +interface CustomInputModalProps { runModal: (value: string) => void; closeModal: ( event?: React.KeyboardEvent | React.MouseEvent @@ -41,10 +42,19 @@ type CustomInputModalProps = { btn2txt: string; openNoteName: string; helpText: string; -}; +} export const CustomInputModal = (props: CustomInputModalProps) => { - const { runModal, closeModal, labelTxt, titletxt, btn1txt, btn2txt, openNoteName, helpText } = props; + const { + runModal, + closeModal, + labelTxt, + titletxt, + btn1txt, + btn2txt, + openNoteName, + helpText, + } = props; const [value, setValue] = useState(openNoteName || ''); // sets input value const onChange = (e: React.ChangeEvent) => { @@ -55,7 +65,11 @@ export const CustomInputModal = (props: CustomInputModalProps) => { - {titletxt} + + +

{titletxt}

+ + @@ -73,7 +87,11 @@ export const CustomInputModal = (props: CustomInputModalProps) => { {btn1txt} - runModal(value)} fill> + runModal(value)} + fill + > {btn2txt} diff --git a/public/components/notebooks/components/helpers/custom_modals/reporting_loading_modal.tsx b/public/components/notebooks/components/helpers/custom_modals/reporting_loading_modal.tsx index 4f28904d70..d6e586d900 100644 --- a/public/components/notebooks/components/helpers/custom_modals/reporting_loading_modal.tsx +++ b/public/components/notebooks/components/helpers/custom_modals/reporting_loading_modal.tsx @@ -7,21 +7,18 @@ import { EuiOverlayMask, EuiModal, EuiModalHeader, - EuiTitle, EuiText, EuiModalBody, EuiSpacer, EuiFlexGroup, EuiFlexItem, EuiLoadingSpinner, - EuiSmallButton -} from "@elastic/eui"; -import React from "react"; + EuiSmallButton, +} from '@elastic/eui'; +import React from 'react'; -export function GenerateReportLoadingModal(props: { setShowLoading: any; }) { - const { - setShowLoading - } = props; +export function GenerateReportLoadingModal(props: { setShowLoading: any }) { + const { setShowLoading } = props; const closeModal = () => { setShowLoading(false); @@ -36,15 +33,15 @@ export function GenerateReportLoadingModal(props: { setShowLoading: any; }) { id="downloadInProgressLoadingModal" > - - -

Generating report

- - + +

Generating report

+ - Preparing your file for download. - You can close this dialog while we continue in the background. + Preparing your file for download. + + You can close this dialog while we continue in the background. + @@ -67,4 +64,4 @@ export function GenerateReportLoadingModal(props: { setShowLoading: any; }) {
); -}; +} diff --git a/public/components/notebooks/components/helpers/modal_containers.tsx b/public/components/notebooks/components/helpers/modal_containers.tsx index 5b31c78a1c..4127675977 100644 --- a/public/components/notebooks/components/helpers/modal_containers.tsx +++ b/public/components/notebooks/components/helpers/modal_containers.tsx @@ -18,7 +18,7 @@ import { EuiModalHeader, EuiModalHeaderTitle, EuiText, - EuiSpacer + EuiSpacer, } from '@elastic/eui'; import { CustomInputModal } from './custom_modals/custom_input_modal'; @@ -38,7 +38,7 @@ export const getCustomModal = ( btn1txt: string, btn2txt: string, openNoteName?: string, - helpText?: string, + helpText?: string ) => { return ( -

Do you want to add sample notebooks? This will also add Dashboards sample flights and logs data if they have not been added.

+ +

+ Do you want to add sample notebooks? This will also add Dashboards sample flights and + logs data if they have not been added. +

+ ); @@ -105,7 +110,7 @@ export const getDeleteModal = ( onConfirm: (event?: React.MouseEvent) => void, title: string, message: string, - confirmMessage?: string, + confirmMessage?: string ) => { return ( @@ -114,11 +119,11 @@ export const getDeleteModal = ( onCancel={onCancel} onConfirm={onConfirm} cancelButtonText="Cancel" - confirmButtonText={confirmMessage || "Delete"} + confirmButtonText={confirmMessage || 'Delete'} buttonColor="danger" defaultFocusedButton="confirm" > - {message} + {message} ); @@ -145,12 +150,16 @@ export const DeleteNotebookModal = ({ - {title} + + +

{title}

+ + - {message} - The action cannot be undone. + {message} + The action cannot be undone. diff --git a/public/components/notebooks/components/note_table.tsx b/public/components/notebooks/components/note_table.tsx index 68995a6f36..e677ddd203 100644 --- a/public/components/notebooks/components/note_table.tsx +++ b/public/components/notebooks/components/note_table.tsx @@ -234,9 +234,9 @@ export function NoteTable({ - +

Notebooks

- + @@ -266,7 +266,7 @@ export function NoteTable({ isOpen={isActionsPopoverOpen} closePopover={() => setIsActionsPopoverOpen(false)} > - + @@ -322,7 +322,7 @@ export function NoteTable({

No notebooks

- + Use notebooks to create post-mortem reports, build live infrastructure
reports, or foster explorative collaborations with data. diff --git a/public/components/notebooks/components/notebook.tsx b/public/components/notebooks/components/notebook.tsx index 146dcbc935..d7d82fabb5 100644 --- a/public/components/notebooks/components/notebook.tsx +++ b/public/components/notebooks/components/notebook.tsx @@ -21,7 +21,6 @@ import { EuiPopover, EuiSpacer, EuiText, - EuiTitle, } from '@elastic/eui'; import CSS from 'csstype'; import moment from 'moment'; @@ -1007,7 +1006,7 @@ export class Notebook extends Component { isOpen={this.state.isReportingActionsPopoverOpen} closePopover={() => this.setState({ isReportingActionsPopoverOpen: false })} > - +
) : null; @@ -1059,7 +1058,7 @@ export class Notebook extends Component { isOpen={this.state.isParaActionsPopoverOpen} closePopover={() => this.setState({ isParaActionsPopoverOpen: false })} > - + )} @@ -1084,7 +1083,7 @@ export class Notebook extends Component { isOpen={this.state.isNoteActionsPopoverOpen} closePopover={() => this.setState({ isNoteActionsPopoverOpen: false })} > - + ) : ( @@ -1109,9 +1108,9 @@ export class Notebook extends Component { )} - +

{this.state.path}

- + {!this.state.savedObjectNotebook && ( @@ -1133,7 +1132,7 @@ export class Notebook extends Component { - {createdText} + {createdText} {this.state.parsedPara.length > 0 ? ( @@ -1198,7 +1197,7 @@ export class Notebook extends Component { isOpen={this.state.isAddParaPopoverOpen} closePopover={() => this.setState({ isAddParaPopoverOpen: false })} > - + )} @@ -1210,7 +1209,7 @@ export class Notebook extends Component {

No paragraphs

- + Add a paragraph to compose your document or story. Notebooks now support two types of input: diff --git a/public/components/notebooks/components/paragraph_components/__tests__/__snapshots__/para_output.test.tsx.snap b/public/components/notebooks/components/paragraph_components/__tests__/__snapshots__/para_output.test.tsx.snap index 5c0e7b6fd0..e00e0947fa 100644 --- a/public/components/notebooks/components/paragraph_components/__tests__/__snapshots__/para_output.test.tsx.snap +++ b/public/components/notebooks/components/paragraph_components/__tests__/__snapshots__/para_output.test.tsx.snap @@ -11,7 +11,7 @@ exports[` spec renders dashboards visualization outputs 1`] = ` exports[` spec renders markdown outputs 1`] = `
spec renders the component 1`] = ` class="euiFlexItem euiFlexItem--flexGrowZero" >
-

- Select existing visualization -

+

+ Select existing visualization +

+
-

- Select existing visualization -

+

+ Select existing visualization +

+
-

- Select existing visualization -

+

+ Select existing visualization +

+
- -

- Select existing visualization -

- +

+ Select existing visualization +

+
+
-

Replace visualization

- + } > @@ -1449,12 +1467,15 @@ exports[`Visualization Flyout Component renders replace visualization Flyout 1`]
-

- Replace visualization -

+

+ Replace visualization +

+
-

- Replace visualization -

+

+ Replace visualization +

+
-

- Replace visualization -

+

+ Replace visualization +

+
-

- Replace visualization -

+

+ Replace visualization +

+
-

- Replace visualization -

+

+ Replace visualization +

+
- -

- Replace visualization -

- +

+ Replace visualization +

+
+
); const closeModal = () => setIsModalVisible(false); - const showModal = (modalType: string) => { + const showModal = (_: string) => { setModalContent( -

{isPreviewError.errorMessage}

+ +

{isPreviewError.errorMessage}

+ - Error Details + Error Details {isPreviewError.errorDetails} @@ -267,11 +268,11 @@ export const VisaulizationFlyout = ({ const flyoutHeader = ( - +

{isFlyoutReplacement ? 'Replace visualization' : 'Select existing visualization'}

- + ); diff --git a/public/components/custom_panels/panel_modules/visualization_flyout/visualization_flyout_so.tsx b/public/components/custom_panels/panel_modules/visualization_flyout/visualization_flyout_so.tsx index 691f89c994..b9d8845f34 100644 --- a/public/components/custom_panels/panel_modules/visualization_flyout/visualization_flyout_so.tsx +++ b/public/components/custom_panels/panel_modules/visualization_flyout/visualization_flyout_so.tsx @@ -28,7 +28,6 @@ import { EuiSelectOption, EuiSpacer, EuiText, - EuiTitle, EuiToolTip, ShortDate, } from '@elastic/eui'; @@ -128,17 +127,19 @@ export const VisaulizationFlyoutSO = ({ const [modalContent, setModalContent] = useState(<>); const closeModal = () => setIsModalVisible(false); - const showModal = (modalType: string) => { + const showModal = (_: string) => { setModalContent( -

{isPreviewError.errorMessage}

+ +

{isPreviewError.errorMessage}

+ - Error Details + Error Details {isPreviewError.errorDetails} @@ -177,7 +178,7 @@ export const VisaulizationFlyoutSO = ({ replaceVizInPanel(panel, replaceVisualizationId, selectValue, newVisualizationTitle) ); } else { - const visualizationsWithNewPanel = addVisualizationPanel({ + addVisualizationPanel({ savedVisualizationId: selectValue, onSuccess: `Visualization ${newVisualizationTitle} successfully added!`, onFailure: `Error in adding ${newVisualizationTitle} visualization to the panel`, @@ -249,11 +250,11 @@ export const VisaulizationFlyoutSO = ({ const flyoutHeader = ( - +

{isFlyoutReplacement ? 'Replace visualization' : 'Select existing visualization'}

- + );