From dd7b4a615329200331a727264129f5fd9cea9696 Mon Sep 17 00:00:00 2001 From: cchaos Date: Mon, 25 Oct 2021 16:12:57 -0400 Subject: [PATCH 1/4] Added link to integrations in Sample Data description --- .../application/components/tutorial_directory.js | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/plugins/home/public/application/components/tutorial_directory.js b/src/plugins/home/public/application/components/tutorial_directory.js index a1a93e3eba5424..6c698c7111b40b 100644 --- a/src/plugins/home/public/application/components/tutorial_directory.js +++ b/src/plugins/home/public/application/components/tutorial_directory.js @@ -9,7 +9,7 @@ import _ from 'lodash'; import React from 'react'; import PropTypes from 'prop-types'; -import { EuiFlexItem, EuiFlexGrid, EuiFlexGroup } from '@elastic/eui'; +import { EuiFlexItem, EuiFlexGrid, EuiFlexGroup, EuiLink } from '@elastic/eui'; import { injectI18n, FormattedMessage } from '@kbn/i18n/react'; import { i18n } from '@kbn/i18n'; import { Synopsis } from './synopsis'; @@ -224,7 +224,17 @@ class TutorialDirectoryUi extends React.Component { description: ( + + + ), + }} /> ), tabs, From ae922d9c56bc3cca33cbc47766408ae961eeaa0d Mon Sep 17 00:00:00 2001 From: cchaos Date: Mon, 25 Oct 2021 16:13:09 -0400 Subject: [PATCH 2/4] Fixed no data card alignments --- .../no_data_page/no_data_card/elastic_agent_card.tsx | 8 +------- .../no_data_page/no_data_card/no_data_card.tsx | 3 +-- .../public/page_template/no_data_page/no_data_page.scss | 2 +- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/src/plugins/kibana_react/public/page_template/no_data_page/no_data_card/elastic_agent_card.tsx b/src/plugins/kibana_react/public/page_template/no_data_page/no_data_card/elastic_agent_card.tsx index d429f9d712081c..b9d412fe4df89b 100644 --- a/src/plugins/kibana_react/public/page_template/no_data_page/no_data_card/elastic_agent_card.tsx +++ b/src/plugins/kibana_react/public/page_template/no_data_page/no_data_card/elastic_agent_card.tsx @@ -44,7 +44,6 @@ export const ElasticAgentCard: FunctionComponent = ({ {i18n.translate('kibana-react.noDataPage.elasticAgentCard.noPermission.title', { @@ -93,12 +92,7 @@ export const ElasticAgentCard: FunctionComponent = ({ defaultMessage: `Use Elastic Agent for a simple, unified way to collect data from your machines.`, })} betaBadgeLabel={recommended ? NO_DATA_RECOMMENDED : undefined} - footer={ -
- {button} - {footer} -
- } + footer={footer} layout={layout as 'vertical' | undefined} {...cardRest} /> diff --git a/src/plugins/kibana_react/public/page_template/no_data_page/no_data_card/no_data_card.tsx b/src/plugins/kibana_react/public/page_template/no_data_page/no_data_card/no_data_card.tsx index ad40a4f8f54997..9cc38cc5f60389 100644 --- a/src/plugins/kibana_react/public/page_template/no_data_page/no_data_card/no_data_card.tsx +++ b/src/plugins/kibana_react/public/page_template/no_data_page/no_data_card/no_data_card.tsx @@ -27,7 +27,6 @@ export const NoDataCard: FunctionComponent = ({ return ( = ({ defaultMessage: `Proceed without collecting data`, })} betaBadgeLabel={recommended ? NO_DATA_RECOMMENDED : undefined} - footer={
{footer}
} + footer={footer} layout={layout as 'vertical' | undefined} {...cardRest} /> diff --git a/src/plugins/kibana_react/public/page_template/no_data_page/no_data_page.scss b/src/plugins/kibana_react/public/page_template/no_data_page/no_data_page.scss index f1bc12e74cf4ea..d4b50536d0d098 100644 --- a/src/plugins/kibana_react/public/page_template/no_data_page/no_data_page.scss +++ b/src/plugins/kibana_react/public/page_template/no_data_page/no_data_page.scss @@ -1,5 +1,5 @@ .kbnNoDataPageContents__item:only-child { - min-width: 400px; + min-width: ($euiSize * 22.5); @include euiBreakpoint('xs', 's') { min-width: auto; From 5415e8042fd7a194957b27f74c960659b0f7074f Mon Sep 17 00:00:00 2001 From: cchaos Date: Mon, 25 Oct 2021 16:21:24 -0400 Subject: [PATCH 3/4] Snaps --- .../elastic_agent_card.test.tsx.snap | 58 +++++----------- .../__snapshots__/no_data_card.test.tsx.snap | 66 +++++++------------ 2 files changed, 40 insertions(+), 84 deletions(-) diff --git a/src/plugins/kibana_react/public/page_template/no_data_page/no_data_card/__snapshots__/elastic_agent_card.test.tsx.snap b/src/plugins/kibana_react/public/page_template/no_data_page/no_data_card/__snapshots__/elastic_agent_card.test.tsx.snap index 30703a4a5ebb70..8e1d0cb92e0065 100644 --- a/src/plugins/kibana_react/public/page_template/no_data_page/no_data_card/__snapshots__/elastic_agent_card.test.tsx.snap +++ b/src/plugins/kibana_react/public/page_template/no_data_page/no_data_card/__snapshots__/elastic_agent_card.test.tsx.snap @@ -15,16 +15,11 @@ exports[`ElasticAgentCard props button 1`] = ` Button - - Button - - + } href="/app/integrations/browse" image="/plugins/kibanaReact/assets/elastic_agent_card.svg" @@ -55,15 +50,11 @@ exports[`ElasticAgentCard props category 1`] = ` - - Add Elastic Agent - - + Add Elastic Agent + } href="/app/integrations/browse/custom" image="/plugins/kibanaReact/assets/elastic_agent_card.svg" @@ -94,16 +85,11 @@ exports[`ElasticAgentCard props href 1`] = ` Button - - Button - - + } href="#" image="/plugins/kibanaReact/assets/elastic_agent_card.svg" @@ -135,15 +121,11 @@ exports[`ElasticAgentCard props recommended 1`] = ` betaBadgeLabel="Recommended" description="Use Elastic Agent for a simple, unified way to collect data from your machines." footer={ -
- - Add Elastic Agent - -
+ Add Elastic Agent + } href="/app/integrations/browse" image="/plugins/kibanaReact/assets/elastic_agent_card.svg" @@ -174,15 +156,11 @@ exports[`ElasticAgentCard renders 1`] = ` - - Add Elastic Agent - - + Add Elastic Agent + } href="/app/integrations/browse" image="/plugins/kibanaReact/assets/elastic_agent_card.svg" diff --git a/src/plugins/kibana_react/public/page_template/no_data_page/no_data_card/__snapshots__/no_data_card.test.tsx.snap b/src/plugins/kibana_react/public/page_template/no_data_page/no_data_card/__snapshots__/no_data_card.test.tsx.snap index 6959e2e29095af..fccbbe3a9e8eee 100644 --- a/src/plugins/kibana_react/public/page_template/no_data_page/no_data_card/__snapshots__/no_data_card.test.tsx.snap +++ b/src/plugins/kibana_react/public/page_template/no_data_page/no_data_card/__snapshots__/no_data_card.test.tsx.snap @@ -2,7 +2,7 @@ exports[`NoDataCard props button 1`] = `
-
- -
+ +
`; exports[`NoDataCard props href 1`] = `
-
- -
+ +
`; exports[`NoDataCard props recommended 1`] = `
- `; exports[`NoDataCard renders 1`] = `
- `; From 83a67cd5fd803a3f24c4a99dbc2696081d7e8cd5 Mon Sep 17 00:00:00 2001 From: cchaos Date: Mon, 25 Oct 2021 19:27:35 -0400 Subject: [PATCH 4/4] Remove extra comma --- .../home/public/application/components/tutorial_directory.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/home/public/application/components/tutorial_directory.js b/src/plugins/home/public/application/components/tutorial_directory.js index 6c698c7111b40b..36b301823f1368 100644 --- a/src/plugins/home/public/application/components/tutorial_directory.js +++ b/src/plugins/home/public/application/components/tutorial_directory.js @@ -224,7 +224,7 @@ class TutorialDirectoryUi extends React.Component { description: (