@boomerang-io/carbon-addons-boomerang-react 4.6.5-beta.18 → 4.6.5-beta.20

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.
Files changed (3) hide show
  1. package/dist/cjs/components/Header/Header.js +11 -6
  2. package/dist/esm/components/Header/Header.js +12 -7
  3. package/package.json +1 -1
package/dist/cjs/components/Header/Header.js CHANGED
@@ -55,11 +55,6 @@ const MenuAriaLabelRecord = {
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
57
  function Header(props) {
58
- // const currentURL= window.location.href;
59
- const currentURL = "https://canada.ica.ibm.com/ica/launchpad";
60
- const isCanadaInstance = currentURL.startsWith("canada");
61
- console.log("currentURL", currentURL);
62
- console.log("isCanadaInstance", isCanadaInstance);
63
58
  const { productName, baseEnvUrl, baseServicesUrl, carbonTheme = "g10", className, navLinks, prefixName = "", rightPanel, skipToContentProps, templateMeteringEvent, triggerEvent, userTeams, } = props;
64
59
  return (React__default.default.createElement(React__default.default.Fragment, null,
65
60
  React__default.default.createElement(react.Theme, { theme: carbonTheme },
@@ -81,6 +76,11 @@ function Header(props) {
81
76
  React__default.default.createElement(NotificationsContainer.default, { enableMultiContainer: true, containerId: `${settings.prefix}--bmrg-header-notifications` })));
82
77
  }
83
78
  function InstanceSwitcherMenu(props) {
79
+ // const currentURL= window.location.href;
80
+ const currentURL = "https://canada.ica.ibm.com/ica/launchpad";
81
+ const isCanadaInstance = currentURL.includes("canada");
82
+ console.log("currentURL", currentURL);
83
+ console.log("isCanadaInstance", isCanadaInstance);
84
84
  const { isOpen, toggleActive, ref } = useHeaderMenu.default(MenuButtonId.InstanceSwitcher);
85
85
  if (!props.enabled) {
86
86
  return null;
@@ -89,7 +89,12 @@ function InstanceSwitcherMenu(props) {
89
89
  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 },
90
90
  React__default.default.createElement(icons.Wikis, { size: 20 })),
91
91
  isOpen ? (React__default.default.createElement(HeaderMenu.default, { "aria-labelledby": MenuButtonId.InstanceSwitcher, id: MenuListId.instanceSwitcher },
92
- React__default.default.createElement(react.HeaderMenuItem, { key: "UKI", text: "UKI", type: "link", kind: "app", href: "http://uki.ica.ibm.com", target: "_self" }, "UKI"),
92
+ React__default.default.createElement(react.HeaderMenuItem, { key: "UKI", text: "UKI", type: "link", kind: "app", href: "http://uki.ica.ibm.com", target: "_self" },
93
+ React__default.default.createElement("div", null,
94
+ React__default.default.createElement("span", null, "UKI"),
95
+ " ",
96
+ isCanadaInstance ? (React__default.default.createElement("span", null,
97
+ React__default.default.createElement(react.Checkmark, null))) : "")),
93
98
  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"),
94
99
  React__default.default.createElement(react.HeaderMenuItem, { key: "Canada", text: "Canada", type: "link", kind: "app", href: "https://canada.ica.ibm.com", target: "_self" }, "Canada"),
95
100
  React__default.default.createElement(react.HeaderMenuItem, { key: "USA", text: "USA", type: "link", kind: "app", href: "http://us.ica.ibm.com", target: "_self" }, "USA"),
package/dist/esm/components/Header/Header.js CHANGED
@@ -1,5 +1,5 @@
1
1
  import React from 'react';
2
- import { Theme, Header as Header$1, SkipToContent, HeaderName, HeaderNavigation, HeaderMenuItem, HeaderGlobalBar, HeaderPanel, HeaderMenuButton, SideNav, SideNavItems, SideNavLink } from '@carbon/react';
2
+ import { Theme, Header as Header$1, SkipToContent, HeaderName, HeaderNavigation, HeaderMenuItem, HeaderGlobalBar, Checkmark, HeaderPanel, HeaderMenuButton, SideNav, SideNavItems, SideNavLink } from '@carbon/react';
3
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';
@@ -47,11 +47,6 @@ const MenuAriaLabelRecord = {
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
49
  function Header(props) {
50
- // const currentURL= window.location.href;
51
- const currentURL = "https://canada.ica.ibm.com/ica/launchpad";
52
- const isCanadaInstance = currentURL.startsWith("canada");
53
- console.log("currentURL", currentURL);
54
- console.log("isCanadaInstance", isCanadaInstance);
55
50
  const { productName, baseEnvUrl, baseServicesUrl, carbonTheme = "g10", className, navLinks, prefixName = "", rightPanel, skipToContentProps, templateMeteringEvent, triggerEvent, userTeams, } = props;
56
51
  return (React.createElement(React.Fragment, null,
57
52
  React.createElement(Theme, { theme: carbonTheme },
@@ -73,6 +68,11 @@ function Header(props) {
73
68
  React.createElement(NotificationsContainer, { enableMultiContainer: true, containerId: `${prefix}--bmrg-header-notifications` })));
74
69
  }
75
70
  function InstanceSwitcherMenu(props) {
71
+ // const currentURL= window.location.href;
72
+ const currentURL = "https://canada.ica.ibm.com/ica/launchpad";
73
+ const isCanadaInstance = currentURL.includes("canada");
74
+ console.log("currentURL", currentURL);
75
+ console.log("isCanadaInstance", isCanadaInstance);
76
76
  const { isOpen, toggleActive, ref } = useHeaderMenu(MenuButtonId.InstanceSwitcher);
77
77
  if (!props.enabled) {
78
78
  return null;
@@ -81,7 +81,12 @@ function InstanceSwitcherMenu(props) {
81
81
  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 },
82
82
  React.createElement(Wikis, { size: 20 })),
83
83
  isOpen ? (React.createElement(HeaderMenu, { "aria-labelledby": MenuButtonId.InstanceSwitcher, id: MenuListId.instanceSwitcher },
84
- React.createElement(HeaderMenuItem, { key: "UKI", text: "UKI", type: "link", kind: "app", href: "http://uki.ica.ibm.com", target: "_self" }, "UKI"),
84
+ React.createElement(HeaderMenuItem, { key: "UKI", text: "UKI", type: "link", kind: "app", href: "http://uki.ica.ibm.com", target: "_self" },
85
+ React.createElement("div", null,
86
+ React.createElement("span", null, "UKI"),
87
+ " ",
88
+ isCanadaInstance ? (React.createElement("span", null,
89
+ React.createElement(Checkmark, null))) : "")),
85
90
  React.createElement(HeaderMenuItem, { key: "R-EMEA", text: "R-EMEA", type: "link", kind: "app", href: "http://remea.ica.ibm.com", target: "_self" }, "R-EMEA"),
86
91
  React.createElement(HeaderMenuItem, { key: "Canada", text: "Canada", type: "link", kind: "app", href: "https://canada.ica.ibm.com", target: "_self" }, "Canada"),
87
92
  React.createElement(HeaderMenuItem, { key: "USA", text: "USA", type: "link", kind: "app", href: "http://us.ica.ibm.com", target: "_self" }, "USA"),
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@boomerang-io/carbon-addons-boomerang-react",
3
3
  "description": "Carbon Addons for Boomerang apps",
4
- "version": "4.6.5-beta.18",
4
+ "version": "4.6.5-beta.20",
5
5
  "author": {
6
6
  "name": "Tim Bula",
7
7
  "email": "timrbula@gmail.com"