@gridsuite/commons-ui 0.30.0 → 0.30.1

package/lib/components/MuiVirtualizedTable/KeyedColumnsRowIndexer.js

@@ -23,7 +23,7 @@ var CHANGE_WAYS = {
   AMEND: 'Amend',
   REMOVE: 'Remove'
 };
-/*
+/* This is not real code commented
 const someTypicalColumns = [
     { label: 'strings column', dataKey: 'key1' },
     {
@@ -187,13 +187,15 @@ var KeyedColumnsRowIndexer = /*#__PURE__*/function () {
       var ri = [];
       var cs = {};
 
-      for (var colIdx = 0; colIdx < columns.length; colIdx++) {
-        var col = columns[colIdx];
-        var helper = getHelper(col);
-        var colStat = helper.initStat();
+      for (var _iterator = _createForOfIteratorHelperLoose(columns), _step; !(_step = _iterator()).done;) {
+        var _col2 = _step.value;
+
+        var _helper2 = getHelper(_col2);
+
+        var colStat = _helper2.initStat();
 
         if (colStat) {
-          cs[col.dataKey] = colStat;
+          cs[_col2.dataKey] = colStat;
         }
       }
 
@@ -202,18 +204,14 @@ var KeyedColumnsRowIndexer = /*#__PURE__*/function () {
         var acceptsRow = true;
         var acceptedOnRow = {};
 
-        for (var _colIdx = 0; _colIdx < columns.length; _colIdx++) {
+        for (var colIdx = 0; colIdx < columns.length; colIdx++) {
           var _this$byColFilter;
 
-          var _col = columns[_colIdx];
-
-          var _helper = getHelper(_col);
-
-          var colKey = _col.dataKey;
+          var col = columns[colIdx];
+          var helper = getHelper(col);
+          var colKey = col.dataKey;
           var cellValue = row[colKey];
-
-          _helper.updateStat(cs[colKey], cellValue, false);
-
+          helper.updateStat(cs[colKey], cellValue, false);
           var colFilterParams = (_this$byColFilter = _this.byColFilter) === null || _this$byColFilter === void 0 ? void 0 : _this$byColFilter[colKey];
           var acceptsCell = true;
 
@@ -221,13 +219,13 @@ var KeyedColumnsRowIndexer = /*#__PURE__*/function () {
             var up = colFilterParams.userParams;
             var op = colFilterParams.outerParams;
 
-            if (!_helper.accepts(cellValue, up, op)) {
+            if (!helper.accepts(cellValue, up, op)) {
               acceptsCell = false;
             }
           }
 
-          if (_helper.maintainsStats && acceptsCell) {
-            acceptedOnRow[_colIdx] = cellValue;
+          if (helper.maintainsStats && acceptsCell) {
+            acceptedOnRow[colIdx] = cellValue;
           }
 
           acceptsRow &= acceptsCell;
@@ -242,11 +240,11 @@ var KeyedColumnsRowIndexer = /*#__PURE__*/function () {
             var _Object$entries$_i = _Object$entries[_i],
                 idx = _Object$entries$_i[0],
                 value = _Object$entries$_i[1];
-            var _col2 = columns[idx];
+            var _col = columns[idx];
 
-            var _helper2 = getHelper(_col2);
+            var _helper = getHelper(_col);
 
-            _helper2.updateStat(cs[_col2.dataKey], value, true);
+            _helper.updateStat(cs[_col.dataKey], value, true);
           }
 
           ri.push([row, rowIdx]);
@@ -546,14 +544,14 @@ var codedColumnsFromKeyAndDirection = function codedColumnsFromKeyAndDirection(k
     columIndexByKey[colKey] = colIdx;
   }
 
-  for (var i = 0; i < keyAndDirections.length; i++) {
-    var knd = keyAndDirections[i];
+  for (var _iterator2 = _createForOfIteratorHelperLoose(keyAndDirections), _step2; !(_step2 = _iterator2()).done;) {
+    var knd = _step2.value;
     var _colKey = knd[0];
     var dir = knd[1];
-    var _colIdx2 = columIndexByKey[_colKey];
-    if (_colIdx2 === undefined) continue;
+    var _colIdx = columIndexByKey[_colKey];
+    if (_colIdx === undefined) continue;
     var sign = giveDirSignFor(dir);
-    ret.push((_colIdx2 + 1) * sign);
+    ret.push((_colIdx + 1) * sign);
   }
 
   return ret;
@@ -565,7 +563,14 @@ var compareValue = function compareValue(a, b, isNumeric, undefSign) {
   }
 
   if (a === undefined && b === undefined) return 0;else if (a === undefined) return undefSign;else if (b === undefined) return -undefSign;
-  return isNumeric ? Math.sign(Number(a) - Number(b)) : ('' + a).localeCompare(b);
+
+  if (!isNumeric) {
+    return ('' + a).localeCompare(b);
+  } else {
+    if (isNaN(a)) return isNaN(b) ? 0 : 1;
+    if (isNaN(b)) return -1;
+    return Math.sign(Number(a) - Number(b));
+  }
 };
 
 var makeCompositeComparatorFromCodedColumns = function makeCompositeComparatorFromCodedColumns(codedColumns, columns, rowExtractor) {
@@ -573,8 +578,8 @@ var makeCompositeComparatorFromCodedColumns = function makeCompositeComparatorFr
     var row_a = rowExtractor(row_a_i);
     var row_b = rowExtractor(row_b_i);
 
-    for (var _iterator = _createForOfIteratorHelperLoose(codedColumns), _step; !(_step = _iterator()).done;) {
-      var cc = _step.value;
+    for (var _iterator3 = _createForOfIteratorHelperLoose(codedColumns), _step3; !(_step3 = _iterator3()).done;) {
+      var cc = _step3.value;
       var i = Math.abs(cc) - 1;
       var mul = Math.sign(cc);
       var col = columns[i];
@@ -602,8 +607,8 @@ var groupRows = function groupRows(groupingColumnsCount, columns, indexedArray)
   var inBuildGroup = [];
   groups.push(inBuildGroup);
 
-  for (var _iterator2 = _createForOfIteratorHelperLoose(indexedArray), _step2; !(_step2 = _iterator2()).done;) {
-    var p = _step2.value;
+  for (var _iterator4 = _createForOfIteratorHelperLoose(indexedArray), _step4; !(_step4 = _iterator4()).done;) {
+    var p = _step4.value;
     var nextSlice = p[0].slice(0, groupingColumnsCount);
 
     if (prevSlice === null || !(0, _algos.equalsArray)(prevSlice, nextSlice)) {
@@ -647,10 +652,10 @@ var groupAndSort = function groupAndSort(preFilteredRowPairs, codedColumns, grou
     });
     indexedArray = [];
 
-    for (var _iterator3 = _createForOfIteratorHelperLoose(groups), _step3; !(_step3 = _iterator3()).done;) {
+    for (var _iterator5 = _createForOfIteratorHelperLoose(groups), _step5; !(_step5 = _iterator5()).done;) {
       var _indexedArray;
 
-      var group = _step3.value;
+      var group = _step5.value;
       group.sort(intraGroupSortingComparator);
 
       (_indexedArray = indexedArray).push.apply(_indexedArray, group);

package/lib/components/MuiVirtualizedTable/MuiVirtualizedTable.js

@@ -407,9 +407,7 @@ var MuiVirtualizedTable = /*#__PURE__*/function (_React$PureComponent) {
 
       var label = _ref.label,
           columnIndex = _ref.columnIndex;
-      var _this$props = _this.props,
-          columns = _this$props.columns,
-          classes = _this$props.classes;
+      var columns = _this.props.columns;
       var indexer = _this.state.indexer;
       var colKey = columns[columnIndex].dataKey;
       var signedRank = indexer.columnSortingSignedRank(colKey);
@@ -426,9 +424,11 @@ var MuiVirtualizedTable = /*#__PURE__*/function (_React$PureComponent) {
         var userSelectedCount = userParams === null || userParams === void 0 ? void 0 : userParams.length;
         filterLevel += userSelectedCount ? 1 : 0;
         filterLevel += userSelectedCount >= countSeen ? 2 : 0;
-      }
+      } // disable filtering when a cellRenderer is defined,
+      // as we have no simple way to match for chosen value(s)
+
 
-      var onFilterClick = numeric || _this.props.sort ? undefined : function (ev, retargeted) {
+      var onFilterClick = numeric || _this.props.sort || columns[columnIndex].cellRenderer ? undefined : function (ev, retargeted) {
         _this.filterClickHandler(ev, retargeted, columnIndex);
       };
       return /*#__PURE__*/_react["default"].createElement(_ColumnHeader["default"], {
@@ -436,7 +436,6 @@ var MuiVirtualizedTable = /*#__PURE__*/function (_React$PureComponent) {
         ref: function ref(e) {
           return _this._registerHeader(label, e);
         },
-        className: (0, _clsx3["default"])(classes.tableCell, classes.header),
         sortSignedRank: signedRank,
         filterLevel: filterLevel,
         numeric: numeric,
@@ -461,9 +460,9 @@ var MuiVirtualizedTable = /*#__PURE__*/function (_React$PureComponent) {
 
       var index = _ref3.index,
           rowGetter = _ref3.rowGetter;
-      var _this$props2 = _this.props,
-          classes = _this$props2.classes,
-          onRowClick = _this$props2.onRowClick;
+      var _this$props = _this.props,
+          classes = _this$props.classes,
+          onRowClick = _this$props.onRowClick;
       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));
     });
 
@@ -481,12 +480,12 @@ var MuiVirtualizedTable = /*#__PURE__*/function (_React$PureComponent) {
       var cellData = _ref4.cellData,
           columnIndex = _ref4.columnIndex,
           rowIndex = _ref4.rowIndex;
-      var _this$props3 = _this.props,
-          columns = _this$props3.columns,
-          classes = _this$props3.classes,
-          rowHeight = _this$props3.rowHeight,
-          onCellClick = _this$props3.onCellClick,
-          rows = _this$props3.rows;
+      var _this$props2 = _this.props,
+          columns = _this$props2.columns,
+          classes = _this$props2.classes,
+          rowHeight = _this$props2.rowHeight,
+          onCellClick = _this$props2.onCellClick,
+          rows = _this$props2.rows;
 
       var displayedValue = _this.getDisplayValue(columns[columnIndex], cellData);
 
@@ -515,9 +514,9 @@ var MuiVirtualizedTable = /*#__PURE__*/function (_React$PureComponent) {
     _defineProperty(_assertThisInitialized(_this), "makeSizedTable", function (height, width, sizes, reorderedIndex, _rowGetter3) {
       var _reorderedIndex$lengt;
 
-      var _this$props4 = _this.props,
-          sort = _this$props4.sort,
-          otherProps = _objectWithoutPropertiesLoose(_this$props4, _excluded);
+      var _this$props3 = _this.props,
+          sort = _this$props3.sort,
+          otherProps = _objectWithoutPropertiesLoose(_this$props3, _excluded);
 
       return /*#__PURE__*/_react["default"].createElement(_reactVirtualized.Table, _extends({}, otherProps, {
         height: height,
@@ -732,9 +731,9 @@ var MuiVirtualizedTable = /*#__PURE__*/function (_React$PureComponent) {
   _proto.makeHeaderRenderer = function makeHeaderRenderer(dataKey, columnIndex) {
     var _this2 = this;
 
-    var _this$props5 = this.props,
-        columns = _this$props5.columns,
-        classes = _this$props5.classes;
+    var _this$props4 = this.props,
+        columns = _this$props4.columns,
+        classes = _this$props4.classes;
     return function (headerProps) {
       return /*#__PURE__*/_react["default"].createElement(_material.TableCell, {
         component: "div",

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.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;
+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.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.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"));
 
@@ -55,7 +55,6 @@ 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");
 
@@ -86,7 +85,6 @@ 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;
 
 var _reportViewerEn = _interopRequireDefault(require("./components/translations/report-viewer-en"));

package/lib/utils/AuthService.js

@@ -2,7 +2,6 @@
 
 exports.__esModule = true;
 exports.dispatchUser = dispatchUser;
-exports.getIdTokenExpiresIn = getIdTokenExpiresIn;
 exports.getPreLoginPath = getPreLoginPath;
 exports.handleSigninCallback = handleSigninCallback;
 exports.handleSilentRenewCallback = handleSilentRenewCallback;
@@ -32,11 +31,29 @@ window.OIDCLog = _oidcClient.Log;
 var hackauthoritykey = 'oidc.hack.authority';
 var pathKey = 'powsybl-gridsuite-current-path';
 
+function handleSigninSilent(dispatch, userManager) {
+  userManager.getUser().then(function (user) {
+    if (user == null || getIdTokenExpiresIn(user) < 0) {
+      return userManager.signinSilent()["catch"](function (error) {
+        dispatch((0, _actions.setShowAuthenticationRouterLogin)(true));
+        var oidcHackReloaded = 'gridsuite-oidc-hack-reloaded';
+
+        if (!sessionStorage.getItem(oidcHackReloaded) && error.message === 'authority mismatch on settings vs. signin state') {
+          sessionStorage.setItem(oidcHackReloaded, true);
+          console.log('Hack oidc, reload page to make login work');
+          window.location.reload();
+        }
+      });
+    }
+  });
+}
+
 function initializeAuthenticationDev(dispatch, isSilentRenew, validateUser) {
   var userManager = new _UserManagerMock.UserManagerMock({});
 
   if (!isSilentRenew) {
     handleUser(dispatch, userManager, validateUser);
+    handleSigninSilent(dispatch, userManager);
   }
 
   return Promise.resolve(userManager);
@@ -119,9 +136,14 @@ function initializeAuthenticationProd(dispatch, isSilentRenew, idpSettings, vali
 
     if (!isSilentRenew) {
       handleUser(dispatch, userManager, validateUser);
+      handleSigninSilent(dispatch, userManager);
     }
 
     return userManager;
+  })["catch"](function (error) {
+    console.debug('error when importing the idp settings', error);
+    dispatch((0, _actions.setShowAuthenticationRouterLogin)(true));
+    throw error;
   });
 }
 

package/package.json

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