@boomerang-io/carbon-addons-boomerang-react 4.6.21-beta.18 → 4.6.21-beta.19

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 (6) hide show
  1. package/dist/cjs/components/AdvantageSideNav/AdvantageSideNav.js +10 -27
  2. package/dist/cjs/components/UIShell/UIShell.js +9 -1
  3. package/dist/esm/components/AdvantageSideNav/AdvantageSideNav.js +10 -27
  4. package/dist/esm/components/UIShell/UIShell.js +10 -2
  5. package/dist/types/index.d.ts +1 -0
  6. package/package.json +2 -2
package/dist/cjs/components/AdvantageSideNav/AdvantageSideNav.js CHANGED
@@ -33,7 +33,7 @@ const SideNavUrlKeys = {
33
33
  Admin: "admin",
34
34
  };
35
35
  function AdvantageSideNav(props) {
36
- const { app, appLink, agenticAppsPath = "", agentStudioPath = "", regionalTeam, enableChatButton = true, showChatButton = true, showSelectTeamPurpose = false, defaultAssistantLink, joinCreateTrigger, isLoading, isOpen, teams = [], triggerEvent, accounts = [], baseEnvUrl, className, navLinks, personalTeams = [], user, showChatTooltip, templateMeteringEvent, tooltipMessage, isLaunchpad = false, sideNavUrls, history, children, personalTeamEnabled, ...rest } = props;
36
+ const { app, appLink, agenticAppsPath = "", agentStudioPath = "", regionalTeam, enableChatButton = true, showChatButton = true, showSelectTeamPurpose = false, defaultAssistantLink, joinCreateTrigger, isLoading, isOpen, teams = [], triggerEvent, accounts = [], baseEnvUrl, className, navLinks, personalTeams = [], user, showChatTooltip, templateMeteringEvent, tooltipMessage, isLaunchpad = false, isbetaLaunchpad = false, sideNavUrls, history, children, personalTeamEnabled, ...rest } = props;
37
37
  const [activeMenu, setActiveMenu] = React__default.default.useState(false);
38
38
  const isMenuOpen = isOpen || activeMenu;
39
39
  const windowLocation = window.location;
@@ -46,12 +46,9 @@ 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 = "https://ica20-beta.ica.ibm.com/ica/catalog";
50
- // const catalogNavlink = "http://localhost:3000/catalog"
51
- const adminNavlink = "http://localhost:3000/admin";
52
- // const catalogNavlink = sideNavUrls?.find((sideNavUrl) => sideNavUrl.key === SideNavUrlKeys.Catalog)?.url;
49
+ const catalogNavlink = sideNavUrls?.find((sideNavUrl) => sideNavUrl.key === SideNavUrlKeys.Catalog)?.url;
53
50
  const settingsLink = sideNavUrls?.find((sideNavUrl) => sideNavUrl.key === SideNavUrlKeys.Settings)?.url;
54
- // const adminNavlink = sideNavUrls?.find((sideNavUrl) => sideNavUrl.key === SideNavUrlKeys.Admin)?.url;
51
+ const adminNavlink = sideNavUrls?.find((sideNavUrl) => sideNavUrl.key === SideNavUrlKeys.Admin)?.url;
55
52
  // get current selected team
56
53
  let teamSwitcherTeam = null;
57
54
  if (Array.isArray(personalTeams) && personalTeams.length > 0) {
@@ -173,19 +170,6 @@ function AdvantageSideNav(props) {
173
170
  };
174
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"));
175
172
  const showSecondDivider = showChatButton || toolsLink || agentAssistantStudioLink || agentAssistantLibraryLink || documentCollectionsLink;
176
- const navigateInternal = (url) => {
177
- console.log("url", url);
178
- const target = new URL(url, window.location.origin);
179
- console.log("target", target);
180
- if (target.origin === window.location.origin) {
181
- console.log("target.origin", target.origin);
182
- console.log("window.location.origin", window.location.origin);
183
- history.push(target.pathname + target.search + target.hash);
184
- }
185
- else {
186
- window.location.href = url;
187
- }
188
- };
189
173
  return (React__default.default.createElement(react.SideNav, { "aria-label": "sidenav-container", className: cx__default.default(`${settings.prefix}--bmrg-advantage-sidenav-container`, className, {
190
174
  "--closed": !isMenuOpen,
191
175
  }), "data-testid": "sidenav-container", isRail: true, expanded: isMenuOpen, onMouseEnter: () => setActiveMenu(true), onMouseLeave: () => {
@@ -197,6 +181,11 @@ function AdvantageSideNav(props) {
197
181
  handleLaunchpadLink(e);
198
182
  history.push("/");
199
183
  }
184
+ if (isbetaLaunchpad) {
185
+ console.log("beta launchpad home link clicked");
186
+ handleLaunchpadLink(e);
187
+ history.push("/launchpad");
188
+ }
200
189
  handleHomeClick();
201
190
  } }, "Home")) : null,
202
191
  teamSwitcherTeam ? (React__default.default.createElement(react.SideNavLink, { title: teamSwitcherTeam.isAccount ? "Account Page" : "Team Page", name: teamSwitcherTeam.name, "data-testid": "sidenav-team-link", id: teamSwitcherTeam.id, isActive: windowLocation.href.includes(`/launchpad/teams/${teamSwitcherTeam.id}`), className: `${settings.prefix}--bmrg-advantage-sidenav-team`, renderIcon: icons.UserMultiple, href: `${baseEnvUrl}/${app}/teams/${teamSwitcherTeam.id}`, onClick: (e) => {
@@ -244,17 +233,11 @@ function AdvantageSideNav(props) {
244
233
  handleDocumentCollectionsClick();
245
234
  } }, "Document Collections")) : null,
246
235
  showSecondDivider ? React__default.default.createElement(react.SideNavDivider, null) : null,
247
- (React__default.default.createElement(react.SideNavLink, { "data-testid": "sidenav-catalog-link", isActive: windowLocation.href.includes(`${baseEnvUrl}/catalog`), renderIcon: icons.Catalog, onClick: (e) => {
248
- e.preventDefault();
249
- navigateInternal(catalogNavlink);
250
- } }, "Catalog")) ,
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,
251
237
  settingsLink ? (React__default.default.createElement(react.SideNavLink, { "data-testid": "sidenav-settings-link", renderIcon: icons.Settings, href: settingsLink, onClick: (e) => {
252
238
  handleSettingsClick();
253
239
  } }, "Settings")) : null,
254
- (React__default.default.createElement(react.SideNavLink, { "data-testid": "sidenav-admin-link", renderIcon: icons.LicenseThirdParty, onClick: (e) => {
255
- e.preventDefault();
256
- navigateInternal(adminNavlink);
257
- } }, "Admin")) ),
240
+ adminNavlink ? (React__default.default.createElement(react.SideNavLink, { "data-testid": "sidenav-admin-link", href: adminNavlink, renderIcon: icons.LicenseThirdParty }, "Admin")) : null),
258
241
  children ? (React__default.default.createElement(React__default.default.Fragment, null,
259
242
  React__default.default.createElement(react.SideNavDivider, null),
260
243
  children)) : null)));
