@boomerang-io/carbon-addons-boomerang-react 4.6.21-beta.1 → 4.6.21-beta.10

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 +7 -6
  2. package/dist/esm/components/AdvantageSideNav/AdvantageSideNav.js +7 -6
  3. package/package.json +2 -2
package/dist/cjs/components/AdvantageSideNav/AdvantageSideNav.js CHANGED
@@ -3,7 +3,6 @@
3
3
  Object.defineProperty(exports, '__esModule', { value: true });
4
4
 
5
5
  var React = require('react');
6
- var reactRouterDom = require('react-router-dom');
7
6
  var cx = require('classnames');
8
7
  var react = require('@carbon/react');
9
8
  var TooltipHover = require('../TooltipHover/TooltipHover.js');
@@ -47,7 +46,8 @@ function AdvantageSideNav(props) {
47
46
  const agentAssistantStudioLink = sideNavUrls?.find((sideNavUrl) => sideNavUrl.key === SideNavUrlKeys.AgentStudio)?.url;
48
47
  const agentAssistantLibraryLink = sideNavUrls?.find((sideNavUrl) => sideNavUrl.key === SideNavUrlKeys.AgentLibrary)?.url;
49
48
  const documentCollectionsLink = sideNavUrls?.find((sideNavUrl) => sideNavUrl.key === SideNavUrlKeys.DocumentCollections)?.url;
50
- const catalogNavlink = sideNavUrls?.find((sideNavUrl) => sideNavUrl.key === SideNavUrlKeys.Catalog)?.url;
49
+ // const catalogNavlink = sideNavUrls?.find((sideNavUrl) => sideNavUrl.key === SideNavUrlKeys.Catalog)?.url;
50
+ const catalogNavlink = "https://ocp2.cloud.boomerangplatform.net/dev/catalog/";
51
51
  const settingsLink = sideNavUrls?.find((sideNavUrl) => sideNavUrl.key === SideNavUrlKeys.Settings)?.url;
52
52
  const adminNavlink = sideNavUrls?.find((sideNavUrl) => sideNavUrl.key === SideNavUrlKeys.Admin)?.url;
53
53
  // get current selected team
@@ -229,10 +229,11 @@ function AdvantageSideNav(props) {
229
229
  handleDocumentCollectionsClick();
230
230
  } }, "Document Collections")) : null,
231
231
  showSecondDivider ? React__default.default.createElement(react.SideNavDivider, null) : null,
232
- catalogNavlink ? (React__default.default.createElement(react.SideNavLink, { "data-testid": "sidenav-catalog-link", isActive: windowLocation.href.includes(`${baseEnvUrl}/catalog`),
233
- // href={catalogNavlink}
234
- renderIcon: icons.Catalog },
235
- React__default.default.createElement(reactRouterDom.Link, { to: catalogNavlink }, "Catalog"))) : null,
232
+ (React__default.default.createElement(react.SideNavLink, { "data-testid": "sidenav-catalog-link", isActive: location.pathname.includes("/catalog"), renderIcon: icons.Catalog, href: catalogNavlink, onClick: (e) => {
233
+ console.log("ss", catalogNavlink);
234
+ e.preventDefault();
235
+ history.push(catalogNavlink);
236
+ } }, "Catalog")) ,
236
237
  settingsLink ? (React__default.default.createElement(react.SideNavLink, { "data-testid": "sidenav-settings-link", renderIcon: icons.Settings, href: settingsLink, onClick: (e) => {
237
238
  handleSettingsClick();
238
239
  } }, "Settings")) : null,
package/dist/esm/components/AdvantageSideNav/AdvantageSideNav.js CHANGED
@@ -1,5 +1,4 @@
1
1
  import React from 'react';
2
- import { Link } from 'react-router-dom';
3
2
  import cx from 'classnames';
4
3
  import { SideNavLink, SideNav, SideNavItems, SideNavDivider, Tag } from '@carbon/react';
5
4
  import TooltipHover from '../TooltipHover/TooltipHover.js';
@@ -38,7 +37,8 @@ function AdvantageSideNav(props) {
38
37
  const agentAssistantStudioLink = sideNavUrls?.find((sideNavUrl) => sideNavUrl.key === SideNavUrlKeys.AgentStudio)?.url;
39
38
  const agentAssistantLibraryLink = sideNavUrls?.find((sideNavUrl) => sideNavUrl.key === SideNavUrlKeys.AgentLibrary)?.url;
40
39
  const documentCollectionsLink = sideNavUrls?.find((sideNavUrl) => sideNavUrl.key === SideNavUrlKeys.DocumentCollections)?.url;
41
- const catalogNavlink = sideNavUrls?.find((sideNavUrl) => sideNavUrl.key === SideNavUrlKeys.Catalog)?.url;
40
+ // const catalogNavlink = sideNavUrls?.find((sideNavUrl) => sideNavUrl.key === SideNavUrlKeys.Catalog)?.url;
41
+ const catalogNavlink = "https://ocp2.cloud.boomerangplatform.net/dev/catalog/";
42
42
  const settingsLink = sideNavUrls?.find((sideNavUrl) => sideNavUrl.key === SideNavUrlKeys.Settings)?.url;
43
43
  const adminNavlink = sideNavUrls?.find((sideNavUrl) => sideNavUrl.key === SideNavUrlKeys.Admin)?.url;
44
44
  // get current selected team
@@ -220,10 +220,11 @@ function AdvantageSideNav(props) {
220
220
  handleDocumentCollectionsClick();
221
221
  } }, "Document Collections")) : null,
222
222
  showSecondDivider ? React.createElement(SideNavDivider, null) : null,
223
- catalogNavlink ? (React.createElement(SideNavLink, { "data-testid": "sidenav-catalog-link", isActive: windowLocation.href.includes(`${baseEnvUrl}/catalog`),
224
- // href={catalogNavlink}
225
- renderIcon: Catalog },
226
- React.createElement(Link, { to: catalogNavlink }, "Catalog"))) : null,
223
+ (React.createElement(SideNavLink, { "data-testid": "sidenav-catalog-link", isActive: location.pathname.includes("/catalog"), renderIcon: Catalog, href: catalogNavlink, onClick: (e) => {
224
+ console.log("ss", catalogNavlink);
225
+ e.preventDefault();
226
+ history.push(catalogNavlink);
227
+ } }, "Catalog")) ,
227
228
  settingsLink ? (React.createElement(SideNavLink, { "data-testid": "sidenav-settings-link", renderIcon: Settings, href: settingsLink, onClick: (e) => {
228
229
  handleSettingsClick();
229
230
  } }, "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.21-beta.1",
4
+ "version": "4.6.21-beta.10",
5
5
  "author": {
6
6
  "name": "Tim Bula",
7
7
  "email": "timrbula@gmail.com"
@@ -73,7 +73,7 @@
73
73
  "react": "^17.0.0 || ^16.14.0",
74
74
  "react-dom": "^17.0.0 || ^16.14.0",
75
75
  "react-query": "^3.34.12",
76
- "react-router-dom": "^5.3.0",
76
+ "react-router-dom": "^6.0.0",
77
77
  "yup": ">=0.32.11"
78
78
  },
79
79
  "devDependencies": {