@boomerang-io/carbon-addons-boomerang-react 4.6.11-beta.25 → 4.6.11-beta.26

package/dist/cjs/components/AdvantageSideNav/AdvantageSideNav.js

@@ -23,9 +23,9 @@ IBM Confidential
 function AdvantageSideNav(props) {
     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;
     const [activeMenu, setActiveMenu] = React__default.default.useState(false);
-    React__default.default.useState(null);
-    // const [regionalModalIsOpen, setRegionalModalIsOpen] = React.useState(false);
-    React__default.default.useState(null);
+    const [teamList, setTeamList] = React__default.default.useState(null);
+    const [regionalModalIsOpen, setRegionalModalIsOpen] = React__default.default.useState(false);
+    const [selectedTeam, setSelectedTeam] = React__default.default.useState(null);
     const isMenuOpen = isOpen || activeMenu;
     const windowLocation = window.location;
     const isPartnerUser = user?.type === UserType.USER_PLATFORM_ROLE.Partner;
@@ -70,6 +70,10 @@ function AdvantageSideNav(props) {
                 destinationPath: homeLink,
             });
     };
+    const handleRegionalNewStartNewChat = (team) => {
+        const assistantLink = `${appLink?.newChatRedirect()}?teamName=${team.name}&teamId=${team.id}`;
+        window.open(assistantLink, "_self", "noopener,noreferrer");
+    };
     const handleToolsClick = () => {
         triggerEvent &&
             triggerEvent({
@@ -111,14 +115,19 @@ function AdvantageSideNav(props) {
             });
     };
     const handleAssistantClick = () => {
-        let redirectLink = `${appLink.newChatRedirect()}?teamName=${teamSwitcherTeam.name}&teamId=${teamSwitcherTeam.id}`;
+        if (regionalTeam?.length > 1) {
+            setRegionalModalIsOpen(true);
+            setTeamList(regionalTeam?.map((team) => ({
+                id: team.id,
+                name: team.name,
+            })));
+        }
         triggerEvent &&
             triggerEvent({
                 action: "Clicked on SideNav Assistant link",
                 category: "Sidenav",
-                destinationPath: redirectLink,
+                destinationPath: assistantLink,
             });
-        window.open(redirectLink, "_self", "noopener,noreferrer");
     };
     const handleCreateJoinClick = () => {
         triggerEvent &&
@@ -150,11 +159,7 @@ function AdvantageSideNav(props) {
     };
     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={assistantLink }
-        renderIcon: icons.ChatBot, 
-        // href={enableChatButton}
-        onClick: enableChatButton ? handleAssistantClick : (e) => e.preventDefault() }, "Chat"));
+    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() }, "Chat"));
     const catalogNavlink = navigation?.platform?.catalog?.url;
     const adminNavlink = navigation?.platform?.admin?.url;
     const showSecondDivider = (!isPartnerUser && showChatButton) ||
@@ -222,7 +227,20 @@ function AdvantageSideNav(props) {
             settingsLink ? (React__default.default.createElement(react.SideNavLink, { "data-testid": "sidenav-settings-link", renderIcon: icons.Settings, href: settingsLink, onClick: (e) => {
                     handleSettingsClick();
                 } }, "Settings")) : null,
-            adminNavlink ? (React__default.default.createElement(react.SideNavLink, { href: adminNavlink, renderIcon: icons.LicenseThirdParty }, "Admin")) : null),
+            adminNavlink ? (React__default.default.createElement(react.SideNavLink, { href: adminNavlink, renderIcon: icons.LicenseThirdParty }, "Admin")) : null,
+            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" },
+                React__default.default.createElement(react.ModalHeader, { title: "Select Team to Start a New Chat", closeModal: () => setRegionalModalIsOpen(false) }),
+                React__default.default.createElement(react.ModalBody, { className: `${settings.prefix}--teamSelectModalBody` },
+                    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) })),
+                React__default.default.createElement(react.ModalFooter, null,
+                    React__default.default.createElement(react.Button, { kind: "secondary", "data-testid": "select-team-chat-modal-cancel-button", onClick: () => setRegionalModalIsOpen(false) }, "Cancel"),
+                    React__default.default.createElement(react.Button, { "data-modal-primary-focus": true, kind: "primary", disabled: !selectedTeam, "data-testid": "select-team-chat-modal-continue-button", onClick: () => {
+                            if (selectedTeam) {
+                                handleRegionalNewStartNewChat(selectedTeam);
+                                setRegionalModalIsOpen(false);
+                                // closeModal();
+                            }
+                        } }, "Continue"))))),
         children ? (React__default.default.createElement(React__default.default.Fragment, null,
             React__default.default.createElement(react.SideNavDivider, null),
             children)) : null)));

