@boomerang-io/carbon-addons-boomerang-react 4.6.21-beta.41 → 4.6.21-beta.43

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 +30 -4
  2. package/dist/esm/components/AdvantageSideNav/AdvantageSideNav.js +30 -4
  3. package/package.json +1 -1
package/dist/cjs/components/AdvantageSideNav/AdvantageSideNav.js CHANGED
@@ -107,7 +107,8 @@ function AdvantageSideNav(props) {
107
107
  category: "Sidenav",
108
108
  destinationPath: redirectLink,
109
109
  });
110
- window.open(redirectLink, "_self", "noopener,noreferrer");
110
+ // window.open(redirectLink, "_self", "noopener,noreferrer");
111
+ navigateInternal(redirectLink);
111
112
  };
112
113
  const handleCreateJoinClick = () => {
113
114
  triggerEvent &&
@@ -139,6 +140,18 @@ function AdvantageSideNav(props) {
139
140
  };
140
141
  const chatSideNavLink = (React__default.default.createElement(react.SideNavLink, { "data-testid": "sidenav-chat-link", className: !enableChatButton ? `${settings.prefix}--bmrg-advantage-sidenav__inactive-link` : "", isActive: windowLocation.href.includes(`${baseEnvUrl}/chat`), disabled: Boolean(!enableChatButton), renderIcon: icons.ChatBot, href: enableChatButton && chatLink, onClick: enableChatButton ? handleChatClick : (e) => e.preventDefault() }, "Chat"));
141
142
  const showSecondDivider = showChatButton || toolsLink || agentAssistantStudioLink || agentAssistantLibraryLink || documentCollectionsLink;
143
+ const navigateInternal = (url) => {
144
+ const target = new URL(url, window.location.origin);
145
+ if (target.origin === window.location.origin) {
146
+ const pathname = target.pathname.startsWith("/ica")
147
+ ? target.pathname.slice(4) // removes "/ica"
148
+ : target.pathname;
149
+ history.push(pathname + target.search + target.hash);
150
+ }
151
+ else {
152
+ window.location.href = url;
153
+ }
154
+ };
142
155
  return (React__default.default.createElement(react.SideNav, { "aria-label": "sidenav-container", className: cx__default.default(`${settings.prefix}--bmrg-advantage-sidenav-container`, className, {
143
156
  "--closed": !isMenuOpen,
144
157
  }), "data-testid": "sidenav-container", isRail: true, expanded: isMenuOpen, onMouseEnter: () => setActiveMenu(true), onMouseLeave: () => {
@@ -200,11 +213,24 @@ function AdvantageSideNav(props) {
200
213
  //href={documentCollectionsLink}
201
214
  className: `${settings.prefix}--bmrg-advantage-sidenav__inactive-link` , disabled: Boolean(!AssistantStudioLink) }, "Document Collections")) : null,
202
215
  showSecondDivider ? React__default.default.createElement(react.SideNavDivider, null) : null,
203
- 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,
216
+ catalogNavlink ? (React__default.default.createElement(react.SideNavLink, { "data-testid": "sidenav-catalog-link", isActive: windowLocation.href.includes(`${baseEnvUrl}/catalog`), renderIcon: icons.Catalog, onClick: (e) => {
217
+ e.preventDefault();
218
+ navigateInternal(catalogNavlink);
219
+ } }, "Catalog")) : null,
204
220
  settingsLink ? (React__default.default.createElement(react.SideNavLink, { "data-testid": "sidenav-settings-link", renderIcon: icons.Settings,
205
221
  // href={settingsLink}
206
- className: `${settings.prefix}--bmrg-advantage-sidenav__inactive-link` , disabled: Boolean(!AssistantStudioLink) }, "Settings")) : null,
207
- adminNavlink ? (React__default.default.createElement(react.SideNavLink, { "data-testid": "sidenav-admin-link", href: adminNavlink, renderIcon: icons.LicenseThirdParty }, "Admin")) : null),
222
+ className: `${settings.prefix}--bmrg-advantage-sidenav__inactive-link` , disabled: Boolean(!AssistantStudioLink),
223
+ // onClick={(e: any) => {
224
+ // handleSettingsClick();
225
+ // }}
226
+ onClick: (e) => {
227
+ e.preventDefault();
228
+ navigateInternal(settingsLink);
229
+ } }, "Settings")) : null,
230
+ adminNavlink ? (React__default.default.createElement(react.SideNavLink, { "data-testid": "sidenav-admin-link", renderIcon: icons.LicenseThirdParty, onClick: (e) => {
231
+ e.preventDefault();
232
+ navigateInternal(adminNavlink);
233
+ } }, "Admin")) : null),
208
234
  children ? (React__default.default.createElement(React__default.default.Fragment, null,
209
235
  React__default.default.createElement(react.SideNavDivider, null),
210
236
  children)) : null)));
