@sis-cc/dotstatsuite-components 9.3.0 → 9.3.4

package/lib/rules/src/table/factories/getLayoutData.js

@@ -9,6 +9,10 @@ var _slicedToArray2 = require('babel-runtime/helpers/slicedToArray');
 
 var _slicedToArray3 = _interopRequireDefault(_slicedToArray2);
 
+var _objectWithoutProperties2 = require('babel-runtime/helpers/objectWithoutProperties');
+
+var _objectWithoutProperties3 = _interopRequireDefault(_objectWithoutProperties2);
+
 var _extends2 = require('babel-runtime/helpers/extends');
 
 var _extends3 = _interopRequireDefault(_extends2);
@@ -136,10 +140,10 @@ var getRowsData = function getRowsData(rowsIndexes, dimensions) {
   return R.unnest(res);
 };
 
-var getLayoutData = exports.getLayoutData = function getLayoutData(layoutIndexes, layout) {
+var getLayoutData = function getLayoutData(layoutIndexes, layout) {
   var header = layoutIndexes.header,
       sections = layoutIndexes.sections,
-      truncated = layoutIndexes.truncated;
+      rest = (0, _objectWithoutProperties3.default)(layoutIndexes, ['header', 'sections']);
 
   var headerData = R.map(function (i) {
     return indexesToLayoutData(layout.header, i);
@@ -157,5 +161,6 @@ var getLayoutData = exports.getLayoutData = function getLayoutData(layoutIndexes
     return [sectionData, rowsData];
   }, sections);
 
-  return { headerData: headerData, sectionsData: sectionsData, truncated: truncated };
-};
+  return (0, _extends3.default)({ headerData: headerData, sectionsData: sectionsData }, rest);
+};
+exports.getLayoutData = getLayoutData;

package/lib/rules/src/table/factories/refineLayoutSize.js

@@ -142,7 +142,7 @@ var refineLayoutSize = exports.refineLayoutSize = function refineLayoutSize(_ref
         sections = layoutIndexes.sections;
 
     if (R.isNil(limit) || limit === 0 || R.all(R.isEmpty, [header, sections])) {
-      return R.assoc('truncated', false, layoutIndexes);
+      return R.pipe(R.set(R.lensProp('truncated'), false), R.set(R.lensProp('totalCells'), null))(layoutIndexes);
     }
 
     //number of dimensions in header
@@ -178,7 +178,7 @@ var refineLayoutSize = exports.refineLayoutSize = function refineLayoutSize(_ref
 
     var excess = total - limit;
     if (excess <= 0) {
-      return R.assoc('truncated', false, layoutIndexes);
+      return R.pipe(R.set(R.lensProp('truncated'), false), R.set(R.lensProp('totalCells'), total))(layoutIndexes);
     }
 
     // total of cells in one column
@@ -205,6 +205,6 @@ var refineLayoutSize = exports.refineLayoutSize = function refineLayoutSize(_ref
 
     var result = getRefinedLayout(isVertical, truncated, refined);
 
-    return R.assoc('truncated', true, result);
+    return R.pipe(R.set(R.lensProp('truncated'), true), R.set(R.lensProp('totalCells'), total))(result);
   };
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sis-cc/dotstatsuite-components",
   "description": "Set components based on React.",
-  "version": "9.3.0",
+  "version": "9.3.4",
   "main": "lib/index.js",
   "author": "OECD",
   "license": "MIT",
@@ -20,7 +20,7 @@
     "@react-hook/size": "^2.1.1",
     "@sis-cc/dotstatsuite-d3-charts": "^8.0.0",
     "@sis-cc/dotstatsuite-sdmxjs": "^4.5.2",
-    "@sis-cc/dotstatsuite-visions": "^6.4.2",
+    "@sis-cc/dotstatsuite-visions": "^6.6.3",
     "date-fns": "^1.30.1",
     "glamor": "^2.20.40",
     "glamorous": "^4.13.1",

package/src/rules/src/table/factories/getLayoutData.js

@@ -150,7 +150,7 @@ const getRowsData = (rowsIndexes, dimensions) => {
 };
 
 export const getLayoutData = (layoutIndexes, layout) => {
-  const { header, sections, truncated } = layoutIndexes;
+  const { header, sections, ...rest } = layoutIndexes;
   const headerData = R.map(i => indexesToLayoutData(layout.header, i), header);
 
   const sectionsData = R.map(
@@ -165,5 +165,5 @@ export const getLayoutData = (layoutIndexes, layout) => {
     sections
   );
 
-  return ({ headerData, sectionsData, truncated });
+  return ({ headerData, sectionsData, ...rest });
 };

package/src/rules/src/table/factories/refineLayoutSize.js

@@ -140,7 +140,10 @@ const segregateLayout = (isVertical) => R.ifElse(
 export const refineLayoutSize = ({ layout, observations, limit }) => layoutIndexes => {
   const { header, sections } = layoutIndexes;
   if (R.isNil(limit) || limit === 0 || R.all(R.isEmpty, [header, sections])) {
-    return R.assoc('truncated', false, layoutIndexes);
+    return R.pipe(
+      R.set(R.lensProp('truncated'), false), 
+      R.set(R.lensProp('totalCells'), null), 
+    )(layoutIndexes);
   }
 
   //number of dimensions in header
@@ -192,7 +195,10 @@ export const refineLayoutSize = ({ layout, observations, limit }) => layoutIndex
 
   const excess = total - limit;
   if (excess <= 0) {
-    return R.assoc('truncated', false, layoutIndexes);
+    return R.pipe(
+      R.set(R.lensProp('truncated'), false), 
+      R.set(R.lensProp('totalCells'), total), 
+    )(layoutIndexes);
   }
 
   // total of cells in one column
@@ -202,7 +208,6 @@ export const refineLayoutSize = ({ layout, observations, limit }) => layoutIndex
 
   const [toTruncate, toRefine] = segregateLayout(isVertical)(layoutIndexes);
 
-
   const cutLength = R.pipe(
     R.ifElse(R.identity, R.always(rowCellsCount), R.always(columnCellsCount)),
     R.divide(excess),
@@ -220,5 +225,8 @@ export const refineLayoutSize = ({ layout, observations, limit }) => layoutIndex
 
   const result = getRefinedLayout(isVertical, truncated, refined);
 
-  return R.assoc('truncated', true, result);
+  return R.pipe(
+    R.set(R.lensProp('truncated'), true), 
+    R.set(R.lensProp('totalCells'), total), 
+  )(result);
 };

package/test/getTableData.test.js

@@ -1306,6 +1306,7 @@ describe('getTableData tests', () => {
       observationsType: null
     })).to.deep.equal({
       truncated: false,
+      totalCells: null,
       cells: {},
       headerData: [],
       sectionsData: [],

package/test/mocks/table-layout-multi-hierarchies--layoutData.json

@@ -32406,5 +32406,6 @@
             ]
         ]
     ],
-    "truncated": false
+    "truncated": false,
+    "totalCells": 2754
 }

package/test/mocks/table-layout-multi-hierarchies--sizedIndexes.json

@@ -2757,5 +2757,6 @@
             ]
         ]
     ],
