@boomerang-io/carbon-addons-boomerang-react 4.6.9-beta.15 → 4.6.9-beta.17

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.
@@ -60,14 +60,8 @@ const headerButtonClassNames = "cds--btn--icon-only cds--header__action cds--btn
60
60
  const instanceCheckMarkContainerClass = "instance-checkmark-style-container";
61
61
  function Header(props) {
62
62
  const { productName, baseEnvUrl, baseServicesUrl, carbonTheme = "g10", className, navLinks, platform, prefixName = "", rightPanel, skipToContentProps, templateMeteringEvent, triggerEvent, userTeams, } = props;
63
- userTeams?.data?.accountTeams;
64
- userTeams?.data?.standardTeams;
65
- userTeams?.data?.personalTeam;
66
- console.log("personalTeam", userTeams?.data?.standardTeams);
67
- console.log("accountTeams", userTeams?.data?.personalTeam);
68
- console.log("standardTeams", userTeams?.data?.accountTeams);
69
- // const allTeams=[...personalTeam, ...standardTeams,...accountTeams]
70
- // console.log("allTeams",allTeams);
63
+ const combinedArray = userTeams?.data?.standardTeams.concat(userTeams?.data?.personalTeam, userTeams?.data?.accountTeams);
64
+ console.log("combinedArray", combinedArray);
71
65
  return (React__default.default.createElement(React__default.default.Fragment, null,
72
66
  React__default.default.createElement(react.Theme, { theme: carbonTheme },
73
67
  React__default.default.createElement(react.Header, { "aria-label": "App navigation header", className: className },
@@ -78,7 +72,7 @@ function Header(props) {
78
72
  ? 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)))
79
73
  : null),
80
74
  React__default.default.createElement(react.HeaderGlobalBar, null,
81
- React__default.default.createElement(DefaultTeamsFlowMenu, { menuItems: userTeams?.data?.standardTeams }),
75
+ React__default.default.createElement(DefaultTeamsFlowMenu, { menuItems: combinedArray }),
82
76
  props?.instanceSwitcherEnabled && (React__default.default.createElement(InstanceSwitcherMenu, { enabled: Boolean(props.instanceSwitcherEnabled), menuItems: platform?.instances })),
83
77
  React__default.default.createElement(RequestsMenu, { baseEnvUrl: baseEnvUrl, enabled: Boolean(props.requestSummary), summary: props.requestSummary }),
84
78
  React__default.default.createElement(NotificationsMenu, { baseEnvUrl: baseEnvUrl, baseServicesUrl: baseServicesUrl, enabled: Boolean(props.enableNotifications), countEnabled: Boolean(props.enableNotificationsCount) }),
@@ -52,14 +52,8 @@ const headerButtonClassNames = "cds--btn--icon-only cds--header__action cds--btn
52
52
  const instanceCheckMarkContainerClass = "instance-checkmark-style-container";
53
53
  function Header(props) {
54
54
  const { productName, baseEnvUrl, baseServicesUrl, carbonTheme = "g10", className, navLinks, platform, prefixName = "", rightPanel, skipToContentProps, templateMeteringEvent, triggerEvent, userTeams, } = props;
55
- userTeams?.data?.accountTeams;
56
- userTeams?.data?.standardTeams;
57
- userTeams?.data?.personalTeam;
58
- console.log("personalTeam", userTeams?.data?.standardTeams);
59
- console.log("accountTeams", userTeams?.data?.personalTeam);
60
- console.log("standardTeams", userTeams?.data?.accountTeams);
61
- // const allTeams=[...personalTeam, ...standardTeams,...accountTeams]
62
- // console.log("allTeams",allTeams);
55
+ const combinedArray = userTeams?.data?.standardTeams.concat(userTeams?.data?.personalTeam, userTeams?.data?.accountTeams);
56
+ console.log("combinedArray", combinedArray);
63
57
  return (React.createElement(React.Fragment, null,
64
58
  React.createElement(Theme, { theme: carbonTheme },
65
59
  React.createElement(Header$1, { "aria-label": "App navigation header", className: className },
@@ -70,7 +64,7 @@ function Header(props) {
70
64
  ? 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)))
71
65
  : null),
72
66
  React.createElement(HeaderGlobalBar, null,
73
- React.createElement(DefaultTeamsFlowMenu, { menuItems: userTeams?.data?.standardTeams }),
67
+ React.createElement(DefaultTeamsFlowMenu, { menuItems: combinedArray }),
74
68
  props?.instanceSwitcherEnabled && (React.createElement(InstanceSwitcherMenu, { enabled: Boolean(props.instanceSwitcherEnabled), menuItems: platform?.instances })),
75
69
  React.createElement(RequestsMenu, { baseEnvUrl: baseEnvUrl, enabled: Boolean(props.requestSummary), summary: props.requestSummary }),
76
70
  React.createElement(NotificationsMenu, { baseEnvUrl: baseEnvUrl, baseServicesUrl: baseServicesUrl, enabled: Boolean(props.enableNotifications), countEnabled: Boolean(props.enableNotificationsCount) }),
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.9-beta.15",
4
+ "version": "4.6.9-beta.17",
5
5
  "author": {
6
6
  "name": "Tim Bula",
7
7
  "email": "timrbula@gmail.com"