@boomerang-io/carbon-addons-boomerang-react 4.6.13-beta.2 → 4.6.13-beta.4

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.
@@ -6,7 +6,6 @@ var React = require('react');
6
6
  var cx = require('classnames');
7
7
  var react = require('@carbon/react');
8
8
  var TooltipHover = require('../TooltipHover/TooltipHover.js');
9
- var reactRouterDom = require('react-router-dom');
10
9
  var icons = require('@carbon/react/icons');
11
10
  var UserType = require('../../constants/UserType.js');
12
11
  var settings = require('../../internal/settings.js');
@@ -38,8 +37,7 @@ function AdvantageSideNav(props) {
38
37
  const [activeMenu, setActiveMenu] = React__default.default.useState(false);
39
38
  const isMenuOpen = isOpen || activeMenu;
40
39
  const windowLocation = window.location;
41
- const isPartnerUser = user?.type === UserType.USER_PLATFORM_ROLE.Partner;
42
- const joinButtontitle = showSelectTeamPurpose ? "Create Team" : "Create or Join Team";
40
+ user?.type === UserType.USER_PLATFORM_ROLE.Partner;
43
41
  const hamburguerMenu = document.getElementById("header-sidenav-menu-button");
44
42
  const homeLink = sideNavUrls?.find((sideNavUrl) => sideNavUrl.key === SideNavUrlKeys.Home)?.url;
45
43
  const chatLink = sideNavUrls?.find((sideNavUrl) => sideNavUrl.key === SideNavUrlKeys.Chat)?.url;
@@ -141,15 +139,6 @@ function AdvantageSideNav(props) {
141
139
  });
142
140
  window.open(redirectLink, "_self", "noopener,noreferrer");
143
141
  };
