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

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