@boomerang-io/carbon-addons-boomerang-react 4.6.5-beta.27 → 4.6.5-beta.29
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.
|
@@ -70,7 +70,8 @@ function Header(props) {
|
|
|
70
70
|
? 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
71
|
: null),
|
|
72
72
|
React__default.default.createElement(react.HeaderGlobalBar, null,
|
|
73
|
-
|
|
73
|
+
platform?.instanceSwitcherEnabled &&
|
|
74
|
+
React__default.default.createElement(InstanceSwitcherMenu, { enabled: Boolean(props.instanceSwitcherEnabled), menuItems: platform?.instances }),
|
|
74
75
|
React__default.default.createElement(RequestsMenu, { baseEnvUrl: baseEnvUrl, enabled: Boolean(props.requestSummary), summary: props.requestSummary }),
|
|
75
76
|
React__default.default.createElement(NotificationsMenu, { baseEnvUrl: baseEnvUrl, baseServicesUrl: baseServicesUrl, enabled: Boolean(props.enableNotifications), countEnabled: Boolean(props.enableNotificationsCount) }),
|
|
76
77
|
React__default.default.createElement(SupportMenu, { enabled: Array.isArray(props.supportMenuItems) && props.supportMenuItems.length > 0, menuItems: props.supportMenuItems }),
|
|
@@ -82,9 +83,6 @@ function Header(props) {
|
|
|
82
83
|
function InstanceSwitcherMenu(props) {
|
|
83
84
|
// const currentURL= window.location.href;
|
|
84
85
|
const currentURL = "https://canada.ica.ibm.com/ica/launchpad";
|
|
85
|
-
const isCanadaInstance = currentURL.includes("canada");
|
|
86
|
-
console.log("currentURL", currentURL);
|
|
87
|
-
console.log("isCanadaInstance", isCanadaInstance);
|
|
88
86
|
const { isOpen, toggleActive, ref } = useHeaderMenu.default(MenuButtonId.InstanceSwitcher);
|
|
89
87
|
if (!props.enabled) {
|
|
90
88
|
return null;
|
|
@@ -92,19 +90,14 @@ function InstanceSwitcherMenu(props) {
|
|
|
92
90
|
return (React__default.default.createElement("div", { className: `${settings.prefix}--bmrg-header-instance-switcher`, style: { position: "relative" }, ref: ref },
|
|
93
91
|
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
92
|
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
|
-
React__default.default.createElement(react.HeaderMenuItem, { key: "R-EMEA", text: "R-EMEA", type: "link", kind: "app", href: "http://remea.ica.ibm.com", target: "_self" }, "R-EMEA"),
|
|
98
|
-
React__default.default.createElement(react.HeaderMenuItem, { key: "Canada", text: "Canada", type: "link", kind: "app", href: "https://canada.ica.ibm.com", target: "_self" },
|
|
93
|
+
isOpen ? (React__default.default.createElement(HeaderMenu.default, { "aria-labelledby": MenuButtonId.InstanceSwitcher, id: MenuListId.instanceSwitcher }, Array.isArray(props.menuItems)
|
|
94
|
+
? 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" },
|
|
99
95
|
React__default.default.createElement("div", null,
|
|
100
|
-
React__default.default.createElement("span", null,
|
|
101
|
-
|
|
96
|
+
React__default.default.createElement("span", null, item.instanceName),
|
|
97
|
+
currentURL.includes(item.instanceName) ? React__default.default.createElement("span", { className: instanceCheckMarkStyle },
|
|
102
98
|
React__default.default.createElement(icons.Checkmark, null),
|
|
103
|
-
" ") : ""))
|
|
104
|
-
|
|
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));
|
|
99
|
+
" ") : ""))))
|
|
100
|
+
: null)) : null));
|
|
108
101
|
}
|
|
109
102
|
function RequestsMenu(props) {
|
|
110
103
|
const { isOpen, toggleActive, ref } = useHeaderMenu.default(MenuButtonId.Requests);
|
|
@@ -62,7 +62,8 @@ function Header(props) {
|
|
|
62
62
|
? 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
63
|
: null),
|
|
64
64
|
React.createElement(HeaderGlobalBar, null,
|
|
65
|
-
|
|
65
|
+
platform?.instanceSwitcherEnabled &&
|
|
66
|
+
React.createElement(InstanceSwitcherMenu, { enabled: Boolean(props.instanceSwitcherEnabled), menuItems: platform?.instances }),
|
|
66
67
|
React.createElement(RequestsMenu, { baseEnvUrl: baseEnvUrl, enabled: Boolean(props.requestSummary), summary: props.requestSummary }),
|
|
67
68
|
React.createElement(NotificationsMenu, { baseEnvUrl: baseEnvUrl, baseServicesUrl: baseServicesUrl, enabled: Boolean(props.enableNotifications), countEnabled: Boolean(props.enableNotificationsCount) }),
|
|
68
69
|
React.createElement(SupportMenu, { enabled: Array.isArray(props.supportMenuItems) && props.supportMenuItems.length > 0, menuItems: props.supportMenuItems }),
|
|
@@ -74,9 +75,6 @@ function Header(props) {
|
|
|
74
75
|
function InstanceSwitcherMenu(props) {
|
|
75
76
|
// const currentURL= window.location.href;
|
|
76
77
|
const currentURL = "https://canada.ica.ibm.com/ica/launchpad";
|
|
77
|
-
const isCanadaInstance = currentURL.includes("canada");
|
|
78
|
-
console.log("currentURL", currentURL);
|
|
79
|
-
console.log("isCanadaInstance", isCanadaInstance);
|
|
80
78
|
const { isOpen, toggleActive, ref } = useHeaderMenu(MenuButtonId.InstanceSwitcher);
|
|
81
79
|
if (!props.enabled) {
|
|
82
80
|
return null;
|
|
@@ -84,19 +82,14 @@ function InstanceSwitcherMenu(props) {
|
|
|
84
82
|
return (React.createElement("div", { className: `${prefix}--bmrg-header-instance-switcher`, style: { position: "relative" }, ref: ref },
|
|
85
83
|
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
84
|
React.createElement(Wikis, { size: 20 })),
|
|
87
|
-
isOpen ? (React.createElement(HeaderMenu, { "aria-labelledby": MenuButtonId.InstanceSwitcher, id: MenuListId.instanceSwitcher },
|
|
88
|
-
React.createElement(HeaderMenuItem, {
|
|
89
|
-
React.createElement(HeaderMenuItem, { key: "R-EMEA", text: "R-EMEA", type: "link", kind: "app", href: "http://remea.ica.ibm.com", target: "_self" }, "R-EMEA"),
|
|
90
|
-
React.createElement(HeaderMenuItem, { key: "Canada", text: "Canada", type: "link", kind: "app", href: "https://canada.ica.ibm.com", target: "_self" },
|
|
85
|
+
isOpen ? (React.createElement(HeaderMenu, { "aria-labelledby": MenuButtonId.InstanceSwitcher, id: MenuListId.instanceSwitcher }, Array.isArray(props.menuItems)
|
|
86
|
+
? 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" },
|
|
91
87
|
React.createElement("div", null,
|
|
92
|
-
React.createElement("span", null,
|
|
93
|
-
|
|
88
|
+
React.createElement("span", null, item.instanceName),
|
|
89
|
+
currentURL.includes(item.instanceName) ? React.createElement("span", { className: instanceCheckMarkStyle },
|
|
94
90
|
React.createElement(Checkmark, null),
|
|
95
|
-
" ") : ""))
|
|
96
|
-
|
|
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));
|
|
91
|
+
" ") : ""))))
|
|
92
|
+
: null)) : null));
|
|
100
93
|
}
|
|
101
94
|
function RequestsMenu(props) {
|
|
102
95
|
const { isOpen, toggleActive, ref } = useHeaderMenu(MenuButtonId.Requests);
|
package/package.json
CHANGED