@sis-cc/dotstatsuite-components 15.0.2 → 15.0.5

package/lib/rules/src/properties/index.js

@@ -310,7 +310,7 @@ var toProperties = exports.toProperties = function toProperties(props, state, _o
       onChange: function onChange(value) {
         return _onChange({ title: value });
       },
-      value: (0, _getHeaderProps.getTitleLabel)(props, state),
+      value: R.isNil(state.title) || R.isEmpty(state.title) ? R.pathOr('', ['title', 'label'], props) : state.title,
       onReset: R.isNil(state.title) ? null : function () {
         return _onChange({ title: null });
       }
@@ -322,7 +322,7 @@ var toProperties = exports.toProperties = function toProperties(props, state, _o
       onChange: function onChange(value) {
         return _onChange({ subtitle: value });
       },
-      value: R.pipe(_getHeaderProps.getSubtitle, _getStringifiedSubtitle.stringifySubtitle)(props, state),
+      value: R.isNil(state.subtitle) || R.isEmpty(state.subtitle) ? (0, _getStringifiedSubtitle.stringifySubtitle)(props.subtitle || []) : state.subtitle,
       onReset: R.isNil(state.subtitle) ? null : function () {
         return _onChange({ subtitle: null });
       }

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

@@ -92,6 +92,6 @@ var getSideProps = function getSideProps(_ref2, customAttributes, metadataCoordi
 
 var getCells = exports.getCells = function getCells(data, display, customAttributes, unitsProps, metadataCoordinates) {
   return R.mapObjIndexed(function (observation) {
-    return R.pipe(R.set(R.lensProp('flags'), getFlags(customAttributes, (0, _dimensionUtils.dimensionValueDisplay)(display), unitsProps)(observation)), R.set(R.lensProp('intValue'), R.prop('value', observation)), R.set(R.lensProp('value'), R.prop('formattedValue', observation)), R.assoc('indexedDimValIds', R.prop('indexedDimValIds', observation)), R.assoc('sideProps', getSideProps(observation, customAttributes, metadataCoordinates)), R.set(R.lensProp('key'), R.prop('key', observation)))({});
+    return R.pipe(R.set(R.lensProp('flags'), getFlags(customAttributes, (0, _dimensionUtils.dimensionValueDisplay)(display), unitsProps)(observation)), R.set(R.lensProp('intValue'), R.is(Number, observation.value) ? observation.value : null), R.set(R.lensProp('value'), R.prop('formattedValue', observation)), R.assoc('indexedDimValIds', R.prop('indexedDimValIds', observation)), R.assoc('sideProps', getSideProps(observation, customAttributes, metadataCoordinates)), R.set(R.lensProp('key'), R.prop('key', observation)))({});
   }, R.propOr({}, 'observations', data));
 };

package/lib/rules/src/table/preparators/prepareData.js

@@ -86,9 +86,7 @@ var prepareData = exports.prepareData = function prepareData(sdmxJson, customAtt
   //------------------------------------------------------------------
   var unitsArtefacts = (0, _getUnitsArtefacts.getUnitsArtefacts)({ unitsDefinitionCodes: unitsDefinitionCodes, data: sdmxJson });
   var headerUnits = (0, _getHeaderUnits.getHeaderUnits)({ unitsArtefacts: unitsArtefacts, unitsDefinitionCodes: unitsDefinitionCodes, rejectedValueIds: rejectedValueIds });
-  var _dimensions = R.pipe(R.pathOr([], ['data', 'structure', 'dimensions', 'observation']), R.addIndex(R.map)(function (dim, index) {
-    return R.assoc('index', index, dim);
-  }), R.indexBy(R.prop('id')))(sdmxJson);
+  var _dimensions = R.pipe(R.pathOr([], ['data', 'structure', 'dimensions', 'observation']), R.indexBy(R.prop('id')))(sdmxJson);
   var attachmentSeriesIndexes = (0, _getAttachmentSeriesIndexes.getAttachmentSeriesIndexes)({ dimensions: _dimensions, unitsArtefacts: unitsArtefacts });
   //------------------------------------------------------------------
 

package/lib/rules/src/table/units/getAttachmentSeriesIndexes.js

@@ -21,5 +21,5 @@ var getAttachmentSeriesIndexes = exports.getAttachmentSeriesIndexes = function g
 
   return R.pipe(R.props(R.concat(unitsDimensionsCodes, targettedDimensionsCodes)), R.filter(function (dim) {
     return !R.isNil(dim);
-  }), R.pluck('index'), R.uniq, R.sortBy(R.identity))(dimensions);
+  }), R.pluck('__index'), R.uniq, R.sortBy(R.identity))(dimensions);
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sis-cc/dotstatsuite-components",
   "description": "Set components based on React.",
-  "version": "15.0.2",
+  "version": "15.0.5",
   "main": "lib/index.js",
   "author": "OECD",
   "license": "MIT",

package/src/rules/src/properties/index.js

@@ -319,7 +319,8 @@ export const toProperties = (props, state, onChange) => ({
     isActive: isChart(props.type),
     isDefault: R.isNil(state.title),
     onChange: (value) => onChange({ title: value }),
-    value: getTitleLabel(props, state),
+    value: R.isNil(state.title) || R.isEmpty(state.title)
+      ? R.pathOr('', ['title', 'label'], props) : state.title,
     onReset: R.isNil(state.title)
       ? null : () => onChange({ title: null })
   },
@@ -328,7 +329,8 @@ export const toProperties = (props, state, onChange) => ({
     isActive: isChart(props.type),
     isDefault: R.isNil(state.subtitle),
     onChange: (value) => onChange({ subtitle: value }),
-    value: R.pipe(getSubtitle, stringifySubtitle)(props, state),
+    value: R.isNil(state.subtitle) || R.isEmpty(state.subtitle)
+      ? stringifySubtitle(props.subtitle || []) : state.subtitle,
     onReset: R.isNil(state.subtitle)
       ? null : () => onChange({ subtitle: null })
   },

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

@@ -92,7 +92,7 @@ export const getCells = (data, display, customAttributes, unitsProps, metadataCo
         customAttributes, dimensionValueDisplay(display), unitsProps
       )(observation)
     ),
-    R.set(R.lensProp('intValue'), R.prop('value', observation)),
+    R.set(R.lensProp('intValue'), R.is(Number, observation.value) ? observation.value : null),
     R.set(R.lensProp('value'), R.prop('formattedValue', observation)),
     R.assoc('indexedDimValIds', R.prop('indexedDimValIds', observation)),
     R.assoc('sideProps', getSideProps(observation, customAttributes, metadataCoordinates)),

package/src/rules/src/table/preparators/prepareData.js

@@ -50,7 +50,6 @@ export const prepareData = (sdmxJson, customAttributes, unitsProps={}, _options=
     const headerUnits = getHeaderUnits({ unitsArtefacts, unitsDefinitionCodes, rejectedValueIds });
     const _dimensions = R.pipe(
       R.pathOr([], ['data', 'structure', 'dimensions', 'observation']),
-      R.addIndex(R.map)((dim, index) => R.assoc('index', index, dim)),
       R.indexBy(R.prop('id'))
     )(sdmxJson);
     const attachmentSeriesIndexes = getAttachmentSeriesIndexes({ dimensions: _dimensions, unitsArtefacts });

package/src/rules/src/table/units/getAttachmentSeriesIndexes.js

@@ -2,7 +2,7 @@ import * as R from 'ramda';
 
 export const getAttachmentSeriesIndexes = ({
   unitsArtefacts,
-  dimensions // { id: { index, ...dim } }
+  dimensions // { id: { __index, ...dim } }
 }) => {
   const targettedDimensionsCodes = R.pipe(
     R.pathOr({}, ['attributes', 'series']),
@@ -20,7 +20,7 @@ export const getAttachmentSeriesIndexes = ({
   return R.pipe(
     R.props(R.concat(unitsDimensionsCodes, targettedDimensionsCodes)),
     R.filter(dim => !R.isNil(dim)),
-    R.pluck('index'),
+    R.pluck('__index'),
     R.uniq,
     R.sortBy(R.identity)
   )(dimensions);