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

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 (5) hide show
  1. package/dist/cjs/components/AdvantageSideNav/AdvantageSideNav.js +4 -23
  2. package/dist/cjs/components/Header/HeaderTeamSwitcher.js +5 -0
  3. package/dist/esm/components/AdvantageSideNav/AdvantageSideNav.js +4 -23
  4. package/dist/esm/components/Header/HeaderTeamSwitcher.js +5 -0
  5. package/package.json +1 -1
package/dist/cjs/components/AdvantageSideNav/AdvantageSideNav.js CHANGED
@@ -147,15 +147,6 @@ function AdvantageSideNav(props) {
147
147
  };
148
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"));
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
- };
159
150
  return (React__default.default.createElement(react.SideNav, { "aria-label": "sidenav-container", className: cx__default.default(`${settings.prefix}--bmrg-advantage-sidenav-container`, className, {
160
151
  "--closed": !isMenuOpen,
161
152
  }), "data-testid": "sidenav-container", isRail: true, expanded: isMenuOpen, onMouseEnter: () => setActiveMenu(true), onMouseLeave: () => {
@@ -204,12 +195,8 @@ function AdvantageSideNav(props) {
204
195
  React__default.default.createElement("div", { className: `${settings.prefix}--bmrg-advantage-sidenav-item-tag` },
205
196
  "Tools",
206
197
  React__default.default.createElement(react.Tag, { size: "sm", title: "BETA", type: "high-contrast" }, "BETA")))) : 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,
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,
213
200
  agentAssistantLibraryLink ? (React__default.default.createElement(react.SideNavLink, { "data-testid": "sidenav-agent-assistant-library-link", renderIcon: icons.Folders,
214
201
  //href={agentAssistantLibraryLink}
215
202
  className: `${settings.prefix}--bmrg-advantage-sidenav__inactive-link` , disabled: Boolean(!AssistantStudioLink) }, "Agent & Assistant Library")) : null,
@@ -217,19 +204,13 @@ function AdvantageSideNav(props) {
217
204
  //href={documentCollectionsLink}
218
205
  className: `${settings.prefix}--bmrg-advantage-sidenav__inactive-link` , disabled: Boolean(!AssistantStudioLink) }, "Document Collections")) : null,
219
206
  showSecondDivider ? React__default.default.createElement(react.SideNavDivider, null) : 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,
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,
224
208
  settingsLink ? (React__default.default.createElement(react.SideNavLink, { "data-testid": "sidenav-settings-link", renderIcon: icons.Settings,
225
209
  // href={settingsLink}
226
210
  className: `${settings.prefix}--bmrg-advantage-sidenav__inactive-link` , disabled: Boolean(!AssistantStudioLink), onClick: (e) => {
227
211
  handleSettingsClick();
228
212
  } }, "Settings")) : 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),
213
+ adminNavlink ? (React__default.default.createElement(react.SideNavLink, { "data-testid": "sidenav-admin-link", href: adminNavlink, renderIcon: icons.LicenseThirdParty }, "Admin")) : null),
233
214
  children ? (React__default.default.createElement(React__default.default.Fragment, null,
234
215
  React__default.default.createElement(react.SideNavDivider, null),
235
216
  children)) : null)));
package/dist/cjs/components/Header/HeaderTeamSwitcher.js CHANGED
@@ -98,6 +98,7 @@ function HeaderTeamSwitcher({ analyticsHelpers, baseServicesUrl, createJoinTeamT
98
98
  const body = {
99
99
  teamInstanceSwitcherDefault: team.id,
100
100
  };
101
+ console.log("handleSelectTeam in useEffect - updating default team to:", team.id);
101
102
  await mutateUserProfile({ baseServicesUrl, body });
102
103
  }
103
104
  };