-    "truncated": false
+    "truncated": false,
+    "totalCells": 2754
 }

package/test/mocks/table-layout-truncation1--layoutData.json

@@ -20353,5 +20353,6 @@
             ]
         ]
     ],
-    "truncated": true
+    "truncated": true,
+    "totalCells": 7503
 }

package/test/mocks/table-layout-truncation1--sizedIndexes.json

@@ -3006,5 +3006,6 @@
     "header": [
         []
     ],
-    "truncated": true
+    "truncated": true,
+    "totalCells": 7503
 }

package/test/refineLayoutSize.test.js

@@ -118,6 +118,7 @@ describe('refineLayoutSize tests', () => {
 
     const expected = {
       truncated: false,
+      totalCells: 57,
       header: [[0], [1], [2]],
       sections: [
         [[0], [[0], [1], [2]]],
@@ -179,6 +180,7 @@ describe('refineLayoutSize tests', () => {
     };
 
     const expected = {
+      totalCells: 140,
       truncated: true,
       header: [[]],
       sections: [
@@ -260,6 +262,7 @@ describe('refineLayoutSize tests', () => {
     };
 
     const expected = {
+      totalCells: 140,
       truncated: true,
       header: [
         [0, 0, 0],
@@ -310,6 +313,7 @@ describe('refineLayoutSize tests', () => {
     };
 
     const expected = {
+      totalCells: 57,
       truncated: true,
       header: [[0],[2]],
       sections: [
@@ -349,6 +353,7 @@ describe('refineLayoutSize tests', () => {
     };
 
     const expected = {
+      totalCells: 64,
       truncated:true,
       header: [
         [0, 0],
@@ -392,6 +397,7 @@ describe('refineLayoutSize tests', () => {
     };
 
     const expected = {
+      totalCells: 64,
       truncated: true,
       header: [
         [0, 0],