@boomerang-io/carbon-addons-boomerang-react 4.6.9-beta.1 → 4.6.9-beta.11

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