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

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');
@@ -180,15 +179,17 @@ function AdvantageSideNav(props) {
180
179
  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
180
  if (isLaunchpad) {
182
181
  handleLaunchpadLink(e);
183
- history.push("/launchpad/");
182
+ history.push("/");
184
183
  }
185
184
  handleHomeClick();
186
185
  } }, "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) => {
186
+ 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,
187
+ // href={`${baseEnvUrl}/${app}/teams/${teamSwitcherTeam.id}`}
188
+ onClick: (e) => {
189
+ history.push(`/launchpad/teams/${teamSwitcherTeam.id}`);
188
190
  if (isLaunchpad) {
189
191
  handleLaunchpadLink(e);
190
- return React__default.default.createElement(reactRouterDom.Link, { to: appLink.team({ teamId: teamSwitcherTeam.id }) });
191
- // history.push(`/launchpad/teams/${teamSwitcherTeam.id}`);
192
+ history.push(`/launchpad/teams/${teamSwitcherTeam.id}`);
192
193
  }
193
194
  handleTeamClick({
194
195
  team: teamSwitcherTeam,
@@ -2,7 +2,6 @@ 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
5
  import { ChatBot, Home, UserMultiple, AddAlt, 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';
@@ -171,15 +170,17 @@ function AdvantageSideNav(props) {
171
170
  homeLink ? (React.createElement(SideNavLink, { "data-testid": "sidenav-home-link", isActive: `${baseEnvUrl}/${app}/`.includes(windowLocation.href), renderIcon: Home, href: homeLink, onClick: (e) => {
172
171
  if (isLaunchpad) {
173
172
  handleLaunchpadLink(e);
174
- history.push("/launchpad/");
173
+ history.push("/");
175
174
  }
176
175
  handleHomeClick();
177
176
  } }, "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) => {
177
+ 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,
178
+ // href={`${baseEnvUrl}/${app}/teams/${teamSwitcherTeam.id}`}
179
+ onClick: (e) => {
180
+ history.push(`/launchpad/teams/${teamSwitcherTeam.id}`);
179
181
  if (isLaunchpad) {
180
182
  handleLaunchpadLink(e);
181
- return React.createElement(Link, { to: appLink.team({ teamId: teamSwitcherTeam.id }) });
182
- // history.push(`/launchpad/teams/${teamSwitcherTeam.id}`);
183
+ history.push(`/launchpad/teams/${teamSwitcherTeam.id}`);
183
184
  }
184
185
  handleTeamClick({
185
186
  team: teamSwitcherTeam,
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.3",
5
5
  "author": {
6
6
  "name": "Tim Bula",
7
7
  "email": "timrbula@gmail.com"