supernav-test 2.2.34 → 2.2.35

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

@@ -45,23 +45,19 @@ function AuthWrapper(props) {
       topnavDisplayMode = props.topnavDisplayMode,
       sidebarDisplayMode = props.sidebarDisplayMode;
   var uiDevMode = runMode === _UtilityConstants.RunModes.UI_DEV_MODE;
-  var dispatch = (0, _reactRedux.useDispatch)();
+  var dispatch = (0, _reactRedux.useDispatch)(); // Once we have an initialized keycloak, then fetch the userInfo's information
+
   (0, _react.useEffect)(function () {
     dispatch((0, _AuthActions.setUiDevMode)(uiDevMode));
-  }, [uiDevMode]); // Once we have an initialized keycloak, then fetch the userInfo's information
 
-  (0, _react.useEffect)(function () {
-    if (!uiDevMode && userInfo) {
+    if (userInfo && !uiDevMode) {
       dispatch((0, _AuthActions.setUserInfo)(userInfo));
-    }
-  }, [uiDevMode, userInfo]);
-  (0, _react.useEffect)(function () {
-    if (uiDevMode) {
+    } else {
       dispatch((0, _AuthActions.setUserInfo)({
         name: 'test-userInfo'
       }));
     }
-  }, [uiDevMode]); // If the calling application has local application links, set those in the store so they can be consumed by the Sidebar
+  }, [props]); // If the calling application has local application links, set those in the store so they can be consumed by the Sidebar
 
   (0, _react.useEffect)(function () {
     if (sidebarOptions && sidebarOptions.length > 0) {

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

@@ -17,13 +17,14 @@ var _SidebarActions = require("../actions/SidebarActions");
 
 var _Models = require("../interfaces/Models");
 
+var _rightIcon = _interopRequireDefault(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) {
@@ -89,7 +90,10 @@ function SidebarMainLink(props) {
     className: "icon-right"
   }, /*#__PURE__*/_react.default.createElement("div", {
     className: "icon-right-arrow"
-  }));
+  }, /*#__PURE__*/_react.default.createElement("img", {
+    src: _rightIcon.default,
+    className: "icon-right"
+  })));
 
   if (subMenu) {
     return /*#__PURE__*/_react.default.createElement("div", {

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

@@ -11,8 +11,14 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _reactRedux = require("react-redux");
 
+var _hamburgerIcon = _interopRequireDefault(require("../static/images/hamburger-icon.svg"));
+
+var _closeHamburgerIcon = _interopRequireDefault(require("../static/images/close-hamburger-icon.svg"));
+
 var _saama_logo = _interopRequireDefault(require("../static/images/saama_logo.svg"));
 
+var _iconUser = _interopRequireDefault(require("../static/images/icon-user.svg"));
+
 var _classnames = _interopRequireDefault(require("classnames"));
 
 var _SidebarActions = require("../actions/SidebarActions");
@@ -31,9 +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 {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');
 
@@ -95,8 +98,21 @@ 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("img", {
+        src: _closeHamburgerIcon.default,
+        className: "close-hamburger"
+      })) : /*#__PURE__*/_react.default.createElement("img", {
+        src: _hamburgerIcon.default,
+        className: "hamburger"
+      });
+    } else {
+      menuIcon = /*#__PURE__*/_react.default.createElement("img", {
+        src: _hamburgerIcon.default,
+        className: "hamburger"
+      });
     }
 
     return menuIcon;
@@ -125,7 +141,8 @@ function TopNav(props) {
     }),
     onClick: handleToggleClick
   }, /*#__PURE__*/_react.default.createElement("img", {
-    src: _saama_logo.default
+    src: _saama_logo.default,
+    className: "saama-logo"
   })), /*#__PURE__*/_react.default.createElement("span", {
     className: "LSAC-logo"
   }, "Life Science ", /*#__PURE__*/_react.default.createElement("br", null), "Analytics Cloud"), !!applicationTitle ? /*#__PURE__*/_react.default.createElement("span", {
@@ -152,7 +169,10 @@ 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("img", {
+    src: _iconUser.default,
+    className: "user-icon"
+  })), /*#__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/stylesheets/topnav.scss

@@ -26,6 +26,9 @@ $bodyText: $gray80;
   top: 0;
   left: 0;
 }
+.user-icon {
+  height: 30px;
+}
 
 .top-nav {
   display: flex;
@@ -75,7 +78,7 @@ $bodyText: $gray80;
     display: flex;
     flex-shrink: 100;
     width: 40%;
-    margin-left: 1em;
+    margin-left: 30em;
 
     &.minimized{
       overflow: hidden;
@@ -222,6 +225,13 @@ $bodyText: $gray80;
     width: 125px;
     height: 38px;
   }
+  .saama-logo {
+    height: 38px;
+  }
+  
+  .hamburger {
+    margin: 5px 0 0 5px;
+  }
   .clickable{
     height: 28px;
   }

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

@@ -7,6 +7,12 @@ exports.default = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
+var _rbqmTriangle = _interopRequireDefault(require("../static/images/sidebar-icons/rbqm-triangle.svg"));
+
+var _caret_down = _interopRequireDefault(require("../static/images/sidebar-icons/caret_down.svg"));
+
+var _caret_up = _interopRequireDefault(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,20 @@ 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("img", {
+          src: _rbqmTriangle.default,
+          className: "rbqm-triangle"
+        })), /*#__PURE__*/_react.default.createElement("span", {
           className: "label"
-        }, "RBQM")), showSubApps && subApps);
+        }, "RBQM"), /*#__PURE__*/_react.default.createElement("span", {
+          className: "caret"
+        }, showSubApps ? /*#__PURE__*/_react.default.createElement("img", {
+          src: _caret_up.default,
+          className: "caret-up"
+        }) : /*#__PURE__*/_react.default.createElement("img", {
+          src: _caret_down.default,
+          className: "caret-down"
+        }))), 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.34",
+  "version": "2.2.35",
   "private": false,
   "dependencies": {
     "@testing-library/jest-dom": "5.14.1",
@@ -18,10 +18,9 @@
     "react-scripts": "4.0.3",
     "redux": "4.0.5",
     "redux-thunk": "2.3.0",
-    "supernav-test": "^2.2.18",
-    "typescript": "4.4.3",
     "web-vitals": "1.1.2",
-    "webpack-dev-server": "3.11.1"
+    "react": "17.0.2",
+    "react-dom": "17.0.2"
   },
   "peerDependencies": {
     "react": "17.0.2",
@@ -34,36 +33,22 @@
     "@babel/preset-env": "7.15.6",
     "@babel/preset-react": "7.14.5",
     "@babel/preset-typescript": "7.15.0",
-    "@types/classnames": "2.2.11",
     "@types/react": "17.0.21",
     "@types/react-dom": "17.0.9",
     "@types/react-redux": "^7.1.11",
     "@types/react-router": "5.1.8",
-    "@types/redux": "^3.6.0",
-    "@types/redux-thunk": "^2.1.0",
-    "@webpack-cli/serve": "^1.5.2",
     "babel-loader": "8.1.0",
-    "copyfiles": "^2.4.1",
-    "css-loader": "5.0.0",
     "customize-cra": "1.0.0",
     "eslint-plugin-node": "11.0.0",
     "eslint-plugin-promise": "4.2.1",
     "eslint-plugin-react": "7.18.0",
-    "file-loader": "6.2.0",
-    "html-webpack-plugin": "4.5.2",
     "jest-environment-jsdom-fourteen": "0.1.0",
     "node-sass": "^4.14.1",
     "react-app-rewired": "2.1.3",
     "react-scripts": "3.4.1",
     "react-test-renderer": "16.9.0",
-    "sass-loader": "^10.0.0",
-    "style-loader": "2.0.0",
     "to-string-loader": "1.1.6",
-    "ts-loader": "^4.4.2",
-    "typescript": "4.4.3",
-    "url-loader": "4.1.1",
-    "webpack": "4.44.2",
-    "webpack-cli": "3.3.12"
+    "typescript": "4.4.3"
   },
   "main": "dist/components/lsac-supernavbar/index.js",
   "types": "dist/components/lsac-supernavbar/index.d.ts",
@@ -73,15 +58,11 @@
   ],
   "scripts": {
     "start": "react-scripts start",
-    "webpack:start": "webpack-dev-server --mode development --config webpack.config.js --open",
     "build": "react-scripts build",
     "test": "react-scripts test",
     "eject": "react-scripts eject",
     "clean": "rm dist/index.js",
-    "build-dev": "webpack --mode development",
-    "build-prod": "webpack --mode production",
-    "tsc-build": "npx tsc",
-    "publish:npm": "set NODE_ENV=production && rm -rf dist && mkdir dist && npx babel --extensions .tsx,.jsx,.ts,.js src --out-dir dist --copy-files && npx tsc"
+    "publish:npm": "set NODE_ENV=production && rm -rf dist && mkdir dist && npx babel --extensions .tsx,.jsx,.ts,.js src --out-dir dist --copy-files && npx tsc && npm publish"
   },
   "eslintConfig": {
     "extends": [