package/dist/esm/components/AdvantageSideNav/AdvantageSideNav.js CHANGED
@@ -98,7 +98,8 @@ function AdvantageSideNav(props) {
98
98
  category: "Sidenav",
99
99
  destinationPath: redirectLink,
100
100
  });
101
- window.open(redirectLink, "_self", "noopener,noreferrer");
101
+ // window.open(redirectLink, "_self", "noopener,noreferrer");
102
+ navigateInternal(redirectLink);
102
103
  };
103
104
  const handleCreateJoinClick = () => {
104
105
  triggerEvent &&
@@ -130,6 +131,18 @@ function AdvantageSideNav(props) {
130
131
  };
131
132
  const chatSideNavLink = (React.createElement(SideNavLink, { "data-testid": "sidenav-chat-link", className: !enableChatButton ? `${prefix}--bmrg-advantage-sidenav__inactive-link` : "", isActive: windowLocation.href.includes(`${baseEnvUrl}/chat`), disabled: Boolean(!enableChatButton), renderIcon: ChatBot, href: enableChatButton && chatLink, onClick: enableChatButton ? handleChatClick : (e) => e.preventDefault() }, "Chat"));
132
133
  const showSecondDivider = showChatButton || toolsLink || agentAssistantStudioLink || agentAssistantLibraryLink || documentCollectionsLink;
134
+ const navigateInternal = (url) => {
135
+ const target = new URL(url, window.location.origin);
136
+ if (target.origin === window.location.origin) {
137
+ const pathname = target.pathname.startsWith("/ica")
138
+ ? target.pathname.slice(4) // removes "/ica"
139
+ : target.pathname;
140
+ history.push(pathname + target.search + target.hash);
141
+ }
142
+ else {
143
+ window.location.href = url;
144
+ }
145
+ };
133
146
  return (React.createElement(SideNav, { "aria-label": "sidenav-container", className: cx(`${prefix}--bmrg-advantage-sidenav-container`, className, {
134
147
  "--closed": !isMenuOpen,
135
148
  }), "data-testid": "sidenav-container", isRail: true, expanded: isMenuOpen, onMouseEnter: () => setActiveMenu(true), onMouseLeave: () => {
@@ -191,11 +204,24 @@ function AdvantageSideNav(props) {
191
204
  //href={documentCollectionsLink}
192
205
  className: `${prefix}--bmrg-advantage-sidenav__inactive-link` , disabled: Boolean(!AssistantStudioLink) }, "Document Collections")) : null,
193
206
  showSecondDivider ? React.createElement(SideNavDivider, null) : null,
194
- catalogNavlink ? (React.createElement(SideNavLink, { "data-testid": "sidenav-catalog-link", isActive: windowLocation.href.includes(`${baseEnvUrl}/catalog`), href: catalogNavlink, renderIcon: Catalog }, "Catalog")) : null,
207
+ catalogNavlink ? (React.createElement(SideNavLink, { "data-testid": "sidenav-catalog-link", isActive: windowLocation.href.includes(`${baseEnvUrl}/catalog`), renderIcon: Catalog, onClick: (e) => {
208
+ e.preventDefault();
209
+ navigateInternal(catalogNavlink);
210
+ } }, "Catalog")) : null,
195
211
  settingsLink ? (React.createElement(SideNavLink, { "data-testid": "sidenav-settings-link", renderIcon: Settings,
196
212
  // href={settingsLink}
197
- className: `${prefix}--bmrg-advantage-sidenav__inactive-link` , disabled: Boolean(!AssistantStudioLink) }, "Settings")) : null,
198
- adminNavlink ? (React.createElement(SideNavLink, { "data-testid": "sidenav-admin-link", href: adminNavlink, renderIcon: LicenseThirdParty }, "Admin")) : null),
213
+ className: `${prefix}--bmrg-advantage-sidenav__inactive-link` , disabled: Boolean(!AssistantStudioLink),
214
+ // onClick={(e: any) => {
215
+ // handleSettingsClick();
216
+ // }}
217
+ onClick: (e) => {
218
+ e.preventDefault();
219
+ navigateInternal(settingsLink);
220
+ } }, "Settings")) : null,
221
+ adminNavlink ? (React.createElement(SideNavLink, { "data-testid": "sidenav-admin-link", renderIcon: LicenseThirdParty, onClick: (e) => {
222
+ e.preventDefault();
223
+ navigateInternal(adminNavlink);
224
+ } }, "Admin")) : null),
199
225
  children ? (React.createElement(React.Fragment, null,
200
226
  React.createElement(SideNavDivider, null),
201
227
  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.41",
4
+ "version": "4.6.21-beta.43",
5
5
  "author": {
6
6
  "name": "Tim Bula",
7
7
  "email": "timrbula@gmail.com"