Merge branch 'master' into multi-queries

simcha90 · Dec 13, 2020 · 8428c07 · 8428c07
2 parents f01b9af + 022d755
commit 8428c07
Showing 1 changed file with 8 additions and 9 deletions.
diff --git a/superset-frontend/src/dashboard/components/SliceHeaderControls.jsx b/superset-frontend/src/dashboard/components/SliceHeaderControls.jsx
@@ -195,8 +195,7 @@ class SliceHeaderControls extends React.PureComponent {
           : item}
       </div>
     ));
-    const resizeLabel = isFullSize ? t('Minimize') : t('Maximize');
-
+    const resizeLabel = isFullSize ? t('Minimize Chart') : t('Maximize Chart');
     const menu = (
       <Menu
         onClick={this.handleMenuClick}
@@ -225,16 +224,10 @@ class SliceHeaderControls extends React.PureComponent {
 
         {this.props.supersetCanExplore && (
           <Menu.Item key={MENU_KEYS.EXPLORE_CHART}>
-            {t('Explore chart')}
+            {t('View Chart in Explore')}
           </Menu.Item>
         )}
 
-        {this.props.supersetCanCSV && (
-          <Menu.Item key={MENU_KEYS.EXPORT_CSV}>{t('Export CSV')}</Menu.Item>
-        )}
-
-        <Menu.Item key={MENU_KEYS.RESIZE_LABEL}>{resizeLabel}</Menu.Item>
-
         <Menu.Item key={MENU_KEYS.SHARE_CHART}>
           <URLShortLinkModal
             url={getDashboardUrl(
@@ -248,9 +241,15 @@ class SliceHeaderControls extends React.PureComponent {
           />
         </Menu.Item>
 
+        <Menu.Item key={MENU_KEYS.RESIZE_LABEL}>{resizeLabel}</Menu.Item>
+
         <Menu.Item key={MENU_KEYS.DOWNLOAD_AS_IMAGE}>
           {t('Download as image')}
         </Menu.Item>
+
+        {this.props.supersetCanCSV && (
+          <Menu.Item key={MENU_KEYS.EXPORT_CSV}>{t('Export CSV')}</Menu.Item>
+        )}
       </Menu>
     );