Skip to content

[7.x] Actions menu doesn't close when opening Custom Links flyout (#62577) | fixing APM internationalization (#62757) #62767

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 7, 2020
Merged

[7.x] Actions menu doesn't close when opening Custom Links flyout (#62577) | fixing APM internationalization (#62757) #62767

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c7df85f
fixing bug (#62577)
cauemarcondes Apr 7, 2020
c468e0e
fixing APM internationalization (#62757)
cauemarcondes Apr 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion x-pack/legacy/plugins/apm/public/components/app/Settings/CustomizeUI/CustomLink/Title.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.'
}
)}
/>
Expand Down
4 changes: 2 additions & 2 deletions x-pack/legacy/plugins/apm/public/components/app/Settings/CustomizeUI/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ export const CustomizeUI = () => {
<>
<EuiTitle size="l">
<h1>
{i18n.translate('xpack.apm.settings.customizeUI', {
defaultMessage: 'Customize UI'
{i18n.translate('xpack.apm.settings.customizeApp', {
defaultMessage: 'Customize app'
})}
</h1>
</EuiTitle>
Expand Down
4 changes: 2 additions & 2 deletions x-pack/legacy/plugins/apm/public/components/app/Settings/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
2 changes: 1 addition & 1 deletion ...gacy/plugins/apm/public/components/shared/TransactionActionMenu/CustomLink/index.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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']);
});
Expand Down
2 changes: 1 addition & 1 deletion ...ck/legacy/plugins/apm/public/components/shared/TransactionActionMenu/CustomLink/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ export const CustomLink = ({
<EuiText size="xs" grow={false} style={{ width: px(300) }}>
{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.'
})}
</EuiText>
<EuiSpacer size="s" />
Expand Down
11 changes: 7 additions & 4 deletions ...gacy/plugins/apm/public/components/shared/TransactionActionMenu/TransactionActionMenu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,13 @@ export const TransactionActionMenu: FunctionComponent<Props> = ({
urlParams
});

const closePopover = () => {
setIsActionPopoverOpen(false);
setIsCustomLinksPopoverOpen(false);
};

const toggleCustomLinkFlyout = () => {
closePopover();
setIsCustomLinkFlyoutOpen(isOpen => !isOpen);
};

Expand All @@ -111,10 +117,7 @@ export const TransactionActionMenu: FunctionComponent<Props> = ({
)}
<ActionMenu
id="transactionActionMenu"
closePopover={() => {
setIsActionPopoverOpen(false);
setIsCustomLinksPopoverOpen(false);
}}
closePopover={closePopover}
isOpen={isActionPopoverOpen}
anchorPosition="downRight"
button={
Expand Down
1 change: 0 additions & 1 deletion x-pack/plugins/translations/translations/ja-JP.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4539,7 +4539,6 @@
"xpack.apm.settings.apmIndices.spanIndicesLabel": "スパンインデックス",
"xpack.apm.settings.apmIndices.title": "インデックス",
"xpack.apm.settings.apmIndices.transactionIndicesLabel": "トランザクションインデックス",
"xpack.apm.settings.customizeUI": "UI をカスタマイズ",
"xpack.apm.settings.customizeUI.customLink": "カスタムリンク",
"xpack.apm.settings.customizeUI.customLink.create.failed": "リンクを保存できませんでした！",
"xpack.apm.settings.customizeUI.customLink.create.failed.message": "リンクを保存するときに問題が発生しました。エラー: 「{errorMessage}」",
Expand Down
1 change: 0 additions & 1 deletion x-pack/plugins/translations/translations/zh-CN.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4540,7 +4540,6 @@
"xpack.apm.settings.apmIndices.spanIndicesLabel": "跨度索引",
"xpack.apm.settings.apmIndices.title": "索引",
"xpack.apm.settings.apmIndices.transactionIndicesLabel": "事务索引",
"xpack.apm.settings.customizeUI": "定制 UI",
"xpack.apm.settings.customizeUI.customLink": "定制链接",
"xpack.apm.settings.customizeUI.customLink.create.failed": "链接无法保存！",
"xpack.apm.settings.customizeUI.customLink.create.failed.message": "保存链接时出现了问题。错误：“{errorMessage}”",
Expand Down