144
- const handleCreateJoinClick = () => {
145
- triggerEvent &&
146
- triggerEvent({
147
- action: "Clicked on SideNav Create/Join link",
148
- category: "Sidenav",
149
- CTA: "Create/Join team cliked",
150
- type: "Button",
151
- });
152
- };
153
142
  const handleTeamClick = ({ team, type }) => {
154
143
  triggerEvent &&
155
144
  triggerEvent({
@@ -180,15 +169,17 @@ function AdvantageSideNav(props) {
180
169
  homeLink ? (React__default.default.createElement(react.SideNavLink, { "data-testid": "sidenav-home-link", isActive: `${baseEnvUrl}/${app}/`.includes(windowLocation.href), renderIcon: icons.Home, href: homeLink, onClick: (e) => {
181
170
  if (isLaunchpad) {
182
171
  handleLaunchpadLink(e);
183
- history.push("/launchpad/");
172
+ history.push("/");
184
173
  }
185
174
  handleHomeClick();
186
175
  } }, "Home")) : null,
187
- teamSwitcherTeam ? (React__default.default.createElement(react.SideNavLink, { title: teamSwitcherTeam.isAccount ? "Account Page" : "Team Page", name: teamSwitcherTeam.name, "data-testid": "sidenav-team-link", id: teamSwitcherTeam.id, isActive: windowLocation.href.includes(teamSwitcherTeam.id), className: `${settings.prefix}--bmrg-advantage-sidenav-team`, renderIcon: icons.UserMultiple, href: `${baseEnvUrl}/${app}/teams/${teamSwitcherTeam.id}`, onClick: (e) => {
176
+ (React__default.default.createElement(react.SideNavLink, { title: teamSwitcherTeam.isAccount ? "Account Page" : "Team Page", name: teamSwitcherTeam.name, "data-testid": "sidenav-team-link", id: teamSwitcherTeam.id, isActive: windowLocation.href.includes(teamSwitcherTeam.id), className: `${settings.prefix}--bmrg-advantage-sidenav-team`, renderIcon: icons.UserMultiple,
177
+ // href={`${baseEnvUrl}/${app}/teams/${teamSwitcherTeam.id}`}
178
+ onClick: (e) => {
179
+ history.push(`/launchpad/teams/${teamSwitcherTeam.id}`);
188
180
  if (isLaunchpad) {
189
181
  handleLaunchpadLink(e);
190
- return React__default.default.createElement(reactRouterDom.Link, { to: appLink.team({ teamId: teamSwitcherTeam.id }) });
191
- // history.push(`/launchpad/teams/${teamSwitcherTeam.id}`);
182
+ history.push(`/launchpad/teams/${teamSwitcherTeam.id}`);
192
183
  }
193
184
  handleTeamClick({
194
185
  team: teamSwitcherTeam,
@@ -201,10 +192,7 @@ function AdvantageSideNav(props) {
201
192
  : "standard",
202
193
  });
203
194
  } },
204
- React__default.default.createElement("p", { className: `${settings.prefix}--bmrg-advantage-sidenav-teams__title` }, teamSwitcherTeam.isAccount ? "Account Page" : "Team Page"))) : !isPartnerUser && joinCreateTrigger ? (React__default.default.createElement(react.SideNavLink, { "data-testid": "sidenav-create-join-trigger", renderIcon: icons.AddAlt, onClick: (e) => {
205
- joinCreateTrigger(e);
206
- handleCreateJoinClick();
207
- } }, joinButtontitle)) : null,
195
+ React__default.default.createElement("p", { className: `${settings.prefix}--bmrg-advantage-sidenav-teams__title` }, teamSwitcherTeam.isAccount ? "Account Page" : "Team Page"))) ,
208
196
  React__default.default.createElement(react.SideNavDivider, null),
209
197
  showChatButton &&
210
198
  (showChatTooltip ? (React__default.default.createElement(TooltipHover.default, { className: `${settings.prefix}--bmrg-side-nav__tooltip`, content: tooltipMessage, direction: "right" },
@@ -2,8 +2,7 @@ import React from 'react';
2
2
  import cx from 'classnames';
3
3
  import { SideNavLink, SideNav, SideNavItems, SideNavDivider } from '@carbon/react';
4
4
  import TooltipHover from '../TooltipHover/TooltipHover.js';
5
- import { Link } from 'react-router-dom';
6
- import { ChatBot, Home, UserMultiple, AddAlt, Api, IntentRequestCreate, Folders, DocumentMultiple_02, Catalog, Settings, LicenseThirdParty } from '@carbon/react/icons';
5
+ import { ChatBot, Home, UserMultiple, Api, IntentRequestCreate, Folders, DocumentMultiple_02, Catalog, Settings, LicenseThirdParty } from '@carbon/react/icons';
7
6
  import { USER_PLATFORM_ROLE } from '../../constants/UserType.js';
8
7
  import { prefix } from '../../internal/settings.js';
9
8
 
@@ -29,8 +28,7 @@ function AdvantageSideNav(props) {
29
28
  const [activeMenu, setActiveMenu] = React.useState(false);
30
29
  const isMenuOpen = isOpen || activeMenu;
31
30
  const windowLocation = window.location;
32
- const isPartnerUser = user?.type === USER_PLATFORM_ROLE.Partner;
33
- const joinButtontitle = showSelectTeamPurpose ? "Create Team" : "Create or Join Team";
31
+ user?.type === USER_PLATFORM_ROLE.Partner;
34
32
  const hamburguerMenu = document.getElementById("header-sidenav-menu-button");
35
33
  const homeLink = sideNavUrls?.find((sideNavUrl) => sideNavUrl.key === SideNavUrlKeys.Home)?.url;
36
34
  const chatLink = sideNavUrls?.find((sideNavUrl) => sideNavUrl.key === SideNavUrlKeys.Chat)?.url;
@@ -132,15 +130,6 @@ function AdvantageSideNav(props) {
132
130
  });
133
131
  window.open(redirectLink, "_self", "noopener,noreferrer");
134
132
  };
135
- const handleCreateJoinClick = () => {
136
- triggerEvent &&
137
- triggerEvent({
138
- action: "Clicked on SideNav Create/Join link",
139
- category: "Sidenav",
140
- CTA: "Create/Join team cliked",
141
- type: "Button",
142
- });
143
- };
144
133
  const handleTeamClick = ({ team, type }) => {
145
134
  triggerEvent &&
146
135
  triggerEvent({
@@ -171,15 +160,17 @@ function AdvantageSideNav(props) {
171
160
  homeLink ? (React.createElement(SideNavLink, { "data-testid": "sidenav-home-link", isActive: `${baseEnvUrl}/${app}/`.includes(windowLocation.href), renderIcon: Home, href: homeLink, onClick: (e) => {
172
161
  if (isLaunchpad) {
173
162
  handleLaunchpadLink(e);
174
- history.push("/launchpad/");
163
+ history.push("/");
175
164
  }
176
165
  handleHomeClick();
177
166
  } }, "Home")) : null,
178
- teamSwitcherTeam ? (React.createElement(SideNavLink, { title: teamSwitcherTeam.isAccount ? "Account Page" : "Team Page", name: teamSwitcherTeam.name, "data-testid": "sidenav-team-link", id: teamSwitcherTeam.id, isActive: windowLocation.href.includes(teamSwitcherTeam.id), className: `${prefix}--bmrg-advantage-sidenav-team`, renderIcon: UserMultiple, href: `${baseEnvUrl}/${app}/teams/${teamSwitcherTeam.id}`, onClick: (e) => {
167
+ (React.createElement(SideNavLink, { title: teamSwitcherTeam.isAccount ? "Account Page" : "Team Page", name: teamSwitcherTeam.name, "data-testid": "sidenav-team-link", id: teamSwitcherTeam.id, isActive: windowLocation.href.includes(teamSwitcherTeam.id), className: `${prefix}--bmrg-advantage-sidenav-team`, renderIcon: UserMultiple,
168
+ // href={`${baseEnvUrl}/${app}/teams/${teamSwitcherTeam.id}`}
169
+ onClick: (e) => {
170
+ history.push(`/launchpad/teams/${teamSwitcherTeam.id}`);
179
171
  if (isLaunchpad) {
180
172
  handleLaunchpadLink(e);
181
- return React.createElement(Link, { to: appLink.team({ teamId: teamSwitcherTeam.id }) });
182
- // history.push(`/launchpad/teams/${teamSwitcherTeam.id}`);
173
+ history.push(`/launchpad/teams/${teamSwitcherTeam.id}`);
183
174
  }
184
175
  handleTeamClick({
185
176
  team: teamSwitcherTeam,
@@ -192,10 +183,7 @@ function AdvantageSideNav(props) {
192
183
  : "standard",
193
184
  });
194
185
  } },
195
- React.createElement("p", { className: `${prefix}--bmrg-advantage-sidenav-teams__title` }, teamSwitcherTeam.isAccount ? "Account Page" : "Team Page"))) : !isPartnerUser && joinCreateTrigger ? (React.createElement(SideNavLink, { "data-testid": "sidenav-create-join-trigger", renderIcon: AddAlt, onClick: (e) => {
196
- joinCreateTrigger(e);
197
- handleCreateJoinClick();
198
- } }, joinButtontitle)) : null,
186
+ React.createElement("p", { className: `${prefix}--bmrg-advantage-sidenav-teams__title` }, teamSwitcherTeam.isAccount ? "Account Page" : "Team Page"))) ,
199
187
  React.createElement(SideNavDivider, null),
200
188
  showChatButton &&
201
189
  (showChatTooltip ? (React.createElement(TooltipHover, { className: `${prefix}--bmrg-side-nav__tooltip`, content: tooltipMessage, direction: "right" },
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.13-beta.2",
4
+ "version": "4.6.13-beta.4",
5
5
  "author": {
6
6
  "name": "Tim Bula",
7
7
  "email": "timrbula@gmail.com"