@sis-cc/dotstatsuite-components 12.1.0 → 12.1.3

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

@@ -112,13 +112,18 @@ var prepareData = exports.prepareData = function prepareData(sdmxJson, customAtt
 
   var seriesAttributesIds = R.propOr([], 'series', attributesIdsIndexedByTargets);
   var observationsAttributesIds = R.propOr([], 'observations', attributesIdsIndexedByTargets);
+  var obsUnitsIds = R.pipe(function (_ref) {
+    var attributes = _ref.attributes,
+        dimensions = _ref.dimensions;
+    return R.merge(attributes.series || {}, dimensions.series || {});
+  }, R.values, R.pluck('id'))(unitsArtefacts);
   var options = {
     attachmentSeriesIndexes: attachmentSeriesIndexes,
     customAttributes: customAttributes,
     noDisplayIndexes: noDisplayIndexes,
     notDisplayedCodes: notDisplayedCodes,
     attributesIds: R.concat(seriesAttributesIds, observationsAttributesIds),
-    unitsIds: unitsDefinitionCodes
+    unitsIds: obsUnitsIds
   };
 
   var _observations = (0, _getObservations.getObservations)(sdmxJson);
@@ -145,7 +150,7 @@ var prepareData = exports.prepareData = function prepareData(sdmxJson, customAtt
   }, dimensionsAttributesValues);
 
   var metadataCoordinates = (0, _getMetadataCoordinates.getMetadataCoordinates)(sdmxJson);
-  var headerAttributesIds = R.concat(attributesIdsIndexedByTargets.dataflow || [], attributesIdsIndexedByTargets.oneValueDimensions || []);
+  var headerAttributesIds = R.concat(attributesIdsIndexedByTargets.dataflow || [], R.pipe(R.values, R.unnest)(attributesIdsIndexedByTargets.oneValueDimensions || {}));
   var headerAttributes = R.pick(headerAttributesIds, attributesIndexedByIds);
   var headerAdvancedAttrIds = R.pipe(R.filter(function (id) {
     return !R.includes(id, customAttributes.flags || []) && !R.includes(id, customAttributes.footnotes || []);

package/lib/viewer/src/footer.js

@@ -35,12 +35,12 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 var Footer = function Footer(_ref) {
   var type = _ref.type,
       chartData = _ref.chartData,
-      options = _ref.options,
       source = _ref.source,
       logo = _ref.logo,
       copyright = _ref.copyright,
       onSize = _ref.onSize,
-      chartOptions = _ref.chartOptions;
+      chartOptions = _ref.chartOptions,
+      isSticky = _ref.isSticky;
 
   var target = _react2.default.useRef(null);
 
@@ -63,7 +63,8 @@ var Footer = function Footer(_ref) {
       source: source,
       logo: logo,
       copyright: copyright,
-      legend: legend
+      legend: legend,
+      isSticky: isSticky
     })
   );
 };

package/lib/viewer/src/index.js

@@ -58,7 +58,7 @@ function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj;
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-var useStyles = (0, _styles.makeStyles)(function (theme) {
+var useStyles = (0, _styles.makeStyles)(function () {
   return {
     container: {
       borderColor: '#007bc7',

package/package.json

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

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

@@ -79,13 +79,18 @@ export const prepareData = (sdmxJson, customAttributes, unitsProps={}) => {
 
   const seriesAttributesIds = R.propOr([], 'series', attributesIdsIndexedByTargets);
   const observationsAttributesIds = R.propOr([], 'observations', attributesIdsIndexedByTargets);
+  const obsUnitsIds = R.pipe(
+    ({ attributes, dimensions }) => R.merge(attributes.series || {}, dimensions.series || {}),
+    R.values,
+    R.pluck('id')
+  )(unitsArtefacts);
   const options = {
     attachmentSeriesIndexes,
     customAttributes,
     noDisplayIndexes,
     notDisplayedCodes,
     attributesIds: R.concat(seriesAttributesIds, observationsAttributesIds),
-    unitsIds: unitsDefinitionCodes,
+    unitsIds: obsUnitsIds
   };
   
   const _observations = getObservations(sdmxJson);
@@ -140,7 +145,10 @@ export const prepareData = (sdmxJson, customAttributes, unitsProps={}) => {
   );
 
   const metadataCoordinates = getMetadataCoordinates(sdmxJson);
-  const headerAttributesIds = R.concat(attributesIdsIndexedByTargets.dataflow || [], attributesIdsIndexedByTargets.oneValueDimensions || []);
+  const headerAttributesIds = R.concat(
+    attributesIdsIndexedByTargets.dataflow || [],
+    R.pipe(R.values, R.unnest)(attributesIdsIndexedByTargets.oneValueDimensions || {})
+  );
   const headerAttributes = R.pick(headerAttributesIds, attributesIndexedByIds);
   const headerAdvancedAttrIds = R.pipe(
     R.filter(id => !R.includes(id, customAttributes.flags || []) && !R.includes(id, customAttributes.footnotes || [])),

package/src/viewer/src/footer.js

@@ -5,7 +5,7 @@ import { DataFooter } from '@sis-cc/dotstatsuite-visions';
 import ChartLegends from './legends/ChartLegends';
 import { isChartNoData } from './utils';
 
-const Footer = ({ type, chartData, options, source, logo, copyright, onSize, chartOptions }) => {
+const Footer = ({ type, chartData, source, logo, copyright, onSize, chartOptions, isSticky }) => {
   const target = React.useRef(null);
   const [width, height] = useSize(target);
 
@@ -23,6 +23,7 @@ const Footer = ({ type, chartData, options, source, logo, copyright, onSize, cha
         logo={logo}
         copyright={copyright}
         legend={legend}
+        isSticky={isSticky}
       />
     </div>
   );

package/src/viewer/src/index.js

@@ -10,7 +10,7 @@ import Header from './header';
 import Chart from './chart';
 import Footer from './footer';
 
-const useStyles = makeStyles(theme => ({
+const useStyles = makeStyles(() => ({
   container: {
     borderColor: '#007bc7',
     borderBottomWidth: 1,