@boomerang-io/carbon-addons-boomerang-react 4.6.21-beta.37 → 4.6.21-beta.39

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 +25 -6
  2. package/dist/esm/components/AdvantageSideNav/AdvantageSideNav.js +25 -6
  3. package/package.json +1 -1
package/dist/cjs/components/AdvantageSideNav/AdvantageSideNav.js CHANGED
@@ -145,8 +145,17 @@ function AdvantageSideNav(props) {
145
145
  }
146
146
  setActiveMenu(false);
147
147
  };
148
- 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"));
148
+ 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"));
149
149
  const showSecondDivider = showChatButton || toolsLink || agentAssistantStudioLink || agentAssistantLibraryLink || documentCollectionsLink;
150
+ const navigateInternal = (url) => {
151
+ const target = new URL(url, window.location.origin);
152
+ if (target.origin === window.location.origin) {
153
+ history.push(target.pathname + target.search + target.hash);
154
+ }
155
+ else {
156
+ window.location.href = url;
157
+ }
158
+ };
150
159
  return (React__default.default.createElement(react.SideNav, { "aria-label": "sidenav-container", className: cx__default.default(`${settings.prefix}--bmrg-advantage-sidenav-container`, className, {
151
160
  "--closed": !isMenuOpen,
152
161
  }), "data-testid": "sidenav-container", isRail: true, expanded: isMenuOpen, onMouseEnter: () => setActiveMenu(true), onMouseLeave: () => {
@@ -187,7 +196,7 @@ function AdvantageSideNav(props) {
187
196
  } }, joinButtontitle)) : null,
188
197
  React__default.default.createElement(react.SideNavDivider, null),
189
198
  showChatButton &&
190
- (showChatTooltip ? (React__default.default.createElement(TooltipHover.default, { className: `${settings.prefix}--bmrg-side-nav__tooltip`, content: tooltipMessage, direction: "right" },
199
+ (showChatTooltip ? (React__default.default.createElement(TooltipHover.default, { className: `${settings.prefix}--bmrg-side-nav__tooltip`, content: tooltipMessage, isActive: windowLocation.href.includes(`${baseEnvUrl}/chat`), direction: "right" },
191
200
  React__default.default.createElement("span", null, chatSideNavLink))) : (chatSideNavLink)),
192
201
  toolsLink ? (React__default.default.createElement(react.SideNavLink, { "data-testid": "sidenav-tools-link", renderIcon: icons.Api, href: toolsLink, onClick: (e) => {
193
202
  handleToolsClick();
@@ -195,8 +204,12 @@ function AdvantageSideNav(props) {
195
204
  React__default.default.createElement("div", { className: `${settings.prefix}--bmrg-advantage-sidenav-item-tag` },
196
205
  "Tools",
197
206
  React__default.default.createElement(react.Tag, { size: "sm", title: "BETA", type: "high-contrast" }, "BETA")))) : null,
198
- agentAssistantStudioLink ? (React__default.default.createElement(react.SideNavLink, { "data-testid": "sidenav-agent-assistant-studio-link", isActive: (agentStudioPath && windowLocation.href.includes(`/launchpad${agentStudioPath}`)) ||
199
- (agenticAppsPath && windowLocation.href.includes(`/launchpad${agenticAppsPath}`)), className: `${settings.prefix}--bmrg-advantage-sidenav__inactive-link` , disabled: Boolean(!AssistantStudioLink), renderIcon: icons.IntentRequestCreate }, "Agent & Assistant Studio")) : null,
207
+ agentAssistantStudioLink ? (React__default.default.createElement(react.SideNavLink, { "data-testid": "sidenav-agent-assistant-studio-link",
208
+ // isActive={
209
+ // (agentStudioPath && windowLocation.href.includes(`/launchpad${agentStudioPath}`)) ||
210
+ // (agenticAppsPath && windowLocation.href.includes(`/launchpad${agenticAppsPath}`))
211
+ // }
212
+ className: `${settings.prefix}--bmrg-advantage-sidenav__inactive-link` , disabled: Boolean(!AssistantStudioLink), renderIcon: icons.IntentRequestCreate }, "Agent & Assistant Studio")) : null,
200
213
  agentAssistantLibraryLink ? (React__default.default.createElement(react.SideNavLink, { "data-testid": "sidenav-agent-assistant-library-link", renderIcon: icons.Folders,
201
214
  //href={agentAssistantLibraryLink}
202
215
  className: `${settings.prefix}--bmrg-advantage-sidenav__inactive-link` , disabled: Boolean(!AssistantStudioLink) }, "Agent & Assistant Library")) : null,
@@ -204,13 +217,19 @@ function AdvantageSideNav(props) {
204
217
  //href={documentCollectionsLink}
205
218
  className: `${settings.prefix}--bmrg-advantage-sidenav__inactive-link` , disabled: Boolean(!AssistantStudioLink) }, "Document Collections")) : null,
206
219
  showSecondDivider ? React__default.default.createElement(react.SideNavDivider, null) : null,
207
- 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,
220
+ catalogNavlink ? (React__default.default.createElement(react.SideNavLink, { "data-testid": "sidenav-catalog-link", isActive: windowLocation.href.includes(`${baseEnvUrl}/catalog`), renderIcon: icons.Catalog, onClick: (e) => {
221
+ e.preventDefault();
222
+ navigateInternal(catalogNavlink);
223
+ } }, "Catalog")) : null,
208
224
  settingsLink ? (React__default.default.createElement(react.SideNavLink, { "data-testid": "sidenav-settings-link", renderIcon: icons.Settings,
209
225
  // href={settingsLink}
210
226
  className: `${settings.prefix}--bmrg-advantage-sidenav__inactive-link` , disabled: Boolean(!AssistantStudioLink), onClick: (e) => {
211
227
  handleSettingsClick();
212
228
  } }, "Settings")) : null,
213
- adminNavlink ? (React__default.default.createElement(react.SideNavLink, { "data-testid": "sidenav-admin-link", href: adminNavlink, renderIcon: icons.LicenseThirdParty }, "Admin")) : null),
229
+ adminNavlink ? (React__default.default.createElement(react.SideNavLink, { "data-testid": "sidenav-admin-link", renderIcon: icons.LicenseThirdParty, onClick: (e) => {
230
+ e.preventDefault();
231
+ navigateInternal(adminNavlink);
232
+ } }, "Admin")) : null),
214
233
  children ? (React__default.default.createElement(React__default.default.Fragment, null,
215
234
  React__default.default.createElement(react.SideNavDivider, null),
216
235
  children)) : null)));
