@boomerang-io/carbon-addons-boomerang-react 4.6.21-beta.46 → 4.6.21-beta.48

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 -31
  2. package/dist/esm/components/AdvantageSideNav/AdvantageSideNav.js +17 -31
  3. package/package.json +1 -1
package/dist/cjs/components/AdvantageSideNav/AdvantageSideNav.js CHANGED
@@ -109,6 +109,14 @@ function AdvantageSideNav(props) {
109
109
  destinationPath: documentCollectionsLink,
110
110
  });
111
111
  };
112
+ const handleSettingsClick = () => {
113
+ triggerEvent &&
114
+ triggerEvent({
115
+ action: "Clicked on SideNav Settings link",
116
+ category: "Sidenav",
117
+ destinationPath: settingsLink,
118
+ });
119
+ };
112
120
  const handleChatClick = () => {
113
121
  let redirectLink = chatLink
114
122
  ? chatLink
@@ -119,8 +127,7 @@ function AdvantageSideNav(props) {
119
127
  category: "Sidenav",
120
128
  destinationPath: redirectLink,
121
129
  });
122
- // window.open(redirectLink, "_self", "noopener,noreferrer");
123
- navigateInternal(redirectLink);
130
+ window.open(redirectLink, "_self", "noopener,noreferrer");
124
131
  };
125
132
  const handleCreateJoinClick = () => {
126
133
  triggerEvent &&
@@ -152,24 +159,6 @@ function AdvantageSideNav(props) {
152
159
  };
153
160
  const chatSideNavLink = (React__default.default.createElement(react.SideNavLink, { "data-testid": "sidenav-chat-link", className: !enableChatButton ? `${settings.prefix}--bmrg-advantage-sidenav__inactive-link` : "", isActive: isChatActive, disabled: Boolean(!enableChatButton), renderIcon: icons.ChatBot, href: enableChatButton && chatLink, onClick: enableChatButton ? handleChatClick : (e) => e.preventDefault() }, "Chat"));
154
161
  const showSecondDivider = showChatButton || toolsLink || agentAssistantStudioLink || agentAssistantLibraryLink || documentCollectionsLink;
155
- const navigateInternal = (url) => {
156
- console.log("url", url);
157
- const target = new URL(url, window.location.origin);
158
- console.log("target", target.origin);
159
- console.log("window.location.origin", window.location.origin);
160
- if (target.origin === window.location.origin) {
161
- console.log("target.pathname", target.pathname);
162
- const pathname = target.pathname.startsWith("/ica")
163
- ? target.pathname.slice(4) // removes "/ica"
164
- : target.pathname;
165
- console.log("pathname", pathname);
166
- history.push(pathname + target.search + target.hash);
167
- }
168
- else {
169
- console.log("direct url navgation", url);
170
- window.location.href = url;
171
- }
172
- };
173
162
  return (React__default.default.createElement(react.SideNav, { "aria-label": "sidenav-container", className: cx__default.default(`${settings.prefix}--bmrg-advantage-sidenav-container`, className, {
174
163
  "--closed": !isMenuOpen,
175
164
  }), "data-testid": "sidenav-container", isRail: true, expanded: isMenuOpen, onMouseEnter: () => setActiveMenu(true), onMouseLeave: () => {
@@ -231,17 +220,14 @@ function AdvantageSideNav(props) {
231
220
  handleDocumentCollectionsClick();
232
221
  } }, "Document Collections")) : null,
233
222
  showSecondDivider ? React__default.default.createElement(react.SideNavDivider, null) : null,
234
- catalogNavlink ? (React__default.default.createElement(react.SideNavLink, { "data-testid": "sidenav-catalog-link", isActive: windowLocation.href.includes(`${baseEnvUrl}/catalog`), renderIcon: icons.Catalog, onClick: (e) => {
235
- e.preventDefault();
236
- navigateInternal(catalogNavlink);
237
- } }, "Catalog")) : null,
238
- settingsLink ? (React__default.default.createElement(react.SideNavLink, { "data-testid": "sidenav-settings-link", renderIcon: icons.Settings,
239
- // href={settingsLink}
240
- className: `${settings.prefix}--bmrg-advantage-sidenav__inactive-link` , disabled: Boolean(!AssistantStudioLink) }, "Settings")) : null,
241
- adminNavlink ? (React__default.default.createElement(react.SideNavLink, { "data-testid": "sidenav-admin-link", renderIcon: icons.LicenseThirdParty, onClick: (e) => {
242
- e.preventDefault();
243
- navigateInternal(adminNavlink);
244
- } }, "Admin")) : null),
223
+ 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,
224
+ settingsLink ? (React__default.default.createElement(react.SideNavLink, { "data-testid": "sidenav-settings-link", renderIcon: icons.Settings, href: settingsLink,
225
+ //className={!AssistantStudioLink ? `${prefix}--bmrg-advantage-sidenav__inactive-link` : ""}
226
+ //disabled={Boolean(!AssistantStudioLink)}
227
+ onClick: (e) => {
228
+ handleSettingsClick();
229
+ } }, "Settings")) : null,
230
+ adminNavlink ? (React__default.default.createElement(react.SideNavLink, { "data-testid": "sidenav-admin-link", href: adminNavlink, renderIcon: icons.LicenseThirdParty }, "Admin")) : null),
245
231
  children ? (React__default.default.createElement(React__default.default.Fragment, null,
246
232
  React__default.default.createElement(react.SideNavDivider, null),
247
233
  children)) : null)));
