@boomerang-io/carbon-addons-boomerang-react 4.6.14-beta.0 → 4.6.14-beta.10

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

@@ -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

@@ -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 }; }
 
@@ -26,6 +27,9 @@ const headerDropdownMenuContainerClassname = `${settings.prefix}--header-dropdow
 const headerDropdownMenuLoadingClassname = `${settings.prefix}--header-dropdown-menu-loading`;
 const headerDropdownMenuSuccessClassname = `${settings.prefix}--header-dropdown-menu-success`;
 const headerDropdownMenuClassname = `${settings.prefix}--header-dropdown-menu`;
+const headerDropdownMenuContentClassname = `${settings.prefix}--header-dropdown-menu-content`;
+const headerDropdownMenuContentTextClassname = `${settings.prefix}--header-dropdown-menu-content-text`;
+const headerDropdownMenuContentIconClassname = `${settings.prefix}--header-dropdown-menu-content-icon`;
 const headerDropdownMenuListClassname = `${settings.prefix}--bmrg-header-drop-down`;
 const headerDropdownMenuItemContainerClassname = `${settings.prefix}--header-dropdown-menu-item-container`;
 const headerDropdownMenuItemClassname = `${settings.prefix}--header-dropdown-menu-item`;
@@ -94,6 +98,12 @@ function HeaderTeamSwitcher({ analyticsHelpers, baseServicesUrl, createJoinTeamT
                 await mutateUserProfile({ baseServicesUrl, body });
             }
         };
+        const handleNoTeamsToSelect = async () => {
+            const body = {
+                teamInstanceSwitcherDefault: null,
+            };
+            await mutateUserProfile({ baseServicesUrl, body });
+        };
         if (userHasTeams) {
             if (!userTeamInstanceSwitcherDefault) {
                 if (userHasPersonalTeam) {
@@ -125,6 +135,21 @@ function HeaderTeamSwitcher({ analyticsHelpers, baseServicesUrl, createJoinTeamT
                 const newSelectedTeam = allTeams.find((team) => team.id === userTeamInstanceSwitcherDefault);
                 handleSelectTeam({ team: newSelectedTeam });
             }
+            // if teams data loaded but there are no teams
+        }
+        else if (Boolean(userTeamInstanceSwitcherDefault) &&
+            ((hasUserTeams &&
+                userTeams?.data?.accountTeams?.length === 0 &&
+                userTeams?.data?.standardTeams?.length === 0 &&
+                userTeams?.data?.personalTeam?.length === 0) ||
+                (!hasUserTeams &&
+                    teamsQuery?.data?.accountTeams?.length === 0 &&
+                    teamsQuery?.data?.standardTeams?.length === 0 &&
+                    teamsQuery?.data?.personalTeam?.length === 0))) {
+            handleNoTeamsToSelect();
+        }
+        else if (userTeamInstanceSwitcherDefault === null) {
+            setSelectedTeam(null);
         }
     }, [
         baseServicesUrl,
@@ -202,44 +227,72 @@ 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 selectedTeamName = selectedTeam?.displayName ? selectedTeam.displayName : selectedTeam?.name;
-        if (selectedTeamName && selectedTeamName.length > 65) {
-            selectedTeamName = selectedTeamName.slice(0, 65) + "...";
+        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
+            : selectedTeam?.name
+                ? selectedTeam?.name
+                : "No team selected";
         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(react.HeaderMenu, { id: "header-team-switcher-menu", "aria-label": menuAriaLabelRecord, className: headerDropdownMenuClassname, renderMenuContent: () => (React__default.default.createElement("div", { className: headerDropdownMenuContentClassname },
+                    React__default.default.createElement("p", { title: selectedTeamName, className: headerDropdownMenuContentTextClassname }, selectedTeamName),
+                    React__default.default.createElement(icons.ChevronDown, { className: headerDropdownMenuContentIconClassname }))), onClick: handleHeaderMenuClick, "data-testid": "header-team-switcher-menu" },
                 React__default.default.createElement(HeaderMenu.default, { "aria-labelledby": menuButtonId, className: headerDropdownMenuListClassname, id: menuListId },
                     !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
@@ -247,28 +300,13 @@ 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 isMenuSelected = isTeamSelected || isProjectTeamSelected;
                             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 }), 
@@ -277,7 +315,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 })))),
@@ -289,7 +327,7 @@ 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)),
+                                            isTeamSelected ? React__default.default.createElement(icons.CheckmarkFilled, { className: headerDropdownMenuItemIconClassname }) : null)),
                                     team.projectTeams && team.projectTeams.length > 0
                                         ? team.projectTeams.map((team) => {
                                             const isTeamSelected = team.id === selectedTeam?.id;
@@ -304,22 +342,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

@@ -34,12 +34,13 @@ function determineIfConfigIsDifferent(teams, initialTeams) {
     }
     return isConfigDifferent;
 }
-function ProfileSettings({ baseServicesUrl, src, userName, isOpen, closeModal }) {
+function ProfileSettings({ baseServicesUrl, refetchUser, refetchUserTeams, refetchNavigation, src, userName, isOpen, closeModal, }) {
     const queryClient = reactQuery.useQueryClient();
     const [initialTeams, setInitialTeams] = React.useState([]);
     const [teams, setTeams] = React.useState([]);
     const userUrl = servicesConfig.serviceUrl.getLaunchpadUser({ baseServicesUrl });
     const profileUrl = servicesConfig.serviceUrl.resourceUserProfile({ baseServicesUrl });
+    const userTeamsUrl = servicesConfig.serviceUrl.getUserTeamsServices({ baseServicesUrl });
     const { data: user, isLoading: userIsLoading, error: userError, } = reactQuery.useQuery({
         queryKey: userUrl,
         queryFn: servicesConfig.resolver.query(userUrl),
@@ -48,6 +49,22 @@ function ProfileSettings({ baseServicesUrl, src, userName, isOpen, closeModal })
         onSuccess: () => {
             queryClient.invalidateQueries(userUrl);
             queryClient.invalidateQueries(profileUrl);
+            queryClient.invalidateQueries(userTeamsUrl);
+            if (refetchUser) {
+                setTimeout(() => {
+                    refetchUser();
+                }, 1000);
+            }
+            if (refetchUserTeams) {
+                setTimeout(() => {
+                    refetchUserTeams();
+                }, 1000);
+            }
+            if (refetchNavigation) {
+                setTimeout(() => {
+                    refetchNavigation();
+                }, 1000);
+            }
         },
     });
     // Only disable when we have a user and we know that there aren' any lower level groups to manage
@@ -63,6 +80,7 @@ function ProfileSettings({ baseServicesUrl, src, userName, isOpen, closeModal })
     }
     async function handleSubmit() {
         const body = {
+            teamInstanceSwitcherDefault: null,
             lowerLevelGroups: teams,
         };
         try {
@@ -104,9 +122,9 @@ function ProfileSettings({ baseServicesUrl, src, userName, isOpen, closeModal })
     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

@@ -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, 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,8 +71,8 @@ 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: [
-                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 })),
+        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 })),
                 ...profileMenuItems,

package/dist/cjs/constants/TeamTypes.js

@@ -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/Header/Header.js

@@ -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

@@ -1,12 +1,13 @@
 import React, { useState, useEffect } from 'react';
 import { useMutation } from 'react-query';
 import { InlineLoading, HeaderMenu, HeaderMenuItem } from '@carbon/react';
-import { CheckmarkFilled, AddAlt, GroupAccount, ChevronDown } from '@carbon/react/icons';
+import { CheckmarkFilled, ChevronDown, AddAlt, GroupAccount } from '@carbon/react/icons';
 import sortBy from 'lodash.sortby';
 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
@@ -17,6 +18,9 @@ const headerDropdownMenuContainerClassname = `${prefix}--header-dropdown-menu-co
 const headerDropdownMenuLoadingClassname = `${prefix}--header-dropdown-menu-loading`;
 const headerDropdownMenuSuccessClassname = `${prefix}--header-dropdown-menu-success`;
 const headerDropdownMenuClassname = `${prefix}--header-dropdown-menu`;
