@sis-cc/dotstatsuite-components 15.0.9 → 15.0.11

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

@@ -56,7 +56,7 @@ var comparator = function comparator(size) {
   };
 };
 
-// simple call to ramda uniq method is very slow regarding performance 
+// simple call to ramda uniq method is very slow regarding performance
 var uniqIndexes = function uniqIndexes(indexes) {
   return R.pipe(R.reduce(function (acc, i) {
     var key = R.join(':', i);
@@ -71,7 +71,7 @@ var uniqIndexes = function uniqIndexes(indexes) {
 };
 
 var getSortedLayoutIndexes = exports.getSortedLayoutIndexes = function getSortedLayoutIndexes(layout, observations) {
-  var dimIndexes = R.pipe(R.values, R.pluck('orderedDimIndexes'))(observations);
+  var dimIndexes = R.pipe(R.values, R.map(R.propOr([], 'orderedDimIndexes')))(observations);
 
   var headerLength = R.length(layout.header);
 

package/lib/rules2/src/duplicateObservations.js

@@ -13,7 +13,7 @@ function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj;
 
 var duplicateObs = exports.duplicateObs = function duplicateObs(dims, observations) {
   var obsValues = R.values(observations);
-  if (R.length(obsValues) < 2 || R.length(dims) === 0) {
+  if (R.length(dims) === 0) {
     return observations;
   }
   var duplicated = R.reduce(function (obs, dim) {

package/lib/rules2/src/getDataflowTooltipAttributesIds.js

@@ -11,7 +11,9 @@ var R = _interopRequireWildcard(_ramda);
 
 function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
 
-var getDataflowTooltipAttributesIds = exports.getDataflowTooltipAttributesIds = function getDataflowTooltipAttributesIds(sdmxJson, defaults) {
+var getDataflowTooltipAttributesIds = exports.getDataflowTooltipAttributesIds = function getDataflowTooltipAttributesIds(sdmxJson) {
+  var defaults = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+
   var dataflowAnnotationsIndexes = R.pathOr([], ['data', 'dataSets', 0, 'annotations'], sdmxJson);
   var dataflowAnnotations = R.props(dataflowAnnotationsIndexes, R.pathOr([], ['data', 'structure', 'annotations'], sdmxJson));
 
@@ -24,10 +26,13 @@ var getDataflowTooltipAttributesIds = exports.getDataflowTooltipAttributesIds =
 
   var customNotes = R.pipe(R.propOr('', 'title'), function (title) {
     return R.isNil(title) || R.isEmpty(title) ? [] : R.split(',', title);
+  }, function (notes) {
+    return R.difference(notes, customFlags);
   })(footnotesAttrAnnotation || {});
 
-  return {
-    flags: R.isNil(flagsAttrAnnotation) ? defaults.flags : customFlags,
-    notes: R.isNil(footnotesAttrAnnotation) ? defaults.notes : customNotes
-  };
+  var flags = R.isNil(flagsAttrAnnotation) ? R.difference(defaults.flags || [], customNotes) : customFlags;
+
+  var notes = R.isNil(footnotesAttrAnnotation) ? R.difference(defaults.notes, flags) : customNotes;
+
+  return { flags: flags, notes: notes };
 };

package/package.json

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

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

@@ -33,7 +33,7 @@ const comparator = size => (a, b) => {
   return a[i] - b[i];
 };
 
-// simple call to ramda uniq method is very slow regarding performance 
+// simple call to ramda uniq method is very slow regarding performance
 const uniqIndexes = (indexes) => R.pipe(
   R.reduce(
     (acc, i) => {
@@ -52,7 +52,7 @@ const uniqIndexes = (indexes) => R.pipe(
 )(indexes);
 
 export const getSortedLayoutIndexes = (layout, observations) => {
-  const dimIndexes = R.pipe(R.values, R.pluck('orderedDimIndexes'))(observations);
+  const dimIndexes = R.pipe(R.values, R.map(R.propOr([], 'orderedDimIndexes')))(observations);
 
   const headerLength = R.length(layout.header);
 

package/src/rules2/src/duplicateObservations.js

@@ -2,7 +2,7 @@ import * as R from 'ramda';
 
 export const duplicateObs = (dims, observations) => {
   const obsValues = R.values(observations);
-  if ((R.length(obsValues) < 2) || R.length(dims) === 0) {
+  if (R.length(dims) === 0) {
     return observations;
   }
   const duplicated = R.reduce(

package/src/rules2/src/getDataflowTooltipAttributesIds.js

@@ -1,6 +1,6 @@
 import * as R from 'ramda';
 
-export const getDataflowTooltipAttributesIds = (sdmxJson, defaults) => {
+export const getDataflowTooltipAttributesIds = (sdmxJson, defaults = {}) => {
   const dataflowAnnotationsIndexes = R.pathOr([], ['data', 'dataSets', 0, 'annotations'], sdmxJson);
   const dataflowAnnotations = R.props(dataflowAnnotationsIndexes, R.pathOr([], ['data', 'structure', 'annotations'], sdmxJson));
 
@@ -14,12 +14,18 @@ export const getDataflowTooltipAttributesIds = (sdmxJson, defaults) => {
 
   const customNotes = R.pipe(
     R.propOr('', 'title'),
-    title => R.isNil(title) || R.isEmpty(title) ? [] : R.split(',', title)
+    title => R.isNil(title) || R.isEmpty(title) ? [] : R.split(',', title),
+    notes => R.difference(notes, customFlags)
   )(footnotesAttrAnnotation || {});
 
-  return ({
-    flags: R.isNil(flagsAttrAnnotation) ? defaults.flags : customFlags,
-    notes: R.isNil(footnotesAttrAnnotation) ? defaults.notes : customNotes,
-  });
+  const flags = R.isNil(flagsAttrAnnotation)
+    ? R.difference(defaults.flags || [], customNotes)
+    : customFlags;
+
+  const notes = R.isNil(footnotesAttrAnnotation)
+    ? R.difference(defaults.notes, flags)
+    : customNotes;
+
+  return ({ flags, notes });
 };
 

package/test/duplicateObs.test.js

@@ -78,6 +78,41 @@ describe('duplicate obs tests', () => {
       }
     };
 
+    expect(duplicateObs(dims, obs)).to.deep.equal(expected);
+  });
+  it('handle uniq observation case', () => {
+    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],
+      }
+    };
+    const expected = {
+      '0:0:2': {
+        indexedDimValIds: { FREQ: 'A', VAR: '_T', REF_AREA: 'FRA' },
+        orderedDimIndexes: [0, 0, 2],
+        dimValuesIndexes: [0, 0, 0],
+      },
+      '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);
   });
 });

package/test/getDataflowTooltipAttributesIds.test.js

@@ -87,4 +87,56 @@ describe('getDataflowTooltipAttributesIds tests', () => {
 
     expect(getDataflowTooltipAttributesIds({ data }, def)).to.deep.equal({ flags: ['f2', 'f3'], notes: [] });
   });
+  it('custom flags overrides default notes', () => {
+    const defaultIds = {
+      flags: [],
+      notes: ['ATTR0', 'ATTR1']
+    };
+    const data = {
+      dataSets: [{
+        annotations: [0]
+      }],
+      structure: {
+        annotations: [
+          { id: 'annot0', type: 'LAYOUT_FLAG', title: 'ATTR0,ATTR1' },
+        ]
+      }
+    };
+    expect(getDataflowTooltipAttributesIds({ data }, defaultIds)).to.deep.equal({ flags: ['ATTR0', 'ATTR1'], notes: [] });
+  });
+  it('custom notes overrides default flags', () => {
+    const defaultIds  = {
+      flags: ['ATTR0', 'ATTR1'],
+      notes: ['ATTR2', 'ATTR3']
+    };
+    const data = {
+      dataSets: [{
+        annotations: [0]
+      }],
+      structure: {
+        annotations: [
+          { id: 'annot0', type: 'LAYOUT_NOTE', title: 'ATTR1,ATTR2' },
+        ]
+      }
+    };
+    expect(getDataflowTooltipAttributesIds({ data }, defaultIds)).to.deep.equal({ flags: ['ATTR0'], notes: ['ATTR1', 'ATTR2'] });
+  });
+  it('custom flags overrides custom notes', () => {
+    const defaultIds  = {
+      flags: [],
+      notes: []
+    };
+    const data = {
+      dataSets: [{
+        annotations: [0, 1]
+      }],
+      structure: {
+        annotations: [
+          { id: 'annot0', type: 'LAYOUT_FLAG', title: 'ATTR0,ATTR1' },
+          { id: 'annot1', type: 'LAYOUT_NOTE', title: 'ATTR1,ATTR2' },
+        ]
+      }
+    };
+    expect(getDataflowTooltipAttributesIds({ data }, defaultIds)).to.deep.equal({ flags: ['ATTR0', 'ATTR1'], notes: ['ATTR2'] });
+  });
 });