@boomerang-io/carbon-addons-boomerang-react 4.6.8-beta.2 → 4.6.8-beta.20

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 +18 -31
  2. package/dist/esm/components/AdvantageSideNav/AdvantageSideNav.js +19 -32
  3. package/dist/types/index.d.ts +1 -1
  4. package/package.json +1 -1
  5. package/scss/components/AdvantageSideNav/_advantageSideNav.scss +0 -4
package/dist/cjs/components/AdvantageSideNav/AdvantageSideNav.js CHANGED
@@ -21,13 +21,9 @@ IBM Confidential
21
21
  © Copyright IBM Corp. 2022, 2024
22
22
  */
23
23
  function AdvantageSideNav(props) {
24
- const { app, appLink, enableChatButton = true, showChatButton = true, showSelectTeamPurpose = false, homeLink, assistantLink, regionalTeam,
25
- // multipleRegionalTeams,
26
- // teamList,
27
- defaultAssistantLink, joinCreateTrigger, isLoading, isOpen, teams = [], triggerEvent, accounts = [], baseEnvUrl, className, navLinks, personalTeams = [], user, showChatTooltip, templateMeteringEvent, tooltipMessage, isLaunchpad = false, userTeamsError = false, userTeamsLoading = false, history, children, ...rest } = props;
24
+ const { app, appLink, regionalTeam, enableChatButton = true, showChatButton = true, showSelectTeamPurpose = false, homeLink, assistantLink, defaultAssistantLink, joinCreateTrigger, isLoading, isOpen, teams = [], triggerEvent, accounts = [], baseEnvUrl, className, navLinks, personalTeams = [], user, showChatTooltip, templateMeteringEvent, tooltipMessage, isLaunchpad = false, userTeamsError = false, userTeamsLoading = false, history, children, ...rest } = props;
28
25
  const [activeSubmenu, setActiveSubmenu] = React__default.default.useState("");
29
26
  const [activeMenu, setActiveMenu] = React__default.default.useState(false);
30
- // const [multipleRegionalTeams, setMultipleRegionalTeams] = React.useState(false);
31
27
  const [teamList, setTeamList] = React__default.default.useState(null);
32
28
  const [regionalModalIsOpen, setRegionalModalIsOpen] = React__default.default.useState(false);
33
29
  const [selectedTeam, setSelectedTeam] = React__default.default.useState(null);
@@ -59,17 +55,12 @@ function AdvantageSideNav(props) {
59
55
  };
60
56
  const handleAssistantClick = () => {
61
57
  if (regionalTeam?.length > 1) {
62
- // setMultipleRegionalTeams(true);
63
58
  setRegionalModalIsOpen(true);
64
59
  setTeamList(regionalTeam?.map((team) => ({
65
60
  id: team.id,
66
61
  name: team.name,
67
62
  })));
68
63
  }
69
- // if(multipleRegionalTeams)
70
- // {
71
- // setRegionalModalIsOpen(true);
72
- // }
73
64
  triggerEvent &&
74
65
  triggerEvent({
75
66
  action: "Clicked on SideNav Assistant link",
@@ -137,7 +128,9 @@ function AdvantageSideNav(props) {
137
128
  //@ts-ignore
138
129
  accountsRef.current = Array(accounts?.length).fill().map((_, i) => accountsRef.current[i] || React__default.default.createRef());
139
130
  }
140
- const assistantSideNavLink = assistantLink && (React__default.default.createElement(react.SideNavLink, { "data-testid": "sidenav-assistant-link", className: !enableChatButton ? `${settings.prefix}--bmrg-advantage-sidenav__inactive-link` : "", disabled: Boolean(!enableChatButton), isActive: windowLocation.href.includes(assistantLink), renderIcon: icons.ChatBot, href: enableChatButton && assistantLink, onClick: enableChatButton ? handleAssistantClick : (e) => e.preventDefault() }, `Start a ${defaultAssistantLink ? "" : "New "}Chattt`));
131
+ const assistantSideNavLink = (
132
+ // assistantLink &&
133
+ React__default.default.createElement(react.SideNavLink, { "data-testid": "sidenav-assistant-link", className: !enableChatButton ? `${settings.prefix}--bmrg-advantage-sidenav__inactive-link` : "", disabled: Boolean(!enableChatButton), isActive: assistantLink ? windowLocation.href.includes(assistantLink) : '', renderIcon: icons.ChatBot, href: enableChatButton && assistantLink, onClick: enableChatButton ? handleAssistantClick : (e) => e.preventDefault() }, `Start a ${defaultAssistantLink ? "" : "New "}Chat`));
141
134
  return (React__default.default.createElement(react.SideNav, { "aria-label": "sidenav-container", className: cx__default.default(`${settings.prefix}--bmrg-advantage-sidenav-container`, className, {
142
135
  "--closed": !isMenuOpen,
143
136
  }), "data-testid": "sidenav-container", isRail: true, expanded: isMenuOpen, onToggle: () => setActiveSubmenu(""), onMouseEnter: () => setActiveMenu(true), onMouseLeave: () => {
@@ -156,29 +149,23 @@ function AdvantageSideNav(props) {
156
149
  handleHomeClick();
157
150
  } }, "Home")) : null,
158
151
  !isPartnerUser &&
159
- assistantLink &&
152
+ // assistantLink &&
160
153
  showChatButton &&
161
154
  (showChatTooltip ? (React__default.default.createElement(TooltipHover.default, { className: `${settings.prefix}--bmrg-side-nav__tooltip`, content: tooltipMessage, direction: "right" },
162
155
  React__default.default.createElement("span", null, assistantSideNavLink))) : (assistantSideNavLink)),
163
- React__default.default.createElement(react.ComposedModal
164
- // composedModalProps={{ containerClassName: teamSelectionModalContainer }}
165
- , {
166
- // composedModalProps={{ containerClassName: teamSelectionModalContainer }}
167
- modalHeaderProps: {
168
- title: "Select Team to Start a New Chat",
169
- }, isOpen: regionalModalIsOpen, onCloseModal: () => setRegionalModalIsOpen(false), onKeyDown: (e) => e.stopPropagation(), "data-testid": "select-team-chat-modal" }, ({ closeModal }) => {
170
- return (React__default.default.createElement(React__default.default.Fragment, null,
171
- React__default.default.createElement(react.ModalBody, { className: `${settings.prefix}--teamSelectModalBody` },
172
- 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) })),
173
- React__default.default.createElement(react.ModalFooter, null,
174
- React__default.default.createElement(react.Button, { kind: "secondary", "data-testid": "select-team-chat-modal-cancel-button", onClick: closeModal }, "Cancel"),
175
- React__default.default.createElement(react.Button, { "data-modal-primary-focus": true, kind: "primary", disabled: !selectedTeam, "data-testid": "select-team-chat-modal-continue-button", onClick: () => {
176
- if (selectedTeam) {
177
- handleRegionalNewStartNewChat(selectedTeam);
178
- closeModal();
179
- }
180
- } }, "Continue"))));
181
- }),
156
+ 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" },
157
+ React__default.default.createElement(react.ModalHeader, { title: "Select Team to Start a New Chat", closeModal: () => setRegionalModalIsOpen(false) }),
158
+ React__default.default.createElement(react.ModalBody, { className: `${settings.prefix}--teamSelectModalBody` },
159
+ 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) })),
160
+ React__default.default.createElement(react.ModalFooter, null,
161
+ React__default.default.createElement(react.Button, { kind: "secondary", "data-testid": "select-team-chat-modal-cancel-button", onClick: () => setRegionalModalIsOpen(false) }, "Cancel"),
162
+ React__default.default.createElement(react.Button, { "data-modal-primary-focus": true, kind: "primary", disabled: !selectedTeam, "data-testid": "select-team-chat-modal-continue-button", onClick: () => {
163
+ if (selectedTeam) {
164
+ handleRegionalNewStartNewChat(selectedTeam);
165
+ setRegionalModalIsOpen(false);
166
+ // closeModal();
167
+ }
168
+ } }, "Continue"))),
182
169
  !isPartnerUser && joinCreateTrigger ? (React__default.default.createElement(react.SideNavLink, { "data-testid": "sidenav-create-join-trigger", renderIcon: icons.AddAlt, onClick: (e) => {
183
170
  joinCreateTrigger(e);
184
171
  handleCreateJoinClick();
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, ModalBody, Dropdown, ModalFooter, Button, SkeletonPlaceholder, SideNavMenu } from '@carbon/react';
3
+ import { SideNavLink, SideNav, SideNavItems, SideNavDivider, ComposedModal, ModalHeader, ModalBody, Dropdown, ModalFooter, Button, SkeletonPlaceholder, SideNavMenu } from '@carbon/react';
4
4
  import TooltipHover from '../TooltipHover/TooltipHover.js';
5
5
  import { ChatBot, Home, AddAlt, UserMultiple, User, Locked, Unlocked, ChevronRight, GroupAccount } from '@carbon/react/icons';
6
6
  import { USER_PLATFORM_ROLE } from '../../constants/UserType.js';
@@ -12,13 +12,9 @@ IBM Confidential
12
12
  © Copyright IBM Corp. 2022, 2024
13
13
  */
14
14
  function AdvantageSideNav(props) {
15
- const { app, appLink, enableChatButton = true, showChatButton = true, showSelectTeamPurpose = false, homeLink, assistantLink, regionalTeam,
16
- // multipleRegionalTeams,
17
- // teamList,
18
- defaultAssistantLink, joinCreateTrigger, isLoading, isOpen, teams = [], triggerEvent, accounts = [], baseEnvUrl, className, navLinks, personalTeams = [], user, showChatTooltip, templateMeteringEvent, tooltipMessage, isLaunchpad = false, userTeamsError = false, userTeamsLoading = false, history, children, ...rest } = props;
15
+ const { app, appLink, regionalTeam, enableChatButton = true, showChatButton = true, showSelectTeamPurpose = false, homeLink, assistantLink, defaultAssistantLink, joinCreateTrigger, isLoading, isOpen, teams = [], triggerEvent, accounts = [], baseEnvUrl, className, navLinks, personalTeams = [], user, showChatTooltip, templateMeteringEvent, tooltipMessage, isLaunchpad = false, userTeamsError = false, userTeamsLoading = false, history, children, ...rest } = props;
19
16
  const [activeSubmenu, setActiveSubmenu] = React.useState("");
20
17
  const [activeMenu, setActiveMenu] = React.useState(false);
21
- // const [multipleRegionalTeams, setMultipleRegionalTeams] = React.useState(false);
22
18
  const [teamList, setTeamList] = React.useState(null);
23
19
  const [regionalModalIsOpen, setRegionalModalIsOpen] = React.useState(false);
24
20
  const [selectedTeam, setSelectedTeam] = React.useState(null);
@@ -50,17 +46,12 @@ function AdvantageSideNav(props) {
50
46
  };
51
47
  const handleAssistantClick = () => {
52
48
  if (regionalTeam?.length > 1) {
53
- // setMultipleRegionalTeams(true);
54
49
  setRegionalModalIsOpen(true);
55
50
  setTeamList(regionalTeam?.map((team) => ({
56
51
  id: team.id,
57
52
  name: team.name,
58
53
  })));
59
54
  }
60
- // if(multipleRegionalTeams)
61
- // {
62
- // setRegionalModalIsOpen(true);
63
- // }
64
55
  triggerEvent &&
65
56
  triggerEvent({
66
57
  action: "Clicked on SideNav Assistant link",
@@ -128,7 +119,9 @@ function AdvantageSideNav(props) {
128
119
  //@ts-ignore
129
120
  accountsRef.current = Array(accounts?.length).fill().map((_, i) => accountsRef.current[i] || React.createRef());
130
121
  }
131
- const assistantSideNavLink = assistantLink && (React.createElement(SideNavLink, { "data-testid": "sidenav-assistant-link", className: !enableChatButton ? `${prefix}--bmrg-advantage-sidenav__inactive-link` : "", disabled: Boolean(!enableChatButton), isActive: windowLocation.href.includes(assistantLink), renderIcon: ChatBot, href: enableChatButton && assistantLink, onClick: enableChatButton ? handleAssistantClick : (e) => e.preventDefault() }, `Start a ${defaultAssistantLink ? "" : "New "}Chattt`));
122
+ const assistantSideNavLink = (
123
+ // assistantLink &&
124
+ React.createElement(SideNavLink, { "data-testid": "sidenav-assistant-link", className: !enableChatButton ? `${prefix}--bmrg-advantage-sidenav__inactive-link` : "", disabled: Boolean(!enableChatButton), isActive: assistantLink ? windowLocation.href.includes(assistantLink) : '', renderIcon: ChatBot, href: enableChatButton && assistantLink, onClick: enableChatButton ? handleAssistantClick : (e) => e.preventDefault() }, `Start a ${defaultAssistantLink ? "" : "New "}Chat`));
132
125
  return (React.createElement(SideNav, { "aria-label": "sidenav-container", className: cx(`${prefix}--bmrg-advantage-sidenav-container`, className, {
133
126
  "--closed": !isMenuOpen,
134
127
  }), "data-testid": "sidenav-container", isRail: true, expanded: isMenuOpen, onToggle: () => setActiveSubmenu(""), onMouseEnter: () => setActiveMenu(true), onMouseLeave: () => {
@@ -147,29 +140,23 @@ function AdvantageSideNav(props) {
147
140
  handleHomeClick();
148
141
  } }, "Home")) : null,
149
142
  !isPartnerUser &&
150
- assistantLink &&
143
+ // assistantLink &&
151
144
  showChatButton &&
152
145
  (showChatTooltip ? (React.createElement(TooltipHover, { className: `${prefix}--bmrg-side-nav__tooltip`, content: tooltipMessage, direction: "right" },
153
146
  React.createElement("span", null, assistantSideNavLink))) : (assistantSideNavLink)),
154
- React.createElement(ComposedModal
155
- // composedModalProps={{ containerClassName: teamSelectionModalContainer }}
156
- , {
157
- // composedModalProps={{ containerClassName: teamSelectionModalContainer }}
158
- modalHeaderProps: {
159
- title: "Select Team to Start a New Chat",
160
- }, isOpen: regionalModalIsOpen, onCloseModal: () => setRegionalModalIsOpen(false), onKeyDown: (e) => e.stopPropagation(), "data-testid": "select-team-chat-modal" }, ({ closeModal }) => {
161
- return (React.createElement(React.Fragment, null,
162
- React.createElement(ModalBody, { className: `${prefix}--teamSelectModalBody` },
163
- 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) })),
164
- React.createElement(ModalFooter, null,
165
- React.createElement(Button, { kind: "secondary", "data-testid": "select-team-chat-modal-cancel-button", onClick: closeModal }, "Cancel"),
166
- React.createElement(Button, { "data-modal-primary-focus": true, kind: "primary", disabled: !selectedTeam, "data-testid": "select-team-chat-modal-continue-button", onClick: () => {
167
- if (selectedTeam) {
168
- handleRegionalNewStartNewChat(selectedTeam);
169
- closeModal();
170
- }
171
- } }, "Continue"))));
172
- }),
147
+ regionalModalIsOpen && React.createElement(ComposedModal, { className: `${prefix}--teamSelectionModalContainer`, open: regionalModalIsOpen, onClose: () => setRegionalModalIsOpen(false), onKeyDown: (e) => e.stopPropagation(), "data-testid": "select-team-chat-modal" },
148
+ React.createElement(ModalHeader, { title: "Select Team to Start a New Chat", closeModal: () => setRegionalModalIsOpen(false) }),
149
+ React.createElement(ModalBody, { className: `${prefix}--teamSelectModalBody` },
150
+ 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) })),
151
+ React.createElement(ModalFooter, null,
152
+ React.createElement(Button, { kind: "secondary", "data-testid": "select-team-chat-modal-cancel-button", onClick: () => setRegionalModalIsOpen(false) }, "Cancel"),
153
+ React.createElement(Button, { "data-modal-primary-focus": true, kind: "primary", disabled: !selectedTeam, "data-testid": "select-team-chat-modal-continue-button", onClick: () => {
154
+ if (selectedTeam) {
155
+ handleRegionalNewStartNewChat(selectedTeam);
156
+ setRegionalModalIsOpen(false);
157
+ // closeModal();
158
+ }
159
+ } }, "Continue"))),
173
160
  !isPartnerUser && joinCreateTrigger ? (React.createElement(SideNavLink, { "data-testid": "sidenav-create-join-trigger", renderIcon: AddAlt, onClick: (e) => {
174
161
  joinCreateTrigger(e);
175
162
  handleCreateJoinClick();
package/dist/types/index.d.ts CHANGED
@@ -262,8 +262,8 @@ type Props$I = {
262
262
  accounts?: Array<SideNavAccount>;
263
263
  app?: string;
264
264
  appLink: any;
265
- assistantLink?: string;
266
265
  regionalTeam?: any;
266
+ assistantLink?: string;
267
267
  baseEnvUrl?: string;
268
268
  className?: string;
269
269
  defaultAssistantLink?: string;
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.8-beta.2",
4
+ "version": "4.6.8-beta.20",
5
5
  "author": {
6
6
  "name": "Tim Bula",
7
7
  "email": "timrbula@gmail.com"
package/scss/components/AdvantageSideNav/_advantageSideNav.scss CHANGED
@@ -259,7 +259,3 @@ IBM Confidential
259
259
  .#{$prefix}--teamSelectModalBody {
260
260
  overflow: visible;
261
261
  }
262
- .#{$prefix}--teamSelectionModalContainer {
263
- max-width: 40rem;
264
- max-height: 13.25rem;
265
- }