Skip to content

Commit

Permalink
fix: Issue #24493; Resolved report selection menu in chart and dashbo…
Browse files Browse the repository at this point in the history
…ard page (#25157)

(cherry picked from commit d030544)
  • Loading branch information
sandeep-patel11 authored and michael-s-molina committed Sep 6, 2023
1 parent 90a66ee commit e77bc06
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 17 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@ export default function HeaderReportDropDown({
setShowReportSubMenu,
setIsDropdownVisible,
isDropdownVisible,
...rest
}: HeaderReportProps) {
const dispatch = useDispatch();
const report = useSelector<any, AlertObject>(state => {
Expand Down Expand Up @@ -214,7 +215,7 @@ export default function HeaderReportDropDown({

const textMenu = () =>
isEmpty(report) ? (
<Menu selectable={false} css={onMenuHover}>
<Menu selectable={false} {...rest} css={onMenuHover}>
<Menu.Item onClick={handleShowMenu}>
{DropdownItemExtension ? (
<StyledDropdownItemWithIcon>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -114,12 +114,12 @@ export const useExploreAdditionalActionsMenu = (
onOpenPropertiesModal,
ownState,
dashboards,
...rest
) => {
const theme = useTheme();
const { addDangerToast, addSuccessToast } = useToasts();
const [showReportSubMenu, setShowReportSubMenu] = useState(null);
const [isDropdownVisible, setIsDropdownVisible] = useState(false);
const [openSubmenus, setOpenSubmenus] = useState([]);
const chart = useSelector(
state => state.charts?.[getChartKey(state.explore)],
);
Expand Down Expand Up @@ -204,23 +204,19 @@ export const useExploreAdditionalActionsMenu = (
case MENU_KEYS.EXPORT_TO_CSV:
exportCSV();
setIsDropdownVisible(false);
setOpenSubmenus([]);
break;
case MENU_KEYS.EXPORT_TO_CSV_PIVOTED:
exportCSVPivoted();
setIsDropdownVisible(false);
setOpenSubmenus([]);
break;
case MENU_KEYS.EXPORT_TO_JSON:
exportJson();
setIsDropdownVisible(false);
setOpenSubmenus([]);

break;
case MENU_KEYS.EXPORT_TO_XLSX:
exportExcel();
setIsDropdownVisible(false);
setOpenSubmenus([]);
break;
case MENU_KEYS.DOWNLOAD_AS_IMAGE:
downloadAsImage(
Expand All @@ -230,21 +226,17 @@ export const useExploreAdditionalActionsMenu = (
true,
)(domEvent);
setIsDropdownVisible(false);
setOpenSubmenus([]);
break;
case MENU_KEYS.COPY_PERMALINK:
copyLink();
setIsDropdownVisible(false);
setOpenSubmenus([]);
break;
case MENU_KEYS.EMBED_CODE:
setIsDropdownVisible(false);
setOpenSubmenus([]);
break;
case MENU_KEYS.SHARE_BY_EMAIL:
shareByEmail();
setIsDropdownVisible(false);
setOpenSubmenus([]);
break;
case MENU_KEYS.VIEW_QUERY:
setIsDropdownVisible(false);
Expand Down Expand Up @@ -272,12 +264,7 @@ export const useExploreAdditionalActionsMenu = (

const menu = useMemo(
() => (
<Menu
onClick={handleMenuClick}
selectable={false}
openKeys={openSubmenus}
onOpenChange={setOpenSubmenus}
>
<Menu onClick={handleMenuClick} selectable={false} {...rest}>
<>
{slice && (
<Menu.Item key={MENU_KEYS.EDIT_PROPERTIES}>
Expand Down Expand Up @@ -423,7 +410,6 @@ export const useExploreAdditionalActionsMenu = (
handleMenuClick,
isDropdownVisible,
latestQueryFormData,
openSubmenus,
showReportSubMenu,
slice,
theme.gridUnit,
Expand Down

0 comments on commit e77bc06

Please sign in to comment.