allow column to proper resize

Signed-off-by: Anan Z <ananzh@amazon.com>

CHANGELOG.md

@@ -82,6 +82,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 - [BUG][Multiple Datasource] Fix data source filter bug and add tests ([#6152](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/6152))
 - [BUG][Multiple Datasource] Fix obsolete snapshots for test within data source management plugin ([#6185](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/6185))
 - [Workspace] Add base path when parse url in http service ([#6233](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/6233))
+- [Discover] Remove empty space when resize datagrid table in Discover and Allow saving column width in both Discover and Dashboards Embeddable ([#5883](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/5883))
 
 ### 🚞 Infrastructure
 

release-notes/opensearch-dashboards.release-notes-2.13.0.md

@@ -47,6 +47,7 @@
 - [BUG][Multiple Datasource] Add a migration function for datasource to add migrationVersion field ([#6025](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/6025))
 - [BUG][MD]Expose picker using function in data source management plugin setup([#6030](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/6030))
 - [BUG][Multiple Datasource] Fix data source filter bug and add tests ([#6152](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/6152))
+- [Discover] Remove empty space when resize datagrid table in Discover and Allow saving column width in both Discover and Dashboards Embeddable ([#5883](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/5883))
 
 ### 📝 Documentation
 

src/plugins/discover/public/application/components/data_grid/data_grid_table.tsx

@@ -6,7 +6,7 @@
 import './_data_grid_table.scss';
 
 import React, { useState, useMemo, useCallback } from 'react';
-import { EuiDataGrid, EuiDataGridSorting, EuiPanel } from '@elastic/eui';
+import { EuiDataGrid, EuiDataGridSorting, EuiPanel, EuiDataGridProps } from '@elastic/eui';
 import { IndexPattern, getServices } from '../../../opensearch_dashboards_services';
 import { fetchTableDataCell } from './data_grid_table_cell_value';
 import { buildDataGridColumns, computeVisibleColumns } from './data_grid_table_columns';
@@ -26,9 +26,11 @@ import { LegacyDiscoverTable } from '../default_discover_table/default_discover_
 import { getNewDiscoverSetting } from '../utils/local_storage';
 import { SortDirection, SortOrder } from '../../../saved_searches/types';
 import { useToolbarOptions } from './data_grid_toolbar';
+import { ColumnWidths } from './data_grid_table_columns';
 
 export interface DataGridTableProps {
   columns: string[];
+  columnWidths?: ColumnWidths;
   indexPattern: IndexPattern;
   onAddColumn: (column: string) => void;
   onFilter: DocViewFilterFn;
@@ -38,6 +40,7 @@ export interface DataGridTableProps {
   onSort: (s: SortOrder[]) => void;
   rows: OpenSearchSearchHit[];
   onSetColumns: (columns: string[]) => void;
+  onColumnResize: ({ columnId, width }: { columnId: string; width: number }) => void;
   sort: SortOrder[];
   displayTimeColumn: boolean;
   title?: string;
@@ -51,13 +54,15 @@ export interface DataGridTableProps {
 
 export const DataGridTable = ({
   columns,
+  columnWidths,
   indexPattern,
   onAddColumn,
   onFilter,
   onMoveColumn,
   onRemoveColumn,
   onSetColumns,
   onSort,
+  onColumnResize,
   sort,
   hits,
   rows,
@@ -125,9 +130,17 @@ export const DataGridTable = ({
         indexPattern,
         displayTimeColumn,
         includeSourceInColumns,
-        isContextView
+        isContextView,
+        columnWidths
       ),
-    [adjustedColumns, indexPattern, displayTimeColumn, includeSourceInColumns, isContextView]
+    [
+      adjustedColumns,
+      indexPattern,
+      displayTimeColumn,
+      includeSourceInColumns,
+      isContextView,
+      columnWidths,
+    ]
   );
 
   const dataGridTableColumnsVisibility = useMemo(
@@ -218,6 +231,7 @@ export const DataGridTable = ({
         sorting={sorting}
         toolbarVisibility={isToolbarVisible ? toolbarOptions : false}
         rowHeightsOptions={rowHeightsOptions}
+        onColumnResize={onColumnResize}
         className="discoverDataGrid"
       />
     ),
@@ -232,6 +246,7 @@ export const DataGridTable = ({
       isToolbarVisible,
       toolbarOptions,
       rowHeightsOptions,
+      onColumnResize,
     ]
   );
 

src/plugins/discover/public/application/components/data_grid/data_grid_table_columns.test.tsx

@@ -49,7 +49,13 @@ const customizedIndexPatternMockWithTimeField = getMockedIndexPatternWithTimeFie
 
 describe('Testing buildDataGridColumns function ', () => {
   it('should return correct columns without time column when displayTimeColumn is false', () => {
-    const columns = buildDataGridColumns(['name', 'currency'], customizedIndexPatternMock, false);
+    const columns = buildDataGridColumns(
+      ['name', 'currency'],
+      customizedIndexPatternMock,
+      false,
+      false,
+      false
+    );
     expect(columns).toHaveLength(2);
     expect(columns[0].id).toEqual('name');
     expect(columns[1].id).toEqual('currency');
@@ -93,7 +99,9 @@ describe('Testing buildDataGridColumns function ', () => {
     const columns = buildDataGridColumns(
       ['name', 'currency', '_source'],
       customizedIndexPatternMockWithTimeField,
-      true
+      true,
+      false,
+      false
     );
     expect(columns).toHaveLength(4);
     expect(columns[0].id).toEqual('order_date');
@@ -165,7 +173,9 @@ describe('Testing buildDataGridColumns function ', () => {
     const columns = buildDataGridColumns(
       ['name', 'currency', 'order_date'],
       customizedIndexPatternMockWithTimeField,
-      true
+      true,
+      false,
+      false
     );
     expect(columns).toHaveLength(3);
     expect(columns[2].id).toEqual('order_date');
@@ -218,6 +228,32 @@ describe('Testing buildDataGridColumns function ', () => {
       ]
     `);
   });
+
+  it('should respect column widths when provided', () => {
+    const columnWidths = { name: { width: 100 }, currency: { width: 150 } };
+    const columns = buildDataGridColumns(
+      ['name', 'currency'],
+      customizedIndexPatternMock,
+      false,
+      false,
+      false,
+      columnWidths
+    );
+    expect(columns[0].initialWidth).toEqual(100);
+    expect(columns[1].initialWidth).toEqual(150);
+  });
+
+  it('should set default column width when not specified', () => {
+    const columns = buildDataGridColumns(
+      ['name', 'currency'],
+      customizedIndexPatternMock,
+      false,
+      false,
+      false
+    );
+    expect(columns[0].initialWidth).toBeUndefined();
+    expect(columns[1].initialWidth).toBeUndefined();
+  });
 });
 
 describe('Testing computeVisibleColumns function ', () => {

src/plugins/discover/public/application/components/data_grid/data_grid_table_columns.tsx

@@ -8,30 +8,47 @@ import { i18n } from '@osd/i18n';
 import { IndexPattern } from '../../../opensearch_dashboards_services';
 import { getCellActions } from './data_grid_table_cell_actions';
 
+export interface ColumnWidth {
+  width?: number;
+}
+
+export interface ColumnWidths {
+  [columnName: string]: ColumnWidth;
+}
+
 export function buildDataGridColumns(
   columnNames: string[],
   idxPattern: IndexPattern,
   displayTimeColumn: boolean,
   includeSourceInColumns: boolean,
-  isContextView: boolean
+  isContextView: boolean,
+  columnWidths?: ColumnWidths
 ) {
   const timeFieldName = idxPattern.timeFieldName;
   let columnsToUse = columnNames;
+  const getColumnWidth = (columnName: string) => columnWidths?.[columnName]?.width ?? 0;
 
   if (displayTimeColumn && timeFieldName && !columnNames.includes(timeFieldName)) {
     columnsToUse = [timeFieldName, ...columnNames];
   }
 
   return columnsToUse.map((colName) =>
-    generateDataGridTableColumn(colName, idxPattern, includeSourceInColumns, isContextView)
+    generateDataGridTableColumn(
+      colName,
+      idxPattern,
+      includeSourceInColumns,
+      isContextView,
+      getColumnWidth(colName)
+    )
   );
 }
 
 export function generateDataGridTableColumn(
   colName: string,
   idxPattern: IndexPattern,
   includeSourceInColumns: boolean,
-  isContextView: boolean
+  isContextView: boolean,
+  columnWidth: number | undefined = 0
 ) {
   const timeLabel = i18n.translate('discover.timeLabel', {
     defaultMessage: 'Time',
@@ -69,6 +86,9 @@ export function generateDataGridTableColumn(
       defaultMessage: 'Source',
     });
   }
+  if (columnWidth > 0) {
+    dataGridCol.initialWidth = Number(columnWidth);
+  }
   return dataGridCol;
 }
 

src/plugins/discover/public/application/components/doc_views/context_app.tsx

@@ -104,6 +104,7 @@ export function ContextApp({
           onRemoveColumn={() => {}}
           onSetColumns={() => {}}
           onSort={() => {}}
+          onColumnResize={() => {}}
           sort={sort}
           rows={rows}
           displayTimeColumn={displayTimeColumn}

src/plugins/discover/public/application/components/top_nav/get_top_nav_links.tsx

@@ -89,6 +89,7 @@ export const getTopNavLinks = (
 
         savedSearch.columns = state.columns;
         savedSearch.sort = state.sort;
+        savedSearch.columnWidths = state.columnWidths;
 
         try {
           const id = await savedSearch.save(saveOptions);

src/plugins/discover/public/application/utils/state_management/discover_slice.test.tsx

@@ -134,4 +134,35 @@ describe('discoverSlice', () => {
     const result = discoverSlice.reducer(initialState, action);
     expect(result.columns).toEqual(['column1', 'column2', 'column3']);
   });
+
+  it('should handle setColumnWidths', () => {
+    // Add columnWidths to the state only in this test
+    const stateWithColumnWidths = { ...initialState, columnWidths: {} };
+    const action = {
+      type: 'discover/setColumnWidths',
+      payload: { columnName: 'column1', width: 100 },
+    };
+    const result = discoverSlice.reducer(stateWithColumnWidths, action);
+    expect(result.columnWidths).toEqual({ column1: { width: 100 } });
+  });
+
+  it('should update column width if already set', () => {
+    const stateWithColumnWidths = { ...initialState, columnWidths: { column1: { width: 150 } } };
+    const action = {
+      type: 'discover/setColumnWidths',
+      payload: { columnName: 'column1', width: 200 },
+    };
+    const result = discoverSlice.reducer(stateWithColumnWidths, action);
+    expect(result.columnWidths).toEqual({ column1: { width: 200 } });
+  });
+
+  it('should add new column width while maintaining existing ones', () => {
+    const stateWithColumnWidths = { ...initialState, columnWidths: { column1: { width: 150 } } };
+    const action = {
+      type: 'discover/setColumnWidths',
+      payload: { columnName: 'column2', width: 100 },
+    };
+    const result = discoverSlice.reducer(stateWithColumnWidths, action);
+    expect(result.columnWidths).toEqual({ column1: { width: 150 }, column2: { width: 100 } });
+  });
 });

src/plugins/discover/public/application/utils/state_management/discover_slice.tsx

@@ -12,6 +12,7 @@ import { buildColumns } from '../columns';
 import * as utils from './common';
 import { SortOrder } from '../../../saved_searches/types';
 import { DEFAULT_COLUMNS_SETTING, PLUGIN_ID } from '../../../../common';
+import { ColumnWidths } from '../../components/data_grid/data_grid_table_columns';
 
 export interface DiscoverState {
   /**
@@ -52,6 +53,7 @@ export interface DiscoverState {
      */
     lineCount?: number;
   };
+  columnWidths?: ColumnWidths;
 }
 
 export interface DiscoverRootState extends RootState {
@@ -86,6 +88,7 @@ export const getPreloadedState = async ({
       preloadedState.state.columns = savedSearchInstance.columns;
       preloadedState.state.sort = savedSearchInstance.sort;
       preloadedState.state.savedSearch = savedSearchInstance.id;
+      preloadedState.state.columnWidths = savedSearchInstance.columnWidths;
       const indexPatternId = savedSearchInstance.searchSource.getField('index')?.id;
       preloadedState.root = {
         metadata: {
@@ -166,6 +169,11 @@ export const discoverSlice = createSlice({
         interval: action.payload,
       };
     },
+    setColumnWidths(state, action: PayloadAction<{ columnName: string; width: number }>) {
+      const { columnName, width } = action.payload;
+      if (!state.columnWidths) state.columnWidths = {};
+      state.columnWidths[columnName] = { width };
+    },
     updateState(state, action: PayloadAction<Partial<DiscoverState>>) {
       return {
         ...state,
@@ -200,6 +208,7 @@ export const {
   setColumns,
   setSort,
   setInterval,
+  setColumnWidths,
   setState,
   updateState,
   setSavedSearchId,

src/plugins/discover/public/application/view_components/canvas/discover_table.tsx

@@ -4,6 +4,7 @@
  */
 
 import React, { useCallback, useMemo } from 'react';
+import { EuiDataGridProps } from '@elastic/eui';
 import { DiscoverViewServices } from '../../../build_services';
 import { useOpenSearchDashboards } from '../../../../../opensearch_dashboards_react/public';
 import { DataGridTable } from '../../components/data_grid/data_grid_table';
@@ -14,6 +15,7 @@ import {
   removeColumn,
   setColumns,
   setSort,
+  setColumnWidths,
   useDispatch,
   useSelector,
 } from '../../utils/state_management';
@@ -41,7 +43,7 @@ export const DiscoverTable = ({ rows, scrollToTop }: Props) => {
   } = services;
 
   const { refetch$, indexPattern, savedSearch } = useDiscoverContext();
-  const { columns, sort } = useSelector((state) => state.discover);
+  const { columns, sort, columnWidths } = useSelector((state) => state.discover);
   const dispatch = useDispatch();
   const onAddColumn = (col: string) => {
     if (indexPattern && capabilities.discover?.save) {
@@ -85,6 +87,14 @@ export const DiscoverTable = ({ rows, scrollToTop }: Props) => {
     },
     [filterManager, indexPattern]
   );
+
+  const onColumnResize: EuiDataGridProps['onColumnResize'] = useCallback(
+    ({ columnId, width }: { columnId: string; width: number }) => {
+      dispatch(setColumnWidths({ columnName: columnId, width }));
+    },
+    [dispatch]
+  );
+
   const displayTimeColumn = useMemo(
     () => !!(!uiSettings.get(DOC_HIDE_TIME_COLUMN_SETTING, false) && indexPattern?.isTimeBased()),
     [indexPattern, uiSettings]
@@ -103,13 +113,15 @@ export const DiscoverTable = ({ rows, scrollToTop }: Props) => {
   return (
     <DataGridTable
       columns={columns}
+      columnWidths={columnWidths}
       indexPattern={indexPattern}
       onAddColumn={onAddColumn}
       onFilter={onAddFilter as DocViewFilterFn}
       onMoveColumn={onMoveColumn}
       onRemoveColumn={onRemoveColumn}
       onSetColumns={onSetColumns}
       onSort={onSetSort}
+      onColumnResize={onColumnResize}
       sort={sort}
       rows={rows}
       displayTimeColumn={displayTimeColumn}

src/plugins/discover/public/application/view_components/utils/use_search.ts

@@ -69,7 +69,9 @@ export type RefetchSubject = Subject<SearchRefetch>;
 export const useSearch = (services: DiscoverViewServices) => {
   const initalSearchComplete = useRef(false);
   const [savedSearch, setSavedSearch] = useState<SavedSearch | undefined>(undefined);
-  const { savedSearch: savedSearchId, sort, interval } = useSelector((state) => state.discover);
+  const { savedSearch: savedSearchId, sort, interval, columnWidths } = useSelector(
+    (state) => state.discover
+  );
   const { data, filterManager, getSavedSearchById, core, toastNotifications, chrome } = services;
   const indexPattern = useIndexPattern(services);
   const timefilter = data.query.timefilter.timefilter;