@sis-cc/dotstatsuite-components 13.0.4 → 13.3.0

package/src/rules2/src/index.js

@@ -8,3 +8,4 @@ export { parseMetadataSeries } from './parseMetadataSeries';
 export { sdmx_3_0_DataFormatPatch } from './sdmx3.0DataFormatPatch';
 export { getDataflowTooltipAttributesIds } from './getDataflowTooltipAttributesIds';
 export { getMSDInformations } from './getMSDInformations';
+export { getNotDisplayedIds } from './getNotDisplayedIds';

package/src/rules2/src/parseMetadataSeries.js

@@ -1,14 +1,15 @@
 import * as R from 'ramda';
-import { getLocalisedName } from '@sis-cc/dotstatsuite-sdmxjs';
+import { getRefinedName } from '@sis-cc/dotstatsuite-sdmxjs';
 
-const dimensionValueDisplay = (locale, display) => data => {
+const dimensionValueDisplay = (display) => data => {
   if (display === 'code') {
     return R.prop('id', data);
   }
+  const name = getRefinedName(data);
   if (display ===  'both') {
-    return `${R.prop('id', data)}: ${getLocalisedName(locale)(data)}`;
+    return `${R.prop('id', data)}: ${name}`;
   }
-  return getLocalisedName(locale)(data);
+  return name;
 };
 // options = { locale, display, dimensions = [], attributes = { [id]: { format, parent } } };
 export const parseMetadataSeries = (metadataJson, options) => {
@@ -56,7 +57,7 @@ export const parseMetadataSeries = (metadataJson, options) => {
             return acc;
           }
           const attribute = R.nth(attrIndex, metadataAttributes);
-          const label = dimensionValueDisplay(options.locale, options.display)(attribute);
+          const label = dimensionValueDisplay(options.display)(attribute);
 
           const value = R.prop('value', R.nth(valueIndex, attribute.values || []));
 

package/src/viewer/src/index.js

@@ -33,11 +33,11 @@ const useStyles = makeStyles(() => ({
   }
 }));
 
-const ViewContent = ({ loading, noData = 'No Data', type, width, errorMessage, ...rest }) => {
-  if (loading) return <Loading message={loading} />;
-  if (!width) return <Loading message={loading} />;
+const ViewContent = ({ loading, loadingProps={}, noData = 'No Data', type, width, errorMessage, ...rest }) => {
+  if (loading) return <Loading message={loading} {...loadingProps} />;
+  if (!width) return <Loading message={loading} {...loadingProps} />;
   if (errorMessage) return <NoData message={errorMessage} />;
-  
+
   if (type === 'table') {
     const tableProps = R.propOr({}, 'tableProps', rest);
     const hasNoObs = R.pipe(R.prop('cells'), R.anyPass([R.isNil, R.isEmpty]))(tableProps);
@@ -60,8 +60,8 @@ const ViewContent = ({ loading, noData = 'No Data', type, width, errorMessage, .
 };
 
 const Viewer = ({ getResponsiveSize, setFooterOffset, setHeaderOffset, size, type, ...rest }) => {
-  const classes = useStyles({ 
-    fixedWidth: rest.fixedWidth, 
+  const classes = useStyles({
+    fixedWidth: rest.fixedWidth,
     fixedHeight: rest.fixedHeight
   });
   useEffect(() => {
@@ -74,7 +74,7 @@ const Viewer = ({ getResponsiveSize, setFooterOffset, setHeaderOffset, size, typ
   });
 
   return (
-    <div 
+    <div
       className={cx(classes.container, {
         [classes.tableContainer]: type === 'table',
         [classes.chartContainer]: type !== 'table'

package/test/enhanceObservations.test.js

@@ -100,7 +100,7 @@ describe('enhanceObservations tests', () => {
       },
       {
         id: 'a4',
-        values: [{ id: 'v0' }, { id: 'v1' }],
+        values: [{ id: 'v0' }, { id: 'v1', display: false }],
       },
     ];
 
@@ -112,7 +112,7 @@ describe('enhanceObservations tests', () => {
           { id: 'v0', __index: 0, __indexPosition: 0 },
           { id: 'v1', __index: 1, __indexPosition: 1 },
           { id: 'v2', __index: 2, __indexPosition: 2 },
-          { id: 'v3', __index: 3, __indexPosition: 3 }
+          { id: 'v3', __index: 3, __indexPosition: 3, display: false }
         ]
       },
       {

package/test/getNotDisplayedIds.test.js

@@ -0,0 +1,31 @@
+import { expect } from 'chai';
+import { getNotDisplayedIds } from '../src/rules2/src/getNotDisplayedIds';
+
+describe('getNotDisplayedIds tests', () => {
+  it('not provided case', () => {
+    const annotations = [
+      { type: 'test0' },
+      { type: 'test1' },
+      { type: 'NOT_DISPLAYED', title: '' },
+      { type: 'test2' },
+    ];
+    expect(getNotDisplayedIds(annotations)).to.deep.equal({});
+  });
+  it('complete case', () => {
+    const annotations = [
+      { type: 'test0' },
+      { type: 'test1' },
+      { type: 'NOT_DISPLAYED', title: 'd0,d1=,d2=v0,d3=v0+,d4=v0+v1' },
+      { type: 'test2' },
+    ];
+    const expected = {
+      d0: 'd0',
+      d1: 'd1',
+      'd2.v0': 'd2.v0',
+      'd3.v0': 'd3.v0',
+      'd4.v0': 'd4.v0',
+      'd4.v1': 'd4.v1'
+    };
+    expect(getNotDisplayedIds(annotations)).to.deep.equal(expected);
+  });
+})

package/test/getOneValueDimensions.test.js

@@ -1,29 +1,24 @@
 import { expect } from 'chai';
 import { getOneValueDimensions } from '../src/rules/src/table/preparators/getOneValueDimensions';
-import { getDisplay } from '../src/rules/src/preparators/getDisplay';
-
-const noDisplayIndexes = [0, 2, 4];
-
-const notDisplayedCodes = { '5': { id: '5' }, '6': { id: '6', values: { '6.1': '6.1' } } }
 
 describe('getOneValueDimensions tests', () => {
   it('no display indexes test', () => {
     const dimensions = [
-      { id: '0', values: [{ id: '0.1' }] },
-      { id: '1', annotations: [1, 3, 5], values: [{ id: '1.1' }] },
-      { id: '2', annotations: [0, 3, 5], values: [{ id: '2.1' }] },
-      { id: '3', values: [{ id: '3.1', annotations: [7, 8] }] },
-      { id: '4', values: [{ id: '4.1', annotations: [2, 7] }] },
-      { id: '5', values: [{ id: '5.1' }] },
-      { id: '6', values: [{ id: '6.1' }] },
+      { id: '0', display: true, values: [{ id: '0.1', display: true }] },
+      { id: '1', display: true, values: [{ id: '1.1', display: true }] },
+      { id: '2', display: false, values: [{ id: '2.1', display: true }] },
+      { id: '3', display: true, values: [{ id: '3.1', display: true }] },
+      { id: '4', display: true, values: [{ id: '4.1', display: false }] },
+      { id: '5', display: false, values: [{ id: '5.1', display: true }] },
+      { id: '6', display: true, values: [{ display: false, id: '6.1' }] },
     ];
 
-    expect(getOneValueDimensions(dimensions, {}, [], getDisplay({ noDisplayIndexes, notDisplayedCodes }))).to.deep.equal([
+    expect(getOneValueDimensions(dimensions, {}, [])).to.deep.equal([
       { id: '0', display: true, values: [{ id: '0.1', attributes: {}, display: true }] },
-      { id: '1', annotations: [1, 3, 5], display: true, values: [{ id: '1.1', attributes: {}, display: true }] },
-      { id: '2', annotations: [0, 3, 5], display: false, values: [{ id: '2.1', attributes: {}, display: true }] },
-      { id: '3', display: true, values: [{ id: '3.1', annotations: [7, 8], attributes: {}, display: true }] },
-      { id: '4', display: true, values: [{ id: '4.1', annotations: [2, 7], attributes: {}, display: false }] },
+      { id: '1', display: true, values: [{ id: '1.1', attributes: {}, display: true }] },
+      { id: '2', display: false, values: [{ id: '2.1', attributes: {}, display: true }] },
+      { id: '3', display: true, values: [{ id: '3.1', attributes: {}, display: true }] },
+      { id: '4', display: true, values: [{ id: '4.1', attributes: {}, display: false }] },
       { id: '5', display: false, values: [{ id: '5.1', attributes: {}, display: true }] },
       { id: '6', display: true, values: [{ id: '6.1', attributes: {}, display: false }] },
     ]);

package/test/getSidebarData.test.js

@@ -113,4 +113,108 @@ describe('getSidebarData tests', () => {
       }
     ]);
   });
+  it('non displayed dimensions handling', () => {
+    const attributes = {
+      '::': [
+        { id: 'aa0', label: 'advanced attribute 0', value: 'value' },
+        { id: 'aa1', label: 'advanced attribute 1', value: 'value' },
+      ],
+      '0::': [
+        { id: 'aa2', label: 'advanced attribute 2', value: 'value' },
+        { id: 'aa3', label: 'advanced attribute 3', value: 'value' },
+      ]
+    };
+    const metadata = {
+      '0::': [
+        { id: 'ma0', label: 'metadata attribute 0', value: 'value' },
+        { id: 'ma1', label: 'metadata attribute 1', value: 'value' },
+      ],
+      '0::0': [
+        { id: 'ma2', label: 'metadata attribute 2', value: 'value' },
+        { id: 'ma3', label: 'metadata attribute 3', value: 'value' },
+      ]
+    };
+    const options = {
+      display: 'code',
+      attributesLabel: 'Advanced Attributes'
+    };
+    const dataflow = {
+      id: 'DF',
+      name: 'Dataflow'
+    };
+    const dimensions = [
+      { id: 'd0', name: 'dimension 0', values: [{ id: 'd0v0', name: 'value 0' }] },
+      { id: 'd1', name: 'dimension 1', values: [{ id: 'd1v0', name: 'value 0' }] },
+      { id: 'd2', name: 'dimension 2', display: false, values: [{ id: 'd2v0', name: 'value 0' }] },
+    ];
+
+    expect(getSidebarData(attributes, metadata, dataflow, dimensions, options)).to.deep.equal([
+      {
+        id: '0::',
+        label: 'd0: d0v0',
+        splitCoord: ['0', '', ''],
+        children: [
+          {
+            id: '0::-attr',
+            label: 'Advanced Attributes',
+            children: [
+              {
+                id: 'aa2',
+                label: 'advanced attribute 2',
+                value: 'value'
+              },
+              {
+                id: 'aa3',
+                label: 'advanced attribute 3',
+                value: 'value'
+              }
+            ]
+          },
+          {
+            id: 'ma0',
+            label: 'metadata attribute 0',
+            value: 'value'
+          },
+          {
+            id: 'ma1',
+            label: 'metadata attribute 1',
+            value: 'value'
+          },
+          {
+            id: 'ma2',
+            label: 'metadata attribute 2',
+            value: 'value'
+          },
+          {
+            id: 'ma3',
+            label: 'metadata attribute 3',
+            value: 'value'
+          }
+        ]
+      },
+      {
+        id: '::',
+        label: 'DF',
+        splitCoord: ['', '', ''],
+        children: [
+          {
+            id: '::-attr',
+            label: 'Advanced Attributes',
+            children: [
+              {
+                id: 'aa0',
+                label: 'advanced attribute 0',
+                value: 'value'
+              },
+              {
+                id: 'aa1',
+                label: 'advanced attribute 1',
+                value: 'value'
+              }
+            ]
+          }
+        ]
+      }
+    ]);
+  });
 });

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/large_metadata_series.json

@@ -157,7 +157,7 @@
                 "dimensionGroup": [
                     {
                         "id": "METADATA_ATTR_0",
-                        "names": {"en": "Metadata Attribute 0"},
+                        "name": "Metadata Attribute 0",
                         "values": [
                             { "value": "v0" },
                             { "value": "v1" },
@@ -183,7 +183,7 @@
                     },
                     {
                         "id": "METADATA_ATTR_1",
-                        "names": {"en": "Metadata Attribute 1"},
+                        "name": "Metadata Attribute 1",
                         "values": [
                             { "value": "v0" },
                             { "value": "v1" },
@@ -209,7 +209,7 @@
                     },
                     {
                         "id": "METADATA_ATTR_2",
-                        "names": {"en": "Metadata Attribute 2"},
+                        "name": "Metadata Attribute 2",
                         "values": [
                             { "value": "v0" },
                             { "value": "v1" },
@@ -235,7 +235,7 @@
                     },
                     {
                         "id": "METADATA_ATTR_3",
-                        "names": {"en": "Metadata Attribute 3"},
+                        "name": "Metadata Attribute 3",
                         "values": [
                             { "value": "v0" },
                             { "value": "v1" },
@@ -261,7 +261,7 @@
                     },
                     {
                         "id": "METADATA_ATTR_4",
-                        "names": {"en": "Metadata Attribute 4"},
+                        "name": "Metadata Attribute 4",
                         "values": [
                             { "value": "v0" },
                             { "value": "v1" },
@@ -287,7 +287,7 @@
                     },
                     {
                         "id": "METADATA_ATTR_5",
-                        "names": {"en": "Metadata Attribute 5"},
+                        "name": "Metadata Attribute 5",
                         "values": [
                             { "value": "v0" },
                             { "value": "v1" },
@@ -313,7 +313,7 @@
                     },
                     {
                         "id": "METADATA_ATTR_6",
-                        "names": {"en": "Metadata Attribute 6"},
+                        "name": "Metadata Attribute 6",
                         "values": [
                             { "value": "v0" },
                             { "value": "v1" },
@@ -339,7 +339,7 @@
                     },
                     {
                         "id": "METADATA_ATTR_7",
-                        "names": {"en": "Metadata Attribute 7"},
+                        "name": "Metadata Attribute 7",
                         "values": [
                             { "value": "v0" },
                             { "value": "v1" },
@@ -365,7 +365,7 @@
                     },
                     {
                         "id": "METADATA_ATTR_8",
-                        "names": {"en": "Metadata Attribute 8"},
+                        "name": "Metadata Attribute 8",
                         "values": [
                             { "value": "v0" },
                             { "value": "v1" },
@@ -391,7 +391,7 @@
                     },
                     {
                         "id": "METADATA_ATTR_9",
-                        "names": {"en": "Metadata Attribute 9"},
+                        "name": "Metadata Attribute 9",
                         "values": [
                             { "value": "v0" },
                             { "value": "v1" },
@@ -417,7 +417,7 @@
                     },
                     {
                         "id": "METADATA_ATTR_10",
-                        "names": {"en": "Metadata Attribute 10"},
+                        "name": "Metadata Attribute 10",
                         "values": [
                             { "value": "v0" },
                             { "value": "v1" },
@@ -443,7 +443,7 @@
                     },
                     {
                         "id": "METADATA_ATTR_11",
-                        "names": {"en": "Metadata Attribute 11"},
+                        "name": "Metadata Attribute 11",
                         "values": [
                             { "value": "v0" },
                             { "value": "v1" },
@@ -469,7 +469,7 @@
                     },
                     {
                         "id": "METADATA_ATTR_12",
-                        "names": {"en": "Metadata Attribute 12"},
+                        "name": "Metadata Attribute 12",
                         "values": [
                             { "value": "v0" },
                             { "value": "v1" },
@@ -495,7 +495,7 @@
                     },
                     {
                         "id": "METADATA_ATTR_13",
-                        "names": {"en": "Metadata Attribute 13"},
+                        "name": "Metadata Attribute 13",
                         "values": [
                             { "value": "v0" },
                             { "value": "v1" },
@@ -521,7 +521,7 @@
                     },
                     {
                         "id": "METADATA_ATTR_14",
-                        "names": {"en": "Metadata Attribute 14"},
+                        "name": "Metadata Attribute 14",
                         "values": [
                             { "value": "v0" },
                             { "value": "v1" },
@@ -547,7 +547,7 @@
                     },
                     {
                         "id": "METADATA_ATTR_15",
-                        "names": {"en": "Metadata Attribute 15"},
+                        "name": "Metadata Attribute 15",
                         "values": [
                             { "value": "v0" },
                             { "value": "v1" },
@@ -573,7 +573,7 @@
                     },
                     {
                         "id": "METADATA_ATTR_16",
-                        "names": {"en": "Metadata Attribute 16"},
+                        "name": "Metadata Attribute 16",
                         "values": [
                             { "value": "v0" },
                             { "value": "v1" },
@@ -599,7 +599,7 @@
                     },
                     {
                         "id": "METADATA_ATTR_17",
-                        "names": {"en": "Metadata Attribute 17"},
+                        "name": "Metadata Attribute 17",
                         "values": [
                             { "value": "v0" },
                             { "value": "v1" },
@@ -625,7 +625,7 @@
                     },
                     {
                         "id": "METADATA_ATTR_18",
-                        "names": {"en": "Metadata Attribute 18"},
+                        "name": "Metadata Attribute 18",
                         "values": [
                             { "value": "v0" },
                             { "value": "v1" },
@@ -651,7 +651,7 @@
                     },
                     {
                         "id": "METADATA_ATTR_19",
-                        "names": {"en": "Metadata Attribute 19"},
+                        "name": "Metadata Attribute 19",
                         "values": [
                             { "value": "v0" },
                             { "value": "v1" },

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(