npm - @boomerang-io/carbon-addons-boomerang-react - Versions diffs - 4.6.21-beta.29 → 4.6.21-beta.30 - Mend

@boomerang-io/carbon-addons-boomerang-react 4.6.21-beta.29 → 4.6.21-beta.30

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 (15) hide show

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

@@ -47,10 +47,8 @@ function AdvantageSideNav(props) {
     const agentAssistantLibraryLink = sideNavUrls?.find((sideNavUrl) => sideNavUrl.key === SideNavUrlKeys.AgentLibrary)?.url;
     const documentCollectionsLink = sideNavUrls?.find((sideNavUrl) => sideNavUrl.key === SideNavUrlKeys.DocumentCollections)?.url;
     const catalogNavlink = sideNavUrls?.find((sideNavUrl) => sideNavUrl.key === SideNavUrlKeys.Catalog)?.url;
-    sideNavUrls?.find((sideNavUrl) => sideNavUrl.key === SideNavUrlKeys.Settings)?.url;
+    const settingsLink = sideNavUrls?.find((sideNavUrl) => sideNavUrl.key === SideNavUrlKeys.Settings)?.url;
     const adminNavlink = sideNavUrls?.find((sideNavUrl) => sideNavUrl.key === SideNavUrlKeys.Admin)?.url;
-    const isAgentStudioEnabled = true;
-    const isDocumentCollectionsEnabled = true;
     // get current selected team
     let teamSwitcherTeam = null;
     if (Array.isArray(personalTeams) && personalTeams.length > 0) {
@@ -122,6 +120,14 @@ function AdvantageSideNav(props) {
                 destinationPath: documentCollectionsLink,
             });
     };
+    const handleSettingsClick = () => {
+        triggerEvent &&
+            triggerEvent({
+                action: "Clicked on SideNav Settings link",
+                category: "Sidenav",
+                destinationPath: settingsLink,
+            });
+    };
     const handleChatClick = () => {
         let redirectLink = chatLink
             ? chatLink
@@ -212,22 +218,29 @@ function AdvantageSideNav(props) {
                 React__default.default.createElement("div", { className: `${settings.prefix}--bmrg-advantage-sidenav-item-tag` },
                     "Tools",
                     React__default.default.createElement(react.Tag, { size: "sm", title: "BETA", type: "high-contrast" }, "BETA")))) : null,
