supernav-test 2.2.31 → 2.2.35
Sign up to get free protection for your applications and to get access to all the features.
- package/dist/components/lsac-supernavbar/AuthWrapper.js +5 -9
- package/dist/components/lsac-supernavbar/components/SidebarMainLink.js +6 -2
- package/dist/components/lsac-supernavbar/components/Topnav.js +22 -5
- package/dist/components/lsac-supernavbar/static/images/saama_logo.svg +2 -2
- package/dist/components/lsac-supernavbar/stylesheets/topnav.scss +12 -1
- package/dist/components/lsac-supernavbar/util/SubmenuUtil.js +19 -2
- package/package.json +5 -24
@@ -45,23 +45,19 @@ function AuthWrapper(props) {
|
|
45
45
|
topnavDisplayMode = props.topnavDisplayMode,
|
46
46
|
sidebarDisplayMode = props.sidebarDisplayMode;
|
47
47
|
var uiDevMode = runMode === _UtilityConstants.RunModes.UI_DEV_MODE;
|
48
|
-
var dispatch = (0, _reactRedux.useDispatch)();
|
48
|
+
var dispatch = (0, _reactRedux.useDispatch)(); // Once we have an initialized keycloak, then fetch the userInfo's information
|
49
|
+
|
49
50
|
(0, _react.useEffect)(function () {
|
50
51
|
dispatch((0, _AuthActions.setUiDevMode)(uiDevMode));
|
51
|
-
}, [uiDevMode]); // Once we have an initialized keycloak, then fetch the userInfo's information
|
52
52
|
|
53
|
-
|
54
|
-
if (!uiDevMode && userInfo) {
|
53
|
+
if (userInfo && !uiDevMode) {
|
55
54
|
dispatch((0, _AuthActions.setUserInfo)(userInfo));
|
56
|
-
}
|
57
|
-
}, [uiDevMode, userInfo]);
|
58
|
-
(0, _react.useEffect)(function () {
|
59
|
-
if (uiDevMode) {
|
55
|
+
} else {
|
60
56
|
dispatch((0, _AuthActions.setUserInfo)({
|
61
57
|
name: 'test-userInfo'
|
62
58
|
}));
|
63
59
|
}
|
64
|
-
}, [
|
60
|
+
}, [props]); // If the calling application has local application links, set those in the store so they can be consumed by the Sidebar
|
65
61
|
|
66
62
|
(0, _react.useEffect)(function () {
|
67
63
|
if (sidebarOptions && sidebarOptions.length > 0) {
|
@@ -17,13 +17,14 @@ var _SidebarActions = require("../actions/SidebarActions");
|
|
17
17
|
|
18
18
|
var _Models = require("../interfaces/Models");
|
19
19
|
|
20
|
+
var _rightIcon = _interopRequireDefault(require("../static/images/sidebar-icons/rightIcon.svg"));
|
21
|
+
|
20
22
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
21
23
|
|
22
24
|
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); }
|
23
25
|
|
24
26
|
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; }
|
25
27
|
|
26
|
-
// import IconRight from '../static/images/sidebar-icons/rightIcon.svg';
|
27
28
|
var styles = require('../stylesheets/sidebar-main-link.scss');
|
28
29
|
|
29
30
|
function SidebarMainLink(props) {
|
@@ -89,7 +90,10 @@ function SidebarMainLink(props) {
|
|
89
90
|
className: "icon-right"
|
90
91
|
}, /*#__PURE__*/_react.default.createElement("div", {
|
91
92
|
className: "icon-right-arrow"
|
92
|
-
}
|
93
|
+
}, /*#__PURE__*/_react.default.createElement("img", {
|
94
|
+
src: _rightIcon.default,
|
95
|
+
className: "icon-right"
|
96
|
+
})));
|
93
97
|
|
94
98
|
if (subMenu) {
|
95
99
|
return /*#__PURE__*/_react.default.createElement("div", {
|
@@ -15,6 +15,8 @@ var _hamburgerIcon = _interopRequireDefault(require("../static/images/hamburger-
|
|
15
15
|
|
16
16
|
var _closeHamburgerIcon = _interopRequireDefault(require("../static/images/close-hamburger-icon.svg"));
|
17
17
|
|
18
|
+
var _saama_logo = _interopRequireDefault(require("../static/images/saama_logo.svg"));
|
19
|
+
|
18
20
|
var _iconUser = _interopRequireDefault(require("../static/images/icon-user.svg"));
|
19
21
|
|
20
22
|
var _classnames = _interopRequireDefault(require("classnames"));
|
@@ -99,9 +101,18 @@ function TopNav(props) {
|
|
99
101
|
if (isLogoClickable) {
|
100
102
|
menuIcon = isMinimal || expanded ? /*#__PURE__*/_react.default.createElement("span", {
|
101
103
|
className: "close-hamburger-icon"
|
102
|
-
}, /*#__PURE__*/_react.default.createElement(
|
104
|
+
}, /*#__PURE__*/_react.default.createElement("img", {
|
105
|
+
src: _closeHamburgerIcon.default,
|
106
|
+
className: "close-hamburger"
|
107
|
+
})) : /*#__PURE__*/_react.default.createElement("img", {
|
108
|
+
src: _hamburgerIcon.default,
|
109
|
+
className: "hamburger"
|
110
|
+
});
|
103
111
|
} else {
|
104
|
-
menuIcon = /*#__PURE__*/_react.default.createElement(
|
112
|
+
menuIcon = /*#__PURE__*/_react.default.createElement("img", {
|
113
|
+
src: _hamburgerIcon.default,
|
114
|
+
className: "hamburger"
|
115
|
+
});
|
105
116
|
}
|
106
117
|
|
107
118
|
return menuIcon;
|
@@ -129,11 +140,14 @@ function TopNav(props) {
|
|
129
140
|
clickable: isLogoClickable
|
130
141
|
}),
|
131
142
|
onClick: handleToggleClick
|
132
|
-
},
|
143
|
+
}, /*#__PURE__*/_react.default.createElement("img", {
|
144
|
+
src: _saama_logo.default,
|
145
|
+
className: "saama-logo"
|
146
|
+
})), /*#__PURE__*/_react.default.createElement("span", {
|
133
147
|
className: "LSAC-logo"
|
134
148
|
}, "Life Science ", /*#__PURE__*/_react.default.createElement("br", null), "Analytics Cloud"), !!applicationTitle ? /*#__PURE__*/_react.default.createElement("span", {
|
135
149
|
className: "app-name"
|
136
|
-
}, applicationTitle) : null);
|
150
|
+
}, applicationTitle) : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null));
|
137
151
|
|
138
152
|
var content = topnavDisplayMode === _UtilityConstants.TopnavDisplayModes.MINIMAL ? /*#__PURE__*/_react.default.createElement("div", {
|
139
153
|
className: "top-nav-minimal header-logo",
|
@@ -155,7 +169,10 @@ function TopNav(props) {
|
|
155
169
|
id: "dropdown-basic"
|
156
170
|
}, /*#__PURE__*/_react.default.createElement("span", {
|
157
171
|
className: "account-name"
|
158
|
-
}, accountName), /*#__PURE__*/_react.default.createElement(
|
172
|
+
}, accountName), /*#__PURE__*/_react.default.createElement("img", {
|
173
|
+
src: _iconUser.default,
|
174
|
+
className: "user-icon"
|
175
|
+
})), /*#__PURE__*/_react.default.createElement("div", {
|
159
176
|
className: "user-dropdown-contents"
|
160
177
|
}, /*#__PURE__*/_react.default.createElement(_reactBootstrap.Dropdown.Menu, null, /*#__PURE__*/_react.default.createElement("span", null, userName), /*#__PURE__*/_react.default.createElement("span", {
|
161
178
|
className: "switch-account-link-wrapper"
|
@@ -26,6 +26,9 @@ $bodyText: $gray80;
|
|
26
26
|
top: 0;
|
27
27
|
left: 0;
|
28
28
|
}
|
29
|
+
.user-icon {
|
30
|
+
height: 30px;
|
31
|
+
}
|
29
32
|
|
30
33
|
.top-nav {
|
31
34
|
display: flex;
|
@@ -75,7 +78,7 @@ $bodyText: $gray80;
|
|
75
78
|
display: flex;
|
76
79
|
flex-shrink: 100;
|
77
80
|
width: 40%;
|
78
|
-
margin-left:
|
81
|
+
margin-left: 30em;
|
79
82
|
|
80
83
|
&.minimized{
|
81
84
|
overflow: hidden;
|
@@ -213,6 +216,7 @@ $bodyText: $gray80;
|
|
213
216
|
left: 4px;
|
214
217
|
margin: 0px;
|
215
218
|
width: auto;
|
219
|
+
height: 15px;
|
216
220
|
}
|
217
221
|
.close-hamburger-icon svg{
|
218
222
|
top: 4px;
|
@@ -221,6 +225,13 @@ $bodyText: $gray80;
|
|
221
225
|
width: 125px;
|
222
226
|
height: 38px;
|
223
227
|
}
|
228
|
+
.saama-logo {
|
229
|
+
height: 38px;
|
230
|
+
}
|
231
|
+
|
232
|
+
.hamburger {
|
233
|
+
margin: 5px 0 0 5px;
|
234
|
+
}
|
224
235
|
.clickable{
|
225
236
|
height: 28px;
|
226
237
|
}
|
@@ -7,6 +7,12 @@ exports.default = void 0;
|
|
7
7
|
|
8
8
|
var _react = _interopRequireDefault(require("react"));
|
9
9
|
|
10
|
+
var _rbqmTriangle = _interopRequireDefault(require("../static/images/sidebar-icons/rbqm-triangle.svg"));
|
11
|
+
|
12
|
+
var _caret_down = _interopRequireDefault(require("../static/images/sidebar-icons/caret_down.svg"));
|
13
|
+
|
14
|
+
var _caret_up = _interopRequireDefault(require("../static/images/sidebar-icons/caret_up.svg"));
|
15
|
+
|
10
16
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
11
17
|
|
12
18
|
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 () {
|
|
191
197
|
className: "sub-option-parent"
|
192
198
|
}, /*#__PURE__*/_react.default.createElement("span", {
|
193
199
|
className: "sub-option-icon-container"
|
194
|
-
}
|
200
|
+
}, /*#__PURE__*/_react.default.createElement("img", {
|
201
|
+
src: _rbqmTriangle.default,
|
202
|
+
className: "rbqm-triangle"
|
203
|
+
})), /*#__PURE__*/_react.default.createElement("span", {
|
195
204
|
className: "label"
|
196
|
-
}, "RBQM")
|
205
|
+
}, "RBQM"), /*#__PURE__*/_react.default.createElement("span", {
|
206
|
+
className: "caret"
|
207
|
+
}, showSubApps ? /*#__PURE__*/_react.default.createElement("img", {
|
208
|
+
src: _caret_up.default,
|
209
|
+
className: "caret-up"
|
210
|
+
}) : /*#__PURE__*/_react.default.createElement("img", {
|
211
|
+
src: _caret_down.default,
|
212
|
+
className: "caret-down"
|
213
|
+
}))), showSubApps && subApps);
|
197
214
|
} else {
|
198
215
|
return /*#__PURE__*/_react.default.createElement("div", {
|
199
216
|
key: Math.random()
|
package/package.json
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"name": "supernav-test",
|
3
|
-
"version": "2.2.
|
3
|
+
"version": "2.2.35",
|
4
4
|
"private": false,
|
5
5
|
"dependencies": {
|
6
6
|
"@testing-library/jest-dom": "5.14.1",
|
@@ -18,10 +18,9 @@
|
|
18
18
|
"react-scripts": "4.0.3",
|
19
19
|
"redux": "4.0.5",
|
20
20
|
"redux-thunk": "2.3.0",
|
21
|
-
"supernav-test": "^2.2.18",
|
22
|
-
"typescript": "4.4.3",
|
23
21
|
"web-vitals": "1.1.2",
|
24
|
-
"
|
22
|
+
"react": "17.0.2",
|
23
|
+
"react-dom": "17.0.2"
|
25
24
|
},
|
26
25
|
"peerDependencies": {
|
27
26
|
"react": "17.0.2",
|
@@ -34,36 +33,22 @@
|
|
34
33
|
"@babel/preset-env": "7.15.6",
|
35
34
|
"@babel/preset-react": "7.14.5",
|
36
35
|
"@babel/preset-typescript": "7.15.0",
|
37
|
-
"@types/classnames": "2.2.11",
|
38
36
|
"@types/react": "17.0.21",
|
39
37
|
"@types/react-dom": "17.0.9",
|
40
38
|
"@types/react-redux": "^7.1.11",
|
41
39
|
"@types/react-router": "5.1.8",
|
42
|
-
"@types/redux": "^3.6.0",
|
43
|
-
"@types/redux-thunk": "^2.1.0",
|
44
|
-
"@webpack-cli/serve": "^1.5.2",
|
45
40
|
"babel-loader": "8.1.0",
|
46
|
-
"copyfiles": "^2.4.1",
|
47
|
-
"css-loader": "5.0.0",
|
48
41
|
"customize-cra": "1.0.0",
|
49
42
|
"eslint-plugin-node": "11.0.0",
|
50
43
|
"eslint-plugin-promise": "4.2.1",
|
51
44
|
"eslint-plugin-react": "7.18.0",
|
52
|
-
"file-loader": "6.2.0",
|
53
|
-
"html-webpack-plugin": "4.5.2",
|
54
45
|
"jest-environment-jsdom-fourteen": "0.1.0",
|
55
46
|
"node-sass": "^4.14.1",
|
56
47
|
"react-app-rewired": "2.1.3",
|
57
48
|
"react-scripts": "3.4.1",
|
58
49
|
"react-test-renderer": "16.9.0",
|
59
|
-
"sass-loader": "^10.0.0",
|
60
|
-
"style-loader": "2.0.0",
|
61
50
|
"to-string-loader": "1.1.6",
|
62
|
-
"
|
63
|
-
"typescript": "4.4.3",
|
64
|
-
"url-loader": "4.1.1",
|
65
|
-
"webpack": "4.44.2",
|
66
|
-
"webpack-cli": "3.3.12"
|
51
|
+
"typescript": "4.4.3"
|
67
52
|
},
|
68
53
|
"main": "dist/components/lsac-supernavbar/index.js",
|
69
54
|
"types": "dist/components/lsac-supernavbar/index.d.ts",
|
@@ -73,15 +58,11 @@
|
|
73
58
|
],
|
74
59
|
"scripts": {
|
75
60
|
"start": "react-scripts start",
|
76
|
-
"webpack:start": "webpack-dev-server --mode development --config webpack.config.js --open",
|
77
61
|
"build": "react-scripts build",
|
78
62
|
"test": "react-scripts test",
|
79
63
|
"eject": "react-scripts eject",
|
80
64
|
"clean": "rm dist/index.js",
|
81
|
-
"
|
82
|
-
"build-prod": "webpack --mode production",
|
83
|
-
"tsc-build": "npx tsc",
|
84
|
-
"publish:npm": "set NODE_ENV=production && rm -rf dist && mkdir dist && npx babel --extensions .tsx,.jsx,.ts,.js src --out-dir dist --copy-files"
|
65
|
+
"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"
|
85
66
|
},
|
86
67
|
"eslintConfig": {
|
87
68
|
"extends": [
|