package/dist/esm/components/AdvantageSideNav/AdvantageSideNav.js CHANGED
@@ -136,8 +136,17 @@ function AdvantageSideNav(props) {
136
136
  }
137
137
  setActiveMenu(false);
138
138
  };
139
- 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"));
139
+ 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"));
140
140
  const showSecondDivider = showChatButton || toolsLink || agentAssistantStudioLink || agentAssistantLibraryLink || documentCollectionsLink;
141
+ const navigateInternal = (url) => {
142
+ const target = new URL(url, window.location.origin);
143
+ if (target.origin === window.location.origin) {
144
+ history.push(target.pathname + target.search + target.hash);
145
+ }
146
+ else {
147
+ window.location.href = url;
148
+ }
149
+ };
141
150
  return (React.createElement(SideNav, { "aria-label": "sidenav-container", className: cx(`${prefix}--bmrg-advantage-sidenav-container`, className, {
142
151
  "--closed": !isMenuOpen,
143
152
  }), "data-testid": "sidenav-container", isRail: true, expanded: isMenuOpen, onMouseEnter: () => setActiveMenu(true), onMouseLeave: () => {
@@ -178,7 +187,7 @@ function AdvantageSideNav(props) {
178
187
  } }, joinButtontitle)) : null,
179
188
  React.createElement(SideNavDivider, null),
180
189
  showChatButton &&
181
- (showChatTooltip ? (React.createElement(TooltipHover, { className: `${prefix}--bmrg-side-nav__tooltip`, content: tooltipMessage, direction: "right" },
190
+ (showChatTooltip ? (React.createElement(TooltipHover, { className: `${prefix}--bmrg-side-nav__tooltip`, content: tooltipMessage, isActive: windowLocation.href.includes(`${baseEnvUrl}/chat`), direction: "right" },
182
191
  React.createElement("span", null, chatSideNavLink))) : (chatSideNavLink)),
183
192
  toolsLink ? (React.createElement(SideNavLink, { "data-testid": "sidenav-tools-link", renderIcon: Api, href: toolsLink, onClick: (e) => {
184
193
  handleToolsClick();
@@ -186,8 +195,12 @@ function AdvantageSideNav(props) {
186
195
  React.createElement("div", { className: `${prefix}--bmrg-advantage-sidenav-item-tag` },
187
196
  "Tools",
188
197
  React.createElement(Tag, { size: "sm", title: "BETA", type: "high-contrast" }, "BETA")))) : null,
189
- agentAssistantStudioLink ? (React.createElement(SideNavLink, { "data-testid": "sidenav-agent-assistant-studio-link", isActive: (agentStudioPath && windowLocation.href.includes(`/launchpad${agentStudioPath}`)) ||
190
- (agenticAppsPath && windowLocation.href.includes(`/launchpad${agenticAppsPath}`)), className: `${prefix}--bmrg-advantage-sidenav__inactive-link` , disabled: Boolean(!AssistantStudioLink), renderIcon: IntentRequestCreate }, "Agent & Assistant Studio")) : null,
198
+ agentAssistantStudioLink ? (React.createElement(SideNavLink, { "data-testid": "sidenav-agent-assistant-studio-link",
199
+ // isActive={
200
+ // (agentStudioPath && windowLocation.href.includes(`/launchpad${agentStudioPath}`)) ||
201
+ // (agenticAppsPath && windowLocation.href.includes(`/launchpad${agenticAppsPath}`))
202
+ // }
203
+ className: `${prefix}--bmrg-advantage-sidenav__inactive-link` , disabled: Boolean(!AssistantStudioLink), renderIcon: IntentRequestCreate }, "Agent & Assistant Studio")) : null,
191
204
  agentAssistantLibraryLink ? (React.createElement(SideNavLink, { "data-testid": "sidenav-agent-assistant-library-link", renderIcon: Folders,
192
205
  //href={agentAssistantLibraryLink}
193
206
  className: `${prefix}--bmrg-advantage-sidenav__inactive-link` , disabled: Boolean(!AssistantStudioLink) }, "Agent & Assistant Library")) : null,
@@ -195,13 +208,19 @@ function AdvantageSideNav(props) {
195
208
  //href={documentCollectionsLink}
196
209
  className: `${prefix}--bmrg-advantage-sidenav__inactive-link` , disabled: Boolean(!AssistantStudioLink) }, "Document Collections")) : null,
197
210
  showSecondDivider ? React.createElement(SideNavDivider, null) : null,
198
- catalogNavlink ? (React.createElement(SideNavLink, { "data-testid": "sidenav-catalog-link", isActive: windowLocation.href.includes(`${baseEnvUrl}/catalog`), href: catalogNavlink, renderIcon: Catalog }, "Catalog")) : null,
211
+ catalogNavlink ? (React.createElement(SideNavLink, { "data-testid": "sidenav-catalog-link", isActive: windowLocation.href.includes(`${baseEnvUrl}/catalog`), renderIcon: Catalog, onClick: (e) => {
212
+ e.preventDefault();
213
+ navigateInternal(catalogNavlink);
214
+ } }, "Catalog")) : null,
199
215
  settingsLink ? (React.createElement(SideNavLink, { "data-testid": "sidenav-settings-link", renderIcon: Settings,
200
216
  // href={settingsLink}
201
217
  className: `${prefix}--bmrg-advantage-sidenav__inactive-link` , disabled: Boolean(!AssistantStudioLink), onClick: (e) => {
202
218
  handleSettingsClick();
203
219
  } }, "Settings")) : null,
204
- adminNavlink ? (React.createElement(SideNavLink, { "data-testid": "sidenav-admin-link", href: adminNavlink, renderIcon: LicenseThirdParty }, "Admin")) : null),
220
+ adminNavlink ? (React.createElement(SideNavLink, { "data-testid": "sidenav-admin-link", renderIcon: LicenseThirdParty, onClick: (e) => {
221
+ e.preventDefault();
222
+ navigateInternal(adminNavlink);
223
+ } }, "Admin")) : null),
205
224
  children ? (React.createElement(React.Fragment, null,
206
225
  React.createElement(SideNavDivider, null),
207
226
  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.37",
4
+ "version": "4.6.21-beta.39",
5
5
  "author": {
6
6
  "name": "Tim Bula",
7
7
  "email": "timrbula@gmail.com"