@boomerang-io/carbon-addons-boomerang-react 4.6.11-beta.13 → 4.6.11-beta.15

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 +9 -29
  2. package/dist/esm/components/AdvantageSideNav/AdvantageSideNav.js +10 -30
  3. package/package.json +1 -1
package/dist/cjs/components/AdvantageSideNav/AdvantageSideNav.js CHANGED
@@ -23,9 +23,9 @@ IBM Confidential
23
23
  function AdvantageSideNav(props) {
24
24
  const { app, appLink, regionalTeam, enableChatButton = true, showChatButton = true, showSelectTeamPurpose = false, homeLink, agentAssistantStudioLink, agentAssistantLibraryLink, assistantLink, defaultAssistantLink, documentCollectionsLink, settingsLink, toolsLink, joinCreateTrigger, isLoading, isOpen, teams = [], triggerEvent, accounts = [], baseEnvUrl, className, navLinks, navigation, personalTeams = [], user, showChatTooltip, templateMeteringEvent, tooltipMessage, isLaunchpad = false, history, children, ...rest } = props;
25
25
  const [activeMenu, setActiveMenu] = React__default.default.useState(false);
26
- const [teamList, setTeamList] = React__default.default.useState(null);
27
- const [regionalModalIsOpen, setRegionalModalIsOpen] = React__default.default.useState(false);
28
- const [selectedTeam, setSelectedTeam] = React__default.default.useState(null);
26
+ React__default.default.useState(null);
27
+ // const [regionalModalIsOpen, setRegionalModalIsOpen] = React.useState(false);
28
+ React__default.default.useState(null);
29
29
  const isMenuOpen = isOpen || activeMenu;
30
30
  const windowLocation = window.location;
31
31
  const isPartnerUser = user?.type === UserType.USER_PLATFORM_ROLE.Partner;
@@ -70,10 +70,6 @@ function AdvantageSideNav(props) {
70
70
  destinationPath: homeLink,
71
71
  });
72
72
  };
73
- const handleRegionalNewStartNewChat = (team) => {
74
- const assistantLink = `${appLink?.newChatRedirect()}?teamName=${team.name}&teamId=${team.id}`;
75
- window.open(assistantLink, "_self", "noopener,noreferrer");
76
- };
77
73
  const handleToolsClick = () => {
78
74
  triggerEvent &&
79
75
  triggerEvent({
@@ -115,19 +111,16 @@ function AdvantageSideNav(props) {
115
111
  });
116
112
  };
117
113
  const handleAssistantClick = () => {
118
- if (regionalTeam?.length > 1) {
119
- setRegionalModalIsOpen(true);
120
- setTeamList(regionalTeam?.map((team) => ({
121
- id: team.id,
122
- name: team.name,
123
- })));
124
- }
114
+ console.log("assistantLink", assistantLink);
115
+ let redirectLink = `${appLink.newChatRedirect()}?teamName=${teamSwitcherTeam.name}&teamId=${teamSwitcherTeam.id}`;
116
+ console.log("redirectLink", redirectLink);
125
117
  triggerEvent &&
126
118
  triggerEvent({
127
119
  action: "Clicked on SideNav Assistant link",
128
120
  category: "Sidenav",
129
- destinationPath: assistantLink,
121
+ destinationPath: assistantLink ? assistantLink : redirectLink,
130
122
  });
123
+ window.open(assistantLink, "_self", "noopener,noreferrer");
131
124
  };
132
125
  const handleCreateJoinClick = () => {
133
126
  triggerEvent &&
@@ -227,20 +220,7 @@ function AdvantageSideNav(props) {
227
220
  settingsLink ? (React__default.default.createElement(react.SideNavLink, { "data-testid": "sidenav-settings-link", renderIcon: icons.Settings, href: settingsLink, onClick: (e) => {
228
221
  handleSettingsClick();
229
222
  } }, "Settings")) : null,
230
- adminNavlink ? (React__default.default.createElement(react.SideNavLink, { href: adminNavlink, renderIcon: icons.LicenseThirdParty }, "Admin")) : null,
231
- regionalModalIsOpen && (React__default.default.createElement(react.ComposedModal, { className: `${settings.prefix}--teamSelectionModalContainer`, open: regionalModalIsOpen, onClose: () => setRegionalModalIsOpen(false), onKeyDown: (e) => e.stopPropagation(), "data-testid": "select-team-chat-modal" },
232
- React__default.default.createElement(react.ModalHeader, { title: "Select Team to Start a New Chat", closeModal: () => setRegionalModalIsOpen(false) }),
233
- React__default.default.createElement(react.ModalBody, { className: `${settings.prefix}--teamSelectModalBody` },
234
- React__default.default.createElement(react.Dropdown, { items: teamList, disabled: !teamList?.length, id: "select-team-chat-modal-dropdown", selectedItem: selectedTeam, size: "md", "data-testid": "select-team-chat-modal-dropdown", itemToString: (item) => item?.name, label: "Choose a team", onChange: ({ selectedItem }) => setSelectedTeam(selectedItem) })),
235
- React__default.default.createElement(react.ModalFooter, null,
236
- React__default.default.createElement(react.Button, { kind: "secondary", "data-testid": "select-team-chat-modal-cancel-button", onClick: () => setRegionalModalIsOpen(false) }, "Cancel"),
237
- React__default.default.createElement(react.Button, { "data-modal-primary-focus": true, kind: "primary", disabled: !selectedTeam, "data-testid": "select-team-chat-modal-continue-button", onClick: () => {
238
- if (selectedTeam) {
239
- handleRegionalNewStartNewChat(selectedTeam);
240
- setRegionalModalIsOpen(false);
241
- // closeModal();
242
- }
243
- } }, "Continue"))))),
223
+ adminNavlink ? (React__default.default.createElement(react.SideNavLink, { href: adminNavlink, renderIcon: icons.LicenseThirdParty }, "Admin")) : null),
244
224
  children ? (React__default.default.createElement(React__default.default.Fragment, null,
245
225
  React__default.default.createElement(react.SideNavDivider, null),
246
226
  children)) : null)));
