a

Signed-off-by: Anan Zhuang <ananzh@amazon.com>
opensearch-project · Sep 23, 2022 · ac91222 · ac91222
1 parent acd34ef
commit ac91222
Showing 1 changed file with 7 additions and 12 deletions.
diff --git a/src/plugins/vis_type_table/public/components/table_vis_grid_columns.tsx b/src/plugins/vis_type_table/public/components/table_vis_grid_columns.tsx
@@ -11,21 +11,16 @@ import { Table } from '../table_vis_response_handler';
 import { TableVisConfig } from '../types';
 import { convertToFormattedData } from '../utils/convert_to_formatted_data';
 
-interface FilterData {
-  row: number;
-  column: number;
-}
-
 export const getDataGridColumns = (
   table: Table,
   visConfig: TableVisConfig,
   handlers: IInterpreterRenderHandlers
 ) => {
   const { formattedRows, formattedColumns } = convertToFormattedData(table, visConfig);
 
-  const filterBucket = (data: FilterData, negate: boolean) => {
-    const foramttedColumnId = formattedColumns[data.column].id;
-    const filterColumnIndex = table.columns.findIndex((col) => col.id === foramttedColumnId);
+  const filterBucket = (rowIndex: number, columnIndex: number, negate: boolean) => {
+    const foramttedColumnId = formattedColumns[columnIndex].id;
+    const rawColumnIndex = table.columns.findIndex((col) => col.id === foramttedColumnId);
     handlers.event({
       name: 'filterBucket',
       data: {
@@ -35,8 +30,8 @@ export const getDataGridColumns = (
               columns: table.columns,
               rows: formattedRows,
             },
-            row: data.row,
-            column: filterColumnIndex,
+            row: rowIndex,
+            column: rawColumnIndex,
           },
         ],
         negate,
@@ -71,7 +66,7 @@ export const getDataGridColumns = (
               filterValue != null && (
                 <Component
                   onClick={() => {
-                    filterBucket({ row: rowIndex, column: colIndex }, false);
+                    filterBucket(rowIndex, colIndex, false);
                     closePopover();
                   }}
                   iconType="plusInCircle"
@@ -107,7 +102,7 @@ export const getDataGridColumns = (
               filterValue != null && (
                 <Component
                   onClick={() => {
-                    filterBucket({ row: rowIndex, column: colIndex }, true);
+                    filterBucket(rowIndex, colIndex, true);
                     closePopover();
                   }}
                   iconType="minusInCircle"