@boomerang-io/carbon-addons-boomerang-react 4.6.11-beta.41 → 4.6.11-beta.43

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

@@ -64,19 +64,12 @@ 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 hasUserTeams = Boolean(userTeams);
-    const hasUserTeamsAssets = Boolean(userTeamsAssets);
     const userTeamsUrl = servicesConfig.serviceUrl.getUserTeamsServices({ baseServicesUrl });
-    const userTeamsAssetsUrl = servicesConfig.serviceUrl.getUserTeamsServicesAssets({ baseServicesUrl });
     const teamsQuery = reactQuery.useQuery({
         queryKey: userTeamsUrl,
         queryFn: servicesConfig.resolver.query(userTeamsUrl, null),
         enabled: !hasUserTeams && Boolean(baseServicesUrl),
     });
-    const teamsAssetsQuery = reactQuery.useQuery({
-        queryKey: userTeamsAssetsUrl,
-        queryFn: servicesConfig.resolver.query(userTeamsAssetsUrl, null),
-        enabled: !hasUserTeamsAssets && Boolean(baseServicesUrl),
-    });
     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 },
@@ -93,7 +86,7 @@ function Header(props) {
                     React__default.default.createElement(NotificationsMenu, { baseEnvUrl: baseEnvUrl, baseServicesUrl: baseServicesUrl, enabled: Boolean(props.enableNotifications), countEnabled: Boolean(props.enableNotificationsCount) }),
                     React__default.default.createElement(SupportMenu, { enabled: Array.isArray(props.supportMenuItems) && props.supportMenuItems.length > 0, menuItems: props.supportMenuItems }),
                     React__default.default.createElement(ProfileMenu, { enabled: Array.isArray(props.profileMenuItems) && props.profileMenuItems.length > 0, menuItems: props.profileMenuItems }),
-                    React__default.default.createElement(AppSwitcherMenu, { baseEnvUrl: baseEnvUrl, baseServicesUrl: baseServicesUrl, enabled: props.enableAppSwitcher, teamsQuery: teamsAssetsQuery, templateMeteringEvent: templateMeteringEvent, triggerEvent: triggerEvent, userTeams: userTeamsAssets }),
+                    React__default.default.createElement(AppSwitcherMenu, { baseEnvUrl: baseEnvUrl, baseServicesUrl: baseServicesUrl, enabled: props.enableAppSwitcher, templateMeteringEvent: templateMeteringEvent, triggerEvent: triggerEvent, userTeams: userTeamsAssets }),
                     React__default.default.createElement(RightPanelMenu, { enabled: Boolean(rightPanel && Object.keys(rightPanel).length), ...rightPanel })))),
         React__default.default.createElement(NotificationsContainer.default, { enableMultiContainer: true, containerId: `${settings.prefix}--bmrg-header-notifications` })));
 }
