From 3ffa4e7f21d3c39e42c5815c3d5f3a145da485ee Mon Sep 17 00:00:00 2001 From: defazio Date: Wed, 25 Mar 2020 08:53:07 -0400 Subject: [PATCH 01/12] Add es binary token --- src-docs/src/views/icon/tokens.js | 1 + .../icon/assets/tokens/esTokenBinary.js | 19 +++++++++++++++++++ .../icon/assets/tokens/esTokenBinary.svg | 3 +++ src/components/icon/icon.tsx | 1 + src/components/token/token_map.ts | 7 ++++++- 5 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 src/components/icon/assets/tokens/esTokenBinary.js create mode 100644 src/components/icon/assets/tokens/esTokenBinary.svg diff --git a/src-docs/src/views/icon/tokens.js b/src-docs/src/views/icon/tokens.js index 152996284fa8..78b74ddf2f6e 100644 --- a/src-docs/src/views/icon/tokens.js +++ b/src-docs/src/views/icon/tokens.js @@ -60,6 +60,7 @@ const tokens = [ 'tokenFile', 'tokenSymbol', 'tokenRepo', + 'esTokenBinary', ]; export default () => ( diff --git a/src/components/icon/assets/tokens/esTokenBinary.js b/src/components/icon/assets/tokens/esTokenBinary.js new file mode 100644 index 000000000000..1a19279bba67 --- /dev/null +++ b/src/components/icon/assets/tokens/esTokenBinary.js @@ -0,0 +1,19 @@ +import React from 'react'; + +const EuiIconESTokenBinary = ({ title, titleId, ...props }) => ( + + {title ? {title} : null} + + +); + +export const icon = EuiIconESTokenBinary; diff --git a/src/components/icon/assets/tokens/esTokenBinary.svg b/src/components/icon/assets/tokens/esTokenBinary.svg new file mode 100644 index 000000000000..7b5b8293afd3 --- /dev/null +++ b/src/components/icon/assets/tokens/esTokenBinary.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/components/icon/icon.tsx b/src/components/icon/icon.tsx index 1b7815569ccd..3ebc48d30861 100644 --- a/src/components/icon/icon.tsx +++ b/src/components/icon/icon.tsx @@ -394,6 +394,7 @@ const typeToPathMap = { tokenShape: 'tokens/tokenShape', tokenGeo: 'tokens/tokenGeo', tokenRange: 'tokens/tokenRange', + esTokenBinary: 'tokens/esTokenBinary', }; export const TYPES = keysOf(typeToPathMap); diff --git a/src/components/token/token_map.ts b/src/components/token/token_map.ts index bfab347a7522..48bc33147f46 100644 --- a/src/components/token/token_map.ts +++ b/src/components/token/token_map.ts @@ -37,7 +37,8 @@ export type EuiTokenMapType = | 'tokenGeo' | 'tokenRange' | 'tokenSymbol' - | 'tokenVariable'; + | 'tokenVariable' + | 'esTokenBinary'; /** * Most of the style combinations for tokens are semi-arbitrary. However, there was an effort @@ -199,4 +200,8 @@ export const TOKEN_MAP: { shape: 'circle', color: 'euiColorVis3', }, + esTokenBinary: { + shape: 'square', + color: 'euiColorVis4', + }, }; From f07cea6c4eea651f29251c7c877bba45ff799299 Mon Sep 17 00:00:00 2001 From: defazio Date: Wed, 25 Mar 2020 09:21:43 -0400 Subject: [PATCH 02/12] Add flattened, join, percolator tokens --- src-docs/src/views/icon/tokens.js | 3 +++ .../icon/assets/tokens/esTokenFlattened.js | 19 +++++++++++++++++ .../icon/assets/tokens/esTokenFlattened.svg | 4 ++++ .../icon/assets/tokens/esTokenJoin.js | 21 +++++++++++++++++++ .../icon/assets/tokens/esTokenJoin.svg | 3 +++ .../icon/assets/tokens/esTokenPercolator.js | 19 +++++++++++++++++ .../icon/assets/tokens/esTokenPercolator.svg | 3 +++ src/components/icon/icon.tsx | 3 +++ src/components/token/token_map.ts | 17 ++++++++++++++- 9 files changed, 91 insertions(+), 1 deletion(-) create mode 100644 src/components/icon/assets/tokens/esTokenFlattened.js create mode 100644 src/components/icon/assets/tokens/esTokenFlattened.svg create mode 100644 src/components/icon/assets/tokens/esTokenJoin.js create mode 100644 src/components/icon/assets/tokens/esTokenJoin.svg create mode 100644 src/components/icon/assets/tokens/esTokenPercolator.js create mode 100644 src/components/icon/assets/tokens/esTokenPercolator.svg diff --git a/src-docs/src/views/icon/tokens.js b/src-docs/src/views/icon/tokens.js index 78b74ddf2f6e..f93d9f1be4ea 100644 --- a/src-docs/src/views/icon/tokens.js +++ b/src-docs/src/views/icon/tokens.js @@ -61,6 +61,9 @@ const tokens = [ 'tokenSymbol', 'tokenRepo', 'esTokenBinary', + 'esTokenJoin', + 'esTokenPercolator', + 'esTokenFlattened', ]; export default () => ( diff --git a/src/components/icon/assets/tokens/esTokenFlattened.js b/src/components/icon/assets/tokens/esTokenFlattened.js new file mode 100644 index 000000000000..2563d7957fc4 --- /dev/null +++ b/src/components/icon/assets/tokens/esTokenFlattened.js @@ -0,0 +1,19 @@ +import React from 'react'; +// TODO: Change to one line to simplify +const EuiIconESTokenFlattened = ({ title, titleId, ...props }) => ( + + {title ? {title} : null} + + +); + +export const icon = EuiIconESTokenFlattened; diff --git a/src/components/icon/assets/tokens/esTokenFlattened.svg b/src/components/icon/assets/tokens/esTokenFlattened.svg new file mode 100644 index 000000000000..7564107ba44c --- /dev/null +++ b/src/components/icon/assets/tokens/esTokenFlattened.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/src/components/icon/assets/tokens/esTokenJoin.js b/src/components/icon/assets/tokens/esTokenJoin.js new file mode 100644 index 000000000000..66dbea4ea831 --- /dev/null +++ b/src/components/icon/assets/tokens/esTokenJoin.js @@ -0,0 +1,21 @@ +import React from 'react'; + +// TODO: This one does not read very well at small size. Should simplify + +const EuiIconESTokenJoin = ({ title, titleId, ...props }) => ( + + {title ? {title} : null} + + +); + +export const icon = EuiIconESTokenJoin; diff --git a/src/components/icon/assets/tokens/esTokenJoin.svg b/src/components/icon/assets/tokens/esTokenJoin.svg new file mode 100644 index 000000000000..a4da10570b0d --- /dev/null +++ b/src/components/icon/assets/tokens/esTokenJoin.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/components/icon/assets/tokens/esTokenPercolator.js b/src/components/icon/assets/tokens/esTokenPercolator.js new file mode 100644 index 000000000000..1670c10567bc --- /dev/null +++ b/src/components/icon/assets/tokens/esTokenPercolator.js @@ -0,0 +1,19 @@ +import React from 'react'; + +const EuiIconESTokenPercolator = ({ title, titleId, ...props }) => ( + + {title ? {title} : null} + + +); + +export const icon = EuiIconESTokenPercolator; diff --git a/src/components/icon/assets/tokens/esTokenPercolator.svg b/src/components/icon/assets/tokens/esTokenPercolator.svg new file mode 100644 index 000000000000..4134dc61b4aa --- /dev/null +++ b/src/components/icon/assets/tokens/esTokenPercolator.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/components/icon/icon.tsx b/src/components/icon/icon.tsx index 3ebc48d30861..6b16c93bbcff 100644 --- a/src/components/icon/icon.tsx +++ b/src/components/icon/icon.tsx @@ -395,6 +395,9 @@ const typeToPathMap = { tokenGeo: 'tokens/tokenGeo', tokenRange: 'tokens/tokenRange', esTokenBinary: 'tokens/esTokenBinary', + esTokenJoin: 'tokens/esTokenJoin', + esTokenPercolator: 'tokens/esTokenPercolator', + esTokenFlattened: 'tokens/esTokenFlattened', }; export const TYPES = keysOf(typeToPathMap); diff --git a/src/components/token/token_map.ts b/src/components/token/token_map.ts index 48bc33147f46..4763a3605f35 100644 --- a/src/components/token/token_map.ts +++ b/src/components/token/token_map.ts @@ -38,7 +38,10 @@ export type EuiTokenMapType = | 'tokenRange' | 'tokenSymbol' | 'tokenVariable' - | 'esTokenBinary'; + | 'esTokenBinary' + | 'esTokenJoin' + | 'esTokenPercolator' + | 'esTokenFlattened'; /** * Most of the style combinations for tokens are semi-arbitrary. However, there was an effort @@ -204,4 +207,16 @@ export const TOKEN_MAP: { shape: 'square', color: 'euiColorVis4', }, + esTokenJoin: { + shape: 'square', + color: 'euiColorVis5', + }, + esTokenPercolator: { + shape: 'square', + color: 'euiColorVis6', + }, + esTokenFlattened: { + shape: 'square', + color: 'euiColorVis7', + }, }; From 155325088ee18bc47876928238f6be8d6535917e Mon Sep 17 00:00:00 2001 From: defazio Date: Wed, 25 Mar 2020 11:56:18 -0400 Subject: [PATCH 03/12] Add rank feature, keyword and completion suggester token --- src-docs/src/views/icon/tokens.js | 3 +++ .../assets/tokens/esTokenCompSuggester.js | 19 +++++++++++++++++++ .../assets/tokens/esTokenCompSuggester.svg | 3 +++ .../icon/assets/tokens/esTokenKeyword.js | 19 +++++++++++++++++++ .../icon/assets/tokens/esTokenKeyword.svg | 3 +++ .../icon/assets/tokens/esTokenRankFeature.js | 19 +++++++++++++++++++ .../icon/assets/tokens/esTokenRankFeature.svg | 3 +++ src/components/icon/icon.tsx | 3 +++ src/components/token/token_map.ts | 17 ++++++++++++++++- 9 files changed, 88 insertions(+), 1 deletion(-) create mode 100644 src/components/icon/assets/tokens/esTokenCompSuggester.js create mode 100644 src/components/icon/assets/tokens/esTokenCompSuggester.svg create mode 100644 src/components/icon/assets/tokens/esTokenKeyword.js create mode 100644 src/components/icon/assets/tokens/esTokenKeyword.svg create mode 100644 src/components/icon/assets/tokens/esTokenRankFeature.js create mode 100644 src/components/icon/assets/tokens/esTokenRankFeature.svg diff --git a/src-docs/src/views/icon/tokens.js b/src-docs/src/views/icon/tokens.js index f93d9f1be4ea..67b612c4127b 100644 --- a/src-docs/src/views/icon/tokens.js +++ b/src-docs/src/views/icon/tokens.js @@ -64,6 +64,9 @@ const tokens = [ 'esTokenJoin', 'esTokenPercolator', 'esTokenFlattened', + 'esTokenRankFeature', + 'esTokenKeyword', + 'esTokenCompSuggester', ]; export default () => ( diff --git a/src/components/icon/assets/tokens/esTokenCompSuggester.js b/src/components/icon/assets/tokens/esTokenCompSuggester.js new file mode 100644 index 000000000000..519be8eb07f5 --- /dev/null +++ b/src/components/icon/assets/tokens/esTokenCompSuggester.js @@ -0,0 +1,19 @@ +import React from 'react'; + +const EuiIconESTokenCompSuggester = ({ title, titleId, ...props }) => ( + + {title ? {title} : null} + + +); + +export const icon = EuiIconESTokenCompSuggester; diff --git a/src/components/icon/assets/tokens/esTokenCompSuggester.svg b/src/components/icon/assets/tokens/esTokenCompSuggester.svg new file mode 100644 index 000000000000..d0c565bcd2b4 --- /dev/null +++ b/src/components/icon/assets/tokens/esTokenCompSuggester.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/components/icon/assets/tokens/esTokenKeyword.js b/src/components/icon/assets/tokens/esTokenKeyword.js new file mode 100644 index 000000000000..462f2b6618d0 --- /dev/null +++ b/src/components/icon/assets/tokens/esTokenKeyword.js @@ -0,0 +1,19 @@ +import React from 'react'; + +const EuiIconESTokenKeyword = ({ title, titleId, ...props }) => ( + + {title ? {title} : null} + + +); + +export const icon = EuiIconESTokenKeyword; diff --git a/src/components/icon/assets/tokens/esTokenKeyword.svg b/src/components/icon/assets/tokens/esTokenKeyword.svg new file mode 100644 index 000000000000..0648c22c0d1e --- /dev/null +++ b/src/components/icon/assets/tokens/esTokenKeyword.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/components/icon/assets/tokens/esTokenRankFeature.js b/src/components/icon/assets/tokens/esTokenRankFeature.js new file mode 100644 index 000000000000..dab1e606a4cf --- /dev/null +++ b/src/components/icon/assets/tokens/esTokenRankFeature.js @@ -0,0 +1,19 @@ +import React from 'react'; + +const EuiIconESTokenRankFeature = ({ title, titleId, ...props }) => ( + + {title ? {title} : null} + + +); + +export const icon = EuiIconESTokenRankFeature; diff --git a/src/components/icon/assets/tokens/esTokenRankFeature.svg b/src/components/icon/assets/tokens/esTokenRankFeature.svg new file mode 100644 index 000000000000..c408c86400dd --- /dev/null +++ b/src/components/icon/assets/tokens/esTokenRankFeature.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/components/icon/icon.tsx b/src/components/icon/icon.tsx index 6b16c93bbcff..b278e24e6f3d 100644 --- a/src/components/icon/icon.tsx +++ b/src/components/icon/icon.tsx @@ -398,6 +398,9 @@ const typeToPathMap = { esTokenJoin: 'tokens/esTokenJoin', esTokenPercolator: 'tokens/esTokenPercolator', esTokenFlattened: 'tokens/esTokenFlattened', + esTokenRankFeature: 'tokens/esTokenRankFeature', + esTokenKeyword: 'tokens/esTokenKeyword', + esTokenCompSuggester: 'tokens/esTokenCompSuggester', }; export const TYPES = keysOf(typeToPathMap); diff --git a/src/components/token/token_map.ts b/src/components/token/token_map.ts index 4763a3605f35..4568714d5865 100644 --- a/src/components/token/token_map.ts +++ b/src/components/token/token_map.ts @@ -41,7 +41,10 @@ export type EuiTokenMapType = | 'esTokenBinary' | 'esTokenJoin' | 'esTokenPercolator' - | 'esTokenFlattened'; + | 'esTokenFlattened' + | 'esTokenRankFeature' + | 'esTokenKeyword' + | 'esTokenCompSuggester'; /** * Most of the style combinations for tokens are semi-arbitrary. However, there was an effort @@ -219,4 +222,16 @@ export const TOKEN_MAP: { shape: 'square', color: 'euiColorVis7', }, + esTokenRankFeature: { + shape: 'square', + color: 'euiColorVis8', + }, + esTokenKeyword: { + shape: 'square', + color: 'euiColorVis9', + }, + esTokenCompSuggester: { + shape: 'square', + color: 'euiColorVis1', + }, }; From 1cc20a28eac3e0fc658d345843862a2c6650e52f Mon Sep 17 00:00:00 2001 From: defazio Date: Wed, 25 Mar 2020 14:19:44 -0400 Subject: [PATCH 04/12] Update naming, improve join and flatten icons, add dense vector --- src-docs/src/views/icon/tokens.js | 15 +++++---- .../icon/assets/tokens/esTokenFlattened.js | 19 ----------- .../icon/assets/tokens/esTokenFlattened.svg | 4 --- .../icon/assets/tokens/esTokenJoin.js | 21 ------------ .../icon/assets/tokens/esTokenJoin.svg | 3 -- .../{esTokenBinary.js => tokenBinary.js} | 4 +-- .../{esTokenBinary.svg => tokenBinary.svg} | 0 ...CompSuggester.js => tokenCompSuggester.js} | 4 +-- ...mpSuggester.svg => tokenCompSuggester.svg} | 0 .../icon/assets/tokens/tokenDenseVector.js | 19 +++++++++++ .../icon/assets/tokens/tokenDenseVector.svg | 3 ++ .../icon/assets/tokens/tokenFlattened.js | 19 +++++++++++ .../icon/assets/tokens/tokenFlattened.svg | 3 ++ .../icon/assets/tokens/tokenJoin.js | 19 +++++++++++ .../icon/assets/tokens/tokenJoin.svg | 4 +++ .../{esTokenKeyword.js => tokenKeyword.js} | 4 +-- .../{esTokenKeyword.svg => tokenKeyword.svg} | 0 ...sTokenPercolator.js => tokenPercolator.js} | 4 +-- ...okenPercolator.svg => tokenPercolator.svg} | 0 ...okenRankFeature.js => tokenRankFeature.js} | 4 +-- ...enRankFeature.svg => tokenRankFeature.svg} | 0 src/components/icon/icon.tsx | 15 +++++---- src/components/token/token_map.ts | 33 +++++++++++-------- 23 files changed, 112 insertions(+), 85 deletions(-) delete mode 100644 src/components/icon/assets/tokens/esTokenFlattened.js delete mode 100644 src/components/icon/assets/tokens/esTokenFlattened.svg delete mode 100644 src/components/icon/assets/tokens/esTokenJoin.js delete mode 100644 src/components/icon/assets/tokens/esTokenJoin.svg rename src/components/icon/assets/tokens/{esTokenBinary.js => tokenBinary.js} (76%) rename src/components/icon/assets/tokens/{esTokenBinary.svg => tokenBinary.svg} (100%) rename src/components/icon/assets/tokens/{esTokenCompSuggester.js => tokenCompSuggester.js} (90%) rename src/components/icon/assets/tokens/{esTokenCompSuggester.svg => tokenCompSuggester.svg} (100%) create mode 100644 src/components/icon/assets/tokens/tokenDenseVector.js create mode 100644 src/components/icon/assets/tokens/tokenDenseVector.svg create mode 100644 src/components/icon/assets/tokens/tokenFlattened.js create mode 100644 src/components/icon/assets/tokens/tokenFlattened.svg create mode 100644 src/components/icon/assets/tokens/tokenJoin.js create mode 100644 src/components/icon/assets/tokens/tokenJoin.svg rename src/components/icon/assets/tokens/{esTokenKeyword.js => tokenKeyword.js} (89%) rename src/components/icon/assets/tokens/{esTokenKeyword.svg => tokenKeyword.svg} (100%) rename src/components/icon/assets/tokens/{esTokenPercolator.js => tokenPercolator.js} (89%) rename src/components/icon/assets/tokens/{esTokenPercolator.svg => tokenPercolator.svg} (100%) rename src/components/icon/assets/tokens/{esTokenRankFeature.js => tokenRankFeature.js} (74%) rename src/components/icon/assets/tokens/{esTokenRankFeature.svg => tokenRankFeature.svg} (100%) diff --git a/src-docs/src/views/icon/tokens.js b/src-docs/src/views/icon/tokens.js index 67b612c4127b..fa151c112ac9 100644 --- a/src-docs/src/views/icon/tokens.js +++ b/src-docs/src/views/icon/tokens.js @@ -60,13 +60,14 @@ const tokens = [ 'tokenFile', 'tokenSymbol', 'tokenRepo', - 'esTokenBinary', - 'esTokenJoin', - 'esTokenPercolator', - 'esTokenFlattened', - 'esTokenRankFeature', - 'esTokenKeyword', - 'esTokenCompSuggester', + 'tokenBinary', + 'tokenJoin', + 'tokenPercolator', + 'tokenFlattened', + 'tokenRankFeature', + 'tokenKeyword', + 'tokenCompSuggester', + 'tokenDenseVector', ]; export default () => ( diff --git a/src/components/icon/assets/tokens/esTokenFlattened.js b/src/components/icon/assets/tokens/esTokenFlattened.js deleted file mode 100644 index 2563d7957fc4..000000000000 --- a/src/components/icon/assets/tokens/esTokenFlattened.js +++ /dev/null @@ -1,19 +0,0 @@ -import React from 'react'; -// TODO: Change to one line to simplify -const EuiIconESTokenFlattened = ({ title, titleId, ...props }) => ( - - {title ? {title} : null} - - -); - -export const icon = EuiIconESTokenFlattened; diff --git a/src/components/icon/assets/tokens/esTokenFlattened.svg b/src/components/icon/assets/tokens/esTokenFlattened.svg deleted file mode 100644 index 7564107ba44c..000000000000 --- a/src/components/icon/assets/tokens/esTokenFlattened.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/components/icon/assets/tokens/esTokenJoin.js b/src/components/icon/assets/tokens/esTokenJoin.js deleted file mode 100644 index 66dbea4ea831..000000000000 --- a/src/components/icon/assets/tokens/esTokenJoin.js +++ /dev/null @@ -1,21 +0,0 @@ -import React from 'react'; - -// TODO: This one does not read very well at small size. Should simplify - -const EuiIconESTokenJoin = ({ title, titleId, ...props }) => ( - - {title ? {title} : null} - - -); - -export const icon = EuiIconESTokenJoin; diff --git a/src/components/icon/assets/tokens/esTokenJoin.svg b/src/components/icon/assets/tokens/esTokenJoin.svg deleted file mode 100644 index a4da10570b0d..000000000000 --- a/src/components/icon/assets/tokens/esTokenJoin.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/components/icon/assets/tokens/esTokenBinary.js b/src/components/icon/assets/tokens/tokenBinary.js similarity index 76% rename from src/components/icon/assets/tokens/esTokenBinary.js rename to src/components/icon/assets/tokens/tokenBinary.js index 1a19279bba67..3f31d3f91b57 100644 --- a/src/components/icon/assets/tokens/esTokenBinary.js +++ b/src/components/icon/assets/tokens/tokenBinary.js @@ -1,6 +1,6 @@ import React from 'react'; -const EuiIconESTokenBinary = ({ title, titleId, ...props }) => ( +const EuiIconTokenBinary = ({ title, titleId, ...props }) => ( ( ); -export const icon = EuiIconESTokenBinary; +export const icon = EuiIconTokenBinary; diff --git a/src/components/icon/assets/tokens/esTokenBinary.svg b/src/components/icon/assets/tokens/tokenBinary.svg similarity index 100% rename from src/components/icon/assets/tokens/esTokenBinary.svg rename to src/components/icon/assets/tokens/tokenBinary.svg diff --git a/src/components/icon/assets/tokens/esTokenCompSuggester.js b/src/components/icon/assets/tokens/tokenCompSuggester.js similarity index 90% rename from src/components/icon/assets/tokens/esTokenCompSuggester.js rename to src/components/icon/assets/tokens/tokenCompSuggester.js index 519be8eb07f5..d11149cf537c 100644 --- a/src/components/icon/assets/tokens/esTokenCompSuggester.js +++ b/src/components/icon/assets/tokens/tokenCompSuggester.js @@ -1,6 +1,6 @@ import React from 'react'; -const EuiIconESTokenCompSuggester = ({ title, titleId, ...props }) => ( +const EuiIconTokenCompSuggester = ({ title, titleId, ...props }) => ( ( ); -export const icon = EuiIconESTokenCompSuggester; +export const icon = EuiIconTokenCompSuggester; diff --git a/src/components/icon/assets/tokens/esTokenCompSuggester.svg b/src/components/icon/assets/tokens/tokenCompSuggester.svg similarity index 100% rename from src/components/icon/assets/tokens/esTokenCompSuggester.svg rename to src/components/icon/assets/tokens/tokenCompSuggester.svg diff --git a/src/components/icon/assets/tokens/tokenDenseVector.js b/src/components/icon/assets/tokens/tokenDenseVector.js new file mode 100644 index 000000000000..e28b38238cc2 --- /dev/null +++ b/src/components/icon/assets/tokens/tokenDenseVector.js @@ -0,0 +1,19 @@ +import React from 'react'; + +const EuiIconTokenDenseVector = ({ title, titleId, ...props }) => ( + + {title ? {title} : null} + + +); + +export const icon = EuiIconTokenDenseVector; diff --git a/src/components/icon/assets/tokens/tokenDenseVector.svg b/src/components/icon/assets/tokens/tokenDenseVector.svg new file mode 100644 index 000000000000..66cbdf889042 --- /dev/null +++ b/src/components/icon/assets/tokens/tokenDenseVector.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/components/icon/assets/tokens/tokenFlattened.js b/src/components/icon/assets/tokens/tokenFlattened.js new file mode 100644 index 000000000000..608195416c92 --- /dev/null +++ b/src/components/icon/assets/tokens/tokenFlattened.js @@ -0,0 +1,19 @@ +import React from 'react'; + +const EuiIconTokenFlattened = ({ title, titleId, ...props }) => ( + + {title ? {title} : null} + + +); + +export const icon = EuiIconTokenFlattened; diff --git a/src/components/icon/assets/tokens/tokenFlattened.svg b/src/components/icon/assets/tokens/tokenFlattened.svg new file mode 100644 index 000000000000..2bd08dcefdf2 --- /dev/null +++ b/src/components/icon/assets/tokens/tokenFlattened.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/src/components/icon/assets/tokens/tokenJoin.js b/src/components/icon/assets/tokens/tokenJoin.js new file mode 100644 index 000000000000..b906a212122a --- /dev/null +++ b/src/components/icon/assets/tokens/tokenJoin.js @@ -0,0 +1,19 @@ +import React from 'react'; + +const EuiIconTokenJoin = ({ title, titleId, ...props }) => ( + + {title ? {title} : null} + + +); + +export const icon = EuiIconTokenJoin; diff --git a/src/components/icon/assets/tokens/tokenJoin.svg b/src/components/icon/assets/tokens/tokenJoin.svg new file mode 100644 index 000000000000..6a43ce38b6ac --- /dev/null +++ b/src/components/icon/assets/tokens/tokenJoin.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/components/icon/assets/tokens/esTokenKeyword.js b/src/components/icon/assets/tokens/tokenKeyword.js similarity index 89% rename from src/components/icon/assets/tokens/esTokenKeyword.js rename to src/components/icon/assets/tokens/tokenKeyword.js index 462f2b6618d0..3c7bbe75397a 100644 --- a/src/components/icon/assets/tokens/esTokenKeyword.js +++ b/src/components/icon/assets/tokens/tokenKeyword.js @@ -1,6 +1,6 @@ import React from 'react'; -const EuiIconESTokenKeyword = ({ title, titleId, ...props }) => ( +const EuiIconTokenKeyword = ({ title, titleId, ...props }) => ( ( ); -export const icon = EuiIconESTokenKeyword; +export const icon = EuiIconTokenKeyword; diff --git a/src/components/icon/assets/tokens/esTokenKeyword.svg b/src/components/icon/assets/tokens/tokenKeyword.svg similarity index 100% rename from src/components/icon/assets/tokens/esTokenKeyword.svg rename to src/components/icon/assets/tokens/tokenKeyword.svg diff --git a/src/components/icon/assets/tokens/esTokenPercolator.js b/src/components/icon/assets/tokens/tokenPercolator.js similarity index 89% rename from src/components/icon/assets/tokens/esTokenPercolator.js rename to src/components/icon/assets/tokens/tokenPercolator.js index 1670c10567bc..8a005dc8ace4 100644 --- a/src/components/icon/assets/tokens/esTokenPercolator.js +++ b/src/components/icon/assets/tokens/tokenPercolator.js @@ -1,6 +1,6 @@ import React from 'react'; -const EuiIconESTokenPercolator = ({ title, titleId, ...props }) => ( +const EuiIconTokenPercolator = ({ title, titleId, ...props }) => ( ( ); -export const icon = EuiIconESTokenPercolator; +export const icon = EuiIconTokenPercolator; diff --git a/src/components/icon/assets/tokens/esTokenPercolator.svg b/src/components/icon/assets/tokens/tokenPercolator.svg similarity index 100% rename from src/components/icon/assets/tokens/esTokenPercolator.svg rename to src/components/icon/assets/tokens/tokenPercolator.svg diff --git a/src/components/icon/assets/tokens/esTokenRankFeature.js b/src/components/icon/assets/tokens/tokenRankFeature.js similarity index 74% rename from src/components/icon/assets/tokens/esTokenRankFeature.js rename to src/components/icon/assets/tokens/tokenRankFeature.js index dab1e606a4cf..8360254f1a45 100644 --- a/src/components/icon/assets/tokens/esTokenRankFeature.js +++ b/src/components/icon/assets/tokens/tokenRankFeature.js @@ -1,6 +1,6 @@ import React from 'react'; -const EuiIconESTokenRankFeature = ({ title, titleId, ...props }) => ( +const EuiIconTokenRankFeature = ({ title, titleId, ...props }) => ( ( ); -export const icon = EuiIconESTokenRankFeature; +export const icon = EuiIconTokenRankFeature; diff --git a/src/components/icon/assets/tokens/esTokenRankFeature.svg b/src/components/icon/assets/tokens/tokenRankFeature.svg similarity index 100% rename from src/components/icon/assets/tokens/esTokenRankFeature.svg rename to src/components/icon/assets/tokens/tokenRankFeature.svg diff --git a/src/components/icon/icon.tsx b/src/components/icon/icon.tsx index b278e24e6f3d..2552cb78a398 100644 --- a/src/components/icon/icon.tsx +++ b/src/components/icon/icon.tsx @@ -394,13 +394,14 @@ const typeToPathMap = { tokenShape: 'tokens/tokenShape', tokenGeo: 'tokens/tokenGeo', tokenRange: 'tokens/tokenRange', - esTokenBinary: 'tokens/esTokenBinary', - esTokenJoin: 'tokens/esTokenJoin', - esTokenPercolator: 'tokens/esTokenPercolator', - esTokenFlattened: 'tokens/esTokenFlattened', - esTokenRankFeature: 'tokens/esTokenRankFeature', - esTokenKeyword: 'tokens/esTokenKeyword', - esTokenCompSuggester: 'tokens/esTokenCompSuggester', + tokenBinary: 'tokens/tokenBinary', + tokenJoin: 'tokens/tokenJoin', + tokenPercolator: 'tokens/tokenPercolator', + tokenFlattened: 'tokens/tokenFlattened', + tokenRankFeature: 'tokens/tokenRankFeature', + tokenKeyword: 'tokens/tokenKeyword', + tokenCompSuggester: 'tokens/tokenCompSuggester', + tokenDenseVector: 'tokens/tokenDenseVector', }; export const TYPES = keysOf(typeToPathMap); diff --git a/src/components/token/token_map.ts b/src/components/token/token_map.ts index 4568714d5865..6539ceff9a8c 100644 --- a/src/components/token/token_map.ts +++ b/src/components/token/token_map.ts @@ -38,13 +38,14 @@ export type EuiTokenMapType = | 'tokenRange' | 'tokenSymbol' | 'tokenVariable' - | 'esTokenBinary' - | 'esTokenJoin' - | 'esTokenPercolator' - | 'esTokenFlattened' - | 'esTokenRankFeature' - | 'esTokenKeyword' - | 'esTokenCompSuggester'; + | 'tokenBinary' + | 'tokenJoin' + | 'tokenPercolator' + | 'tokenFlattened' + | 'tokenRankFeature' + | 'tokenKeyword' + | 'tokenCompSuggester' + | 'tokenDenseVector'; /** * Most of the style combinations for tokens are semi-arbitrary. However, there was an effort @@ -206,32 +207,36 @@ export const TOKEN_MAP: { shape: 'circle', color: 'euiColorVis3', }, - esTokenBinary: { + tokenBinary: { shape: 'square', color: 'euiColorVis4', }, - esTokenJoin: { + tokenJoin: { shape: 'square', color: 'euiColorVis5', }, - esTokenPercolator: { + tokenPercolator: { shape: 'square', color: 'euiColorVis6', }, - esTokenFlattened: { + tokenFlattened: { shape: 'square', color: 'euiColorVis7', }, - esTokenRankFeature: { + tokenRankFeature: { shape: 'square', color: 'euiColorVis8', }, - esTokenKeyword: { + tokenKeyword: { shape: 'square', color: 'euiColorVis9', }, - esTokenCompSuggester: { + tokenCompSuggester: { shape: 'square', color: 'euiColorVis1', }, + tokenDenseVector: { + shape: 'square', + color: 'euiColorVis2', + }, }; From 15d8403d92e87a7920c69050b6950ed4748c8dec Mon Sep 17 00:00:00 2001 From: defazio Date: Thu, 26 Mar 2020 08:22:48 -0400 Subject: [PATCH 05/12] Add text token, improve rank feature, keyword --- src-docs/src/views/icon/tokens.js | 1 + .../icon/assets/tokens/tokenKeyword.js | 12 ++++++++---- .../icon/assets/tokens/tokenKeyword.svg | 10 ++++++++-- .../icon/assets/tokens/tokenRankFeature.js | 5 +---- .../icon/assets/tokens/tokenRankFeature.svg | 4 ++-- src/components/icon/assets/tokens/tokenText.js | 16 ++++++++++++++++ src/components/icon/assets/tokens/tokenText.svg | 4 ++++ src/components/icon/icon.tsx | 1 + src/components/token/token_map.ts | 7 ++++++- 9 files changed, 47 insertions(+), 13 deletions(-) create mode 100644 src/components/icon/assets/tokens/tokenText.js create mode 100644 src/components/icon/assets/tokens/tokenText.svg diff --git a/src-docs/src/views/icon/tokens.js b/src-docs/src/views/icon/tokens.js index fa151c112ac9..aed8590340bf 100644 --- a/src-docs/src/views/icon/tokens.js +++ b/src-docs/src/views/icon/tokens.js @@ -68,6 +68,7 @@ const tokens = [ 'tokenKeyword', 'tokenCompSuggester', 'tokenDenseVector', + 'tokenText', ]; export default () => ( diff --git a/src/components/icon/assets/tokens/tokenKeyword.js b/src/components/icon/assets/tokens/tokenKeyword.js index 3c7bbe75397a..1e90b78a1c17 100644 --- a/src/components/icon/assets/tokens/tokenKeyword.js +++ b/src/components/icon/assets/tokens/tokenKeyword.js @@ -9,10 +9,14 @@ const EuiIconTokenKeyword = ({ title, titleId, ...props }) => ( aria-labelledby={titleId} {...props}> {title ? {title} : null} - + + + + ); diff --git a/src/components/icon/assets/tokens/tokenKeyword.svg b/src/components/icon/assets/tokens/tokenKeyword.svg index 0648c22c0d1e..1eb3d2b389c4 100644 --- a/src/components/icon/assets/tokens/tokenKeyword.svg +++ b/src/components/icon/assets/tokens/tokenKeyword.svg @@ -1,3 +1,9 @@ - - + + + + + + + + diff --git a/src/components/icon/assets/tokens/tokenRankFeature.js b/src/components/icon/assets/tokens/tokenRankFeature.js index 8360254f1a45..789e964c1d17 100644 --- a/src/components/icon/assets/tokens/tokenRankFeature.js +++ b/src/components/icon/assets/tokens/tokenRankFeature.js @@ -9,10 +9,7 @@ const EuiIconTokenRankFeature = ({ title, titleId, ...props }) => ( aria-labelledby={titleId} {...props}> {title ? {title} : null} - + ); diff --git a/src/components/icon/assets/tokens/tokenRankFeature.svg b/src/components/icon/assets/tokens/tokenRankFeature.svg index c408c86400dd..53380ae096fe 100644 --- a/src/components/icon/assets/tokens/tokenRankFeature.svg +++ b/src/components/icon/assets/tokens/tokenRankFeature.svg @@ -1,3 +1,3 @@ - - + + \ No newline at end of file diff --git a/src/components/icon/assets/tokens/tokenText.js b/src/components/icon/assets/tokens/tokenText.js new file mode 100644 index 000000000000..4fce59c31a80 --- /dev/null +++ b/src/components/icon/assets/tokens/tokenText.js @@ -0,0 +1,16 @@ +import React from 'react'; + +const EuiIconTokenText = ({ title, titleId, ...props }) => ( + + {title ? {title} : null} + + +); + +export const icon = EuiIconTokenText; diff --git a/src/components/icon/assets/tokens/tokenText.svg b/src/components/icon/assets/tokens/tokenText.svg new file mode 100644 index 000000000000..bdba54dd5820 --- /dev/null +++ b/src/components/icon/assets/tokens/tokenText.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/components/icon/icon.tsx b/src/components/icon/icon.tsx index 2552cb78a398..f8cae47960fc 100644 --- a/src/components/icon/icon.tsx +++ b/src/components/icon/icon.tsx @@ -402,6 +402,7 @@ const typeToPathMap = { tokenKeyword: 'tokens/tokenKeyword', tokenCompSuggester: 'tokens/tokenCompSuggester', tokenDenseVector: 'tokens/tokenDenseVector', + tokenText: 'tokens/tokenText', }; export const TYPES = keysOf(typeToPathMap); diff --git a/src/components/token/token_map.ts b/src/components/token/token_map.ts index 6539ceff9a8c..9c62da416883 100644 --- a/src/components/token/token_map.ts +++ b/src/components/token/token_map.ts @@ -45,7 +45,8 @@ export type EuiTokenMapType = | 'tokenRankFeature' | 'tokenKeyword' | 'tokenCompSuggester' - | 'tokenDenseVector'; + | 'tokenDenseVector' + | 'tokenText'; /** * Most of the style combinations for tokens are semi-arbitrary. However, there was an effort @@ -239,4 +240,8 @@ export const TOKEN_MAP: { shape: 'square', color: 'euiColorVis2', }, + tokenText: { + shape: 'square', + color: 'euiColorVis3', + }, }; From d68f399d0ea0cad149c67b8b39234386749114db Mon Sep 17 00:00:00 2001 From: defazio Date: Thu, 26 Mar 2020 10:38:42 -0400 Subject: [PATCH 06/12] Add count, rank features, search-as-you-type and histogram tokens. Improve join, binary and percolator tokens. --- src-docs/src/views/icon/tokens.js | 4 ++++ .../icon/assets/tokens/tokenBinary.js | 5 +--- .../icon/assets/tokens/tokenBinary.svg | 3 ++- .../icon/assets/tokens/tokenCount.js | 21 ++++++++++++++++ .../icon/assets/tokens/tokenCount.svg | 13 ++++++++++ .../icon/assets/tokens/tokenHistogram.js | 20 ++++++++++++++++ .../icon/assets/tokens/tokenHistogram.svg | 3 +++ .../icon/assets/tokens/tokenJoin.js | 2 +- .../icon/assets/tokens/tokenJoin.svg | 3 +-- .../icon/assets/tokens/tokenPercolator.js | 21 ++++++++++++---- .../icon/assets/tokens/tokenPercolator.svg | 8 +++++-- .../icon/assets/tokens/tokenRankFeatures.js | 16 +++++++++++++ .../icon/assets/tokens/tokenRankFeatures.svg | 3 +++ .../icon/assets/tokens/tokenSearchType.js | 24 +++++++++++++++++++ .../icon/assets/tokens/tokenSearchType.svg | 7 ++++++ src/components/icon/icon.tsx | 4 ++++ src/components/token/token_map.ts | 22 ++++++++++++++++- 17 files changed, 164 insertions(+), 15 deletions(-) create mode 100644 src/components/icon/assets/tokens/tokenCount.js create mode 100644 src/components/icon/assets/tokens/tokenCount.svg create mode 100644 src/components/icon/assets/tokens/tokenHistogram.js create mode 100644 src/components/icon/assets/tokens/tokenHistogram.svg create mode 100644 src/components/icon/assets/tokens/tokenRankFeatures.js create mode 100644 src/components/icon/assets/tokens/tokenRankFeatures.svg create mode 100644 src/components/icon/assets/tokens/tokenSearchType.js create mode 100644 src/components/icon/assets/tokens/tokenSearchType.svg diff --git a/src-docs/src/views/icon/tokens.js b/src-docs/src/views/icon/tokens.js index aed8590340bf..f92c10a80ab8 100644 --- a/src-docs/src/views/icon/tokens.js +++ b/src-docs/src/views/icon/tokens.js @@ -65,10 +65,14 @@ const tokens = [ 'tokenPercolator', 'tokenFlattened', 'tokenRankFeature', + 'tokenRankFeatures', 'tokenKeyword', 'tokenCompSuggester', 'tokenDenseVector', 'tokenText', + 'tokenCount', + 'tokenSearchType', + 'tokenHistogram', ]; export default () => ( diff --git a/src/components/icon/assets/tokens/tokenBinary.js b/src/components/icon/assets/tokens/tokenBinary.js index 3f31d3f91b57..5bb742ee632d 100644 --- a/src/components/icon/assets/tokens/tokenBinary.js +++ b/src/components/icon/assets/tokens/tokenBinary.js @@ -9,10 +9,7 @@ const EuiIconTokenBinary = ({ title, titleId, ...props }) => ( aria-labelledby={titleId} {...props}> {title ? {title} : null} - + ); diff --git a/src/components/icon/assets/tokens/tokenBinary.svg b/src/components/icon/assets/tokens/tokenBinary.svg index 7b5b8293afd3..b8aa0f3bfe1e 100644 --- a/src/components/icon/assets/tokens/tokenBinary.svg +++ b/src/components/icon/assets/tokens/tokenBinary.svg @@ -1,3 +1,4 @@ - + + diff --git a/src/components/icon/assets/tokens/tokenCount.js b/src/components/icon/assets/tokens/tokenCount.js new file mode 100644 index 000000000000..08771f44706f --- /dev/null +++ b/src/components/icon/assets/tokens/tokenCount.js @@ -0,0 +1,21 @@ +import React from 'react'; + +const EuiIconTokenBinary = ({ title, titleId, ...props }) => ( + + {title ? {title} : null} + + + + + + + +); + +export const icon = EuiIconTokenBinary; diff --git a/src/components/icon/assets/tokens/tokenCount.svg b/src/components/icon/assets/tokens/tokenCount.svg new file mode 100644 index 000000000000..4c8e6cb9a1fa --- /dev/null +++ b/src/components/icon/assets/tokens/tokenCount.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/src/components/icon/assets/tokens/tokenHistogram.js b/src/components/icon/assets/tokens/tokenHistogram.js new file mode 100644 index 000000000000..b98ff11f630a --- /dev/null +++ b/src/components/icon/assets/tokens/tokenHistogram.js @@ -0,0 +1,20 @@ +import React from 'react'; + +const EuiIconTokenHistogram = ({ title, titleId, ...props }) => ( + + {title ? {title} : null} + + +); + +export const icon = EuiIconTokenHistogram; diff --git a/src/components/icon/assets/tokens/tokenHistogram.svg b/src/components/icon/assets/tokens/tokenHistogram.svg new file mode 100644 index 000000000000..1a13dee0b829 --- /dev/null +++ b/src/components/icon/assets/tokens/tokenHistogram.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/src/components/icon/assets/tokens/tokenJoin.js b/src/components/icon/assets/tokens/tokenJoin.js index b906a212122a..adc84dd8879d 100644 --- a/src/components/icon/assets/tokens/tokenJoin.js +++ b/src/components/icon/assets/tokens/tokenJoin.js @@ -11,7 +11,7 @@ const EuiIconTokenJoin = ({ title, titleId, ...props }) => ( {title ? {title} : null} ); diff --git a/src/components/icon/assets/tokens/tokenJoin.svg b/src/components/icon/assets/tokens/tokenJoin.svg index 6a43ce38b6ac..dd6fd8b5450f 100644 --- a/src/components/icon/assets/tokens/tokenJoin.svg +++ b/src/components/icon/assets/tokens/tokenJoin.svg @@ -1,4 +1,3 @@ - + - diff --git a/src/components/icon/assets/tokens/tokenPercolator.js b/src/components/icon/assets/tokens/tokenPercolator.js index 8a005dc8ace4..731545da3881 100644 --- a/src/components/icon/assets/tokens/tokenPercolator.js +++ b/src/components/icon/assets/tokens/tokenPercolator.js @@ -9,10 +9,23 @@ const EuiIconTokenPercolator = ({ title, titleId, ...props }) => ( aria-labelledby={titleId} {...props}> {title ? {title} : null} - + + + + + ); diff --git a/src/components/icon/assets/tokens/tokenPercolator.svg b/src/components/icon/assets/tokens/tokenPercolator.svg index 4134dc61b4aa..dcfcaad18923 100644 --- a/src/components/icon/assets/tokens/tokenPercolator.svg +++ b/src/components/icon/assets/tokens/tokenPercolator.svg @@ -1,3 +1,7 @@ - - + + + + + + \ No newline at end of file diff --git a/src/components/icon/assets/tokens/tokenRankFeatures.js b/src/components/icon/assets/tokens/tokenRankFeatures.js new file mode 100644 index 000000000000..0e01424c0c07 --- /dev/null +++ b/src/components/icon/assets/tokens/tokenRankFeatures.js @@ -0,0 +1,16 @@ +import React from 'react'; + +const EuiIconTokenRankFeatures = ({ title, titleId, ...props }) => ( + + {title ? {title} : null} + + +); + +export const icon = EuiIconTokenRankFeatures; diff --git a/src/components/icon/assets/tokens/tokenRankFeatures.svg b/src/components/icon/assets/tokens/tokenRankFeatures.svg new file mode 100644 index 000000000000..53380ae096fe --- /dev/null +++ b/src/components/icon/assets/tokens/tokenRankFeatures.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/src/components/icon/assets/tokens/tokenSearchType.js b/src/components/icon/assets/tokens/tokenSearchType.js new file mode 100644 index 000000000000..9d972aa13a5c --- /dev/null +++ b/src/components/icon/assets/tokens/tokenSearchType.js @@ -0,0 +1,24 @@ +import React from 'react'; + +const EuiIconTokenSearchType = ({ title, titleId, ...props }) => ( + + {title ? {title} : null} + + + + + + +); + +export const icon = EuiIconTokenSearchType; diff --git a/src/components/icon/assets/tokens/tokenSearchType.svg b/src/components/icon/assets/tokens/tokenSearchType.svg new file mode 100644 index 000000000000..c6511c2ed935 --- /dev/null +++ b/src/components/icon/assets/tokens/tokenSearchType.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/src/components/icon/icon.tsx b/src/components/icon/icon.tsx index f8cae47960fc..dc80fffe1788 100644 --- a/src/components/icon/icon.tsx +++ b/src/components/icon/icon.tsx @@ -399,10 +399,14 @@ const typeToPathMap = { tokenPercolator: 'tokens/tokenPercolator', tokenFlattened: 'tokens/tokenFlattened', tokenRankFeature: 'tokens/tokenRankFeature', + tokenRankFeatures: 'tokens/tokenRankFeatures', tokenKeyword: 'tokens/tokenKeyword', tokenCompSuggester: 'tokens/tokenCompSuggester', tokenDenseVector: 'tokens/tokenDenseVector', tokenText: 'tokens/tokenText', + tokenCount: 'tokens/tokenCount', + tokenSearchType: 'tokens/tokenSearchType', + tokenHistogram: 'tokens/tokenHistogram', }; export const TYPES = keysOf(typeToPathMap); diff --git a/src/components/token/token_map.ts b/src/components/token/token_map.ts index 9c62da416883..e7e246557f4c 100644 --- a/src/components/token/token_map.ts +++ b/src/components/token/token_map.ts @@ -43,10 +43,14 @@ export type EuiTokenMapType = | 'tokenPercolator' | 'tokenFlattened' | 'tokenRankFeature' + | 'tokenRankFeatures' | 'tokenKeyword' | 'tokenCompSuggester' | 'tokenDenseVector' - | 'tokenText'; + | 'tokenText' + | 'tokenCount' + | 'tokenSearchType' + | 'tokenHistogram'; /** * Most of the style combinations for tokens are semi-arbitrary. However, there was an effort @@ -228,6 +232,10 @@ export const TOKEN_MAP: { shape: 'square', color: 'euiColorVis8', }, + tokenRankFeatures: { + shape: 'square', + color: 'euiColorVis3', + }, tokenKeyword: { shape: 'square', color: 'euiColorVis9', @@ -244,4 +252,16 @@ export const TOKEN_MAP: { shape: 'square', color: 'euiColorVis3', }, + tokenCount: { + shape: 'square', + color: 'euiColorVis4', + }, + tokenSearchType: { + shape: 'square', + color: 'euiColorVis5', + }, + tokenHistogram: { + shape: 'square', + color: 'euiColorVis6', + }, }; From a64e204fc263af8744992d5cbd3501369c34a3f5 Mon Sep 17 00:00:00 2001 From: defazio Date: Mon, 30 Mar 2020 07:00:32 -0400 Subject: [PATCH 07/12] Update icon tests, update names, clean up a few icons --- src-docs/src/views/icon/tokens.js | 4 +- .../icon/__snapshots__/icon.test.tsx.snap | 264 ++++++++++++++++++ .../icon/assets/tokens/tokenBinary.svg | 3 +- .../icon/assets/tokens/tokenCompSuggester.js | 19 -- .../icon/assets/tokens/tokenCompSuggester.svg | 3 - .../assets/tokens/tokenCompletionSuggester.js | 23 ++ .../tokens/tokenCompletionSuggester.svg | 7 + .../icon/assets/tokens/tokenCount.js | 21 -- .../icon/assets/tokens/tokenCount.svg | 13 - .../icon/assets/tokens/tokenHistogram.js | 6 +- .../icon/assets/tokens/tokenHistogram.svg | 2 +- .../icon/assets/tokens/tokenKeyword.js | 8 +- .../icon/assets/tokens/tokenKeyword.svg | 11 +- .../icon/assets/tokens/tokenPercolator.js | 22 +- .../icon/assets/tokens/tokenPercolator.svg | 9 +- .../icon/assets/tokens/tokenSearchType.js | 4 +- .../icon/assets/tokens/tokenTokenCount.js | 21 ++ .../icon/assets/tokens/tokenTokenCount.svg | 8 + src/components/icon/icon.tsx | 4 +- src/components/token/token_map.ts | 8 +- 20 files changed, 352 insertions(+), 108 deletions(-) delete mode 100644 src/components/icon/assets/tokens/tokenCompSuggester.js delete mode 100644 src/components/icon/assets/tokens/tokenCompSuggester.svg create mode 100644 src/components/icon/assets/tokens/tokenCompletionSuggester.js create mode 100644 src/components/icon/assets/tokens/tokenCompletionSuggester.svg delete mode 100644 src/components/icon/assets/tokens/tokenCount.js delete mode 100644 src/components/icon/assets/tokens/tokenCount.svg create mode 100644 src/components/icon/assets/tokens/tokenTokenCount.js create mode 100644 src/components/icon/assets/tokens/tokenTokenCount.svg diff --git a/src-docs/src/views/icon/tokens.js b/src-docs/src/views/icon/tokens.js index f92c10a80ab8..ca6ece5e795f 100644 --- a/src-docs/src/views/icon/tokens.js +++ b/src-docs/src/views/icon/tokens.js @@ -67,10 +67,10 @@ const tokens = [ 'tokenRankFeature', 'tokenRankFeatures', 'tokenKeyword', - 'tokenCompSuggester', + 'tokenCompletionSuggester', 'tokenDenseVector', 'tokenText', - 'tokenCount', + 'tokenTokenCount', 'tokenSearchType', 'tokenHistogram', ]; diff --git a/src/components/icon/__snapshots__/icon.test.tsx.snap b/src/components/icon/__snapshots__/icon.test.tsx.snap index 884cca1da108..86b7b30277b8 100644 --- a/src/components/icon/__snapshots__/icon.test.tsx.snap +++ b/src/components/icon/__snapshots__/icon.test.tsx.snap @@ -7572,6 +7572,24 @@ exports[`EuiIcon props type tokenArray is rendered 1`] = ` `; +exports[`EuiIcon props type tokenBinary is rendered 1`] = ` + +`; + exports[`EuiIcon props type tokenBoolean is rendered 1`] = ` ); diff --git a/src/components/icon/assets/tokens/tokenRankFeatures.svg b/src/components/icon/assets/tokens/tokenRankFeatures.svg index 53380ae096fe..96c9ccabcd75 100644 --- a/src/components/icon/assets/tokens/tokenRankFeatures.svg +++ b/src/components/icon/assets/tokens/tokenRankFeatures.svg @@ -1,3 +1,3 @@ - + \ No newline at end of file From 2756a283f95cd0a25f9459d9503fa813326f4887 Mon Sep 17 00:00:00 2001 From: defazio Date: Mon, 30 Mar 2020 12:01:56 -0400 Subject: [PATCH 09/12] Update tests --- .../__snapshots__/draggable.test.tsx.snap | 22 ++- .../__snapshots__/droppable.test.tsx.snap | 9 +- .../icon/__snapshots__/icon.test.tsx.snap | 9 +- .../token/__snapshots__/token.test.tsx.snap | 130 ++++++++++++++++++ 4 files changed, 147 insertions(+), 23 deletions(-) diff --git a/src/components/drag_and_drop/__snapshots__/draggable.test.tsx.snap b/src/components/drag_and_drop/__snapshots__/draggable.test.tsx.snap index 0e70b7e31b51..a3403368cf21 100644 --- a/src/components/drag_and_drop/__snapshots__/draggable.test.tsx.snap +++ b/src/components/drag_and_drop/__snapshots__/draggable.test.tsx.snap @@ -1,12 +1,11 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP exports[`EuiDraggable can be given ReactElement children 1`] = ` -"
-
+"
+
Hello
@@ -16,12 +15,11 @@ data-test-subj=\\"droppable\\" class=\\"euiDroppable euiDroppable--noGrow\\"> exports[`EuiDraggable can be given ReactElement children 2`] = `undefined`; exports[`EuiDraggable is rendered 1`] = ` -"
-
+"
+
Hello
diff --git a/src/components/drag_and_drop/__snapshots__/droppable.test.tsx.snap b/src/components/drag_and_drop/__snapshots__/droppable.test.tsx.snap index f3914ee9d8d6..9736c0c810ac 100644 --- a/src/components/drag_and_drop/__snapshots__/droppable.test.tsx.snap +++ b/src/components/drag_and_drop/__snapshots__/droppable.test.tsx.snap @@ -3,8 +3,7 @@ exports[`EuiDroppable can be given ReactElement children 1`] = `
@@ -17,8 +16,7 @@ exports[`EuiDroppable can be given ReactElement children 1`] = ` exports[`EuiDroppable can be given multiple ReactElement children 1`] = `
@@ -33,8 +31,7 @@ exports[`EuiDroppable can be given multiple ReactElement children 1`] = ` exports[`EuiDroppable is rendered 1`] = `
diff --git a/src/components/icon/__snapshots__/icon.test.tsx.snap b/src/components/icon/__snapshots__/icon.test.tsx.snap index 86b7b30277b8..e9fbff65125a 100644 --- a/src/components/icon/__snapshots__/icon.test.tsx.snap +++ b/src/components/icon/__snapshots__/icon.test.tsx.snap @@ -7947,7 +7947,8 @@ exports[`EuiIcon props type tokenJoin is rendered 1`] = ` xmlns="http://www.w3.org/2000/svg" > @@ -8250,8 +8251,7 @@ exports[`EuiIcon props type tokenRankFeature is rendered 1`] = ` xmlns="http://www.w3.org/2000/svg" > `; @@ -8268,8 +8268,7 @@ exports[`EuiIcon props type tokenRankFeatures is rendered 1`] = ` xmlns="http://www.w3.org/2000/svg" > `; diff --git a/src/components/token/__snapshots__/token.test.tsx.snap b/src/components/token/__snapshots__/token.test.tsx.snap index a99768e2ea19..dc8abca53ebb 100644 --- a/src/components/token/__snapshots__/token.test.tsx.snap +++ b/src/components/token/__snapshots__/token.test.tsx.snap @@ -193,6 +193,16 @@ exports[`EuiToken props iconType as EuiTokenMapType tokenArray is rendered 1`] = `; +exports[`EuiToken props iconType as EuiTokenMapType tokenBinary is rendered 1`] = ` + +
+ +`; + exports[`EuiToken props iconType as EuiTokenMapType tokenBoolean is rendered 1`] = ` `; +exports[`EuiToken props iconType as EuiTokenMapType tokenCompletionSuggester is rendered 1`] = ` + +
+ +`; + exports[`EuiToken props iconType as EuiTokenMapType tokenConstant is rendered 1`] = ` `; +exports[`EuiToken props iconType as EuiTokenMapType tokenDenseVector is rendered 1`] = ` + +
+ +`; + exports[`EuiToken props iconType as EuiTokenMapType tokenElement is rendered 1`] = ` `; +exports[`EuiToken props iconType as EuiTokenMapType tokenFlattened is rendered 1`] = ` + +
+ +`; + exports[`EuiToken props iconType as EuiTokenMapType tokenFunction is rendered 1`] = ` `; +exports[`EuiToken props iconType as EuiTokenMapType tokenHistogram is rendered 1`] = ` + +
+ +`; + exports[`EuiToken props iconType as EuiTokenMapType tokenIP is rendered 1`] = ` `; +exports[`EuiToken props iconType as EuiTokenMapType tokenJoin is rendered 1`] = ` + +
+ +`; + exports[`EuiToken props iconType as EuiTokenMapType tokenKey is rendered 1`] = ` `; +exports[`EuiToken props iconType as EuiTokenMapType tokenKeyword is rendered 1`] = ` + +
+ +`; + exports[`EuiToken props iconType as EuiTokenMapType tokenMethod is rendered 1`] = ` `; +exports[`EuiToken props iconType as EuiTokenMapType tokenPercolator is rendered 1`] = ` + +
+ +`; + exports[`EuiToken props iconType as EuiTokenMapType tokenProperty is rendered 1`] = ` `; +exports[`EuiToken props iconType as EuiTokenMapType tokenRankFeature is rendered 1`] = ` + +
+ +`; + +exports[`EuiToken props iconType as EuiTokenMapType tokenRankFeatures is rendered 1`] = ` + +
+ +`; + exports[`EuiToken props iconType as EuiTokenMapType tokenRepo is rendered 1`] = ` `; +exports[`EuiToken props iconType as EuiTokenMapType tokenSearchType is rendered 1`] = ` + +
+ +`; + exports[`EuiToken props iconType as EuiTokenMapType tokenShape is rendered 1`] = ` `; +exports[`EuiToken props iconType as EuiTokenMapType tokenText is rendered 1`] = ` + +
+ +`; + +exports[`EuiToken props iconType as EuiTokenMapType tokenTokenCount is rendered 1`] = ` + +
+ +`; + exports[`EuiToken props iconType as EuiTokenMapType tokenVariable is rendered 1`] = ` Date: Mon, 30 Mar 2020 15:55:36 -0400 Subject: [PATCH 10/12] Revert "Update tests" This reverts commit 2756a283f95cd0a25f9459d9503fa813326f4887. --- .../__snapshots__/draggable.test.tsx.snap | 22 ++++++++++--------- .../__snapshots__/droppable.test.tsx.snap | 9 +++++--- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/src/components/drag_and_drop/__snapshots__/draggable.test.tsx.snap b/src/components/drag_and_drop/__snapshots__/draggable.test.tsx.snap index a3403368cf21..0e70b7e31b51 100644 --- a/src/components/drag_and_drop/__snapshots__/draggable.test.tsx.snap +++ b/src/components/drag_and_drop/__snapshots__/draggable.test.tsx.snap @@ -1,11 +1,12 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP exports[`EuiDraggable can be given ReactElement children 1`] = ` -"
-
+"
+
Hello
@@ -15,11 +16,12 @@ class=\\"euiDroppable euiDroppable--noGrow\\"> exports[`EuiDraggable can be given ReactElement children 2`] = `undefined`; exports[`EuiDraggable is rendered 1`] = ` -"
-
+"
+
Hello
diff --git a/src/components/drag_and_drop/__snapshots__/droppable.test.tsx.snap b/src/components/drag_and_drop/__snapshots__/droppable.test.tsx.snap index 9736c0c810ac..f3914ee9d8d6 100644 --- a/src/components/drag_and_drop/__snapshots__/droppable.test.tsx.snap +++ b/src/components/drag_and_drop/__snapshots__/droppable.test.tsx.snap @@ -3,7 +3,8 @@ exports[`EuiDroppable can be given ReactElement children 1`] = `
@@ -16,7 +17,8 @@ exports[`EuiDroppable can be given ReactElement children 1`] = ` exports[`EuiDroppable can be given multiple ReactElement children 1`] = `
@@ -31,7 +33,8 @@ exports[`EuiDroppable can be given multiple ReactElement children 1`] = ` exports[`EuiDroppable is rendered 1`] = `
From d95d060acb89f0ae17f065b42303a8944453443d Mon Sep 17 00:00:00 2001 From: defazio Date: Mon, 30 Mar 2020 16:32:14 -0400 Subject: [PATCH 11/12] Update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 75a3d9bae5c6..992f6dc64226 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ - Upgraded `react-beautiful-dnd` to v13 ([#3064](https://github.com/elastic/eui/pull/3064)) - Fixed `EuiPagination` vertical alignment of the text when used as `compressed` ([#3152](https://github.com/elastic/eui/pull/3152)) - Added `showTooltip` prop for `EuiSuperUpdateButton` to show tooltip and showing only once popovers are closed ([#3127](https://github.com/elastic/eui/pull/3127)) +- Added new Elasticsearch token types ([58036](https://github.com/elastic/kibana/issues/58036)) **Bug Fixes** From 22264cc37077ead251cb4cad3545fada953a450f Mon Sep 17 00:00:00 2001 From: defazio Date: Mon, 30 Mar 2020 16:47:17 -0400 Subject: [PATCH 12/12] Update changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c7cf81f592be..022564b627d8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ - Improved `htmlIdGenerator` when supplying both `prefix` and `suffix` ([#3076](https://github.com/elastic/eui/pull/3076)) - Updated pagination prop descriptions for `EuiInMemoryTable` ([#3142](https://github.com/elastic/eui/pull/3142)) - Added `title` and `aria` attributes to `EuiToken`'s icon element ([#3195](https://github.com/elastic/eui/pull/3195)) +- Added new Elasticsearch token types ([58036](https://github.com/elastic/kibana/issues/58036)) ## [`22.2.0`](https://github.com/elastic/eui/tree/v22.2.0) @@ -61,7 +62,6 @@ - Upgraded `react-beautiful-dnd` to v13 ([#3064](https://github.com/elastic/eui/pull/3064)) - Fixed `EuiPagination` vertical alignment of the text when used as `compressed` ([#3152](https://github.com/elastic/eui/pull/3152)) - Added `showTooltip` prop for `EuiSuperUpdateButton` to show tooltip and showing only once popovers are closed ([#3127](https://github.com/elastic/eui/pull/3127)) -- Added new Elasticsearch token types ([58036](https://github.com/elastic/kibana/issues/58036)) **Bug Fixes**