@gridsuite/commons-ui 0.29.0 → 0.29.2

package/lib/components/MuiVirtualizedTable/MuiVirtualizedTable.js

@@ -227,22 +227,20 @@ var MuiVirtualizedTable = /*#__PURE__*/function (_React$PureComponent) {
       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));
     });
 
-    _defineProperty(_assertThisInitialized(_this), "onClickableRowClick", function (_ref3) {
-      var e = _ref3.e,
-          index = _ref3.index,
-          rowData = _ref3.rowData;
+    _defineProperty(_assertThisInitialized(_this), "onClickableRowClick", function (event) {
+      var _event$rowData;
 
-      if (!((rowData === null || rowData === void 0 ? void 0 : rowData.notClickable) === true)) {
-        _this.props.onRowClick(e, index, rowData);
+      if (!(((_event$rowData = event.rowData) === null || _event$rowData === void 0 ? void 0 : _event$rowData.notClickable) === true)) {
+        _this.props.onRowClick(event);
       }
     });
 
-    _defineProperty(_assertThisInitialized(_this), "cellRenderer", function (_ref4) {
+    _defineProperty(_assertThisInitialized(_this), "cellRenderer", function (_ref3) {
       var _rows$rowIndex, _rows$rowIndex2, _clsx2;
 
-      var cellData = _ref4.cellData,
-          columnIndex = _ref4.columnIndex,
-          rowIndex = _ref4.rowIndex;
+      var cellData = _ref3.cellData,
+          columnIndex = _ref3.columnIndex,
+          rowIndex = _ref3.rowIndex;
       var _this$props3 = _this.props,
           columns = _this$props3.columns,
           classes = _this$props3.classes,
@@ -274,9 +272,9 @@ var MuiVirtualizedTable = /*#__PURE__*/function (_React$PureComponent) {
       }));
     });
 
-    _defineProperty(_assertThisInitialized(_this), "headerRenderer", function (_ref5) {
-      var label = _ref5.label,
-          columnIndex = _ref5.columnIndex;
+    _defineProperty(_assertThisInitialized(_this), "headerRenderer", function (_ref4) {
+      var label = _ref4.label,
+          columnIndex = _ref4.columnIndex;
       var _this$props4 = _this.props,
           columns = _this$props4.columns,
           classes = _this$props4.classes;
@@ -487,9 +485,9 @@ var MuiVirtualizedTable = /*#__PURE__*/function (_React$PureComponent) {
       style: {
         flexGrow: 1
       }
-    }, /*#__PURE__*/_react["default"].createElement(_reactVirtualized.AutoSizer, null, function (_ref6) {
-      var height = _ref6.height,
-          width = _ref6.width;
+    }, /*#__PURE__*/_react["default"].createElement(_reactVirtualized.AutoSizer, null, function (_ref5) {
+      var height = _ref5.height,
+          width = _ref5.width;
       return /*#__PURE__*/_react["default"].createElement(_reactVirtualized.Table, _extends({
         height: height,
         width: width,
@@ -501,20 +499,20 @@ var MuiVirtualizedTable = /*#__PURE__*/function (_React$PureComponent) {
         className: classes.table
       }, tableProps, {
         rowCount: reorderedIndex.length,
-        rowClassName: function rowClassName(_ref7) {
-          var index = _ref7.index;
+        rowClassName: function rowClassName(_ref6) {
+          var index = _ref6.index;
           return _this2.getRowClassName({
             index: index,
             rowGetter: _rowGetter3
           });
         },
-        rowGetter: function rowGetter(_ref8) {
-          var index = _ref8.index;
+        rowGetter: function rowGetter(_ref7) {
+          var index = _ref7.index;
           return _rowGetter3(index);
         }
-      }), columns.map(function (_ref9, index) {
-        var dataKey = _ref9.dataKey,
-            other = _objectWithoutPropertiesLoose(_ref9, _excluded2);
+      }), columns.map(function (_ref8, index) {
+        var dataKey = _ref8.dataKey,
+            other = _objectWithoutPropertiesLoose(_ref8, _excluded2);
 
         return /*#__PURE__*/_react["default"].createElement(_reactVirtualized.Column, _extends({
           key: dataKey,

package/lib/components/ReportViewer/log-table.js

@@ -109,9 +109,9 @@ var LogTable = function LogTable(_ref) {
     });
   };
 
-  var handleRowClick = function handleRowClick(event, index, data) {
-    setSelectedRowIndex(index);
-    onRowClick(data);
+  var handleRowClick = function handleRowClick(event) {
+    setSelectedRowIndex(event.index);
+    onRowClick(event.rowData);
   };
 
   var rowStyleFormat = function rowStyleFormat(row) {

package/lib/index.js

@@ -1,7 +1,7 @@
 "use strict";
 
 exports.__esModule = true;
-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;
+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.RESET_AUTHENTICATION_ROUTER_ERROR = 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;
 
 var _TreeViewFinder = _interopRequireDefault(require("./components/TreeViewFinder"));
 
@@ -82,6 +82,7 @@ exports.setSignInCallbackError = _actions.setSignInCallbackError;
 exports.UNAUTHORIZED_USER_INFO = _actions.UNAUTHORIZED_USER_INFO;
 exports.LOGOUT_ERROR = _actions.LOGOUT_ERROR;
 exports.USER_VALIDATION_ERROR = _actions.USER_VALIDATION_ERROR;
+exports.RESET_AUTHENTICATION_ROUTER_ERROR = _actions.RESET_AUTHENTICATION_ROUTER_ERROR;
 exports.setShowAuthenticationRouterLogin = _actions.setShowAuthenticationRouterLogin;
 exports.SHOW_AUTH_INFO_LOGIN = _actions.SHOW_AUTH_INFO_LOGIN;
 

package/lib/utils/AuthService.js

@@ -234,14 +234,16 @@ function handleUser(dispatch, userManager, validateUser) {
           console.log('Error in silent renew, idtoken expired: ' + idTokenExpiresIn + ' => Logging out.', error); // TODO here allow to continue to use the app but in some kind of frozen state because we can't make API calls anymore
           // remove the user from our app, but don't sso logout on all other apps
 
-          dispatch((0, _actions.setShowAuthenticationRouterLogin)(true));
+          dispatch((0, _actions.setShowAuthenticationRouterLogin)(true)); // logout during token expiration, show login without errors
+
+          dispatch((0, _actions.resetAuthenticationRouterError)());
           return dispatch((0, _actions.setLoggedUser)(null));
         } else if (userManager.idpSettings.maxExpiresIn) {
           if (idTokenExpiresIn < userManager.idpSettings.maxExpiresIn) {
             // TODO here attempt last chance login ? snackbar to notify the user ? Popup ?
             // for now we do the same thing as in the else block
-            console.log('Error in silent renew, but idtoken ALMOST expiring (expiring in' + idTokenExpiresIn + ') => last chance' + userManager.idpSettings.maxExpiresIn, error);
-            user.expires_in = userManager.idpSettings.maxExpiresIn;
+            console.log('Error in silent renew, but idtoken ALMOST expiring (expiring in' + idTokenExpiresIn + ') => last chance, next error will logout', 'maxExpiresIn = ' + userManager.idpSettings.maxExpiresIn, 'last renew attempt in ' + idTokenExpiresIn - accessTokenExpiringNotificationTime + 'seconds', error);
+            user.expires_in = idTokenExpiresIn;
             userManager.storeUser(user).then(function () {
               userManager.getUser();
             });

package/lib/utils/actions.js

@@ -1,7 +1,8 @@
 "use strict";
 
 exports.__esModule = true;
-exports.USER_VALIDATION_ERROR = exports.USER = exports.UNAUTHORIZED_USER_INFO = exports.SIGNIN_CALLBACK_ERROR = exports.SHOW_AUTH_INFO_LOGIN = exports.LOGOUT_ERROR = void 0;
+exports.USER_VALIDATION_ERROR = exports.USER = exports.UNAUTHORIZED_USER_INFO = exports.SIGNIN_CALLBACK_ERROR = exports.SHOW_AUTH_INFO_LOGIN = exports.RESET_AUTHENTICATION_ROUTER_ERROR = exports.LOGOUT_ERROR = void 0;
+exports.resetAuthenticationRouterError = resetAuthenticationRouterError;
 exports.setLoggedUser = setLoggedUser;
 exports.setLogoutError = setLogoutError;
 exports.setShowAuthenticationRouterLogin = setShowAuthenticationRouterLogin;
@@ -74,6 +75,16 @@ function setUserValidationError(userName, userValidationError) {
   };
 }
 
+var RESET_AUTHENTICATION_ROUTER_ERROR = 'RESET_AUTHENTICATION_ROUTER_ERROR';
+exports.RESET_AUTHENTICATION_ROUTER_ERROR = RESET_AUTHENTICATION_ROUTER_ERROR;
+
+function resetAuthenticationRouterError() {
+  return {
+    type: RESET_AUTHENTICATION_ROUTER_ERROR,
+    authenticationRouterError: null
+  };
+}
+
 var SHOW_AUTH_INFO_LOGIN = 'SHOW_AUTH_INFO_LOGIN';
 exports.SHOW_AUTH_INFO_LOGIN = SHOW_AUTH_INFO_LOGIN;
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@gridsuite/commons-ui",
-    "version": "0.29.0",
+    "version": "0.29.2",
     "description": "common react components for gridsuite applications",
     "engines": {
         "npm": "<=6",