@boomerang-io/carbon-addons-boomerang-react 4.6.9-beta.2 → 4.6.9-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 +29 -6
  2. package/dist/esm/components/Header/Header.js +30 -7
  3. package/package.json +1 -1
package/dist/cjs/components/Header/Header.js CHANGED
@@ -60,6 +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
+ const combinedArray = [...userTeams?.data?.standardTeams, ...userTeams?.data?.personalTeam, ...userTeams?.data?.accountTeams];
64
+ console.log("combinedArray", combinedArray);
63
65
  return (React__default.default.createElement(React__default.default.Fragment, null,
64
66
  React__default.default.createElement(react.Theme, { theme: carbonTheme },
65
67
  React__default.default.createElement(react.Header, { "aria-label": "App navigation header", className: className },
@@ -70,7 +72,7 @@ function Header(props) {
70
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)))
71
73
  : null),
72
74
  React__default.default.createElement(react.HeaderGlobalBar, null,
73
- React__default.default.createElement(DefaultTeamsFlowMenu, { menuItems: props.userTeams }),
75
+ React__default.default.createElement(DefaultTeamsFlowMenu, { menuItems: userTeams?.data }),
74
76
  props?.instanceSwitcherEnabled && (React__default.default.createElement(InstanceSwitcherMenu, { enabled: Boolean(props.instanceSwitcherEnabled), menuItems: platform?.instances })),
75
77
  React__default.default.createElement(RequestsMenu, { baseEnvUrl: baseEnvUrl, enabled: Boolean(props.requestSummary), summary: props.requestSummary }),
76
78
  React__default.default.createElement(NotificationsMenu, { baseEnvUrl: baseEnvUrl, baseServicesUrl: baseServicesUrl, enabled: Boolean(props.enableNotifications), countEnabled: Boolean(props.enableNotificationsCount) }),
@@ -104,16 +106,37 @@ function DefaultTeamsFlowMenu(props) {
104
106
  // if (!props.enabled) {
105
107
  // return null;
106
108
  // }
109
+ console.log("props.menuItems?.standardTeams", props.menuItems?.standardTeams);
110
+ console.log("props.menuItems?.accountTeams", props.menuItems?.accountTeams);
111
+ console.log("props.menuItems?.personalTeam", props.menuItems?.personalTeam);
107
112
  return (React__default.default.createElement("div", { className: `${settings.prefix}--bmrg-header-instance-switcher`, style: { position: "relative" }, ref: ref },
108
- React__default.default.createElement("button", { "aria-controls": MenuListId.defaultTeamsFlowMenu, "aria-expanded": isOpen, "aria-haspopup": "menu", "aria-label": MenuAriaLabelRecord.defaultTeamsFlowMenu, className: headerButtonClassNames, "data-testid": "header-defaultTeamsFlow-link", id: MenuButtonId.defaultTeamsFlowMenu, onClick: toggleActive }, "default team Name"),
109
- isOpen ? (React__default.default.createElement(HeaderMenu.default, { "aria-labelledby": MenuButtonId.defaultTeamsFlowMenu, id: MenuListId.defaultTeamsFlowMenu }, Array.isArray(props.menuItems)
110
- ? props.menuItems.map((item) => (React__default.default.createElement(react.HeaderMenuItem, { "aria-label": `Default Teams for ${item.instanceName}`, "data-testid": "header-menu-default-teams-flow", href: item.url, key: item.instanceName, target: "_self", rel: "noopener noreferrer" },
113
+ React__default.default.createElement(react.Dropdown, { style: { width: "10rem", marginBottom: "1rem" }, label: "Test", title: "Dropdown", items: props.menuItems, itemToString: (item) => {
114
+ // (item ? item.name : "")}
115
+ React__default.default.createElement(HeaderMenu.default, { "aria-labelledby": MenuButtonId.defaultTeamsFlowMenu, id: MenuListId.defaultTeamsFlowMenu },
116
+ Array.isArray(props.menuItems?.standardTeams)
117
+ ? props.menuItems?.standardTeams?.map((item) => (React__default.default.createElement(react.HeaderMenuItem, { "aria-label": `Default Teams for ${item.name}`, "data-testid": "header-menu-default-teams-flow", href: item.url, key: item.name, target: "_self", rel: "noopener noreferrer" },
118
+ React__default.default.createElement("div", { className: instanceCheckMarkContainerClass },
119
+ React__default.default.createElement("span", null, item.name)))))
120
+ : null,
121
+ Array.isArray(props.menuItems?.accountTeams)
122
+ ? props.menuItems?.accountTeams?.map((item) => (React__default.default.createElement(react.HeaderMenuItem, { "aria-label": `Default Teams for ${item.name}`, "data-testid": "header-menu-default-teams-flow", href: item.url, key: item.name, target: "_self", rel: "noopener noreferrer" },
123
+ React__default.default.createElement("div", { className: instanceCheckMarkContainerClass },
124
+ React__default.default.createElement("span", null, item.name)))))
125
+ : null,
126
+ Array.isArray(props.menuItems?.personalTeam)
127
+ ? props.menuItems?.personalTeam?.map((item) => (React__default.default.createElement(react.HeaderMenuItem, { "aria-label": `Default Teams for ${item.name}`, "data-testid": "header-menu-default-teams-flow", href: item.url, key: item.name, target: "_self", rel: "noopener noreferrer" },
128
+ React__default.default.createElement("div", { className: instanceCheckMarkContainerClass },
129
+ React__default.default.createElement("span", null, item.name)))))
130
+ : null);
131
+ } }),
132
+ React__default.default.createElement(HeaderMenu.default, { "aria-labelledby": MenuButtonId.defaultTeamsFlowMenu, id: MenuListId.defaultTeamsFlowMenu }, Array.isArray(props.menuItems)
133
+ ? props.menuItems.map((item) => (React__default.default.createElement(react.HeaderMenuItem, { "aria-label": `Default Teams for ${item.name}`, "data-testid": "header-menu-default-teams-flow", href: item.url, key: item.name, target: "_self", rel: "noopener noreferrer" },
111
134
  React__default.default.createElement("div", { className: instanceCheckMarkContainerClass },
112
- React__default.default.createElement("span", null, item.instanceName),
135
+ React__default.default.createElement("span", null, item.name),
113
136
  item.url && currentURL?.includes(item.url) ? (React__default.default.createElement("span", null,
114
137
  React__default.default.createElement(icons.Checkmark, null),
115
138
  " ")) : ("")))))
116
- : null)) : null));
139
+ : null)));
117
140
  }
118
141
  function RequestsMenu(props) {
119
142
  const { isOpen, toggleActive, ref } = useHeaderMenu.default(MenuButtonId.Requests);
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, Dropdown, HeaderPanel, HeaderMenuButton, SideNav, SideNavItems, SideNavLink } from '@carbon/react';
3
3
  import { Wikis, Checkmark, 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';
@@ -52,6 +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
+ const combinedArray = [...userTeams?.data?.standardTeams, ...userTeams?.data?.personalTeam, ...userTeams?.data?.accountTeams];
56
+ console.log("combinedArray", combinedArray);
55
57
  return (React.createElement(React.Fragment, null,
56
58
  React.createElement(Theme, { theme: carbonTheme },
57
59
  React.createElement(Header$1, { "aria-label": "App navigation header", className: className },
@@ -62,7 +64,7 @@ function Header(props) {
62
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)))
63
65
  : null),
64
66
  React.createElement(HeaderGlobalBar, null,
65
- React.createElement(DefaultTeamsFlowMenu, { menuItems: props.userTeams }),
67
+ React.createElement(DefaultTeamsFlowMenu, { menuItems: userTeams?.data }),
66
68
  props?.instanceSwitcherEnabled && (React.createElement(InstanceSwitcherMenu, { enabled: Boolean(props.instanceSwitcherEnabled), menuItems: platform?.instances })),
67
69
  React.createElement(RequestsMenu, { baseEnvUrl: baseEnvUrl, enabled: Boolean(props.requestSummary), summary: props.requestSummary }),
68
70
  React.createElement(NotificationsMenu, { baseEnvUrl: baseEnvUrl, baseServicesUrl: baseServicesUrl, enabled: Boolean(props.enableNotifications), countEnabled: Boolean(props.enableNotificationsCount) }),
@@ -96,16 +98,37 @@ function DefaultTeamsFlowMenu(props) {
96
98
  // if (!props.enabled) {
97
99
  // return null;
98
100
  // }
101
+ console.log("props.menuItems?.standardTeams", props.menuItems?.standardTeams);
102
+ console.log("props.menuItems?.accountTeams", props.menuItems?.accountTeams);
103
+ console.log("props.menuItems?.personalTeam", props.menuItems?.personalTeam);
99
104
  return (React.createElement("div", { className: `${prefix}--bmrg-header-instance-switcher`, style: { position: "relative" }, ref: ref },
100
- React.createElement("button", { "aria-controls": MenuListId.defaultTeamsFlowMenu, "aria-expanded": isOpen, "aria-haspopup": "menu", "aria-label": MenuAriaLabelRecord.defaultTeamsFlowMenu, className: headerButtonClassNames, "data-testid": "header-defaultTeamsFlow-link", id: MenuButtonId.defaultTeamsFlowMenu, onClick: toggleActive }, "default team Name"),
101
- isOpen ? (React.createElement(HeaderMenu, { "aria-labelledby": MenuButtonId.defaultTeamsFlowMenu, id: MenuListId.defaultTeamsFlowMenu }, Array.isArray(props.menuItems)
102
- ? props.menuItems.map((item) => (React.createElement(HeaderMenuItem, { "aria-label": `Default Teams for ${item.instanceName}`, "data-testid": "header-menu-default-teams-flow", href: item.url, key: item.instanceName, target: "_self", rel: "noopener noreferrer" },
105
+ React.createElement(Dropdown, { style: { width: "10rem", marginBottom: "1rem" }, label: "Test", title: "Dropdown", items: props.menuItems, itemToString: (item) => {
106
+ // (item ? item.name : "")}
107
+ React.createElement(HeaderMenu, { "aria-labelledby": MenuButtonId.defaultTeamsFlowMenu, id: MenuListId.defaultTeamsFlowMenu },
108
+ Array.isArray(props.menuItems?.standardTeams)
109
+ ? props.menuItems?.standardTeams?.map((item) => (React.createElement(HeaderMenuItem, { "aria-label": `Default Teams for ${item.name}`, "data-testid": "header-menu-default-teams-flow", href: item.url, key: item.name, target: "_self", rel: "noopener noreferrer" },
110
+ React.createElement("div", { className: instanceCheckMarkContainerClass },
111
+ React.createElement("span", null, item.name)))))
112
+ : null,
113
+ Array.isArray(props.menuItems?.accountTeams)
114
+ ? props.menuItems?.accountTeams?.map((item) => (React.createElement(HeaderMenuItem, { "aria-label": `Default Teams for ${item.name}`, "data-testid": "header-menu-default-teams-flow", href: item.url, key: item.name, target: "_self", rel: "noopener noreferrer" },
115
+ React.createElement("div", { className: instanceCheckMarkContainerClass },
116
+ React.createElement("span", null, item.name)))))
117
+ : null,
118
+ Array.isArray(props.menuItems?.personalTeam)
119
+ ? props.menuItems?.personalTeam?.map((item) => (React.createElement(HeaderMenuItem, { "aria-label": `Default Teams for ${item.name}`, "data-testid": "header-menu-default-teams-flow", href: item.url, key: item.name, target: "_self", rel: "noopener noreferrer" },
120
+ React.createElement("div", { className: instanceCheckMarkContainerClass },
121
+ React.createElement("span", null, item.name)))))
122
+ : null);
123
+ } }),
124
+ React.createElement(HeaderMenu, { "aria-labelledby": MenuButtonId.defaultTeamsFlowMenu, id: MenuListId.defaultTeamsFlowMenu }, Array.isArray(props.menuItems)
125
+ ? props.menuItems.map((item) => (React.createElement(HeaderMenuItem, { "aria-label": `Default Teams for ${item.name}`, "data-testid": "header-menu-default-teams-flow", href: item.url, key: item.name, target: "_self", rel: "noopener noreferrer" },
103
126
  React.createElement("div", { className: instanceCheckMarkContainerClass },
104
- React.createElement("span", null, item.instanceName),
127
+ React.createElement("span", null, item.name),
105
128
  item.url && currentURL?.includes(item.url) ? (React.createElement("span", null,
106
129
  React.createElement(Checkmark, null),
107
130
  " ")) : ("")))))
108
- : null)) : null));
131
+ : null)));
109
132
  }
110
133
  function RequestsMenu(props) {
111
134
  const { isOpen, toggleActive, ref } = useHeaderMenu(MenuButtonId.Requests);
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.2",
4
+ "version": "4.6.9-beta.20",
5
5
  "author": {
6
6
  "name": "Tim Bula",
7
7
  "email": "timrbula@gmail.com"