@boomerang-io/carbon-addons-boomerang-react 4.6.21-beta.12 → 4.6.21-beta.13

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 +13 -4
  2. package/dist/esm/components/AdvantageSideNav/AdvantageSideNav.js +13 -4
  3. package/package.json +1 -1
package/dist/cjs/components/AdvantageSideNav/AdvantageSideNav.js CHANGED
@@ -46,8 +46,8 @@ function AdvantageSideNav(props) {
46
46
  const agentAssistantStudioLink = sideNavUrls?.find((sideNavUrl) => sideNavUrl.key === SideNavUrlKeys.AgentStudio)?.url;
47
47
  const agentAssistantLibraryLink = sideNavUrls?.find((sideNavUrl) => sideNavUrl.key === SideNavUrlKeys.AgentLibrary)?.url;
48
48
  const documentCollectionsLink = sideNavUrls?.find((sideNavUrl) => sideNavUrl.key === SideNavUrlKeys.DocumentCollections)?.url;
49
+ const catalogNavlink = "http://localhost:3000/BMRG_APP_ROOT_CONTEXT/catalg";
49
50
  // const catalogNavlink = sideNavUrls?.find((sideNavUrl) => sideNavUrl.key === SideNavUrlKeys.Catalog)?.url;
50
- const catalogNavlink = "/catalog/";
51
51
  const settingsLink = sideNavUrls?.find((sideNavUrl) => sideNavUrl.key === SideNavUrlKeys.Settings)?.url;
52
52
  const adminNavlink = sideNavUrls?.find((sideNavUrl) => sideNavUrl.key === SideNavUrlKeys.Admin)?.url;
53
53
  // get current selected team
@@ -171,6 +171,16 @@ function AdvantageSideNav(props) {
171
171
  };
172
172
  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"));
173
173
  const showSecondDivider = showChatButton || toolsLink || agentAssistantStudioLink || agentAssistantLibraryLink || documentCollectionsLink;
174
+ const navigateInternal = (url) => {
175
+ console.log("url", url);
176
+ const target = new URL(url, window.location.origin);
177
+ if (target.origin === window.location.origin) {
178
+ history.push(target.pathname + target.search + target.hash);
179
+ }
180
+ else {
181
+ window.location.href = url;
182
+ }
183
+ };
174
184
  return (React__default.default.createElement(react.SideNav, { "aria-label": "sidenav-container", className: cx__default.default(`${settings.prefix}--bmrg-advantage-sidenav-container`, className, {
175
185
  "--closed": !isMenuOpen,
176
186
  }), "data-testid": "sidenav-container", isRail: true, expanded: isMenuOpen, onMouseEnter: () => setActiveMenu(true), onMouseLeave: () => {
@@ -229,10 +239,9 @@ function AdvantageSideNav(props) {
229
239
  handleDocumentCollectionsClick();
230
240
  } }, "Document Collections")) : null,
231
241
  showSecondDivider ? React__default.default.createElement(react.SideNavDivider, null) : null,
232
- (React__default.default.createElement(react.SideNavLink, { "data-testid": "sidenav-catalog-link", isActive: location.pathname.includes("/catalog"), renderIcon: icons.Catalog, href: catalogNavlink, onClick: (e) => {
233
- console.log("ss", catalogNavlink);
242
+ (React__default.default.createElement(react.SideNavLink, { "data-testid": "sidenav-catalog-link", isActive: windowLocation.href.includes(`${baseEnvUrl}/catalog`), renderIcon: icons.Catalog, onClick: (e) => {
234
243
  e.preventDefault();
235
- window.location.href = catalogNavlink;
244
+ navigateInternal(catalogNavlink);
236
245
  } }, "Catalog")) ,
237
246
  settingsLink ? (React__default.default.createElement(react.SideNavLink, { "data-testid": "sidenav-settings-link", renderIcon: icons.Settings, href: settingsLink, onClick: (e) => {
238
247
  handleSettingsClick();
package/dist/esm/components/AdvantageSideNav/AdvantageSideNav.js CHANGED
@@ -37,8 +37,8 @@ function AdvantageSideNav(props) {
37
37
  const agentAssistantStudioLink = sideNavUrls?.find((sideNavUrl) => sideNavUrl.key === SideNavUrlKeys.AgentStudio)?.url;
38
38
  const agentAssistantLibraryLink = sideNavUrls?.find((sideNavUrl) => sideNavUrl.key === SideNavUrlKeys.AgentLibrary)?.url;
39
39
  const documentCollectionsLink = sideNavUrls?.find((sideNavUrl) => sideNavUrl.key === SideNavUrlKeys.DocumentCollections)?.url;
40
+ const catalogNavlink = "http://localhost:3000/BMRG_APP_ROOT_CONTEXT/catalg";
40
41
  // const catalogNavlink = sideNavUrls?.find((sideNavUrl) => sideNavUrl.key === SideNavUrlKeys.Catalog)?.url;
41
- const catalogNavlink = "/catalog/";
42
42
  const settingsLink = sideNavUrls?.find((sideNavUrl) => sideNavUrl.key === SideNavUrlKeys.Settings)?.url;
43
43
  const adminNavlink = sideNavUrls?.find((sideNavUrl) => sideNavUrl.key === SideNavUrlKeys.Admin)?.url;
44
44
  // get current selected team
@@ -162,6 +162,16 @@ function AdvantageSideNav(props) {
162
162
  };
163
163
  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"));
164
164
  const showSecondDivider = showChatButton || toolsLink || agentAssistantStudioLink || agentAssistantLibraryLink || documentCollectionsLink;
165
+ const navigateInternal = (url) => {
166
+ console.log("url", url);
167
+ const target = new URL(url, window.location.origin);
168
+ if (target.origin === window.location.origin) {
169
+ history.push(target.pathname + target.search + target.hash);
170
+ }
171
+ else {
172
+ window.location.href = url;
173
+ }
174
+ };
165
175
  return (React.createElement(SideNav, { "aria-label": "sidenav-container", className: cx(`${prefix}--bmrg-advantage-sidenav-container`, className, {
166
176
  "--closed": !isMenuOpen,
167
177
  }), "data-testid": "sidenav-container", isRail: true, expanded: isMenuOpen, onMouseEnter: () => setActiveMenu(true), onMouseLeave: () => {
@@ -220,10 +230,9 @@ function AdvantageSideNav(props) {
220
230
  handleDocumentCollectionsClick();
221
231
  } }, "Document Collections")) : null,
222
232
  showSecondDivider ? React.createElement(SideNavDivider, null) : null,
223
- (React.createElement(SideNavLink, { "data-testid": "sidenav-catalog-link", isActive: location.pathname.includes("/catalog"), renderIcon: Catalog, href: catalogNavlink, onClick: (e) => {
224
- console.log("ss", catalogNavlink);
233
+ (React.createElement(SideNavLink, { "data-testid": "sidenav-catalog-link", isActive: windowLocation.href.includes(`${baseEnvUrl}/catalog`), renderIcon: Catalog, onClick: (e) => {
225
234
  e.preventDefault();
226
- window.location.href = catalogNavlink;
235
+ navigateInternal(catalogNavlink);
227
236
  } }, "Catalog")) ,
228
237
  settingsLink ? (React.createElement(SideNavLink, { "data-testid": "sidenav-settings-link", renderIcon: Settings, href: settingsLink, onClick: (e) => {
229
238
  handleSettingsClick();
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.12",
4
+ "version": "4.6.21-beta.13",
5
5
  "author": {
6
6
  "name": "Tim Bula",
7
7
  "email": "timrbula@gmail.com"