From b4dd9784bdcde398b733d580e55efd0b8b140efa Mon Sep 17 00:00:00 2001 From: Rafael Wendel Date: Thu, 25 Feb 2021 19:56:50 -0300 Subject: [PATCH] Removed mistakenly set menuitem role from anchors --- .../QueryControlDropdown.jsx | 7 ++----- client/app/components/TagsList.tsx | 1 - client/app/pages/alert/components/MenuButton.jsx | 12 +++--------- .../dashboards/components/DashboardHeader.jsx | 16 ++++------------ 4 files changed, 9 insertions(+), 27 deletions(-) diff --git a/client/app/components/EditVisualizationButton/QueryControlDropdown.jsx b/client/app/components/EditVisualizationButton/QueryControlDropdown.jsx index 6f04ada37..fc5b99195 100644 --- a/client/app/components/EditVisualizationButton/QueryControlDropdown.jsx +++ b/client/app/components/EditVisualizationButton/QueryControlDropdown.jsx @@ -18,17 +18,14 @@ export default function QueryControlDropdown(props) { {!props.query.isNew() && (!props.query.is_draft || !props.query.is_archived) && ( - props.openAddToDashboardForm(props.selectedTab)}> + props.openAddToDashboardForm(props.selectedTab)}> Add to Dashboard )} {!clientConfig.disablePublicUrls && !props.query.isNew() && ( - props.showEmbedDialog(props.query, props.selectedTab)} - data-test="ShowEmbedDialogButton"> + props.showEmbedDialog(props.query, props.selectedTab)} data-test="ShowEmbedDialogButton"> Embed Elsewhere diff --git a/client/app/components/TagsList.tsx b/client/app/components/TagsList.tsx index 75f199cfd..7ec320f06 100644 --- a/client/app/components/TagsList.tsx +++ b/client/app/components/TagsList.tsx @@ -92,7 +92,6 @@ function TagsList({ tagsUrl, showUnselectAll = false, onUpdate }: TagsListProps) toggleTag(event, tag.name)}> {tag.name} diff --git a/client/app/pages/alert/components/MenuButton.jsx b/client/app/pages/alert/components/MenuButton.jsx index 7897cab28..bf83f68aa 100644 --- a/client/app/pages/alert/components/MenuButton.jsx +++ b/client/app/pages/alert/components/MenuButton.jsx @@ -46,19 +46,13 @@ export default function MenuButton({ doDelete, canEdit, mute, unmute, muted }) { {muted ? ( - execute(unmute)}> - Unmute Notifications - + execute(unmute)}>Unmute Notifications ) : ( - execute(mute)}> - Mute Notifications - + execute(mute)}>Mute Notifications )} - - Delete - + Delete }> diff --git a/client/app/pages/dashboards/components/DashboardHeader.jsx b/client/app/pages/dashboards/components/DashboardHeader.jsx index aadb9dfbb..be695d6d7 100644 --- a/client/app/pages/dashboards/components/DashboardHeader.jsx +++ b/client/app/pages/dashboards/components/DashboardHeader.jsx @@ -138,28 +138,20 @@ function DashboardMoreOptionsButton({ dashboardConfiguration }) { overlay={ - setEditingLayout(true)}> - Edit - + setEditingLayout(true)}>Edit {clientConfig.showPermissionsControl && isDashboardOwnerOrAdmin && ( - - Manage Permissions - + Manage Permissions )} {!clientConfig.disablePublish && !dashboard.is_draft && ( - - Unpublish - + Unpublish )} - - Archive - + Archive }>