package/dist/cjs/components/UIShell/UIShell.js CHANGED
@@ -82,7 +82,15 @@ function UIShell({ analyticsHelpers, baseEnvUrl, carbonTheme = "g10", config, cr
82
82
  isSupportEnabled &&
83
83
  (supportFlagCheck || isPartnerUser ? (React__default.default.createElement(SupportCenter.SupportCenterMenuItem, { key: "support-center", platformName: platform?.platformName, platformOrganization: platform?.platformOrganization, supportLink: supportLink, partnerEmailId: partnerEmailId, enablePartner: isPartnerUser, baseServicesUrl: platform.baseServicesUrl })) : (React__default.default.createElement(HeaderMenuItem.default, { key: "support-center", href: platform?.supportUrl, icon: React__default.default.createElement(icons.HelpDesk, null), kind: "external", text: "Support Center", type: "link" }))),
84
84
  React__default.default.createElement(HeaderMenuItem.default, { key: "release-notes", href: platform?.releaseNotesUrl, icon: React__default.default.createElement(icons.CatalogPublish, null), "data-testid": "release-notes", kind: "app", text: "Release Notes", type: "link" }),
85
- React__default.default.createElement(HeaderMenuItem.default, { key: "legal-terms", href: platform?.legalTermsUrl, icon: React__default.default.createElement(icons.Policy, null), "data-testid": "legal-terms", kind: "app", text: "Legal Terms", type: "link" }),
85
+ // <HeaderMenuItem
86
+ // key="legal-terms"
87
+ // href={platform?.legalTermsUrl as string}
88
+ // icon={<Policy />}
89
+ // data-testid="legal-terms"
90
+ // kind="app"
91
+ // text="Legal Terms"
92
+ // type="link"
93
+ // />,
86
94
  React__default.default.createElement("span", { style: { borderBottom: "1px solid #b8c1c1" } }),
87
95
  isCommunityEnabled && (React__default.default.createElement(HeaderMenuItem.default, { key: "community", href: platform?.communityUrl, icon: React__default.default.createElement(icons.Forum, null), kind: "external", text: "Community", type: "link" })),
88
96
  isFeedbackEnabled && (React__default.default.createElement(Feedback.FeedbackMenuItem, { key: "feedback", platformName: platform?.platformName, platformOrganization: platform?.platformOrganization, sendIdeasUrl: sendIdeasUrl, sendBluePointsAwardUrl: sendBluePointsAwardUrl })),
package/dist/esm/components/AdvantageSideNav/AdvantageSideNav.js CHANGED
@@ -24,7 +24,7 @@ const SideNavUrlKeys = {
24
24
  Admin: "admin",
25
25
  };
26
26
  function AdvantageSideNav(props) {
27
- const { app, appLink, agenticAppsPath = "", agentStudioPath = "", regionalTeam, enableChatButton = true, showChatButton = true, showSelectTeamPurpose = false, defaultAssistantLink, joinCreateTrigger, isLoading, isOpen, teams = [], triggerEvent, accounts = [], baseEnvUrl, className, navLinks, personalTeams = [], user, showChatTooltip, templateMeteringEvent, tooltipMessage, isLaunchpad = false, sideNavUrls, history, children, personalTeamEnabled, ...rest } = props;
27
+ const { app, appLink, agenticAppsPath = "", agentStudioPath = "", regionalTeam, enableChatButton = true, showChatButton = true, showSelectTeamPurpose = false, defaultAssistantLink, joinCreateTrigger, isLoading, isOpen, teams = [], triggerEvent, accounts = [], baseEnvUrl, className, navLinks, personalTeams = [], user, showChatTooltip, templateMeteringEvent, tooltipMessage, isLaunchpad = false, isbetaLaunchpad = false, sideNavUrls, history, children, personalTeamEnabled, ...rest } = props;
28
28
  const [activeMenu, setActiveMenu] = React.useState(false);
29
29
  const isMenuOpen = isOpen || activeMenu;
30
30
  const windowLocation = window.location;
@@ -37,12 +37,9 @@ 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 = "https://ica20-beta.ica.ibm.com/ica/catalog";
41
- // const catalogNavlink = "http://localhost:3000/catalog"
42
- const adminNavlink = "http://localhost:3000/admin";
43
- // const catalogNavlink = sideNavUrls?.find((sideNavUrl) => sideNavUrl.key === SideNavUrlKeys.Catalog)?.url;
40
+ const catalogNavlink = sideNavUrls?.find((sideNavUrl) => sideNavUrl.key === SideNavUrlKeys.Catalog)?.url;
44
41
  const settingsLink = sideNavUrls?.find((sideNavUrl) => sideNavUrl.key === SideNavUrlKeys.Settings)?.url;
45
- // const adminNavlink = sideNavUrls?.find((sideNavUrl) => sideNavUrl.key === SideNavUrlKeys.Admin)?.url;
42
+ const adminNavlink = sideNavUrls?.find((sideNavUrl) => sideNavUrl.key === SideNavUrlKeys.Admin)?.url;
46
43
  // get current selected team
47
44
  let teamSwitcherTeam = null;
48
45
  if (Array.isArray(personalTeams) && personalTeams.length > 0) {
@@ -164,19 +161,6 @@ function AdvantageSideNav(props) {
164
161
  };
165
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"));
166
163
  const showSecondDivider = showChatButton || toolsLink || agentAssistantStudioLink || agentAssistantLibraryLink || documentCollectionsLink;
167
- const navigateInternal = (url) => {
168
- console.log("url", url);
169
- const target = new URL(url, window.location.origin);
170
- console.log("target", target);
171
- if (target.origin === window.location.origin) {
172
- console.log("target.origin", target.origin);
173
- console.log("window.location.origin", window.location.origin);
174
- history.push(target.pathname + target.search + target.hash);
175
- }
176
- else {
177
- window.location.href = url;
178
- }
179
- };
180
164
  return (React.createElement(SideNav, { "aria-label": "sidenav-container", className: cx(`${prefix}--bmrg-advantage-sidenav-container`, className, {
181
165
  "--closed": !isMenuOpen,
182
166
  }), "data-testid": "sidenav-container", isRail: true, expanded: isMenuOpen, onMouseEnter: () => setActiveMenu(true), onMouseLeave: () => {
@@ -188,6 +172,11 @@ function AdvantageSideNav(props) {
188
172
  handleLaunchpadLink(e);
189
173
  history.push("/");
190
174
  }
175
+ if (isbetaLaunchpad) {
176
+ console.log("beta launchpad home link clicked");
177
+ handleLaunchpadLink(e);
178
+ history.push("/launchpad");
179
+ }
191
180
  handleHomeClick();
192
181
  } }, "Home")) : null,
193
182
  teamSwitcherTeam ? (React.createElement(SideNavLink, { title: teamSwitcherTeam.isAccount ? "Account Page" : "Team Page", name: teamSwitcherTeam.name, "data-testid": "sidenav-team-link", id: teamSwitcherTeam.id, isActive: windowLocation.href.includes(`/launchpad/teams/${teamSwitcherTeam.id}`), className: `${prefix}--bmrg-advantage-sidenav-team`, renderIcon: UserMultiple, href: `${baseEnvUrl}/${app}/teams/${teamSwitcherTeam.id}`, onClick: (e) => {
@@ -235,17 +224,11 @@ function AdvantageSideNav(props) {
235
224
  handleDocumentCollectionsClick();
236
225
  } }, "Document Collections")) : null,
237
226
  showSecondDivider ? React.createElement(SideNavDivider, null) : null,
238
- (React.createElement(SideNavLink, { "data-testid": "sidenav-catalog-link", isActive: windowLocation.href.includes(`${baseEnvUrl}/catalog`), renderIcon: Catalog, onClick: (e) => {
239
- e.preventDefault();
240
- navigateInternal(catalogNavlink);
241
- } }, "Catalog")) ,
227
+ catalogNavlink ? (React.createElement(SideNavLink, { "data-testid": "sidenav-catalog-link", isActive: windowLocation.href.includes(`${baseEnvUrl}/catalog`), href: catalogNavlink, renderIcon: Catalog }, "Catalog")) : null,
242
228
  settingsLink ? (React.createElement(SideNavLink, { "data-testid": "sidenav-settings-link", renderIcon: Settings, href: settingsLink, onClick: (e) => {
243
229
  handleSettingsClick();
244
230
  } }, "Settings")) : null,
245
- (React.createElement(SideNavLink, { "data-testid": "sidenav-admin-link", renderIcon: LicenseThirdParty, onClick: (e) => {
246
- e.preventDefault();
247
- navigateInternal(adminNavlink);
248
- } }, "Admin")) ),
231
+ adminNavlink ? (React.createElement(SideNavLink, { "data-testid": "sidenav-admin-link", href: adminNavlink, renderIcon: LicenseThirdParty }, "Admin")) : null),
249
232
  children ? (React.createElement(React.Fragment, null,
250
233
  React.createElement(SideNavDivider, null),
251
234
  children)) : null)));
