@sis-cc/dotstatsuite-components 13.0.4 → 13.1.0

package/test/getUnitsArtefacts.test.js

@@ -1,9 +1,5 @@
 import { expect } from 'chai';
 import { getUnitsArtefacts } from '../src/rules/src/table/units/getUnitsArtefacts';
-import { getDisplay } from '../src/rules/src/preparators/getDisplay';
-
-const noDisplayIndexes = [0, 1];
-const _getDisplay = getDisplay({ noDisplayIndexes });
 
 const data = {
   structure: {
@@ -19,8 +15,8 @@ const data = {
         { id: 'A5', relationship: { dimensions: ['D2'] }, values: [{ id: 'V1' }, { id: 'V2' }] },
         { id: 'A6', relationship: { dimensions: ['D1'] }, values: [{ id: 'V1' }] },
         { id: 'A7', relationship: { dimensions: ['D1', 'D2'] }, values: [{ id: 'V1' }] },
-        { id: 'A8', relationship: { primaryMeasure: 'OBS_VALUE' }, values: [{ id: 'V1' }, { id: 'V2' }], annotations: [2, 3, 4] },
-        { id: 'A9', relationship: { primaryMeasure: 'OBS_VALUE' }, values: [{ id: 'V1' }, { id: 'V2' }], annotations: [0, 5] },
+        { id: 'A8', relationship: { primaryMeasure: 'OBS_VALUE' }, values: [{ id: 'V1' }, { id: 'V2' }] },
+        { id: 'A9', relationship: { primaryMeasure: 'OBS_VALUE' }, values: [{ id: 'V1' }, { id: 'V2' }], display: false },
       ]
     },
     dimensions: {
@@ -47,13 +43,13 @@ describe('getUnitsArtefacts tests', () => {
     });
   });
   it('full header', () => {
-    expect(getUnitsArtefacts({ data: { data }, unitsDefinitionCodes: ['A1', 'D1'], getDisplay: _getDisplay })).to.deep.equal({
+    expect(getUnitsArtefacts({ data: { data }, unitsDefinitionCodes: ['A1', 'D1'] })).to.deep.equal({
       attributes: { header: { A1: { id: 'A1', datasetLevel: true, values: [{ id: 'V1' }] } }, series: {} },
       dimensions: { header: { D1: { id: 'D1', header: true, index: 1, values: [{ id: 'V1' }] } }, series: {} },
     });
   });
   it('full series', () => {
-    expect(getUnitsArtefacts({ data: { data }, unitsDefinitionCodes: ['A4', 'A5', 'D2'], getDisplay: _getDisplay })).to.deep.equal({
+    expect(getUnitsArtefacts({ data: { data }, unitsDefinitionCodes: ['A4', 'A5', 'D2'] })).to.deep.equal({
       attributes: {
         series: {
           A4: { id: 'A4', index: 1, relationship: { dimensions: ['D2'] }, values: [{ id: 'V1' }] },
@@ -65,7 +61,7 @@ describe('getUnitsArtefacts tests', () => {
     });
   });
   it('header dimensions with series', () => {
-    expect(getUnitsArtefacts({ data: { data }, unitsDefinitionCodes: ['A4', 'A5', 'D1', 'D2'], getDisplay: _getDisplay })).to.deep.equal({
+    expect(getUnitsArtefacts({ data: { data }, unitsDefinitionCodes: ['A4', 'A5', 'D1', 'D2'] })).to.deep.equal({
       attributes: {
         series: {
           A4: { id: 'A4', index: 1, relationship: { dimensions: ['D2'] }, values: [{ id: 'V1' }] },
@@ -83,7 +79,7 @@ describe('getUnitsArtefacts tests', () => {
     });
   });
   it('header attributes with series', () => {
-    expect(getUnitsArtefacts({ data: { data }, unitsDefinitionCodes: ['A1', 'A4', 'A5', 'D2'], getDisplay: _getDisplay })).to.deep.equal({
+    expect(getUnitsArtefacts({ data: { data }, unitsDefinitionCodes: ['A1', 'A4', 'A5', 'D2'] })).to.deep.equal({
       attributes: {
         series: {
           A1: { id: 'A1', datasetLevel: true, values: [{ id: 'V1' }] },
@@ -96,20 +92,20 @@ describe('getUnitsArtefacts tests', () => {
     });
   });
   it('all attached dimensions single value makes a header', () => {
-    expect(getUnitsArtefacts({ data: { data }, unitsDefinitionCodes: ['A6'], getDisplay: _getDisplay })).to.deep.equal({
+    expect(getUnitsArtefacts({ data: { data }, unitsDefinitionCodes: ['A6'] })).to.deep.equal({
       attributes: { header: { A6: { id: 'A6', index: 3, relationship: { dimensions: [] }, values: [{ id: 'V1' }] }, }, series: {} },
       dimensions: { header: {}, series: {} },
     });
   });
   it('series attributes keeps only multi values dimensions in attachment', () => {
-    expect(getUnitsArtefacts({ data: { data }, unitsDefinitionCodes: ['A7'], getDisplay: _getDisplay })).to.deep.equal({
+    expect(getUnitsArtefacts({ data: { data }, unitsDefinitionCodes: ['A7'] })).to.deep.equal({
       attributes: { series: { A7: { id: 'A7', index: 4, relationship: { dimensions: ['D2'] }, values: [{ id: 'V1' }] }, }, header: {} },
       dimensions: { header: {}, series: {} },
     });
   });
   it('no display annotations', () => {
-    expect(getUnitsArtefacts({ data: { data }, unitsDefinitionCodes: ['A8', 'A9'], getDisplay: _getDisplay })).to.deep.equal({
-      attributes: { header: {}, series: { A8: { id: 'A8', observations: true, index: 5, relationship: { primaryMeasure: 'OBS_VALUE' }, values: [{ id: 'V1' }, { id: 'V2' }], annotations: [2, 3, 4] } } },
+    expect(getUnitsArtefacts({ data: { data }, unitsDefinitionCodes: ['A8', 'A9'] })).to.deep.equal({
+      attributes: { header: {}, series: { A8: { id: 'A8', observations: true, index: 5, relationship: { primaryMeasure: 'OBS_VALUE' }, values: [{ id: 'V1' }, { id: 'V2' }] } } },
       dimensions: { header: {}, series: {} },
     });
   });

package/test/mocks/table-prep-multi-hierarchies--attributes.json

@@ -12,6 +12,7 @@
         "values": [
             {
                 "id": "A",
+                "display": false,
                 "order": 0,
                 "name": "Normal value",
                 "names": {
@@ -33,6 +34,7 @@
         "values": [
             {
                 "id": "0",
+                "display": false,
                 "order": 0,
                 "name": "Units",
                 "names": {

package/test/parseAttributes.test.js

@@ -1,13 +1,8 @@
 import { expect } from 'chai';
 import { parseAttributes } from '../src/rules/src/table/preparators/parseAttributes';
-import { getDisplay } from '../src/rules/src/preparators/getDisplay';
-
-const noDisplayIndexes = [0, 5, 10];
-const notDisplayedCodes = { a17: { id: 'a17' }, a18: { values: { a18v2: 'a18v2' } } };
-
 
 const attributes = [
-  { id: 'a0', annotations: [0, 4, 9], relationship: { primaryMeasure: 'OBS_VALUE' }, values: [{ id: 'a0v1' }] }, // no display
+  { id: 'a0', display: false, relationship: { primaryMeasure: 'OBS_VALUE' }, values: [{ id: 'a0v1' }] }, // no display
   { id: 'a1', relationship: { primaryMeasure: 'OBS_VALUE' } }, // no values
   { id: 'a2', relationship: { primaryMeasure: 'OBS_VALUE' }, values: [] }, // empty values
   { id: 'a3', values: [{ id: 'a3v1' }] }, // no relationship definition
@@ -24,8 +19,8 @@ const attributes = [
   { id: 'a14', relationship: { dimensions: ['d1'] }, values: [{ id: 'a14v1' }] }, // not recognised as footnote
   { id: 'a15', relationship: { dimensions: ['d3'] }, values: [{ id: 'a15v1' }] }, // recognised as prefscale
   { id: 'a16', relationship: { dimensions: ['d6'] }, values: [{ id: 'a16v1' }] }, // recognised as decimals 
-  { id: 'a17', relationship: { primaryMeasure: 'OBS_VALUE' }, values: [{ id: 'a17v1' }] }, // blacklisted
-  { id: 'a18', relationship: { primaryMeasure: 'OBS_VALUE' }, values: [{ id: 'a18v1' }, { id: 'a18v2' }] }, // blacklisted value
+  { id: 'a17', display: false, relationship: { primaryMeasure: 'OBS_VALUE' }, values: [{ id: 'a17v1' }] }, // blacklisted
+  { id: 'a18', relationship: { primaryMeasure: 'OBS_VALUE' }, values: [{ id: 'a18v1' }, { id: 'a18v2', display: false }] }, // blacklisted value
   { id: 'a19', relationship: { none: {} }, values: [{ id: 'a19v1' }] }, // dataset relationship
   { id: 'a20', relationship: { primaryMeasure: 'OBS_VALUE' }, values: [{ id: 'a20v1' }] }, // units attribute
   { id: 'a21', relationship: { dataflow: {} }, values: [{ id: 'a21v0' }] }, // alternative dataflow relationship
@@ -46,7 +41,7 @@ const parsedDimensionsIds = {
 describe('parseAttributes test', () => {
   it('complete case', () => {
     expect(parseAttributes({
-      attributes, parsedDimensionsIds, customAttributes, getDisplay: getDisplay({ noDisplayIndexes, notDisplayedCodes })
+      attributes, parsedDimensionsIds, customAttributes
     })).to.deep.equal({
       attributesIndexedByIds: {
         a6: { id: 'a6', index: 6, relationship: { primaryMeasure: 'OBS_VALUE' }, values: [{ id: 'a6v1' }] },

package/test/table-prep-perf.test.js

@@ -28,11 +28,6 @@ describe('table preparators performance tests', () => {
         decimals: 'DECIMALS',
         prefscale: 'PREF_SCALE'
       },
-      noDisplayIndexes: [4],
-      notDisplayedCodes: {
-        OBS_STATUS: { id: 'OBS_STATUS', values: { A: 'A' } },
-        UNIT_MULT: { id: 'UNIT_MULT', values: { '0': '0' } }
-      },
       unitsIds: ['UNIT_MULT', 'BASE_PER']
     };
     expect(
@@ -50,8 +45,6 @@ describe('table preparators performance tests', () => {
         decimals: 'DECIMALS',
         prefscale: 'PREF_SCALE'
       },
-      noDisplayIndexes: [],
-      notDisplayedCodes: {},
       unitsIds: ['UNIT_MEASURE', 'UNIT_MULT', 'BASE_PER']
     };
     expect(

package/lib/rules/src/preparators/getDisplay.js

@@ -1,32 +0,0 @@
-'use strict';
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.getDisplay = undefined;
-
-var _ramda = require('ramda');
-
-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 getDisplay = exports.getDisplay = function getDisplay(_ref) {
-  var _ref$noDisplayIndexes = _ref.noDisplayIndexes,
-      noDisplayIndexes = _ref$noDisplayIndexes === undefined ? [] : _ref$noDisplayIndexes,
-      _ref$notDisplayedCode = _ref.notDisplayedCodes,
-      notDisplayedCodes = _ref$notDisplayedCode === undefined ? {} : _ref$notDisplayedCode;
-
-  var annotationsValidator = R.pipe(R.propOr([], 'annotations'), R.intersection(noDisplayIndexes), R.isEmpty);
-
-  var blacklistValidator = R.ifElse(R.has('values'), function (_ref2) {
-    var id = _ref2.id;
-    return R.anyPass([R.complement(R.has)(id), R.hasPath([id, 'values'])])(notDisplayedCodes);
-  }, function (_ref3) {
-    var id = _ref3.id,
-        parent = _ref3.parent;
-    return R.complement(R.hasPath)([parent, 'values', id], notDisplayedCodes);
-  });
-
-  return R.allPass([annotationsValidator, blacklistValidator]);
-};

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

@@ -1,32 +0,0 @@
-'use strict';
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.getDisplay = undefined;
-
-var _ramda = require('ramda');
-
-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 getDisplay = exports.getDisplay = function getDisplay(_ref) {
-  var _ref$noDisplayIndexes = _ref.noDisplayIndexes,
-      noDisplayIndexes = _ref$noDisplayIndexes === undefined ? [] : _ref$noDisplayIndexes,
-      _ref$notDisplayedCode = _ref.notDisplayedCodes,
-      notDisplayedCodes = _ref$notDisplayedCode === undefined ? {} : _ref$notDisplayedCode;
-
-  var annotationsValidator = R.pipe(R.propOr([], 'annotations'), R.intersection(noDisplayIndexes), R.isEmpty);
-
-  var blacklistValidator = R.ifElse(R.has('values'), function (_ref2) {
-    var id = _ref2.id;
-    return R.anyPass([R.complement(R.has)(id), R.hasPath([id, 'values'])])(notDisplayedCodes);
-  }, function (_ref3) {
-    var id = _ref3.id,
-        parent = _ref3.parent;
-    return R.complement(R.hasPath)([parent, 'values', id], notDisplayedCodes);
-  });
-
-  return R.allPass([annotationsValidator, blacklistValidator]);
-};

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

@@ -1,16 +0,0 @@
-'use strict';
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.getNoDisplayAnnotationsIndexes = undefined;
-
-var _ramda = require('ramda');
-
-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 getNoDisplayAnnotationsIndexes = exports.getNoDisplayAnnotationsIndexes = R.addIndex(R.reduce)(function (acc, annotation, annotationIndex) {
-  return R.when(R.always(R.pipe(R.prop('type'), R.equals('NOT_DISPLAYED'))(annotation)), R.append(annotationIndex))(acc);
-}, []);

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

@@ -1,32 +0,0 @@
-'use strict';
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.getNoDisplayCodes = undefined;
-
-var _ramda = require('ramda');
-
-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 getNoDisplayCodes = exports.getNoDisplayCodes = function getNoDisplayCodes(_ref) {
-  var noDisplayIndexes = _ref.noDisplayIndexes,
-      annotations = _ref.annotations,
-      datasetIndexes = _ref.datasetIndexes;
-
-  var datasetLevelNoDisplayIndexes = R.intersection(noDisplayIndexes, datasetIndexes);
-
-  return R.pipe(R.nth(R.head(datasetLevelNoDisplayIndexes)), R.when(R.isNil, R.always({})),
-  // duplicate from sdmxjs
-  R.propOr('', 'title'), R.split(','), R.reduce(function (acc, entry) {
-    if (R.isEmpty(entry)) {
-      return acc;
-    }
-    var parse = R.split('=', entry);
-    var id = R.head(parse);
-    var values = R.ifElse(R.pipe(R.length, R.equals(1)), R.always(null), R.pipe(R.last, R.split('+'), R.reject(R.isEmpty), R.indexBy(R.identity)))(parse);
-    return R.pipe(R.set(R.lensProp(id), { id: id }), R.when(R.always(!R.isNil(values) && !R.isEmpty(values)), R.set(R.lensPath([id, 'values']), values)))(acc);
-  }, {}))(annotations);
-};

package/src/rules/src/preparators/getDisplay.js

@@ -1,20 +0,0 @@
-import * as R from 'ramda';
-
-export const getDisplay = ({ noDisplayIndexes = [], notDisplayedCodes = {} }) => {
-  const annotationsValidator = R.pipe(
-    R.propOr([], 'annotations'),
-    R.intersection(noDisplayIndexes),
-    R.isEmpty
-  );
-
-  const blacklistValidator = R.ifElse(
-    R.has('values'),
-    ({ id }) => R.anyPass([
-      R.complement(R.has)(id),
-      R.hasPath([id, 'values'])
-    ])(notDisplayedCodes),
-    ({ id, parent }) => R.complement(R.hasPath)([parent, 'values', id], notDisplayedCodes)
-  );
-
-  return R.allPass([annotationsValidator, blacklistValidator]);
-};

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

@@ -1,20 +0,0 @@
-import * as R from 'ramda';
-
-export const getDisplay = ({ noDisplayIndexes = [], notDisplayedCodes = {} }) => {
-  const annotationsValidator = R.pipe(
-    R.propOr([], 'annotations'),
-    R.intersection(noDisplayIndexes),
-    R.isEmpty
-  );
-
-  const blacklistValidator = R.ifElse(
-    R.has('values'),
-    ({ id }) => R.anyPass([
-      R.complement(R.has)(id),
-      R.hasPath([id, 'values'])
-    ])(notDisplayedCodes),
-    ({ id, parent }) => R.complement(R.hasPath)([parent, 'values', id], notDisplayedCodes)
-  );
-
-  return R.allPass([annotationsValidator, blacklistValidator]);
-};

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

@@ -1,9 +0,0 @@
-import * as R from 'ramda';
-
-export const getNoDisplayAnnotationsIndexes = R.addIndex(R.reduce)(
-  (acc, annotation, annotationIndex) => R.when(
-    R.always(R.pipe(R.prop('type'), R.equals('NOT_DISPLAYED'))(annotation)),
-    R.append(annotationIndex)
-  )(acc),
-  []
-);

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

@@ -1,32 +0,0 @@
-import * as R from 'ramda';
-
-export const getNoDisplayCodes = ({ noDisplayIndexes, annotations, datasetIndexes }) => {
-  const datasetLevelNoDisplayIndexes = R.intersection(noDisplayIndexes, datasetIndexes);
-
-  return R.pipe(
-    R.nth(R.head(datasetLevelNoDisplayIndexes)),
-    R.when(R.isNil, R.always({})),
-    // duplicate from sdmxjs
-    R.propOr('', 'title'),
-    R.split(','),
-    R.reduce((acc, entry) => {
-      if (R.isEmpty(entry)) {
-        return acc;
-      }
-      const parse = R.split('=', entry);
-      const id = R.head(parse);
-      const values = R.ifElse(
-        R.pipe(R.length, R.equals(1)),
-        R.always(null),
-        R.pipe(R.last, R.split('+'), R.reject(R.isEmpty), R.indexBy(R.identity)),
-      )(parse);
-      return R.pipe(
-        R.set(R.lensProp(id), { id }),
-        R.when(
-          R.always(!R.isNil(values) && !R.isEmpty(values)),
-          R.set(R.lensPath([id, 'values']), values),
-        ),
-      )(acc);
-    }, {})
-  )(annotations);
-};

package/test/getNoDisplayAnnotationsIndexes.test.js

@@ -1,18 +0,0 @@
-import { expect } from 'chai';
-import { getNoDisplayAnnotationsIndexes } from '../src/rules/src/table/preparators/getNoDisplayAnnotationsIndexes';
-
-describe('getNoDisplayAnnotationsIndexes test', () => {
-  it('basic test', () => {
-    const annotations = [
-      {},
-      { random: 'test' },
-      { type: 'wrong' },
-      { type: 'NOT_DISPLAYED', text: 'correct case' },
-      { type: 'NOT_DISPLAYED', message: 'other one' },
-      { other: 'random' },
-      { type: 'NOT_DISPLAYED', information: 'one last' }
-    ];
-
-    expect(getNoDisplayAnnotationsIndexes(annotations)).to.deep.equal([3, 4, 6]);
-  });
-});

package/test/getNoDisplayCodes.test.js

@@ -1,87 +0,0 @@
-import { expect } from 'chai';
-import { getNoDisplayCodes } from '../src/rules/src/table/preparators/getNoDisplayCodes';
-
-const annotations = [
-  {},
-  { title: '' },
-  { title: 'Toto' },
-  { title: 'Toto=Africa' },
-  { title: 'JM_Jarre=Oxygen+Equinoxe' },
-  { title: 'Toto,JM_Jarre' },
-  { title: 'Toto,JM_Jarre=Oxygen+Equinoxe' },
-  { title: 'Toto=Africa,JM_Jarre=Oxygen+Equinoxe' }
-];
-
-const noDisplayIndexes = [0, 1, 2, 3, 4, 5, 6, 7];
-
-describe('getNoDisplayCodes tests', () => {
-  it('no indexes match', () => {
-    expect(getNoDisplayCodes({
-      noDisplayIndexes,
-      annotations,
-      datasetIndexes: [8, 9]
-    })).to.deep.equal({});
-  });
-  it('no title', () => {
-    expect(getNoDisplayCodes({
-      noDisplayIndexes,
-      annotations,
-      datasetIndexes: [0, 1]
-    })).to.deep.equal({});
-  });
-  it('empty title', () => {
-    expect(getNoDisplayCodes({
-      noDisplayIndexes,
-      annotations,
-      datasetIndexes: [1, 2]
-    })).to.deep.equal({});
-  });
-  it('dimension', () => {
-    expect(getNoDisplayCodes({
-      noDisplayIndexes,
-      annotations,
-      datasetIndexes: [2]
-    })).to.deep.equal({ Toto: { id: 'Toto' } });
-  });
-  it('dimension value', () => {
-    expect(getNoDisplayCodes({
-      noDisplayIndexes,
-      annotations,
-      datasetIndexes: [3, 4, 5]
-    })).to.deep.equal({ Toto: { id: 'Toto', values: { Africa: 'Africa' } } });
-  });
-  it('dimension values', () => {
-    expect(getNoDisplayCodes({
-      noDisplayIndexes,
-      annotations,
-      datasetIndexes: [4, 5]
-    })).to.deep.equal({ JM_Jarre: { id: 'JM_Jarre', values: { Oxygen: 'Oxygen', Equinoxe: 'Equinoxe' } } });
-  });
-  it('dimensions', () => {
-    expect(getNoDisplayCodes({
-      noDisplayIndexes,
-      annotations,
-      datasetIndexes: [5, 9, 10]
-    })).to.deep.equal({ Toto: { id: 'Toto' }, JM_Jarre: { id: 'JM_Jarre' } });
-  });
-  it('dimension plus dimension values', () => {
-    expect(getNoDisplayCodes({
-      noDisplayIndexes,
-      annotations,
-      datasetIndexes: [18, 6, 2]
-    })).to.deep.equal({
-      Toto: { id: 'Toto' },
-      JM_Jarre: { id: 'JM_Jarre', values: { Oxygen: 'Oxygen', Equinoxe: 'Equinoxe' } }
-    });
-  });
-  it('dimension value plus dimension values', () => {
-    expect(getNoDisplayCodes({
-      noDisplayIndexes,
-      annotations,
-      datasetIndexes: [7, 8, 9]
-    })).to.deep.equal({
-      Toto: { id: 'Toto', values: { Africa: 'Africa' } },
-      JM_Jarre: { id: 'JM_Jarre', values: { Oxygen: 'Oxygen', Equinoxe: 'Equinoxe' } }
-    });
-  });
-});