@boomerang-io/carbon-addons-boomerang-react 4.6.5-beta.4 → 4.6.5-beta.40

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

@@ -54,8 +54,9 @@ const MenuAriaLabelRecord = {
     Switcher: "Switcher menu",
 };
 const headerButtonClassNames = "cds--btn--icon-only cds--header__action cds--btn cds--btn--primary cds--btn--icon-only cds--btn cds--btn--primary";
+const instanceCheckMarkStyle = "instance-checkmark-style";
 function Header(props) {
-    const { productName, baseEnvUrl, baseServicesUrl, carbonTheme = "g10", className, navLinks, prefixName = "", rightPanel, skipToContentProps, templateMeteringEvent, triggerEvent, userTeams, } = props;
+    const { productName, baseEnvUrl, baseServicesUrl, carbonTheme = "g10", className, navLinks, platform, prefixName = "", rightPanel, skipToContentProps, templateMeteringEvent, triggerEvent, userTeams, } = props;
     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 },
@@ -66,9 +67,8 @@ 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(InstanceSwitcherMenu, { enabled: true, 
-                        // enabled={Array.isArray(props.instanceSwitcherMenuItems) && props.instanceSwitcherMenuItems.length > 0}
-                        menuItems: props.instanceSwitcherMenuItems }),
+                    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) }),
                     React__default.default.createElement(SupportMenu, { enabled: Array.isArray(props.supportMenuItems) && props.supportMenuItems.length > 0, menuItems: props.supportMenuItems }),
