@boomerang-io/carbon-addons-boomerang-react 4.6.9-beta.0 → 4.6.9-beta.10

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 +6 -12
  2. package/dist/esm/components/Header/Header.js +7 -13
  3. package/package.json +1 -1
package/dist/cjs/components/Header/Header.js CHANGED
@@ -60,6 +60,10 @@ 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 accountTeams = userTeams?.data?.accountTeams;
64
+ const standardTeams = userTeams?.data?.standardTeams;
65
+ const personalTeam = userTeams?.data?.personalTeam;
66
+ const teams = accountTeams + standardTeams + personalTeam;
63
67
  return (React__default.default.createElement(React__default.default.Fragment, null,
64
68
  React__default.default.createElement(react.Theme, { theme: carbonTheme },
65
69
  React__default.default.createElement(react.Header, { "aria-label": "App navigation header", className: className },
@@ -70,7 +74,7 @@ function Header(props) {
70
74
  ? 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
75
  : null),
72
76
  React__default.default.createElement(react.HeaderGlobalBar, null,
73
- React__default.default.createElement(DefaultTeamsFlowMenu, { menuItems: platform?.instances }),
77
+ React__default.default.createElement(DefaultTeamsFlowMenu, { menuItems: teams }),
74
78
  props?.instanceSwitcherEnabled && (React__default.default.createElement(InstanceSwitcherMenu, { enabled: Boolean(props.instanceSwitcherEnabled), menuItems: platform?.instances })),
75
79
  React__default.default.createElement(RequestsMenu, { baseEnvUrl: baseEnvUrl, enabled: Boolean(props.requestSummary), summary: props.requestSummary }),
76
80
  React__default.default.createElement(NotificationsMenu, { baseEnvUrl: baseEnvUrl, baseServicesUrl: baseServicesUrl, enabled: Boolean(props.enableNotifications), countEnabled: Boolean(props.enableNotificationsCount) }),
@@ -99,22 +103,12 @@ function InstanceSwitcherMenu(props) {
99
103
  : null)) : null));
100
104
  }
101
105
  function DefaultTeamsFlowMenu(props) {
102
- const currentURL = window?.location?.href;
103
106
  const { isOpen, toggleActive, ref } = useHeaderMenu.default(MenuButtonId.defaultTeamsFlowMenu);
104
107
  // if (!props.enabled) {
105
108
  // return null;
106
109
  // }
107
110
  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 },
109
- React__default.default.createElement(icons.Wikis, { size: 20 })),
110
- isOpen ? (React__default.default.createElement(HeaderMenu.default, { "aria-labelledby": MenuButtonId.defaultTeamsFlowMenu, id: MenuListId.defaultTeamsFlowMenu }, Array.isArray(props.menuItems)
111
- ? 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" },
112
- React__default.default.createElement("div", { className: instanceCheckMarkContainerClass },
113
- React__default.default.createElement("span", null, item.instanceName),
114
- item.url && currentURL?.includes(item.url) ? (React__default.default.createElement("span", null,
115
- React__default.default.createElement(icons.Checkmark, null),
116
- " ")) : ("")))))
117
- : null)) : null));
111
+ React__default.default.createElement(react.Dropdown, { style: { width: "10rem", marginBottom: "1rem" }, label: "Test", title: "Dropdown", items: props.menuItems, itemToString: (item) => (item ? item.name : "") })));
118
112
  }
119
113
  function RequestsMenu(props) {
120
114
  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,10 @@ 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 accountTeams = userTeams?.data?.accountTeams;
56
+ const standardTeams = userTeams?.data?.standardTeams;
57
+ const personalTeam = userTeams?.data?.personalTeam;
58
+ const teams = accountTeams + standardTeams + personalTeam;
55
59
  return (React.createElement(React.Fragment, null,
56
60
  React.createElement(Theme, { theme: carbonTheme },
57
61
  React.createElement(Header$1, { "aria-label": "App navigation header", className: className },
@@ -62,7 +66,7 @@ function Header(props) {
62
66
  ? 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
67
  : null),
64
68
  React.createElement(HeaderGlobalBar, null,
65
- React.createElement(DefaultTeamsFlowMenu, { menuItems: platform?.instances }),
69
+ React.createElement(DefaultTeamsFlowMenu, { menuItems: teams }),
66
70
  props?.instanceSwitcherEnabled && (React.createElement(InstanceSwitcherMenu, { enabled: Boolean(props.instanceSwitcherEnabled), menuItems: platform?.instances })),
67
71
  React.createElement(RequestsMenu, { baseEnvUrl: baseEnvUrl, enabled: Boolean(props.requestSummary), summary: props.requestSummary }),
68
72
  React.createElement(NotificationsMenu, { baseEnvUrl: baseEnvUrl, baseServicesUrl: baseServicesUrl, enabled: Boolean(props.enableNotifications), countEnabled: Boolean(props.enableNotificationsCount) }),
@@ -91,22 +95,12 @@ function InstanceSwitcherMenu(props) {
91
95
  : null)) : null));
92
96
  }
93
97
  function DefaultTeamsFlowMenu(props) {
94
- const currentURL = window?.location?.href;
95
98
  const { isOpen, toggleActive, ref } = useHeaderMenu(MenuButtonId.defaultTeamsFlowMenu);
96
99
  // if (!props.enabled) {
97
100
  // return null;
98
101
  // }
99
102
  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 },
101
- React.createElement(Wikis, { size: 20 })),
102
- isOpen ? (React.createElement(HeaderMenu, { "aria-labelledby": MenuButtonId.defaultTeamsFlowMenu, id: MenuListId.defaultTeamsFlowMenu }, Array.isArray(props.menuItems)
103
- ? 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" },
104
- React.createElement("div", { className: instanceCheckMarkContainerClass },
105
- React.createElement("span", null, item.instanceName),
106
- item.url && currentURL?.includes(item.url) ? (React.createElement("span", null,
107
- React.createElement(Checkmark, null),
108
- " ")) : ("")))))
109
- : null)) : null));
103
+ React.createElement(Dropdown, { style: { width: "10rem", marginBottom: "1rem" }, label: "Test", title: "Dropdown", items: props.menuItems, itemToString: (item) => (item ? item.name : "") })));
110
104
  }
111
105
  function RequestsMenu(props) {
112
106
  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.0",
4
+ "version": "4.6.9-beta.10",
5
5
  "author": {
6
6
  "name": "Tim Bula",
7
7
  "email": "timrbula@gmail.com"