From c97580d6988ad9150385e4aecc1021a3683d462c Mon Sep 17 00:00:00 2001 From: Vadim73i <55870906+Vadim73i@users.noreply.github.com> Date: Thu, 29 Aug 2024 12:41:49 +0300 Subject: [PATCH] =?UTF-8?q?EPMRPP-93626=20||=20Notifications.=20"Configure?= =?UTF-8?q?=20Integration"=20link=20doesn't=20l=E2=80=A6=20(#3988)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/package-lock.json | 8 ++++---- app/package.json | 2 +- .../content/notifications/LinkComponent/LinkComponent.jsx | 8 +++++--- .../content/notifications/ruleGroup/ruleGroup.jsx | 7 ++++++- 4 files changed, 16 insertions(+), 9 deletions(-) diff --git a/app/package-lock.json b/app/package-lock.json index 7128da758a..b6106d9913 100644 --- a/app/package-lock.json +++ b/app/package-lock.json @@ -12,7 +12,7 @@ "@formatjs/intl-pluralrules": "1.3.9", "@formatjs/intl-relativetimeformat": "4.5.1", "@formatjs/intl-utils": "1.6.0", - "@reportportal/ui-kit": "^0.0.1-alpha.20", + "@reportportal/ui-kit": "^0.0.1-alpha.24", "axios": "1.6.4", "c3": "0.7.20", "chart.js": "2.9.4", @@ -3464,9 +3464,9 @@ "integrity": "sha512-/RVXdLvJxLg4QKvMoM5WlwNR9ViO9z8B/qPcc+C0Sa/teJY7QG7kJ441DwzOjMYEY7GmU4dj5EcGHIkKZiQZCA==" }, "node_modules/@reportportal/ui-kit": { - "version": "0.0.1-alpha.20", - "resolved": "https://registry.npmjs.org/@reportportal/ui-kit/-/ui-kit-0.0.1-alpha.20.tgz", - "integrity": "sha512-OdEpTT8vYWqsvoEWNY5pAQXgtRlDzHdb0qsP85l3bKFMM2ThSi2oJ088i8JXF72MJbONhoxQFrRukYho2sIR8A==", + "version": "0.0.1-alpha.24", + "resolved": "https://registry.npmjs.org/@reportportal/ui-kit/-/ui-kit-0.0.1-alpha.24.tgz", + "integrity": "sha512-VlpW6TeoFesnRABlKxnGQ5q9VFXxKgmnTS4MKSCVfZZFGIzeMJF75uvcwY5Nx3MOKkApoX3SS9+LrL0NtmWUVQ==", "dependencies": { "@floating-ui/react": "^0.26.16", "@floating-ui/react-dom": "^2.0.1", diff --git a/app/package.json b/app/package.json index 921942a15a..d2ed7c502f 100644 --- a/app/package.json +++ b/app/package.json @@ -25,7 +25,7 @@ "@formatjs/intl-pluralrules": "1.3.9", "@formatjs/intl-relativetimeformat": "4.5.1", "@formatjs/intl-utils": "1.6.0", - "@reportportal/ui-kit": "^0.0.1-alpha.20", + "@reportportal/ui-kit": "^0.0.1-alpha.24", "axios": "1.6.4", "c3": "0.7.20", "chart.js": "2.9.4", diff --git a/app/src/pages/inside/projectSettingsPageContainer/content/notifications/LinkComponent/LinkComponent.jsx b/app/src/pages/inside/projectSettingsPageContainer/content/notifications/LinkComponent/LinkComponent.jsx index d09e1b68f1..e080f778e0 100644 --- a/app/src/pages/inside/projectSettingsPageContainer/content/notifications/LinkComponent/LinkComponent.jsx +++ b/app/src/pages/inside/projectSettingsPageContainer/content/notifications/LinkComponent/LinkComponent.jsx @@ -25,7 +25,7 @@ import { isInternalLink } from '../utils'; const cx = classNames.bind(styles); -export const LinkComponent = ({ to, children, icon, className, event, automationId }) => { +export const LinkComponent = ({ to, children, icon, className, event, automationId, target }) => { const { trackEvent } = useTracking(); const handleLinkTracking = () => { trackEvent(event); @@ -35,7 +35,7 @@ export const LinkComponent = ({ to, children, icon, className, event, automation to={to} onClick={handleLinkTracking} className={cx(className)} - target={'_blank'} + target={target} data-automation-id={automationId} > {children} @@ -46,7 +46,7 @@ export const LinkComponent = ({ to, children, icon, className, event, automation onClick={handleLinkTracking} href={to} className={cx(className)} - target={'_blank'} + target={target} rel="noopener noreferrer" data-automation-id={automationId} > @@ -69,9 +69,11 @@ LinkComponent.propTypes = { event: PropTypes.object, className: PropTypes.string, automationId: PropTypes.string, + target: PropTypes.oneOf(['_blank', '_self', '_parent', '_top']), }; LinkComponent.defaultProps = { className: 'link-item-wrapper', icon: null, automationId: null, + target: '_blank', }; diff --git a/app/src/pages/inside/projectSettingsPageContainer/content/notifications/ruleGroup/ruleGroup.jsx b/app/src/pages/inside/projectSettingsPageContainer/content/notifications/ruleGroup/ruleGroup.jsx index 6f187a9f3b..7dc42dc8ec 100644 --- a/app/src/pages/inside/projectSettingsPageContainer/content/notifications/ruleGroup/ruleGroup.jsx +++ b/app/src/pages/inside/projectSettingsPageContainer/content/notifications/ruleGroup/ruleGroup.jsx @@ -324,11 +324,16 @@ export const RuleGroup = ({ pluginName, ruleDescription, rules, isPluginEnabled, payload: { projectId: activeProject, settingsTab: INTEGRATIONS, - subTab: 'email', + }, + meta: { + query: { + subPage: 'email', + }, }, }} icon={arrowRightIcon} event={PROJECT_SETTINGS_NOTIFICATIONS_EVENTS.CLICK_CONFIGURE_INTEGRATION_LINK} + target="_self" > {formatMessage(messages.configureIntegration)}