From 5896c2c3cf79bd66221117ca725e2bccfb42032f Mon Sep 17 00:00:00 2001 From: Sergey Myssak Date: Tue, 18 Apr 2023 07:32:57 +0600 Subject: [PATCH] Normalize interlink URL usage (#698) Co-authored-by: Andrey Myssak Signed-off-by: Sergey Myssak --- src-docs/src/views/badge/badge_example.js | 4 ++- src-docs/src/views/call_out/danger.js | 5 +++- src-docs/src/views/call_out/warning.js | 2 +- src-docs/src/views/card/card_footer.js | 9 ++++--- src-docs/src/views/card/card_image.js | 2 +- src-docs/src/views/card/card_layout.js | 2 +- .../src/views/datagrid/additional_controls.js | 2 +- src-docs/src/views/datagrid/container.js | 2 +- src-docs/src/views/datagrid/datagrid.js | 6 +++-- src-docs/src/views/datagrid/in_memory.js | 6 +++-- .../views/datagrid/in_memory_enhancements.js | 6 +++-- .../views/datagrid/in_memory_pagination.js | 6 +++-- .../src/views/datagrid/in_memory_sorting.js | 6 +++-- src-docs/src/views/datagrid/virtualization.js | 6 +++-- .../datagrid/virtualization_constrained.js | 6 +++-- src-docs/src/views/flyout/flyout_banner.js | 3 ++- src-docs/src/views/header/header.js | 2 +- src-docs/src/views/header/header_alert.js | 12 +++++++-- .../views/header/header_elastic_pattern.js | 4 ++- src-docs/src/views/header/header_example.js | 6 ++--- src-docs/src/views/header/header_sections.js | 2 +- .../src/views/key_pad_menu/key_pad_beta.js | 8 +++--- .../src/views/key_pad_menu/key_pad_menu.js | 17 ++++++++++--- .../key_pad_menu/key_pad_menu_example.js | 6 ++--- src-docs/src/views/link/link.js | 20 +++++++-------- src-docs/src/views/link/link_example.js | 4 +-- .../list_group/list_group_item_color.tsx | 25 ++++++++++++++++--- src-docs/src/views/progress/progress_fixed.js | 2 +- src-docs/src/views/suggest/hashtag_popover.js | 4 +-- src-docs/src/views/tables/auto/auto.js | 8 +++--- src-docs/src/views/tables/basic/basic.js | 4 +-- src-docs/src/views/tables/custom/custom.js | 10 ++++++-- src-docs/src/views/text/playground.js | 4 +-- src-docs/src/views/text/text.js | 8 +++--- src-docs/src/views/text/text_color.js | 2 +- src-docs/src/views/toast/success.js | 5 +++- src-docs/src/views/toast/toast_list.js | 5 +++- 37 files changed, 152 insertions(+), 79 deletions(-) diff --git a/src-docs/src/views/badge/badge_example.js b/src-docs/src/views/badge/badge_example.js index 830bff3a13..655491886d 100644 --- a/src-docs/src/views/badge/badge_example.js +++ b/src-docs/src/views/badge/badge_example.js @@ -102,7 +102,9 @@ const badgeHealthSnippet = [ import BadgeHref from './badge_href'; const badgeHrefSource = require('!!raw-loader!./badge_href'); const badgeHrefHtml = renderToHtml(BadgeHref); -const badgeHrefSnippet = ['']; +const badgeHrefSnippet = [ + '', +]; import BadgeTruncate from './badge_truncate'; const badgeTruncateSource = require('!!raw-loader!./badge_truncate'); diff --git a/src-docs/src/views/call_out/danger.js b/src-docs/src/views/call_out/danger.js index f61b8b9aa1..87b0cc477a 100644 --- a/src-docs/src/views/call_out/danger.js +++ b/src-docs/src/views/call_out/danger.js @@ -17,7 +17,10 @@ export default () => (

Now you have to fix it, but maybe{' '} - this link can help. + + this link can help + + .

); diff --git a/src-docs/src/views/call_out/warning.js b/src-docs/src/views/call_out/warning.js index 52bfea224c..3fcca08258 100644 --- a/src-docs/src/views/call_out/warning.js +++ b/src-docs/src/views/call_out/warning.js @@ -23,7 +23,7 @@ export default () => ( .

- + Link button diff --git a/src-docs/src/views/card/card_footer.js b/src-docs/src/views/card/card_footer.js index 69ffae5da3..b55f6c759d 100644 --- a/src-docs/src/views/card/card_footer.js +++ b/src-docs/src/views/card/card_footer.js @@ -37,7 +37,8 @@ export default () => (

- Choice Two + Choice{' '} + Two

@@ -55,7 +56,8 @@ export default () => (

- Choice Two + Choice{' '} + Two

@@ -73,7 +75,8 @@ export default () => (

- Choice Two + Choice{' '} + Two

diff --git a/src-docs/src/views/card/card_image.js b/src-docs/src/views/card/card_image.js index 1306a9e960..b103eec9ed 100644 --- a/src-docs/src/views/card/card_image.js +++ b/src-docs/src/views/card/card_image.js @@ -57,7 +57,7 @@ export default () => ( } title={'Title'} diff --git a/src-docs/src/views/card/card_layout.js b/src-docs/src/views/card/card_layout.js index 4429611dfd..7cfc8c42bf 100644 --- a/src-docs/src/views/card/card_layout.js +++ b/src-docs/src/views/card/card_layout.js @@ -45,7 +45,7 @@ export default () => ( title={'No icon example'} description="Example of a card's description. Stick to one or two sentences." onClick={() => {}} - href="#" + href="https://oui.opensearch.org/latest/" /> diff --git a/src-docs/src/views/datagrid/additional_controls.js b/src-docs/src/views/datagrid/additional_controls.js index 9530efab28..b0319ed739 100644 --- a/src-docs/src/views/datagrid/additional_controls.js +++ b/src-docs/src/views/datagrid/additional_controls.js @@ -45,7 +45,7 @@ for (let i = 1; i < 20; i++) { ), email: faker.helpers.fake('{{internet.email}}'), city: ( - + {faker.helpers.fake('{{location.city}}')} ), diff --git a/src-docs/src/views/datagrid/container.js b/src-docs/src/views/datagrid/container.js index c8c1cfdffe..16760be989 100644 --- a/src-docs/src/views/datagrid/container.js +++ b/src-docs/src/views/datagrid/container.js @@ -41,7 +41,7 @@ for (let i = 1; i < 20; i++) { ), email: faker.helpers.fake('{{internet.email}}'), city: ( - + {faker.helpers.fake('{{location.city}}')} ), diff --git a/src-docs/src/views/datagrid/datagrid.js b/src-docs/src/views/datagrid/datagrid.js index 091490e8b5..03c3d81635 100644 --- a/src-docs/src/views/datagrid/datagrid.js +++ b/src-docs/src/views/datagrid/datagrid.js @@ -46,14 +46,16 @@ for (let i = 1; i < 100; i++) { }, email: { formatted: ( - {faker.helpers.fake('{{internet.email}}')} + + {faker.helpers.fake('{{internet.email}}')} + ), raw: email, }, location: ( {`${faker.helpers.fake('{{location.city}}')}, `} - + {faker.helpers.fake('{{location.country}}')} diff --git a/src-docs/src/views/datagrid/in_memory.js b/src-docs/src/views/datagrid/in_memory.js index 1a4bda0466..8817ed8750 100644 --- a/src-docs/src/views/datagrid/in_memory.js +++ b/src-docs/src/views/datagrid/in_memory.js @@ -50,12 +50,14 @@ for (let i = 1; i < 100; i++) { '{{person.lastName}}, {{person.firstName}} {{person.suffix}}' ), email: ( - {faker.helpers.fake('{{internet.email}}')} + + {faker.helpers.fake('{{internet.email}}')} + ), location: ( {`${faker.helpers.fake('{{location.city}}')}, `} - + {faker.helpers.fake('{{location.country}}')} diff --git a/src-docs/src/views/datagrid/in_memory_enhancements.js b/src-docs/src/views/datagrid/in_memory_enhancements.js index cd92d1ec62..0ed5464331 100644 --- a/src-docs/src/views/datagrid/in_memory_enhancements.js +++ b/src-docs/src/views/datagrid/in_memory_enhancements.js @@ -49,12 +49,14 @@ for (let i = 1; i < 100; i++) { '{{person.lastName}}, {{person.firstName}} {{person.suffix}}' ), email: ( - {faker.helpers.fake('{{internet.email}}')} + + {faker.helpers.fake('{{internet.email}}')} + ), location: ( {`${faker.helpers.fake('{{location.city}}')}, `} - + {faker.helpers.fake('{{location.country}}')} diff --git a/src-docs/src/views/datagrid/in_memory_pagination.js b/src-docs/src/views/datagrid/in_memory_pagination.js index a1363b7689..e6d199a911 100644 --- a/src-docs/src/views/datagrid/in_memory_pagination.js +++ b/src-docs/src/views/datagrid/in_memory_pagination.js @@ -49,12 +49,14 @@ for (let i = 1; i < 100; i++) { '{{person.lastName}}, {{person.firstName}} {{person.suffix}}' ), email: ( - {faker.helpers.fake('{{internet.email}}')} + + {faker.helpers.fake('{{internet.email}}')} + ), location: ( {`${faker.helpers.fake('{{location.city}}')}, `} - + {faker.helpers.fake('{{location.country}}')} diff --git a/src-docs/src/views/datagrid/in_memory_sorting.js b/src-docs/src/views/datagrid/in_memory_sorting.js index 1d807b45a9..39b6aa765c 100644 --- a/src-docs/src/views/datagrid/in_memory_sorting.js +++ b/src-docs/src/views/datagrid/in_memory_sorting.js @@ -49,12 +49,14 @@ for (let i = 1; i < 100; i++) { '{{person.lastName}}, {{person.firstName}} {{person.suffix}}' ), email: ( - {faker.helpers.fake('{{internet.email}}')} + + {faker.helpers.fake('{{internet.email}}')} + ), location: ( {`${faker.helpers.fake('{{location.city}}')}, `} - + {faker.helpers.fake('{{location.country}}')} diff --git a/src-docs/src/views/datagrid/virtualization.js b/src-docs/src/views/datagrid/virtualization.js index 8e36a535e1..ceccf23307 100644 --- a/src-docs/src/views/datagrid/virtualization.js +++ b/src-docs/src/views/datagrid/virtualization.js @@ -84,11 +84,13 @@ function RenderCellValue({ rowIndex, columnId }) { const suffix = faker.helpers.fake('{{person.suffix}}'); data[rowIndex] = { name: `${name} ${suffix}`, - email: {email}, + email: ( + {email} + ), location: ( {`${faker.helpers.fake('{{location.city}}')}, `} - + {faker.helpers.fake('{{location.country}}')} diff --git a/src-docs/src/views/datagrid/virtualization_constrained.js b/src-docs/src/views/datagrid/virtualization_constrained.js index a9074e65d2..cc0a736186 100644 --- a/src-docs/src/views/datagrid/virtualization_constrained.js +++ b/src-docs/src/views/datagrid/virtualization_constrained.js @@ -82,11 +82,13 @@ function RenderCellValue({ rowIndex, columnId }) { const suffix = faker.helpers.fake('{{person.suffix}}'); data[rowIndex] = { name: `${name} ${suffix}`, - email: {email}, + email: ( + {email} + ), location: ( {`${faker.helpers.fake('{{location.city}}')}, `} - + {faker.helpers.fake('{{location.country}}')} diff --git a/src-docs/src/views/flyout/flyout_banner.js b/src-docs/src/views/flyout/flyout_banner.js index 1f50693aa2..b9f99b3a4e 100644 --- a/src-docs/src/views/flyout/flyout_banner.js +++ b/src-docs/src/views/flyout/flyout_banner.js @@ -35,7 +35,8 @@ export default () => {

Here’s some stuff that you need to know. This banner helps - highlight important information. View docs + highlight important information.{' '} + View docs

); diff --git a/src-docs/src/views/header/header.js b/src-docs/src/views/header/header.js index f794507509..9b2f21216c 100644 --- a/src-docs/src/views/header/header.js +++ b/src-docs/src/views/header/header.js @@ -38,7 +38,7 @@ export default () => { const renderLogo = () => ( e.preventDefault()} aria-label="Go to home page" /> diff --git a/src-docs/src/views/header/header_alert.js b/src-docs/src/views/header/header_alert.js index 86f52980ec..e046d81859 100644 --- a/src-docs/src/views/header/header_alert.js +++ b/src-docs/src/views/header/header_alert.js @@ -48,7 +48,11 @@ const HeaderUpdates = () => { { title: 'Control access to features', text: 'Show or hide applications and features per space in Kibana.', - action: Learn about feature controls, + action: ( + + Learn about feature controls + + ), date: '1 May 2019', badge: 7.1, }, @@ -71,7 +75,11 @@ const HeaderUpdates = () => { title: 'Enter dark mode', text: 'Kibana now supports the easy-on-the-eyes theme across the entire UI.', - action: Go to Advanced Settings, + action: ( + + Go to Advanced Settings + + ), date: '10 April 2019', badge: 7.0, }, diff --git a/src-docs/src/views/header/header_elastic_pattern.js b/src-docs/src/views/header/header_elastic_pattern.js index c1a909ee86..4b0f6663eb 100644 --- a/src-docs/src/views/header/header_elastic_pattern.js +++ b/src-docs/src/views/header/header_elastic_pattern.js @@ -283,7 +283,9 @@ export default ({ theme }) => { sections={[ { items: [ - + OpenSearch , deploymentMenu, diff --git a/src-docs/src/views/header/header_example.js b/src-docs/src/views/header/header_example.js index 342538c117..bd3809cf11 100644 --- a/src-docs/src/views/header/header_example.js +++ b/src-docs/src/views/header/header_example.js @@ -95,16 +95,16 @@ const headerLinksSnippet = ` - + - + diff --git a/src-docs/src/views/header/header_sections.js b/src-docs/src/views/header/header_sections.js index a68f414785..9b2c648185 100644 --- a/src-docs/src/views/header/header_sections.js +++ b/src-docs/src/views/header/header_sections.js @@ -28,7 +28,7 @@ export default () => { const renderLogo = ( e.preventDefault()} aria-label="Navigate to home page" /> diff --git a/src-docs/src/views/key_pad_menu/key_pad_beta.js b/src-docs/src/views/key_pad_menu/key_pad_beta.js index 4852ea19c5..439f548341 100644 --- a/src-docs/src/views/key_pad_menu/key_pad_beta.js +++ b/src-docs/src/views/key_pad_menu/key_pad_beta.js @@ -19,13 +19,15 @@ import { export default () => ( - + @@ -33,7 +35,7 @@ export default () => ( diff --git a/src-docs/src/views/key_pad_menu/key_pad_menu.js b/src-docs/src/views/key_pad_menu/key_pad_menu.js index 08c49394b6..04a7a86778 100644 --- a/src-docs/src/views/key_pad_menu/key_pad_menu.js +++ b/src-docs/src/views/key_pad_menu/key_pad_menu.js @@ -19,19 +19,28 @@ import { export default () => ( - + - + - + - + diff --git a/src-docs/src/views/key_pad_menu/key_pad_menu_example.js b/src-docs/src/views/key_pad_menu/key_pad_menu_example.js index e4e832ba54..47a5a2b074 100644 --- a/src-docs/src/views/key_pad_menu/key_pad_menu_example.js +++ b/src-docs/src/views/key_pad_menu/key_pad_menu_example.js @@ -27,10 +27,10 @@ import KeyPadMenu from './key_pad_menu'; const keyPadMenuSource = require('!!raw-loader!./key_pad_menu'); const keyPadMenuHtml = renderToHtml(KeyPadMenu); const keyPadMenuSnippet = ` - + - + @@ -51,7 +51,7 @@ const keyPadBetaSource = require('!!raw-loader!./key_pad_beta'); const keyPadBetaHtml = renderToHtml(KeyPadBeta); const keyPadBetaSnippet = ` diff --git a/src-docs/src/views/link/link.js b/src-docs/src/views/link/link.js index 4e73a49d08..7714ad8d69 100644 --- a/src-docs/src/views/link/link.js +++ b/src-docs/src/views/link/link.js @@ -17,7 +17,7 @@ export default () => (

Open the{' '} - + OpenSearch website {' '} in a new tab. Setting target=“_blank” also @@ -25,7 +25,7 @@ export default () => (

This{' '} - + link {' '} has the external prop set to true. @@ -37,7 +37,7 @@ export default () => (

Here is an example of a{' '} { e.preventDefault(); }}> @@ -49,38 +49,38 @@ export default () => (

Links can be colored as well.

  • - + subdued
  • - + success
  • - + accent
  • - + danger
  • - + warning
  • - + text
  • - + ghost diff --git a/src-docs/src/views/link/link_example.js b/src-docs/src/views/link/link_example.js index e84201701b..ff3aaae6a3 100644 --- a/src-docs/src/views/link/link_example.js +++ b/src-docs/src/views/link/link_example.js @@ -33,9 +33,9 @@ const linkValidationSource = require('!!raw-loader!./link_validation'); const linkValidationHtml = renderToHtml(LinkValidation); const linkSnippet = [ - ` + ` `, - ` + ` `, diff --git a/src-docs/src/views/list_group/list_group_item_color.tsx b/src-docs/src/views/list_group/list_group_item_color.tsx index c9054ee706..ba30fbe1ed 100644 --- a/src-docs/src/views/list_group/list_group_item_color.tsx +++ b/src-docs/src/views/list_group/list_group_item_color.tsx @@ -20,7 +20,11 @@ import { OuiSpacer } from '../../../../src/components/spacer'; export default () => ( <> - + {}} @@ -29,15 +33,28 @@ export default () => ( size="s" /> - + - + - + ); diff --git a/src-docs/src/views/progress/progress_fixed.js b/src-docs/src/views/progress/progress_fixed.js index a35359aee2..74c48d1034 100644 --- a/src-docs/src/views/progress/progress_fixed.js +++ b/src-docs/src/views/progress/progress_fixed.js @@ -95,7 +95,7 @@ export default () => { diff --git a/src-docs/src/views/suggest/hashtag_popover.js b/src-docs/src/views/suggest/hashtag_popover.js index 8bffe562b3..c38cadadfd 100644 --- a/src-docs/src/views/suggest/hashtag_popover.js +++ b/src-docs/src/views/suggest/hashtag_popover.js @@ -71,7 +71,7 @@ export default (props) => { iconType: 'trash', iconSize: 's', }} - href="#" + href="https://oui.opensearch.org/latest/" label="Popular shoes in America" /> { iconType: 'trash', iconSize: 's', }} - href="#" + href="https://oui.opensearch.org/latest/" label="Popular shirts in Canada" /> diff --git a/src-docs/src/views/tables/auto/auto.js b/src-docs/src/views/tables/auto/auto.js index 428a93311a..c530fb840e 100644 --- a/src-docs/src/views/tables/auto/auto.js +++ b/src-docs/src/views/tables/auto/auto.js @@ -58,7 +58,7 @@ const columns = [ render: (item) => ( {item.firstName}{' '} - + {item.lastName} @@ -73,7 +73,7 @@ const columns = [ field: 'lastName', name: 'Last Name', render: (name) => ( - + {name} ), @@ -99,7 +99,7 @@ const customColumns = [ render: (item) => ( {item.firstName}{' '} - + {item.lastName} @@ -114,7 +114,7 @@ const customColumns = [ field: 'lastName', name: 'Last Name', render: (name) => ( - + {name} ), diff --git a/src-docs/src/views/tables/basic/basic.js b/src-docs/src/views/tables/basic/basic.js index d0dd9d2ea5..f22486f6ef 100644 --- a/src-docs/src/views/tables/basic/basic.js +++ b/src-docs/src/views/tables/basic/basic.js @@ -54,7 +54,7 @@ export const Table = () => { render: (item) => ( {item.firstName}{' '} - + {item.lastName} @@ -70,7 +70,7 @@ export const Table = () => { name: 'Last Name', truncateText: true, render: (name) => ( - + {name} ), diff --git a/src-docs/src/views/tables/custom/custom.js b/src-docs/src/views/tables/custom/custom.js index ff69198bf1..1a3c826329 100644 --- a/src-docs/src/views/tables/custom/custom.js +++ b/src-docs/src/views/tables/custom/custom.js @@ -587,7 +587,9 @@ export default class extends Component { ? item.title.value : item.title; const title = item.title.isLink ? ( - {item.title.value} + + {item.title.value} + ) : ( titleText ); @@ -595,7 +597,11 @@ export default class extends Component { } else if (column.cellProvider) { child = column.cellProvider(cell); } else if (cell.isLink) { - child = {cell.value}; + child = ( + + {cell.value} + + ); } else if (cell.truncateText) { child = cell.value; } else { diff --git a/src-docs/src/views/text/playground.js b/src-docs/src/views/text/playground.js index 2c2a86edcd..83793a46cb 100644 --- a/src-docs/src/views/text/playground.js +++ b/src-docs/src/views/text/playground.js @@ -23,8 +23,8 @@ export const textConfig = () => { type: PropTypes.ReactNode, value: `

    This is Heading One

    - Ea mollit ullamco cillum ipsum adipisicing ea aute id. Cillum unfashionable amet - proident irure Lorem irure consequat veniam. Excepteur exercitation ex officia + Ea mollit ullamco cillum ipsum adipisicing ea aute id. Cillum unfashionable amet + proident irure Lorem irure consequat veniam. Excepteur exercitation ex officia minim excepteur consequat sint id Lorem est officia cupidatat excepteur commodo.

    `, hidden: false, diff --git a/src-docs/src/views/text/text.js b/src-docs/src/views/text/text.js index 3e88c919b9..cdd84ca0f3 100644 --- a/src-docs/src/views/text/text.js +++ b/src-docs/src/views/text/text.js @@ -19,10 +19,10 @@ export default () => (

    This is Heading One

    Veniam et quis in dolor aliqua dolor laboris nostrud nostrud Lorem. - unfashionable Irure et et adipisicing eu mollit. Ullamco - laborum cillum ea id occaecat cupidatat ex dolor consequat ex mollit do. - Irure commodo incididunt reprehenderit deserunt cillum quis ad nostrud!{' '} - const whoa = "!" + Irure et et adipisicing{' '} + eu mollit. Ullamco laborum cillum ea id occaecat cupidatat ex dolor + consequat ex mollit do. Irure commodo incididunt reprehenderit deserunt + cillum quis ad nostrud! const whoa = "!" 

    diff --git a/src-docs/src/views/text/text_color.js b/src-docs/src/views/text/text_color.js
index e7c3290df8..6b68508b59 100644
--- a/src-docs/src/views/text/text_color.js
+++ b/src-docs/src/views/text/text_color.js
@@ -68,7 +68,7 @@ export default () => (
         Sometimes you need to color entire blocks of text, no matter what is in
         them. You can always apply color directly (versus using the separated
         component) to make it easy. Links should still{' '}
-        properly color.
+        properly color.
       
    
     
   
diff --git a/src-docs/src/views/toast/success.js b/src-docs/src/views/toast/success.js
index 3d4f0f31c3..4ac0f313f2 100644
--- a/src-docs/src/views/toast/success.js
+++ b/src-docs/src/views/toast/success.js
@@ -33,7 +33,10 @@ export default () => (
 
     
    
       And some other stuff on another line, just for kicks. And{' '}
-      here’s a link.
+      
+        here’s a link
+      
+      .
     
    
 
     
diff --git a/src-docs/src/views/toast/toast_list.js b/src-docs/src/views/toast/toast_list.js
index 166ee0ec50..13cc2f3681 100644
--- a/src-docs/src/views/toast/toast_list.js
+++ b/src-docs/src/views/toast/toast_list.js
@@ -62,7 +62,10 @@ export default () => {
             
    
             
    
               And some other stuff on another line, just for kicks. And{' '}
-              here’s a link.
+              
+                here’s a link
+              
+              .
             
    
           
         ),