From 04586263791175a14805680602e9310cc3dbe508 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cau=C3=AA=20Marcondes?=
<55978943+cauemarcondes@users.noreply.github.com>
Date: Tue, 7 Apr 2020 08:08:00 +0100
Subject: [PATCH] fixing bug (#62577)
---
.../app/Settings/CustomizeUI/CustomLink/Title.tsx | 2 +-
.../components/app/Settings/CustomizeUI/index.tsx | 4 ++--
.../apm/public/components/app/Settings/index.tsx | 4 ++--
.../TransactionActionMenu/CustomLink/index.test.tsx | 2 +-
.../shared/TransactionActionMenu/CustomLink/index.tsx | 2 +-
.../TransactionActionMenu/TransactionActionMenu.tsx | 11 +++++++----
6 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/x-pack/legacy/plugins/apm/public/components/app/Settings/CustomizeUI/CustomLink/Title.tsx b/x-pack/legacy/plugins/apm/public/components/app/Settings/CustomizeUI/CustomLink/Title.tsx
index 17ec42b3e20161..07af7b0c0e7db8 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/Settings/CustomizeUI/CustomLink/Title.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/app/Settings/CustomizeUI/CustomLink/Title.tsx
@@ -28,7 +28,7 @@ export const Title = () => (
'xpack.apm.settings.customizeUI.customLink.info',
{
defaultMessage:
- "These links will be shown in the 'Actions' context menu for the transaction detail."
+ 'These links will be shown in the Actions context menu for transactions.'
}
)}
/>
diff --git a/x-pack/legacy/plugins/apm/public/components/app/Settings/CustomizeUI/index.tsx b/x-pack/legacy/plugins/apm/public/components/app/Settings/CustomizeUI/index.tsx
index 1cd1298fdd5492..350f2185fb3c8a 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/Settings/CustomizeUI/index.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/app/Settings/CustomizeUI/index.tsx
@@ -14,8 +14,8 @@ export const CustomizeUI = () => {
<>
- {i18n.translate('xpack.apm.settings.customizeUI', {
- defaultMessage: 'Customize UI'
+ {i18n.translate('xpack.apm.settings.customizeApp', {
+ defaultMessage: 'Customize app'
})}
diff --git a/x-pack/legacy/plugins/apm/public/components/app/Settings/index.tsx b/x-pack/legacy/plugins/apm/public/components/app/Settings/index.tsx
index f33bb17decd4e2..2bb85876686bf2 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/Settings/index.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/app/Settings/index.tsx
@@ -57,8 +57,8 @@ export const Settings: React.FC = props => {
isSelected: pathname === '/settings/apm-indices'
},
{
- name: i18n.translate('xpack.apm.settings.customizeUI', {
- defaultMessage: 'Customize UI'
+ name: i18n.translate('xpack.apm.settings.customizeApp', {
+ defaultMessage: 'Customize app'
}),
id: '3',
href: getAPMHref('/settings/customize-ui', search),
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/TransactionActionMenu/CustomLink/index.test.tsx b/x-pack/legacy/plugins/apm/public/components/shared/TransactionActionMenu/CustomLink/index.test.tsx
index 2dab8d63f99b26..9d1eeb9a3136d9 100644
--- a/x-pack/legacy/plugins/apm/public/components/shared/TransactionActionMenu/CustomLink/index.test.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/shared/TransactionActionMenu/CustomLink/index.test.tsx
@@ -28,7 +28,7 @@ describe('Custom links', () => {
);
expectTextsInDocument(component, [
- 'No custom links found. Set up your own custom links i.e. a link to a specific Dashboard or external link.'
+ 'No custom links found. Set up your own custom links, e.g., a link to a specific Dashboard or external link.'
]);
expectTextsNotInDocument(component, ['Create']);
});
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/TransactionActionMenu/CustomLink/index.tsx b/x-pack/legacy/plugins/apm/public/components/shared/TransactionActionMenu/CustomLink/index.tsx
index b32d8f0d9582cb..38b672a181fceb 100644
--- a/x-pack/legacy/plugins/apm/public/components/shared/TransactionActionMenu/CustomLink/index.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/shared/TransactionActionMenu/CustomLink/index.tsx
@@ -55,7 +55,7 @@ export const CustomLink = ({
{i18n.translate('xpack.apm.customLink.empty', {
defaultMessage:
- 'No custom links found. Set up your own custom links i.e. a link to a specific Dashboard or external link.'
+ 'No custom links found. Set up your own custom links, e.g., a link to a specific Dashboard or external link.'
})}
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/TransactionActionMenu/TransactionActionMenu.tsx b/x-pack/legacy/plugins/apm/public/components/shared/TransactionActionMenu/TransactionActionMenu.tsx
index 048ed662ec502d..e3fbcf8485d541 100644
--- a/x-pack/legacy/plugins/apm/public/components/shared/TransactionActionMenu/TransactionActionMenu.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/shared/TransactionActionMenu/TransactionActionMenu.tsx
@@ -85,7 +85,13 @@ export const TransactionActionMenu: FunctionComponent = ({
urlParams
});
+ const closePopover = () => {
+ setIsActionPopoverOpen(false);
+ setIsCustomLinksPopoverOpen(false);
+ };
+
const toggleCustomLinkFlyout = () => {
+ closePopover();
setIsCustomLinkFlyoutOpen(isOpen => !isOpen);
};
@@ -111,10 +117,7 @@ export const TransactionActionMenu: FunctionComponent = ({
)}