@boomerang-io/carbon-addons-boomerang-react 4.6.8-beta.38 → 4.6.8-beta.39

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/HeaderTeamSwitcher.js +36 -38
  2. package/dist/esm/components/Header/HeaderTeamSwitcher.js +35 -38
  3. package/package.json +1 -1
package/dist/cjs/components/Header/HeaderTeamSwitcher.js CHANGED
@@ -6,6 +6,7 @@ var React = require('react');
6
6
  var reactQuery = require('react-query');
7
7
  var react = require('@carbon/react');
8
8
  var icons = require('@carbon/react/icons');
9
+ var sortBy = require('lodash.sortby');
9
10
  var HeaderMenu = require('./HeaderMenu.js');
10
11
  var servicesConfig = require('../../config/servicesConfig.js');
11
12
  var settings = require('../../internal/settings.js');
@@ -13,6 +14,7 @@ var settings = require('../../internal/settings.js');
13
14
  function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
14
15
 
15
16
  var React__default = /*#__PURE__*/_interopDefault(React);
17
+ var sortBy__default = /*#__PURE__*/_interopDefault(sortBy);
16
18
 
17
19
  /*
18
20
  IBM Confidential
@@ -173,38 +175,34 @@ function HeaderTeamSwitcher({ analyticsHelpers, baseServicesUrl, createJoinTeamT
173
175
  standardTeams = teamsQuery?.data?.standardTeams ?? [];
174
176
  personalTeam = teamsQuery?.data?.personalTeam ?? [];
175
177
  }
176
- // let sortedAccountTeamsWithNamesToDisplay = [];
177
- // let sortedStandardTeamsWithNamesToDisplay = [];
178
- // if (accountTeams?.length > 0) {
179
- // sortedAccountTeamsWithNamesToDisplay = orderBy(
180
- // accountTeams.map((team: UserTeam) => {
181
- // let newProjectTeams: UserTeam[] = [];
182
- // if (team.projectTeams && team.projectTeams.length > 0) {
183
- // newProjectTeams = team.projectTeams?.map((team: UserTeam) => ({
184
- // ...team,
185
- // nameToDisplay: team.displayName ? team.displayName : team.name,
186
- // }));
187
- // }
188
- // return {
189
- // ...team,
190
- // nameToDisplay: team.displayName ? team.displayName : team.name,
191
- // projectTeams: orderBy(newProjectTeams, ["nameToDisplay"]),
192
- // };
193
- // }),
194
- // ["nameToDisplay"]
195
- // );
196
- // }
197
- // if (standardTeams?.length > 0) {
198
- // sortedStandardTeamsWithNamesToDisplay = orderBy(
199
- // standardTeams.map((team: UserTeam) => {
200
- // return {
201
- // ...team,
202
- // nameToDisplay: team.displayName ? team.displayName : team.name,
203
- // };
204
- // }),
205
- // ["nameToDisplay"]
206
- // );
207
- // }
178
+ let sortedAccountTeamsWithNamesToDisplay = [];
179
+ let sortedStandardTeamsWithNamesToDisplay = [];
180
+ if (accountTeams?.length > 0) {
181
+ const newAccountTeams = accountTeams.map((team) => {
182
+ let newProjectTeams = [];
183
+ if (team.projectTeams && team.projectTeams.length > 0) {
184
+ newProjectTeams = team.projectTeams?.map((team) => ({
185
+ ...team,
186
+ nameToDisplay: team.displayName ? team.displayName : team.name,
187
+ }));
188
+ }
189
+ return {
190
+ ...team,
191
+ nameToDisplay: team.displayName ? team.displayName : team.name,
192
+ projectTeams: sortBy__default.default(newProjectTeams, ["nameToDisplay"]),
193
+ };
194
+ });
195
+ sortedAccountTeamsWithNamesToDisplay = sortBy__default.default(newAccountTeams, ["nameToDisplay"]);
196
+ }
197
+ if (standardTeams?.length > 0) {
198
+ const newStandardTeams = standardTeams.map((team) => {
199
+ return {
200
+ ...team,
201
+ nameToDisplay: team.displayName ? team.displayName : team.name,
202
+ };
203
+ });
204
+ sortedStandardTeamsWithNamesToDisplay = sortBy__default.default(newStandardTeams, ["nameToDisplay"]);
205
+ }
208
206
  let selectedTeamName = selectedTeam?.displayName ? selectedTeam.displayName : selectedTeam?.name;
209
207
  if (selectedTeamName && selectedTeamName.length > 42) {
210
208
  selectedTeamName = selectedTeamName.slice(0, 42) + "...";
@@ -230,7 +228,7 @@ function HeaderTeamSwitcher({ analyticsHelpers, baseServicesUrl, createJoinTeamT
230
228
  })
231
229
  : null,
232
230
  accountTeams.length > 0
233
- ? accountTeams.map((team) => {
231
+ ? sortedAccountTeamsWithNamesToDisplay.map((team) => {
234
232
  const isSubmenuOpen = team.id === openAccountSubmenuId;
235
233
  const isProjectTeamSelected = team.projectTeams &&
236
234
  team.projectTeams.length > 0 &&
@@ -243,7 +241,7 @@ function HeaderTeamSwitcher({ analyticsHelpers, baseServicesUrl, createJoinTeamT
243
241
  href: "javascript:void(0)", "data-testid": "header-team-switcher-menu-account-accordion" },
244
242
  React__default.default.createElement("div", { className: headerDropdownMenuItemAccountClassname },
245
243
  React__default.default.createElement("div", { className: headerDropdownMenuItemTextIconClassname },
246
- React__default.default.createElement("span", { title: team.name, className: headerDropdownMenuItemTextClassname }, team.name),
244
+ React__default.default.createElement("span", { title: team.nameToDisplay, className: headerDropdownMenuItemTextClassname }, team.nameToDisplay),
247
245
  isMenuSelected ? React__default.default.createElement(icons.CheckmarkFilled, { className: headerDropdownMenuItemIconClassname }) : null),
248
246
  React__default.default.createElement("div", { className: headerDropdownMenuItemAccountIconsClassname },
249
247
  React__default.default.createElement(icons.GroupAccount, { className: headerDropdownMenuItemAccountGroupIconClassname }),
@@ -253,7 +251,7 @@ function HeaderTeamSwitcher({ analyticsHelpers, baseServicesUrl, createJoinTeamT
253
251
  // eslint-disable-next-line no-script-url
254
252
  href: "javascript:void(0)" },
255
253
  React__default.default.createElement("div", { className: headerDropdownMenuItemClassname, style: { paddingLeft: "1rem" } },
256
- React__default.default.createElement("span", { title: team.name, className: headerDropdownMenuItemTextClassname }, "Account Page"),
254
+ React__default.default.createElement("span", { title: team.nameToDisplay, className: headerDropdownMenuItemTextClassname }, "Account Page"),
257
255
  isTeamSelected ? React__default.default.createElement(icons.CheckmarkFilled, { className: headerDropdownMenuItemIconClassname }) : null)),
258
256
  team.projectTeams && team.projectTeams.length > 0
259
257
  ? team.projectTeams.map((team) => {
@@ -262,20 +260,20 @@ function HeaderTeamSwitcher({ analyticsHelpers, baseServicesUrl, createJoinTeamT
262
260
  // eslint-disable-next-line no-script-url
263
261
  href: "javascript:void(0)" },
264
262
  React__default.default.createElement("div", { className: headerDropdownMenuItemClassname, style: { paddingLeft: "1rem" } },
265
- React__default.default.createElement("span", { title: team.name, className: headerDropdownMenuItemTextClassname }, team.name),
263
+ React__default.default.createElement("span", { title: team.nameToDisplay, className: headerDropdownMenuItemTextClassname }, team.nameToDisplay),
266
264
  isTeamSelected ? (React__default.default.createElement(icons.CheckmarkFilled, { className: headerDropdownMenuItemIconClassname })) : null)));
267
265
  })
268
266
  : null)));
269
267
  })
270
268
  : null,
271
269
  standardTeams.length > 0
272
- ? standardTeams.map((team) => {
270
+ ? sortedStandardTeamsWithNamesToDisplay.map((team) => {
273
271
  const isTeamSelected = team.id === selectedTeam?.id;
274
272
  return (React__default.default.createElement(react.HeaderMenuItem, { key: team.id, "aria-selected": isTeamSelected, className: headerDropdownMenuItemContainerClassname, onClick: () => handleTeamClick({ team, type: "standard" }), "data-testid": "header-team-switcher-menu-item",
275
273
  // eslint-disable-next-line no-script-url
276
274
  href: "javascript:void(0)" },
277
275
  React__default.default.createElement("div", { className: headerDropdownMenuItemClassname },
278
- React__default.default.createElement("span", { title: team.name, className: headerDropdownMenuItemTextClassname }, team.name),
276
+ React__default.default.createElement("span", { title: team.nameToDisplay, className: headerDropdownMenuItemTextClassname }, team.nameToDisplay),
279
277
  isTeamSelected ? React__default.default.createElement(icons.CheckmarkFilled, { className: headerDropdownMenuItemIconClassname }) : null)));
280
278
  })
281
279
  : null)));
package/dist/esm/components/Header/HeaderTeamSwitcher.js CHANGED
@@ -2,6 +2,7 @@ import React, { useState, useEffect } from 'react';
2
2
  import { useQueryClient, useMutation } from 'react-query';
3
3
  import { InlineLoading, HeaderMenu, HeaderMenuItem } from '@carbon/react';
4
4
  import { AddAlt, CheckmarkFilled, GroupAccount, ChevronDown } from '@carbon/react/icons';
5
+ import sortBy from 'lodash.sortby';
5
6
  import HeaderMenu$1 from './HeaderMenu.js';
6
7
  import { resolver, serviceUrl } from '../../config/servicesConfig.js';
7
8
  import { prefix } from '../../internal/settings.js';
@@ -165,38 +166,34 @@ function HeaderTeamSwitcher({ analyticsHelpers, baseServicesUrl, createJoinTeamT
165
166
  standardTeams = teamsQuery?.data?.standardTeams ?? [];
166
167
  personalTeam = teamsQuery?.data?.personalTeam ?? [];
167
168
  }
168
- // let sortedAccountTeamsWithNamesToDisplay = [];
169
- // let sortedStandardTeamsWithNamesToDisplay = [];
170
- // if (accountTeams?.length > 0) {
171
- // sortedAccountTeamsWithNamesToDisplay = orderBy(
172
- // accountTeams.map((team: UserTeam) => {
173
- // let newProjectTeams: UserTeam[] = [];
174
- // if (team.projectTeams && team.projectTeams.length > 0) {
175
- // newProjectTeams = team.projectTeams?.map((team: UserTeam) => ({
176
- // ...team,
177
- // nameToDisplay: team.displayName ? team.displayName : team.name,
178
- // }));
179
- // }
180
- // return {
181
- // ...team,
182
- // nameToDisplay: team.displayName ? team.displayName : team.name,
183
- // projectTeams: orderBy(newProjectTeams, ["nameToDisplay"]),
184
- // };
185
- // }),
186
- // ["nameToDisplay"]
187
- // );
188
- // }
189
- // if (standardTeams?.length > 0) {
190
- // sortedStandardTeamsWithNamesToDisplay = orderBy(
191
- // standardTeams.map((team: UserTeam) => {
192
- // return {
193
- // ...team,
194
- // nameToDisplay: team.displayName ? team.displayName : team.name,
195
- // };
196
- // }),
197
- // ["nameToDisplay"]
198
- // );
199
- // }
169
+ let sortedAccountTeamsWithNamesToDisplay = [];
170
+ let sortedStandardTeamsWithNamesToDisplay = [];
171
+ if (accountTeams?.length > 0) {
172
+ const newAccountTeams = accountTeams.map((team) => {
173
+ let newProjectTeams = [];
174
+ if (team.projectTeams && team.projectTeams.length > 0) {
175
+ newProjectTeams = team.projectTeams?.map((team) => ({
176
+ ...team,
177
+ nameToDisplay: team.displayName ? team.displayName : team.name,
178
+ }));
179
+ }
180
+ return {
181
+ ...team,
182
+ nameToDisplay: team.displayName ? team.displayName : team.name,
183
+ projectTeams: sortBy(newProjectTeams, ["nameToDisplay"]),
184
+ };
185
+ });
186
+ sortedAccountTeamsWithNamesToDisplay = sortBy(newAccountTeams, ["nameToDisplay"]);
187
+ }
188
+ if (standardTeams?.length > 0) {
189
+ const newStandardTeams = standardTeams.map((team) => {
190
+ return {
191
+ ...team,
192
+ nameToDisplay: team.displayName ? team.displayName : team.name,
193
+ };
194
+ });
195
+ sortedStandardTeamsWithNamesToDisplay = sortBy(newStandardTeams, ["nameToDisplay"]);
196
+ }
200
197
  let selectedTeamName = selectedTeam?.displayName ? selectedTeam.displayName : selectedTeam?.name;
201
198
  if (selectedTeamName && selectedTeamName.length > 42) {
202
199
  selectedTeamName = selectedTeamName.slice(0, 42) + "...";
@@ -222,7 +219,7 @@ function HeaderTeamSwitcher({ analyticsHelpers, baseServicesUrl, createJoinTeamT
222
219
  })
223
220
  : null,
224
221
  accountTeams.length > 0
225
- ? accountTeams.map((team) => {
222
+ ? sortedAccountTeamsWithNamesToDisplay.map((team) => {
226
223
  const isSubmenuOpen = team.id === openAccountSubmenuId;
227
224
  const isProjectTeamSelected = team.projectTeams &&
228
225
  team.projectTeams.length > 0 &&
@@ -235,7 +232,7 @@ function HeaderTeamSwitcher({ analyticsHelpers, baseServicesUrl, createJoinTeamT
235
232
  href: "javascript:void(0)", "data-testid": "header-team-switcher-menu-account-accordion" },
236
233
  React.createElement("div", { className: headerDropdownMenuItemAccountClassname },
237
234
  React.createElement("div", { className: headerDropdownMenuItemTextIconClassname },
238
- React.createElement("span", { title: team.name, className: headerDropdownMenuItemTextClassname }, team.name),
235
+ React.createElement("span", { title: team.nameToDisplay, className: headerDropdownMenuItemTextClassname }, team.nameToDisplay),
239
236
  isMenuSelected ? React.createElement(CheckmarkFilled, { className: headerDropdownMenuItemIconClassname }) : null),
240
237
  React.createElement("div", { className: headerDropdownMenuItemAccountIconsClassname },
241
238
  React.createElement(GroupAccount, { className: headerDropdownMenuItemAccountGroupIconClassname }),
@@ -245,7 +242,7 @@ function HeaderTeamSwitcher({ analyticsHelpers, baseServicesUrl, createJoinTeamT
245
242
  // eslint-disable-next-line no-script-url
246
243
  href: "javascript:void(0)" },
247
244
  React.createElement("div", { className: headerDropdownMenuItemClassname, style: { paddingLeft: "1rem" } },
248
- React.createElement("span", { title: team.name, className: headerDropdownMenuItemTextClassname }, "Account Page"),
245
+ React.createElement("span", { title: team.nameToDisplay, className: headerDropdownMenuItemTextClassname }, "Account Page"),
249
246
  isTeamSelected ? React.createElement(CheckmarkFilled, { className: headerDropdownMenuItemIconClassname }) : null)),
250
247
  team.projectTeams && team.projectTeams.length > 0
251
248
  ? team.projectTeams.map((team) => {
@@ -254,20 +251,20 @@ function HeaderTeamSwitcher({ analyticsHelpers, baseServicesUrl, createJoinTeamT
254
251
  // eslint-disable-next-line no-script-url
255
252
  href: "javascript:void(0)" },
256
253
  React.createElement("div", { className: headerDropdownMenuItemClassname, style: { paddingLeft: "1rem" } },
257
- React.createElement("span", { title: team.name, className: headerDropdownMenuItemTextClassname }, team.name),
254
+ React.createElement("span", { title: team.nameToDisplay, className: headerDropdownMenuItemTextClassname }, team.nameToDisplay),
258
255
  isTeamSelected ? (React.createElement(CheckmarkFilled, { className: headerDropdownMenuItemIconClassname })) : null)));
259
256
  })
260
257
  : null)));
261
258
  })
262
259
  : null,
263
260
  standardTeams.length > 0
264
- ? standardTeams.map((team) => {
261
+ ? sortedStandardTeamsWithNamesToDisplay.map((team) => {
265
262
  const isTeamSelected = team.id === selectedTeam?.id;
266
263
  return (React.createElement(HeaderMenuItem, { key: team.id, "aria-selected": isTeamSelected, className: headerDropdownMenuItemContainerClassname, onClick: () => handleTeamClick({ team, type: "standard" }), "data-testid": "header-team-switcher-menu-item",
267
264
  // eslint-disable-next-line no-script-url
268
265
  href: "javascript:void(0)" },
269
266
  React.createElement("div", { className: headerDropdownMenuItemClassname },
270
- React.createElement("span", { title: team.name, className: headerDropdownMenuItemTextClassname }, team.name),
267
+ React.createElement("span", { title: team.nameToDisplay, className: headerDropdownMenuItemTextClassname }, team.nameToDisplay),
271
268
  isTeamSelected ? React.createElement(CheckmarkFilled, { className: headerDropdownMenuItemIconClassname }) : null)));
272
269
  })
273
270
  : null)));
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.38",
4
+ "version": "4.6.8-beta.39",
5
5
  "author": {
6
6
  "name": "Tim Bula",
7
7
  "email": "timrbula@gmail.com"