Add improvements suggested during code review

elastic · Dec 14, 2022 · e6c6a8d · e6c6a8d
1 parent 98ae5ee
commit e6c6a8d
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 23 deletions.
diff --git a/src/plugins/ui_actions/public/cell_actions/components/cell_actions.tsx b/src/plugins/ui_actions/public/cell_actions/components/cell_actions.tsx
@@ -96,11 +96,11 @@ export const CellActions: React.FC<CellActionsProps> = ({
         'No CellActionsContext found. Please wrap the application with CellActionsContextProvider'
       );
       return Promise.resolve([]);
-    } else {
-      return context
-        .getCompatibleActions(triggerId, actionContext)
-        .then((actions) => orderBy(['order', 'id'], ['asc', 'asc'], actions));
     }
+
+    return context
+      .getCompatibleActions(triggerId, actionContext)
+      .then((actions) => orderBy(['order', 'id'], ['asc', 'asc'], actions));
   }, [context, triggerId, actionContext]);
 
   if (mode === CellActionsMode.HOVER_POPOVER) {
@@ -131,8 +131,6 @@ export const CellActions: React.FC<CellActionsProps> = ({
         <div ref={extraContentNodeRef} />
       </div>
     );
-  } else {
-    return <>Not implemented</>;
   }
 };
 

diff --git a/src/plugins/ui_actions/public/cell_actions/components/extra_actions_button.tsx b/src/plugins/ui_actions/public/cell_actions/components/extra_actions_button.tsx
@@ -8,17 +8,13 @@
 
 import { EuiButtonIcon, EuiToolTip } from '@elastic/eui';
 import React from 'react';
-import { i18n } from '@kbn/i18n';
+import { SHOW_MORE_ACTIONS } from './translations';
 
 interface ExtraActionsButtonProps {
   onClick: () => void;
   showTooltip: boolean;
 }
 
-export const SHOW_MORE_ACTIONS = i18n.translate('uiActions.showMoreActionsLabel', {
-  defaultMessage: 'More actions',
-});
-
 export const ExtraActionsButton: React.FC<ExtraActionsButtonProps> = ({ onClick, showTooltip }) =>
   showTooltip ? (
     <EuiToolTip content={SHOW_MORE_ACTIONS}>

diff --git a/src/plugins/ui_actions/public/cell_actions/components/extra_actions_popover.tsx b/src/plugins/ui_actions/public/cell_actions/components/extra_actions_popover.tsx
@@ -16,19 +16,14 @@ import {
 import React, { useMemo } from 'react';
 import { euiThemeVars } from '@kbn/ui-theme';
 import { css } from '@emotion/react';
-import { i18n } from '@kbn/i18n';
 import type { Action } from '../../actions';
-import { YOU_ARE_IN_A_DIALOG_CONTAINING_OPTIONS } from './translations';
+import { EXTRA_ACTIONS_ARIA_LABEL, YOU_ARE_IN_A_DIALOG_CONTAINING_OPTIONS } from './translations';
 import { CellActionExecutionContext } from './cell_actions';
 
 const euiContextMenuItemCSS = css`
   color: ${euiThemeVars.euiColorPrimaryText};
 `;
 
-const EXTRA_ACTIONS_ARIA_LABEL = i18n.translate('uiActions.cellActions.extraActionsAriaLabel', {
-  defaultMessage: 'Extra actions',
-});
-
 interface ActionsPopOverProps {
   actionContext: CellActionExecutionContext;
   isOpen: boolean;
@@ -50,7 +45,7 @@ export const ExtraActionsPopOver: React.FC<ActionsPopOverProps> = ({
     closePopover={closePopOver}
     panelPaddingSize="xs"
     anchorPosition={'downCenter'}
-    hasArrow={true}
+    hasArrow
     repositionOnScroll
     ownFocus
     data-test-subj="extraActionsPopOver"

diff --git a/src/plugins/ui_actions/public/cell_actions/components/hover_actions_popover.tsx b/src/plugins/ui_actions/public/cell_actions/components/hover_actions_popover.tsx
@@ -11,11 +11,10 @@ import { EuiPopover, EuiScreenReaderOnly } from '@elastic/eui';
 import React, { useCallback, useMemo, useRef, useState } from 'react';
 import { euiThemeVars } from '@kbn/ui-theme';
 import { css } from '@emotion/react';
-import { i18n } from '@kbn/i18n';
 import type { Action } from '../../actions';
 import { ActionItem } from './cell_action_item';
 import { ExtraActionsButton } from './extra_actions_button';
-import { YOU_ARE_IN_A_DIALOG_CONTAINING_OPTIONS } from './translations';
+import { ACTIONS_AREA_LABEL, YOU_ARE_IN_A_DIALOG_CONTAINING_OPTIONS } from './translations';
 import { partitionActions } from '../hooks/actions';
 import { ExtraActionsPopOverWithAnchor } from './extra_actions_popover';
 import { CellActionExecutionContext } from './cell_actions';
@@ -125,9 +124,7 @@ export const HoverActionsPopover = React.memo<Props>(
             repositionOnScroll
             ownFocus={false}
             data-test-subj={'hoverActionsPopover'}
-            aria-label={i18n.translate('uiActions.cellActions.actionsAriaLabel', {
-              defaultMessage: 'Actions',
-            })}
+            aria-label={ACTIONS_AREA_LABEL}
           >
             {showHoverContent ? (
               <div css={hoverContentWrapperCSS}>

diff --git a/src/plugins/ui_actions/public/cell_actions/components/translations.ts b/src/plugins/ui_actions/public/cell_actions/components/translations.ts
@@ -12,3 +12,18 @@ export const YOU_ARE_IN_A_DIALOG_CONTAINING_OPTIONS = (fieldName: string) =>
     values: { fieldName },
     defaultMessage: `You are in a dialog, containing options for field {fieldName}. Press tab to navigate options. Press escape to exit.`,
   });
+
+export const EXTRA_ACTIONS_ARIA_LABEL = i18n.translate(
+  'uiActions.cellActions.extraActionsAriaLabel',
+  {
+    defaultMessage: 'Extra actions',
+  }
+);
+
+export const SHOW_MORE_ACTIONS = i18n.translate('uiActions.showMoreActionsLabel', {
+  defaultMessage: 'More actions',
+});
+
+export const ACTIONS_AREA_LABEL = i18n.translate('uiActions.cellActions.actionsAriaLabel', {
+  defaultMessage: 'Actions',
+});