package/dist/esm/components/AdvantageSideNav/AdvantageSideNav.js CHANGED
@@ -1,6 +1,6 @@
1
1
  import React from 'react';
2
2
  import cx from 'classnames';
3
- import { SideNavLink, SideNav, SideNavItems, SideNavDivider, ComposedModal, ModalHeader, ModalBody, Dropdown, ModalFooter, Button } from '@carbon/react';
3
+ import { SideNavLink, SideNav, SideNavItems, SideNavDivider } from '@carbon/react';
4
4
  import TooltipHover from '../TooltipHover/TooltipHover.js';
5
5
  import { ChatBot, Home, UserMultiple, AddAlt, Api, IntentRequestCreate, Folders, DocumentMultiple_02, Catalog, Settings, LicenseThirdParty } from '@carbon/react/icons';
6
6
  import { USER_PLATFORM_ROLE } from '../../constants/UserType.js';
@@ -14,9 +14,9 @@ IBM Confidential
14
14
  function AdvantageSideNav(props) {
15
15
  const { app, appLink, regionalTeam, enableChatButton = true, showChatButton = true, showSelectTeamPurpose = false, homeLink, agentAssistantStudioLink, agentAssistantLibraryLink, assistantLink, defaultAssistantLink, documentCollectionsLink, settingsLink, toolsLink, joinCreateTrigger, isLoading, isOpen, teams = [], triggerEvent, accounts = [], baseEnvUrl, className, navLinks, navigation, personalTeams = [], user, showChatTooltip, templateMeteringEvent, tooltipMessage, isLaunchpad = false, history, children, ...rest } = props;
16
16
  const [activeMenu, setActiveMenu] = React.useState(false);
17
- const [teamList, setTeamList] = React.useState(null);
18
- const [regionalModalIsOpen, setRegionalModalIsOpen] = React.useState(false);
19
- const [selectedTeam, setSelectedTeam] = React.useState(null);
17
+ React.useState(null);
18
+ // const [regionalModalIsOpen, setRegionalModalIsOpen] = React.useState(false);
19
+ React.useState(null);
20
20
  const isMenuOpen = isOpen || activeMenu;
21
21
  const windowLocation = window.location;
22
22
  const isPartnerUser = user?.type === USER_PLATFORM_ROLE.Partner;
@@ -61,10 +61,6 @@ function AdvantageSideNav(props) {
61
61
  destinationPath: homeLink,
62
62
  });
