[setup] DRY out utils to action_types

+ `collapsed_item_actions` is repeating a util already in there unnecessarily, DRY it out too
elastic · Nov 17, 2023 · 6cf4211 · 6cf4211
1 parent b038a8c
commit 6cf4211
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 16 deletions.
diff --git a/src/components/basic_table/action_types.ts b/src/components/basic_table/action_types.ts
@@ -88,8 +88,13 @@ export interface CustomItemAction<T> {
 
 export type Action<T> = DefaultItemAction<T> | CustomItemAction<T>;
 
-export const isCustomItemAction = (
-  action: DefaultItemAction<any> | CustomItemAction<any>
-): action is CustomItemAction<any> => {
+export const isCustomItemAction = <T>(
+  action: DefaultItemAction<T> | CustomItemAction<T>
+): action is CustomItemAction<T> => {
   return action.hasOwnProperty('render');
 };
+
+export const callWithItemIfFunction =
+  <T>(item: T) =>
+  <U>(prop: U | ((item: T) => U)): U =>
+    typeof prop === 'function' ? (prop as Function)(item) : prop;
diff --git a/src/components/basic_table/collapsed_item_actions.tsx b/src/components/basic_table/collapsed_item_actions.tsx
@@ -21,7 +21,12 @@ import { EuiButtonIcon } from '../button';
 import { EuiToolTip } from '../tool_tip';
 import { EuiI18n } from '../i18n';
 
-import { Action, CustomItemAction } from './action_types';
+import {
+  Action,
+  CustomItemAction,
+  isCustomItemAction,
+  callWithItemIfFunction,
+} from './action_types';
 import { ItemIdResolved } from './table_types';
 
 export interface CollapsedItemActionsProps<T extends {}> {
@@ -32,10 +37,6 @@ export interface CollapsedItemActionsProps<T extends {}> {
   className?: string;
 }
 
-const actionIsCustomItemAction = <T extends {}>(
-  action: Action<T>
-): action is CustomItemAction<T> => action.hasOwnProperty('render');
-
 export const CollapsedItemActions = <T extends {}>({
   actions,
   itemId,
@@ -59,7 +60,7 @@ export const CollapsedItemActions = <T extends {}>({
       const enabled = actionEnabled(action);
       if (enabled) setAllDisabled(false);
 
-      if (actionIsCustomItemAction(action)) {
+      if (isCustomItemAction<T>(action)) {
         const customAction = action as CustomItemAction<T>;
         const actionControl = customAction.render(item, enabled);
         controls.push(

diff --git a/src/components/basic_table/default_item_action.tsx b/src/components/basic_table/default_item_action.tsx
@@ -7,6 +7,7 @@
  */
 
 import React, { ReactElement } from 'react';
+
 import { isString } from '../../services/predicate';
 import {
   EuiButtonEmpty,
@@ -15,10 +16,14 @@ import {
   EuiButtonIconProps,
 } from '../button';
 import { EuiToolTip } from '../tool_tip';
-import { DefaultItemAction as Action } from './action_types';
 import { useGeneratedHtmlId } from '../../services/accessibility';
 import { EuiScreenReaderOnly } from '../accessibility';
 
+import {
+  DefaultItemAction as Action,
+  callWithItemIfFunction,
+} from './action_types';
+
 export interface DefaultItemActionProps<T> {
   action: Action<T>;
   enabled: boolean;
@@ -109,8 +114,3 @@ export const DefaultItemAction = <T,>({
     button
   );
 };
-
-const callWithItemIfFunction =
-  <T,>(item: T) =>
-  <U,>(prop: U | ((item: T) => U)): U =>
-    typeof prop === 'function' ? (prop as Function)(item) : prop;
diff --git a/src/components/basic_table/expanded_item_actions.tsx b/src/components/basic_table/expanded_item_actions.tsx
@@ -51,7 +51,7 @@ export const ExpandedItemActions = <T extends {}>({
           expandedItemActions__completelyHide: moreThanThree && index < 2,
         });
 
-        if (isCustomItemAction(action)) {
+        if (isCustomItemAction<T>(action)) {
           // custom action has a render function
           tools.push(
             <CustomItemAction