@sis-cc/dotstatsuite-components 14.3.6 → 15.0.0

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

@@ -24,10 +24,9 @@ import {
   getObservationsAdvancedAttributes,
   getSeriesAdvancedAttributes
 } from '../../../../rules2/src/getAdvancedAttributes';
-import { duplicateObservations } from '../../../../rules2/src/duplicateObservations';
+import { duplicateObs } from '../../../../rules2/src/duplicateObservations';
 import { hierarchiseDimensionWithAdvancedHierarchy } from '../../../../rules2/src/hierarchiseDimensionWithAdvancedHierarchy';
 import { hierarchiseDimensionWithNativeHierarchy } from '../../../../rules2/src/hierarchiseDimensionWithNativeHierarchy';
-import { getDimensionValuesIndexes } from '../../../../rules2/src/getDimensionValuesIndexes';
 
 export const prepareData = (sdmxJson, customAttributes, unitsProps={}, _options={}) => {
   const {
@@ -172,14 +171,7 @@ export const prepareData = (sdmxJson, customAttributes, unitsProps={}, _options=
     return hierarchiseDimensionWithAdvancedHierarchy(dim, R.prop(dim.id, hierarchies));
   })(manyValuesDimensions);
 
-  const valuesIndexes = R.reduce(
-    (acc, dim) => ({ ...acc, [dim.__index]: getDimensionValuesIndexes(dim.values) }),
-    {},
-    R.values(hierarchisedDimensions)
-  );
-
-  const duplicatedObservations = duplicateObservations(observations, valuesIndexes);
-
+  const duplicatedObservations = duplicateObs(R.values(hierarchisedDimensions), observations);
   return ({
     dimensions: {
       one: oneValueDimensions,

package/src/rules2/src/duplicateObservations.js

@@ -1,45 +1,31 @@
 import * as R from 'ramda';
 
-export const duplicateObservations = (observations, indexes) => {
-  return R.addIndex(R.reduce)(
-    (acc, obs, i) => {
+export const duplicateObs = (dims, observations) => {
+  const duplicated = R.reduce(
+    (obs, dim) => {
+      const groupedObs = R.groupBy(o => R.prop(dim.id, o.indexedDimValIds), obs);
+      const enhancedObs = R.addIndex(R.map)(
+        (value, index) => {
+          const matchingObs = R.propOr([], value.id, groupedObs);
 
-      const orderedIndexes = R.addIndex(R.map)(
-        (valueIndex, dimIndex) => R.pathOr([Number(valueIndex)], [dimIndex, valueIndex], indexes),
-        R.propOr([], 'dimValuesIndexes', obs)
-      );
-
-      let cartesian;
-
-      if (R.any(is => R.length(is) > 1)(orderedIndexes)) {
-        cartesian = R.reduce(
-          (acc, oInds) => {
-            const r = R.map(
-              i => R.map(is => R.append(i, is), acc),
-              oInds
-            );
-            return R.unnest(r);
-          },
-          R.pipe(R.head, R.map(R.of))(orderedIndexes),
-          R.tail(orderedIndexes)
-        );
-      }
-      else {
-        cartesian = [R.unnest(orderedIndexes)];
-      }
-
-      const duplicatedObs = R.reduce(
-        (acc, orderedDimIndexes) => {
-          const key = R.join(':', orderedDimIndexes);
-          return R.assoc(key, { ...obs, orderedDimIndexes }, acc);
+          return R.map(
+            obs => R.over(
+              R.lensProp('orderedDimIndexes'),
+              _indexes => {
+                const indexes = R.isNil(_indexes) ? R.map(i => Number(i), obs.dimValuesIndexes) : _indexes;
+                return R.set(R.lensIndex(dim.__index), index)(indexes);
+              }
+            )(obs),
+            matchingObs
+          );
         },
-        {},
-        cartesian
+        dim.values
       );
-
-      return R.mergeRight(acc, duplicatedObs);
+      return R.unnest(enhancedObs);
     },
-    {},
-    R.values(observations)
-  )
-};
+    R.values(observations),
+    dims
+  );
+  const res =  R.indexBy(R.pipe(R.prop('orderedDimIndexes'), R.join(':')), duplicated);
+  return res;
+};

package/src/rules2/src/index.js

@@ -12,3 +12,14 @@ export { getNotDisplayedIds } from './getNotDisplayedIds';
 export { getHCodelistsRefs, getHCodelistsRefsInData } from './getHCodelistsRefsInData';
 export { parseHierarchicalCodelist } from './parseHierarchicalCodelist';
 export { refinePartialHierarchy } from './hierarchiseDimensionWithAdvancedHierarchy';
+export { getMetadataCoordinates } from './getMetadataCoordinates';
+export {
+  getDataflowAdvancedAttributes,
+  getObservationsAdvancedAttributes,
+  getSeriesAdvancedAttributes
+} from './getAdvancedAttributes';
+export { duplicateObs } from './duplicateObservations';
+export { hierarchiseDimensionWithAdvancedHierarchy } from './hierarchiseDimensionWithAdvancedHierarchy';
+export { hierarchiseDimensionWithNativeHierarchy } from './hierarchiseDimensionWithNativeHierarchy';
+export { getDimensionValuesIndexes } from './getDimensionValuesIndexes';
+

package/src/viewer/src/chart.js

@@ -1,47 +1,16 @@
 import React from 'react';
 import { branch, compose, renderComponent, withProps } from 'recompose';
 import * as R from 'ramda';
-import cx from 'classnames';
-import { makeStyles } from '@material-ui/core/styles';
 import { NoData } from '@sis-cc/dotstatsuite-visions';
 import * as charts from '../../bridge-d3-react/src';
-import { SCATTER } from '../../rules/src/constants';
 import filterSeriesRegardingDimensions from './chartUtils/series';
 import AxisLegend from './legends/AxisLegend';
 import { isChartNoData } from './utils';
 
-const useStyles = makeStyles(() => ({
-  container: {
-    backgroundColor: 'none',
-    overflow: 'hidden',
-    position: 'relative',
-    direction: 'ltr !important',
-  },
-  chartContainer: {
-    '& .rcw-chart__chart__line--x:last-of-type': {
-      visibility: 'hidden',
-    },
-    '& .rcw-chart__chart__line--y:last-of-type': {
-      visibility: 'hidden',
-    },
-    '& .rcw-chart__chart__axis--x': {
-      '& .tick:last-of-type': {
-        visibility: 'hidden',
-      }
-    },
-    '& .rcw-chart__chart__axis--y': {
-      '& .tick:last-of-type': {
-        visibility: 'hidden',
-      }
-    },
-  }
-}));
-
 const Chart = ({ options, series, type, width, getAxisOptions }) => {
-  const classes = useStyles();
   const ChartClass = charts[type];
   return (
-    <div className={cx({ [classes.chartContainer]: !R.equals(SCATTER, type) })}>
+    <div>
       {
         (R.is(Number, width) && width < 370)
         ? null

package/test/duplicateObs.test.js

@@ -0,0 +1,83 @@
+import { expect } from 'chai';
+import { duplicateObs } from '../src/rules2/src/duplicateObservations';
+
+describe('duplicate obs tests', () => {
+  it('simple test', () => {
+    const dims = [{
+      id: 'REF_AREA',
+      __index: 2,
+      values: [
+        { id: 'W' },
+        { id: 'OECD' },
+        { id: 'FRA' },
+        { id: 'GER' },
+        { id: 'EA' },
+        { id: 'GER' },
+        { id: 'FRA' },
+      ]
+    }];
+
+    const obs = {
+      '0:0:0': {
+        indexedDimValIds: { FREQ: 'A', VAR: '_T', REF_AREA: 'FRA' },
+        dimValuesIndexes: [0, 0, 0],
+      },
+      '0:0:1': {
+        indexedDimValIds: { FREQ: 'A', VAR: '_T', REF_AREA: 'EA' },
+        dimValuesIndexes: [0, 0, 1],
+      },
+      '0:0:2': {
+        indexedDimValIds: { FREQ: 'A', VAR: '_T', REF_AREA: 'OECD' },
+        dimValuesIndexes: [0, 0, 2],
+      },
+      '0:0:3': {
+        indexedDimValIds: { FREQ: 'A', VAR: '_T', REF_AREA: 'GER' },
+        dimValuesIndexes: [0, 0, 3],
+      },
+      '0:0:4': {
+        indexedDimValIds: { FREQ: 'A', VAR: '_T', REF_AREA: 'W' },
+        dimValuesIndexes: [0, 0, 4],
+      },
+    };
+
+    const expected = {
+      '0:0:0': {
+        indexedDimValIds: { FREQ: 'A', VAR: '_T', REF_AREA: 'W' },
+        orderedDimIndexes: [0, 0, 0],
+        dimValuesIndexes: [0, 0, 4],
+      },
+      '0:0:1': {
+        indexedDimValIds: { FREQ: 'A', VAR: '_T', REF_AREA: 'OECD' },
+        orderedDimIndexes: [0, 0, 1],
+        dimValuesIndexes: [0, 0, 2],
+      },
+      '0:0:2': {
+        indexedDimValIds: { FREQ: 'A', VAR: '_T', REF_AREA: 'FRA' },
+        orderedDimIndexes: [0, 0, 2],
+        dimValuesIndexes: [0, 0, 0],
+      },
+      '0:0:3': {
+        indexedDimValIds: { FREQ: 'A', VAR: '_T', REF_AREA: 'GER' },
+        orderedDimIndexes: [0, 0, 3],
+        dimValuesIndexes: [0, 0, 3],
+      },
+      '0:0:4': {
+        indexedDimValIds: { FREQ: 'A', VAR: '_T', REF_AREA: 'EA' },
+        orderedDimIndexes: [0, 0, 4],
+        dimValuesIndexes: [0, 0, 1],
+      },
+      '0:0:5': {
+        indexedDimValIds: { FREQ: 'A', VAR: '_T', REF_AREA: 'GER' },
+        orderedDimIndexes: [0, 0, 5],
+        dimValuesIndexes: [0, 0, 3],
+      },
+      '0:0:6': {
+        indexedDimValIds: { FREQ: 'A', VAR: '_T', REF_AREA: 'FRA' },
+        orderedDimIndexes: [0, 0, 6],
+        dimValuesIndexes: [0, 0, 0],
+      }
+    };
+
+    expect(duplicateObs(dims, obs)).to.deep.equal(expected);
+  });
+});