Fixed view_menu

elastic · Apr 29, 2020 · 67a4525 · 67a4525
1 parent 1cfc3fa
commit 67a4525
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 46 deletions.
diff --git a/...egacy/plugins/canvas/public/components/workpad_header/refresh_control/refresh_control.tsx b/...egacy/plugins/canvas/public/components/workpad_header/refresh_control/refresh_control.tsx
@@ -32,7 +32,7 @@ export const RefreshControl = ({ doRefresh, inFlight }: Props) => (
       iconType="refresh"
       aria-label={strings.getRefreshAriaLabel()}
       onClick={doRefresh}
-      {...{ 'data-test-subj': 'canvas-refresh-control' }}
+      data-test-subj="canvas-refresh-control"
     />
   </EuiToolTip>
 );

diff --git a/...gins/canvas/public/components/workpad_header/view_menu/__examples__/view_menu.stories.tsx b/...gins/canvas/public/components/workpad_header/view_menu/__examples__/view_menu.stories.tsx
@@ -8,6 +8,20 @@ import { action } from '@storybook/addon-actions';
 import React from 'react';
 import { ViewMenu } from '../view_menu';
 
+const handlers = {
+  setZoomScale: action('setZoomScale'),
+  zoomIn: action('zoomIn'),
+  zoomOut: action('zoomOut'),
+  toggleWriteable: action('toggleWriteable'),
+  resetZoom: action('resetZoom'),
+  enterFullscreen: action('enterFullscreen'),
+  doRefresh: action('doRefresh'),
+  fitToWindow: action('fitToWindow'),
+  setRefreshInterval: action('setRefreshInterval'),
+  setAutoplayInterval: action('setAutoplayInterval'),
+  enableAutoplay: action('enableAutoplay'),
+};
+
 storiesOf('components/WorkpadHeader/ViewMenu', module)
   .add('edit mode', () => (
     <ViewMenu
@@ -16,17 +30,7 @@ storiesOf('components/WorkpadHeader/ViewMenu', module)
       refreshInterval={0}
       autoplayInterval={0}
       autoplayEnabled={false}
-      setZoomScale={action('setZoomScale')}
-      zoomIn={action('zoomIn')}
-      zoomOut={action('zoomOut')}
-      toggleWriteable={action('toggleWriteable')}
-      resetZoom={action('resetZoom')}
-      enterFullscreen={action('enterFullscreen')}
-      doRefresh={action('doRefresh')}
-      fitToWindow={action('fitToWindow')}
-      setRefreshInterval={action('setRefreshInterval')}
-      setAutoplayInterval={action('setAutoplayInterval')}
-      enableAutoplay={action('enableAutoplay')}
+      {...handlers}
     />
   ))
   .add('read only mode', () => (
@@ -36,17 +40,7 @@ storiesOf('components/WorkpadHeader/ViewMenu', module)
       refreshInterval={0}
       autoplayInterval={0}
       autoplayEnabled={false}
-      setZoomScale={action('setZoomScale')}
-      zoomIn={action('zoomIn')}
-      zoomOut={action('zoomOut')}
-      toggleWriteable={action('toggleWriteable')}
-      resetZoom={action('resetZoom')}
-      enterFullscreen={action('enterFullscreen')}
-      doRefresh={action('doRefresh')}
-      fitToWindow={action('fitToWindow')}
-      setRefreshInterval={action('setRefreshInterval')}
-      setAutoplayInterval={action('setAutoplayInterval')}
-      enableAutoplay={action('enableAutoplay')}
+      {...handlers}
     />
   ))
   .add('with refresh enabled', () => (
@@ -56,17 +50,7 @@ storiesOf('components/WorkpadHeader/ViewMenu', module)
       refreshInterval={1000}
       autoplayInterval={0}
       autoplayEnabled={false}
-      setZoomScale={action('setZoomScale')}
-      zoomIn={action('zoomIn')}
-      zoomOut={action('zoomOut')}
-      toggleWriteable={action('toggleWriteable')}
-      resetZoom={action('resetZoom')}
-      enterFullscreen={action('enterFullscreen')}
-      doRefresh={action('doRefresh')}
-      fitToWindow={action('fitToWindow')}
-      setRefreshInterval={action('setRefreshInterval')}
-      setAutoplayInterval={action('setAutoplayInterval')}
-      enableAutoplay={action('enableAutoplay')}
+      {...handlers}
     />
   ))
   .add('with autoplay enabled', () => (
@@ -76,16 +60,6 @@ storiesOf('components/WorkpadHeader/ViewMenu', module)
       refreshInterval={0}
       autoplayInterval={5000}
       autoplayEnabled={true}
-      setZoomScale={action('setZoomScale')}
-      zoomIn={action('zoomIn')}
-      zoomOut={action('zoomOut')}
-      toggleWriteable={action('toggleWriteable')}
-      resetZoom={action('resetZoom')}
-      enterFullscreen={action('enterFullscreen')}
-      doRefresh={action('doRefresh')}
-      fitToWindow={action('fitToWindow')}
-      setRefreshInterval={action('setRefreshInterval')}
-      setAutoplayInterval={action('setAutoplayInterval')}
-      enableAutoplay={action('enableAutoplay')}
+      {...handlers}
     />
   ));
diff --git a/...egacy/plugins/canvas/public/components/workpad_header/view_menu/auto_refresh_controls.tsx b/...egacy/plugins/canvas/public/components/workpad_header/view_menu/auto_refresh_controls.tsx
@@ -112,6 +112,11 @@ export const AutoRefreshControls = ({ refreshInterval, setRefresh, disableInterv
         <EuiSpacer size="s" />
         <EuiText size="s">
           <ListGroup aria-labelledby={intervalTitleId} className="canvasControlSettings__list">
+            <RefreshItem
+              duration={30000}
+              label={getSecondsText(30)}
+              descriptionId={intervalTitleId}
+            />
             <RefreshItem
               duration={60000}
               label={getMinutesText(1)}

diff --git a/x-pack/legacy/plugins/canvas/public/components/workpad_header/view_menu/view_menu.tsx b/x-pack/legacy/plugins/canvas/public/components/workpad_header/view_menu/view_menu.tsx
@@ -163,7 +163,6 @@ export const ViewMenu: FunctionComponent<Props> = ({
 
   const getPanelTree = (closePopover: ClosePopoverFn) => ({
     id: 0,
-    title: strings.getViewMenuLabel(),
     items: [
       {
         name: strings.getRefreshMenuItemLabel(),