@gridsuite/commons-ui 0.28.0 → 0.29.1
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.
- package/lib/components/MuiVirtualizedTable/MuiVirtualizedTable.js +23 -9
- package/lib/components/ReportViewer/log-report-item.js +6 -1
- package/lib/components/ReportViewer/log-report.js +4 -3
- package/lib/components/ReportViewer/log-table.js +40 -7
- package/lib/components/ReportViewer/report-item.js +19 -2
- package/lib/components/ReportViewer/report-tree-view-context.js +22 -0
- package/lib/components/ReportViewer/report-viewer.js +43 -2
- package/lib/hooks/useIntlRef.js +27 -0
- package/lib/hooks/useSnackMessage.js +98 -0
- package/lib/index.js +9 -1
- package/package.json +1 -1
|
@@ -217,18 +217,26 @@ var MuiVirtualizedTable = /*#__PURE__*/function (_React$PureComponent) {
|
|
|
217
217
|
});
|
|
218
218
|
|
|
219
219
|
_defineProperty(_assertThisInitialized(_this), "getRowClassName", function (_ref2) {
|
|
220
|
-
var _rowGetter, _clsx;
|
|
220
|
+
var _rowGetter, _rowGetter2, _clsx;
|
|
221
221
|
|
|
222
222
|
var index = _ref2.index,
|
|
223
223
|
rowGetter = _ref2.rowGetter;
|
|
224
224
|
var _this$props2 = _this.props,
|
|
225
225
|
classes = _this$props2.classes,
|
|
226
226
|
onRowClick = _this$props2.onRowClick;
|
|
227
|
-
return (0, _clsx3["default"])(classes.tableRow, classes.flexContainer, index % 2 === 0 && classes.rowBackgroundDark, index % 2 !== 0 && classes.rowBackgroundLight, ((_rowGetter = rowGetter(index)) === null || _rowGetter === void 0 ? void 0 : _rowGetter.notClickable) === true && classes.noClick, (_clsx = {}, _clsx[classes.tableRowHover] = index !== -1 && onRowClick != null, _clsx));
|
|
227
|
+
return (0, _clsx3["default"])(classes.tableRow, classes.flexContainer, index % 2 === 0 && classes.rowBackgroundDark, index % 2 !== 0 && classes.rowBackgroundLight, ((_rowGetter = rowGetter(index)) === null || _rowGetter === void 0 ? void 0 : _rowGetter.notClickable) === true && classes.noClick, (_clsx = {}, _clsx[classes.tableRowHover] = index !== -1 && onRowClick != null && !(((_rowGetter2 = rowGetter(index)) === null || _rowGetter2 === void 0 ? void 0 : _rowGetter2.notClickable) === true), _clsx));
|
|
228
|
+
});
|
|
229
|
+
|
|
230
|
+
_defineProperty(_assertThisInitialized(_this), "onClickableRowClick", function (event) {
|
|
231
|
+
var _event$rowData;
|
|
232
|
+
|
|
233
|
+
if (!(((_event$rowData = event.rowData) === null || _event$rowData === void 0 ? void 0 : _event$rowData.notClickable) === true)) {
|
|
234
|
+
_this.props.onRowClick(event);
|
|
235
|
+
}
|
|
228
236
|
});
|
|
229
237
|
|
|
230
238
|
_defineProperty(_assertThisInitialized(_this), "cellRenderer", function (_ref3) {
|
|
231
|
-
var _clsx2;
|
|
239
|
+
var _rows$rowIndex, _rows$rowIndex2, _clsx2;
|
|
232
240
|
|
|
233
241
|
var cellData = _ref3.cellData,
|
|
234
242
|
columnIndex = _ref3.columnIndex,
|
|
@@ -244,7 +252,7 @@ var MuiVirtualizedTable = /*#__PURE__*/function (_React$PureComponent) {
|
|
|
244
252
|
|
|
245
253
|
return /*#__PURE__*/_react["default"].createElement(_TableCell["default"], {
|
|
246
254
|
component: "div",
|
|
247
|
-
className: (0, _clsx3["default"])(classes.tableCell, classes.flexContainer, (_clsx2 = {}, _clsx2[classes.noClick] = displayedValue === undefined || onCellClick == null || columns[columnIndex].clickable === undefined || !columns[columnIndex].clickable, _clsx2[classes.tableCellColor] = displayedValue === undefined || onCellClick !== null && columns[columnIndex].clickable !== undefined && columns[columnIndex].clickable, _clsx2)),
|
|
255
|
+
className: (0, _clsx3["default"])(classes.tableCell, classes.flexContainer, (_clsx2 = {}, _clsx2[classes.noClick] = displayedValue === undefined || ((_rows$rowIndex = rows[rowIndex]) === null || _rows$rowIndex === void 0 ? void 0 : _rows$rowIndex.notClickable) === true || onCellClick == null || columns[columnIndex].clickable === undefined || !columns[columnIndex].clickable, _clsx2[classes.tableCellColor] = displayedValue === undefined || onCellClick !== null && !((_rows$rowIndex2 = rows[rowIndex]) === null || _rows$rowIndex2 === void 0 ? void 0 : _rows$rowIndex2.notClickable) === true && columns[columnIndex].clickable !== undefined && columns[columnIndex].clickable, _clsx2)),
|
|
248
256
|
variant: "body",
|
|
249
257
|
style: {
|
|
250
258
|
height: rowHeight,
|
|
@@ -252,7 +260,9 @@ var MuiVirtualizedTable = /*#__PURE__*/function (_React$PureComponent) {
|
|
|
252
260
|
},
|
|
253
261
|
align: columnIndex != null && columns[columnIndex].numeric || false ? 'right' : 'left',
|
|
254
262
|
onClick: function onClick() {
|
|
255
|
-
|
|
263
|
+
var _rows$rowIndex3;
|
|
264
|
+
|
|
265
|
+
if (onCellClick && columns[columnIndex].clickable !== undefined && !((_rows$rowIndex3 = rows[rowIndex]) === null || _rows$rowIndex3 === void 0 ? void 0 : _rows$rowIndex3.notClickable) === true && columns[columnIndex].clickable) {
|
|
256
266
|
onCellClick(rows[rowIndex], columns[columnIndex]);
|
|
257
267
|
}
|
|
258
268
|
}
|
|
@@ -434,17 +444,21 @@ var MuiVirtualizedTable = /*#__PURE__*/function (_React$PureComponent) {
|
|
|
434
444
|
enableExportCSV = _this$props5.enableExportCSV,
|
|
435
445
|
tableProps = _objectWithoutPropertiesLoose(_this$props5, _excluded);
|
|
436
446
|
|
|
447
|
+
if (tableProps.onRowClick) {
|
|
448
|
+
tableProps.onRowClick = this.onClickableRowClick;
|
|
449
|
+
}
|
|
450
|
+
|
|
437
451
|
var reorderedIndex = this.reorderIndex(this.state.key, this.state.direction, this.props.filter, this.props.rows);
|
|
438
452
|
|
|
439
453
|
var getIndexFor = function getIndexFor(index) {
|
|
440
454
|
return index < reorderedIndex.length ? reorderedIndex[index] : 0;
|
|
441
455
|
};
|
|
442
456
|
|
|
443
|
-
var
|
|
457
|
+
var _rowGetter3 = function rowGetter(index) {
|
|
444
458
|
return _this2.props.rows[getIndexFor(index)];
|
|
445
459
|
};
|
|
446
460
|
|
|
447
|
-
var sizes = this.sizes(this.props.columns, this.props.rows,
|
|
461
|
+
var sizes = this.sizes(this.props.columns, this.props.rows, _rowGetter3);
|
|
448
462
|
var csvHeaders = this.csvHeaders(this.props.columns, this.props.exportCSVDataKeys);
|
|
449
463
|
return /*#__PURE__*/_react["default"].createElement("div", {
|
|
450
464
|
style: {
|
|
@@ -489,12 +503,12 @@ var MuiVirtualizedTable = /*#__PURE__*/function (_React$PureComponent) {
|
|
|
489
503
|
var index = _ref6.index;
|
|
490
504
|
return _this2.getRowClassName({
|
|
491
505
|
index: index,
|
|
492
|
-
rowGetter:
|
|
506
|
+
rowGetter: _rowGetter3
|
|
493
507
|
});
|
|
494
508
|
},
|
|
495
509
|
rowGetter: function rowGetter(_ref7) {
|
|
496
510
|
var index = _ref7.index;
|
|
497
|
-
return
|
|
511
|
+
return _rowGetter3(index);
|
|
498
512
|
}
|
|
499
513
|
}), columns.map(function (_ref8, index) {
|
|
500
514
|
var dataKey = _ref8.dataKey,
|
|
@@ -28,9 +28,10 @@ var LogReportItem = /*#__PURE__*/function () {
|
|
|
28
28
|
});
|
|
29
29
|
};
|
|
30
30
|
|
|
31
|
-
function LogReportItem(jsonReport) {
|
|
31
|
+
function LogReportItem(jsonReport, reportId) {
|
|
32
32
|
this.key = jsonReport.reportKey;
|
|
33
33
|
this.log = LogReportItem.resolveTemplateMessage(jsonReport.defaultMessage, jsonReport.values);
|
|
34
|
+
this.reportId = reportId;
|
|
34
35
|
this.severity = this.initSeverity(jsonReport.values.reportSeverity);
|
|
35
36
|
}
|
|
36
37
|
|
|
@@ -40,6 +41,10 @@ var LogReportItem = /*#__PURE__*/function () {
|
|
|
40
41
|
return this.log;
|
|
41
42
|
};
|
|
42
43
|
|
|
44
|
+
_proto.getReportId = function getReportId() {
|
|
45
|
+
return this.reportId;
|
|
46
|
+
};
|
|
47
|
+
|
|
43
48
|
_proto.getSeverity = function getSeverity() {
|
|
44
49
|
return this.severity;
|
|
45
50
|
};
|
|
@@ -16,12 +16,13 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "d
|
|
|
16
16
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
17
17
|
*/
|
|
18
18
|
var LogReport = /*#__PURE__*/function () {
|
|
19
|
-
function LogReport(jsonReporter) {
|
|
19
|
+
function LogReport(jsonReporter, parentReportId) {
|
|
20
20
|
this.id = (0, _uuid.v4)();
|
|
21
21
|
this.key = jsonReporter.taskKey;
|
|
22
22
|
this.title = _logReportItem["default"].resolveTemplateMessage(jsonReporter.defaultName, jsonReporter.taskValues);
|
|
23
23
|
this.subReports = [];
|
|
24
24
|
this.logs = [];
|
|
25
|
+
this.parentReportId = parentReportId;
|
|
25
26
|
this.init(jsonReporter);
|
|
26
27
|
}
|
|
27
28
|
|
|
@@ -53,10 +54,10 @@ var LogReport = /*#__PURE__*/function () {
|
|
|
53
54
|
var _this = this;
|
|
54
55
|
|
|
55
56
|
jsonReporter.subReporters.map(function (value) {
|
|
56
|
-
return _this.subReports.push(new LogReport(value));
|
|
57
|
+
return _this.subReports.push(new LogReport(value, _this.id));
|
|
57
58
|
});
|
|
58
59
|
jsonReporter.reports.map(function (value) {
|
|
59
|
-
return _this.logs.push(new _logReportItem["default"](value));
|
|
60
|
+
return _this.logs.push(new _logReportItem["default"](value, _this.id));
|
|
60
61
|
});
|
|
61
62
|
};
|
|
62
63
|
|
|
@@ -13,6 +13,8 @@ var _TableCell = _interopRequireDefault(require("@mui/material/TableCell"));
|
|
|
13
13
|
|
|
14
14
|
var _MuiVirtualizedTable = _interopRequireDefault(require("../MuiVirtualizedTable"));
|
|
15
15
|
|
|
16
|
+
var _styles = require("@mui/material/styles");
|
|
17
|
+
|
|
16
18
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
|
|
17
19
|
|
|
18
20
|
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); }
|
|
@@ -51,8 +53,14 @@ var styles = function styles(theme) {
|
|
|
51
53
|
var VirtualizedTable = (0, _withStyles["default"])(styles)(_MuiVirtualizedTable["default"]);
|
|
52
54
|
|
|
53
55
|
var LogTable = function LogTable(_ref) {
|
|
54
|
-
var logs = _ref.logs
|
|
56
|
+
var logs = _ref.logs,
|
|
57
|
+
onRowClick = _ref.onRowClick;
|
|
55
58
|
var intl = (0, _reactIntl.useIntl)();
|
|
59
|
+
var theme = (0, _styles.useTheme)();
|
|
60
|
+
|
|
61
|
+
var _useState = (0, _react.useState)(-1),
|
|
62
|
+
selectedRowIndex = _useState[0],
|
|
63
|
+
setSelectedRowIndex = _useState[1];
|
|
56
64
|
|
|
57
65
|
var severityCellRender = function severityCellRender(cellData) {
|
|
58
66
|
return /*#__PURE__*/_react["default"].createElement(_TableCell["default"], {
|
|
@@ -95,16 +103,41 @@ var LogTable = function LogTable(_ref) {
|
|
|
95
103
|
return {
|
|
96
104
|
severity: log.getSeverityName(),
|
|
97
105
|
message: log.getLog(),
|
|
98
|
-
backgroundColor: log.getColorName()
|
|
106
|
+
backgroundColor: log.getColorName(),
|
|
107
|
+
reportId: log.getReportId()
|
|
99
108
|
};
|
|
100
109
|
});
|
|
101
110
|
};
|
|
102
111
|
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
112
|
+
var handleRowClick = function handleRowClick(event, index, data) {
|
|
113
|
+
setSelectedRowIndex(index);
|
|
114
|
+
onRowClick(data);
|
|
115
|
+
};
|
|
116
|
+
|
|
117
|
+
var rowStyleFormat = function rowStyleFormat(row) {
|
|
118
|
+
if (row.index < 0) return;
|
|
119
|
+
|
|
120
|
+
if (selectedRowIndex === row.index) {
|
|
121
|
+
return {
|
|
122
|
+
backgroundColor: theme.palette.action.selected
|
|
123
|
+
};
|
|
124
|
+
}
|
|
125
|
+
};
|
|
126
|
+
|
|
127
|
+
(0, _react.useEffect)(function () {
|
|
128
|
+
setSelectedRowIndex(-1);
|
|
129
|
+
}, [logs]);
|
|
130
|
+
return (
|
|
131
|
+
/*#__PURE__*/
|
|
132
|
+
//TODO do we need to useMemo/useCallback these props to avoid rerenders ?
|
|
133
|
+
_react["default"].createElement(VirtualizedTable, {
|
|
134
|
+
columns: generateTableColumns(),
|
|
135
|
+
rows: generateTableRows(),
|
|
136
|
+
sortable: false,
|
|
137
|
+
onRowClick: handleRowClick,
|
|
138
|
+
rowStyle: rowStyleFormat
|
|
139
|
+
})
|
|
140
|
+
);
|
|
108
141
|
};
|
|
109
142
|
|
|
110
143
|
var _default = (0, _react.memo)(LogTable);
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
exports.__esModule = true;
|
|
4
4
|
exports["default"] = void 0;
|
|
5
5
|
|
|
6
|
-
var _react =
|
|
6
|
+
var _react = _interopRequireWildcard(require("react"));
|
|
7
7
|
|
|
8
8
|
var _propTypes = _interopRequireDefault(require("prop-types"));
|
|
9
9
|
|
|
@@ -15,10 +15,16 @@ var _Typography = _interopRequireDefault(require("@mui/material/Typography"));
|
|
|
15
15
|
|
|
16
16
|
var _Label = _interopRequireDefault(require("@mui/icons-material/Label"));
|
|
17
17
|
|
|
18
|
+
var _reportTreeViewContext = _interopRequireDefault(require("./report-tree-view-context"));
|
|
19
|
+
|
|
18
20
|
var _excluded = ["labelText", "labelIconColor"];
|
|
19
21
|
|
|
20
22
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
|
|
21
23
|
|
|
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); }
|
|
25
|
+
|
|
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; }
|
|
27
|
+
|
|
22
28
|
function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
|
|
23
29
|
|
|
24
30
|
function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
|
|
@@ -65,6 +71,12 @@ var useReportItemStyles = (0, _makeStyles["default"])(function (theme) {
|
|
|
65
71
|
alignItems: 'center',
|
|
66
72
|
padding: theme.spacing(0.5, 0)
|
|
67
73
|
},
|
|
74
|
+
labelRootHighlighted: {
|
|
75
|
+
display: 'flex',
|
|
76
|
+
alignItems: 'center',
|
|
77
|
+
padding: theme.spacing(0.5, 0),
|
|
78
|
+
backgroundColor: theme.palette.action.selected
|
|
79
|
+
},
|
|
68
80
|
labelIcon: {
|
|
69
81
|
marginRight: theme.spacing(1)
|
|
70
82
|
},
|
|
@@ -76,6 +88,11 @@ var useReportItemStyles = (0, _makeStyles["default"])(function (theme) {
|
|
|
76
88
|
});
|
|
77
89
|
|
|
78
90
|
var ReportItem = function ReportItem(props) {
|
|
91
|
+
// using a context because TreeItem uses useMemo on this. See report-viewer.js for the provider
|
|
92
|
+
var _useContext = (0, _react.useContext)(_reportTreeViewContext["default"]),
|
|
93
|
+
isHighlighted = _useContext.isHighlighted;
|
|
94
|
+
|
|
95
|
+
var highlighted = isHighlighted ? isHighlighted(props.nodeId) : false;
|
|
79
96
|
var classes = useReportItemStyles();
|
|
80
97
|
|
|
81
98
|
var labelText = props.labelText,
|
|
@@ -92,7 +109,7 @@ var ReportItem = function ReportItem(props) {
|
|
|
92
109
|
label: classes.label
|
|
93
110
|
},
|
|
94
111
|
label: /*#__PURE__*/_react["default"].createElement("div", {
|
|
95
|
-
className: classes.labelRoot
|
|
112
|
+
className: highlighted ? classes.labelRootHighlighted : classes.labelRoot
|
|
96
113
|
}, /*#__PURE__*/_react["default"].createElement(_Label["default"], {
|
|
97
114
|
htmlColor: labelIconColor,
|
|
98
115
|
className: classes.labelIcon
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
exports.__esModule = true;
|
|
4
|
+
exports["default"] = void 0;
|
|
5
|
+
|
|
6
|
+
var _react = require("react");
|
|
7
|
+
|
|
8
|
+
/**
|
|
9
|
+
* Copyright (c) 2022, RTE (http://www.rte-france.com)
|
|
10
|
+
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
11
|
+
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
12
|
+
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
13
|
+
*/
|
|
14
|
+
var ReportTreeViewContext = (0, _react.createContext)({});
|
|
15
|
+
|
|
16
|
+
if (process.env.NODE_ENV !== 'production') {
|
|
17
|
+
ReportTreeViewContext.displayName = 'ReportTreeViewContext';
|
|
18
|
+
}
|
|
19
|
+
|
|
20
|
+
var _default = ReportTreeViewContext;
|
|
21
|
+
exports["default"] = _default;
|
|
22
|
+
module.exports = exports.default;
|
|
@@ -21,6 +21,8 @@ var _Grid = _interopRequireDefault(require("@mui/material/Grid"));
|
|
|
21
21
|
|
|
22
22
|
var _logTable = _interopRequireDefault(require("./log-table"));
|
|
23
23
|
|
|
24
|
+
var _reportTreeViewContext = _interopRequireDefault(require("./report-tree-view-context"));
|
|
25
|
+
|
|
24
26
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
|
|
25
27
|
|
|
26
28
|
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); }
|
|
@@ -62,6 +64,10 @@ function ReportViewer(_ref) {
|
|
|
62
64
|
logs = _useState3[0],
|
|
63
65
|
setLogs = _useState3[1];
|
|
64
66
|
|
|
67
|
+
var _useState4 = (0, _react.useState)(),
|
|
68
|
+
highlightedReportId = _useState4[0],
|
|
69
|
+
setHighlightedReportId = _useState4[1];
|
|
70
|
+
|
|
65
71
|
var rootReport = (0, _react.useRef)(null);
|
|
66
72
|
var allReports = (0, _react.useRef)({});
|
|
67
73
|
var treeView = (0, _react.useRef)(null);
|
|
@@ -108,7 +114,39 @@ function ReportViewer(_ref) {
|
|
|
108
114
|
if (selectedNode !== nodeId) {
|
|
109
115
|
setSelectedNode(nodeId);
|
|
110
116
|
setLogs(allReports.current[nodeId].getAllLogs());
|
|
117
|
+
setHighlightedReportId(null);
|
|
111
118
|
}
|
|
119
|
+
}; // The MUI TreeView/TreeItems use useMemo on our items, so it's important to avoid changing the context
|
|
120
|
+
|
|
121
|
+
|
|
122
|
+
var isHighlighted = (0, _react.useMemo)(function () {
|
|
123
|
+
return {
|
|
124
|
+
isHighlighted: function isHighlighted(reportId) {
|
|
125
|
+
return highlightedReportId === reportId;
|
|
126
|
+
}
|
|
127
|
+
};
|
|
128
|
+
}, [highlightedReportId]);
|
|
129
|
+
|
|
130
|
+
var onRowClick = function onRowClick(data) {
|
|
131
|
+
setExpandedNodes(function (previouslyExpandedNodes) {
|
|
132
|
+
var nodesToExpand = [];
|
|
133
|
+
var reportId = data.reportId;
|
|
134
|
+
|
|
135
|
+
while ((_allReports$current$r = allReports.current[reportId]) === null || _allReports$current$r === void 0 ? void 0 : _allReports$current$r.parentReportId) {
|
|
136
|
+
var _allReports$current$r;
|
|
137
|
+
|
|
138
|
+
var parentReportId = allReports.current[reportId].parentReportId;
|
|
139
|
+
|
|
140
|
+
if (!previouslyExpandedNodes.includes(parentReportId)) {
|
|
141
|
+
nodesToExpand.push(parentReportId);
|
|
142
|
+
}
|
|
143
|
+
|
|
144
|
+
reportId = parentReportId;
|
|
145
|
+
}
|
|
146
|
+
|
|
147
|
+
if (nodesToExpand.length > 0) return nodesToExpand.concat(previouslyExpandedNodes);else return previouslyExpandedNodes;
|
|
148
|
+
});
|
|
149
|
+
setHighlightedReportId(data.reportId);
|
|
112
150
|
};
|
|
113
151
|
|
|
114
152
|
return rootReport.current && /*#__PURE__*/_react["default"].createElement(_Grid["default"], {
|
|
@@ -124,6 +162,8 @@ function ReportViewer(_ref) {
|
|
|
124
162
|
height: '95%',
|
|
125
163
|
borderRight: '1px solid rgba(81, 81, 81, 1)'
|
|
126
164
|
}
|
|
165
|
+
}, /*#__PURE__*/_react["default"].createElement(_reportTreeViewContext["default"].Provider, {
|
|
166
|
+
value: isHighlighted
|
|
127
167
|
}, /*#__PURE__*/_react["default"].createElement(_TreeView["default"], {
|
|
128
168
|
className: classes.treeView,
|
|
129
169
|
defaultCollapseIcon: /*#__PURE__*/_react["default"].createElement(_ArrowDropDown["default"], null),
|
|
@@ -137,7 +177,7 @@ function ReportViewer(_ref) {
|
|
|
137
177
|
onNodeSelect: handleSelectNode,
|
|
138
178
|
selected: selectedNode,
|
|
139
179
|
expanded: expandedNodes
|
|
140
|
-
}, treeView.current)), /*#__PURE__*/_react["default"].createElement(_Grid["default"], {
|
|
180
|
+
}, treeView.current))), /*#__PURE__*/_react["default"].createElement(_Grid["default"], {
|
|
141
181
|
item: true,
|
|
142
182
|
xs: 12,
|
|
143
183
|
sm: 9,
|
|
@@ -145,7 +185,8 @@ function ReportViewer(_ref) {
|
|
|
145
185
|
height: '95%'
|
|
146
186
|
}
|
|
147
187
|
}, /*#__PURE__*/_react["default"].createElement(_logTable["default"], {
|
|
148
|
-
logs: logs
|
|
188
|
+
logs: logs,
|
|
189
|
+
onRowClick: onRowClick
|
|
149
190
|
})));
|
|
150
191
|
}
|
|
151
192
|
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
exports.__esModule = true;
|
|
4
|
+
exports.useIntlRef = useIntlRef;
|
|
5
|
+
|
|
6
|
+
var _react = require("react");
|
|
7
|
+
|
|
8
|
+
var _reactIntl = require("react-intl");
|
|
9
|
+
|
|
10
|
+
/**
|
|
11
|
+
* Copyright (c) 2021, RTE (http://www.rte-france.com)
|
|
12
|
+
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
13
|
+
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
14
|
+
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
15
|
+
*/
|
|
16
|
+
//This useEffect must be at the beginning to be executed before other useEffects which use intlRef.
|
|
17
|
+
//This ref is used to avoid redoing other useEffects when the language (intl) is changed for things that produce temporary messages using the snackbar.
|
|
18
|
+
//The drawback to this custom hook is that a ref and a useEffect are created in each component that needs this hook.
|
|
19
|
+
//Can we avoid this overhead ?
|
|
20
|
+
function useIntlRef() {
|
|
21
|
+
var intl = (0, _reactIntl.useIntl)();
|
|
22
|
+
var intlRef = (0, _react.useRef)();
|
|
23
|
+
(0, _react.useEffect)(function () {
|
|
24
|
+
intlRef.current = intl;
|
|
25
|
+
}, [intl]);
|
|
26
|
+
return intlRef;
|
|
27
|
+
}
|
|
@@ -0,0 +1,98 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
exports.__esModule = true;
|
|
4
|
+
exports.useSnackMessage = useSnackMessage;
|
|
5
|
+
|
|
6
|
+
var _react = require("react");
|
|
7
|
+
|
|
8
|
+
var _notistack = require("notistack");
|
|
9
|
+
|
|
10
|
+
var _useIntlRef = require("./useIntlRef");
|
|
11
|
+
|
|
12
|
+
/**
|
|
13
|
+
* Copyright (c) 2021, RTE (http://www.rte-france.com)
|
|
14
|
+
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
15
|
+
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
16
|
+
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
17
|
+
*/
|
|
18
|
+
function useSnackMessage() {
|
|
19
|
+
var intlRef = (0, _useIntlRef.useIntlRef)();
|
|
20
|
+
|
|
21
|
+
var _useSnackbar = (0, _notistack.useSnackbar)(),
|
|
22
|
+
enqueueSnackbar = _useSnackbar.enqueueSnackbar;
|
|
23
|
+
/*
|
|
24
|
+
There is two kind of messages : the message itself (bottom of snackbar), and the header (top of snackbar).
|
|
25
|
+
As inputs, you can give either a text message, or an ID with optional values (for translation with intl).
|
|
26
|
+
snackInputs: {
|
|
27
|
+
messageTxt,
|
|
28
|
+
messageId,
|
|
29
|
+
messageValues,
|
|
30
|
+
headerTxt,
|
|
31
|
+
headerId,
|
|
32
|
+
headerValues,
|
|
33
|
+
}
|
|
34
|
+
*/
|
|
35
|
+
|
|
36
|
+
|
|
37
|
+
var snackError = (0, _react.useCallback)(function (snackInputs) {
|
|
38
|
+
return makeSnackbar(snackInputs, intlRef, enqueueSnackbar, 'error', true);
|
|
39
|
+
}, [enqueueSnackbar, intlRef]);
|
|
40
|
+
/* see snackError */
|
|
41
|
+
|
|
42
|
+
var snackWarning = (0, _react.useCallback)(function (snackInputs) {
|
|
43
|
+
return makeSnackbar(snackInputs, intlRef, enqueueSnackbar, 'warning', true);
|
|
44
|
+
}, [enqueueSnackbar, intlRef]);
|
|
45
|
+
/* see snackError */
|
|
46
|
+
|
|
47
|
+
var snackInfo = (0, _react.useCallback)(function (snackInputs) {
|
|
48
|
+
return makeSnackbar(snackInputs, intlRef, enqueueSnackbar, 'info', false);
|
|
49
|
+
}, [enqueueSnackbar, intlRef]);
|
|
50
|
+
return {
|
|
51
|
+
snackError: snackError,
|
|
52
|
+
snackInfo: snackInfo,
|
|
53
|
+
snackWarning: snackWarning
|
|
54
|
+
};
|
|
55
|
+
}
|
|
56
|
+
|
|
57
|
+
function makeSnackbar(snackInputs, intlRef, enqueueSnackbar, level, persistent) {
|
|
58
|
+
var message = checkAndTranslateIfNecessary(snackInputs.messageTxt, snackInputs.messageId, snackInputs.messageValues, intlRef);
|
|
59
|
+
var header = checkAndTranslateIfNecessary(snackInputs.headerTxt, snackInputs.headerId, snackInputs.headerValues, intlRef);
|
|
60
|
+
displayMessageWithSnackbar(message, header, enqueueSnackbar, level, persistent);
|
|
61
|
+
}
|
|
62
|
+
|
|
63
|
+
function checkAndTranslateIfNecessary(txt, id, values, intlRef) {
|
|
64
|
+
checkInputs(txt, id, values);
|
|
65
|
+
return txt !== null && txt !== void 0 ? txt : id ? intlRef.current.formatMessage({
|
|
66
|
+
id: id
|
|
67
|
+
}, values) : null;
|
|
68
|
+
}
|
|
69
|
+
|
|
70
|
+
function checkInputs(txt, id, values) {
|
|
71
|
+
if (txt && (id || values)) {
|
|
72
|
+
console.warn('Snack inputs should be [*Txt] OR [*Id, *Values]');
|
|
73
|
+
}
|
|
74
|
+
}
|
|
75
|
+
|
|
76
|
+
function displayMessageWithSnackbar(message, header, enqueueSnackbar, level, persistent) {
|
|
77
|
+
var fullMessage = '';
|
|
78
|
+
|
|
79
|
+
if (header) {
|
|
80
|
+
fullMessage += header;
|
|
81
|
+
}
|
|
82
|
+
|
|
83
|
+
if (message) {
|
|
84
|
+
if (header) {
|
|
85
|
+
fullMessage += '\n\n';
|
|
86
|
+
}
|
|
87
|
+
|
|
88
|
+
fullMessage += message;
|
|
89
|
+
}
|
|
90
|
+
|
|
91
|
+
enqueueSnackbar(fullMessage, {
|
|
92
|
+
variant: level,
|
|
93
|
+
persist: persistent,
|
|
94
|
+
style: {
|
|
95
|
+
whiteSpace: 'pre-line'
|
|
96
|
+
}
|
|
97
|
+
});
|
|
98
|
+
}
|
package/lib/index.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
3
|
exports.__esModule = true;
|
|
4
|
-
exports.useImportExportParams = exports.treeview_finder_fr = exports.treeview_finder_en = exports.top_bar_fr = exports.top_bar_en = exports.table_fr = exports.table_en = exports.setSignInCallbackError = exports.setShowAuthenticationRouterLogin = exports.setLoggedUser = exports.report_viewer_fr = exports.report_viewer_en = exports.logout = exports.login_fr = exports.login_en = exports.initializeAuthenticationProd = exports.initializeAuthenticationDev = exports.getPreLoginPath = exports.getFileIcon = exports.getEquipmentsInfosForSearchBar = exports.equipment_search_fr = exports.equipment_search_en = exports.equipmentStyles = exports.element_search_fr = exports.element_search_en = exports.elementType = exports.dispatchUser = exports.card_error_boundary_fr = exports.card_error_boundary_en = exports.USER_VALIDATION_ERROR = exports.USER = exports.UNAUTHORIZED_USER_INFO = exports.TreeViewFinder = exports.TopBar = exports.TagRenderer = exports.SnackbarProvider = exports.SIGNIN_CALLBACK_ERROR = exports.SHOW_AUTH_INFO_LOGIN = exports.ReportViewerDialog = exports.ReportViewer = exports.OverflowableText = exports.MuiVirtualizedTable = exports.LOGOUT_ERROR = exports.LIGHT_THEME = exports.LANG_SYSTEM = exports.LANG_FRENCH = exports.LANG_ENGLISH = exports.EquipmentItem = exports.ElementSearchDialog = exports.EQUIPMENT_TYPE = exports.DEFAULT_ROW_HEIGHT = exports.DEFAULT_HEADER_HEIGHT = exports.DEFAULT_CELL_PADDING = exports.DARK_THEME = exports.CardErrorBoundary = exports.AuthenticationRouter = void 0;
|
|
4
|
+
exports.useSnackMessage = exports.useIntlRef = exports.useImportExportParams = exports.treeview_finder_fr = exports.treeview_finder_en = exports.top_bar_fr = exports.top_bar_en = exports.table_fr = exports.table_en = exports.setSignInCallbackError = exports.setShowAuthenticationRouterLogin = exports.setLoggedUser = exports.report_viewer_fr = exports.report_viewer_en = exports.logout = exports.login_fr = exports.login_en = exports.initializeAuthenticationProd = exports.initializeAuthenticationDev = exports.getPreLoginPath = exports.getFileIcon = exports.getEquipmentsInfosForSearchBar = exports.equipment_search_fr = exports.equipment_search_en = exports.equipmentStyles = exports.element_search_fr = exports.element_search_en = exports.elementType = exports.dispatchUser = exports.card_error_boundary_fr = exports.card_error_boundary_en = exports.USER_VALIDATION_ERROR = exports.USER = exports.UNAUTHORIZED_USER_INFO = exports.TreeViewFinder = exports.TopBar = exports.TagRenderer = exports.SnackbarProvider = exports.SIGNIN_CALLBACK_ERROR = exports.SHOW_AUTH_INFO_LOGIN = exports.ReportViewerDialog = exports.ReportViewer = exports.OverflowableText = exports.MuiVirtualizedTable = exports.LOGOUT_ERROR = exports.LIGHT_THEME = exports.LANG_SYSTEM = exports.LANG_FRENCH = exports.LANG_ENGLISH = exports.EquipmentItem = exports.ElementSearchDialog = exports.EQUIPMENT_TYPE = exports.DEFAULT_ROW_HEIGHT = exports.DEFAULT_HEADER_HEIGHT = exports.DEFAULT_CELL_PADDING = exports.DARK_THEME = exports.CardErrorBoundary = exports.AuthenticationRouter = void 0;
|
|
5
5
|
|
|
6
6
|
var _TreeViewFinder = _interopRequireDefault(require("./components/TreeViewFinder"));
|
|
7
7
|
|
|
@@ -161,6 +161,14 @@ var _useImportExportParams = require("./hooks/useImportExportParams");
|
|
|
161
161
|
|
|
162
162
|
exports.useImportExportParams = _useImportExportParams.useImportExportParams;
|
|
163
163
|
|
|
164
|
+
var _useIntlRef = require("./hooks/useIntlRef");
|
|
165
|
+
|
|
166
|
+
exports.useIntlRef = _useIntlRef.useIntlRef;
|
|
167
|
+
|
|
168
|
+
var _useSnackMessage = require("./hooks/useSnackMessage");
|
|
169
|
+
|
|
170
|
+
exports.useSnackMessage = _useSnackMessage.useSnackMessage;
|
|
171
|
+
|
|
164
172
|
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); }
|
|
165
173
|
|
|
166
174
|
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; }
|