+const headerDropdownMenuContentClassname = `${prefix}--header-dropdown-menu-content`;
+const headerDropdownMenuContentTextClassname = `${prefix}--header-dropdown-menu-content-text`;
+const headerDropdownMenuContentIconClassname = `${prefix}--header-dropdown-menu-content-icon`;
 const headerDropdownMenuListClassname = `${prefix}--bmrg-header-drop-down`;
 const headerDropdownMenuItemContainerClassname = `${prefix}--header-dropdown-menu-item-container`;
 const headerDropdownMenuItemClassname = `${prefix}--header-dropdown-menu-item`;
@@ -85,6 +89,12 @@ function HeaderTeamSwitcher({ analyticsHelpers, baseServicesUrl, createJoinTeamT
                 await mutateUserProfile({ baseServicesUrl, body });
             }
         };
+        const handleNoTeamsToSelect = async () => {
+            const body = {
+                teamInstanceSwitcherDefault: null,
+            };
+            await mutateUserProfile({ baseServicesUrl, body });
+        };
         if (userHasTeams) {
             if (!userTeamInstanceSwitcherDefault) {
                 if (userHasPersonalTeam) {
@@ -116,6 +126,21 @@ function HeaderTeamSwitcher({ analyticsHelpers, baseServicesUrl, createJoinTeamT
                 const newSelectedTeam = allTeams.find((team) => team.id === userTeamInstanceSwitcherDefault);
                 handleSelectTeam({ team: newSelectedTeam });
             }
+            // if teams data loaded but there are no teams
+        }
+        else if (Boolean(userTeamInstanceSwitcherDefault) &&
+            ((hasUserTeams &&
+                userTeams?.data?.accountTeams?.length === 0 &&
+                userTeams?.data?.standardTeams?.length === 0 &&
+                userTeams?.data?.personalTeam?.length === 0) ||
+                (!hasUserTeams &&
+                    teamsQuery?.data?.accountTeams?.length === 0 &&
+                    teamsQuery?.data?.standardTeams?.length === 0 &&
+                    teamsQuery?.data?.personalTeam?.length === 0))) {
+            handleNoTeamsToSelect();
+        }
+        else if (userTeamInstanceSwitcherDefault === null) {
+            setSelectedTeam(null);
         }
     }, [
         baseServicesUrl,
@@ -193,44 +218,72 @@ 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 selectedTeamName = selectedTeam?.displayName ? selectedTeam.displayName : selectedTeam?.name;
-        if (selectedTeamName && selectedTeamName.length > 65) {
-            selectedTeamName = selectedTeamName.slice(0, 65) + "...";
+        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
+            : selectedTeam?.name
+                ? selectedTeam?.name
+                : "No team selected";
         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, { id: "header-team-switcher-menu", "aria-label": menuAriaLabelRecord, className: headerDropdownMenuClassname, renderMenuContent: () => (React.createElement("div", { className: headerDropdownMenuContentClassname },
+                    React.createElement("p", { title: selectedTeamName, className: headerDropdownMenuContentTextClassname }, selectedTeamName),
+                    React.createElement(ChevronDown, { className: headerDropdownMenuContentIconClassname }))), onClick: handleHeaderMenuClick, "data-testid": "header-team-switcher-menu" },
                 React.createElement(HeaderMenu$1, { "aria-labelledby": menuButtonId, className: headerDropdownMenuListClassname, id: menuListId },
                     !isPartnerUser && (React.createElement(HeaderMenuItem, { id: "header-team-switcher-create-join-team-button", className: headerTeamSwitcherCreateTeamButtonContainerClassname, onClick: handleCreateJoinTeamClick, 
                         // eslint-disable-next-line no-script-url
@@ -238,28 +291,13 @@ 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 isMenuSelected = isTeamSelected || isProjectTeamSelected;
                             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 }), 
@@ -268,7 +306,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 })))),
@@ -280,7 +318,7 @@ 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)),
+                                            isTeamSelected ? React.createElement(CheckmarkFilled, { className: headerDropdownMenuItemIconClassname }) : null)),
                                     team.projectTeams && team.projectTeams.length > 0
                                         ? team.projectTeams.map((team) => {
                                             const isTeamSelected = team.id === selectedTeam?.id;
@@ -295,22 +333,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

@@ -25,12 +25,13 @@ function determineIfConfigIsDifferent(teams, initialTeams) {
     }
     return isConfigDifferent;
 }
-function ProfileSettings({ baseServicesUrl, src, userName, isOpen, closeModal }) {
+function ProfileSettings({ baseServicesUrl, refetchUser, refetchUserTeams, refetchNavigation, src, userName, isOpen, closeModal, }) {
     const queryClient = useQueryClient();
     const [initialTeams, setInitialTeams] = useState([]);
     const [teams, setTeams] = useState([]);
     const userUrl = serviceUrl.getLaunchpadUser({ baseServicesUrl });
     const profileUrl = serviceUrl.resourceUserProfile({ baseServicesUrl });
+    const userTeamsUrl = serviceUrl.getUserTeamsServices({ baseServicesUrl });
     const { data: user, isLoading: userIsLoading, error: userError, } = useQuery({
         queryKey: userUrl,
         queryFn: resolver.query(userUrl),
@@ -39,6 +40,22 @@ function ProfileSettings({ baseServicesUrl, src, userName, isOpen, closeModal })
         onSuccess: () => {
             queryClient.invalidateQueries(userUrl);
             queryClient.invalidateQueries(profileUrl);
+            queryClient.invalidateQueries(userTeamsUrl);
+            if (refetchUser) {
+                setTimeout(() => {
+                    refetchUser();
+                }, 1000);
+            }
+            if (refetchUserTeams) {
+                setTimeout(() => {
+                    refetchUserTeams();
+                }, 1000);
+            }
+            if (refetchNavigation) {
+                setTimeout(() => {
+                    refetchNavigation();
+                }, 1000);
+            }
         },
     });
     // Only disable when we have a user and we know that there aren' any lower level groups to manage
@@ -54,6 +71,7 @@ function ProfileSettings({ baseServicesUrl, src, userName, isOpen, closeModal })
     }
     async function handleSubmit() {
         const body = {
+            teamInstanceSwitcherDefault: null,
             lowerLevelGroups: teams,
         };
         try {
@@ -95,9 +113,9 @@ function ProfileSettings({ baseServicesUrl, src, userName, isOpen, closeModal })
     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

@@ -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, 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,8 +63,8 @@ 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: [
-                isUserEnabled && (React.createElement(ProfileSettingsMenuItem, { key: "profile-settings", baseServicesUrl: platform.baseServicesUrl, src: `${platform.baseServicesUrl}/users/image/${user?.email}`, userName: user?.displayName ?? user?.name })),
+        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 })),
                 ...profileMenuItems,

package/dist/esm/constants/TeamTypes.js

@@ -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

@@ -366,6 +366,7 @@ type Props$G = {
     className?: string;
     createJoinTeamTrigger?: Function;
     enableAppSwitcher?: boolean;
+    enableTeamSwitcher?: boolean;
     instanceSwitcherEnabled?: boolean;
     enableNotifications?: boolean;
     enableNotificationsCount?: boolean;
@@ -1436,6 +1437,7 @@ type Props = {
         };
         platformMessage?: any;
     };
+    enableTeamSwitcher?: boolean;
     history?: any;
     isLaunchpad?: boolean;
     isLoadingTeamSwitcher?: boolean;
@@ -1456,6 +1458,7 @@ type Props = {
         component: React.ReactNode;
     };
     refetchUser?: Function;
+    refetchUserTeams?: Function;
     refetchNavigation?: Function;
     skipToContentProps?: {
         href?: string;
@@ -1481,6 +1484,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, 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

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

package/scss/components/Header/_headerTeamSwitcher.scss

@@ -39,13 +39,40 @@ IBM Confidential
       overflow: hidden;
       width: 100%;
 
-      .#{$prefix}--header__menu-arrow {
+      .#{$prefix}--header-dropdown-menu-content {
+        align-items: center;
+        display: flex;
+      }
+
+      .#{$prefix}--header-dropdown-menu-content-text {
+        font-size: 0.875rem;
+        font-weight: 600;
+        line-height: 1.125rem;
+        letter-spacing: 0.01rem;
+        max-width: 14.5625rem;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+      }
+
+      .#{$prefix}--header-dropdown-menu-content-icon {
+        margin-left: 1rem;
         min-height: 1rem;
         min-width: 1rem;
+        transition: transform 150ms ease-in-out;
+        transform: rotate(0deg);
       }
 
       &[aria-expanded="true"] {
         background-color: var(--cds-layer-hover-01) !important;
+
+        .#{$prefix}--header-dropdown-menu-content-text {
+          width: 14.5625rem;
+        }
+
+        .#{$prefix}--header-dropdown-menu-content-icon {
+          transform: rotate(180deg);
+        }
       }
     }
 

package/scss/components/ProfileSettings/_profileSettings.scss

@@ -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;
@@ -29,6 +28,7 @@ IBM Confidential
 
   .#{$prefix}--modal-content {
     color: shell.$bmrg-theme-primary;
+    mask-image: none !important;
     .#{$prefix}--bmrg-profile-settings__title {
       color: shell.$bmrg-theme-primary;
       font-size: utils.rem(14px);