@boomerang-io/carbon-addons-boomerang-react 4.6.21-beta.3 → 4.6.21-beta.6

package/dist/cjs/components/AdvantageSideNav/AdvantageSideNav.js

@@ -3,6 +3,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var React = require('react');
+var reactRouterDom = require('react-router-dom');
 var cx = require('classnames');
 var react = require('@carbon/react');
 var TooltipHover = require('../TooltipHover/TooltipHover.js');
@@ -37,6 +38,7 @@ function AdvantageSideNav(props) {
     const [activeMenu, setActiveMenu] = React__default.default.useState(false);
     const isMenuOpen = isOpen || activeMenu;
     const windowLocation = window.location;
+    const historyy = reactRouterDom.useHistory();
     const isPartnerUser = user?.type === UserType.USER_PLATFORM_ROLE.Partner;
     const joinButtontitle = showSelectTeamPurpose ? "Create Team" : "Create or Join Team";
     const hamburguerMenu = document.getElementById("header-sidenav-menu-button");
@@ -228,9 +230,10 @@ function AdvantageSideNav(props) {
                     handleDocumentCollectionsClick();
                 } }, "Document Collections")) : null,
             showSecondDivider ? React__default.default.createElement(react.SideNavDivider, null) : null,
-            catalogNavlink ? (React__default.default.createElement(react.SideNavLink, { to: catalogNavlink, "data-testid": "sidenav-catalog-link", isActive: windowLocation.href.includes(`${baseEnvUrl}/catalog`), 
-                // href={catalogNavlink}
-                renderIcon: icons.Catalog }, "Catalog")) : null,
+            catalogNavlink ? (React__default.default.createElement(react.SideNavLink, { "data-testid": "sidenav-catalog-link", isActive: location.pathname.includes("/catalog"), renderIcon: icons.Catalog, href: catalogNavlink, onClick: (e) => {
+                    e.preventDefault();
+                    historyy.push(catalogNavlink);
+                } }, "Catalog")) : null,
             settingsLink ? (React__default.default.createElement(react.SideNavLink, { "data-testid": "sidenav-settings-link", renderIcon: icons.Settings, href: settingsLink, onClick: (e) => {
                     handleSettingsClick();
                 } }, "Settings")) : null,

package/dist/esm/components/AdvantageSideNav/AdvantageSideNav.js

@@ -1,4 +1,5 @@
 import React from 'react';
+import { useHistory } from 'react-router-dom';
 import cx from 'classnames';
 import { SideNavLink, SideNav, SideNavItems, SideNavDivider, Tag } from '@carbon/react';
 import TooltipHover from '../TooltipHover/TooltipHover.js';
@@ -28,6 +29,7 @@ function AdvantageSideNav(props) {
     const [activeMenu, setActiveMenu] = React.useState(false);
     const isMenuOpen = isOpen || activeMenu;
     const windowLocation = window.location;
+    const historyy = useHistory();
     const isPartnerUser = user?.type === USER_PLATFORM_ROLE.Partner;
     const joinButtontitle = showSelectTeamPurpose ? "Create Team" : "Create or Join Team";
     const hamburguerMenu = document.getElementById("header-sidenav-menu-button");
@@ -219,9 +221,10 @@ function AdvantageSideNav(props) {
                     handleDocumentCollectionsClick();
                 } }, "Document Collections")) : null,
             showSecondDivider ? React.createElement(SideNavDivider, null) : null,
-            catalogNavlink ? (React.createElement(SideNavLink, { to: catalogNavlink, "data-testid": "sidenav-catalog-link", isActive: windowLocation.href.includes(`${baseEnvUrl}/catalog`), 
-                // href={catalogNavlink}
-                renderIcon: Catalog }, "Catalog")) : null,
+            catalogNavlink ? (React.createElement(SideNavLink, { "data-testid": "sidenav-catalog-link", isActive: location.pathname.includes("/catalog"), renderIcon: Catalog, href: catalogNavlink, onClick: (e) => {
+                    e.preventDefault();
+                    historyy.push(catalogNavlink);
+                } }, "Catalog")) : null,
             settingsLink ? (React.createElement(SideNavLink, { "data-testid": "sidenav-settings-link", renderIcon: Settings, href: settingsLink, onClick: (e) => {
                     handleSettingsClick();
                 } }, "Settings")) : null,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@boomerang-io/carbon-addons-boomerang-react",
   "description": "Carbon Addons for Boomerang apps",
-  "version": "4.6.21-beta.3",
+  "version": "4.6.21-beta.6",
   "author": {
     "name": "Tim Bula",
     "email": "timrbula@gmail.com"
@@ -73,7 +73,7 @@
     "react": "^17.0.0 || ^16.14.0",
     "react-dom": "^17.0.0 || ^16.14.0",
     "react-query": "^3.34.12",
-    "react-router-dom": "^5.3.0",
+    "react-router-dom": "^6.0.0",
     "yup": ">=0.32.11"
   },
   "devDependencies": {