@boomerang-io/carbon-addons-boomerang-react 4.6.5-beta.27 → 4.6.5-beta.28
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -54,7 +54,6 @@ const MenuAriaLabelRecord = {
|
|
|
54
54
|
Switcher: "Switcher menu",
|
|
55
55
|
};
|
|
56
56
|
const headerButtonClassNames = "cds--btn--icon-only cds--header__action cds--btn cds--btn--primary cds--btn--icon-only cds--btn cds--btn--primary";
|
|
57
|
-
const instanceCheckMarkStyle = "instance-checkmark-style";
|
|
58
57
|
function Header(props) {
|
|
59
58
|
const { productName, baseEnvUrl, baseServicesUrl, carbonTheme = "g10", className, navLinks, platform, prefixName = "", rightPanel, skipToContentProps, templateMeteringEvent, triggerEvent, userTeams, } = props;
|
|
60
59
|
console.log("platform", platform);
|
|
@@ -70,7 +69,8 @@ function Header(props) {
|
|
|
70
69
|
? 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)))
|
|
71
70
|
: null),
|
|
72
71
|
React__default.default.createElement(react.HeaderGlobalBar, null,
|
|
73
|
-
|
|
72
|
+
platform?.instanceSwitcherEnabled &&
|
|
73
|
+
React__default.default.createElement(InstanceSwitcherMenu, { enabled: Boolean(props.instanceSwitcherEnabled), menuItems: platform?.instances }),
|
|
74
74
|
React__default.default.createElement(RequestsMenu, { baseEnvUrl: baseEnvUrl, enabled: Boolean(props.requestSummary), summary: props.requestSummary }),
|
|
75
75
|
React__default.default.createElement(NotificationsMenu, { baseEnvUrl: baseEnvUrl, baseServicesUrl: baseServicesUrl, enabled: Boolean(props.enableNotifications), countEnabled: Boolean(props.enableNotificationsCount) }),
|
|
76
76
|
React__default.default.createElement(SupportMenu, { enabled: Array.isArray(props.supportMenuItems) && props.supportMenuItems.length > 0, menuItems: props.supportMenuItems }),
|
|
@@ -82,9 +82,8 @@ function Header(props) {
|
|
|
82
82
|
function InstanceSwitcherMenu(props) {
|
|
83
83
|
// const currentURL= window.location.href;
|
|
84
84
|
const currentURL = "https://canada.ica.ibm.com/ica/launchpad";
|
|
85
|
-
const isCanadaInstance = currentURL.includes("canada");
|
|
86
85
|
console.log("currentURL", currentURL);
|
|
87
|
-
console.log("
|
|
86
|
+
console.log("menuItems", props.menuItems);
|
|
88
87
|
const { isOpen, toggleActive, ref } = useHeaderMenu.default(MenuButtonId.InstanceSwitcher);
|
|
89
88
|
if (!props.enabled) {
|
|
90
89
|
return null;
|
|
@@ -92,19 +91,9 @@ function InstanceSwitcherMenu(props) {
|
|
|
92
91
|
return (React__default.default.createElement("div", { className: `${settings.prefix}--bmrg-header-instance-switcher`, style: { position: "relative" }, ref: ref },
|
|
93
92
|
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 },
|
|
94
93
|
React__default.default.createElement(icons.Wikis, { size: 20 })),
|
|
95
|
-
isOpen ? (React__default.default.createElement(HeaderMenu.default, { "aria-labelledby": MenuButtonId.InstanceSwitcher, id: MenuListId.instanceSwitcher },
|
|
96
|
-
React__default.default.createElement(react.HeaderMenuItem, {
|
|
97
|
-
|
|
98
|
-
React__default.default.createElement(react.HeaderMenuItem, { key: "Canada", text: "Canada", type: "link", kind: "app", href: "https://canada.ica.ibm.com", target: "_self" },
|
|
99
|
-
React__default.default.createElement("div", null,
|
|
100
|
-
React__default.default.createElement("span", null, "Canada"),
|
|
101
|
-
isCanadaInstance ? React__default.default.createElement("span", { className: instanceCheckMarkStyle },
|
|
102
|
-
React__default.default.createElement(icons.Checkmark, null),
|
|
103
|
-
" ") : "")),
|
|
104
|
-
React__default.default.createElement(react.HeaderMenuItem, { key: "USA", text: "USA", type: "link", kind: "app", href: "http://us.ica.ibm.com", target: "_self" }, "USA"),
|
|
105
|
-
React__default.default.createElement(react.HeaderMenuItem, { key: "Australia", text: "Australlia", type: "link", kind: "app", href: "https://au.ica.ibm.com", target: "_self" }, "Australia"),
|
|
106
|
-
React__default.default.createElement(react.HeaderMenuItem, { key: "Japan", text: "Global", type: "link", kind: "app", href: "http://japan.ica.ibm.com", target: "_self" }, "Japan"),
|
|
107
|
-
React__default.default.createElement(react.HeaderMenuItem, { key: "Global", text: "Global", type: "link", kind: "app", href: "https://servicesessentials.ibm.com/launchpad", target: "_self" }, "Global"))) : null));
|
|
94
|
+
isOpen ? (React__default.default.createElement(HeaderMenu.default, { "aria-labelledby": MenuButtonId.InstanceSwitcher, id: MenuListId.instanceSwitcher }, Array.isArray(props.menuItems)
|
|
95
|
+
? 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" }, item.instanceName)))
|
|
96
|
+
: null)) : null));
|
|
108
97
|
}
|
|
109
98
|
function RequestsMenu(props) {
|
|
110
99
|
const { isOpen, toggleActive, ref } = useHeaderMenu.default(MenuButtonId.Requests);
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
2
|
import { Theme, Header as Header$1, SkipToContent, HeaderName, HeaderNavigation, HeaderMenuItem, HeaderGlobalBar, HeaderPanel, HeaderMenuButton, SideNav, SideNavItems, SideNavLink } from '@carbon/react';
|
|
3
|
-
import { Wikis,
|
|
3
|
+
import { Wikis, Collaborate, NotificationNew, Notification, Help, UserAvatar, Close, Switcher, OpenPanelFilledRight } from '@carbon/react/icons';
|
|
4
4
|
import HeaderAppSwitcher from './HeaderAppSwitcher.js';
|
|
5
5
|
import HeaderMenu from './HeaderMenu.js';
|
|
6
6
|
import NotificationsContainer from '../Notifications/NotificationsContainer.js';
|
|
@@ -46,7 +46,6 @@ const MenuAriaLabelRecord = {
|
|
|
46
46
|
Switcher: "Switcher menu",
|
|
47
47
|
};
|
|
48
48
|
const headerButtonClassNames = "cds--btn--icon-only cds--header__action cds--btn cds--btn--primary cds--btn--icon-only cds--btn cds--btn--primary";
|
|
49
|
-
const instanceCheckMarkStyle = "instance-checkmark-style";
|
|
50
49
|
function Header(props) {
|
|
51
50
|
const { productName, baseEnvUrl, baseServicesUrl, carbonTheme = "g10", className, navLinks, platform, prefixName = "", rightPanel, skipToContentProps, templateMeteringEvent, triggerEvent, userTeams, } = props;
|
|
52
51
|
console.log("platform", platform);
|
|
@@ -62,7 +61,8 @@ function Header(props) {
|
|
|
62
61
|
? 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)))
|
|
63
62
|
: null),
|
|
64
63
|
React.createElement(HeaderGlobalBar, null,
|
|
65
|
-
|
|
64
|
+
platform?.instanceSwitcherEnabled &&
|
|
65
|
+
React.createElement(InstanceSwitcherMenu, { enabled: Boolean(props.instanceSwitcherEnabled), menuItems: platform?.instances }),
|
|
66
66
|
React.createElement(RequestsMenu, { baseEnvUrl: baseEnvUrl, enabled: Boolean(props.requestSummary), summary: props.requestSummary }),
|
|
67
67
|
React.createElement(NotificationsMenu, { baseEnvUrl: baseEnvUrl, baseServicesUrl: baseServicesUrl, enabled: Boolean(props.enableNotifications), countEnabled: Boolean(props.enableNotificationsCount) }),
|
|
68
68
|
React.createElement(SupportMenu, { enabled: Array.isArray(props.supportMenuItems) && props.supportMenuItems.length > 0, menuItems: props.supportMenuItems }),
|
|
@@ -74,9 +74,8 @@ function Header(props) {
|
|
|
74
74
|
function InstanceSwitcherMenu(props) {
|
|
75
75
|
// const currentURL= window.location.href;
|
|
76
76
|
const currentURL = "https://canada.ica.ibm.com/ica/launchpad";
|
|
77
|
-
const isCanadaInstance = currentURL.includes("canada");
|
|
78
77
|
console.log("currentURL", currentURL);
|
|
79
|
-
console.log("
|
|
78
|
+
console.log("menuItems", props.menuItems);
|
|
80
79
|
const { isOpen, toggleActive, ref } = useHeaderMenu(MenuButtonId.InstanceSwitcher);
|
|
81
80
|
if (!props.enabled) {
|
|
82
81
|
return null;
|
|
@@ -84,19 +83,9 @@ function InstanceSwitcherMenu(props) {
|
|
|
84
83
|
return (React.createElement("div", { className: `${prefix}--bmrg-header-instance-switcher`, style: { position: "relative" }, ref: ref },
|
|
85
84
|
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 },
|
|
86
85
|
React.createElement(Wikis, { size: 20 })),
|
|
87
|
-
isOpen ? (React.createElement(HeaderMenu, { "aria-labelledby": MenuButtonId.InstanceSwitcher, id: MenuListId.instanceSwitcher },
|
|
88
|
-
React.createElement(HeaderMenuItem, {
|
|
89
|
-
|
|
90
|
-
React.createElement(HeaderMenuItem, { key: "Canada", text: "Canada", type: "link", kind: "app", href: "https://canada.ica.ibm.com", target: "_self" },
|
|
91
|
-
React.createElement("div", null,
|
|
92
|
-
React.createElement("span", null, "Canada"),
|
|
93
|
-
isCanadaInstance ? React.createElement("span", { className: instanceCheckMarkStyle },
|
|
94
|
-
React.createElement(Checkmark, null),
|
|
95
|
-
" ") : "")),
|
|
96
|
-
React.createElement(HeaderMenuItem, { key: "USA", text: "USA", type: "link", kind: "app", href: "http://us.ica.ibm.com", target: "_self" }, "USA"),
|
|
97
|
-
React.createElement(HeaderMenuItem, { key: "Australia", text: "Australlia", type: "link", kind: "app", href: "https://au.ica.ibm.com", target: "_self" }, "Australia"),
|
|
98
|
-
React.createElement(HeaderMenuItem, { key: "Japan", text: "Global", type: "link", kind: "app", href: "http://japan.ica.ibm.com", target: "_self" }, "Japan"),
|
|
99
|
-
React.createElement(HeaderMenuItem, { key: "Global", text: "Global", type: "link", kind: "app", href: "https://servicesessentials.ibm.com/launchpad", target: "_self" }, "Global"))) : null));
|
|
86
|
+
isOpen ? (React.createElement(HeaderMenu, { "aria-labelledby": MenuButtonId.InstanceSwitcher, id: MenuListId.instanceSwitcher }, Array.isArray(props.menuItems)
|
|
87
|
+
? 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" }, item.instanceName)))
|
|
88
|
+
: null)) : null));
|
|
100
89
|
}
|
|
101
90
|
function RequestsMenu(props) {
|
|
102
91
|
const { isOpen, toggleActive, ref } = useHeaderMenu(MenuButtonId.Requests);
|
package/package.json
CHANGED