Skip to content
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.

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

[7.7] Actions menu doesn't close when opening Custom Links flyout (#62577) | fixing APM internationalization (#62757) #62768

Merged
Merged
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -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.'
}
)}
/>
Original file line number Diff line number Diff line change
@@ -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>
Original file line number Diff line number Diff line change
@@ -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),
Original file line number Diff line number Diff line change
@@ -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']);
});
Original file line number Diff line number Diff line change
@@ -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" />
Original file line number Diff line number Diff line change
@@ -85,7 +85,13 @@ export const TransactionActionMenu: FunctionComponent<Props> = ({
urlParams
});

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

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

@@ -111,10 +117,7 @@ export const TransactionActionMenu: FunctionComponent<Props> = ({
)}
<ActionMenu
id="transactionActionMenu"
closePopover={() => {
setIsActionPopoverOpen(false);
setIsCustomLinksPopoverOpen(false);
}}
closePopover={closePopover}
isOpen={isActionPopoverOpen}
anchorPosition="downRight"
button={
1 change: 0 additions & 1 deletion x-pack/plugins/translations/translations/ja-JP.json
Original file line number Diff line number Diff line change
@@ -4620,7 +4620,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}」",
1 change: 0 additions & 1 deletion x-pack/plugins/translations/translations/zh-CN.json
Original file line number Diff line number Diff line change
@@ -4621,7 +4621,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}”",