@@ -114,17 +115,20 @@ function HeaderTeamSwitcher({ analyticsHelpers, baseServicesUrl, createJoinTeamT
114
115
  if (!userTeamInstanceSwitcherDefault) {
115
116
  if (userHasPersonalTeam) {
116
117
  handleSelectTeam({ team: personalTeam[0] });
118
+ console.log("useffect - personal team selected");
117
119
  }
118
120
  else if (userHasAccountTeams) {
119
121
  const sortedAccounts = sortBy__default.default(accountTeams, [
120
122
  (account) => (account.displayName ? account.displayName : account.name),
121
123
  ]);
124
+ console.log("useffect - account team selected");
122
125
  handleSelectTeam({ team: sortedAccounts[0] });
123
126
  }
124
127
  else if (userHasStandardTeams) {
125
128
  const sortedStandardTeams = sortBy__default.default(standardTeams, [
126
129
  (standardTeam) => (standardTeam.displayName ? standardTeam.displayName : standardTeam.name),
127
130
  ]);
131
+ console.log("useffect - standard team selected");
128
132
  handleSelectTeam({ team: sortedStandardTeams[0] });
129
133
  }
130
134
  }
@@ -139,6 +143,7 @@ function HeaderTeamSwitcher({ analyticsHelpers, baseServicesUrl, createJoinTeamT
139
143
  }
140
144
  const allTeams = personalTeam.concat(standardTeams, accountTeams, allProjectTeams);
141
145
  const newSelectedTeam = allTeams.find((team) => team.id === userTeamInstanceSwitcherDefault);
146
+ console.log("useffect - newSelectedTeam in usEffect:", newSelectedTeam);
142
147
  handleSelectTeam({ team: newSelectedTeam });
143
148
  }
144
149
  // if teams data loaded but there are no teams
package/dist/esm/components/AdvantageSideNav/AdvantageSideNav.js CHANGED
@@ -138,15 +138,6 @@ function AdvantageSideNav(props) {
138
138
  };
139
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"));
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
- };
150
141
  return (React.createElement(SideNav, { "aria-label": "sidenav-container", className: cx(`${prefix}--bmrg-advantage-sidenav-container`, className, {
151
142
  "--closed": !isMenuOpen,
152
143
  }), "data-testid": "sidenav-container", isRail: true, expanded: isMenuOpen, onMouseEnter: () => setActiveMenu(true), onMouseLeave: () => {
@@ -195,12 +186,8 @@ function AdvantageSideNav(props) {
195
186
  React.createElement("div", { className: `${prefix}--bmrg-advantage-sidenav-item-tag` },
196
187
  "Tools",
197
188
  React.createElement(Tag, { size: "sm", title: "BETA", type: "high-contrast" }, "BETA")))) : 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,
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,
204
191
  agentAssistantLibraryLink ? (React.createElement(SideNavLink, { "data-testid": "sidenav-agent-assistant-library-link", renderIcon: Folders,
205
192
  //href={agentAssistantLibraryLink}
206
193
  className: `${prefix}--bmrg-advantage-sidenav__inactive-link` , disabled: Boolean(!AssistantStudioLink) }, "Agent & Assistant Library")) : null,
@@ -208,19 +195,13 @@ function AdvantageSideNav(props) {
208
195
  //href={documentCollectionsLink}
209
196
  className: `${prefix}--bmrg-advantage-sidenav__inactive-link` , disabled: Boolean(!AssistantStudioLink) }, "Document Collections")) : null,
210
197
  showSecondDivider ? React.createElement(SideNavDivider, null) : 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,
198
+ catalogNavlink ? (React.createElement(SideNavLink, { "data-testid": "sidenav-catalog-link", isActive: windowLocation.href.includes(`${baseEnvUrl}/catalog`), href: catalogNavlink, renderIcon: Catalog }, "Catalog")) : null,
215
199
  settingsLink ? (React.createElement(SideNavLink, { "data-testid": "sidenav-settings-link", renderIcon: Settings,
216
200
  // href={settingsLink}
217
201
  className: `${prefix}--bmrg-advantage-sidenav__inactive-link` , disabled: Boolean(!AssistantStudioLink), onClick: (e) => {
218
202
  handleSettingsClick();
219
203
  } }, "Settings")) : null,
220
- adminNavlink ? (React.createElement(SideNavLink, { "data-testid": "sidenav-admin-link", renderIcon: LicenseThirdParty, onClick: (e) => {
221
- e.preventDefault();
222
- navigateInternal(adminNavlink);
223
- } }, "Admin")) : null),
204
+ adminNavlink ? (React.createElement(SideNavLink, { "data-testid": "sidenav-admin-link", href: adminNavlink, renderIcon: LicenseThirdParty }, "Admin")) : null),
224
205
  children ? (React.createElement(React.Fragment, null,
225
206
  React.createElement(SideNavDivider, null),
226
207
  children)) : null)));
package/dist/esm/components/Header/HeaderTeamSwitcher.js CHANGED
@@ -89,6 +89,7 @@ function HeaderTeamSwitcher({ analyticsHelpers, baseServicesUrl, createJoinTeamT
89
89
  const body = {
90
90
  teamInstanceSwitcherDefault: team.id,
91
91
  };
92
+ console.log("handleSelectTeam in useEffect - updating default team to:", team.id);
92
93
  await mutateUserProfile({ baseServicesUrl, body });
93
94
  }
94
95
  };
@@ -105,17 +106,20 @@ function HeaderTeamSwitcher({ analyticsHelpers, baseServicesUrl, createJoinTeamT
105
106
  if (!userTeamInstanceSwitcherDefault) {
106
107
  if (userHasPersonalTeam) {
107
108
  handleSelectTeam({ team: personalTeam[0] });
109
+ console.log("useffect - personal team selected");
108
110
  }
109
111
  else if (userHasAccountTeams) {
110
112
  const sortedAccounts = sortBy(accountTeams, [
111
113
  (account) => (account.displayName ? account.displayName : account.name),
112
114
  ]);
115
+ console.log("useffect - account team selected");
113
116
  handleSelectTeam({ team: sortedAccounts[0] });
114
117
  }
115
118
  else if (userHasStandardTeams) {
116
119
  const sortedStandardTeams = sortBy(standardTeams, [
117
120
  (standardTeam) => (standardTeam.displayName ? standardTeam.displayName : standardTeam.name),
118
121
  ]);
122
+ console.log("useffect - standard team selected");
119
123
  handleSelectTeam({ team: sortedStandardTeams[0] });
120
124
  }
121
125
  }
@@ -130,6 +134,7 @@ function HeaderTeamSwitcher({ analyticsHelpers, baseServicesUrl, createJoinTeamT
130
134
  }
131
135
  const allTeams = personalTeam.concat(standardTeams, accountTeams, allProjectTeams);
132
136
  const newSelectedTeam = allTeams.find((team) => team.id === userTeamInstanceSwitcherDefault);
137
+ console.log("useffect - newSelectedTeam in usEffect:", newSelectedTeam);
133
138
  handleSelectTeam({ team: newSelectedTeam });
134
139
  }
135
140
  // if teams data loaded but there are no teams
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.35",
4
+ "version": "4.6.21-beta.37",
5
5
  "author": {
6
6
  "name": "Tim Bula",
7
7
  "email": "timrbula@gmail.com"