Add wrap break-all to Noteobook CodeBlock output (opensearch-project#974

) (opensearch-project#1027) * Add wrap break-all to Noteobook CodeBlock output --------- (cherry picked from commit f989783) Signed-off-by: Peter Fitzgibbons <peter.fitzgibbons@gmail.com> Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> (cherry picked from commit 3684129)
amsiglan · Oct 12, 2023 · 6be3483 · 6be3483
1 parent 8ec6183
commit 6be3483
Show file tree

Hide file tree

Showing 7 changed files with 106 additions and 54 deletions.
diff --git a/.cypress/integration/2_notebooks.spec.js b/.cypress/integration/2_notebooks.spec.js
@@ -21,6 +21,8 @@ import { SAMPLE_PANEL } from '../utils/panel_constants';
 
 import { skipOn } from '@cypress/skip-test';
 
+import { v4 as uuid4 } from 'uuid';
+
 const moveToEventsHome = () => {
   cy.visit(`${Cypress.env('opensearchDashboards')}/app/observability-logs#/`);
 };
@@ -157,7 +159,7 @@ describe('Test reporting integration if plugin installed', () => {
   beforeEach(() => {
     cy.visit(`${Cypress.env('opensearchDashboards')}/app/observability-notebooks#/`);
     cy.get('.euiTableCellContent').contains(TEST_NOTEBOOK).click();
-    cy.wait(delay);//page needs to process before checking
+    cy.wait(delay); //page needs to process before checking
     cy.get('body').then(($body) => {
       skipOn($body.find('#reportingActionsButton').length <= 0);
     });
@@ -290,8 +292,9 @@ describe('Testing paragraphs', () => {
 
   it('Adds a SQL query paragraph', () => {
     cy.contains('Add paragraph').click();
-    cy.get('.euiContextMenuItem__text').contains('Code block').click(), { timeout: COMMAND_TIMEOUT_LONG };
-    cy.wait(delay);//SQL_QUERY_TEXT will sometimes fail to type without this delay
+    cy.get('.euiContextMenuItem__text').contains('Code block').click(),
+      { timeout: COMMAND_TIMEOUT_LONG };
+    cy.wait(delay); //SQL_QUERY_TEXT will sometimes fail to type without this delay
 
     cy.get('.euiTextArea').type(SQL_QUERY_TEXT);
     cy.get('.euiButton__text').contains('Run').click();
@@ -301,6 +304,45 @@ describe('Testing paragraphs', () => {
     cy.get('.euiDataGrid__overflow').should('exist');
   });
 
+  it('Renders very long markdown as wrapped', () => {
+    cy.contains('Add paragraph').click();
+    cy.get('.euiContextMenuItem__text').contains('Code block').click(),
+      { timeout: COMMAND_TIMEOUT_LONG };
+    cy.wait(delay); //SQL_QUERY_TEXT will sometimes fail to type without this delay
+
+    const testWord = uuid4().replace(/-/gi, '').repeat(10);
+    cy.get('.euiTextArea').type(`%md\n${testWord}`);
+    cy.get('.euiButton__text').contains('Run').click();
+
+    cy.get('p')
+      .contains(testWord)
+      .then((element) => {
+        const clientWidth = element[0].clientWidth;
+        const scrollWidth = element[0].scrollWidth;
+        console.log('paragraph', { clientWidth, scrollWidth });
+        expect(scrollWidth, 'Output Text has not been wrapped').to.be.at.most(clientWidth);
+      });
+  });
+
+  it('Renders very long query as wrapped', () => {
+    cy.contains('Add paragraph').click();
+    cy.get('.euiContextMenuItem__text').contains('Code block').click(),
+      { timeout: COMMAND_TIMEOUT_LONG };
+    cy.wait(delay); //SQL_QUERY_TEXT will sometimes fail to type without this delay
+
+    const testWord = uuid4().replace(/-/gi, '').repeat(10);
+    cy.get('.euiTextArea').type(`%sql\nSELECT 1 AS ${testWord}`);
+    cy.get('.euiButton__text').contains('Run').click();
+
+    cy.get('b')
+      .contains(testWord)
+      .then((element) => {
+        const clientWidth = element[0].clientWidth;
+        const scrollWidth = element[0].scrollWidth;
+        expect(scrollWidth, 'Output Text has not been wrapped').to.be.at.most(clientWidth);
+      });
+  });
+
   it('Adds an observability visualization paragraph', () => {
     cy.contains('Add paragraph').click();
     cy.get('.euiContextMenuItem__text').contains('Visualization').click();
@@ -319,8 +361,9 @@ describe('Testing paragraphs', () => {
 
   it('Adds a PPL query paragraph', () => {
     cy.contains('Add paragraph').click();
-    cy.get('.euiContextMenuItem__text').contains('Code block').click(), { timeout: COMMAND_TIMEOUT_LONG };;
-    cy.wait(delay);//PPL_QUERY_TEXT will sometimes fail to type without this delay
+    cy.get('.euiContextMenuItem__text').contains('Code block').click(),
+      { timeout: COMMAND_TIMEOUT_LONG };
+    cy.wait(delay); //PPL_QUERY_TEXT will sometimes fail to type without this delay
 
     cy.get('.euiTextArea').type(PPL_QUERY_TEXT);
     cy.get('.euiButton__text').contains('Run').click();
@@ -433,7 +476,7 @@ describe('clean up all test data', () => {
     cy.get('.euiButton__text').contains('Actions').trigger('mouseover').click();
     cy.get('.euiContextMenuItem__text').contains('Delete').trigger('mouseover').click();
     cy.get('button.euiButton--danger').should('be.disabled');
-    cy.get('input.euiFieldText[placeholder="delete"]').focus().type('delete', {delay: 50, });
+    cy.get('input.euiFieldText[placeholder="delete"]').focus().type('delete', { delay: 50 });
     cy.get('button.euiButton--danger').should('not.be.disabled');
     cy.get('.euiButton__text').contains('Delete').trigger('mouseover').click();
     cy.get('.euiTextAlign').contains('No Queries or Visualizations').should('exist');
@@ -445,8 +488,8 @@ describe('clean up all test data', () => {
     cy.get('.euiButton__text').contains('Actions').trigger('mouseover').click();
     cy.get('.euiContextMenuItem__text').contains('Delete').trigger('mouseover').click();
     cy.get('button.euiButton--danger').should('be.disabled');
-    cy.get('input.euiFieldText[placeholder="delete"]').focus().type('delete', { delay: 50, });
+    cy.get('input.euiFieldText[placeholder="delete"]').focus().type('delete', { delay: 50 });
     cy.get('button.euiButton--danger').should('not.be.disabled');
     cy.get('.euiButton__text').contains('Delete').trigger('mouseover').click();
   });
-});
+});
diff --git a/auto_sync_commit_metadata.json b/auto_sync_commit_metadata.json
@@ -1,4 +1,4 @@
 {
-    "last_github_commit": "7faf731cae1a04186c0baf67a9c412abb9e59e6b",
-    "last_gitfarm_commit": "5deec2e3be506bfe642c0f54b9b9ab5c3a52ca91"
+    "last_github_commit": "36841295fef340a472ebfce8c6b5bb60699835bd",
+    "last_gitfarm_commit": "e48e2367bb958dc0b38e7132445119fcf72b92a0"
 }
diff --git a/...tebooks/components/paragraph_components/__tests__/__snapshots__/para_output.test.tsx.snap b/...tebooks/components/paragraph_components/__tests__/__snapshots__/para_output.test.tsx.snap
@@ -2,7 +2,7 @@
 
 exports[`<ParaOutput /> spec renders markdown outputs 1`] = `
 <div
-  class="euiText euiText--medium markdown-output-text"
+  class="euiText euiText--medium wrapAll markdown-output-text"
 >
   <div
     class="markdown-body "
@@ -27,7 +27,7 @@ exports[`<ParaOutput /> spec renders other types of outputs 1`] = `
 exports[`<ParaOutput /> spec renders query outputs 1`] = `
 <div>
   <div
-    class="euiText euiText--medium"
+    class="euiText euiText--medium wrapAll"
   >
     <b>
        select * from opensearch_dashboards_sample_data_flights limit 2

diff --git a/...otebooks/components/paragraph_components/__tests__/__snapshots__/paragraphs.test.tsx.snap b/...otebooks/components/paragraph_components/__tests__/__snapshots__/paragraphs.test.tsx.snap
@@ -275,7 +275,7 @@ exports[`<Paragraphs /> spec renders the component 1`] = `
       style="opacity: 1; padding: 15px;"
     >
       <div
-        class="euiText euiText--medium markdown-output-text"
+        class="euiText euiText--medium wrapAll markdown-output-text"
       >
         <div
           class="markdown-body "

diff --git a/public/components/notebooks/components/paragraph_components/para_output.tsx b/public/components/notebooks/components/paragraph_components/para_output.tsx
@@ -7,9 +7,9 @@ import { EuiCodeBlock, EuiSpacer, EuiText } from '@elastic/eui';
 import MarkdownRender from '@nteract/markdown';
 import { Media } from '@nteract/outputs';
 import moment from 'moment';
+import React, { useState } from 'react';
 import { VisualizationContainer } from '../../../../components/custom_panels/panel_modules/visualization_container';
 import PPLService from '../../../../services/requests/ppl';
-import React, { useState } from 'react';
 import { CoreStart } from '../../../../../../../src/core/public';
 import {
   DashboardContainerInput,
@@ -38,7 +38,7 @@ export const ParaOutput = (props: {
 }) => {
   const createQueryColumns = (jsonColumns: any[]) => {
     let index = 0;
-    let datagridColumns = [];
+    const datagridColumns = [];
     for (index = 0; index < jsonColumns.length; ++index) {
       const datagridColumnObject = {
         id: jsonColumns[index].name,
@@ -54,7 +54,7 @@ export const ParaOutput = (props: {
     let index = 0;
     let schemaIndex = 0;
     for (index = 0; index < queryObject.datarows.length; ++index) {
-      let datarowValue = {};
+      const datarowValue = {};
       for (schemaIndex = 0; schemaIndex < queryObject.schema.length; ++schemaIndex) {
         const columnName = queryObject.schema[schemaIndex].name;
         if (typeof queryObject.datarows[index][schemaIndex] === 'object') {
@@ -70,7 +70,34 @@ export const ParaOutput = (props: {
     return data;
   };
 
-  const outputBody = (key: string, typeOut: string, val: string) => {
+  const QueryOutput = ({ typeOut, val }: { typeOut: string; val: string }) => {
+    const inputQuery = para.inp.substring(4, para.inp.length);
+    const queryObject = JSON.parse(val);
+    const columns = createQueryColumns(queryObject.schema);
+    const data = getQueryOutputData(queryObject);
+    const [visibleColumns, setVisibleColumns] = useState(() => columns.map(({ id }) => id));
+    if (queryObject.hasOwnProperty('error')) {
+      return <EuiCodeBlock>{val}</EuiCodeBlock>;
+    } else {
+      return (
+        <div>
+          <EuiText className="wrapAll">
+            <b>{inputQuery}</b>
+          </EuiText>
+          <EuiSpacer />
+          <QueryDataGridMemo
+            rowCount={queryObject.datarows.length}
+            queryColumns={columns}
+            visibleColumns={visibleColumns}
+            setVisibleColumns={setVisibleColumns}
+            dataValues={data}
+          />
+        </div>
+      );
+    }
+  };
+
+  const OutputBody = ({ typeOut, val }: { typeOut: string; val: string }) => {
     /* Returns a component to render paragraph outputs using the para.typeOut property
      * Currently supports HTML, TABLE, IMG
      * TODO: add table rendering
@@ -80,34 +107,10 @@ export const ParaOutput = (props: {
     if (typeOut !== undefined) {
       switch (typeOut) {
         case 'QUERY':
-          const inputQuery = para.inp.substring(4, para.inp.length);
-          const queryObject = JSON.parse(val);
-          if (queryObject.hasOwnProperty('error')) {
-            return <EuiCodeBlock key={key}>{val}</EuiCodeBlock>;
-          } else {
-            const columns = createQueryColumns(queryObject.schema);
-            const data = getQueryOutputData(queryObject);
-            const [visibleColumns, setVisibleColumns] = useState(() => columns.map(({ id }) => id));
-            return (
-              <div>
-                <EuiText key={'query-input-key'}>
-                  <b>{inputQuery}</b>
-                </EuiText>
-                <EuiSpacer />
-                <QueryDataGridMemo
-                  key={key}
-                  rowCount={queryObject.datarows.length}
-                  queryColumns={columns}
-                  visibleColumns={visibleColumns}
-                  setVisibleColumns={setVisibleColumns}
-                  dataValues={data}
-                />
-              </div>
-            );
-          }
+          return <QueryOutput typeOut={typeOut} val={val} />;
         case 'MARKDOWN':
           return (
-            <EuiText key={key} className="markdown-output-text">
+            <EuiText className="wrapAll markdown-output-text">
               <MarkdownRender source={val} />
             </EuiText>
           );
@@ -121,11 +124,7 @@ export const ParaOutput = (props: {
               <EuiText size="s" style={{ marginLeft: 9 }}>
                 {`${from} - ${to}`}
               </EuiText>
-              <DashboardContainerByValueRenderer
-                key={key}
-                input={visInput}
-                onInputUpdated={setVisInput}
-              />
+              <DashboardContainerByValueRenderer input={visInput} onInputUpdated={setVisInput} />
             </>
           );
         case 'OBSERVABILITY_VISUALIZATION':
@@ -160,17 +159,17 @@ export const ParaOutput = (props: {
           );
         case 'HTML':
           return (
-            <EuiText key={key}>
+            <EuiText>
               {/* eslint-disable-next-line react/jsx-pascal-case */}
               <Media.HTML data={val} />
             </EuiText>
           );
         case 'TABLE':
-          return <pre key={key}>{val}</pre>;
+          return <pre>{val}</pre>;
         case 'IMG':
-          return <img alt="" src={'data:image/gif;base64,' + val} key={key} />;
+          return <img alt="" src={'data:image/gif;base64,' + val} />;
         default:
-          return <pre key={key}>{val}</pre>;
+          return <pre>{val}</pre>;
       }
     } else {
       console.log('output not supported', typeOut);
@@ -183,7 +182,13 @@ export const ParaOutput = (props: {
   return !para.isOutputHidden ? (
     <>
       {para.typeOut.map((typeOut: string, tIdx: number) => {
-        return outputBody(para.uniqueId + '_paraOutputBody', typeOut, para.out[tIdx]);
+        return (
+          <OutputBody
+            key={para.uniqueId + '_paraOutputBody_' + tIdx}
+            typeOut={typeOut}
+            val={para.out[tIdx]}
+          />
+        );
       })}
     </>
   ) : null;

diff --git a/public/components/notebooks/components/paragraph_components/paragraphs.tsx b/public/components/notebooks/components/paragraph_components/paragraphs.tsx
@@ -258,7 +258,6 @@ export const Paragraphs = forwardRef((props: ParagraphProps, ref) => {
     <ParaOutput
       http={http}
       pplService={pplService}
-      key={para.uniqueId}
       para={para}
       visInput={visInput}
       setVisInput={setVisInput}

diff --git a/public/components/notebooks/index.scss b/public/components/notebooks/index.scss
@@ -20,6 +20,11 @@
   font-weight: normal;
 }
 
+.wrapAll {
+  word-break: break-all;
+  word-wrap: break-word;
+}
+
 .markdown-output-text {
   font-family: 'Inter UI', -apple-system, system-ui, 'Segoe UI', Helvetica, Arial, sans-serif,
     'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol';