@boomerang-io/carbon-addons-boomerang-react 4.6.9-beta.21 → 4.6.9-beta.22
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,11 +60,18 @@ 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
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
63
|
+
const hasUserTeams = Boolean(userTeams);
|
|
64
|
+
let accountTeams, standardTeams, personalTeam = [];
|
|
65
|
+
if (userTeams?.data) {
|
|
66
|
+
if (hasUserTeams) {
|
|
67
|
+
accountTeams = userTeams?.data?.accountTeams;
|
|
68
|
+
standardTeams = userTeams?.data?.standardTeams;
|
|
69
|
+
personalTeam = userTeams?.data?.personalTeam;
|
|
70
|
+
}
|
|
71
|
+
}
|
|
72
|
+
console.log("personalTeam", personalTeam);
|
|
73
|
+
console.log("accountTeams", accountTeams);
|
|
74
|
+
console.log("standardTeams", standardTeams);
|
|
68
75
|
return (React__default.default.createElement(React__default.default.Fragment, null,
|
|
69
76
|
React__default.default.createElement(react.Theme, { theme: carbonTheme },
|
|
70
77
|
React__default.default.createElement(react.Header, { "aria-label": "App navigation header", className: className },
|
|
@@ -75,7 +82,7 @@ function Header(props) {
|
|
|
75
82
|
? 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)))
|
|
76
83
|
: null),
|
|
77
84
|
React__default.default.createElement(react.HeaderGlobalBar, null,
|
|
78
|
-
React__default.default.createElement(DefaultTeamsFlowMenu, { menuItems: userTeams?.data }),
|
|
85
|
+
React__default.default.createElement(DefaultTeamsFlowMenu, { menuItems: userTeams?.data?.standardTeams }),
|
|
79
86
|
props?.instanceSwitcherEnabled && (React__default.default.createElement(InstanceSwitcherMenu, { enabled: Boolean(props.instanceSwitcherEnabled), menuItems: platform?.instances })),
|
|
80
87
|
React__default.default.createElement(RequestsMenu, { baseEnvUrl: baseEnvUrl, enabled: Boolean(props.requestSummary), summary: props.requestSummary }),
|
|
81
88
|
React__default.default.createElement(NotificationsMenu, { baseEnvUrl: baseEnvUrl, baseServicesUrl: baseServicesUrl, enabled: Boolean(props.enableNotifications), countEnabled: Boolean(props.enableNotificationsCount) }),
|
|
@@ -104,39 +111,12 @@ function InstanceSwitcherMenu(props) {
|
|
|
104
111
|
: null)) : null));
|
|
105
112
|
}
|
|
106
113
|
function DefaultTeamsFlowMenu(props) {
|
|
107
|
-
const currentURL = window?.location?.href;
|
|
108
114
|
const { isOpen, toggleActive, ref } = useHeaderMenu.default(MenuButtonId.defaultTeamsFlowMenu);
|
|
109
115
|
// if (!props.enabled) {
|
|
110
116
|
// return null;
|
|
111
117
|
// }
|
|
112
118
|
return (React__default.default.createElement("div", { className: `${settings.prefix}--bmrg-header-instance-switcher`, style: { position: "relative" }, ref: ref },
|
|
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" },
|
|
134
|
-
React__default.default.createElement("div", { className: instanceCheckMarkContainerClass },
|
|
135
|
-
React__default.default.createElement("span", null, item.name),
|
|
136
|
-
item.url && currentURL?.includes(item.url) ? (React__default.default.createElement("span", null,
|
|
137
|
-
React__default.default.createElement(icons.Checkmark, null),
|
|
138
|
-
" ")) : ("")))))
|
|
139
|
-
: null)));
|
|
119
|
+
React__default.default.createElement(react.Dropdown, { style: { width: "10rem", marginBottom: "1rem" }, label: "Test", title: "Dropdown", items: props.menuItems, itemToString: (item) => (item ? item.name : "") })));
|
|
140
120
|
}
|
|
141
121
|
function RequestsMenu(props) {
|
|
142
122
|
const { isOpen, toggleActive, ref } = useHeaderMenu.default(MenuButtonId.Requests);
|
|
@@ -52,11 +52,18 @@ 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
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
55
|
+
const hasUserTeams = Boolean(userTeams);
|
|
56
|
+
let accountTeams, standardTeams, personalTeam = [];
|
|
57
|
+
if (userTeams?.data) {
|
|
58
|
+
if (hasUserTeams) {
|
|
59
|
+
accountTeams = userTeams?.data?.accountTeams;
|
|
60
|
+
standardTeams = userTeams?.data?.standardTeams;
|
|
61
|
+
personalTeam = userTeams?.data?.personalTeam;
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
console.log("personalTeam", personalTeam);
|
|
65
|
+
console.log("accountTeams", accountTeams);
|
|
66
|
+
console.log("standardTeams", standardTeams);
|
|
60
67
|
return (React.createElement(React.Fragment, null,
|
|
61
68
|
React.createElement(Theme, { theme: carbonTheme },
|
|
62
69
|
React.createElement(Header$1, { "aria-label": "App navigation header", className: className },
|
|
@@ -67,7 +74,7 @@ function Header(props) {
|
|
|
67
74
|
? 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)))
|
|
68
75
|
: null),
|
|
69
76
|
React.createElement(HeaderGlobalBar, null,
|
|
70
|
-
React.createElement(DefaultTeamsFlowMenu, { menuItems: userTeams?.data }),
|
|
77
|
+
React.createElement(DefaultTeamsFlowMenu, { menuItems: userTeams?.data?.standardTeams }),
|
|
71
78
|
props?.instanceSwitcherEnabled && (React.createElement(InstanceSwitcherMenu, { enabled: Boolean(props.instanceSwitcherEnabled), menuItems: platform?.instances })),
|
|
72
79
|
React.createElement(RequestsMenu, { baseEnvUrl: baseEnvUrl, enabled: Boolean(props.requestSummary), summary: props.requestSummary }),
|
|
73
80
|
React.createElement(NotificationsMenu, { baseEnvUrl: baseEnvUrl, baseServicesUrl: baseServicesUrl, enabled: Boolean(props.enableNotifications), countEnabled: Boolean(props.enableNotificationsCount) }),
|
|
@@ -96,39 +103,12 @@ function InstanceSwitcherMenu(props) {
|
|
|
96
103
|
: null)) : null));
|
|
97
104
|
}
|
|
98
105
|
function DefaultTeamsFlowMenu(props) {
|
|
99
|
-
const currentURL = window?.location?.href;
|
|
100
106
|
const { isOpen, toggleActive, ref } = useHeaderMenu(MenuButtonId.defaultTeamsFlowMenu);
|
|
101
107
|
// if (!props.enabled) {
|
|
102
108
|
// return null;
|
|
103
109
|
// }
|
|
104
110
|
return (React.createElement("div", { className: `${prefix}--bmrg-header-instance-switcher`, style: { position: "relative" }, ref: ref },
|
|
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" },
|
|
126
|
-
React.createElement("div", { className: instanceCheckMarkContainerClass },
|
|
127
|
-
React.createElement("span", null, item.name),
|
|
128
|
-
item.url && currentURL?.includes(item.url) ? (React.createElement("span", null,
|
|
129
|
-
React.createElement(Checkmark, null),
|
|
130
|
-
" ")) : ("")))))
|
|
131
|
-
: null)));
|
|
111
|
+
React.createElement(Dropdown, { style: { width: "10rem", marginBottom: "1rem" }, label: "Test", title: "Dropdown", items: props.menuItems, itemToString: (item) => (item ? item.name : "") })));
|
|
132
112
|
}
|
|
133
113
|
function RequestsMenu(props) {
|
|
134
114
|
const { isOpen, toggleActive, ref } = useHeaderMenu(MenuButtonId.Requests);
|
package/package.json
CHANGED