@@ -169,12 +162,20 @@ function ProfileMenu(props) {
 }
 function AppSwitcherMenu(props) {
     const { isOpen, toggleActive, ref } = useHeaderMenu.default(MenuButtonId.Switcher);
+    const hasUserTeamsAssets = Boolean(props.userTeams);
+    const userTeamsAssetsUrl = servicesConfig.serviceUrl.getUserTeamsServicesAssets({ baseServicesUrl: props.baseServicesUrl });
+    const queryEnabled = isOpen && props.enabled && !hasUserTeamsAssets && Boolean(props.baseServicesUrl);
+    const teamsAssetsQuery = reactQuery.useQuery({
+        queryKey: userTeamsAssetsUrl,
+        queryFn: servicesConfig.resolver.query(userTeamsAssetsUrl, null),
+        enabled: queryEnabled,
+    });
     if (!props.enabled || !props.baseServicesUrl) {
         return null;
     }
     return (React__default.default.createElement("div", { ref: ref },
         React__default.default.createElement("button", { "aria-controls": MenuListId.Switcher, "aria-expanded": isOpen, "aria-haspopup": "menu", "aria-label": MenuAriaLabelRecord.Switcher, className: headerButtonClassNames, "data-testid": "header-appswitcher-link", id: MenuButtonId.Switcher, onClick: toggleActive }, isOpen ? React__default.default.createElement(icons.Close, { size: 20 }) : React__default.default.createElement(icons.Switcher, { size: 20 })),
-        React__default.default.createElement(HeaderAppSwitcher.default, { baseEnvUrl: props.baseEnvUrl, baseServicesUrl: props.baseServicesUrl, id: MenuListId.Switcher, isOpen: isOpen, teamsQuery: props.teamsQuery, templateMeteringEvent: props.templateMeteringEvent, triggerEvent: props.triggerEvent, userTeams: props.userTeams })));
+        React__default.default.createElement(HeaderAppSwitcher.default, { baseEnvUrl: props.baseEnvUrl, baseServicesUrl: props.baseServicesUrl, id: MenuListId.Switcher, isOpen: isOpen, teamsQuery: teamsAssetsQuery, templateMeteringEvent: props.templateMeteringEvent, triggerEvent: props.triggerEvent, userTeams: props.userTeams })));
 }
 function RightPanelMenu(props) {
     const { isOpen, toggleActive, ref } = useHeaderMenu.default(MenuButtonId.RightPanel);

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

@@ -71,17 +71,17 @@ function HeaderAppSwitcher({ baseServicesUrl, baseEnvUrl, id, isOpen, teamsQuery
     return null;
 }
 function TeamServiceListMenu({ baseEnvUrl, isAccount, isMember, team, templateMeteringEvent, triggerEvent, }) {
-    const { name, displayName, services } = team;
+    const { id, name, displayName, services } = team;
     const nameToDisplay = displayName ? displayName : name;
     const isNameTruncated = nameToDisplay?.length > 30;
     if (!isMember) {
-        return (React__default.default.createElement("div", { className: `${settings.prefix}--side-nav__item`, title: isNameTruncated ? nameToDisplay : undefined },
+        return (React__default.default.createElement("div", { id: id, className: `${settings.prefix}--side-nav__item`, title: isNameTruncated ? nameToDisplay : undefined },
             React__default.default.createElement("button", { disabled: true, className: `${settings.prefix}--side-nav__submenu`, "data-testid": "header-app-switcher-service" },
                 React__default.default.createElement("span", { className: `${settings.prefix}--side-nav__submenu-title` }, nameToDisplay))));
     }
     return (
     // eslint-disable-next-line jsx-a11y/no-noninteractive-element-interactions
-    React__default.default.createElement("ul", { className: `${settings.prefix}--bmrg-header-team`, title: isNameTruncated ? nameToDisplay : undefined },
+    React__default.default.createElement("ul", { id: id, className: `${settings.prefix}--bmrg-header-team`, title: isNameTruncated ? nameToDisplay : undefined },
         React__default.default.createElement(react.SideNavMenu, { title: nameToDisplay },
             React__default.default.createElement(ServiceList, { baseEnvUrl: baseEnvUrl, isAccount: isAccount, servicesData: services, team: team, templateMeteringEvent: templateMeteringEvent, triggerEvent: triggerEvent }))));
 }
@@ -98,7 +98,7 @@ function ServiceList(props) {
             return (React__default.default.createElement(React__default.default.Fragment, null, servicesData.map((service) => {
                 const isExternalLink = typeof service?.url?.includes === "function" && !service.url.includes(baseEnvUrl);
                 const isNameTruncated = isExternalLink ? service.name.length > 28 : service.name.length > 32;
-                return (React__default.default.createElement(react.SideNavMenuItem, { key: service.name, href: service.url, title: isNameTruncated ? service.name : undefined, onClick: () => handleLinkClick(service), "data-testid": "header-app-switcher-service", ...(isExternalLink ? externalProps : undefined) },
+                return (React__default.default.createElement(react.SideNavMenuItem, { id: service.id, key: service.id, href: service.url, title: isNameTruncated ? service.name : undefined, onClick: () => handleLinkClick(service), "data-testid": "header-app-switcher-service", ...(isExternalLink ? externalProps : undefined) },
                     React__default.default.createElement("span", null, service.name),
                     isExternalLink ? React__default.default.createElement(icons.Launch, { size: 16, title: "Opens page in new tab" }) : undefined));
             })));

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

@@ -56,19 +56,12 @@ 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 hasUserTeams = Boolean(userTeams);
-    const hasUserTeamsAssets = Boolean(userTeamsAssets);
     const userTeamsUrl = serviceUrl.getUserTeamsServices({ baseServicesUrl });
-    const userTeamsAssetsUrl = serviceUrl.getUserTeamsServicesAssets({ baseServicesUrl });
     const teamsQuery = useQuery({
         queryKey: userTeamsUrl,
         queryFn: resolver.query(userTeamsUrl, null),
         enabled: !hasUserTeams && Boolean(baseServicesUrl),
     });
-    const teamsAssetsQuery = useQuery({
-        queryKey: userTeamsAssetsUrl,
-        queryFn: resolver.query(userTeamsAssetsUrl, null),
-        enabled: !hasUserTeamsAssets && Boolean(baseServicesUrl),
-    });
     return (React.createElement(React.Fragment, null,
         React.createElement(Theme, { theme: carbonTheme },
             React.createElement(Header$1, { "aria-label": "App navigation header", className: className },
@@ -85,7 +78,7 @@ function Header(props) {
                     React.createElement(NotificationsMenu, { baseEnvUrl: baseEnvUrl, baseServicesUrl: baseServicesUrl, enabled: Boolean(props.enableNotifications), countEnabled: Boolean(props.enableNotificationsCount) }),
                     React.createElement(SupportMenu, { enabled: Array.isArray(props.supportMenuItems) && props.supportMenuItems.length > 0, menuItems: props.supportMenuItems }),
                     React.createElement(ProfileMenu, { enabled: Array.isArray(props.profileMenuItems) && props.profileMenuItems.length > 0, menuItems: props.profileMenuItems }),
-                    React.createElement(AppSwitcherMenu, { baseEnvUrl: baseEnvUrl, baseServicesUrl: baseServicesUrl, enabled: props.enableAppSwitcher, teamsQuery: teamsAssetsQuery, templateMeteringEvent: templateMeteringEvent, triggerEvent: triggerEvent, userTeams: userTeamsAssets }),
+                    React.createElement(AppSwitcherMenu, { baseEnvUrl: baseEnvUrl, baseServicesUrl: baseServicesUrl, enabled: props.enableAppSwitcher, templateMeteringEvent: templateMeteringEvent, triggerEvent: triggerEvent, userTeams: userTeamsAssets }),
                     React.createElement(RightPanelMenu, { enabled: Boolean(rightPanel && Object.keys(rightPanel).length), ...rightPanel })))),
         React.createElement(NotificationsContainer, { enableMultiContainer: true, containerId: `${prefix}--bmrg-header-notifications` })));
 }
@@ -161,12 +154,20 @@ function ProfileMenu(props) {
 }
 function AppSwitcherMenu(props) {
     const { isOpen, toggleActive, ref } = useHeaderMenu(MenuButtonId.Switcher);
+    const hasUserTeamsAssets = Boolean(props.userTeams);
+    const userTeamsAssetsUrl = serviceUrl.getUserTeamsServicesAssets({ baseServicesUrl: props.baseServicesUrl });
+    const queryEnabled = isOpen && props.enabled && !hasUserTeamsAssets && Boolean(props.baseServicesUrl);
+    const teamsAssetsQuery = useQuery({
+        queryKey: userTeamsAssetsUrl,
+        queryFn: resolver.query(userTeamsAssetsUrl, null),
+        enabled: queryEnabled,
+    });
     if (!props.enabled || !props.baseServicesUrl) {
         return null;
     }
     return (React.createElement("div", { ref: ref },
         React.createElement("button", { "aria-controls": MenuListId.Switcher, "aria-expanded": isOpen, "aria-haspopup": "menu", "aria-label": MenuAriaLabelRecord.Switcher, className: headerButtonClassNames, "data-testid": "header-appswitcher-link", id: MenuButtonId.Switcher, onClick: toggleActive }, isOpen ? React.createElement(Close, { size: 20 }) : React.createElement(Switcher, { size: 20 })),
-        React.createElement(HeaderAppSwitcher, { baseEnvUrl: props.baseEnvUrl, baseServicesUrl: props.baseServicesUrl, id: MenuListId.Switcher, isOpen: isOpen, teamsQuery: props.teamsQuery, templateMeteringEvent: props.templateMeteringEvent, triggerEvent: props.triggerEvent, userTeams: props.userTeams })));
+        React.createElement(HeaderAppSwitcher, { baseEnvUrl: props.baseEnvUrl, baseServicesUrl: props.baseServicesUrl, id: MenuListId.Switcher, isOpen: isOpen, teamsQuery: teamsAssetsQuery, templateMeteringEvent: props.templateMeteringEvent, triggerEvent: props.triggerEvent, userTeams: props.userTeams })));
 }
 function RightPanelMenu(props) {
     const { isOpen, toggleActive, ref } = useHeaderMenu(MenuButtonId.RightPanel);

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

@@ -62,17 +62,17 @@ function HeaderAppSwitcher({ baseServicesUrl, baseEnvUrl, id, isOpen, teamsQuery
     return null;
 }
 function TeamServiceListMenu({ baseEnvUrl, isAccount, isMember, team, templateMeteringEvent, triggerEvent, }) {
-    const { name, displayName, services } = team;
+    const { id, name, displayName, services } = team;
     const nameToDisplay = displayName ? displayName : name;
     const isNameTruncated = nameToDisplay?.length > 30;
     if (!isMember) {
-        return (React.createElement("div", { className: `${prefix}--side-nav__item`, title: isNameTruncated ? nameToDisplay : undefined },
+        return (React.createElement("div", { id: id, className: `${prefix}--side-nav__item`, title: isNameTruncated ? nameToDisplay : undefined },
             React.createElement("button", { disabled: true, className: `${prefix}--side-nav__submenu`, "data-testid": "header-app-switcher-service" },
                 React.createElement("span", { className: `${prefix}--side-nav__submenu-title` }, nameToDisplay))));
     }
     return (
     // eslint-disable-next-line jsx-a11y/no-noninteractive-element-interactions
-    React.createElement("ul", { className: `${prefix}--bmrg-header-team`, title: isNameTruncated ? nameToDisplay : undefined },
+    React.createElement("ul", { id: id, className: `${prefix}--bmrg-header-team`, title: isNameTruncated ? nameToDisplay : undefined },
         React.createElement(SideNavMenu, { title: nameToDisplay },
             React.createElement(ServiceList, { baseEnvUrl: baseEnvUrl, isAccount: isAccount, servicesData: services, team: team, templateMeteringEvent: templateMeteringEvent, triggerEvent: triggerEvent }))));
 }
@@ -89,7 +89,7 @@ function ServiceList(props) {
             return (React.createElement(React.Fragment, null, servicesData.map((service) => {
                 const isExternalLink = typeof service?.url?.includes === "function" && !service.url.includes(baseEnvUrl);
                 const isNameTruncated = isExternalLink ? service.name.length > 28 : service.name.length > 32;
-                return (React.createElement(SideNavMenuItem, { key: service.name, href: service.url, title: isNameTruncated ? service.name : undefined, onClick: () => handleLinkClick(service), "data-testid": "header-app-switcher-service", ...(isExternalLink ? externalProps : undefined) },
+                return (React.createElement(SideNavMenuItem, { id: service.id, key: service.id, href: service.url, title: isNameTruncated ? service.name : undefined, onClick: () => handleLinkClick(service), "data-testid": "header-app-switcher-service", ...(isExternalLink ? externalProps : undefined) },
                     React.createElement("span", null, service.name),
                     isExternalLink ? React.createElement(Launch, { size: 16, title: "Opens page in new tab" }) : undefined));
             })));

package/dist/types/index.d.ts

@@ -78,11 +78,15 @@ type SimpleIdNameMap = {
     privateTeam?: boolean;
     displayName?: string;
     services?: Array<{
+        id: string;
+        templateId: string;
         name: string;
         url: string;
     }>;
 };
 type SimpleTeamService = {
+    id: string;
+    templateId: string;
     name: string;
     url: string;
 };

package/package.json

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