package/dist/esm/components/AdvantageSideNav/AdvantageSideNav.js CHANGED
@@ -100,6 +100,14 @@ function AdvantageSideNav(props) {
100
100
  destinationPath: documentCollectionsLink,
101
101
  });
102
102
  };
103
+ const handleSettingsClick = () => {
104
+ triggerEvent &&
105
+ triggerEvent({
106
+ action: "Clicked on SideNav Settings link",
107
+ category: "Sidenav",
108
+ destinationPath: settingsLink,
109
+ });
110
+ };
103
111
  const handleChatClick = () => {
104
112
  let redirectLink = chatLink
105
113
  ? chatLink
@@ -110,8 +118,7 @@ function AdvantageSideNav(props) {
110
118
  category: "Sidenav",
111
119
  destinationPath: redirectLink,
112
120
  });
113
- // window.open(redirectLink, "_self", "noopener,noreferrer");
114
- navigateInternal(redirectLink);
121
+ window.open(redirectLink, "_self", "noopener,noreferrer");
115
122
  };
116
123
  const handleCreateJoinClick = () => {
117
124
  triggerEvent &&
@@ -143,24 +150,6 @@ function AdvantageSideNav(props) {
143
150
  };
144
151
  const chatSideNavLink = (React.createElement(SideNavLink, { "data-testid": "sidenav-chat-link", className: !enableChatButton ? `${prefix}--bmrg-advantage-sidenav__inactive-link` : "", isActive: isChatActive, disabled: Boolean(!enableChatButton), renderIcon: ChatBot, href: enableChatButton && chatLink, onClick: enableChatButton ? handleChatClick : (e) => e.preventDefault() }, "Chat"));
145
152
  const showSecondDivider = showChatButton || toolsLink || agentAssistantStudioLink || agentAssistantLibraryLink || documentCollectionsLink;
146
- const navigateInternal = (url) => {
147
- console.log("url", url);
148
- const target = new URL(url, window.location.origin);
149
- console.log("target", target.origin);
150
- console.log("window.location.origin", window.location.origin);
151
- if (target.origin === window.location.origin) {
152
- console.log("target.pathname", target.pathname);
153
- const pathname = target.pathname.startsWith("/ica")
154
- ? target.pathname.slice(4) // removes "/ica"
155
- : target.pathname;
156
- console.log("pathname", pathname);
157
- history.push(pathname + target.search + target.hash);
158
- }
159
- else {
160
- console.log("direct url navgation", url);
161
- window.location.href = url;
162
- }
163
- };
164
153
  return (React.createElement(SideNav, { "aria-label": "sidenav-container", className: cx(`${prefix}--bmrg-advantage-sidenav-container`, className, {
165
154
  "--closed": !isMenuOpen,
166
155
  }), "data-testid": "sidenav-container", isRail: true, expanded: isMenuOpen, onMouseEnter: () => setActiveMenu(true), onMouseLeave: () => {
@@ -222,17 +211,14 @@ function AdvantageSideNav(props) {
222
211
  handleDocumentCollectionsClick();
223
212
  } }, "Document Collections")) : null,
224
213
  showSecondDivider ? React.createElement(SideNavDivider, null) : null,
225
- catalogNavlink ? (React.createElement(SideNavLink, { "data-testid": "sidenav-catalog-link", isActive: windowLocation.href.includes(`${baseEnvUrl}/catalog`), renderIcon: Catalog, onClick: (e) => {
226
- e.preventDefault();
227
- navigateInternal(catalogNavlink);
228
- } }, "Catalog")) : null,
229
- settingsLink ? (React.createElement(SideNavLink, { "data-testid": "sidenav-settings-link", renderIcon: Settings,
230
- // href={settingsLink}
231
- className: `${prefix}--bmrg-advantage-sidenav__inactive-link` , disabled: Boolean(!AssistantStudioLink) }, "Settings")) : null,
232
- adminNavlink ? (React.createElement(SideNavLink, { "data-testid": "sidenav-admin-link", renderIcon: LicenseThirdParty, onClick: (e) => {
233
- e.preventDefault();
234
- navigateInternal(adminNavlink);
235
- } }, "Admin")) : null),
214
+ catalogNavlink ? (React.createElement(SideNavLink, { "data-testid": "sidenav-catalog-link", isActive: windowLocation.href.includes(`${baseEnvUrl}/catalog`), href: catalogNavlink, renderIcon: Catalog }, "Catalog")) : null,
215
+ settingsLink ? (React.createElement(SideNavLink, { "data-testid": "sidenav-settings-link", renderIcon: Settings, href: settingsLink,
216
+ //className={!AssistantStudioLink ? `${prefix}--bmrg-advantage-sidenav__inactive-link` : ""}
217
+ //disabled={Boolean(!AssistantStudioLink)}
218
+ onClick: (e) => {
219
+ handleSettingsClick();
220
+ } }, "Settings")) : null,
221
+ adminNavlink ? (React.createElement(SideNavLink, { "data-testid": "sidenav-admin-link", href: adminNavlink, renderIcon: LicenseThirdParty }, "Admin")) : null),
236
222
  children ? (React.createElement(React.Fragment, null,
237
223
  React.createElement(SideNavDivider, null),
238
224
  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.46",
4
+ "version": "4.6.21-beta.48",
5
5
  "author": {
6
6
  "name": "Tim Bula",
7
7
  "email": "timrbula@gmail.com"