supernav-test 2.2.9 → 2.2.10

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

@@ -17,13 +17,14 @@ 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 IconRight from '../static/images/sidebar-icons/rightIcon.svg';
 var styles = require('../stylesheets/sidebar-main-link.scss');
 
 function SidebarMainLink(props) {
@@ -89,7 +90,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,6 +11,14 @@ 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 _classnames = _interopRequireDefault(require("classnames"));
 
 var _SidebarActions = require("../actions/SidebarActions");
@@ -29,10 +37,6 @@ 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 Hamburger from '../static/images/hamburger-icon.svg';
-// import CloseHamburger from '../static/images/close-hamburger-icon.svg'
-// import SaamaLogo from '../static/images/saama_logo.svg';
-// import UserIcon from '../static/images/icon-user.svg';
 // icon imports
 require('../stylesheets/topnav.scss');
 
@@ -94,8 +98,12 @@ function TopNav(props) {
   var showHamburger = function showHamburger() {
     var menuIcon;
 
-    if (isLogoClickable) {// menuIcon = isMinimal || expanded ? <span className="close-hamburger-icon"><CloseHamburger /></span> : <Hamburger />
-    } else {// menuIcon= <Hamburger />
+    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);
     }
 
     return menuIcon;
@@ -123,7 +131,7 @@ function TopNav(props) {
       clickable: isLogoClickable
     }),
     onClick: handleToggleClick
-  }), /*#__PURE__*/_react.default.createElement("span", {
+  }, /*#__PURE__*/_react.default.createElement(_saama_logo.ReactComponent, null)), /*#__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"
@@ -149,7 +157,7 @@ function TopNav(props) {
     id: "dropdown-basic"
   }, /*#__PURE__*/_react.default.createElement("span", {
     className: "account-name"
-  }, accountName)), /*#__PURE__*/_react.default.createElement("div", {
+  }, accountName), /*#__PURE__*/_react.default.createElement(_iconUser.ReactComponent, null)), /*#__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/static/images/saama_logo.svg

@@ -6,10 +6,10 @@ viewBox="0 0 23961 8481"
  xmlns:xlink="http://www.w3.org/1999/xlink">
  <defs>
   <style type="text/css">
-   <![CDATA[
+ 
     .fil0 {fill:#1E96DE}
     .fil1 {fill:#333333}
-   ]]>
+
   </style>
  </defs>
  <g id="Layer_x0020_1">

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

@@ -7,6 +7,12 @@ 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"); } }
@@ -191,9 +197,11 @@ var SubmenuUtil = /*#__PURE__*/function () {
           className: "sub-option-parent"
         }, /*#__PURE__*/_react.default.createElement("span", {
           className: "sub-option-icon-container"
-        }), /*#__PURE__*/_react.default.createElement("span", {
+        }, /*#__PURE__*/_react.default.createElement(_rbqmTriangle.ReactComponent, null)), /*#__PURE__*/_react.default.createElement("span", {
           className: "label"
-        }, "RBQM")), showSubApps && subApps);
+        }, "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);
       } else {
         return /*#__PURE__*/_react.default.createElement("div", {
           key: Math.random()

package/package.json

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

package/src/components/lsac-supernavbar/components/SidebarMainLink.tsx

@@ -5,7 +5,7 @@ import { RootState } from "../reducers/RootReducer";
 import { SetSelectedSidebarOption, SetExpandSidebar, SetMinimalSidebar } from "../actions/SidebarActions";
 import { SidebarMenuTypes } from "../constants/SidebarConstants";
 import { KeycloakAppInfo, SidebarCategory } from "../interfaces/Models";
-// import IconRight from '../static/images/sidebar-icons/rightIcon.svg';
+import {ReactComponent as IconRight} from '../static/images/sidebar-icons/rightIcon.svg';
 
 const styles = require('../stylesheets/sidebar-main-link.scss');
 
@@ -63,7 +63,7 @@ function SidebarMainLink(props: SidebarMainLinkProps) {
   const iconRight = (
     <div className="icon-right" >
       <div className="icon-right-arrow">
-        {/* <IconRight /> */}
+        <IconRight />
       </div>
     </div>
   );

package/src/components/lsac-supernavbar/components/Topnav.tsx

@@ -1,9 +1,9 @@
 import React, {useEffect, useRef} from 'react';
 import {useDispatch, useSelector} from "react-redux";
-// import Hamburger from '../static/images/hamburger-icon.svg';
-// import CloseHamburger from '../static/images/close-hamburger-icon.svg'
-// import SaamaLogo from '../static/images/saama_logo.svg';
-// import UserIcon from '../static/images/icon-user.svg';
+import {ReactComponent as Hamburger} from '../static/images/hamburger-icon.svg';
+import {ReactComponent as CloseHamburger} from '../static/images/close-hamburger-icon.svg'
+import {ReactComponent as SaamaLogo} from '../static/images/saama_logo.svg';
+import {ReactComponent as UserIcon} from '../static/images/icon-user.svg';
 import cx from 'classnames';
 import {RootState} from "../reducers/RootReducer";
 import {SetExpandSidebar, SetTopnavToggleref, SetMinimalSidebar} from "../actions/SidebarActions";
@@ -71,9 +71,9 @@ function TopNav(props: Props) {
   const showHamburger = () => {
     let menuIcon;
     if(isLogoClickable){
-      // menuIcon = isMinimal || expanded ? <span className="close-hamburger-icon"><CloseHamburger /></span> : <Hamburger />
+      menuIcon = isMinimal || expanded ? <span className="close-hamburger-icon"><CloseHamburger /></span> : <Hamburger />
     }else{
-      // menuIcon= <Hamburger />
+      menuIcon= <Hamburger />
     }
     return menuIcon
   }
@@ -91,7 +91,7 @@ function TopNav(props: Props) {
         {showHamburger() }
       </span>
       <span className={cx('saama-logo', { clickable: isLogoClickable })} onClick={handleToggleClick}> 
-        {/* <SaamaLogo  /> */}
+        <SaamaLogo  />
       </span>
       <span className='LSAC-logo'>Life Science <br/>Analytics Cloud</span>
       { !!applicationTitle ? <span className="app-name">{applicationTitle}</span> : <></>}
@@ -114,7 +114,7 @@ function TopNav(props: Props) {
               <Dropdown>
                 <Dropdown.Toggle variant="" id="dropdown-basic">
                 <span className="account-name">{accountName}</span>
-                  {/* <UserIcon /> */}
+                  <UserIcon />
                 </Dropdown.Toggle>
                 <div className="user-dropdown-contents">
                   <Dropdown.Menu>

package/src/components/lsac-supernavbar/static/images/saama_logo.svg

@@ -6,10 +6,10 @@ viewBox="0 0 23961 8481"
  xmlns:xlink="http://www.w3.org/1999/xlink">
  <defs>
   <style type="text/css">
-   <![CDATA[
+ 
     .fil0 {fill:#1E96DE}
     .fil1 {fill:#333333}
-   ]]>
+
   </style>
  </defs>
  <g id="Layer_x0020_1">

package/src/components/lsac-supernavbar/util/SubmenuUtil.tsx

@@ -1,9 +1,9 @@
 import React from 'react';
 import IcomoonReact from "icomoon-react";
 import { Application, KeycloakAppInfo, SidebarCategory } from "../interfaces/Models";
-// import Rbqmtriangle from '../static/images/sidebar-icons/rbqm-triangle.svg';
-// import CaretDown from '../static/images/sidebar-icons/caret_down.svg';
-// import CaretUp from '../static/images/sidebar-icons/caret_up.svg';
+import {ReactComponent as Rbqmtriangle} from '../static/images/sidebar-icons/rbqm-triangle.svg';
+import {ReactComponent as CaretDown} from '../static/images/sidebar-icons/caret_down.svg';
+import {ReactComponent as CaretUp} from '../static/images/sidebar-icons/caret_up.svg';
 import iconSet from "../resources/icomoon-library.json";
 const baseUrlForIcons = "https://static-content.lsac.cloud/app-icons/";
 export default class SubmenuUtil {
@@ -137,10 +137,10 @@ export default class SubmenuUtil {
       <div className="sub-option" onClick={subAppClick} key={Math.random()}>
         <div className="sub-option-parent">
           <span className="sub-option-icon-container">
-          {/* <Rbqmtriangle /> */}
+          <Rbqmtriangle />
           </span>
           <span className='label'>RBQM</span>
-          {/* <span className="caret">{showSubApps ? <CaretUp /> : <CaretDown />}</span> */}
+          <span className="caret">{showSubApps ? <CaretUp /> : <CaretDown />}</span>
         </div>
         {showSubApps && subApps}
       </div>

package/tsconfig.json

@@ -18,9 +18,9 @@
     "moduleResolution": "node",
     "resolveJsonModule": true,
     "isolatedModules": true,
-    "jsx": "react",
     "jsx": "react-jsx",
-},
+    "noEmit": true
+  },
   "include": [
     "./src/**/*"
   ],