@boomerang-io/carbon-addons-boomerang-react 4.6.21-beta.9 → 4.6.22-beta.1

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

@@ -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
@@ -43,6 +44,7 @@ function HeaderTeamSwitcher({ analyticsHelpers, baseServicesUrl, createJoinTeamT
     const showSelectTeamPurpose = navigationPlatform?.requireTeamPurpose;
     const createTeamButtonText = showSelectTeamPurpose ? "Create Team" : "Create or Join Team";
     const userTeamInstanceSwitcherDefault = user?.teamInstanceSwitcherDefault;
+    const hasUpdatedDefaultTeamRef = React.useRef(false);
     const teamLink = ({ teamId }) => {
         return `${navigationPlatform.baseEnvUrl}/launchpad/teams/${teamId}`;
     };
@@ -81,7 +83,9 @@ function HeaderTeamSwitcher({ analyticsHelpers, baseServicesUrl, createJoinTeamT
         const userHasTeams = userHasPersonalTeam || userHasAccountTeams || userHasStandardTeams;
         const handleSelectTeam = async ({ team }) => {
             setSelectedTeam(team);
-            if (!userTeamInstanceSwitcherDefault) {
+            if (!userTeamInstanceSwitcherDefault &&
+                !hasUpdatedDefaultTeamRef.current) {
+                hasUpdatedDefaultTeamRef.current = true;
                 const body = {
                     teamInstanceSwitcherDefault: team.id,
                 };
@@ -89,6 +93,9 @@ function HeaderTeamSwitcher({ analyticsHelpers, baseServicesUrl, createJoinTeamT
             }
         };
         const handleNoTeamsToSelect = async () => {
+            if (hasUpdatedDefaultTeamRef.current)
+                return;
+            hasUpdatedDefaultTeamRef.current = true;
             const body = {
                 teamInstanceSwitcherDefault: null,
             };
@@ -138,6 +145,9 @@ function HeaderTeamSwitcher({ analyticsHelpers, baseServicesUrl, createJoinTeamT
                     teamsQuery?.data?.personalTeam?.length === 0))) {
             handleNoTeamsToSelect();
         }
+        else if (userTeamInstanceSwitcherDefault === null) {
+            setSelectedTeam(null);
+        }
     }, [
         baseServicesUrl,
         hasUserTeams,
@@ -214,33 +224,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
@@ -262,79 +297,72 @@ 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;
+                    allTeams.map((team) => {
+                        if (Boolean(team?.id)) {
                             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) => {
-                            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 }), 
-                                    // eslint-disable-next-line no-script-url
-                                    href: "javascript:void(0)", "data-testid": "header-team-switcher-menu-account-accordion" },
-                                    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),
-                                        React.createElement("div", { className: headerDropdownMenuItemAccountIconsClassname },
-                                            React.createElement(GroupAccount, { className: headerDropdownMenuItemAccountGroupIconClassname }),
-                                            React.createElement(ChevronDown, { className: headerDropdownMenuItemAccountChevronIconClassname })))),
-                                React.createElement("div", { id: `${team.id}-account-submenu`, key: `${team.id}-account-submenu`, "aria-expanded": isSubmenuOpen, className: headerDropdownMenuItemAccountSubmenuClassname },
-                                    React.createElement(HeaderMenuItem, { key: `${team.id}-menu-item`, id: `${team.id}-account-menu-item`, "aria-selected": isTeamSelected, className: headerDropdownMenuItemContainerClassname, onClick: () => {
-                                            handleTeamClick({ team, type: "account" });
-                                        }, "data-testid": "header-team-switcher-menu-account-accordion-item", 
+                            if (team.type === TEAM_TYPES.ACCOUNT) {
+                                const isSubmenuOpen = team.id === openAccountSubmenuId;
+                                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
+                                        href: "javascript:void(0)", "data-testid": "header-team-switcher-menu-account-accordion" },
+                                        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),
+                                            React.createElement("div", { className: headerDropdownMenuItemAccountIconsClassname },
+                                                React.createElement(GroupAccount, { className: headerDropdownMenuItemAccountGroupIconClassname }),
+                                                React.createElement(ChevronDown, { className: headerDropdownMenuItemAccountChevronIconClassname })))),
+                                    React.createElement("div", { id: `${team.id}-account-submenu`, key: `${team.id}-account-submenu`, "aria-expanded": isSubmenuOpen, className: headerDropdownMenuItemAccountSubmenuClassname },
+                                        React.createElement(HeaderMenuItem, { key: `${team.id}-menu-item`, id: `${team.id}-account-menu-item`, "aria-selected": isTeamSelected, className: headerDropdownMenuItemContainerClassname, onClick: () => {
+                                                handleTeamClick({ team, type: "account" });
+                                            }, "data-testid": "header-team-switcher-menu-account-accordion-item", 
+                                            // eslint-disable-next-line no-script-url
+                                            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)),
+                                        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: () => {
+                                                            handleTeamClick({ team, type: "project" });
+                                                        }, "data-testid": "header-team-switcher-menu-account-accordion-item", 
+                                                        // eslint-disable-next-line no-script-url
+                                                        href: "javascript:void(0)" },
+                                                        React.createElement("div", { className: headerDropdownMenuItemClassname, style: { paddingLeft: "1rem" } },
+                                                            React.createElement("span", { title: team.nameToDisplay, className: headerDropdownMenuItemTextClassname }, team.nameToDisplay),
+                                                            isTeamSelected ? (React.createElement(CheckmarkFilled, { className: headerDropdownMenuItemIconClassname })) : null))));
+                                            })
+                                            : null)));
+                            }
+                            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: 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, 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) => {
-                                            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: () => {
-                                                        handleTeamClick({ team, type: "project" });
-                                                    }, "data-testid": "header-team-switcher-menu-account-accordion-item", 
-                                                    // eslint-disable-next-line no-script-url
-                                                    href: "javascript:void(0)" },
-                                                    React.createElement("div", { className: headerDropdownMenuItemClassname, style: { paddingLeft: "1rem" } },
-                                                        React.createElement("span", { title: team.nameToDisplay, className: headerDropdownMenuItemTextClassname }, team.nameToDisplay),
-                                                        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` },
-                                React.createElement(HeaderMenuItem, { "aria-selected": isTeamSelected, className: headerDropdownMenuItemContainerClassname, onClick: () => {
-                                        handleTeamClick({ team, type: "standard" });
-                                    }, "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))));
+                                        React.createElement("div", { className: headerDropdownMenuItemClassname },
+                                            React.createElement("span", { title: team.nameToDisplay, className: headerDropdownMenuItemTextClassname }, team.nameToDisplay),
+                                            isTeamSelected ? React.createElement(CheckmarkFilled, { className: headerDropdownMenuItemIconClassname }) : null))));
+                            }
+                        }
+                        return 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

@@ -1,6 +1,6 @@
 import React from 'react';
 import { QueryClientProvider } from 'react-query';
-import { Email, Document, HelpDesk, CatalogPublish, Policy, Forum, ChatLaunch, Cognitive, Book } from '@carbon/react/icons';
+import { Email, Document, HelpDesk, CatalogPublish, Forum, ChatLaunch, Cognitive, Book } from '@carbon/react/icons';
 import Header from '../Header/Header.js';
 import HeaderMenuItem from '../Header/HeaderMenuItem.js';
 import PrivacyRedirect from '../PrivacyRedirect/PrivacyRedirect.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,
@@ -74,7 +74,15 @@ function UIShell({ analyticsHelpers, baseEnvUrl, carbonTheme = "g10", config, cr
                 isSupportEnabled &&
                     (supportFlagCheck || isPartnerUser ? (React.createElement(SupportCenterMenuItem, { key: "support-center", platformName: platform?.platformName, platformOrganization: platform?.platformOrganization, supportLink: supportLink, partnerEmailId: partnerEmailId, enablePartner: isPartnerUser, baseServicesUrl: platform.baseServicesUrl })) : (React.createElement(HeaderMenuItem, { key: "support-center", href: platform?.supportUrl, icon: React.createElement(HelpDesk, null), kind: "external", text: "Support Center", type: "link" }))),
                 React.createElement(HeaderMenuItem, { key: "release-notes", href: platform?.releaseNotesUrl, icon: React.createElement(CatalogPublish, null), "data-testid": "release-notes", kind: "app", text: "Release Notes", type: "link" }),
-                React.createElement(HeaderMenuItem, { key: "legal-terms", href: platform?.legalTermsUrl, icon: React.createElement(Policy, null), "data-testid": "legal-terms", kind: "app", text: "Legal Terms", type: "link" }),
+                // <HeaderMenuItem
+                //   key="legal-terms"
+                //   href={platform?.legalTermsUrl as string}
+                //   icon={<Policy />}
+                //   data-testid="legal-terms"
+                //   kind="app"
+                //   text="Legal Terms"
+                //   type="link"
+                // />,
                 React.createElement("span", { style: { borderBottom: "1px solid #b8c1c1" } }),
                 isCommunityEnabled && (React.createElement(HeaderMenuItem, { key: "community", href: platform?.communityUrl, icon: React.createElement(Forum, null), kind: "external", text: "Community", type: "link" })),
                 isFeedbackEnabled && (React.createElement(FeedbackMenuItem, { key: "feedback", platformName: platform?.platformName, platformOrganization: platform?.platformOrganization, sendIdeasUrl: sendIdeasUrl, sendBluePointsAwardUrl: sendBluePointsAwardUrl })),

package/dist/esm/constants/DataDrivenInputTypes.js

@@ -9,8 +9,12 @@ const CHECKBOX_TYPES = {
 const CREATABLE_TYPES = {
     CREATABLE_SINGLE: "creatable-single",
     CREATABLE_SINGLE_NON_DELETABLE: "creatable-single-non-deletable",
+    CREATABLE_SINGLE_REORDERABLE: "creatable-single-reorderable",
+    CREATABLE_SINGLE_REORDERABLE_NON_DELETABLE: "creatable-single-reorderable-non-deletable",
     CREATABLE_PAIR: "creatable-pair",
     CREATABLE_PAIR_NON_DELETABLE: "creatable-pair-non-deletable",
+    CREATABLE_PAIR_REORDERABLE: "creatable-pair-reorderable",
+    CREATABLE_PAIR_REORDERABLE_NON_DELETABLE: "creatable-pair-reorderable-non-deletable",
 };
 const DATE_TYPES = {
     DATE: "date",

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

@@ -296,6 +296,7 @@ type Props$I = {
     triggerEvent?: (props: any) => void;
     user: User;
     isLaunchpad?: boolean;
+    isbetaLaunchpad?: boolean;
     userTeamsError?: boolean;
     userTeamsLoading?: boolean;
     history?: any;
@@ -366,6 +367,7 @@ type Props$G = {
     className?: string;
     createJoinTeamTrigger?: Function;
     enableAppSwitcher?: boolean;
+    enableTeamSwitcher?: boolean;
     instanceSwitcherEnabled?: boolean;
     enableNotifications?: boolean;
     enableNotificationsCount?: boolean;
@@ -656,6 +658,7 @@ type Props$y = {
     onChange?: (items: string[]) => void;
     placeholder?: string;
     readOnly?: boolean;
+    reorderable?: boolean;
     tagProps?: any;
     tagType?: string;
     textInputProps?: any;
@@ -670,7 +673,7 @@ type Props$y = {
     value?: string | string[];
     values?: string | string[];
 };
-declare function CreatableComponent({ buttonClassName, buttonContent, buttonProps, createKeyValuePair, disabled, id, initialValues: externalInitialValues, invalid, invalidText, helperText, key, keyHelperText, keyLabel, keyLabelText, keyPlaceholder, label, labelText, max, nonDeletable, onKeyBlur, onValueBlur, onInputBlur, onChange, placeholder, tagProps, tagType, textInputProps, tooltipClassName, tooltipContent, tooltipProps, type, valueHelperText, valueLabel, valueLabelText, valuePlaceholder, value: externalValues, values, trimInput, removeOnlyFirst, }: Props$y): React.JSX.Element;
+declare function CreatableComponent({ buttonClassName, buttonContent, buttonProps, createKeyValuePair, disabled, id, initialValues: externalInitialValues, invalid, invalidText, helperText, key, keyHelperText, keyLabel, keyLabelText, keyPlaceholder, label, labelText, max, nonDeletable, onKeyBlur, onValueBlur, onInputBlur, onChange, placeholder, reorderable, tagProps, tagType, textInputProps, tooltipClassName, tooltipContent, tooltipProps, type, valueHelperText, valueLabel, valueLabelText, valuePlaceholder, value: externalValues, values, trimInput, removeOnlyFirst, }: Props$y): React.JSX.Element;
 
 type OwnDataDrivenInputProps = {
     id?: string;
@@ -1436,6 +1439,7 @@ type Props = {
         };
         platformMessage?: any;
     };
+    enableTeamSwitcher?: boolean;
     history?: any;
     isLaunchpad?: boolean;
     isLoadingTeamSwitcher?: boolean;
@@ -1456,6 +1460,7 @@ type Props = {
         component: React.ReactNode;
     };
     refetchUser?: Function;
+    refetchUserTeams?: Function;
     refetchNavigation?: Function;
     skipToContentProps?: {
         href?: string;
@@ -1481,6 +1486,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,13 +1,13 @@
 {
   "name": "@boomerang-io/carbon-addons-boomerang-react",
   "description": "Carbon Addons for Boomerang apps",
-  "version": "4.6.21-beta.9",
+  "version": "4.6.22-beta.1",
   "author": {
     "name": "Tim Bula",
     "email": "timrbula@gmail.com"
   },
   "license": "Apache-2",
-  "repository": { 
+  "repository": {
     "type": "git",
     "url": "git@github.com:boomerang-io/carbon-addons-boomerang-react"
   },
@@ -49,12 +49,16 @@
   "dependencies": {
     "@carbon/ibm-products": "2.57.1",
     "@carbon/react": "1.77.0",
+    "@dnd-kit/core": "^6.3.1",
+    "@dnd-kit/sortable": "^10.0.0",
+    "@dnd-kit/utilities": "^3.2.2",
     "@stomp/stompjs": "6.1.2",
     "@tippyjs/react": "4.2.6",
     "classnames": "2.3.2",
     "dayjs": "^1.11.11",
     "dompurify": "3.2.6",
     "downshift": "6.1.7",
+    "history": "^5.3.0",
     "lodash.get": "4.4.2",
     "lodash.isequal": "4.5.0",
     "lodash.sortby": "4.7.0",
@@ -73,7 +77,7 @@
     "react": "^17.0.0 || ^16.14.0",
     "react-dom": "^17.0.0 || ^16.14.0",
     "react-query": "^3.34.12",
-    "react-router-dom": "^6.0.0",
+    "react-router-dom": "^5.3.0",
     "yup": ">=0.32.11"
   },
   "devDependencies": {

package/scss/components/Creatable/_creatable.scss

@@ -4,7 +4,6 @@ IBM Confidential
 © Copyright IBM Corp. 2022, 2024
 */
 
-
 @use "../../global/config" as *;
 .#{$prefix}--bmrg-creatable {
   position: relative;
@@ -42,6 +41,37 @@ IBM Confidential
   width: 100%;
 }
 
+.#{$prefix}--bmrg-creatable__tags--reorderable {
+  display: flex;
+  flex-direction: column;
+  margin-top: 0.5rem;
+  width: 100%;
+
+  .cds--tag {
+    cursor: grab;
+    margin-left: 0;
+    min-width: 100%;
+    width: 100%;
+
+    .cds--tag__custom-icon ~ span {
+      min-width: calc(100% - 1.25rem);
+    }
+
+    .cds--interactive--tag-children {
+      max-inline-size: none !important;
+      width: 100%;
+
+      .cds--popover {
+        display: none;
+      }
+    }
+
+    .cds--tag__label {
+      min-width: calc(100% - 1.5rem);
+    }
+  }
+}
+
 .#{$prefix}--bmrg-creatable__tooltip {
   line-height: 0;
   margin-left: 0.5rem;

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);