Merge branch 'main' into d/2022-03-09-fix-ff-color-crash

elastic · Mar 9, 2022 · 6e98b39 · 6e98b39
2 parents 411c94f + 488d939
commit 6e98b39
Show file tree

Hide file tree

Showing 33 changed files with 498 additions and 207 deletions.
diff --git a/.ci/package-testing/Jenkinsfile b/.ci/package-testing/Jenkinsfile
diff --git a/test/scripts/jenkins_xpack_package_build.sh b/test/scripts/jenkins_xpack_package_build.sh
diff --git a/test/scripts/jenkins_xpack_package_deb.sh b/test/scripts/jenkins_xpack_package_deb.sh
diff --git a/test/scripts/jenkins_xpack_package_docker.sh b/test/scripts/jenkins_xpack_package_docker.sh
diff --git a/test/scripts/jenkins_xpack_package_rpm.sh b/test/scripts/jenkins_xpack_package_rpm.sh
diff --git a/x-pack/plugins/fleet/server/integration_tests/cloud_preconfiguration.test.ts b/x-pack/plugins/fleet/server/integration_tests/cloud_preconfiguration.test.ts
@@ -18,7 +18,8 @@ import { CLOUD_KIBANA_CONFIG } from './fixtures/cloud_kibana_config';
 
 const logFilePath = Path.join(__dirname, 'logs.log');
 
-describe('Fleet preconfiguration reset', () => {
+// FAILING: https://github.com/elastic/kibana/issues/127076
+describe.skip('Fleet preconfiguration reset', () => {
   let esServer: kbnTestServer.TestElasticsearchUtils;
   let kbnServer: kbnTestServer.TestKibanaUtils;
 

diff --git a/x-pack/plugins/lens/common/expressions/datatable/datatable.ts b/x-pack/plugins/lens/common/expressions/datatable/datatable.ts
@@ -28,6 +28,7 @@ export interface DatatableArgs {
   sortingColumnId: SortingState['columnId'];
   sortingDirection: SortingState['direction'];
   fitRowToContent?: boolean;
+  rowHeightLines?: number;
   pageSize?: PagingState['size'];
 }
 
@@ -68,6 +69,10 @@ export const getDatatable = (
       types: ['boolean'],
       help: '',
     },
+    rowHeightLines: {
+      types: ['number'],
+      help: '',
+    },
     pageSize: {
       types: ['number'],
       help: '',

diff --git a/...ns/lens/public/datatable_visualization/components/__snapshots__/table_basic.test.tsx.snap b/...ns/lens/public/datatable_visualization/components/__snapshots__/table_basic.test.tsx.snap
diff --git a/x-pack/plugins/lens/public/datatable_visualization/components/cell_value.test.tsx b/x-pack/plugins/lens/public/datatable_visualization/components/cell_value.test.tsx
@@ -86,7 +86,7 @@ describe('datatable cell renderer', () => {
         />
       </DataContext.Provider>
     );
-    expect(cell.find('.lnsTableCell').prop('className')).toContain('--right');
+    expect(cell.find('.lnsTableCell--right').exists()).toBeTruthy();
   });
 
   describe('dynamic coloring', () => {
@@ -127,6 +127,7 @@ describe('datatable cell renderer', () => {
         ],
         sortingColumnId: '',
         sortingDirection: 'none',
+        rowHeightLines: 1,
       };
     }
 

diff --git a/x-pack/plugins/lens/public/datatable_visualization/components/cell_value.tsx b/x-pack/plugins/lens/public/datatable_visualization/components/cell_value.tsx
@@ -20,7 +20,8 @@ export const createGridCell = (
   columnConfig: ColumnConfig,
   DataContext: React.Context<DataContextType>,
   uiSettings: IUiSettingsClient,
-  fitRowToContent?: boolean
+  fitRowToContent?: boolean,
+  rowHeight?: number
 ) => {
   // Changing theme requires a full reload of the page, so we can cache here
   const IS_DARK_THEME = uiSettings.get('theme:darkMode');
@@ -31,7 +32,7 @@ export const createGridCell = (
     const currentAlignment = alignments && alignments[columnId];
     const alignmentClassName = `lnsTableCell--${currentAlignment}`;
     const className = classNames(alignmentClassName, {
-      lnsTableCell: !fitRowToContent,
+      lnsTableCell: !fitRowToContent && rowHeight === 1,
     });
 
     const { colorMode, palette } =

diff --git a/x-pack/plugins/lens/public/datatable_visualization/components/table_basic.test.tsx b/x-pack/plugins/lens/public/datatable_visualization/components/table_basic.test.tsx
@@ -84,6 +84,7 @@ function sampleArgs() {
     ],
     sortingColumnId: '',
     sortingDirection: 'none',
+    rowHeightLines: 1,
   };
 
   return { data, args };
@@ -299,6 +300,7 @@ describe('DatatableComponent', () => {
       ],
       sortingColumnId: '',
       sortingDirection: 'none',
+      rowHeightLines: 1,
     };
 
     const wrapper = mountWithIntl(

diff --git a/x-pack/plugins/lens/public/datatable_visualization/components/table_basic.tsx b/x-pack/plugins/lens/public/datatable_visualization/components/table_basic.tsx
@@ -334,9 +334,16 @@ export const DatatableComponent = (props: DatatableRenderProps) => {
         columnConfig,
         DataContext,
         props.uiSettings,
-        props.args.fitRowToContent
+        props.args.fitRowToContent,
+        props.args.rowHeightLines
       ),
-    [formatters, columnConfig, props.uiSettings, props.args.fitRowToContent]
+    [
+      formatters,
+      columnConfig,
+      props.uiSettings,
+      props.args.fitRowToContent,
+      props.args.rowHeightLines,
+    ]
   );
 
   const columnVisibility = useMemo(
@@ -414,13 +421,15 @@ export const DatatableComponent = (props: DatatableRenderProps) => {
         <EuiDataGrid
           aria-label={dataGridAriaLabel}
           data-test-subj="lnsDataTable"
-          rowHeightsOptions={
-            props.args.fitRowToContent
+          rowHeightsOptions={{
+            defaultHeight: props.args.fitRowToContent
+              ? 'auto'
+              : props.args.rowHeightLines
               ? {
-                  defaultHeight: 'auto',
+                  lineCount: props.args.rowHeightLines,
                 }
-              : undefined
-          }
+              : undefined,
+          }}
           columns={columns}
           columnVisibility={columnVisibility}
           trailingControlColumns={trailingControlColumns}