@boomerang-io/carbon-addons-boomerang-react 4.6.8-beta.33 → 4.6.8-beta.35

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.
@@ -7,7 +7,6 @@ var reactQuery = require('react-query');
7
7
  var react = require('@carbon/react');
8
8
  var orderBy = require('../../../node_modules/.pnpm/lodash@4.17.21/node_modules/lodash/orderBy.js');
9
9
  var servicesConfig = require('../../config/servicesConfig.js');
10
- var settings = require('../../internal/settings.js');
11
10
 
12
11
  function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
13
12
 
@@ -18,11 +17,10 @@ IBM Confidential
18
17
  694970X, 69497O0
19
18
  © Copyright IBM Corp. 2022, 2025
20
19
  */
21
- const headerDropdownMenuItemAccountSubmenuClassname = `${settings.prefix}--header-dropdown-menu-item-account-submenu`;
22
20
  function HeaderTeamSwitcher({ analyticsHelpers, baseServicesUrl, createJoinTeamTrigger, history, isLaunchpad, menuAriaLabelRecord, menuButtonId, menuListId, navigationPlatform, teamsQuery, trackEvent, user, userTeams, }) {
23
21
  const queryClient = reactQuery.useQueryClient();
24
22
  const [selectedTeam, setSelectedTeam] = React.useState();
25
- const [openAccountSubmenuId, setOpenAccountSubmenuId] = React.useState("");
23
+ React.useState("");
26
24
  const hasUserTeams = Boolean(userTeams);
27
25
  navigationPlatform?.requireTeamPurpose;
28
26
  const userTeamInstanceSwitcherDefault = user?.teamInstanceSwitcherDefault;
@@ -112,10 +110,8 @@ function HeaderTeamSwitcher({ analyticsHelpers, baseServicesUrl, createJoinTeamT
112
110
  standardTeams = teamsQuery?.data?.standardTeams ?? [];
113
111
  personalTeam = teamsQuery?.data?.personalTeam ?? [];
114
112
  }
115
- let sortedAccountTeamsWithNamesToDisplay = [];
116
- let sortedStandardTeamsWithNamesToDisplay = [];
117
113
  if (accountTeams?.length > 0) {
118
- sortedAccountTeamsWithNamesToDisplay = orderBy.default(accountTeams.map((team) => {
114
+ orderBy.default(accountTeams.map((team) => {
119
115
  let newProjectTeams = [];
120
116
  if (team.projectTeams && team.projectTeams.length > 0) {
121
117
  newProjectTeams = team.projectTeams?.map((team) => ({
@@ -131,7 +127,7 @@ function HeaderTeamSwitcher({ analyticsHelpers, baseServicesUrl, createJoinTeamT
131
127
  }), ["nameToDisplay"]);
132
128
  }
133
129
  if (standardTeams?.length > 0) {
134
- sortedStandardTeamsWithNamesToDisplay = orderBy.default(standardTeams.map((team) => {
130
+ orderBy.default(standardTeams.map((team) => {
135
131
  return {
136
132
  ...team,
137
133
  nameToDisplay: team.displayName ? team.displayName : team.name,
@@ -142,89 +138,30 @@ function HeaderTeamSwitcher({ analyticsHelpers, baseServicesUrl, createJoinTeamT
142
138
  if (selectedTeamName && selectedTeamName.length > 42) {
143
139
  selectedTeamName = selectedTeamName.slice(0, 42) + "...";
144
140
  }
145
- return (React__default.default.createElement(React__default.default.Fragment, null,
146
- personalTeam.length > 0
147
- ? personalTeam.map((team) => {
148
- team.displayName ? team.displayName : team.name;
149
- team.id === selectedTeam?.id;
150
- return (React__default.default.createElement(React__default.default.Fragment, null)
151
- // <HeaderMenuItem
152
- // key={team.id}
153
- // aria-selected={isTeamSelected}
154
- // className={headerDropdownMenuItemContainerClassname}
155
- // onClick={() => handleTeamClick({ team, type: "personal" })}
156
- // // eslint-disable-next-line no-script-url
157
- // href={"javascript:void(0)"}
158
- // data-testid="header-team-switcher-menu-item"
159
- // >
160
- // <div className={headerDropdownMenuItemClassname}>
161
- // <span title={teamName} className={headerDropdownMenuItemTextClassname}>
162
- // {teamName}
163
- // </span>
164
- // {isTeamSelected ? <CheckmarkFilled className={headerDropdownMenuItemIconClassname} /> : null}
165
- // </div>
166
- // </HeaderMenuItem>
167
- );
168
- })
169
- : null,
170
- accountTeams.length > 0
171
- ? sortedAccountTeamsWithNamesToDisplay.map((team) => {
172
- team.id === openAccountSubmenuId;
173
- team.projectTeams &&
174
- team.projectTeams.length > 0 &&
175
- team.projectTeams.some((team) => team.id === selectedTeam?.id);
176
- team.id === selectedTeam?.id;
177
- return (React__default.default.createElement(React__default.default.Fragment, null,
178
- React__default.default.createElement("div", { className: headerDropdownMenuItemAccountSubmenuClassname }, team.projectTeams && team.projectTeams.length > 0
179
- ? team.projectTeams.map((team) => {
180
- team.id === selectedTeam?.id;
181
- return (React__default.default.createElement(React__default.default.Fragment, null)
182
- // <HeaderMenuItem
183
- // key={team.id}
184
- // aria-selected={isTeamSelected}
185
- // className={headerDropdownMenuItemContainerClassname}
186
- // onClick={() => handleTeamClick({ team, type: "project" })}
187
- // data-testid="header-team-switcher-menu-account-accordion-item"
188
- // // eslint-disable-next-line no-script-url
189
- // href={"javascript:void(0)"}
190
- // >
191
- // <div className={headerDropdownMenuItemClassname} style={{ paddingLeft: "1rem" }}>
192
- // <span title={team.nameToDisplay} className={headerDropdownMenuItemTextClassname}>
193
- // {team.nameToDisplay}
194
- // </span>
195
- // {isTeamSelected ? (
196
- // <CheckmarkFilled className={headerDropdownMenuItemIconClassname} />
197
- // ) : null}
198
- // </div>
199
- // </HeaderMenuItem>
200
- );
201
- })
202
- : null)));
203
- })
204
- : null,
205
- standardTeams.length > 0
206
- ? sortedStandardTeamsWithNamesToDisplay.map((team) => {
207
- team.id === selectedTeam?.id;
208
- return (React__default.default.createElement(React__default.default.Fragment, null)
209
- // <HeaderMenuItem
210
- // key={team.id}
211
- // aria-selected={isTeamSelected}
212
- // className={headerDropdownMenuItemContainerClassname}
213
- // onClick={() => handleTeamClick({ team, type: "standard" })}
214
- // data-testid="header-team-switcher-menu-item"
215
- // // eslint-disable-next-line no-script-url
216
- // href={"javascript:void(0)"}
217
- // >
218
- // <div className={headerDropdownMenuItemClassname}>
219
- // <span title={team.nameToDisplay} className={headerDropdownMenuItemTextClassname}>
220
- // {team.nameToDisplay}
221
- // </span>
222
- // {isTeamSelected ? <CheckmarkFilled className={headerDropdownMenuItemIconClassname} /> : null}
223
- // </div>
224
- // </HeaderMenuItem>
225
- );
226
- })
227
- : null));
141
+ return (React__default.default.createElement(React__default.default.Fragment, null, personalTeam.length > 0
142
+ ? personalTeam.map((team) => {
143
+ team.displayName ? team.displayName : team.name;
144
+ team.id === selectedTeam?.id;
145
+ return (React__default.default.createElement(React__default.default.Fragment, null)
146
+ // <HeaderMenuItem
147
+ // key={team.id}
148
+ // aria-selected={isTeamSelected}
149
+ // className={headerDropdownMenuItemContainerClassname}
150
+ // onClick={() => handleTeamClick({ team, type: "personal" })}
151
+ // // eslint-disable-next-line no-script-url
152
+ // href={"javascript:void(0)"}
153
+ // data-testid="header-team-switcher-menu-item"
154
+ // >
155
+ // <div className={headerDropdownMenuItemClassname}>
156
+ // <span title={teamName} className={headerDropdownMenuItemTextClassname}>
157
+ // {teamName}
158
+ // </span>
159
+ // {isTeamSelected ? <CheckmarkFilled className={headerDropdownMenuItemIconClassname} /> : null}
160
+ // </div>
161
+ // </HeaderMenuItem>
162
+ );
163
+ })
164
+ : null));
228
165
  }
229
166
  return null;
230
167
  }
@@ -3,18 +3,16 @@ import { useQueryClient, useMutation } from 'react-query';
3
3
  import { InlineLoading } from '@carbon/react';
4
4
  import orderBy_1 from '../../../node_modules/.pnpm/lodash@4.17.21/node_modules/lodash/orderBy.js';
5
5
  import { resolver, serviceUrl } from '../../config/servicesConfig.js';
6
- import { prefix } from '../../internal/settings.js';
7
6
 
8
7
  /*
9
8
  IBM Confidential
10
9
  694970X, 69497O0
11
10
  © Copyright IBM Corp. 2022, 2025
12
11
  */
13
- const headerDropdownMenuItemAccountSubmenuClassname = `${prefix}--header-dropdown-menu-item-account-submenu`;
14
12
  function HeaderTeamSwitcher({ analyticsHelpers, baseServicesUrl, createJoinTeamTrigger, history, isLaunchpad, menuAriaLabelRecord, menuButtonId, menuListId, navigationPlatform, teamsQuery, trackEvent, user, userTeams, }) {
15
13
  const queryClient = useQueryClient();
16
14
  const [selectedTeam, setSelectedTeam] = useState();
17
- const [openAccountSubmenuId, setOpenAccountSubmenuId] = useState("");
15
+ useState("");
18
16
  const hasUserTeams = Boolean(userTeams);
19
17
  navigationPlatform?.requireTeamPurpose;
20
18
  const userTeamInstanceSwitcherDefault = user?.teamInstanceSwitcherDefault;
@@ -104,10 +102,8 @@ function HeaderTeamSwitcher({ analyticsHelpers, baseServicesUrl, createJoinTeamT
104
102
  standardTeams = teamsQuery?.data?.standardTeams ?? [];
105
103
  personalTeam = teamsQuery?.data?.personalTeam ?? [];
106
104
  }
107
- let sortedAccountTeamsWithNamesToDisplay = [];
108
- let sortedStandardTeamsWithNamesToDisplay = [];
109
105
  if (accountTeams?.length > 0) {
110
- sortedAccountTeamsWithNamesToDisplay = orderBy_1(accountTeams.map((team) => {
106
+ orderBy_1(accountTeams.map((team) => {
111
107
  let newProjectTeams = [];
112
108
  if (team.projectTeams && team.projectTeams.length > 0) {
113
109
  newProjectTeams = team.projectTeams?.map((team) => ({
@@ -123,7 +119,7 @@ function HeaderTeamSwitcher({ analyticsHelpers, baseServicesUrl, createJoinTeamT
123
119
  }), ["nameToDisplay"]);
124
120
  }
125
121
  if (standardTeams?.length > 0) {
126
- sortedStandardTeamsWithNamesToDisplay = orderBy_1(standardTeams.map((team) => {
122
+ orderBy_1(standardTeams.map((team) => {
127
123
  return {
128
124
  ...team,
129
125
  nameToDisplay: team.displayName ? team.displayName : team.name,
@@ -134,89 +130,30 @@ function HeaderTeamSwitcher({ analyticsHelpers, baseServicesUrl, createJoinTeamT
134
130
  if (selectedTeamName && selectedTeamName.length > 42) {
135
131
  selectedTeamName = selectedTeamName.slice(0, 42) + "...";
136
132
  }
137
- return (React.createElement(React.Fragment, null,
138
- personalTeam.length > 0
139
- ? personalTeam.map((team) => {
140
- team.displayName ? team.displayName : team.name;
141
- team.id === selectedTeam?.id;
142
- return (React.createElement(React.Fragment, null)
143
- // <HeaderMenuItem
144
- // key={team.id}
145
- // aria-selected={isTeamSelected}
146
- // className={headerDropdownMenuItemContainerClassname}
147
- // onClick={() => handleTeamClick({ team, type: "personal" })}
148
- // // eslint-disable-next-line no-script-url
149
- // href={"javascript:void(0)"}
150
- // data-testid="header-team-switcher-menu-item"
151
- // >
152
- // <div className={headerDropdownMenuItemClassname}>
153
- // <span title={teamName} className={headerDropdownMenuItemTextClassname}>
154
- // {teamName}
155
- // </span>
156
- // {isTeamSelected ? <CheckmarkFilled className={headerDropdownMenuItemIconClassname} /> : null}
157
- // </div>
158
- // </HeaderMenuItem>
159
- );
160
- })
161
- : null,
162
- accountTeams.length > 0
163
- ? sortedAccountTeamsWithNamesToDisplay.map((team) => {
164
- team.id === openAccountSubmenuId;
165
- team.projectTeams &&
166
- team.projectTeams.length > 0 &&
167
- team.projectTeams.some((team) => team.id === selectedTeam?.id);
168
- team.id === selectedTeam?.id;
169
- return (React.createElement(React.Fragment, null,
170
- React.createElement("div", { className: headerDropdownMenuItemAccountSubmenuClassname }, team.projectTeams && team.projectTeams.length > 0
171
- ? team.projectTeams.map((team) => {
172
- team.id === selectedTeam?.id;
173
- return (React.createElement(React.Fragment, null)
174
- // <HeaderMenuItem
175
- // key={team.id}
176
- // aria-selected={isTeamSelected}
177
- // className={headerDropdownMenuItemContainerClassname}
178
- // onClick={() => handleTeamClick({ team, type: "project" })}
179
- // data-testid="header-team-switcher-menu-account-accordion-item"
180
- // // eslint-disable-next-line no-script-url
181
- // href={"javascript:void(0)"}
182
- // >
183
- // <div className={headerDropdownMenuItemClassname} style={{ paddingLeft: "1rem" }}>
184
- // <span title={team.nameToDisplay} className={headerDropdownMenuItemTextClassname}>
185
- // {team.nameToDisplay}
186
- // </span>
187
- // {isTeamSelected ? (
188
- // <CheckmarkFilled className={headerDropdownMenuItemIconClassname} />
189
- // ) : null}
190
- // </div>
191
- // </HeaderMenuItem>
192
- );
193
- })
194
- : null)));
195
- })
196
- : null,
197
- standardTeams.length > 0
198
- ? sortedStandardTeamsWithNamesToDisplay.map((team) => {
199
- team.id === selectedTeam?.id;
200
- return (React.createElement(React.Fragment, null)
201
- // <HeaderMenuItem
202
- // key={team.id}
203
- // aria-selected={isTeamSelected}
204
- // className={headerDropdownMenuItemContainerClassname}
205
- // onClick={() => handleTeamClick({ team, type: "standard" })}
206
- // data-testid="header-team-switcher-menu-item"
207
- // // eslint-disable-next-line no-script-url
208
- // href={"javascript:void(0)"}
209
- // >
210
- // <div className={headerDropdownMenuItemClassname}>
211
- // <span title={team.nameToDisplay} className={headerDropdownMenuItemTextClassname}>
212
- // {team.nameToDisplay}
213
- // </span>
214
- // {isTeamSelected ? <CheckmarkFilled className={headerDropdownMenuItemIconClassname} /> : null}
215
- // </div>
216
- // </HeaderMenuItem>
217
- );
218
- })
219
- : null));
133
+ return (React.createElement(React.Fragment, null, personalTeam.length > 0
134
+ ? personalTeam.map((team) => {
135
+ team.displayName ? team.displayName : team.name;
136
+ team.id === selectedTeam?.id;
137
+ return (React.createElement(React.Fragment, null)
138
+ // <HeaderMenuItem
139
+ // key={team.id}
140
+ // aria-selected={isTeamSelected}
141
+ // className={headerDropdownMenuItemContainerClassname}
142
+ // onClick={() => handleTeamClick({ team, type: "personal" })}
143
+ // // eslint-disable-next-line no-script-url
144
+ // href={"javascript:void(0)"}
145
+ // data-testid="header-team-switcher-menu-item"
146
+ // >
147
+ // <div className={headerDropdownMenuItemClassname}>
148
+ // <span title={teamName} className={headerDropdownMenuItemTextClassname}>
149
+ // {teamName}
150
+ // </span>
151
+ // {isTeamSelected ? <CheckmarkFilled className={headerDropdownMenuItemIconClassname} /> : null}
152
+ // </div>
153
+ // </HeaderMenuItem>
154
+ );
155
+ })
156
+ : null));
220
157
  }
221
158
  return null;
222
159
  }
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.8-beta.33",
4
+ "version": "4.6.8-beta.35",
5
5
  "author": {
6
6
  "name": "Tim Bula",
7
7
  "email": "timrbula@gmail.com"