@sis-cc/dotstatsuite-components 14.3.7 → 15.0.1

package/src/rules/src/v8-transformer.js

@@ -3,7 +3,7 @@ import dateFns from 'date-fns';
 import { getCodeOrder, getRefinedName, isTimePeriodDimension } from '@sis-cc/dotstatsuite-sdmxjs';
 import {
   getRelationnalAnnotations, setAnnotationsLayout, getIsHidden } from './sdmx-data';
-import { getReportedTimePeriodLabel, getReportedTimePeriodNote, getReportedTimePeriod } from './date';
+import { getReportedTimePeriodLabel, getReportedTimePeriodNote, getReportedTimePeriod, dateWithoutTZ } from './date';
 import { getReportingYearStart } from './preparators/getReportingYearStart';
 import { getNotDisplayedIds } from '../../rules2/src';
 
@@ -75,7 +75,7 @@ export const dataTransformer = (dataNew, options = {}) => {
         display: !isHidden,
         name: R.when(
           R.always(isTimeDimension),
-          R.always(getReportedTimePeriodLabel(options.frequency, timeFormat, locale)(reportYearStart, { id: value.id, reportedStart: start, start:value.start }))
+          R.always(getReportedTimePeriodLabel(options.frequency, timeFormat, locale)(reportYearStart, { id: value.id, reportedStart: start, start: dateWithoutTZ(new Date(value.start)) }))
         )(name),
         start: start ? start.toISOString() : null,
         notes,

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/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);
+  });
+});