package/dist/cjs/components/Header/HeaderTeamSwitcher.js

@@ -10,6 +10,7 @@ var sortBy = require('lodash.sortby');
 var HeaderMenu = require('./HeaderMenu.js');
 var servicesConfig = require('../../config/servicesConfig.js');
 var settings = require('../../internal/settings.js');
+var UserType = require('../../constants/UserType.js');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 
@@ -232,13 +233,14 @@ function HeaderTeamSwitcher({ analyticsHelpers, baseServicesUrl, createJoinTeamT
         if (selectedTeamName && selectedTeamName.length > 65) {
             selectedTeamName = selectedTeamName.slice(0, 65) + "...";
         }
+        const isPartnerUser = Boolean(user?.type === UserType.USER_PLATFORM_ROLE.Partner);
         return (React__default.default.createElement("div", { className: headerDropdownMenuContainerClassname },
             isLoadingTeamSwitcher ? (React__default.default.createElement("div", { className: headerDropdownMenuLoadingClassname },
                 React__default.default.createElement(react.InlineLoading, null))) : isSuccessTeamSwitcher ? (React__default.default.createElement("div", { className: headerDropdownMenuSuccessClassname },
                 React__default.default.createElement(icons.CheckmarkFilled, null))) : null,
             React__default.default.createElement(react.HeaderMenu, { id: "header-team-switcher-menu", "aria-label": menuAriaLabelRecord, className: headerDropdownMenuClassname, menuLinkName: selectedTeamName ? selectedTeamName : "No team selected", onClick: handleHeaderMenuClick, "data-testid": "header-team-switcher-menu" },
                 React__default.default.createElement(HeaderMenu.default, { "aria-labelledby": menuButtonId, className: headerDropdownMenuListClassname, id: menuListId },
-                    React__default.default.createElement(react.HeaderMenuItem, { id: "header-team-switcher-create-join-team-button", className: headerTeamSwitcherCreateTeamButtonContainerClassname, onClick: handleCreateJoinTeamClick, 
+                    !isPartnerUser && React__default.default.createElement(react.HeaderMenuItem, { id: "header-team-switcher-create-join-team-button", className: headerTeamSwitcherCreateTeamButtonContainerClassname, onClick: handleCreateJoinTeamClick, 
                         // eslint-disable-next-line no-script-url
                         href: "javascript:void(0)", role: "menuitem", "data-testid": "header-team-switcher-create-join-team-button" },
                         React__default.default.createElement("div", { className: headerTeamSwitcherCreateTeamButtonClassname },

package/dist/cjs/components/UIShell/UIShell.js

@@ -77,7 +77,7 @@ function UIShell({ analyticsHelpers, baseEnvUrl, carbonTheme = "g10", config, cr
                 ...profileMenuItems,
                 isSignOutEnabled && React__default.default.createElement(SignOut.SignOutMenuItem, { key: "Sign Out", signOutLink: platform.signOutUrl }),
             ].filter(Boolean), supportMenuItems: [
-                React__default.default.createElement(HeaderMenuItem.default, { key: "docs", href: platform?.docs?.url, icon: React__default.default.createElement(icons.Document, null), "data-testid": "docs", kind: "app", text: "Docs", type: "link" }),
+                !isPartnerUser && React__default.default.createElement(HeaderMenuItem.default, { key: "docs", href: platform?.docs?.url, icon: React__default.default.createElement(icons.Document, null), "data-testid": "docs", kind: "app", text: "Docs", type: "link" }),
                 isSupportEnabled &&
                     (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" }))),
                 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" }),

package/dist/esm/components/AdvantageSideNav/AdvantageSideNav.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import cx from 'classnames';
-import { SideNavLink, SideNav, SideNavItems, SideNavDivider } from '@carbon/react';
+import { SideNavLink, SideNav, SideNavItems, SideNavDivider, ComposedModal, ModalHeader, ModalBody, Dropdown, ModalFooter, Button } from '@carbon/react';
 import TooltipHover from '../TooltipHover/TooltipHover.js';
 import { ChatBot, Home, UserMultiple, AddAlt, Api, IntentRequestCreate, Folders, DocumentMultiple_02, Catalog, Settings, LicenseThirdParty } from '@carbon/react/icons';
 import { USER_PLATFORM_ROLE } from '../../constants/UserType.js';
@@ -14,9 +14,9 @@ IBM Confidential
 function AdvantageSideNav(props) {
     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;
     const [activeMenu, setActiveMenu] = React.useState(false);
-    React.useState(null);
-    // const [regionalModalIsOpen, setRegionalModalIsOpen] = React.useState(false);
-    React.useState(null);
+    const [teamList, setTeamList] = React.useState(null);
+    const [regionalModalIsOpen, setRegionalModalIsOpen] = React.useState(false);
+    const [selectedTeam, setSelectedTeam] = React.useState(null);
     const isMenuOpen = isOpen || activeMenu;
     const windowLocation = window.location;
     const isPartnerUser = user?.type === USER_PLATFORM_ROLE.Partner;
@@ -61,6 +61,10 @@ function AdvantageSideNav(props) {
                 destinationPath: homeLink,
             });
     };
+    const handleRegionalNewStartNewChat = (team) => {
+        const assistantLink = `${appLink?.newChatRedirect()}?teamName=${team.name}&teamId=${team.id}`;
+        window.open(assistantLink, "_self", "noopener,noreferrer");
+    };
     const handleToolsClick = () => {
         triggerEvent &&
             triggerEvent({
@@ -102,14 +106,19 @@ function AdvantageSideNav(props) {
             });
     };
     const handleAssistantClick = () => {
-        let redirectLink = `${appLink.newChatRedirect()}?teamName=${teamSwitcherTeam.name}&teamId=${teamSwitcherTeam.id}`;
+        if (regionalTeam?.length > 1) {
+            setRegionalModalIsOpen(true);
+            setTeamList(regionalTeam?.map((team) => ({
+                id: team.id,
+                name: team.name,
+            })));
+        }
         triggerEvent &&
             triggerEvent({
                 action: "Clicked on SideNav Assistant link",
                 category: "Sidenav",
-                destinationPath: redirectLink,
+                destinationPath: assistantLink,
             });
-        window.open(redirectLink, "_self", "noopener,noreferrer");
     };
     const handleCreateJoinClick = () => {
         triggerEvent &&
@@ -141,11 +150,7 @@ function AdvantageSideNav(props) {
     };
     const assistantSideNavLink = (
     // assistantLink &&
-    React.createElement(SideNavLink, { "data-testid": "sidenav-assistant-link", className: !enableChatButton ? `${prefix}--bmrg-advantage-sidenav__inactive-link` : "", disabled: Boolean(!enableChatButton), 
-        // isActive={assistantLink }
-        renderIcon: ChatBot, 
-        // href={enableChatButton}
-        onClick: enableChatButton ? handleAssistantClick : (e) => e.preventDefault() }, "Chat"));
+    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() }, "Chat"));
     const catalogNavlink = navigation?.platform?.catalog?.url;
     const adminNavlink = navigation?.platform?.admin?.url;
     const showSecondDivider = (!isPartnerUser && showChatButton) ||
@@ -213,7 +218,20 @@ function AdvantageSideNav(props) {
             settingsLink ? (React.createElement(SideNavLink, { "data-testid": "sidenav-settings-link", renderIcon: Settings, href: settingsLink, onClick: (e) => {
                     handleSettingsClick();
                 } }, "Settings")) : null,
-            adminNavlink ? (React.createElement(SideNavLink, { href: adminNavlink, renderIcon: LicenseThirdParty }, "Admin")) : null),
+            adminNavlink ? (React.createElement(SideNavLink, { href: adminNavlink, renderIcon: LicenseThirdParty }, "Admin")) : null,
+            regionalModalIsOpen && (React.createElement(ComposedModal, { className: `${prefix}--teamSelectionModalContainer`, open: regionalModalIsOpen, onClose: () => setRegionalModalIsOpen(false), onKeyDown: (e) => e.stopPropagation(), "data-testid": "select-team-chat-modal" },
+                React.createElement(ModalHeader, { title: "Select Team to Start a New Chat", closeModal: () => setRegionalModalIsOpen(false) }),
+                React.createElement(ModalBody, { className: `${prefix}--teamSelectModalBody` },
+                    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) })),
+                React.createElement(ModalFooter, null,
+                    React.createElement(Button, { kind: "secondary", "data-testid": "select-team-chat-modal-cancel-button", onClick: () => setRegionalModalIsOpen(false) }, "Cancel"),
+                    React.createElement(Button, { "data-modal-primary-focus": true, kind: "primary", disabled: !selectedTeam, "data-testid": "select-team-chat-modal-continue-button", onClick: () => {
+                            if (selectedTeam) {
+                                handleRegionalNewStartNewChat(selectedTeam);
+                                setRegionalModalIsOpen(false);
+                                // closeModal();
+                            }
+                        } }, "Continue"))))),
         children ? (React.createElement(React.Fragment, null,
             React.createElement(SideNavDivider, null),
             children)) : null)));

package/dist/esm/components/Header/HeaderTeamSwitcher.js

@@ -6,6 +6,7 @@ import sortBy from 'lodash.sortby';
 import HeaderMenu$1 from './HeaderMenu.js';
 import { resolver, serviceUrl } from '../../config/servicesConfig.js';
 import { prefix } from '../../internal/settings.js';
+import { USER_PLATFORM_ROLE } from '../../constants/UserType.js';
 
 /*
 IBM Confidential
@@ -223,13 +224,14 @@ function HeaderTeamSwitcher({ analyticsHelpers, baseServicesUrl, createJoinTeamT
         if (selectedTeamName && selectedTeamName.length > 65) {
             selectedTeamName = selectedTeamName.slice(0, 65) + "...";
         }
+        const isPartnerUser = Boolean(user?.type === USER_PLATFORM_ROLE.Partner);
         return (React.createElement("div", { className: headerDropdownMenuContainerClassname },
             isLoadingTeamSwitcher ? (React.createElement("div", { className: headerDropdownMenuLoadingClassname },
                 React.createElement(InlineLoading, null))) : isSuccessTeamSwitcher ? (React.createElement("div", { className: headerDropdownMenuSuccessClassname },
                 React.createElement(CheckmarkFilled, null))) : null,
             React.createElement(HeaderMenu, { id: "header-team-switcher-menu", "aria-label": menuAriaLabelRecord, className: headerDropdownMenuClassname, menuLinkName: selectedTeamName ? selectedTeamName : "No team selected", onClick: handleHeaderMenuClick, "data-testid": "header-team-switcher-menu" },
                 React.createElement(HeaderMenu$1, { "aria-labelledby": menuButtonId, className: headerDropdownMenuListClassname, id: menuListId },
-                    React.createElement(HeaderMenuItem, { id: "header-team-switcher-create-join-team-button", className: headerTeamSwitcherCreateTeamButtonContainerClassname, onClick: handleCreateJoinTeamClick, 
+                    !isPartnerUser && React.createElement(HeaderMenuItem, { id: "header-team-switcher-create-join-team-button", className: headerTeamSwitcherCreateTeamButtonContainerClassname, onClick: handleCreateJoinTeamClick, 
                         // eslint-disable-next-line no-script-url
                         href: "javascript:void(0)", role: "menuitem", "data-testid": "header-team-switcher-create-join-team-button" },
                         React.createElement("div", { className: headerTeamSwitcherCreateTeamButtonClassname },

package/dist/esm/components/UIShell/UIShell.js

@@ -69,7 +69,7 @@ function UIShell({ analyticsHelpers, baseEnvUrl, carbonTheme = "g10", config, cr
                 ...profileMenuItems,
                 isSignOutEnabled && React.createElement(SignOutMenuItem, { key: "Sign Out", signOutLink: platform.signOutUrl }),
             ].filter(Boolean), supportMenuItems: [
-                React.createElement(HeaderMenuItem, { key: "docs", href: platform?.docs?.url, icon: React.createElement(Document, null), "data-testid": "docs", kind: "app", text: "Docs", type: "link" }),
+                !isPartnerUser && React.createElement(HeaderMenuItem, { key: "docs", href: platform?.docs?.url, icon: React.createElement(Document, null), "data-testid": "docs", kind: "app", text: "Docs", type: "link" }),
                 isSupportEnabled &&
                     (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" }))),
                 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" }),

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@boomerang-io/carbon-addons-boomerang-react",
   "description": "Carbon Addons for Boomerang apps",
-  "version": "4.6.11-beta.25",
+  "version": "4.6.11-beta.26",
   "author": {
     "name": "Tim Bula",
     "email": "timrbula@gmail.com"
   },
   "license": "Apache-2",
-  "repository": { 
+  "repository": {
     "type": "git",
     "url": "git@github.com:boomerang-io/carbon-addons-boomerang-react"
   },