From 5ed4768886a23b64eff2f87d7997e15b1597db3a Mon Sep 17 00:00:00 2001 From: Marra Sherrier Date: Mon, 13 Jul 2020 13:06:01 -0400 Subject: [PATCH 1/4] adding analyze event security icon --- CHANGELOG.md | 2 +- src-docs/src/views/icon/icons.js | 2 + .../icon/__snapshots__/icon.test.tsx.snap | 168 ++++++++++++------ src/components/icon/assets/analyze_event.js | 22 +++ src/components/icon/assets/analyze_event.svg | 3 + .../icon/assets/analyze_event_disabled.js | 40 +++++ .../icon/assets/analyze_event_disabled.svg | 16 ++ .../icon/assets/tokens/tokenBinary.js | 2 +- .../assets/tokens/tokenCompletionSuggester.js | 18 +- .../icon/assets/tokens/tokenDenseVector.js | 5 +- .../icon/assets/tokens/tokenFlattened.js | 5 +- .../icon/assets/tokens/tokenHistogram.js | 2 +- .../icon/assets/tokens/tokenJoin.js | 2 +- .../icon/assets/tokens/tokenKeyword.js | 14 +- .../icon/assets/tokens/tokenPercolator.js | 2 +- .../icon/assets/tokens/tokenRankFeature.js | 2 +- .../icon/assets/tokens/tokenRankFeatures.js | 2 +- .../icon/assets/tokens/tokenSearchType.js | 15 +- .../icon/assets/tokens/tokenText.js | 2 +- .../icon/assets/tokens/tokenTokenCount.js | 11 +- src/components/icon/icon.tsx | 2 + 21 files changed, 228 insertions(+), 109 deletions(-) create mode 100644 src/components/icon/assets/analyze_event.js create mode 100644 src/components/icon/assets/analyze_event.svg create mode 100644 src/components/icon/assets/analyze_event_disabled.js create mode 100644 src/components/icon/assets/analyze_event_disabled.svg diff --git a/CHANGELOG.md b/CHANGELOG.md index d94b270350e..420f73477e1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ ## [`master`](https://github.com/elastic/eui/tree/master) -No public interface changes since `27.0.0`. +- Added `analyzeEvent` and `analyzeEventDisabled` glyph to `EuiIcon` ([#3364](https://github.com/elastic/eui/pull/3364)) ## [`27.0.0`](https://github.com/elastic/eui/tree/v27.0.0) - Added `paddingSize` prop to `EuiCard` ([#3638](https://github.com/elastic/eui/pull/3638)) diff --git a/src-docs/src/views/icon/icons.js b/src-docs/src/views/icon/icons.js index 09d4ad6f288..51386d7b931 100644 --- a/src-docs/src/views/icon/icons.js +++ b/src-docs/src/views/icon/icons.js @@ -24,6 +24,8 @@ export const iconTypes = [ 'accessibility', 'aggregate', 'alert', + 'analyzeEvent', + 'analyzeEventDisabled', 'annotation', 'apmTrace', 'apps', diff --git a/src/components/icon/__snapshots__/icon.test.tsx.snap b/src/components/icon/__snapshots__/icon.test.tsx.snap index 4cfd06a76a9..3daaad2c817 100644 --- a/src/components/icon/__snapshots__/icon.test.tsx.snap +++ b/src/components/icon/__snapshots__/icon.test.tsx.snap @@ -566,6 +566,80 @@ exports[`EuiIcon props type alert is rendered 1`] = ` `; +exports[`EuiIcon props type analyzeEvent is rendered 1`] = ` + +`; + +exports[`EuiIcon props type analyzeEventDisabled is rendered 1`] = ` + +`; + exports[`EuiIcon props type annotation is rendered 1`] = ` @@ -7693,16 +7767,14 @@ exports[`EuiIcon props type tokenCompletionSuggester is rendered 1`] = ` width="16" xmlns="http://www.w3.org/2000/svg" > - - - - + + `; @@ -7754,8 +7826,7 @@ exports[`EuiIcon props type tokenDenseVector is rendered 1`] = ` xmlns="http://www.w3.org/2000/svg" > `; @@ -7896,8 +7967,7 @@ exports[`EuiIcon props type tokenFlattened is rendered 1`] = ` xmlns="http://www.w3.org/2000/svg" > `; @@ -7950,7 +8020,7 @@ exports[`EuiIcon props type tokenHistogram is rendered 1`] = ` xmlns="http://www.w3.org/2000/svg" > `; @@ -8004,7 +8074,7 @@ exports[`EuiIcon props type tokenJoin is rendered 1`] = ` > @@ -8039,16 +8109,14 @@ exports[`EuiIcon props type tokenKeyword is rendered 1`] = ` width="16" xmlns="http://www.w3.org/2000/svg" > - - - - + + `; @@ -8250,7 +8318,7 @@ exports[`EuiIcon props type tokenPercolator is rendered 1`] = ` > @@ -8307,7 +8375,7 @@ exports[`EuiIcon props type tokenRankFeature is rendered 1`] = ` xmlns="http://www.w3.org/2000/svg" > `; @@ -8324,7 +8392,7 @@ exports[`EuiIcon props type tokenRankFeatures is rendered 1`] = ` xmlns="http://www.w3.org/2000/svg" > `; @@ -8358,19 +8426,14 @@ exports[`EuiIcon props type tokenSearchType is rendered 1`] = ` width="16" xmlns="http://www.w3.org/2000/svg" > - - - - - + + `; @@ -8456,7 +8519,7 @@ exports[`EuiIcon props type tokenText is rendered 1`] = ` xmlns="http://www.w3.org/2000/svg" > `; @@ -8472,20 +8535,9 @@ exports[`EuiIcon props type tokenTokenCount is rendered 1`] = ` width="16" xmlns="http://www.w3.org/2000/svg" > - - - - - - + `; diff --git a/src/components/icon/assets/analyze_event.js b/src/components/icon/assets/analyze_event.js new file mode 100644 index 00000000000..6a0419073e7 --- /dev/null +++ b/src/components/icon/assets/analyze_event.js @@ -0,0 +1,22 @@ +import React from 'react'; + +const EuiIconAnalyzeEvent = ({ title, titleId, ...props }) => ( + + {title ? {title} : null} + + +); + +export const icon = EuiIconAnalyzeEvent; diff --git a/src/components/icon/assets/analyze_event.svg b/src/components/icon/assets/analyze_event.svg new file mode 100644 index 00000000000..3478299b630 --- /dev/null +++ b/src/components/icon/assets/analyze_event.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/components/icon/assets/analyze_event_disabled.js b/src/components/icon/assets/analyze_event_disabled.js new file mode 100644 index 00000000000..8d9abd0a6e8 --- /dev/null +++ b/src/components/icon/assets/analyze_event_disabled.js @@ -0,0 +1,40 @@ +import React from 'react'; + +const EuiIconAnalyzeEventDisabled = ({ title, titleId, ...props }) => ( + + {title ? {title} : null} + + + + + + + + + + + + + + + +); + +export const icon = EuiIconAnalyzeEventDisabled; diff --git a/src/components/icon/assets/analyze_event_disabled.svg b/src/components/icon/assets/analyze_event_disabled.svg new file mode 100644 index 00000000000..0301ea59253 --- /dev/null +++ b/src/components/icon/assets/analyze_event_disabled.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/src/components/icon/assets/tokens/tokenBinary.js b/src/components/icon/assets/tokens/tokenBinary.js index 5bb742ee632..3c0d99a6b2d 100644 --- a/src/components/icon/assets/tokens/tokenBinary.js +++ b/src/components/icon/assets/tokens/tokenBinary.js @@ -9,7 +9,7 @@ const EuiIconTokenBinary = ({ title, titleId, ...props }) => ( aria-labelledby={titleId} {...props}> {title ? {title} : null} - + ); diff --git a/src/components/icon/assets/tokens/tokenCompletionSuggester.js b/src/components/icon/assets/tokens/tokenCompletionSuggester.js index d6068de89a6..43adcfac30f 100644 --- a/src/components/icon/assets/tokens/tokenCompletionSuggester.js +++ b/src/components/icon/assets/tokens/tokenCompletionSuggester.js @@ -1,6 +1,6 @@ import React from 'react'; -const EuiIconTokenCompSuggester = ({ title, titleId, ...props }) => ( +const EuiIconTokenCompletionSuggester = ({ title, titleId, ...props }) => ( ( aria-labelledby={titleId} {...props}> {title ? {title} : null} - - - - + + ); -export const icon = EuiIconTokenCompSuggester; +export const icon = EuiIconTokenCompletionSuggester; diff --git a/src/components/icon/assets/tokens/tokenDenseVector.js b/src/components/icon/assets/tokens/tokenDenseVector.js index e28b38238cc..9be0a93d6b3 100644 --- a/src/components/icon/assets/tokens/tokenDenseVector.js +++ b/src/components/icon/assets/tokens/tokenDenseVector.js @@ -9,10 +9,7 @@ const EuiIconTokenDenseVector = ({ title, titleId, ...props }) => ( aria-labelledby={titleId} {...props}> {title ? {title} : null} - + ); diff --git a/src/components/icon/assets/tokens/tokenFlattened.js b/src/components/icon/assets/tokens/tokenFlattened.js index 608195416c9..54b57ac916c 100644 --- a/src/components/icon/assets/tokens/tokenFlattened.js +++ b/src/components/icon/assets/tokens/tokenFlattened.js @@ -9,10 +9,7 @@ const EuiIconTokenFlattened = ({ title, titleId, ...props }) => ( aria-labelledby={titleId} {...props}> {title ? {title} : null} - + ); diff --git a/src/components/icon/assets/tokens/tokenHistogram.js b/src/components/icon/assets/tokens/tokenHistogram.js index 1160996f1e6..b276e5e4c6f 100644 --- a/src/components/icon/assets/tokens/tokenHistogram.js +++ b/src/components/icon/assets/tokens/tokenHistogram.js @@ -9,7 +9,7 @@ const EuiIconTokenHistogram = ({ title, titleId, ...props }) => ( aria-labelledby={titleId} {...props}> {title ? {title} : null} - + ); diff --git a/src/components/icon/assets/tokens/tokenJoin.js b/src/components/icon/assets/tokens/tokenJoin.js index ff64807f2e0..656bb246584 100644 --- a/src/components/icon/assets/tokens/tokenJoin.js +++ b/src/components/icon/assets/tokens/tokenJoin.js @@ -12,7 +12,7 @@ const EuiIconTokenJoin = ({ title, titleId, ...props }) => ( ); diff --git a/src/components/icon/assets/tokens/tokenKeyword.js b/src/components/icon/assets/tokens/tokenKeyword.js index ece20ee44f0..7cd18fe50b8 100644 --- a/src/components/icon/assets/tokens/tokenKeyword.js +++ b/src/components/icon/assets/tokens/tokenKeyword.js @@ -9,14 +9,12 @@ const EuiIconTokenKeyword = ({ title, titleId, ...props }) => ( aria-labelledby={titleId} {...props}> {title ? {title} : null} - - - - + + ); diff --git a/src/components/icon/assets/tokens/tokenPercolator.js b/src/components/icon/assets/tokens/tokenPercolator.js index 9df4d8d30e7..1ef487ded71 100644 --- a/src/components/icon/assets/tokens/tokenPercolator.js +++ b/src/components/icon/assets/tokens/tokenPercolator.js @@ -12,7 +12,7 @@ const EuiIconTokenPercolator = ({ title, titleId, ...props }) => ( ); diff --git a/src/components/icon/assets/tokens/tokenRankFeature.js b/src/components/icon/assets/tokens/tokenRankFeature.js index 852568d0516..12afdbe9ae5 100644 --- a/src/components/icon/assets/tokens/tokenRankFeature.js +++ b/src/components/icon/assets/tokens/tokenRankFeature.js @@ -9,7 +9,7 @@ const EuiIconTokenRankFeature = ({ title, titleId, ...props }) => ( aria-labelledby={titleId} {...props}> {title ? {title} : null} - + ); diff --git a/src/components/icon/assets/tokens/tokenRankFeatures.js b/src/components/icon/assets/tokens/tokenRankFeatures.js index 8c8f0709712..11bc332ed90 100644 --- a/src/components/icon/assets/tokens/tokenRankFeatures.js +++ b/src/components/icon/assets/tokens/tokenRankFeatures.js @@ -9,7 +9,7 @@ const EuiIconTokenRankFeatures = ({ title, titleId, ...props }) => ( aria-labelledby={titleId} {...props}> {title ? {title} : null} - + ); diff --git a/src/components/icon/assets/tokens/tokenSearchType.js b/src/components/icon/assets/tokens/tokenSearchType.js index 53727c46702..1ef4c961c07 100644 --- a/src/components/icon/assets/tokens/tokenSearchType.js +++ b/src/components/icon/assets/tokens/tokenSearchType.js @@ -9,15 +9,12 @@ const EuiIconTokenSearchType = ({ title, titleId, ...props }) => ( aria-labelledby={titleId} {...props}> {title ? {title} : null} - - - - - + + ); diff --git a/src/components/icon/assets/tokens/tokenText.js b/src/components/icon/assets/tokens/tokenText.js index 4fce59c31a8..ed42bee52da 100644 --- a/src/components/icon/assets/tokens/tokenText.js +++ b/src/components/icon/assets/tokens/tokenText.js @@ -9,7 +9,7 @@ const EuiIconTokenText = ({ title, titleId, ...props }) => ( aria-labelledby={titleId} {...props}> {title ? {title} : null} - + ); diff --git a/src/components/icon/assets/tokens/tokenTokenCount.js b/src/components/icon/assets/tokens/tokenTokenCount.js index 6da0c71e529..1f342f90c7a 100644 --- a/src/components/icon/assets/tokens/tokenTokenCount.js +++ b/src/components/icon/assets/tokens/tokenTokenCount.js @@ -1,6 +1,6 @@ import React from 'react'; -const EuiIconTokenBinary = ({ title, titleId, ...props }) => ( +const EuiIconTokenTokenCount = ({ title, titleId, ...props }) => ( ( aria-labelledby={titleId} {...props}> {title ? {title} : null} - - - - - - + ); -export const icon = EuiIconTokenBinary; +export const icon = EuiIconTokenTokenCount; diff --git a/src/components/icon/icon.tsx b/src/components/icon/icon.tsx index a13c32046b7..6dbdf22524c 100644 --- a/src/components/icon/icon.tsx +++ b/src/components/icon/icon.tsx @@ -42,6 +42,8 @@ const typeToPathMap = { advancedSettingsApp: 'app_advanced_settings', aggregate: 'aggregate', alert: 'alert', + analyzeEvent: 'analyze_event', + analyzeEventDisabled: 'analyze_event_disabled', annotation: 'annotation', apmApp: 'app_apm', apmTrace: 'apm_trace', From d70f8e63f50d4e582a4990c08fbef2c5f05fc66e Mon Sep 17 00:00:00 2001 From: Marra Sherrier Date: Wed, 15 Jul 2020 13:30:06 -0400 Subject: [PATCH 2/4] updating analyze_event icon --- CHANGELOG.md | 1 + src-docs/src/views/icon/icons.js | 1 - src/components/icon/assets/analyze_event.js | 5 +-- src/components/icon/assets/analyze_event.svg | 4 +- .../icon/assets/analyze_event_disabled.js | 40 ------------------- .../icon/assets/analyze_event_disabled.svg | 16 -------- 6 files changed, 4 insertions(+), 63 deletions(-) delete mode 100644 src/components/icon/assets/analyze_event_disabled.js delete mode 100644 src/components/icon/assets/analyze_event_disabled.svg diff --git a/CHANGELOG.md b/CHANGELOG.md index 705eb27cd77..5c089369d06 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ - Updated `securityAnalyticsApp` app icon ([#3720](https://github.com/elastic/eui/pull/3720)) - Removed `src/test` and `@types/enzyme` references from `eui.d.ts` ([#3715](https://github.com/elastic/eui/pull/3715)) - Added `index.d.ts` file to `lib/test` and `es/test` ([#3715](https://github.com/elastic/eui/pull/3715)) +- Updated `analyzeEvent` glyph in `EuiIcon` ([#3729](https://github.com/elastic/eui/pull/3729)) ## [`27.0.0`](https://github.com/elastic/eui/tree/v27.0.0) - Added `paddingSize` prop to `EuiCard` ([#3638](https://github.com/elastic/eui/pull/3638)) diff --git a/src-docs/src/views/icon/icons.js b/src-docs/src/views/icon/icons.js index 51386d7b931..180512c64f7 100644 --- a/src-docs/src/views/icon/icons.js +++ b/src-docs/src/views/icon/icons.js @@ -25,7 +25,6 @@ export const iconTypes = [ 'aggregate', 'alert', 'analyzeEvent', - 'analyzeEventDisabled', 'annotation', 'apmTrace', 'apps', diff --git a/src/components/icon/assets/analyze_event.js b/src/components/icon/assets/analyze_event.js index 6a0419073e7..d79b9aff495 100644 --- a/src/components/icon/assets/analyze_event.js +++ b/src/components/icon/assets/analyze_event.js @@ -4,17 +4,14 @@ const EuiIconAnalyzeEvent = ({ title, titleId, ...props }) => ( {title ? {title} : null} ); diff --git a/src/components/icon/assets/analyze_event.svg b/src/components/icon/assets/analyze_event.svg index 3478299b630..2acf13f4fff 100644 --- a/src/components/icon/assets/analyze_event.svg +++ b/src/components/icon/assets/analyze_event.svg @@ -1,3 +1,3 @@ - - + + diff --git a/src/components/icon/assets/analyze_event_disabled.js b/src/components/icon/assets/analyze_event_disabled.js deleted file mode 100644 index 8d9abd0a6e8..00000000000 --- a/src/components/icon/assets/analyze_event_disabled.js +++ /dev/null @@ -1,40 +0,0 @@ -import React from 'react'; - -const EuiIconAnalyzeEventDisabled = ({ title, titleId, ...props }) => ( - - {title ? {title} : null} - - - - - - - - - - - - - - - -); - -export const icon = EuiIconAnalyzeEventDisabled; diff --git a/src/components/icon/assets/analyze_event_disabled.svg b/src/components/icon/assets/analyze_event_disabled.svg deleted file mode 100644 index 0301ea59253..00000000000 --- a/src/components/icon/assets/analyze_event_disabled.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - From a98a5c337e6c146ce2a3dd45f5feb2408d40167d Mon Sep 17 00:00:00 2001 From: Marra Sherrier Date: Wed, 15 Jul 2020 14:49:44 -0400 Subject: [PATCH 3/4] updating again --- .../icon/__snapshots__/icon.test.tsx.snap | 58 +------------------ src/components/icon/icon.tsx | 1 - 2 files changed, 1 insertion(+), 58 deletions(-) diff --git a/src/components/icon/__snapshots__/icon.test.tsx.snap b/src/components/icon/__snapshots__/icon.test.tsx.snap index 16b3a9a6305..f17958fee77 100644 --- a/src/components/icon/__snapshots__/icon.test.tsx.snap +++ b/src/components/icon/__snapshots__/icon.test.tsx.snap @@ -570,76 +570,20 @@ exports[`EuiIcon props type analyzeEvent is rendered 1`] = ` `; -exports[`EuiIcon props type analyzeEventDisabled is rendered 1`] = ` - -`; - exports[`EuiIcon props type annotation is rendered 1`] = `