@sis-cc/dotstatsuite-components 15.0.21 → 16.1.0

package/src/{rules/src/table/factories → rules2/src/table}/refineLayoutSize.js

@@ -1,5 +1,14 @@
 import * as R from 'ramda';
 
+const toKey = indexes => R.reduce(
+  (acc, _ind) => {
+    const ind = R.is(Array, _ind) ? toKey(_ind) : Math.abs(_ind);
+    return R.isEmpty(acc) ? String(ind) : `${acc}:${ind}`
+  },
+  '',
+  indexes
+);
+
 const getPivotKey = indexes => R.pipe(
   R.props(indexes),
   R.join(':')
@@ -7,7 +16,13 @@ const getPivotKey = indexes => R.pipe(
 
 const getPivots = (layout, shape) => R.pipe(
   R.props(shape),
-  R.map(R.pipe(R.pluck('__index'), getPivotKey))
+  R.map(
+    R.pipe(
+      R.map(entry => R.has('dimensions', entry) ? R.pluck('__index', entry.dimensions || []) : entry.__index),
+      R.unnest,
+      getPivotKey
+    )
+  )
 )(layout);
 
 const indexWithPivots = (pivots, observations) => R.pipe(
@@ -35,12 +50,12 @@ export const getCuratedCells = ({ layout, observations, shape }) => {
 export const refineSections = (sections, extractedKeys, curatedObs) => R.pipe(
   R.map(
     (section) => {
-      const sectionKey = R.join(':', R.head(section) || []);
+      const sectionKey = toKey(R.head(section) || []);
       return R.over(
         R.lensIndex(1),
         R.filter(
           rowData => {
-            const rowKey = R.join(':', rowData);
+            const rowKey = toKey(rowData);
             return R.pipe(
               R.path([sectionKey, rowKey]),
               R.omit(extractedKeys),
@@ -59,7 +74,7 @@ export const refineSections = (sections, extractedKeys, curatedObs) => R.pipe(
 
 export const refineHeader = (header, extractedKeys, curatedObs) => R.filter( // extracted : { [sectionKey]: [...rowKeys] }
   (header) => {
-    const headerKey = R.join(':', header);
+    const headerKey = toKey(header);
     return R.pipe(
       R.prop(headerKey),
       (sections) => {
@@ -86,17 +101,17 @@ export const truncateSectionRows = (n, sectionsData) => {
     const lastSection = R.last(truncated);
     const rows = lastSection[1];
     const rowsLength = R.length(rows);
-    const sectionKey = R.join(':', R.head(lastSection));
+    const sectionKey = toKey(R.head(lastSection));
     if (rowsLength > _n) {
       const [rest, extracted] = R.splitAt(R.negate(_n), rows);
       const updatedSection = R.set(R.lensIndex(1), rest)(lastSection);
       truncated = R.set(R.lensIndex(-1), updatedSection)(truncated);
-      extractedKeys = { ...extractedKeys, [sectionKey]: R.map(R.join(':'), extracted) };
+      extractedKeys = { ...extractedKeys, [sectionKey]: R.map(toKey, extracted) };
       _n = 0;
     }
     else {
       truncated = R.dropLast(1, truncated);
-      extractedKeys = { ...extractedKeys, [sectionKey]: R.map(R.join(':'), rows) };
+      extractedKeys = { ...extractedKeys, [sectionKey]: R.map(toKey, rows) };
       _n = _n - rowsLength;
     }
   }
@@ -105,7 +120,7 @@ export const truncateSectionRows = (n, sectionsData) => {
 
 export const truncateHeader = (n, headerData) => {
   const [truncated, extracted] = R.splitAt(R.negate(n))(headerData);
-  return ({ truncated, extractedKeys: R.map(R.join(':'), extracted) });
+  return ({ truncated, extractedKeys: R.map(toKey, extracted) });
 };
 
 const truncateLayout = (isVertical) => R.ifElse(
@@ -218,6 +233,7 @@ export const refineLayoutSize = ({ layout, observations, limit }) => layoutIndex
     (shape) => getCuratedCells({ layout, observations, shape })
   )(isVertical);
 
+
   const refined = refineLayout(isVertical)(toRefine, extractedKeys, curatedObs);
 
   const result = getRefinedLayout(isVertical, truncated, refined);

package/src/rules2/src/utils.js

@@ -0,0 +1,12 @@
+import * as R from 'ramda';
+
+export const trimedProps = (properties, obj) => R.reduce(
+  (acc, prop) => {
+    if (!R.has(prop, obj)) {
+      return acc;
+    }
+    return R.append(obj[prop], acc);
+  },
+  [],
+  properties,
+);

package/test/enhanceObservations2.test.js

@@ -0,0 +1,219 @@
+import { expect } from 'chai';
+import { enhanceObservations } from '../src/rules2/src/enhanceObservations';
+import numeral from 'numeral';
+
+numeral.register('locale', 'eObs', { delimiters: { thousands: ",", decimal: "."  } });
+describe('enhanceObservations tests', () => {
+  it('blank test', () => {
+    expect(enhanceObservations([], {}, [], {})).to.deep.equal({});
+  });
+  it('formatValue test', () => {
+    numeral.locale('eObs');
+    const attributes = [
+      { id: 'A1', values: [] },
+      { id: 'A2', values: [{ id: '-1' }, { id: '0' }, { id: '1' }, { id: '3' }, { id: 'Z' }] },
+      { id: 'A3', values: [{ id: '0' }, { id: '2' }, { id: '3' }, { id: '5' }, { id: 'A' }] }
+    ];
+
+    const customAttributes = { prefscale: 'A2', decimals: 'A3' };
+
+    const observations = {
+      a: { value: 2, attrValuesIndexes: [null, null, null], dimValuesIndexes: [] },
+      c: { value: 10, attrValuesIndexes: [null, 4, null], dimValuesIndexes: [] },
+      d: { value: 5, attrValuesIndexes: [null, 1, null], dimValuesIndexes: [] },
+      e: { value: 8.3, attrValuesIndexes: [null, 0, null], dimValuesIndexes: [] },
+      f: { value: 25.62, attrValuesIndexes: [null, 3, null], dimValuesIndexes: [] },
+      g: { value: 3.7, attrValuesIndexes: [null, null, 4], dimValuesIndexes: [] },
+      h: { value: 21.1234567, attrValuesIndexes: [null, null, 2], dimValuesIndexes: [] },
+      i: { value: 20.1, attrValuesIndexes: [null, null, 3], dimValuesIndexes: [] },
+      j: { value: 19.9, attrValuesIndexes: [null, null, 0], dimValuesIndexes: [] },
+      k: { value: 16.35, attrValuesIndexes: [null, 2, 1], dimValuesIndexes: [] },
+      l: { value: 155062.56, attrValuesIndexes: [null, null, 2], dimValuesIndexes: [] },
+      m: { value: 155062.56, attrValuesIndexes: [null, null, 0], dimValuesIndexes: [] },
+      n: { value: null, attrValuesIndexes: [null, null, 1], dimValuesIndexes: [] },
+    };
+
+    expect(enhanceObservations([], observations, attributes, { customAttributes })).to.deep.equal({
+      a: { attributes: {}, value: 2, formattedValue: '2', attrValuesIndexes: [null, null, null], dimValuesIndexes: [], indexedDimValIds: {} },
+      c: { attributes: {}, value: 10, formattedValue: '10', attrValuesIndexes: [null, 4, null], dimValuesIndexes: [], indexedDimValIds: {} },
+      d: { attributes: {}, value: 5, formattedValue: '5', attrValuesIndexes: [null, 1, null], dimValuesIndexes: [], indexedDimValIds: {} },
+      e: { attributes: {}, value: 8.3, formattedValue: '83', attrValuesIndexes: [null, 0, null], dimValuesIndexes: [], indexedDimValIds: {} },
+      f: { attributes: {}, value: 25.62, formattedValue: '0.02562', attrValuesIndexes: [null, 3, null], dimValuesIndexes: [], indexedDimValIds: {} },
+      g: { attributes: {}, value: 3.7, formattedValue: '3.7', attrValuesIndexes: [null, null, 4], dimValuesIndexes: [], indexedDimValIds: {} },
+      h: { attributes: {}, value: 21.1234567, formattedValue: '21.123', attrValuesIndexes: [null, null, 2], dimValuesIndexes: [], indexedDimValIds: {} },
+      i: { attributes: {}, value: 20.1, formattedValue: '20.10000', attrValuesIndexes: [null, null, 3], dimValuesIndexes: [], indexedDimValIds: {} },
+      j: { attributes: {}, value: 19.9, formattedValue: '20', attrValuesIndexes: [null, null, 0], dimValuesIndexes: [], indexedDimValIds: {} },
+      k: { attributes: {}, value: 16.35, formattedValue: '1.64', attrValuesIndexes: [null, 2, 1], dimValuesIndexes: [], indexedDimValIds: {} },
+      l: { attributes: {}, value: 155062.56, formattedValue: '155,062.560', attrValuesIndexes: [null, null, 2], dimValuesIndexes: [], indexedDimValIds: {} },
+      m: { attributes: {}, value: 155062.56, formattedValue: '155,063', attrValuesIndexes: [null, null, 0], dimValuesIndexes: [], indexedDimValIds: {} },
+      n: { attributes: {}, value: null, formattedValue: '..', attrValuesIndexes: [null, null, 1], dimValuesIndexes: [], indexedDimValIds: {} },
+    });
+  });
+  it('attributes', () => {
+    const attributes = [
+      {
+        id: 'a0',
+        values: [{ id: 'v0' }, { id: 'v1' }, { id: 'v2' }],
+        relationship: ['d0', 'd1'],
+        series: true
+      },
+      {
+        id: 'a1',
+        values: [{ id: 'v0' }],
+      },
+      {
+        id: 'a2',
+        values: [{ id: 'v0' }, { id: 'v1' }],
+        relationship: []
+      },
+      {
+        id: 'a3',
+        values: [{ id: 'v0' }, { id: 'v1' }],
+        relationship: ['d2', 'd3'],
+        series: true
+      },
+      {
+        id: 'a4',
+        values: [{ id: 'v0' }, { id: 'v1', display: false }],
+        relationship: ['d4'],
+        series: true
+      },
+    ];
+
+    const dimensions = [
+      {
+        id: 'd0',
+        __index: 0,
+        values: [
+          { id: 'v0', __index: 0, __indexPosition: 0 },
+          { id: 'v1', __index: 1, __indexPosition: 1 },
+          { id: 'v2', __index: 2, __indexPosition: 2 },
+          { id: 'v3', __index: 3, __indexPosition: 3, display: false }
+        ]
+      },
+      {
+        id: 'd1',
+        __index: 1,
+        values: [
+          { id: 'v0', __index: 0, __indexPosition: 0 }
+        ]
+      },
+      {
+        id: 'd2',
+        __index: 2,
+        values: [
+          { id: 'v0', __index: 0, __indexPosition: 0 }
+        ]
+      },
+      {
+        id: 'd3',
+        __index: 3,
+        values: [
+          { id: 'v0', __index: 0, __indexPosition: 0 },
+          { id: 'v1', __index: 1, __indexPosition: 1 }
+        ]
+      },
+      {
+        id: 'd4',
+        __index: 4,
+        values: [
+          { id: 'v0', __index: 0, __indexPosition: 0 }
+        ]
+      }
+    ];
+
+
+    const observations = {
+      a: {
+        attrValuesIndexes: [0, 0, 0, 0, 0],
+        dimValuesIndexes: [0, 0, 0, 0, 0],
+        value: 22,
+      },
+      b: {
+        attrValuesIndexes: [1, 0, 1, 1, 0],
+        dimValuesIndexes: [0, 0, 0, 1, 0],
+        value: 17,
+      },
+      c: {
+        attrValuesIndexes: [2, 0, null, null, 0],
+        dimValuesIndexes: [1, 0, 0, 0, 0],
+        value: 55,
+      },
+      d: {
+        attrValuesIndexes: [2, 0, null, null, null],
+        dimValuesIndexes: [2, 0, 0, 0, 0],
+        value: 35,
+      },
+      e: {
+        attrValuesIndexes: [2, null, null, null, null],
+        dimValuesIndexes: [3, 0, 0, 0, 0],
+        value: 35,
+      }
+    };
+
+
+    expect(enhanceObservations(dimensions, observations, attributes, {})).to.deep.equal({
+      a: {
+        attrValuesIndexes: [0, 0, 0, 0, 0],
+        dimValuesIndexes: [0, 0, 0, 0, 0],
+        value: 22,
+        formattedValue: '22',
+        attributes: {
+          a0: { id: 'a0', relationship: ['d0', 'd1'], value: { id: 'v0' }, serieKey: 'd0=v0:d1=v0', coordinates: { d0: 'v0', d1: 'v0' }, isObs: false },
+          a3: { id: 'a3', relationship: ['d2', 'd3'], value: { id: 'v0' }, serieKey: 'd2=v0:d3=v0', coordinates: { d2: 'v0', d3: 'v0' }, isObs: false },
+          a4: { id: 'a4', relationship: ['d4'], value: { id: 'v0' }, serieKey: 'd4=v0', coordinates: { d4: 'v0' }, isObs: false },
+        },
+        indexedDimValIds: { d0: 'v0', d1: 'v0', d2: 'v0', d3: 'v0', d4: 'v0' }
+      },
+      b: {
+        attrValuesIndexes: [1, 0, 1, 1, 0],
+        dimValuesIndexes: [0, 0, 0, 1, 0],
+        value: 17,
+        formattedValue: '17',
+        attributes: {
+          a0: { id: 'a0', relationship: ['d0', 'd1'], value: { id: 'v1' }, serieKey: 'd0=v0:d1=v0', coordinates: { d0: 'v0', d1: 'v0' }, isObs: false },
+          a3: { id: 'a3', relationship: ['d2', 'd3'], value: { id: 'v1' }, serieKey: 'd2=v0:d3=v1', coordinates: { d2: 'v0', d3: 'v1' }, isObs: false },
+          a4: { id: 'a4', relationship: ['d4'], value: { id: 'v0' }, serieKey: 'd4=v0', coordinates: { d4: 'v0' }, isObs: false },
+        },
+        indexedDimValIds: { d0: 'v0', d1: 'v0', d2: 'v0', d3: 'v1', d4: 'v0' }
+      },
+      c: {
+        attrValuesIndexes: [2, 0, null, null, 0],
+        dimValuesIndexes: [1, 0, 0, 0, 0],
+        value: 55,
+        formattedValue: '55',
+        attributes: {
+          a0: { id: 'a0', relationship: ['d0', 'd1'], value: { id: 'v2' }, serieKey: 'd0=v1:d1=v0', coordinates: { d0: 'v1', d1: 'v0' }, isObs: false },
+          a3: { id: 'a3', relationship: ['d2', 'd3'], value: undefined, serieKey: 'd2=v0:d3=v0', coordinates: { d2: 'v0', d3: 'v0' }, isObs: false },
+          a4: { id: 'a4', relationship: ['d4'], value: { id: 'v0' }, serieKey: 'd4=v0', coordinates: { d4: 'v0' }, isObs: false },
+        },
+        indexedDimValIds: { d0: 'v1', d1: 'v0', d2: 'v0', d3: 'v0', d4: 'v0' }
+      },
+      d: {
+        attrValuesIndexes: [2, 0, null, null, null],
+        dimValuesIndexes: [2, 0, 0, 0, 0],
+        value: 35,
+        formattedValue: '35',
+        attributes: {
+          a0: { id: 'a0', relationship: ['d0', 'd1'], value: { id: 'v2' }, serieKey: 'd0=v2:d1=v0', coordinates: { d0: 'v2', d1: 'v0' }, isObs: false },
+          a3: { id: 'a3', relationship: ['d2', 'd3'], value: undefined, serieKey: 'd2=v0:d3=v0', coordinates: { d2: 'v0', d3: 'v0' }, isObs: false },
+          a4: { id: 'a4', relationship: ['d4'], value: undefined, serieKey: 'd4=v0', coordinates: { d4: 'v0' }, isObs: false },
+        },
+        indexedDimValIds: { d0: 'v2', d1: 'v0', d2: 'v0', d3: 'v0', d4: 'v0' }
+      },
+      e: {
+        attrValuesIndexes: [2, null, null, null, null],
+        dimValuesIndexes: [3, 0, 0, 0, 0],
+        value: 35,
+        formattedValue: '35',
+        attributes: {
+          a0: { id: 'a0', relationship: ['d0', 'd1'], value: { id: 'v2' }, serieKey: 'd0=v3:d1=v0', coordinates: { d0: 'v3', d1: 'v0' }, isObs: false },
+          a3: { id: 'a3', relationship: ['d2', 'd3'], value: undefined, serieKey: 'd2=v0:d3=v0', coordinates: { d2: 'v0', d3: 'v0' }, isObs: false },
+          a4: { id: 'a4', relationship: ['d4'], value: undefined, serieKey: 'd4=v0', coordinates: { d4: 'v0' }, isObs: false },
+        },
+        indexedDimValIds: { d0: 'v3', d1: 'v0', d2: 'v0', d3: 'v0', d4: 'v0' }
+      }
+    });
+  });
+});
+

package/test/getAttributesSeries.test.js

@@ -0,0 +1,58 @@
+import { expect } from 'chai';
+import { getAttributesSeries } from '../src/rules2/src/getAttributesSeries';
+
+describe('getAttributesSeries tests', () => {
+  it('complete case', () => {
+    const observations = {
+      a: {
+        attributes: {
+          A: { id: 'A', value: { id: 'A0' }, serieKey: 'd0=v0' },
+          B: { id: 'B', value: { id: 'B0' }, serieKey: 'd1=v0' },
+        }
+      },
+      b: {
+        attributes: {
+          A: { id: 'A', value: { id: 'A0' }, serieKey: 'd0=v0' },
+          B: { id: 'B', value: { id: 'B1' }, serieKey: 'd1=v0' },
+        }
+      },
+      c: {
+        attributes: {
+          A: { id: 'A', value: { id: 'A0' }, serieKey: 'd0=v0' },
+          B: { id: 'B', value: { id: 'B1' }, serieKey: 'd1=v1' },
+        }
+      },
+      d: {
+        attributes: {
+          A: { id: 'A', value: { id: 'A0' }, serieKey: 'd0=v0' },
+          B: { id: 'B', value: { id: 'B1' }, serieKey: 'd1=v1' },
+        }
+      },
+      e: {
+        attributes: {
+          A: { id: 'A', value: { id: 'A0' }, serieKey: 'd0=v0' },
+          B: { id: 'B', value: { id: 'B3' }, serieKey: 'd1=v2' },
+        }
+      },
+      f: {
+        attributes: {
+          A: { id: 'A', value: { id: 'A0' }, serieKey: 'd0=v0' },
+          B: { id: 'B', value: { id: 'B3' }, serieKey: 'd1=v2' },
+        }
+      }
+    };
+
+    expect(getAttributesSeries(observations)).to.deep.equal({
+      'd0=v0': {
+        A: { id: 'A', value: { id: 'A0' }, serieKey: 'd0=v0' },
+      },
+      'd1=v0': {},
+      'd1=v1': {
+        B: { id: 'B', value: { id: 'B1' }, serieKey: 'd1=v1' },
+      },
+      'd1=v2': {
+        B: { id: 'B', value: { id: 'B3' }, serieKey: 'd1=v2' },
+      }
+    })
+  });
+});

package/test/getCells.test.js

@@ -1,7 +1,5 @@
 import { expect } from 'chai';
-import { getCells } from '../src/rules/src/table/factories/getCells';
-import { OBS_TYPE_NUMERICAL_STRING } from '../src/rules/src/constants';
-import * as R from 'ramda';
+import { getCells } from '../src/rules2/src/';
 
 const customAttributes = {
   flags: ['FL1', 'FL2'],
@@ -9,9 +7,8 @@ const customAttributes = {
 };
 
 describe('getCells tests', () => {
-  it('flags display name', () => {
-    expect(getCells({
-      observations: {
+  it('flags', () => {
+    expect(getCells(customAttributes, ['FL1', 'FL2', 'FT1', 'FT2', 'FT3'], [], {}, {})({
         a: {
           key: 'a',
           value: 33,
@@ -23,7 +20,6 @@ describe('getCells tests', () => {
           },
           indexedDimValIds: {}
         }
-      }
     }, 'label', customAttributes,
     { unitsDefinitionCodes: [], unitsSeries: {}, unitsDisplay: 'cells', unitDimension: {} }, [])).to.deep.equal({
       a: {
@@ -31,39 +27,9 @@ describe('getCells tests', () => {
         value: '33',
         intValue: 33,
         flags: [
-          { code: 'FL2.1', label: 'Flag 2: Flag 2 Value 1' },
-          { label: 'Footnote 1: Footnote 1 Value 1' },
-          { label: 'Footnote 3: Footnote 3 Value 3' }
-        ],
-        indexedDimValIds: {},
-        sideProps: null
-      }
-    })
-  });
-  it('flags display both', () => {
-    expect(getCells({
-      observations: {
-        a: {
-          key: 'a',
-          value: 33,
-          formattedValue: '33',
-          attributes: {
-            FL2: { id: 'FL2', name: 'Flag 2', value: { id: 'FL2.1', name: 'Flag 2 Value 1' } },
-            FT1: { id: 'FT1', name: 'Footnote 1', value: { id: 'FT1.1', name: 'Footnote 1 Value 1' } },
-            FT3: { id: 'FT3', name: 'Footnote 3', value: { id: 'FT3.3', name: 'Footnote 3 Value 3' } },
-          },
-          indexedDimValIds: {},
-        }
-      }
-    }, 'both', customAttributes, {}, [])).to.deep.equal({
-      a: {
-        key: 'a',
-        value: '33',
-        intValue: 33,
-        flags: [
-          { code: 'FL2.1', label: '(FL2) Flag 2: (FL2.1) Flag 2 Value 1' },
-          { label: '(FT1) Footnote 1: (FT1.1) Footnote 1 Value 1' },
-          { label: '(FT3) Footnote 3: (FT3.3) Footnote 3 Value 3' }
+          { code: 'FL2.1', id: 'FL2', name: 'Flag 2', value: { id: 'FL2.1', name: 'Flag 2 Value 1' } },
+          { id: 'FT1', name: 'Footnote 1', value: { id: 'FT1.1', name: 'Footnote 1 Value 1' } },
+          { id: 'FT3', name: 'Footnote 3', value: { id: 'FT3.3', name: 'Footnote 3 Value 3' } }
         ],
         indexedDimValIds: {},
         sideProps: null

package/test/getCombinationDimensionsData.test.js

@@ -0,0 +1,48 @@
+import { expect } from 'chai';
+import { getCombinationDimensionsData } from '../src/rules2/src/table/getCombinationDimensionsData';
+
+describe('getCombinationDimensionsData', () => {
+  it('basic test', () => {
+    const combination = {
+      id: 'COMB',
+      dimensions: [
+        {
+          id: 'D0',
+          values: [
+            { id: 'v0' },
+            { id: 'v1' },
+            { id: 'v2' },
+          ]
+        },
+        {
+          id: 'D1',
+          values: [
+            { id: 'v0' },
+            { id: 'v1', hasAdvancedAttributes: true },
+            { id: 'v2' },
+          ]
+        },
+        {
+          id: 'D2',
+          values: [
+            { id: 'v0' },
+            { id: 'v1' },
+            { id: 'v2' },
+          ]
+        }
+      ]
+    };
+
+    const indexes = [0, 1, -2];
+
+    const previous = { D0: { id: 'v0' }, D1: { id: 'v0' }, D2: { id: 'v2' } };
+
+    expect(getCombinationDimensionsData(indexes, combination, previous, true)).to.deep.equal({
+      dimValues: { D0: { id: 'v0' }, D1: { id: 'v1', hasAdvancedAttributes: true }, D2: { id: 'v2' } },
+      sameSerie: false,
+      coordinates: { D0: 'v0', D1: 'v1', D2: 'v2' },
+      ids: ['D0=v0', 'D1=v1', 'D2=v2'],
+      hasAdvancedAttributes: true
+    });
+  });
+});