supernav-test 2.2.33 → 2.2.34

package/dist/components/lsac-supernavbar/components/SidebarMainLink.js

@@ -17,14 +17,13 @@ var _SidebarActions = require("../actions/SidebarActions");
 
 var _Models = require("../interfaces/Models");
 
-var _rightIcon = require("../static/images/sidebar-icons/rightIcon.svg");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
+// import {ReactComponent as IconRight} from '../static/images/sidebar-icons/rightIcon.svg';
 var styles = require('../stylesheets/sidebar-main-link.scss');
 
 function SidebarMainLink(props) {
@@ -90,7 +89,7 @@ function SidebarMainLink(props) {
     className: "icon-right"
   }, /*#__PURE__*/_react.default.createElement("div", {
     className: "icon-right-arrow"
-  }, /*#__PURE__*/_react.default.createElement(_rightIcon.ReactComponent, null)));
+  }));
 
   if (subMenu) {
     return /*#__PURE__*/_react.default.createElement("div", {

package/dist/components/lsac-supernavbar/components/Topnav.js

@@ -11,13 +11,7 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _reactRedux = require("react-redux");
 
-var _hamburgerIcon = require("../static/images/hamburger-icon.svg");
-
-var _closeHamburgerIcon = require("../static/images/close-hamburger-icon.svg");
-
-var _saama_logo = require("../static/images/saama_logo.svg");
-
-var _iconUser = require("../static/images/icon-user.svg");
+var _saama_logo = _interopRequireDefault(require("../static/images/saama_logo.svg"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
@@ -37,6 +31,9 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
+// import {ReactComponent as Hamburger} from '../static/images/hamburger-icon.svg';
+// import {ReactComponent as CloseHamburger} from '../static/images/close-hamburger-icon.svg'
+// import {ReactComponent as UserIcon} from '../static/images/icon-user.svg';
 // icon imports
 require('../stylesheets/topnav.scss');
 
@@ -98,12 +95,8 @@ function TopNav(props) {
   var showHamburger = function showHamburger() {
     var menuIcon;
 
-    if (isLogoClickable) {
-      menuIcon = isMinimal || expanded ? /*#__PURE__*/_react.default.createElement("span", {
-        className: "close-hamburger-icon"
-      }, /*#__PURE__*/_react.default.createElement(_closeHamburgerIcon.ReactComponent, null)) : /*#__PURE__*/_react.default.createElement(_hamburgerIcon.ReactComponent, null);
-    } else {
-      menuIcon = /*#__PURE__*/_react.default.createElement(_hamburgerIcon.ReactComponent, null);
+    if (isLogoClickable) {// menuIcon = isMinimal || expanded ? <span className="close-hamburger-icon"><CloseHamburger /></span> : <Hamburger />
+    } else {// menuIcon= <Hamburger />
     }
 
     return menuIcon;
@@ -131,7 +124,9 @@ function TopNav(props) {
       clickable: isLogoClickable
     }),
     onClick: handleToggleClick
-  }, /*#__PURE__*/_react.default.createElement(_saama_logo.ReactComponent, null)), /*#__PURE__*/_react.default.createElement("span", {
+  }, /*#__PURE__*/_react.default.createElement("img", {
+    src: _saama_logo.default
+  })), /*#__PURE__*/_react.default.createElement("span", {
     className: "LSAC-logo"
   }, "Life Science ", /*#__PURE__*/_react.default.createElement("br", null), "Analytics Cloud"), !!applicationTitle ? /*#__PURE__*/_react.default.createElement("span", {
     className: "app-name"
@@ -157,7 +152,7 @@ function TopNav(props) {
     id: "dropdown-basic"
   }, /*#__PURE__*/_react.default.createElement("span", {
     className: "account-name"
-  }, accountName), /*#__PURE__*/_react.default.createElement(_iconUser.ReactComponent, null)), /*#__PURE__*/_react.default.createElement("div", {
+  }, accountName)), /*#__PURE__*/_react.default.createElement("div", {
     className: "user-dropdown-contents"
   }, /*#__PURE__*/_react.default.createElement(_reactBootstrap.Dropdown.Menu, null, /*#__PURE__*/_react.default.createElement("span", null, userName), /*#__PURE__*/_react.default.createElement("span", {
     className: "switch-account-link-wrapper"

package/dist/components/lsac-supernavbar/util/SubmenuUtil.js

@@ -7,12 +7,6 @@ exports.default = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
-var _rbqmTriangle = require("../static/images/sidebar-icons/rbqm-triangle.svg");
-
-var _caret_down = require("../static/images/sidebar-icons/caret_down.svg");
-
-var _caret_up = require("../static/images/sidebar-icons/caret_up.svg");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
@@ -197,11 +191,9 @@ var SubmenuUtil = /*#__PURE__*/function () {
           className: "sub-option-parent"
         }, /*#__PURE__*/_react.default.createElement("span", {
           className: "sub-option-icon-container"
-        }, /*#__PURE__*/_react.default.createElement(_rbqmTriangle.ReactComponent, null)), /*#__PURE__*/_react.default.createElement("span", {
+        }), /*#__PURE__*/_react.default.createElement("span", {
           className: "label"
-        }, "RBQM"), /*#__PURE__*/_react.default.createElement("span", {
-          className: "caret"
-        }, showSubApps ? /*#__PURE__*/_react.default.createElement(_caret_up.ReactComponent, null) : /*#__PURE__*/_react.default.createElement(_caret_down.ReactComponent, null))), showSubApps && subApps);
+        }, "RBQM")), showSubApps && subApps);
       } else {
         return /*#__PURE__*/_react.default.createElement("div", {
           key: Math.random()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "supernav-test",
-  "version": "2.2.33",
+  "version": "2.2.34",
   "private": false,
   "dependencies": {
     "@testing-library/jest-dom": "5.14.1",