package/dist/esm/components/UIShell/UIShell.js CHANGED
@@ -1,6 +1,6 @@
1
1
  import React from 'react';
2
2
  import { QueryClientProvider } from 'react-query';
3
- import { Email, Document, HelpDesk, CatalogPublish, Policy, Forum, ChatLaunch, Cognitive, Book } from '@carbon/react/icons';
3
+ import { Email, Document, HelpDesk, CatalogPublish, Forum, ChatLaunch, Cognitive, Book } from '@carbon/react/icons';
4
4
  import Header from '../Header/Header.js';
5
5
  import HeaderMenuItem from '../Header/HeaderMenuItem.js';
6
6
  import PrivacyRedirect from '../PrivacyRedirect/PrivacyRedirect.js';
@@ -74,7 +74,15 @@ function UIShell({ analyticsHelpers, baseEnvUrl, carbonTheme = "g10", config, cr
74
74
  isSupportEnabled &&
75
75
  (supportFlagCheck || isPartnerUser ? (React.createElement(SupportCenterMenuItem, { key: "support-center", platformName: platform?.platformName, platformOrganization: platform?.platformOrganization, supportLink: supportLink, partnerEmailId: partnerEmailId, enablePartner: isPartnerUser, baseServicesUrl: platform.baseServicesUrl })) : (React.createElement(HeaderMenuItem, { key: "support-center", href: platform?.supportUrl, icon: React.createElement(HelpDesk, null), kind: "external", text: "Support Center", type: "link" }))),
76
76
  React.createElement(HeaderMenuItem, { key: "release-notes", href: platform?.releaseNotesUrl, icon: React.createElement(CatalogPublish, null), "data-testid": "release-notes", kind: "app", text: "Release Notes", type: "link" }),
77
- React.createElement(HeaderMenuItem, { key: "legal-terms", href: platform?.legalTermsUrl, icon: React.createElement(Policy, null), "data-testid": "legal-terms", kind: "app", text: "Legal Terms", type: "link" }),
77
+ // <HeaderMenuItem
78
+ // key="legal-terms"
79
+ // href={platform?.legalTermsUrl as string}
80
+ // icon={<Policy />}
81
+ // data-testid="legal-terms"
82
+ // kind="app"
83
+ // text="Legal Terms"
84
+ // type="link"
85
+ // />,
78
86
  React.createElement("span", { style: { borderBottom: "1px solid #b8c1c1" } }),
79
87
  isCommunityEnabled && (React.createElement(HeaderMenuItem, { key: "community", href: platform?.communityUrl, icon: React.createElement(Forum, null), kind: "external", text: "Community", type: "link" })),
80
88
  isFeedbackEnabled && (React.createElement(FeedbackMenuItem, { key: "feedback", platformName: platform?.platformName, platformOrganization: platform?.platformOrganization, sendIdeasUrl: sendIdeasUrl, sendBluePointsAwardUrl: sendBluePointsAwardUrl })),
package/dist/types/index.d.ts CHANGED
@@ -296,6 +296,7 @@ type Props$I = {
296
296
  triggerEvent?: (props: any) => void;
297
297
  user: User;
298
298
  isLaunchpad?: boolean;
299
+ isbetaLaunchpad?: boolean;
299
300
  userTeamsError?: boolean;
300
301
  userTeamsLoading?: boolean;
301
302
  history?: any;
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.18",
4
+ "version": "4.6.21-beta.19",
5
5
  "author": {
6
6
  "name": "Tim Bula",
7
7
  "email": "timrbula@gmail.com"
@@ -73,7 +73,7 @@
73
73
  "react": "^17.0.0 || ^16.14.0",
74
74
  "react-dom": "^17.0.0 || ^16.14.0",
75
75
  "react-query": "^3.34.12",
76
- "react-router-dom": "^6.0.0",
76
+ "react-router-dom": "^5.3.0",
77
77
  "yup": ">=0.32.11"
78
78
  },
79
79
  "devDependencies": {