fix(explore): Double divider if no permissions for adding reports (#1…

…9777)
apache · Apr 19, 2022 · 3663a33 · 3663a33
1 parent 6f4480a
commit 3663a33
Showing 1 changed file with 28 additions and 24 deletions.
diff --git a/superset-frontend/src/explore/components/ExploreAdditionalActionsMenu/index.jsx b/superset-frontend/src/explore/components/ExploreAdditionalActionsMenu/index.jsx
@@ -370,31 +370,35 @@ const ExploreAdditionalActionsMenu = ({
               </Menu.Item>
             </Menu.SubMenu>
             <Menu.Divider />
-            {canAddReports &&
-              (report ? (
-                <Menu.SubMenu
-                  title={t('Manage email report')}
-                  key={MENU_KEYS.REPORT_SUBMENU}
-                >
-                  <Menu.Item key={MENU_KEYS.SET_REPORT_ACTIVE}>
-                    <MenuItemWithCheckboxContainer>
-                      <Checkbox checked={isReportActive} onChange={noOp} />
-                      {t('Email reports active')}
-                    </MenuItemWithCheckboxContainer>
-                  </Menu.Item>
-                  <Menu.Item key={MENU_KEYS.EDIT_REPORT}>
-                    {t('Edit email report')}
-                  </Menu.Item>
-                  <Menu.Item key={MENU_KEYS.DELETE_REPORT}>
-                    {t('Delete email report')}
+            {canAddReports && (
+              <>
+                {report ? (
+                  <Menu.SubMenu
+                    title={t('Manage email report')}
+                    key={MENU_KEYS.REPORT_SUBMENU}
+                  >
+                    <Menu.Item key={MENU_KEYS.SET_REPORT_ACTIVE}>
+                      <MenuItemWithCheckboxContainer>
+                        <Checkbox checked={isReportActive} onChange={noOp} />
+                        {t('Email reports active')}
+                      </MenuItemWithCheckboxContainer>
+                    </Menu.Item>
+                    <Menu.Item key={MENU_KEYS.EDIT_REPORT}>
+                      {t('Edit email report')}
+                    </Menu.Item>
+                    <Menu.Item key={MENU_KEYS.DELETE_REPORT}>
+                      {t('Delete email report')}
+                    </Menu.Item>
+                  </Menu.SubMenu>
+                ) : (
+                  <Menu.Item key={MENU_KEYS.SET_UP_REPORT}>
+                    {t('Set up an email report')}
                   </Menu.Item>
-                </Menu.SubMenu>
-              ) : (
-                <Menu.Item key={MENU_KEYS.SET_UP_REPORT}>
-                  {t('Set up an email report')}
-                </Menu.Item>
-              ))}
-            <Menu.Divider />
+                )}
+                <Menu.Divider />
+              </>
+            )}
+
             <Menu.Item key={MENU_KEYS.VIEW_QUERY}>
               <ModalTrigger
                 triggerNode={