-            agentAssistantStudioLink ? (React__default.default.createElement(react.SideNavLink, { "data-testid": "sidenav-agent-assistant-studio-link", isActive: (agentStudioPath && windowLocation.href.includes(`/launchpad${agentStudioPath}`)) ||
-                    (agenticAppsPath && windowLocation.href.includes(`/launchpad${agenticAppsPath}`)), disabled: Boolean(isAgentStudioEnabled), className: `${settings.prefix}--bmrg-advantage-sidenav__inactive-link` , renderIcon: icons.IntentRequestCreate, href: agentAssistantStudioLink, onClick: (e) => {
+            agentAssistantStudioLink ? (React__default.default.createElement(react.SideNavLink, { "data-testid": "sidenav-agent-assistant-studio-link",
+                // isActive={
+                //   (agentStudioPath && windowLocation.href.includes(`/launchpad${agentStudioPath}`)) ||
+                //   (agenticAppsPath && windowLocation.href.includes(`/launchpad${agenticAppsPath}`))
+                // }
+                className: !enableChatButton ? `${settings.prefix}--bmrg-advantage-sidenav__inactive-link` : "", disabled: Boolean(!enableChatButton), renderIcon: icons.IntentRequestCreate, href: agentAssistantStudioLink, onClick: (e) => {
                     if (isLaunchpad) {
                         handleLaunchpadLink(e);
                         history.push(agentStudioPath);
                     }
                     handleAgentAssistantStudioClick();
                 } }, "Agent & Assistant Studio")) : null,
-            agentAssistantLibraryLink ? (React__default.default.createElement(react.SideNavLink, { "data-testid": "sidenav-agent-assistant-library-link", renderIcon: icons.Folders, href: agentAssistantLibraryLink, disabled: Boolean(isAgentStudioEnabled), className: Boolean(isAgentStudioEnabled) ? `${settings.prefix}--bmrg-advantage-sidenav__inactive-link` : "", onClick: (e) => {
+            agentAssistantLibraryLink ? (React__default.default.createElement(react.SideNavLink, { "data-testid": "sidenav-agent-assistant-library-link", renderIcon: icons.Folders, href: agentAssistantLibraryLink, className: !enableChatButton ? `${settings.prefix}--bmrg-advantage-sidenav__inactive-link` : "", disabled: Boolean(!enableChatButton), onClick: (e) => {
                     handleAgentAssistantLibraryClick();
                 } }, "Agent & Assistant Library")) : null,
-            documentCollectionsLink ? (React__default.default.createElement(react.SideNavLink, { "data-testid": "sidenav-document-collections-link", renderIcon: icons.DocumentMultiple_02, href: documentCollectionsLink, disabled: Boolean(isDocumentCollectionsEnabled), className: `${settings.prefix}--bmrg-advantage-sidenav__inactive-link` , onClick: (e) => {
+            documentCollectionsLink ? (React__default.default.createElement(react.SideNavLink, { "data-testid": "sidenav-document-collections-link", renderIcon: icons.DocumentMultiple_02, href: documentCollectionsLink, className: !enableChatButton ? `${settings.prefix}--bmrg-advantage-sidenav__inactive-link` : "", disabled: Boolean(!enableChatButton), onClick: (e) => {
                     handleDocumentCollectionsClick();
                 } }, "Document Collections")) : null,
             showSecondDivider ? React__default.default.createElement(react.SideNavDivider, null) : null,
             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,
+            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, { "data-testid": "sidenav-admin-link", href: adminNavlink, renderIcon: icons.LicenseThirdParty }, "Admin")) : null),
         children ? (React__default.default.createElement(React__default.default.Fragment, null,
             React__default.default.createElement(react.SideNavDivider, null),

package/dist/cjs/components/Header/Header.js CHANGED Viewed

@@ -62,7 +62,7 @@ const MenuAriaLabelRecord = {
 const headerButtonClassNames = "cds--btn--icon-only cds--header__action cds--btn cds--btn--primary cds--btn--icon-only cds--btn cds--btn--primary";
 const instanceCheckMarkContainerClass = "instance-checkmark-style-container";
 function Header(props) {
-    const { analyticsHelpers, productName, baseEnvUrl, baseServicesUrl, carbonTheme = "g10", className, createJoinTeamTrigger, history, isLaunchpad = false, isLoadingTeamSwitcher, isSuccessTeamSwitcher, setIsSuccessTeamSwitcher, navLinks, platform, prefixName = "", refetchUser, refetchNavigation, rightPanel, skipToContentProps, templateMeteringEvent, trackEvent, triggerEvent, user, userTeams, userTeamsAssets, } = props;
+    const { analyticsHelpers, productName, baseEnvUrl, baseServicesUrl, carbonTheme = "g10", className, createJoinTeamTrigger, enableTeamSwitcher = true, history, isLaunchpad = false, isLoadingTeamSwitcher, isSuccessTeamSwitcher, setIsSuccessTeamSwitcher, navLinks, platform, prefixName = "", refetchUser, refetchNavigation, rightPanel, skipToContentProps, templateMeteringEvent, trackEvent, triggerEvent, user, userTeams, userTeamsAssets, } = props;
     const hasUserTeams = Boolean(userTeams);
     const userTeamsUrl = servicesConfig.serviceUrl.getUserTeamsServices({ baseServicesUrl });
     const teamsQuery = reactQuery.useQuery({
@@ -70,6 +70,7 @@ function Header(props) {
         queryFn: servicesConfig.resolver.query(userTeamsUrl, null),
         enabled: !hasUserTeams && Boolean(baseServicesUrl),
     });
+    const showTeamSwitcher = enableTeamSwitcher && Boolean(user);
     return (React__default.default.createElement(React__default.default.Fragment, null,
         React__default.default.createElement(react.Theme, { theme: carbonTheme },
             React__default.default.createElement(react.Header, { "aria-label": "App navigation header", className: className },
@@ -80,7 +81,7 @@ function Header(props) {
                     ? navLinks.map((link) => (React__default.default.createElement(react.HeaderMenuItem, { "aria-label": `Link for ${link.name}`, "data-testid": "header-menu-link", href: link.url, isCurrentPage: window?.location?.href && link.url ? window.location.href.startsWith(link.url) : false, key: link.name, target: link.isExternal ? "_blank" : undefined, rel: link.isExternal ? "noopener noreferrer" : undefined }, link.name)))
                     : null),
                 React__default.default.createElement(react.HeaderGlobalBar, null,
-                    React__default.default.createElement(HeaderTeamSwitcher.default, { analyticsHelpers: analyticsHelpers, baseServicesUrl: baseServicesUrl, createJoinTeamTrigger: createJoinTeamTrigger, history: history, isLaunchpad: isLaunchpad, isLoadingTeamSwitcher: isLoadingTeamSwitcher, isSuccessTeamSwitcher: isSuccessTeamSwitcher, setIsSuccessTeamSwitcher: setIsSuccessTeamSwitcher, menuAriaLabelRecord: MenuAriaLabelRecord.TeamSwitcher, menuButtonId: MenuButtonId.TeamSwitcher, menuListId: MenuListId.TeamSwitcher, navigationPlatform: platform, refetchUser: refetchUser, refetchNavigation: refetchNavigation, teamsQuery: teamsQuery, trackEvent: trackEvent, user: user, userTeams: userTeams }),
+                    showTeamSwitcher ? (React__default.default.createElement(HeaderTeamSwitcher.default, { analyticsHelpers: analyticsHelpers, baseServicesUrl: baseServicesUrl, createJoinTeamTrigger: createJoinTeamTrigger, history: history, isLaunchpad: isLaunchpad, isLoadingTeamSwitcher: isLoadingTeamSwitcher, isSuccessTeamSwitcher: isSuccessTeamSwitcher, setIsSuccessTeamSwitcher: setIsSuccessTeamSwitcher, menuAriaLabelRecord: MenuAriaLabelRecord.TeamSwitcher, menuButtonId: MenuButtonId.TeamSwitcher, menuListId: MenuListId.TeamSwitcher, navigationPlatform: platform, refetchUser: refetchUser, refetchNavigation: refetchNavigation, teamsQuery: teamsQuery, trackEvent: trackEvent, user: user, userTeams: userTeams })) : null,
                     props?.instanceSwitcherEnabled && (React__default.default.createElement(InstanceSwitcherMenu, { enabled: Boolean(props.instanceSwitcherEnabled), menuItems: platform?.instances })),
                     React__default.default.createElement(RequestsMenu, { baseEnvUrl: baseEnvUrl, enabled: Boolean(props.requestSummary), summary: props.requestSummary }),
                     React__default.default.createElement(NotificationsMenu, { baseEnvUrl: baseEnvUrl, baseServicesUrl: baseServicesUrl, enabled: Boolean(props.enableNotifications), countEnabled: Boolean(props.enableNotificationsCount) }),

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

@@ -11,6 +11,7 @@ var HeaderMenu = require('./HeaderMenu.js');
 var servicesConfig = require('../../config/servicesConfig.js');
 var settings = require('../../internal/settings.js');
 var UserType = require('../../constants/UserType.js');
+var TeamTypes = require('../../constants/TeamTypes.js');
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
@@ -226,33 +227,58 @@ function HeaderTeamSwitcher({ analyticsHelpers, baseServicesUrl, createJoinTeamT
             standardTeams = teamsQuery?.data?.standardTeams ?? [];
             personalTeam = teamsQuery?.data?.personalTeam ?? [];
         }
-        let sortedAccountTeamsWithNamesToDisplay = [];
-        let sortedStandardTeamsWithNamesToDisplay = [];
+        let newPersonalTeam = personalTeam.length > 0
+            ? personalTeam.map((personalTeam) => ({
+                ...personalTeam,
+                type: TeamTypes.TEAM_TYPES.PERSONAL,
+                nameToDisplay: personalTeam.displayName ? personalTeam.displayName : personalTeam.name,
+            }))
+            : [];
+        let newAccountTeams = [];
+        let newStandardTeams = [];
         if (accountTeams?.length > 0) {
-            const newAccountTeams = accountTeams.map((team) => {
+            newAccountTeams = accountTeams.map((team) => {
                 let newProjectTeams = [];
                 if (team.projectTeams && team.projectTeams.length > 0) {
-                    newProjectTeams = team.projectTeams?.map((team) => ({
-                        ...team,
-                        nameToDisplay: team.displayName ? team.displayName : team.name,
-                    }));
+                    newProjectTeams = team.projectTeams?.map((projectTeam) => {
+                        return {
+                            ...projectTeam,
+                            nameToDisplay: projectTeam.displayName ? projectTeam.displayName : projectTeam.name,
+                        };
+                    });
                 }
                 return {
                     ...team,
                     nameToDisplay: team.displayName ? team.displayName : team.name,
+                    type: TeamTypes.TEAM_TYPES.ACCOUNT,
                     projectTeams: sortBy__default.default(newProjectTeams, ["nameToDisplay"]),
                 };
             });
-            sortedAccountTeamsWithNamesToDisplay = sortBy__default.default(newAccountTeams, ["nameToDisplay"]);
         }
         if (standardTeams?.length > 0) {
-            const newStandardTeams = standardTeams.map((team) => {
+            newStandardTeams = standardTeams.map((team) => {
                 return {
                     ...team,
+                    type: TeamTypes.TEAM_TYPES.STANDARD,
                     nameToDisplay: team.displayName ? team.displayName : team.name,
                 };
             });
-            sortedStandardTeamsWithNamesToDisplay = sortBy__default.default(newStandardTeams, ["nameToDisplay"]);
+        }
+        let allTeams = newPersonalTeam.concat(newAccountTeams, newStandardTeams);
+        const order = { [TeamTypes.TEAM_TYPES.PERSONAL]: 1, [TeamTypes.TEAM_TYPES.ACCOUNT]: 2, [TeamTypes.TEAM_TYPES.STANDARD]: 3 };
+        allTeams = sortBy__default.default(allTeams, [(team) => order[team.type], "nameToDisplay"]);
+        if (selectedTeam) {
+            const selectedTeamIndex = allTeams.findIndex((team, index) => {
+                if (team.id === selectedTeam.id) {
+                    return true;
+                }
+                else if (Array.isArray(team.projectTeams) && team.projectTeams?.length > 0) {
+                    return team.projectTeams.some((projectTeam) => projectTeam.id === selectedTeam.id);
+                }
+                return false;
+            });
+            const [removedTeam] = allTeams.splice(selectedTeamIndex, 1);
+            allTeams.unshift(removedTeam);
         }
         let selectedTeamName = selectedTeam?.displayName
             ? selectedTeam.displayName
@@ -274,29 +300,22 @@ function HeaderTeamSwitcher({ analyticsHelpers, baseServicesUrl, createJoinTeamT
                         React__default.default.createElement("div", { className: headerTeamSwitcherCreateTeamButtonClassname },
                             React__default.default.createElement("span", { className: headerTeamSwitcherCreateTeamButtonTextClassname }, createTeamButtonText),
                             React__default.default.createElement(icons.AddAlt, { className: headerTeamSwitcherCreateTeamButtonIconClassname })))),
-                    personalTeam.length > 0
-                        ? personalTeam.map((team) => {
-                            const teamName = team.displayName ? team.displayName : team.name;
-                            const isTeamSelected = team.id === selectedTeam?.id;
-                            return (React__default.default.createElement("div", { key: team.id, id: `${team.id}-personal-menu-item-id` },
-                                React__default.default.createElement(react.HeaderMenuItem, { key: team.id, id: `${team.id}-personal-menu-item`, "aria-selected": isTeamSelected, className: headerDropdownMenuItemContainerClassname, onClick: () => {
-                                        handleTeamClick({ team, type: "personal" });
-                                    },
-                                    // eslint-disable-next-line no-script-url
-                                    href: "javascript:void(0)", "data-testid": "header-team-switcher-menu-item" },
-                                    React__default.default.createElement("div", { className: headerDropdownMenuItemClassname },
-                                        React__default.default.createElement("span", { title: teamName, className: headerDropdownMenuItemTextClassname }, teamName),
-                                        isTeamSelected ? React__default.default.createElement(icons.CheckmarkFilled, { className: headerDropdownMenuItemIconClassname }) : null))));
-                        })
-                        : null,
-                    accountTeams.length > 0
-                        ? sortedAccountTeamsWithNamesToDisplay.map((team) => {
+                    allTeams.map((team) => {
+                        const isTeamSelected = team.id === selectedTeam?.id;
+                        if (team.type === TeamTypes.TEAM_TYPES.ACCOUNT) {
                             const isSubmenuOpen = team.id === openAccountSubmenuId;
-                            const isProjectTeamSelected = team.projectTeams &&
-                                team.projectTeams.length > 0 &&
-                                team.projectTeams.some((team) => team.id === selectedTeam?.id);
-                            const isTeamSelected = team.id === selectedTeam?.id;
+                            const projectTeams = team.projectTeams;
+                            const existProjectTeams = Array.isArray(projectTeams) && projectTeams.length > 0;
+                            let selectedProjectTeamIndex = -1;
+                            if (existProjectTeams) {
+                                selectedProjectTeamIndex = projectTeams.findIndex((team) => team.id === selectedTeam?.id);
+                            }
+                            const isProjectTeamSelected = selectedProjectTeamIndex >= 0;
                             const isMenuSelected = isTeamSelected || isProjectTeamSelected;
+                            if (existProjectTeams && isProjectTeamSelected) {
+                                const [removedTeam] = projectTeams.splice(selectedProjectTeamIndex, 1);
+                                projectTeams.unshift(removedTeam);
+                            }
                             return (React__default.default.createElement("div", { key: team.id, id: `${team.id}-account-menu` },
                                 React__default.default.createElement(react.HeaderMenuItem, { "aria-expanded": isSubmenuOpen, "aria-selected": isMenuSelected, className: headerDropdownMenuItemAccountContainerClassname, onClick: (e) => handleOpenAccountSubmenu({ e, id: team.id }),
                                     // eslint-disable-next-line no-script-url
@@ -304,7 +323,7 @@ function HeaderTeamSwitcher({ analyticsHelpers, baseServicesUrl, createJoinTeamT
                                     React__default.default.createElement("div", { className: headerDropdownMenuItemAccountClassname },
                                         React__default.default.createElement("div", { className: headerDropdownMenuItemTextIconClassname },
                                             React__default.default.createElement("span", { title: team.nameToDisplay, className: headerDropdownMenuItemTextClassname }, team.nameToDisplay),
-                                            isMenuSelected ? (React__default.default.createElement(icons.CheckmarkFilled, { className: headerDropdownMenuItemIconClassname })) : null),
+                                            isMenuSelected ? React__default.default.createElement(icons.CheckmarkFilled, { className: headerDropdownMenuItemIconClassname }) : null),
                                         React__default.default.createElement("div", { className: headerDropdownMenuItemAccountIconsClassname },
                                             React__default.default.createElement(icons.GroupAccount, { className: headerDropdownMenuItemAccountGroupIconClassname }),
                                             React__default.default.createElement(icons.ChevronDown, { className: headerDropdownMenuItemAccountChevronIconClassname })))),
@@ -316,9 +335,9 @@ function HeaderTeamSwitcher({ analyticsHelpers, baseServicesUrl, createJoinTeamT
                                         href: "javascript:void(0)" },
                                         React__default.default.createElement("div", { className: headerDropdownMenuItemClassname, style: { paddingLeft: "1rem" } },
                                             React__default.default.createElement("span", { title: team.nameToDisplay, className: headerDropdownMenuItemTextClassname }, "Account Page"),
-                                            isTeamSelected ? (React__default.default.createElement(icons.CheckmarkFilled, { className: headerDropdownMenuItemIconClassname })) : null)),
-                                    team.projectTeams && team.projectTeams.length > 0
-                                        ? team.projectTeams.map((team) => {
+                                            isTeamSelected ? React__default.default.createElement(icons.CheckmarkFilled, { className: headerDropdownMenuItemIconClassname }) : null)),
+                                    projectTeams && projectTeams.length > 0
+                                        ? projectTeams.map((team) => {
                                             const isTeamSelected = team.id === selectedTeam?.id;
                                             return (React__default.default.createElement("div", { key: team.id, id: `${team.id}-project-menu-item` },
                                                 React__default.default.createElement(react.HeaderMenuItem, { "aria-selected": isTeamSelected, className: headerDropdownMenuItemContainerClassname, onClick: () => {
@@ -331,22 +350,19 @@ function HeaderTeamSwitcher({ analyticsHelpers, baseServicesUrl, createJoinTeamT
                                                         isTeamSelected ? (React__default.default.createElement(icons.CheckmarkFilled, { className: headerDropdownMenuItemIconClassname })) : null))));
                                         })
                                         : null)));
-                        })
-                        : null,
-                    standardTeams.length > 0
-                        ? sortedStandardTeamsWithNamesToDisplay.map((team) => {
-                            const isTeamSelected = team.id === selectedTeam?.id;
-                            return (React__default.default.createElement("div", { key: team.id, id: `${team.id}-standard-menu-item` },
+                        }
+                        else {
+                            return (React__default.default.createElement("div", { key: team.id, id: `${team.id}-${team.type}-menu-item` },
                                 React__default.default.createElement(react.HeaderMenuItem, { "aria-selected": isTeamSelected, className: headerDropdownMenuItemContainerClassname, onClick: () => {
-                                        handleTeamClick({ team, type: "standard" });
+                                        handleTeamClick({ team, type: team.type ?? "" });
                                     }, "data-testid": "header-team-switcher-menu-item",
                                     // eslint-disable-next-line no-script-url
                                     href: "javascript:void(0)" },
                                     React__default.default.createElement("div", { className: headerDropdownMenuItemClassname },
                                         React__default.default.createElement("span", { title: team.nameToDisplay, className: headerDropdownMenuItemTextClassname }, team.nameToDisplay),
                                         isTeamSelected ? React__default.default.createElement(icons.CheckmarkFilled, { className: headerDropdownMenuItemIconClassname }) : null))));
-                        })
-                        : null))));
+                        }
+                    })))));
     }
     return null;
 }

package/dist/cjs/components/ProfileSettings/ProfileSettings.js CHANGED Viewed

@@ -122,9 +122,9 @@ function ProfileSettings({ baseServicesUrl, refetchUser, refetchUserTeams, refet
     return (React__default.default.createElement(react.ComposedModal, { "aria-label": "Profile Settings", className: `${settings.prefix}--bmrg-profile-settings-container ${settings.prefix}--bmrg-header-modal`, open: isOpen, onClose: handleClose, preventCloseOnClickOutside: true },
         React__default.default.createElement(react.ModalHeader, { closeModal: handleClose, title: `User profile - ${userName}` }),
         React__default.default.createElement(react.ModalBody, { style: { maxHeight: "31.5rem" } },
-            React__default.default.createElement("p", { className: `${settings.prefix}--bmrg-profile-settings__title` }, "More user profile settings will be here eventually, but for now you can choose which Teams are shown in your sidebar in Launchpad."),
-            React__default.default.createElement("h2", { className: `${settings.prefix}--bmrg-profile-settings__subtitle` }, "Teams visible in Launchpad sidebar"),
-            React__default.default.createElement("p", { className: `${settings.prefix}--bmrg-profile-settings__description` }, "Choose Teams to show or hide in your Launchpad sidebar and Catalog (useful for sensitive demos). You will not be able to access or view unchecked Teams from the sidebar, and cannot add items to them from Catalog."),
+            React__default.default.createElement("p", { className: `${settings.prefix}--bmrg-profile-settings__title` }, "More user profile settings will be here eventually, but for now you can choose which Teams are shown in your team switcher in Launchpad."),
+            React__default.default.createElement("h2", { className: `${settings.prefix}--bmrg-profile-settings__subtitle` }, "Teams visible in Launchpad team switcher"),
+            React__default.default.createElement("p", { className: `${settings.prefix}--bmrg-profile-settings__description` }, "Choose Teams to show or hide in your Launchpad team switcher and Catalog (useful for sensitive demos). You will not be able to access or view unchecked Teams from the team switcher, and cannot add items to them from Catalog."),
             userIsLoading ? (React__default.default.createElement(react.StructuredListSkeleton, null)) : userError ? (React__default.default.createElement(ErrorMessage.default, { style: { color: "#F2F4F8", padding: "1rem" } })) : teams?.length > 0 ? (React__default.default.createElement(react.StructuredListWrapper, { className: `${settings.prefix}--bmrg-profile-settings-list` },
                 React__default.default.createElement(react.StructuredListHead, null,
                     React__default.default.createElement(react.StructuredListRow, { head: true },

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

@@ -26,11 +26,11 @@ IBM Confidential
 694970X, 69497O0
 © Copyright IBM Corp. 2022, 2024
 */
-function UIShell({ analyticsHelpers, baseEnvUrl, carbonTheme = "g10", config, createJoinTeamTrigger, history, isLaunchpad = false, isLoadingTeamSwitcher, isSuccessTeamSwitcher, setIsSuccessTeamSwitcher, leftPanel, platformName, productName, profileMenuItems = [], supportMenuItems = [], renderPrivacyRedirect = true, renderPrivacyStatement = true, rightPanel, handleShowTutorial, refetchUser, refetchUserTeams, refetchNavigation, skipToContentProps, templateMeteringEvent, trackEvent, triggerEvent, tutorialScreenToShow, user, userTeams, userTeamsAssets, enableIcaMacs, }) {
+function UIShell({ analyticsHelpers, baseEnvUrl, carbonTheme = "g10", config, createJoinTeamTrigger, enableTeamSwitcher = true, history, isLaunchpad = false, isLoadingTeamSwitcher, isSuccessTeamSwitcher, setIsSuccessTeamSwitcher, leftPanel, platformName, productName, profileMenuItems = [], supportMenuItems = [], renderPrivacyRedirect = true, renderPrivacyStatement = true, rightPanel, handleShowTutorial, refetchUser, refetchUserTeams, refetchNavigation, skipToContentProps, templateMeteringEvent, trackEvent, triggerEvent, tutorialScreenToShow, user, userTeams, userTeamsAssets, enableIcaMacs, }) {
     // Support base header .e.g for an error state
     if (!config) {
         return (React__default.default.createElement(reactQuery.QueryClientProvider, { client: servicesConfig.queryClient },
-            React__default.default.createElement(Header.default, { baseEnvUrl: baseEnvUrl ?? "", baseServicesUrl: "", carbonTheme: carbonTheme, enableAppSwitcher: false, enableNotifications: false, enableNotificationsCount: false, productName: productName || platformName || "", user: user })));
+            React__default.default.createElement(Header.default, { baseEnvUrl: baseEnvUrl ?? "", baseServicesUrl: "", carbonTheme: carbonTheme, enableAppSwitcher: false, enableNotifications: false, enableNotificationsCount: false, enableTeamSwitcher: enableTeamSwitcher, productName: productName || platformName || "", user: user })));
     }
     const { features, navigation, platform, platformMessage } = config;
     const names = getProductAndPlatformNames({ productName, platformName, platform });
@@ -71,7 +71,7 @@ function UIShell({ analyticsHelpers, baseEnvUrl, carbonTheme = "g10", config, cr
      */
     const isPrivacyStatementDisabled = renderPrivacyStatement === false || features?.["consent.enabled"] === false;
     return (React__default.default.createElement(reactQuery.QueryClientProvider, { client: servicesConfig.queryClient },
-        React__default.default.createElement(Header.default, { analyticsHelpers: analyticsHelpers, baseEnvUrl: platform.baseEnvUrl, baseServicesUrl: platform.baseServicesUrl, carbonTheme: carbonTheme, createJoinTeamTrigger: createJoinTeamTrigger, enableAppSwitcher: isAppSwitcherEnabled, instanceSwitcherEnabled: instanceSwitcherEnabled, enableNotifications: isNotificationsEnabled, enableNotificationsCount: isNotificationsCountEnabled, leftPanel: leftPanel, navLinks: navigation, platform: platform, platformMessage: platformMessage, prefixName: names.platformName, productName: names.productName, rightPanel: rightPanel, requestSummary: user?.requestSummary, skipToContentProps: skipToContentProps, templateMeteringEvent: templateMeteringEvent, triggerEvent: triggerEvent, profileMenuItems: [
+        React__default.default.createElement(Header.default, { analyticsHelpers: analyticsHelpers, baseEnvUrl: platform.baseEnvUrl, baseServicesUrl: platform.baseServicesUrl, carbonTheme: carbonTheme, createJoinTeamTrigger: createJoinTeamTrigger, enableAppSwitcher: isAppSwitcherEnabled, instanceSwitcherEnabled: instanceSwitcherEnabled, enableNotifications: isNotificationsEnabled, enableNotificationsCount: isNotificationsCountEnabled, enableTeamSwitcher: enableTeamSwitcher, leftPanel: leftPanel, navLinks: navigation, platform: platform, platformMessage: platformMessage, prefixName: names.platformName, productName: names.productName, rightPanel: rightPanel, requestSummary: user?.requestSummary, skipToContentProps: skipToContentProps, templateMeteringEvent: templateMeteringEvent, triggerEvent: triggerEvent, profileMenuItems: [
                 isUserEnabled && (React__default.default.createElement(ProfileSettings.ProfileSettingsMenuItem, { key: "profile-settings", baseServicesUrl: platform.baseServicesUrl, src: `${platform.baseServicesUrl}/users/image/${user?.email}`, userName: user?.displayName ?? user?.name, refetchUser: refetchUser, refetchUserTeams: refetchUserTeams, refetchNavigation: refetchNavigation })),
                 isSendMailEnabled && (React__default.default.createElement(HeaderMenuItem.default, { key: "email-preferences", href: `${platform.baseEnvUrl}/launchpad/email-preferences`, icon: React__default.default.createElement(icons.Email, null), kind: "internal", text: "Email Preferences", type: "link" })),
                 !isPrivacyStatementDisabled && (React__default.default.createElement(PrivacyStatement.PrivacyStatementMenuItem, { key: "privacy-statement", baseServicesUrl: platform.baseServicesUrl, platformEmail: platform?.platformEmail })),

package/dist/cjs/constants/TeamTypes.js ADDED Viewed

@@ -0,0 +1,15 @@
+'use strict';
+/*
+IBM Confidential
+694970X, 69497O0
+© Copyright IBM Corp. 2022, 2024
+*/
+const TEAM_TYPES = {
+    ACCOUNT: "account",
+    PERSONAL: "personal",
+    PROJECT: "project",
+    STANDARD: "standard",
+};
+exports.TEAM_TYPES = TEAM_TYPES;

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

@@ -2,7 +2,7 @@ import React from 'react';
 import cx from 'classnames';
 import { SideNavLink, SideNav, SideNavItems, SideNavDivider, Tag } from '@carbon/react';
 import TooltipHover from '../TooltipHover/TooltipHover.js';
-import { ChatBot, Home, UserMultiple, AddAlt, Api, IntentRequestCreate, Folders, DocumentMultiple_02, Catalog, LicenseThirdParty } from '@carbon/react/icons';
+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';
 import { prefix } from '../../internal/settings.js';
@@ -38,10 +38,8 @@ function AdvantageSideNav(props) {
     const agentAssistantLibraryLink = sideNavUrls?.find((sideNavUrl) => sideNavUrl.key === SideNavUrlKeys.AgentLibrary)?.url;
     const documentCollectionsLink = sideNavUrls?.find((sideNavUrl) => sideNavUrl.key === SideNavUrlKeys.DocumentCollections)?.url;
     const catalogNavlink = sideNavUrls?.find((sideNavUrl) => sideNavUrl.key === SideNavUrlKeys.Catalog)?.url;
-    sideNavUrls?.find((sideNavUrl) => sideNavUrl.key === SideNavUrlKeys.Settings)?.url;
+    const settingsLink = sideNavUrls?.find((sideNavUrl) => sideNavUrl.key === SideNavUrlKeys.Settings)?.url;
     const adminNavlink = sideNavUrls?.find((sideNavUrl) => sideNavUrl.key === SideNavUrlKeys.Admin)?.url;
-    const isAgentStudioEnabled = true;
-    const isDocumentCollectionsEnabled = true;
     // get current selected team
     let teamSwitcherTeam = null;
     if (Array.isArray(personalTeams) && personalTeams.length > 0) {
@@ -113,6 +111,14 @@ function AdvantageSideNav(props) {
                 destinationPath: documentCollectionsLink,
             });
     };
+    const handleSettingsClick = () => {
+        triggerEvent &&
+            triggerEvent({
+                action: "Clicked on SideNav Settings link",
+                category: "Sidenav",
+                destinationPath: settingsLink,
+            });
+    };
     const handleChatClick = () => {
         let redirectLink = chatLink
             ? chatLink
@@ -203,22 +209,29 @@ function AdvantageSideNav(props) {
                 React.createElement("div", { className: `${prefix}--bmrg-advantage-sidenav-item-tag` },
                     "Tools",
                     React.createElement(Tag, { size: "sm", title: "BETA", type: "high-contrast" }, "BETA")))) : null,
-            agentAssistantStudioLink ? (React.createElement(SideNavLink, { "data-testid": "sidenav-agent-assistant-studio-link", isActive: (agentStudioPath && windowLocation.href.includes(`/launchpad${agentStudioPath}`)) ||
-                    (agenticAppsPath && windowLocation.href.includes(`/launchpad${agenticAppsPath}`)), disabled: Boolean(isAgentStudioEnabled), className: `${prefix}--bmrg-advantage-sidenav__inactive-link` , renderIcon: IntentRequestCreate, href: agentAssistantStudioLink, onClick: (e) => {
+            agentAssistantStudioLink ? (React.createElement(SideNavLink, { "data-testid": "sidenav-agent-assistant-studio-link",
+                // isActive={
+                //   (agentStudioPath && windowLocation.href.includes(`/launchpad${agentStudioPath}`)) ||
+                //   (agenticAppsPath && windowLocation.href.includes(`/launchpad${agenticAppsPath}`))
+                // }
+                className: !enableChatButton ? `${prefix}--bmrg-advantage-sidenav__inactive-link` : "", disabled: Boolean(!enableChatButton), renderIcon: IntentRequestCreate, href: agentAssistantStudioLink, onClick: (e) => {
                     if (isLaunchpad) {
                         handleLaunchpadLink(e);
                         history.push(agentStudioPath);
                     }
                     handleAgentAssistantStudioClick();
                 } }, "Agent & Assistant Studio")) : null,
-            agentAssistantLibraryLink ? (React.createElement(SideNavLink, { "data-testid": "sidenav-agent-assistant-library-link", renderIcon: Folders, href: agentAssistantLibraryLink, disabled: Boolean(isAgentStudioEnabled), className: Boolean(isAgentStudioEnabled) ? `${prefix}--bmrg-advantage-sidenav__inactive-link` : "", onClick: (e) => {
+            agentAssistantLibraryLink ? (React.createElement(SideNavLink, { "data-testid": "sidenav-agent-assistant-library-link", renderIcon: Folders, href: agentAssistantLibraryLink, className: !enableChatButton ? `${prefix}--bmrg-advantage-sidenav__inactive-link` : "", disabled: Boolean(!enableChatButton), onClick: (e) => {
                     handleAgentAssistantLibraryClick();
                 } }, "Agent & Assistant Library")) : null,
-            documentCollectionsLink ? (React.createElement(SideNavLink, { "data-testid": "sidenav-document-collections-link", renderIcon: DocumentMultiple_02, href: documentCollectionsLink, disabled: Boolean(isDocumentCollectionsEnabled), className: `${prefix}--bmrg-advantage-sidenav__inactive-link` , onClick: (e) => {
+            documentCollectionsLink ? (React.createElement(SideNavLink, { "data-testid": "sidenav-document-collections-link", renderIcon: DocumentMultiple_02, href: documentCollectionsLink, className: !enableChatButton ? `${prefix}--bmrg-advantage-sidenav__inactive-link` : "", disabled: Boolean(!enableChatButton), onClick: (e) => {
                     handleDocumentCollectionsClick();
                 } }, "Document Collections")) : null,
             showSecondDivider ? React.createElement(SideNavDivider, null) : null,
             catalogNavlink ? (React.createElement(SideNavLink, { "data-testid": "sidenav-catalog-link", isActive: windowLocation.href.includes(`${baseEnvUrl}/catalog`), href: catalogNavlink, renderIcon: Catalog }, "Catalog")) : null,
+            settingsLink ? (React.createElement(SideNavLink, { "data-testid": "sidenav-settings-link", renderIcon: Settings, href: settingsLink, onClick: (e) => {
+                    handleSettingsClick();
+                } }, "Settings")) : null,
             adminNavlink ? (React.createElement(SideNavLink, { "data-testid": "sidenav-admin-link", href: adminNavlink, renderIcon: LicenseThirdParty }, "Admin")) : null),
         children ? (React.createElement(React.Fragment, null,
             React.createElement(SideNavDivider, null),

package/dist/esm/components/Header/Header.js CHANGED Viewed

@@ -54,7 +54,7 @@ const MenuAriaLabelRecord = {
 const headerButtonClassNames = "cds--btn--icon-only cds--header__action cds--btn cds--btn--primary cds--btn--icon-only cds--btn cds--btn--primary";
 const instanceCheckMarkContainerClass = "instance-checkmark-style-container";
 function Header(props) {
-    const { analyticsHelpers, productName, baseEnvUrl, baseServicesUrl, carbonTheme = "g10", className, createJoinTeamTrigger, history, isLaunchpad = false, isLoadingTeamSwitcher, isSuccessTeamSwitcher, setIsSuccessTeamSwitcher, navLinks, platform, prefixName = "", refetchUser, refetchNavigation, rightPanel, skipToContentProps, templateMeteringEvent, trackEvent, triggerEvent, user, userTeams, userTeamsAssets, } = props;
+    const { analyticsHelpers, productName, baseEnvUrl, baseServicesUrl, carbonTheme = "g10", className, createJoinTeamTrigger, enableTeamSwitcher = true, history, isLaunchpad = false, isLoadingTeamSwitcher, isSuccessTeamSwitcher, setIsSuccessTeamSwitcher, navLinks, platform, prefixName = "", refetchUser, refetchNavigation, rightPanel, skipToContentProps, templateMeteringEvent, trackEvent, triggerEvent, user, userTeams, userTeamsAssets, } = props;
     const hasUserTeams = Boolean(userTeams);
     const userTeamsUrl = serviceUrl.getUserTeamsServices({ baseServicesUrl });
     const teamsQuery = useQuery({
@@ -62,6 +62,7 @@ function Header(props) {
         queryFn: resolver.query(userTeamsUrl, null),
         enabled: !hasUserTeams && Boolean(baseServicesUrl),
     });
+    const showTeamSwitcher = enableTeamSwitcher && Boolean(user);
     return (React.createElement(React.Fragment, null,
         React.createElement(Theme, { theme: carbonTheme },
             React.createElement(Header$1, { "aria-label": "App navigation header", className: className },
@@ -72,7 +73,7 @@ function Header(props) {
                     ? navLinks.map((link) => (React.createElement(HeaderMenuItem, { "aria-label": `Link for ${link.name}`, "data-testid": "header-menu-link", href: link.url, isCurrentPage: window?.location?.href && link.url ? window.location.href.startsWith(link.url) : false, key: link.name, target: link.isExternal ? "_blank" : undefined, rel: link.isExternal ? "noopener noreferrer" : undefined }, link.name)))
                     : null),
                 React.createElement(HeaderGlobalBar, null,
-                    React.createElement(HeaderTeamSwitcher, { analyticsHelpers: analyticsHelpers, baseServicesUrl: baseServicesUrl, createJoinTeamTrigger: createJoinTeamTrigger, history: history, isLaunchpad: isLaunchpad, isLoadingTeamSwitcher: isLoadingTeamSwitcher, isSuccessTeamSwitcher: isSuccessTeamSwitcher, setIsSuccessTeamSwitcher: setIsSuccessTeamSwitcher, menuAriaLabelRecord: MenuAriaLabelRecord.TeamSwitcher, menuButtonId: MenuButtonId.TeamSwitcher, menuListId: MenuListId.TeamSwitcher, navigationPlatform: platform, refetchUser: refetchUser, refetchNavigation: refetchNavigation, teamsQuery: teamsQuery, trackEvent: trackEvent, user: user, userTeams: userTeams }),
+                    showTeamSwitcher ? (React.createElement(HeaderTeamSwitcher, { analyticsHelpers: analyticsHelpers, baseServicesUrl: baseServicesUrl, createJoinTeamTrigger: createJoinTeamTrigger, history: history, isLaunchpad: isLaunchpad, isLoadingTeamSwitcher: isLoadingTeamSwitcher, isSuccessTeamSwitcher: isSuccessTeamSwitcher, setIsSuccessTeamSwitcher: setIsSuccessTeamSwitcher, menuAriaLabelRecord: MenuAriaLabelRecord.TeamSwitcher, menuButtonId: MenuButtonId.TeamSwitcher, menuListId: MenuListId.TeamSwitcher, navigationPlatform: platform, refetchUser: refetchUser, refetchNavigation: refetchNavigation, teamsQuery: teamsQuery, trackEvent: trackEvent, user: user, userTeams: userTeams })) : null,
                     props?.instanceSwitcherEnabled && (React.createElement(InstanceSwitcherMenu, { enabled: Boolean(props.instanceSwitcherEnabled), menuItems: platform?.instances })),
                     React.createElement(RequestsMenu, { baseEnvUrl: baseEnvUrl, enabled: Boolean(props.requestSummary), summary: props.requestSummary }),
                     React.createElement(NotificationsMenu, { baseEnvUrl: baseEnvUrl, baseServicesUrl: baseServicesUrl, enabled: Boolean(props.enableNotifications), countEnabled: Boolean(props.enableNotificationsCount) }),

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

@@ -7,6 +7,7 @@ import HeaderMenu$1 from './HeaderMenu.js';
 import { resolver } from '../../config/servicesConfig.js';
 import { prefix } from '../../internal/settings.js';
 import { USER_PLATFORM_ROLE } from '../../constants/UserType.js';
+import { TEAM_TYPES } from '../../constants/TeamTypes.js';
 /*
 IBM Confidential
@@ -217,33 +218,58 @@ function HeaderTeamSwitcher({ analyticsHelpers, baseServicesUrl, createJoinTeamT
             standardTeams = teamsQuery?.data?.standardTeams ?? [];
             personalTeam = teamsQuery?.data?.personalTeam ?? [];
         }
-        let sortedAccountTeamsWithNamesToDisplay = [];
-        let sortedStandardTeamsWithNamesToDisplay = [];
+        let newPersonalTeam = personalTeam.length > 0
+            ? personalTeam.map((personalTeam) => ({
+                ...personalTeam,
+                type: TEAM_TYPES.PERSONAL,
+                nameToDisplay: personalTeam.displayName ? personalTeam.displayName : personalTeam.name,
+            }))
+            : [];
+        let newAccountTeams = [];
+        let newStandardTeams = [];
         if (accountTeams?.length > 0) {
-            const newAccountTeams = accountTeams.map((team) => {
+            newAccountTeams = accountTeams.map((team) => {
                 let newProjectTeams = [];
                 if (team.projectTeams && team.projectTeams.length > 0) {
-                    newProjectTeams = team.projectTeams?.map((team) => ({
-                        ...team,
-                        nameToDisplay: team.displayName ? team.displayName : team.name,
-                    }));
+                    newProjectTeams = team.projectTeams?.map((projectTeam) => {
+                        return {
+                            ...projectTeam,
+                            nameToDisplay: projectTeam.displayName ? projectTeam.displayName : projectTeam.name,
+                        };
+                    });
                 }
                 return {
                     ...team,
                     nameToDisplay: team.displayName ? team.displayName : team.name,
+                    type: TEAM_TYPES.ACCOUNT,
                     projectTeams: sortBy(newProjectTeams, ["nameToDisplay"]),
                 };
             });
-            sortedAccountTeamsWithNamesToDisplay = sortBy(newAccountTeams, ["nameToDisplay"]);
         }
         if (standardTeams?.length > 0) {
-            const newStandardTeams = standardTeams.map((team) => {
+            newStandardTeams = standardTeams.map((team) => {
                 return {
                     ...team,
+                    type: TEAM_TYPES.STANDARD,
                     nameToDisplay: team.displayName ? team.displayName : team.name,
                 };
             });
-            sortedStandardTeamsWithNamesToDisplay = sortBy(newStandardTeams, ["nameToDisplay"]);
+        }
+        let allTeams = newPersonalTeam.concat(newAccountTeams, newStandardTeams);
+        const order = { [TEAM_TYPES.PERSONAL]: 1, [TEAM_TYPES.ACCOUNT]: 2, [TEAM_TYPES.STANDARD]: 3 };
+        allTeams = sortBy(allTeams, [(team) => order[team.type], "nameToDisplay"]);
+        if (selectedTeam) {
+            const selectedTeamIndex = allTeams.findIndex((team, index) => {
+                if (team.id === selectedTeam.id) {
+                    return true;
+                }
+                else if (Array.isArray(team.projectTeams) && team.projectTeams?.length > 0) {
+                    return team.projectTeams.some((projectTeam) => projectTeam.id === selectedTeam.id);
+                }
+                return false;
+            });
+            const [removedTeam] = allTeams.splice(selectedTeamIndex, 1);
+            allTeams.unshift(removedTeam);
         }
         let selectedTeamName = selectedTeam?.displayName
             ? selectedTeam.displayName
@@ -265,29 +291,22 @@ function HeaderTeamSwitcher({ analyticsHelpers, baseServicesUrl, createJoinTeamT
                         React.createElement("div", { className: headerTeamSwitcherCreateTeamButtonClassname },
                             React.createElement("span", { className: headerTeamSwitcherCreateTeamButtonTextClassname }, createTeamButtonText),
                             React.createElement(AddAlt, { className: headerTeamSwitcherCreateTeamButtonIconClassname })))),
-                    personalTeam.length > 0
-                        ? personalTeam.map((team) => {
-                            const teamName = team.displayName ? team.displayName : team.name;
-                            const isTeamSelected = team.id === selectedTeam?.id;
-                            return (React.createElement("div", { key: team.id, id: `${team.id}-personal-menu-item-id` },
-                                React.createElement(HeaderMenuItem, { key: team.id, id: `${team.id}-personal-menu-item`, "aria-selected": isTeamSelected, className: headerDropdownMenuItemContainerClassname, onClick: () => {
-                                        handleTeamClick({ team, type: "personal" });
-                                    },
-                                    // eslint-disable-next-line no-script-url
-                                    href: "javascript:void(0)", "data-testid": "header-team-switcher-menu-item" },
-                                    React.createElement("div", { className: headerDropdownMenuItemClassname },
-                                        React.createElement("span", { title: teamName, className: headerDropdownMenuItemTextClassname }, teamName),
-                                        isTeamSelected ? React.createElement(CheckmarkFilled, { className: headerDropdownMenuItemIconClassname }) : null))));
-                        })
-                        : null,
-                    accountTeams.length > 0
-                        ? sortedAccountTeamsWithNamesToDisplay.map((team) => {
+                    allTeams.map((team) => {
+                        const isTeamSelected = team.id === selectedTeam?.id;
+                        if (team.type === TEAM_TYPES.ACCOUNT) {
                             const isSubmenuOpen = team.id === openAccountSubmenuId;
-                            const isProjectTeamSelected = team.projectTeams &&
-                                team.projectTeams.length > 0 &&
-                                team.projectTeams.some((team) => team.id === selectedTeam?.id);
-                            const isTeamSelected = team.id === selectedTeam?.id;
+                            const projectTeams = team.projectTeams;
+                            const existProjectTeams = Array.isArray(projectTeams) && projectTeams.length > 0;
+                            let selectedProjectTeamIndex = -1;
+                            if (existProjectTeams) {
+                                selectedProjectTeamIndex = projectTeams.findIndex((team) => team.id === selectedTeam?.id);
+                            }
+                            const isProjectTeamSelected = selectedProjectTeamIndex >= 0;
                             const isMenuSelected = isTeamSelected || isProjectTeamSelected;
+                            if (existProjectTeams && isProjectTeamSelected) {
+                                const [removedTeam] = projectTeams.splice(selectedProjectTeamIndex, 1);
+                                projectTeams.unshift(removedTeam);
+                            }
                             return (React.createElement("div", { key: team.id, id: `${team.id}-account-menu` },
                                 React.createElement(HeaderMenuItem, { "aria-expanded": isSubmenuOpen, "aria-selected": isMenuSelected, className: headerDropdownMenuItemAccountContainerClassname, onClick: (e) => handleOpenAccountSubmenu({ e, id: team.id }),
                                     // eslint-disable-next-line no-script-url
@@ -295,7 +314,7 @@ function HeaderTeamSwitcher({ analyticsHelpers, baseServicesUrl, createJoinTeamT
                                     React.createElement("div", { className: headerDropdownMenuItemAccountClassname },
                                         React.createElement("div", { className: headerDropdownMenuItemTextIconClassname },
                                             React.createElement("span", { title: team.nameToDisplay, className: headerDropdownMenuItemTextClassname }, team.nameToDisplay),
-                                            isMenuSelected ? (React.createElement(CheckmarkFilled, { className: headerDropdownMenuItemIconClassname })) : null),
+                                            isMenuSelected ? React.createElement(CheckmarkFilled, { className: headerDropdownMenuItemIconClassname }) : null),
                                         React.createElement("div", { className: headerDropdownMenuItemAccountIconsClassname },
                                             React.createElement(GroupAccount, { className: headerDropdownMenuItemAccountGroupIconClassname }),
                                             React.createElement(ChevronDown, { className: headerDropdownMenuItemAccountChevronIconClassname })))),
@@ -307,9 +326,9 @@ function HeaderTeamSwitcher({ analyticsHelpers, baseServicesUrl, createJoinTeamT
                                         href: "javascript:void(0)" },
                                         React.createElement("div", { className: headerDropdownMenuItemClassname, style: { paddingLeft: "1rem" } },
                                             React.createElement("span", { title: team.nameToDisplay, className: headerDropdownMenuItemTextClassname }, "Account Page"),
-                                            isTeamSelected ? (React.createElement(CheckmarkFilled, { className: headerDropdownMenuItemIconClassname })) : null)),
-                                    team.projectTeams && team.projectTeams.length > 0
-                                        ? team.projectTeams.map((team) => {
+                                            isTeamSelected ? React.createElement(CheckmarkFilled, { className: headerDropdownMenuItemIconClassname }) : null)),
+                                    projectTeams && projectTeams.length > 0
+                                        ? projectTeams.map((team) => {
                                             const isTeamSelected = team.id === selectedTeam?.id;
                                             return (React.createElement("div", { key: team.id, id: `${team.id}-project-menu-item` },
                                                 React.createElement(HeaderMenuItem, { "aria-selected": isTeamSelected, className: headerDropdownMenuItemContainerClassname, onClick: () => {
@@ -322,22 +341,19 @@ function HeaderTeamSwitcher({ analyticsHelpers, baseServicesUrl, createJoinTeamT
                                                         isTeamSelected ? (React.createElement(CheckmarkFilled, { className: headerDropdownMenuItemIconClassname })) : null))));
                                         })
                                         : null)));
-                        })
-                        : null,
-                    standardTeams.length > 0
-                        ? sortedStandardTeamsWithNamesToDisplay.map((team) => {
-                            const isTeamSelected = team.id === selectedTeam?.id;
-                            return (React.createElement("div", { key: team.id, id: `${team.id}-standard-menu-item` },
+                        }
+                        else {
+                            return (React.createElement("div", { key: team.id, id: `${team.id}-${team.type}-menu-item` },
                                 React.createElement(HeaderMenuItem, { "aria-selected": isTeamSelected, className: headerDropdownMenuItemContainerClassname, onClick: () => {
-                                        handleTeamClick({ team, type: "standard" });
+                                        handleTeamClick({ team, type: team.type ?? "" });
                                     }, "data-testid": "header-team-switcher-menu-item",
                                     // eslint-disable-next-line no-script-url
                                     href: "javascript:void(0)" },
                                     React.createElement("div", { className: headerDropdownMenuItemClassname },
                                         React.createElement("span", { title: team.nameToDisplay, className: headerDropdownMenuItemTextClassname }, team.nameToDisplay),
                                         isTeamSelected ? React.createElement(CheckmarkFilled, { className: headerDropdownMenuItemIconClassname }) : null))));
-                        })
-                        : null))));
+                        }
+                    })))));
     }
     return null;
 }

package/dist/esm/components/ProfileSettings/ProfileSettings.js CHANGED Viewed

@@ -113,9 +113,9 @@ function ProfileSettings({ baseServicesUrl, refetchUser, refetchUserTeams, refet
     return (React.createElement(ComposedModal, { "aria-label": "Profile Settings", className: `${prefix}--bmrg-profile-settings-container ${prefix}--bmrg-header-modal`, open: isOpen, onClose: handleClose, preventCloseOnClickOutside: true },
         React.createElement(ModalHeader, { closeModal: handleClose, title: `User profile - ${userName}` }),
         React.createElement(ModalBody, { style: { maxHeight: "31.5rem" } },
-            React.createElement("p", { className: `${prefix}--bmrg-profile-settings__title` }, "More user profile settings will be here eventually, but for now you can choose which Teams are shown in your sidebar in Launchpad."),
-            React.createElement("h2", { className: `${prefix}--bmrg-profile-settings__subtitle` }, "Teams visible in Launchpad sidebar"),
-            React.createElement("p", { className: `${prefix}--bmrg-profile-settings__description` }, "Choose Teams to show or hide in your Launchpad sidebar and Catalog (useful for sensitive demos). You will not be able to access or view unchecked Teams from the sidebar, and cannot add items to them from Catalog."),
+            React.createElement("p", { className: `${prefix}--bmrg-profile-settings__title` }, "More user profile settings will be here eventually, but for now you can choose which Teams are shown in your team switcher in Launchpad."),
+            React.createElement("h2", { className: `${prefix}--bmrg-profile-settings__subtitle` }, "Teams visible in Launchpad team switcher"),
+            React.createElement("p", { className: `${prefix}--bmrg-profile-settings__description` }, "Choose Teams to show or hide in your Launchpad team switcher and Catalog (useful for sensitive demos). You will not be able to access or view unchecked Teams from the team switcher, and cannot add items to them from Catalog."),
             userIsLoading ? (React.createElement(StructuredListSkeleton, null)) : userError ? (React.createElement(Error, { style: { color: "#F2F4F8", padding: "1rem" } })) : teams?.length > 0 ? (React.createElement(StructuredListWrapper, { className: `${prefix}--bmrg-profile-settings-list` },
                 React.createElement(StructuredListHead, null,
                     React.createElement(StructuredListRow, { head: true },

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

@@ -18,11 +18,11 @@ IBM Confidential
 694970X, 69497O0
 © Copyright IBM Corp. 2022, 2024
 */
-function UIShell({ analyticsHelpers, baseEnvUrl, carbonTheme = "g10", config, createJoinTeamTrigger, history, isLaunchpad = false, isLoadingTeamSwitcher, isSuccessTeamSwitcher, setIsSuccessTeamSwitcher, leftPanel, platformName, productName, profileMenuItems = [], supportMenuItems = [], renderPrivacyRedirect = true, renderPrivacyStatement = true, rightPanel, handleShowTutorial, refetchUser, refetchUserTeams, refetchNavigation, skipToContentProps, templateMeteringEvent, trackEvent, triggerEvent, tutorialScreenToShow, user, userTeams, userTeamsAssets, enableIcaMacs, }) {
+function UIShell({ analyticsHelpers, baseEnvUrl, carbonTheme = "g10", config, createJoinTeamTrigger, enableTeamSwitcher = true, history, isLaunchpad = false, isLoadingTeamSwitcher, isSuccessTeamSwitcher, setIsSuccessTeamSwitcher, leftPanel, platformName, productName, profileMenuItems = [], supportMenuItems = [], renderPrivacyRedirect = true, renderPrivacyStatement = true, rightPanel, handleShowTutorial, refetchUser, refetchUserTeams, refetchNavigation, skipToContentProps, templateMeteringEvent, trackEvent, triggerEvent, tutorialScreenToShow, user, userTeams, userTeamsAssets, enableIcaMacs, }) {
     // Support base header .e.g for an error state
     if (!config) {
         return (React.createElement(QueryClientProvider, { client: queryClient },
-            React.createElement(Header, { baseEnvUrl: baseEnvUrl ?? "", baseServicesUrl: "", carbonTheme: carbonTheme, enableAppSwitcher: false, enableNotifications: false, enableNotificationsCount: false, productName: productName || platformName || "", user: user })));
+            React.createElement(Header, { baseEnvUrl: baseEnvUrl ?? "", baseServicesUrl: "", carbonTheme: carbonTheme, enableAppSwitcher: false, enableNotifications: false, enableNotificationsCount: false, enableTeamSwitcher: enableTeamSwitcher, productName: productName || platformName || "", user: user })));
     }
     const { features, navigation, platform, platformMessage } = config;
     const names = getProductAndPlatformNames({ productName, platformName, platform });
@@ -63,7 +63,7 @@ function UIShell({ analyticsHelpers, baseEnvUrl, carbonTheme = "g10", config, cr
      */
     const isPrivacyStatementDisabled = renderPrivacyStatement === false || features?.["consent.enabled"] === false;
     return (React.createElement(QueryClientProvider, { client: queryClient },
-        React.createElement(Header, { analyticsHelpers: analyticsHelpers, baseEnvUrl: platform.baseEnvUrl, baseServicesUrl: platform.baseServicesUrl, carbonTheme: carbonTheme, createJoinTeamTrigger: createJoinTeamTrigger, enableAppSwitcher: isAppSwitcherEnabled, instanceSwitcherEnabled: instanceSwitcherEnabled, enableNotifications: isNotificationsEnabled, enableNotificationsCount: isNotificationsCountEnabled, leftPanel: leftPanel, navLinks: navigation, platform: platform, platformMessage: platformMessage, prefixName: names.platformName, productName: names.productName, rightPanel: rightPanel, requestSummary: user?.requestSummary, skipToContentProps: skipToContentProps, templateMeteringEvent: templateMeteringEvent, triggerEvent: triggerEvent, profileMenuItems: [
+        React.createElement(Header, { analyticsHelpers: analyticsHelpers, baseEnvUrl: platform.baseEnvUrl, baseServicesUrl: platform.baseServicesUrl, carbonTheme: carbonTheme, createJoinTeamTrigger: createJoinTeamTrigger, enableAppSwitcher: isAppSwitcherEnabled, instanceSwitcherEnabled: instanceSwitcherEnabled, enableNotifications: isNotificationsEnabled, enableNotificationsCount: isNotificationsCountEnabled, enableTeamSwitcher: enableTeamSwitcher, leftPanel: leftPanel, navLinks: navigation, platform: platform, platformMessage: platformMessage, prefixName: names.platformName, productName: names.productName, rightPanel: rightPanel, requestSummary: user?.requestSummary, skipToContentProps: skipToContentProps, templateMeteringEvent: templateMeteringEvent, triggerEvent: triggerEvent, profileMenuItems: [
                 isUserEnabled && (React.createElement(ProfileSettingsMenuItem, { key: "profile-settings", baseServicesUrl: platform.baseServicesUrl, src: `${platform.baseServicesUrl}/users/image/${user?.email}`, userName: user?.displayName ?? user?.name, refetchUser: refetchUser, refetchUserTeams: refetchUserTeams, refetchNavigation: refetchNavigation })),
                 isSendMailEnabled && (React.createElement(HeaderMenuItem, { key: "email-preferences", href: `${platform.baseEnvUrl}/launchpad/email-preferences`, icon: React.createElement(Email, null), kind: "internal", text: "Email Preferences", type: "link" })),
                 !isPrivacyStatementDisabled && (React.createElement(PrivacyStatementMenuItem, { key: "privacy-statement", baseServicesUrl: platform.baseServicesUrl, platformEmail: platform?.platformEmail })),

package/dist/esm/constants/TeamTypes.js ADDED Viewed

@@ -0,0 +1,13 @@
+/*
+IBM Confidential
+694970X, 69497O0
+© Copyright IBM Corp. 2022, 2024
+*/
+const TEAM_TYPES = {
+    ACCOUNT: "account",
+    PERSONAL: "personal",
+    PROJECT: "project",
+    STANDARD: "standard",
+};
+export { TEAM_TYPES };

package/dist/types/index.d.ts CHANGED Viewed

@@ -367,6 +367,7 @@ type Props$G = {
     className?: string;
     createJoinTeamTrigger?: Function;
     enableAppSwitcher?: boolean;
+    enableTeamSwitcher?: boolean;
     instanceSwitcherEnabled?: boolean;
     enableNotifications?: boolean;
     enableNotificationsCount?: boolean;
@@ -1437,6 +1438,7 @@ type Props = {
         };
         platformMessage?: any;
     };
+    enableTeamSwitcher?: boolean;
     history?: any;
     isLaunchpad?: boolean;
     isLoadingTeamSwitcher?: boolean;
@@ -1457,8 +1459,8 @@ type Props = {
         component: React.ReactNode;
     };
     refetchUser?: Function;
-    refetchNavigation?: Function;
     refetchUserTeams?: Function;
+    refetchNavigation?: Function;
     skipToContentProps?: {
         href?: string;
         children?: string;
@@ -1483,6 +1485,6 @@ type Props = {
     handleShowTutorial?: Function;
     tutorialScreenToShow?: string;
 };
-declare function UIShell({ analyticsHelpers, baseEnvUrl, carbonTheme, config, createJoinTeamTrigger, history, isLaunchpad, isLoadingTeamSwitcher, isSuccessTeamSwitcher, setIsSuccessTeamSwitcher, leftPanel, platformName, productName, profileMenuItems, supportMenuItems, renderPrivacyRedirect, renderPrivacyStatement, rightPanel, handleShowTutorial, refetchUser, refetchUserTeams, refetchNavigation, skipToContentProps, templateMeteringEvent, trackEvent, triggerEvent, tutorialScreenToShow, user, userTeams, userTeamsAssets, enableIcaMacs, }: Props): React.JSX.Element;
+declare function UIShell({ analyticsHelpers, baseEnvUrl, carbonTheme, config, createJoinTeamTrigger, enableTeamSwitcher, history, isLaunchpad, isLoadingTeamSwitcher, isSuccessTeamSwitcher, setIsSuccessTeamSwitcher, leftPanel, platformName, productName, profileMenuItems, supportMenuItems, renderPrivacyRedirect, renderPrivacyStatement, rightPanel, handleShowTutorial, refetchUser, refetchUserTeams, refetchNavigation, skipToContentProps, templateMeteringEvent, trackEvent, triggerEvent, tutorialScreenToShow, user, userTeams, userTeamsAssets, enableIcaMacs, }: Props): React.JSX.Element;
 export { AdvantageSideNav, AutoSuggestBmrg as AutoSuggest, Avatar, CheckboxListComponent as CheckboxList, ComboBoxComponent as ComboBox, ComboBoxMultiSelect, ComposedModal, ConfirmModal, CreatableComponent as Creatable, DataDrivenInput, DateInputComponent as DateInput, DecisionButtons, DelayedRender, DynamicFormik, DynamicInput, Error, Error403, Error404, ErrorBoundary, ErrorDragon, ErrorFullPage, Error as ErrorMessage, ErrorPage, ErrorPageCore, FeatureHeader, FeatureHeaderSubtitle, FeatureHeaderTitle, FeatureNavTab, FeatureNavTabs, FeatureSideNav, FeatureSideNavFooter, FeatureSideNavHeader, FeatureSideNavLink, FeatureSideNavLinks, FlowModalContainer as FlowModal, FlowModalForm, FormInput, Header, _default as HeaderMenuItem, ImageModal, InputGovernor, Loading, MemberBar, Modal, ModalConfirmEdit, FlowModalContainer as ModalFlow, FlowModalForm as ModalFlowForm, ModalForm, ModalFunctionChildrenProps, ModalTrigger, NotificationsContainer, PlatformBanner, PlatformNotificationsContainer, Portal, PrivacyStatement, ProtectedRoute, RadioGroupComponent as RadioGroup, RichTextAreaComponent as RichTextArea, SimpleTeamService, Team, TextAreaComponent as TextArea, TextInputComponent as TextInput, ToastNotification, ToggleComponent as Toggle, TooltipHover, UIShell, User, UserTeams, notify };

package/package.json CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "name": "@boomerang-io/carbon-addons-boomerang-react",
   "description": "Carbon Addons for Boomerang apps",
-  "version": "4.6.21-beta.29",
+  "version": "4.6.21-beta.30",
   "author": {
     "name": "Tim Bula",
     "email": "timrbula@gmail.com"

package/scss/components/ProfileSettings/_profileSettings.scss CHANGED Viewed

@@ -4,7 +4,6 @@ IBM Confidential
 © Copyright IBM Corp. 2022, 2024
 */
 @use "../../global/config" as *;
 @use "../../global/utils";
 @use "../../global/themes/shell-tokens" as shell;