63
63
  };
64
- const handleRegionalNewStartNewChat = (team) => {
65
- const assistantLink = `${appLink?.newChatRedirect()}?teamName=${team.name}&teamId=${team.id}`;
66
- window.open(assistantLink, "_self", "noopener,noreferrer");
67
- };
68
64
  const handleToolsClick = () => {
69
65
  triggerEvent &&
70
66
  triggerEvent({
@@ -106,19 +102,16 @@ function AdvantageSideNav(props) {
106
102
  });
107
103
  };
108
104
  const handleAssistantClick = () => {
109
- if (regionalTeam?.length > 1) {
110
- setRegionalModalIsOpen(true);
111
- setTeamList(regionalTeam?.map((team) => ({
112
- id: team.id,
113
- name: team.name,
114
- })));
115
- }
105
+ console.log("assistantLink", assistantLink);
106
+ let redirectLink = `${appLink.newChatRedirect()}?teamName=${teamSwitcherTeam.name}&teamId=${teamSwitcherTeam.id}`;
107
+ console.log("redirectLink", redirectLink);
116
108
  triggerEvent &&
117
109
  triggerEvent({
118
110
  action: "Clicked on SideNav Assistant link",
119
111
  category: "Sidenav",
120
- destinationPath: assistantLink,
112
+ destinationPath: assistantLink ? assistantLink : redirectLink,
121
113
  });
114
+ window.open(assistantLink, "_self", "noopener,noreferrer");
122
115
  };
123
116
  const handleCreateJoinClick = () => {
124
117
  triggerEvent &&
@@ -218,20 +211,7 @@ function AdvantageSideNav(props) {
218
211
  settingsLink ? (React.createElement(SideNavLink, { "data-testid": "sidenav-settings-link", renderIcon: Settings, href: settingsLink, onClick: (e) => {
219
212
  handleSettingsClick();
220
213
  } }, "Settings")) : null,
221
- adminNavlink ? (React.createElement(SideNavLink, { href: adminNavlink, renderIcon: LicenseThirdParty }, "Admin")) : null,
222
- regionalModalIsOpen && (React.createElement(ComposedModal, { className: `${prefix}--teamSelectionModalContainer`, open: regionalModalIsOpen, onClose: () => setRegionalModalIsOpen(false), onKeyDown: (e) => e.stopPropagation(), "data-testid": "select-team-chat-modal" },
223
- React.createElement(ModalHeader, { title: "Select Team to Start a New Chat", closeModal: () => setRegionalModalIsOpen(false) }),
224
- React.createElement(ModalBody, { className: `${prefix}--teamSelectModalBody` },
225
- React.createElement(Dropdown, { items: teamList, disabled: !teamList?.length, id: "select-team-chat-modal-dropdown", selectedItem: selectedTeam, size: "md", "data-testid": "select-team-chat-modal-dropdown", itemToString: (item) => item?.name, label: "Choose a team", onChange: ({ selectedItem }) => setSelectedTeam(selectedItem) })),
226
- React.createElement(ModalFooter, null,
227
- React.createElement(Button, { kind: "secondary", "data-testid": "select-team-chat-modal-cancel-button", onClick: () => setRegionalModalIsOpen(false) }, "Cancel"),
228
- React.createElement(Button, { "data-modal-primary-focus": true, kind: "primary", disabled: !selectedTeam, "data-testid": "select-team-chat-modal-continue-button", onClick: () => {
229
- if (selectedTeam) {
230
- handleRegionalNewStartNewChat(selectedTeam);
231
- setRegionalModalIsOpen(false);
232
- // closeModal();
233
- }
234
- } }, "Continue"))))),
214
+ adminNavlink ? (React.createElement(SideNavLink, { href: adminNavlink, renderIcon: LicenseThirdParty }, "Admin")) : null),
235
215
  children ? (React.createElement(React.Fragment, null,
236
216
  React.createElement(SideNavDivider, null),
237
217
  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.11-beta.13",
4
+ "version": "4.6.11-beta.15",
5
5
  "author": {
6
6
  "name": "Tim Bula",
7
7
  "email": "timrbula@gmail.com"