@boomerang-io/carbon-addons-boomerang-react 4.6.21-beta.25 → 4.6.21-beta.26

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/dist/cjs/components/AdvantageSideNav/AdvantageSideNav.js +17 -2
  2. package/dist/esm/components/AdvantageSideNav/AdvantageSideNav.js +17 -2
  3. package/package.json +1 -1
package/dist/cjs/components/AdvantageSideNav/AdvantageSideNav.js CHANGED
@@ -170,6 +170,15 @@ function AdvantageSideNav(props) {
170
170
  };
171
171
  const chatSideNavLink = (React__default.default.createElement(react.SideNavLink, { "data-testid": "sidenav-chat-link", className: !enableChatButton ? `${settings.prefix}--bmrg-advantage-sidenav__inactive-link` : "", disabled: Boolean(!enableChatButton), renderIcon: icons.ChatBot, href: enableChatButton && chatLink, onClick: enableChatButton ? handleChatClick : (e) => e.preventDefault() }, "Chat"));
172
172
  const showSecondDivider = showChatButton || toolsLink || agentAssistantStudioLink || agentAssistantLibraryLink || documentCollectionsLink;
173
+ const navigateInternal = (url) => {
174
+ const target = new URL(url, window.location.origin);
175
+ if (target.origin === window.location.origin) {
176
+ history.push(target.pathname + target.search + target.hash);
177
+ }
178
+ else {
179
+ window.location.href = url;
180
+ }
181
+ };
173
182
  return (React__default.default.createElement(react.SideNav, { "aria-label": "sidenav-container", className: cx__default.default(`${settings.prefix}--bmrg-advantage-sidenav-container`, className, {
174
183
  "--closed": !isMenuOpen,
175
184
  }), "data-testid": "sidenav-container", isRail: true, expanded: isMenuOpen, onMouseEnter: () => setActiveMenu(true), onMouseLeave: () => {
@@ -233,11 +242,17 @@ function AdvantageSideNav(props) {
233
242
  handleDocumentCollectionsClick();
234
243
  } }, "Document Collections")) : null,
235
244
  showSecondDivider ? React__default.default.createElement(react.SideNavDivider, null) : null,
236
- catalogNavlink ? (React__default.default.createElement(react.SideNavLink, { "data-testid": "sidenav-catalog-link", isActive: windowLocation.href.includes(`${baseEnvUrl}/catalog`), href: catalogNavlink, renderIcon: icons.Catalog }, "Catalog")) : null,
245
+ catalogNavlink ? (React__default.default.createElement(react.SideNavLink, { "data-testid": "sidenav-catalog-link", isActive: windowLocation.href.includes(`${baseEnvUrl}/catalog`), renderIcon: icons.Catalog, onClick: (e) => {
246
+ e.preventDefault();
247
+ navigateInternal(catalogNavlink);
248
+ } }, "Catalog")) : null,
237
249
  settingsLink ? (React__default.default.createElement(react.SideNavLink, { "data-testid": "sidenav-settings-link", renderIcon: icons.Settings, href: settingsLink, onClick: (e) => {
238
250
  handleSettingsClick();
239
251
  } }, "Settings")) : null,
240
- adminNavlink ? (React__default.default.createElement(react.SideNavLink, { "data-testid": "sidenav-admin-link", href: adminNavlink, renderIcon: icons.LicenseThirdParty }, "Admin")) : null),
252
+ adminNavlink ? (React__default.default.createElement(react.SideNavLink, { "data-testid": "sidenav-admin-link", renderIcon: icons.LicenseThirdParty, onClick: (e) => {
253
+ e.preventDefault();
254
+ navigateInternal(adminNavlink);
255
+ } }, "Admin")) : null),
241
256
  children ? (React__default.default.createElement(React__default.default.Fragment, null,
242
257
  React__default.default.createElement(react.SideNavDivider, null),
243
258
  children)) : null)));
package/dist/esm/components/AdvantageSideNav/AdvantageSideNav.js CHANGED
@@ -161,6 +161,15 @@ function AdvantageSideNav(props) {
161
161
  };
162
162
  const chatSideNavLink = (React.createElement(SideNavLink, { "data-testid": "sidenav-chat-link", className: !enableChatButton ? `${prefix}--bmrg-advantage-sidenav__inactive-link` : "", disabled: Boolean(!enableChatButton), renderIcon: ChatBot, href: enableChatButton && chatLink, onClick: enableChatButton ? handleChatClick : (e) => e.preventDefault() }, "Chat"));
163
163
  const showSecondDivider = showChatButton || toolsLink || agentAssistantStudioLink || agentAssistantLibraryLink || documentCollectionsLink;
164
+ const navigateInternal = (url) => {
165
+ const target = new URL(url, window.location.origin);
166
+ if (target.origin === window.location.origin) {
167
+ history.push(target.pathname + target.search + target.hash);
168
+ }
169
+ else {
170
+ window.location.href = url;
171
+ }
172
+ };
164
173
  return (React.createElement(SideNav, { "aria-label": "sidenav-container", className: cx(`${prefix}--bmrg-advantage-sidenav-container`, className, {
165
174
  "--closed": !isMenuOpen,
166
175
  }), "data-testid": "sidenav-container", isRail: true, expanded: isMenuOpen, onMouseEnter: () => setActiveMenu(true), onMouseLeave: () => {
@@ -224,11 +233,17 @@ function AdvantageSideNav(props) {
224
233
  handleDocumentCollectionsClick();
225
234
  } }, "Document Collections")) : null,
226
235
  showSecondDivider ? React.createElement(SideNavDivider, null) : null,
227
- catalogNavlink ? (React.createElement(SideNavLink, { "data-testid": "sidenav-catalog-link", isActive: windowLocation.href.includes(`${baseEnvUrl}/catalog`), href: catalogNavlink, renderIcon: Catalog }, "Catalog")) : null,
236
+ catalogNavlink ? (React.createElement(SideNavLink, { "data-testid": "sidenav-catalog-link", isActive: windowLocation.href.includes(`${baseEnvUrl}/catalog`), renderIcon: Catalog, onClick: (e) => {
237
+ e.preventDefault();
238
+ navigateInternal(catalogNavlink);
239
+ } }, "Catalog")) : null,
228
240
  settingsLink ? (React.createElement(SideNavLink, { "data-testid": "sidenav-settings-link", renderIcon: Settings, href: settingsLink, onClick: (e) => {
229
241
  handleSettingsClick();
230
242
  } }, "Settings")) : null,
231
- adminNavlink ? (React.createElement(SideNavLink, { "data-testid": "sidenav-admin-link", href: adminNavlink, renderIcon: LicenseThirdParty }, "Admin")) : null),
243
+ adminNavlink ? (React.createElement(SideNavLink, { "data-testid": "sidenav-admin-link", renderIcon: LicenseThirdParty, onClick: (e) => {
244
+ e.preventDefault();
245
+ navigateInternal(adminNavlink);
246
+ } }, "Admin")) : null),
232
247
  children ? (React.createElement(React.Fragment, null,
233
248
  React.createElement(SideNavDivider, null),
234
249
  children)) : null)));
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@boomerang-io/carbon-addons-boomerang-react",
3
3
  "description": "Carbon Addons for Boomerang apps",
4
- "version": "4.6.21-beta.25",
4
+ "version": "4.6.21-beta.26",
5
5
  "author": {
6
6
  "name": "Tim Bula",
7
7
  "email": "timrbula@gmail.com"