EPMRPP-93626 || Notifications. "Configure Integration" link doesn't l… (

#3988)
reportportal · Aug 29, 2024 · c97580d · c97580d
1 parent f522a1d
commit c97580d
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 9 deletions.
diff --git a/app/package-lock.json b/app/package-lock.json
diff --git 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/...inside/projectSettingsPageContainer/content/notifications/LinkComponent/LinkComponent.jsx b/...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/...c/pages/inside/projectSettingsPageContainer/content/notifications/ruleGroup/ruleGroup.jsx b/...c/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)}
                   </LinkComponent>