@@ -78,18 +78,22 @@ function Header(props) {
         React__default.default.createElement(NotificationsContainer.default, { enableMultiContainer: true, containerId: `${settings.prefix}--bmrg-header-notifications` })));
 }
 function InstanceSwitcherMenu(props) {
+    const currentURL = "https://au.ica.ibm.com";
     const { isOpen, toggleActive, ref } = useHeaderMenu.default(MenuButtonId.InstanceSwitcher);
     if (!props.enabled) {
         return null;
     }
-    return (React__default.default.createElement("div", { style: { position: "relative" }, ref: ref },
+    return (React__default.default.createElement("div", { className: `${settings.prefix}--bmrg-header-instance-switcher`, style: { position: "relative" }, ref: ref },
         React__default.default.createElement("button", { "aria-controls": MenuListId.instanceSwitcher, "aria-expanded": isOpen, "aria-haspopup": "menu", "aria-label": MenuAriaLabelRecord.instanceSwitcher, className: headerButtonClassNames, "data-testid": "header-instanceSwitcher-link", id: MenuButtonId.InstanceSwitcher, onClick: toggleActive },
-            React__default.default.createElement(icons.Help, { size: 20 })),
-        isOpen ? (React__default.default.createElement(HeaderMenu.default, { "aria-labelledby": MenuButtonId.InstanceSwitcher, id: MenuListId.instanceSwitcher },
-            React__default.default.createElement(react.HeaderMenuItem, { key: "Global", text: "Global", type: "link", kind: "app", href: "https://servicesessentials.ibm.com/launchpad", target: "_self" },
-                React__default.default.createElement("div", null, "Global")),
-            React__default.default.createElement(react.HeaderMenuItem, { key: "Australlia", text: "Australlia", type: "link", kind: "app", href: "https://au.ica.ibm.com", target: "_self" }, "Australlia"),
-            React__default.default.createElement(react.HeaderMenuItem, { key: "Canada", text: "Australlia", type: "link", kind: "app", href: "https://canada.ica.ibm.com", target: "_self" }, "Canada"))) : null));
+            React__default.default.createElement(icons.Wikis, { size: 20 })),
+        isOpen ? (React__default.default.createElement(HeaderMenu.default, { "aria-labelledby": MenuButtonId.InstanceSwitcher, id: MenuListId.instanceSwitcher }, Array.isArray(props.menuItems)
+            ? props.menuItems.map((item) => (React__default.default.createElement(react.HeaderMenuItem, { "aria-label": `Instance Switcher for ${item.instanceName}`, "data-testid": "header-menu-instance-switcher", href: item.url, isCurrentPage: window?.location?.href && item.url ? window.location.href.startsWith(item.url) : false, key: item.instanceName, target: "_self", rel: "noopener noreferrer" },
+                React__default.default.createElement("div", null,
+                    React__default.default.createElement("span", null, "AU"),
+                    currentURL.includes((item.instanceName).toLowerCase()) ? React__default.default.createElement("span", { className: instanceCheckMarkStyle },
+                        React__default.default.createElement(icons.Checkmark, null),
+                        " ") : ""))))
+            : null)) : null));
 }
 function RequestsMenu(props) {
     const { isOpen, toggleActive, ref } = useHeaderMenu.default(MenuButtonId.Requests);

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

@@ -40,6 +40,7 @@ function UIShell({ baseEnvUrl, carbonTheme = "g10", config, leftPanel, platformN
      * Check feature enablement via explicit feature flags
      */
     const isAppSwitcherEnabled = Boolean(features?.["appSwitcher.enabled"]);
+    const instanceSwitcherEnabled = Boolean(platform?.["instanceSwitcherEnabled"]);
     const isFeedbackEnabled = Boolean(features?.["feedback.enabled"]);
     const isNotificationsEnabled = Boolean(features?.["notifications.enabled"]);
     const isNotificationsCountEnabled = Boolean(features?.["notificationsCount.enabled"]);
@@ -68,7 +69,7 @@ function UIShell({ baseEnvUrl, carbonTheme = "g10", config, leftPanel, platformN
      */
     const isPrivacyStatementDisabled = renderPrivacyStatement === false || features?.["consent.enabled"] === false;
     return (React__default.default.createElement(reactQuery.QueryClientProvider, { client: servicesConfig.queryClient },
-        React__default.default.createElement(Header.default, { baseEnvUrl: platform.baseEnvUrl, baseServicesUrl: platform.baseServicesUrl, carbonTheme: carbonTheme, enableAppSwitcher: isAppSwitcherEnabled, enableNotifications: isNotificationsEnabled, enableNotificationsCount: isNotificationsCountEnabled, leftPanel: leftPanel, navLinks: navigation, platformMessage: platformMessage, prefixName: names.platformName, productName: names.productName, rightPanel: rightPanel, requestSummary: user?.requestSummary, skipToContentProps: skipToContentProps, templateMeteringEvent: templateMeteringEvent, triggerEvent: triggerEvent, profileMenuItems: [
+        React__default.default.createElement(Header.default, { baseEnvUrl: platform.baseEnvUrl, baseServicesUrl: platform.baseServicesUrl, carbonTheme: carbonTheme, 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 })),
                 isSendMailEnabled && (React__default.default.createElement(HeaderMenuItem.default, { key: "email-preferences", href: `${platform.baseEnvUrl}/launchpad/email-preferences`, icon: React__default.default.createElement(icons.Email, null), kind: "internal", text: "Email Preferences", type: "link" })),
                 !isPrivacyStatementDisabled && (React__default.default.createElement(PrivacyStatement.PrivacyStatementMenuItem, { key: "privacy-statement", baseServicesUrl: platform.baseServicesUrl, platformEmail: platform?.platformEmail })),

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

@@ -1,6 +1,6 @@
 import React from 'react';
 import { Theme, Header as Header$1, SkipToContent, HeaderName, HeaderNavigation, HeaderMenuItem, HeaderGlobalBar, HeaderPanel, HeaderMenuButton, SideNav, SideNavItems, SideNavLink } from '@carbon/react';
-import { Help, Collaborate, NotificationNew, Notification, UserAvatar, Close, Switcher, OpenPanelFilledRight } from '@carbon/react/icons';
+import { Wikis, Checkmark, Collaborate, NotificationNew, Notification, Help, UserAvatar, Close, Switcher, OpenPanelFilledRight } from '@carbon/react/icons';
 import HeaderAppSwitcher from './HeaderAppSwitcher.js';
 import HeaderMenu from './HeaderMenu.js';
 import NotificationsContainer from '../Notifications/NotificationsContainer.js';
@@ -46,8 +46,9 @@ const MenuAriaLabelRecord = {
     Switcher: "Switcher menu",
 };
 const headerButtonClassNames = "cds--btn--icon-only cds--header__action cds--btn cds--btn--primary cds--btn--icon-only cds--btn cds--btn--primary";
+const instanceCheckMarkStyle = "instance-checkmark-style";
 function Header(props) {
-    const { productName, baseEnvUrl, baseServicesUrl, carbonTheme = "g10", className, navLinks, prefixName = "", rightPanel, skipToContentProps, templateMeteringEvent, triggerEvent, userTeams, } = props;
+    const { productName, baseEnvUrl, baseServicesUrl, carbonTheme = "g10", className, navLinks, platform, prefixName = "", rightPanel, skipToContentProps, templateMeteringEvent, triggerEvent, userTeams, } = props;
     return (React.createElement(React.Fragment, null,
         React.createElement(Theme, { theme: carbonTheme },
             React.createElement(Header$1, { "aria-label": "App navigation header", className: className },
@@ -58,9 +59,8 @@ 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(InstanceSwitcherMenu, { enabled: true, 
-                        // enabled={Array.isArray(props.instanceSwitcherMenuItems) && props.instanceSwitcherMenuItems.length > 0}
-                        menuItems: props.instanceSwitcherMenuItems }),
+                    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) }),
                     React.createElement(SupportMenu, { enabled: Array.isArray(props.supportMenuItems) && props.supportMenuItems.length > 0, menuItems: props.supportMenuItems }),
@@ -70,18 +70,22 @@ function Header(props) {
         React.createElement(NotificationsContainer, { enableMultiContainer: true, containerId: `${prefix}--bmrg-header-notifications` })));
 }
 function InstanceSwitcherMenu(props) {
+    const currentURL = "https://au.ica.ibm.com";
     const { isOpen, toggleActive, ref } = useHeaderMenu(MenuButtonId.InstanceSwitcher);
     if (!props.enabled) {
         return null;
     }
-    return (React.createElement("div", { style: { position: "relative" }, ref: ref },
+    return (React.createElement("div", { className: `${prefix}--bmrg-header-instance-switcher`, style: { position: "relative" }, ref: ref },
         React.createElement("button", { "aria-controls": MenuListId.instanceSwitcher, "aria-expanded": isOpen, "aria-haspopup": "menu", "aria-label": MenuAriaLabelRecord.instanceSwitcher, className: headerButtonClassNames, "data-testid": "header-instanceSwitcher-link", id: MenuButtonId.InstanceSwitcher, onClick: toggleActive },
-            React.createElement(Help, { size: 20 })),
-        isOpen ? (React.createElement(HeaderMenu, { "aria-labelledby": MenuButtonId.InstanceSwitcher, id: MenuListId.instanceSwitcher },
-            React.createElement(HeaderMenuItem, { key: "Global", text: "Global", type: "link", kind: "app", href: "https://servicesessentials.ibm.com/launchpad", target: "_self" },
-                React.createElement("div", null, "Global")),
-            React.createElement(HeaderMenuItem, { key: "Australlia", text: "Australlia", type: "link", kind: "app", href: "https://au.ica.ibm.com", target: "_self" }, "Australlia"),
-            React.createElement(HeaderMenuItem, { key: "Canada", text: "Australlia", type: "link", kind: "app", href: "https://canada.ica.ibm.com", target: "_self" }, "Canada"))) : null));
+            React.createElement(Wikis, { size: 20 })),
+        isOpen ? (React.createElement(HeaderMenu, { "aria-labelledby": MenuButtonId.InstanceSwitcher, id: MenuListId.instanceSwitcher }, Array.isArray(props.menuItems)
+            ? props.menuItems.map((item) => (React.createElement(HeaderMenuItem, { "aria-label": `Instance Switcher for ${item.instanceName}`, "data-testid": "header-menu-instance-switcher", href: item.url, isCurrentPage: window?.location?.href && item.url ? window.location.href.startsWith(item.url) : false, key: item.instanceName, target: "_self", rel: "noopener noreferrer" },
+                React.createElement("div", null,
+                    React.createElement("span", null, "AU"),
+                    currentURL.includes((item.instanceName).toLowerCase()) ? React.createElement("span", { className: instanceCheckMarkStyle },
+                        React.createElement(Checkmark, null),
+                        " ") : ""))))
+            : null)) : null));
 }
 function RequestsMenu(props) {
     const { isOpen, toggleActive, ref } = useHeaderMenu(MenuButtonId.Requests);

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

@@ -32,6 +32,7 @@ function UIShell({ baseEnvUrl, carbonTheme = "g10", config, leftPanel, platformN
      * Check feature enablement via explicit feature flags
      */
     const isAppSwitcherEnabled = Boolean(features?.["appSwitcher.enabled"]);
+    const instanceSwitcherEnabled = Boolean(platform?.["instanceSwitcherEnabled"]);
     const isFeedbackEnabled = Boolean(features?.["feedback.enabled"]);
     const isNotificationsEnabled = Boolean(features?.["notifications.enabled"]);
     const isNotificationsCountEnabled = Boolean(features?.["notificationsCount.enabled"]);
@@ -60,7 +61,7 @@ function UIShell({ baseEnvUrl, carbonTheme = "g10", config, leftPanel, platformN
      */
     const isPrivacyStatementDisabled = renderPrivacyStatement === false || features?.["consent.enabled"] === false;
     return (React.createElement(QueryClientProvider, { client: queryClient },
-        React.createElement(Header, { baseEnvUrl: platform.baseEnvUrl, baseServicesUrl: platform.baseServicesUrl, carbonTheme: carbonTheme, enableAppSwitcher: isAppSwitcherEnabled, enableNotifications: isNotificationsEnabled, enableNotificationsCount: isNotificationsCountEnabled, leftPanel: leftPanel, navLinks: navigation, platformMessage: platformMessage, prefixName: names.platformName, productName: names.productName, rightPanel: rightPanel, requestSummary: user?.requestSummary, skipToContentProps: skipToContentProps, templateMeteringEvent: templateMeteringEvent, triggerEvent: triggerEvent, profileMenuItems: [
+        React.createElement(Header, { baseEnvUrl: platform.baseEnvUrl, baseServicesUrl: platform.baseServicesUrl, carbonTheme: carbonTheme, 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 })),
                 isSendMailEnabled && (React.createElement(HeaderMenuItem, { key: "email-preferences", href: `${platform.baseEnvUrl}/launchpad/email-preferences`, icon: React.createElement(Email, null), kind: "internal", text: "Email Preferences", type: "link" })),
                 !isPrivacyStatementDisabled && (React.createElement(PrivacyStatementMenuItem, { key: "privacy-statement", baseServicesUrl: platform.baseServicesUrl, platformEmail: platform?.platformEmail })),

package/dist/types/index.d.ts

@@ -349,6 +349,7 @@ type Props$G = {
     carbonTheme?: "white" | "g10" | "g90" | "g100";
     className?: string;
     enableAppSwitcher?: boolean;
+    instanceSwitcherEnabled?: boolean;
     enableNotifications?: boolean;
     enableNotificationsCount?: boolean;
     leftPanel?: (args: {
@@ -357,6 +358,7 @@ type Props$G = {
         navLinks?: NavLink[];
     }) => React.ReactNode;
     navLinks?: NavLink[];
+    platform?: any;
     platformMessage?: string;
     prefixName?: string;
     productName: string;
@@ -1385,6 +1387,8 @@ type Props = {
             askICAEnabled?: boolean;
             signOutUrl?: string;
             version?: string;
+            instanceSwitcherEnabled?: boolean;
+            instances?: any[];
             assistantVersion?: string;
             agentsVersion?: string;
             scribeFlowVersion?: string;

package/package.json

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

package/scss/components/Header/_header.scss

@@ -115,7 +115,15 @@ IBM Confidential
       align-items: center;
       font-size: 10px;
     }
-    
+  .#{$prefix}--bmrg-header-instance-switcher .cds--bmrg-header-drop-down a.cds--header__menu-item
+  {
+       padding: 10px 15px !important;
+       border-bottom: 1px solid lightgrey !important;
+  }   
+  .instance-checkmark-style
+  {
+    padding-left: 8rem;
+  }
     // span, p, a, div {
     //   color: shell.$bmrg-theme-primary;
     //   &:hover {
@@ -142,11 +150,7 @@ a.#{$prefix}--header__menu-item {
     color: shell.$bmrg-theme-primary !important;
     background-color: shell.$bmrg-theme-active !important;
   }
-}
-#InstanceSwitcher .cds--header .cds--bmrg-header-drop-down a.cds--header__menu-item
-{
-  padding: 10px 15px;
-  border-bottom: 1px solid lightgrey;
+  
 }
 a.#{$prefix}--side-nav__link {
   color: shell.$bmrg-theme-secondary;