Remove hasActions prop from basic/memory tables

- will automatically be calculated if any `column.actions` exists, prop should no longer be needed
elastic · Mar 28, 2024 · 0b13d3b · 0b13d3b
1 parent 9c5e147
commit 0b13d3b
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 11 deletions.
diff --git a/src-docs/src/views/tables/actions/actions.tsx b/src-docs/src/views/tables/actions/actions.tsx
@@ -396,7 +396,6 @@ export default () => {
         pagination={pagination}
         sorting={sorting}
         selection={selection}
-        hasActions={customAction ? false : true}
         onChange={onTableChange}
       />
     </>

diff --git a/src-docs/src/views/tables/expanding_rows/expanding_rows.tsx b/src-docs/src/views/tables/expanding_rows/expanding_rows.tsx
@@ -261,7 +261,6 @@ export default () => {
       itemId="id"
       itemIdToExpandedRowMap={itemIdToExpandedRowMap}
       isExpandable={true}
-      hasActions={true}
       columns={columnsWithExpandingRowToggle}
       pagination={pagination}
       sorting={sorting}

diff --git a/src-docs/src/views/tables/mobile/mobile.tsx b/src-docs/src/views/tables/mobile/mobile.tsx
@@ -300,7 +300,6 @@ export default () => {
         pagination={pagination}
         sorting={sorting}
         selection={selection}
-        hasActions={true}
         responsiveBreakpoint={isResponsive}
         onChange={onTableChange}
       />

diff --git a/src/components/basic_table/basic_table.tsx b/src/components/basic_table/basic_table.tsx
@@ -241,7 +241,6 @@ interface BasicTableProps<T extends object>
    * Indicates which column should be used as the identifying cell in each row. Should match a "field" prop in FieldDataColumn
    */
   rowHeader?: string;
-  hasActions?: boolean;
   isExpandable?: boolean;
   /**
    * Provides an infinite loading indicator
@@ -525,7 +524,6 @@ export class EuiBasicTable<T extends object = any> extends Component<
       responsive,
       responsiveBreakpoint,
       isExpandable,
-      hasActions,
       rowProps,
       cellProps,
       tableCaption,
@@ -977,7 +975,6 @@ export class EuiBasicTable<T extends object = any> extends Component<
     const {
       columns,
       selection,
-      hasActions,
       rowHeader,
       itemIdToExpandedRowMap = {},
       isExpandable,
@@ -1009,7 +1006,7 @@ export class EuiBasicTable<T extends object = any> extends Component<
       rowSelectionDisabled = !!isDisabled;
     }
 
-    let calculatedHasActions;
+    let hasActions;
     columns.forEach((column: EuiBasicTableColumn<T>, columnIndex: number) => {
       if ((column as EuiTableActionsColumnType<T>).actions) {
         cells.push(
@@ -1020,7 +1017,7 @@ export class EuiBasicTable<T extends object = any> extends Component<
             columnIndex
           )
         );
-        calculatedHasActions = true;
+        hasActions = true;
       } else if ((column as EuiTableFieldDataColumnType<T>).field) {
         const fieldDataColumn = column as EuiTableFieldDataColumnType<T>;
         cells.push(
@@ -1080,7 +1077,7 @@ export class EuiBasicTable<T extends object = any> extends Component<
         hasSelection={!!selection}
         isSelectable={!rowSelectionDisabled}
         isSelected={selected}
-        hasActions={hasActions == null ? calculatedHasActions : hasActions}
+        hasActions={hasActions}
         isExpandable={isExpandable}
         {...rowProps}
       >

diff --git a/src/components/basic_table/in_memory_table.tsx b/src/components/basic_table/in_memory_table.tsx
@@ -678,7 +678,6 @@ export class EuiInMemoryTable<T extends object = object> extends Component<
       message,
       error,
       selection,
-      hasActions,
       compressed,
       pagination: hasPagination,
       sorting: hasSorting,
@@ -747,7 +746,6 @@ export class EuiInMemoryTable<T extends object = object> extends Component<
         pagination={pagination}
         sorting={sorting}
         selection={selection}
-        hasActions={hasActions}
         onChange={this.onTableChange}
         error={error}
         loading={loading}