@gridsuite/commons-ui 0.29.1 → 0.30.0

package/lib/components/MuiVirtualizedTable/index.js

@@ -1,12 +1,15 @@
 "use strict";
 
 exports.__esModule = true;
-exports["default"] = void 0;
+exports["default"] = exports.KeyedColumnsRowIndexer = exports.CHANGE_WAYS = void 0;
 
 var _MuiVirtualizedTable = _interopRequireDefault(require("./MuiVirtualizedTable"));
 
 exports["default"] = _MuiVirtualizedTable["default"];
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+var _KeyedColumnsRowIndexer = require("./KeyedColumnsRowIndexer");
 
-module.exports = exports.default;
+exports.KeyedColumnsRowIndexer = _KeyedColumnsRowIndexer.KeyedColumnsRowIndexer;
+exports.CHANGE_WAYS = _KeyedColumnsRowIndexer.CHANGE_WAYS;
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }

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.getIdTokenExpiresIn = 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.KeyedColumnsRowIndexer = 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.CHANGE_WAYS = exports.AuthenticationRouter = void 0;
 
 var _TreeViewFinder = _interopRequireDefault(require("./components/TreeViewFinder"));
 
@@ -19,9 +19,11 @@ var _AuthenticationRouter = _interopRequireDefault(require("./components/Authent
 
 exports.AuthenticationRouter = _AuthenticationRouter["default"];
 
-var _MuiVirtualizedTable = _interopRequireDefault(require("./components/MuiVirtualizedTable"));
+var _MuiVirtualizedTable = _interopRequireWildcard(require("./components/MuiVirtualizedTable"));
 
 exports.MuiVirtualizedTable = _MuiVirtualizedTable["default"];
+exports.KeyedColumnsRowIndexer = _MuiVirtualizedTable.KeyedColumnsRowIndexer;
+exports.CHANGE_WAYS = _MuiVirtualizedTable.CHANGE_WAYS;
 
 var _ReportViewer = _interopRequireDefault(require("./components/ReportViewer"));
 
@@ -53,6 +55,7 @@ exports.initializeAuthenticationProd = _AuthService.initializeAuthenticationProd
 exports.logout = _AuthService.logout;
 exports.dispatchUser = _AuthService.dispatchUser;
 exports.getPreLoginPath = _AuthService.getPreLoginPath;
+exports.getIdTokenExpiresIn = _AuthService.getIdTokenExpiresIn;
 
 var _ElementType = require("./utils/ElementType");
 
@@ -82,6 +85,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

@@ -2,6 +2,7 @@
 
 exports.__esModule = true;
 exports.dispatchUser = dispatchUser;
+exports.getIdTokenExpiresIn = getIdTokenExpiresIn;
 exports.getPreLoginPath = getPreLoginPath;
 exports.handleSigninCallback = handleSigninCallback;
 exports.handleSilentRenewCallback = handleSilentRenewCallback;
@@ -136,6 +137,7 @@ function logout(dispatch, userManagerInstance) {
 
   return userManagerInstance.getUser().then(function (user) {
     if (user) {
+      // We don't need to check if token is valid at this point
       return userManagerInstance.signoutRedirect({
         extraQueryParams: {
           TargetResource: userManagerInstance.settings.post_logout_redirect_uri
@@ -158,10 +160,24 @@ function logout(dispatch, userManagerInstance) {
   });
 }
 
+function getIdTokenExpiresIn(user) {
+  var now = parseInt(Date.now() / 1000);
+  var exp = (0, _jwtDecode["default"])(user.id_token).exp;
+  return exp - now;
+}
+
 function dispatchUser(dispatch, userManagerInstance, validateUser) {
   return userManagerInstance.getUser().then(function (user) {
     if (user) {
-      // without validateUser defined, valid user by default
+      // If session storage contains a expired token at initialization
+      // We do not dispatch the user
+      // Our explicit SigninSilent will attempt to connect once
+      if (getIdTokenExpiresIn(user) < 0) {
+        console.debug('User token is expired and will not be dispatched');
+        return;
+      } // without validateUser defined, valid user by default
+
+
       var validateUserPromise = validateUser && validateUser(user) || Promise.resolve(true);
       return validateUserPromise.then(function (valid) {
         if (!valid) {
@@ -171,15 +187,6 @@ function dispatchUser(dispatch, userManagerInstance, validateUser) {
           return dispatch((0, _actions.setUnauthorizedUserInfo)(user === null || user === void 0 ? void 0 : (_user$profile2 = user.profile) === null || _user$profile2 === void 0 ? void 0 : _user$profile2.name, {}));
         }
 
-        var now = parseInt(Date.now() / 1000);
-        var exp = (0, _jwtDecode["default"])(user.id_token).exp;
-        var idTokenExpiresIn = exp - now;
-
-        if (idTokenExpiresIn < 0) {
-          console.debug('User token is expired and will not be dispatched');
-          return;
-        }
-
         console.debug('User has been successfully loaded from store.');
         return dispatch((0, _actions.setLoggedUser)(user));
       })["catch"](function (e) {
@@ -226,22 +233,25 @@ function handleUser(dispatch, userManager, validateUser) {
 
     window.setTimeout(function () {
       userManager.getUser().then(function (user) {
-        var now = parseInt(Date.now() / 1000);
-        var exp = (0, _jwtDecode["default"])(user.id_token).exp;
-        var idTokenExpiresIn = exp - now;
+        if (!user) {
+          console.error("user is null at silent renew error, it shouldn't happen.");
+        }
+
+        var idTokenExpiresIn = getIdTokenExpiresIn(user);
 
         if (idTokenExpiresIn < 0) {
-          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
+          console.log('Error in silent renew, idtoken expired: ' + idTokenExpiresIn + ' => Logging out.', error); // remove the user from our app, but don't sso logout on all other apps
+
+          dispatch((0, _actions.setShowAuthenticationRouterLogin)(true)); // logout during token expiration, show login without errors
 
-          dispatch((0, _actions.setShowAuthenticationRouterLogin)(true));
+          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();
             });
@@ -256,7 +266,11 @@ function handleUser(dispatch, userManager, validateUser) {
           console.log('Error in silent renew, unsupported configuration: token still valid for ' + idTokenExpiresIn + ' but maxExpiresIn is not configured:' + userManager.idpSettings.maxExpiresIn, error);
         }
       });
-    }, accessTokenExpiringNotificationTime * 1000);
+    }, accessTokenExpiringNotificationTime * 1000); // Should be min(accessTokenExpiringNotificationTime * 1000, idTokenExpiresIn) to avoid rare case
+    // when user connection is dying and you refresh the page between expiring and expired.
+    // but gateway has a DEFAULT_MAX_CLOCK_SKEW = 60s then the token is still valid for this time
+    // even if expired
+    // We accept to not manage this case further
   });
   console.debug('dispatch user');
   dispatchUser(dispatch, userManager, validateUser);

package/lib/utils/EquipmentType.js

@@ -123,9 +123,9 @@ var EQUIPMENT_TYPE = {
 };
 exports.EQUIPMENT_TYPE = EQUIPMENT_TYPE;
 
-var getEquipmentsInfosForSearchBar = function getEquipmentsInfosForSearchBar(equipmentsInfos, equipmentLabelling) {
+var getEquipmentsInfosForSearchBar = function getEquipmentsInfosForSearchBar(equipmentsInfos, getNameOrId) {
   return equipmentsInfos.flatMap(function (e) {
-    var label = equipmentLabelling ? e.name : e.id;
+    var label = getNameOrId(e);
     return e.type === 'SUBSTATION' ? [{
       label: label,
       id: e.id,
@@ -137,7 +137,7 @@ var getEquipmentsInfosForSearchBar = function getEquipmentsInfosForSearchBar(equ
         id: e.id,
         key: e.id + '_' + vli.id,
         type: e.type,
-        voltageLevelLabel: equipmentLabelling ? vli.name : vli.id,
+        voltageLevelLabel: getNameOrId(vli),
         voltageLevelId: vli.id
       };
     });

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/lib/utils/algos.js

@@ -0,0 +1,27 @@
+"use strict";
+
+exports.__esModule = true;
+exports.equalsArray = equalsArray;
+
+/**
+ * Copyright (c) 2022, RTE (http://www.rte-france.com)
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+function equalsArray(a, b) {
+  if (b === a) return true;
+  if (!b || !a) return false;
+  if (a.length !== b.length) return false;
+
+  for (var i = 0, l = a.length; i < l; i++) {
+    if (a[i] instanceof Array && b[i] instanceof Array) {
+      if (!equalsArray(a[i], b[i])) return false;
+    } else if (a[i] !== b[i]) {
+      // Warning - two different object instances will never be equal: {x:20} != {x:20}
+      return false;
+    }
+  }
+
+  return true;
+}

package/package.json

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