@boomerang-io/carbon-addons-boomerang-react 4.6.15-beta.9 → 4.6.21-beta.2

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/AdvantageSideNav/AdvantageSideNav.js +12 -5
  2. package/dist/esm/components/AdvantageSideNav/AdvantageSideNav.js +12 -5
  3. package/package.json +1 -1
package/dist/cjs/components/AdvantageSideNav/AdvantageSideNav.js CHANGED
@@ -3,6 +3,7 @@
3
3
  Object.defineProperty(exports, '__esModule', { value: true });
4
4
 
5
5
  var React = require('react');
6
+ var reactRouterDom = require('react-router-dom');
6
7
  var cx = require('classnames');
7
8
  var react = require('@carbon/react');
8
9
  var TooltipHover = require('../TooltipHover/TooltipHover.js');
@@ -178,15 +179,15 @@ function AdvantageSideNav(props) {
178
179
  React__default.default.createElement("div", null,
179
180
  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) => {
180
181
  if (isLaunchpad) {
181
- //handleLaunchpadLink(e);
182
- history.push(`${baseEnvUrl}/launchpad}/`);
182
+ handleLaunchpadLink(e);
183
+ history.push("/");
183
184
  }
184
185
  handleHomeClick();
185
186
  } }, "Home")) : null,
186
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(`/launchpad/teams/${teamSwitcherTeam.id}`), className: `${settings.prefix}--bmrg-advantage-sidenav-team`, renderIcon: icons.UserMultiple, href: `${baseEnvUrl}/${app}/teams/${teamSwitcherTeam.id}`, onClick: (e) => {
187
188
  if (isLaunchpad) {
188
- //handleLaunchpadLink(e);
189
- history.push(`/launchpad/teams/${teamSwitcherTeam.id}`);
189
+ handleLaunchpadLink(e);
190
+ history.push(`/teams/${teamSwitcherTeam.id}`);
190
191
  }
191
192
  handleTeamClick({
192
193
  team: teamSwitcherTeam,
@@ -228,7 +229,13 @@ function AdvantageSideNav(props) {
228
229
  handleDocumentCollectionsClick();
229
230
  } }, "Document Collections")) : null,
230
231
  showSecondDivider ? React__default.default.createElement(react.SideNavDivider, null) : null,
231
- catalogNavlink ? (React__default.default.createElement(react.SideNavLink, { "data-testid": "sidenav-catalog-link", isActive: windowLocation.href.includes(`${baseEnvUrl}/catalog`), href: catalogNavlink, renderIcon: icons.Catalog }, "Catalog")) : null,
232
+ catalogNavlink ? (React__default.default.createElement("div", null,
233
+ "catalogg",
234
+ React__default.default.createElement(reactRouterDom.Link, { to: catalogNavlink }, "Catalog"),
235
+ React__default.default.createElement(react.SideNavLink, { "data-testid": "sidenav-catalog-link", isActive: windowLocation.href.includes(`${baseEnvUrl}/catalog`),
236
+ // href={catalogNavlink}
237
+ renderIcon: icons.Catalog },
238
+ React__default.default.createElement(reactRouterDom.Link, { to: catalogNavlink }, "Catalog")))) : null,
232
239
  settingsLink ? (React__default.default.createElement(react.SideNavLink, { "data-testid": "sidenav-settings-link", renderIcon: icons.Settings, href: settingsLink, onClick: (e) => {
233
240
  handleSettingsClick();
234
241
  } }, "Settings")) : null,
package/dist/esm/components/AdvantageSideNav/AdvantageSideNav.js CHANGED
@@ -1,4 +1,5 @@
1
1
  import React from 'react';
2
+ import { Link } from 'react-router-dom';
2
3
  import cx from 'classnames';
3
4
  import { SideNavLink, SideNav, SideNavItems, SideNavDivider, Tag } from '@carbon/react';
4
5
  import TooltipHover from '../TooltipHover/TooltipHover.js';
@@ -169,15 +170,15 @@ function AdvantageSideNav(props) {
169
170
  React.createElement("div", null,
170
171
  homeLink ? (React.createElement(SideNavLink, { "data-testid": "sidenav-home-link", isActive: `${baseEnvUrl}/${app}/`.includes(windowLocation.href), renderIcon: Home, href: homeLink, onClick: (e) => {
171
172
  if (isLaunchpad) {
172
- //handleLaunchpadLink(e);
173
- history.push(`${baseEnvUrl}/launchpad}/`);
173
+ handleLaunchpadLink(e);
174
+ history.push("/");
174
175
  }
175
176
  handleHomeClick();
176
177
  } }, "Home")) : null,
177
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(`/launchpad/teams/${teamSwitcherTeam.id}`), className: `${prefix}--bmrg-advantage-sidenav-team`, renderIcon: UserMultiple, href: `${baseEnvUrl}/${app}/teams/${teamSwitcherTeam.id}`, onClick: (e) => {
178
179
  if (isLaunchpad) {
179
- //handleLaunchpadLink(e);
180
- history.push(`/launchpad/teams/${teamSwitcherTeam.id}`);
180
+ handleLaunchpadLink(e);
181
+ history.push(`/teams/${teamSwitcherTeam.id}`);
181
182
  }
182
183
  handleTeamClick({
183
184
  team: teamSwitcherTeam,
@@ -219,7 +220,13 @@ function AdvantageSideNav(props) {
219
220
  handleDocumentCollectionsClick();
220
221
  } }, "Document Collections")) : null,
221
222
  showSecondDivider ? React.createElement(SideNavDivider, null) : null,
222
- catalogNavlink ? (React.createElement(SideNavLink, { "data-testid": "sidenav-catalog-link", isActive: windowLocation.href.includes(`${baseEnvUrl}/catalog`), href: catalogNavlink, renderIcon: Catalog }, "Catalog")) : null,
223
+ catalogNavlink ? (React.createElement("div", null,
224
+ "catalogg",
225
+ React.createElement(Link, { to: catalogNavlink }, "Catalog"),
226
+ React.createElement(SideNavLink, { "data-testid": "sidenav-catalog-link", isActive: windowLocation.href.includes(`${baseEnvUrl}/catalog`),
227
+ // href={catalogNavlink}
228
+ renderIcon: Catalog },
229
+ React.createElement(Link, { to: catalogNavlink }, "Catalog")))) : null,
223
230
  settingsLink ? (React.createElement(SideNavLink, { "data-testid": "sidenav-settings-link", renderIcon: Settings, href: settingsLink, onClick: (e) => {
224
231
  handleSettingsClick();
225
232
  } }, "Settings")) : 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.15-beta.9",
4
+ "version": "4.6.21-beta.2",
5
5
  "author": {
6
6
  "name": "Tim Bula",
7
7
  "email": "timrbula@gmail.com"