@sis-cc/dotstatsuite-components 9.3.5 → 12.0.0

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

@@ -1,6 +1,7 @@
 import * as R from 'ramda';
 import { getFlags } from './getCells';
 import { dimensionValueDisplay } from '../../dimension-utils';
+import { hasCellMetadata } from '../../../../rules2/src/hasCellMetadata';
 
 export const getLayoutSerieAttributes  = (layoutSerie, seriesAttributes) => {
   const length = R.length(layoutSerie);
@@ -72,15 +73,39 @@ const getSerieKey = R.pipe(R.reduce(
   []
 ), R.join(':'));
 
-export const getLayoutDataWithFlags = (seriesAttributes, display, customAttributes) => {
-  const formatSublayout = getAttributes => R.converge(
-    (data, key, flags) => ({ data, key, flags }),
-    [
-      getSublayoutDataCells(display, customAttributes),
-      getSerieKey,
-      R.pipe(getAttributes, getFlagsFromSeriesAttributes(display, customAttributes))
-    ]
-  );
+const getCoordinates = (data, unitsId) => R.reduce(
+  (acc, entry) => {
+    const dimId = R.path(['dimension', 'id'], entry);
+    const valId = R.path(['value', 'id'], entry);
+    if (dimId === unitsId) {
+      return acc;
+    }
+    return R.assoc(dimId, valId, acc);
+  },
+  {},
+  data
+);
+
+export const getLayoutDataWithFlags = (seriesAttributes, display, customAttributes, metadataCoordinates, unitsId) => {
+  const regularAttrsIds = R.concat(customAttributes.flags || [], customAttributes.footnotes || []);
+  const formatSublayout = (getAttributes, supplData = []) => data => {
+    const attributes = getAttributes(data);
+    const key = getSerieKey(data);
+    const cells = getSublayoutDataCells(display, customAttributes)(data);
+    const flags = getFlagsFromSeriesAttributes(display, customAttributes)(attributes);
+    const coordinates = getCoordinates(R.concat(supplData, data), unitsId);
+    const hasMetadata = hasCellMetadata(metadataCoordinates, coordinates);
+    const advancedAttributesSeries = R.isNil(attributes)
+      ? {}
+      : R.filter(
+        serie => !R.isEmpty(R.omit(regularAttrsIds, R.propOr({}, 'attributes', serie))),
+        attributes
+      );
+    const hasAdvancedAttributes = !R.isEmpty(advancedAttributesSeries);
+    const sideProps = hasMetadata || hasAdvancedAttributes ? { hasAdvancedAttributes, hasMetadata, coordinates } : null;
+
+    return ({ data: cells, key, flags, sideProps });
+  };
 
   return R.evolve({
   headerData: R.map(formatSublayout(data => getLayoutSerieAttributes(data, seriesAttributes))),
@@ -91,7 +116,8 @@ export const getLayoutDataWithFlags = (seriesAttributes, display, customAttribut
       return ([
         formatSublayout(() => sectionAttributes)(sectionSerie),
         R.map(
-          formatSublayout(rowData => getLayoutSerieAttributes(R.concat(sectionSerie, rowData), R.omit(R.keys(sectionAttributes), seriesAttributes)))
+          formatSublayout(rowData => getLayoutSerieAttributes(R.concat(sectionSerie, rowData), R.omit(R.keys(sectionAttributes), seriesAttributes)),
+          sectionSerie)
         )(R.last(sectionData))
       ]);
     }

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

@@ -13,6 +13,7 @@ import { cleanUnitsInLayoutData } from '../units/cleanUnitsInLayoutData';
 import { getSortedLayoutIndexes } from './getSortedLayoutIndexes';
 import { refineLayoutSize } from './refineLayoutSize';
 import { getLayoutData } from './getLayoutData';
+import { refineMetadataCoordinates } from '../../../../rules2/src/refineMetadataCoordinates';
 
 export const getTableProps = ({ data, layoutIds, display, customAttributes, limit, isTimeInverted }) => {
   const seriesAttributes = R.propOr({}, 'seriesAttributes', data);
@@ -22,6 +23,12 @@ export const getTableProps = ({ data, layoutIds, display, customAttributes, limi
     layoutIds
   );
 
+  const headerDimensionsIds = R.pluck('id',
+      R.concat(R.pathOr([], ['units', 'headerUnits'], data), R.values(R.pathOr({}, ['dimensions', 'one'], data)))
+  );
+
+  const refinedMetadataCoordinates = refineMetadataCoordinates(data.metadataCoordinates, layoutIds, headerDimensionsIds);
+
   const {
     rejectedValueIds,
     unitDimension,
@@ -45,7 +52,8 @@ export const getTableProps = ({ data, layoutIds, display, customAttributes, limi
       unitsDefinitionCodes, unitsSeries, unitsDisplay: unitsLevelDisplay,
       unitDimension, rejectedValueIds, layoutDimsIds
     },
-    data.observationsType
+    refinedMetadataCoordinates.cells,
+    data.observationsType,
   );
 
   const dimensions = R.mapObjIndexed(
@@ -89,9 +97,10 @@ export const getTableProps = ({ data, layoutIds, display, customAttributes, limi
       unitsDefinitionCodes, unitsIndexes: unitsAttachmentIndexesInLayout,
       partialUnitSerieIndexes, rejectedValueIds, layoutIds
     }),
-    getLayoutDataWithFlags(seriesAttributesValues, display, customAttributes),
-    cleanUnitsInLayoutData({ unitsDisplay: unitsLevelDisplay, unitsLayoutIndexes: unitsIndexesInLayout })
+    getLayoutDataWithFlags(seriesAttributesValues, display, customAttributes, refinedMetadataCoordinates.layout, unitDimension.id),
+    cleanUnitsInLayoutData({ unitsDisplay: unitsLevelDisplay, unitsLayoutIndexes: unitsIndexesInLayout }),
   )(layout, R.propOr({}, 'observations', data));
+  
   return ({
     cells: getCuratedCells({ layout, observations: cells, shape: ['header', 'sections', 'rows'] }),
     layout,

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

@@ -21,6 +21,13 @@ import { getDisplay } from '../../preparators/getDisplay';
 import { getObservations } from '../../preparators/getObservations';
 import { enhanceObservations } from '../../preparators/enhanceObservations';
 
+import { getMetadataCoordinates } from '../../../../rules2/src/getMetadataCoordinates';
+import {
+  getDataflowAdvancedAttributes,
+  getObservationsAdvancedAttributes,
+  getSeriesAdvancedAttributes
+} from '../../../../rules2/src/getAdvancedAttributes';
+
 export const prepareData = (sdmxJson, customAttributes, unitsProps={}) => {
   const {
     defaultCodes=[],
@@ -127,10 +134,42 @@ export const prepareData = (sdmxJson, customAttributes, unitsProps={}) => {
     attributesIndexedByIds,
   );
 
-  const seriesAttributesValues = refineSeriesAttributesValues(
-    dimensionsAttributesValues.series,
-    attributesIndexedByIds,
+  const seriesAttributesValues = R.map(
+    series => refineSeriesAttributesValues(series, attributesIndexedByIds),
+    dimensionsAttributesValues
+  );
+
+  const metadataCoordinates = getMetadataCoordinates(sdmxJson);
+  const headerAttributesIds = R.concat(attributesIdsIndexedByTargets.dataflow || [], attributesIdsIndexedByTargets.oneValueDimensions || []);
+  const headerAttributes = R.pick(headerAttributesIds, attributesIndexedByIds);
+  const headerAdvancedAttrIds = R.pipe(
+    R.filter(id => !R.includes(id, customAttributes.flags || []) && !R.includes(id, customAttributes.footnotes || [])),
+  )(headerAttributesIds);
+
+  const dataflowAdvancedAttributes = getDataflowAdvancedAttributes(
+    headerAttributes,
+    oneValueDimensions,
+    headerAdvancedAttrIds,
+    R.length(dimensions)
+  );
+
+  const observationsAdvancedAttributesIds = R.filter(
+    id => !R.includes(id, customAttributes.flags || []) && !R.includes(id, customAttributes.footnotes || []),
+    attributesIdsIndexedByTargets.observations || []
   );
+  const observationsAdvancedAttributes = getObservationsAdvancedAttributes(observations, observationsAdvancedAttributesIds);
+
+  const seriesAdvancedAttributesIds = R.filter(
+    id => !R.includes(id, customAttributes.flags || []) && !R.includes(id, customAttributes.footnotes || []),
+    R.concat(attributesIdsIndexedByTargets.series || [], attributesIdsIndexedByTargets.manyValuesDimensions || [])
+  );
+
+  const seriesAdvancedAttributes = getSeriesAdvancedAttributes(
+    seriesAttributesValues,
+    dimensions,
+    seriesAdvancedAttributesIds
+  );
+
   return ({
     dimensions: {
       one: oneValueDimensions,
@@ -144,11 +183,13 @@ export const prepareData = (sdmxJson, customAttributes, unitsProps={}) => {
       unitsAttachmentSeriesIds,
       unitsSeries,
     },
+    metadataCoordinates,
+    advancedAttributes: { ...dataflowAdvancedAttributes, ...observationsAdvancedAttributes, ...seriesAdvancedAttributes },
     observations,
     observationsType: getObservationsType(sdmxJson.data),
     dataflowAttributes,
     dataflowName: R.path(['data', 'structure', 'name'], sdmxJson),
     seriesAttributes: R.props(seriesAttributesIds, attributesIndexedByIds),
-    seriesAttributesValues
+    seriesAttributesValues: seriesAttributesValues.series || {}
   });
 };

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

@@ -95,22 +95,17 @@ export const dataTransformer = (dataNew, options = {}) => {
   const getAttrObservations = R.propOr([], 'observation');
   const attrObservations = getAttrObservations(attributes);
 
-  const getAttrDataset = R.propOr([], 'dataset')
-  const attrDataset = getAttrDataset(attributes);
-
-  const mergeAttr = R.concat(attrDataset, attrObservations);
-
   const resAttrObservations = R.map((observation) => ({
     ...observation,
     name: getLocalisedProp('names', observation),
-    values: getValues(observation.values),
+    values: getValues(observation.values || []),
     roles: !R.isNil(observation.role) ? R.head(observation.role) : null,
-  }), mergeAttr);
+  }), attrObservations);
 
   const resAttributes = {
     ...attributes,
     observation: resAttrObservations,
-  }
+  };
 
 //----------------------------------------------------------------------------------------Dimensions
   const getDimensions = R.propOr({}, 'dimensions');

package/src/rules2/src/constants.js

@@ -0,0 +1,2 @@
+export const SDMX_3_0_JSON_DATA_FORMAT = 'application/vnd.sdmx.data+json;version=2.0';
+export const SDMX_3_0_CSV_DATA_FORMAT = 'application/vnd.sdmx.data+csv;version=2.0';

package/src/rules2/src/getAdvAttrSeriesAtCoordinates.js

@@ -0,0 +1,29 @@
+import * as R from 'ramda';
+
+const attribueValueDisplay = (display) => data => {
+  if (display === 'code') {
+    return R.prop('id', data);
+  }
+  if (display ===  'both') {
+    return `${R.prop('id', data)}: ${R.prop('name', data)}`;
+  }
+  return R.prop('name', data);
+};
+
+export const getAdvAttrSeriesAtCoordinates = (coordinates, advancedAttributes, display) => R.pipe(
+  R.filter(serie => {
+    const mergedCoord = R.mergeLeft(serie.coordinates, coordinates);
+    return R.equals(mergedCoord, coordinates);
+  }),
+  R.map(serie => {
+    return R.pipe(
+      R.propOr({}, 'attributes'),
+      R.values,
+      R.map(attribute => ({
+        id: attribute.id,
+        label: attribueValueDisplay(display)(attribute),
+        value: attribueValueDisplay(display)(attribute.value)
+      }))
+    )(serie);
+  }),
+)(advancedAttributes);

package/src/rules2/src/getAdvancedAttributes.js

@@ -0,0 +1,113 @@
+import * as R from 'ramda';
+
+export const getObservationsAdvancedAttributes = (observations, advancedAttributesIds) => R.pipe(
+  R.map(obs => ({ attributes: R.pick(advancedAttributesIds, obs.attributes || {}), coordinates: obs.indexedDimValIds || {} })),
+  R.filter(entry => !R.isEmpty(entry.attributes))
+)(observations);
+
+export const getDataflowAdvancedAttributes = (attributes, dimensions, advancedAttributesIds, dimLength) => {
+  const advancedAttributes = R.pick(advancedAttributesIds, attributes);
+  const keyTemplate = R.times(R.always(''), dimLength);
+  return R.reduce(
+    (acc, attribute) => {
+      const value = R.head(attribute.values || []);
+      const attr = { ...R.pick(['id', 'name'], attribute), value };
+      let coordinates = {};
+      let key = keyTemplate;
+
+      if (!R.isEmpty(R.pathOr([], ['relationship', 'dimensions'], attribute))) {
+        const attrDimensionsIds = R.pathOr([], ['relationship', 'dimensions'], attribute);
+        const attrDimensions = R.props(attrDimensionsIds, dimensions);
+        R.forEach(
+          dim => {
+            const dId = dim.id;
+            const dIndex = dim.__index;
+            const vId = R.path(['values', 0, 'id'], dim);
+            coordinates = { ...coordinates, [dId]: vId };
+            key = R.set(R.lensIndex(dIndex), 0)(key);
+          },
+          attrDimensions
+        );
+      }
+
+      key = R.join(':', key);
+      return R.over(
+        R.lensProp(key),
+        entry => R.isNil(entry)
+          ? ({ attributes: { [attribute.id]: attr }, coordinates })
+          : R.over(R.lensProp('attributes'), R.assoc(attribute.id, attr))(entry)
+      )(acc);
+    },
+    {},
+    R.values(advancedAttributes)
+  )
+};
+
+/*
+{
+  series: {
+    '0:0:x:x:x': { attributes: { a2: { id, value } } }
+  },
+  dimensions: {
+    '3:0': { attributes: { a1: { id, value } } },
+  }
+}
+
+*/
+
+export const getSeriesAdvancedAttributes = (seriesAttributes, dimensions, advancedAttributesIds) => {
+  const seriesAdvancedAttributes = R.pipe(
+    R.propOr({}, 'series'),
+    series => R.reduce(
+      (acc, key) => {
+        const serie = series[key];
+        const advancedAttributes = R.pick(advancedAttributesIds, serie.attributes);
+        if (R.isEmpty(advancedAttributes)) {
+          return acc;
+        }
+        const splitKey = R.split(':', key); 
+        const { coordinates, refinedKey } = R.addIndex(R.reduce)(
+          (acc, vInd, dInd) => {
+            if (vInd === 'x') {
+              return ({ ...acc, refinedKey: R.append('', acc.refinedKey) });
+            }
+            const _refined = R.append(vInd, acc.refinedKey);
+            const dim = R.nth(dInd, dimensions);
+            const valId = R.path(['values', Number(vInd), 'id'], dim);
+            const _coordinates = R.assoc(dim.id, valId, acc.coordinates);
+            return ({ coordinates: _coordinates, refinedKey: _refined });
+          },
+          { coordinates: {}, refinedKey: [] },
+          splitKey
+        );
+        return R.assoc(R.join(':', refinedKey), { attributes: advancedAttributes, coordinates }, acc);
+      },
+      {},
+      R.keys(series)
+    )
+  )(seriesAttributes);
+  const keyTemplate = R.map(R.always(''), dimensions);
+  const dimensionsAdvancedAttributes = R.pipe(
+    R.propOr({}, 'dimensions'),
+    series => R.reduce(
+      (acc, key) => {
+        const serie = series[key];
+        const advancedAttributes = R.pick(advancedAttributesIds, serie.attributes);
+        if (R.isEmpty(advancedAttributes)) {
+          return acc;
+        }
+        const [dInd, vInd] = R.split(':', key);
+        const dim = R.nth(Number(dInd), dimensions);
+        const valId = R.path(['values', Number(vInd), 'id'], dim);
+        const coordinates = { [dim.id]: valId };
+        let refinedKey = keyTemplate;
+        refinedKey[Number(dInd)] = vInd;
+        return R.assoc(R.join(':', refinedKey), { attributes: advancedAttributes, coordinates }, acc);
+      },
+      {},
+      R.keys(series)
+    )
+  )(seriesAttributes);
+
+  return R.merge(seriesAdvancedAttributes, dimensionsAdvancedAttributes);
+};

package/src/rules2/src/getMetadataCoordinates.js

@@ -0,0 +1,37 @@
+import * as R from 'ramda';
+
+export const getMetadataCoordinates = (sdmxJson) => {
+  const dimensions = R.pathOr([], ['data', 'structure', 'dimensions', 'observation'], sdmxJson);
+  const annotations = R.pathOr([], ['data', 'structure', 'annotations'], sdmxJson);
+  const metadataAvailKeys = R.pipe(
+    R.pathOr([], ['data', 'dataSets', 0, 'dimensionGroupAttributes']),
+    R.map(indexes => R.props(indexes, annotations)),
+    R.filter(R.find(R.propEq('type', 'HAS_METADATA'))),
+    R.keys
+  )(sdmxJson);
+
+  return R.map(
+    key => {
+      const indexes = R.split(':', key);
+      return R.addIndex(R.reduce)(
+        (acc, vIndex, dimIndex) => {
+          if (R.isNil(vIndex) || R.isEmpty(vIndex)) {
+            return acc;
+          }
+          const dim = R.nth(dimIndex, dimensions);
+          if (R.isNil(dim)) {
+            return acc;
+          }
+          const val = R.path(['values', Number(vIndex)], dim);
+          if (R.isNil(val)) {
+            return acc;
+          }
+          return R.assoc(dim.id, val.id, acc);
+        },
+        {},
+        indexes
+      );
+    },
+    metadataAvailKeys
+  );
+};

package/src/rules2/src/getMetadataStructureFromData.js

@@ -0,0 +1,17 @@
+import * as R from 'ramda';
+
+export const getDataflowMetadataStructure = sdmxJson => {
+  const annotations = R.pathOr([], ['data', 'stucture', 'annotations'], sdmxJson);
+  const dataSetAnnotIndexes = R.pathOr([], ['data', 'dataSets', 0, 'annotations'], sdmxJson);
+  const dataSetAnnotations = R.props(dataSetAnnotIndexes, annotations);
+  const metadataAnnotation = R.find(R.propEq('type', 'METADATA'), dataSetAnnotations);
+  if (!metadataAnnotation) {
+    return null;
+  }
+  return R.pipe(
+    R.propOr('', 'title'),
+    R.split('='),
+    R.last,
+    
+  )(metadataAnnotation);
+};

package/src/rules2/src/getSidebarData.js

@@ -0,0 +1,73 @@
+import * as R from 'ramda';
+
+const dimensionValueDisplay = (display) => data => {
+  if (display === 'code') {
+    return R.prop('id', data);
+  }
+  if (display ===  'both') {
+    return `${R.prop('id', data)}: ${R.prop('name', data)}`;
+  }
+  return R.prop('name', data);
+};
+
+const sortByCoordinates = (a, b) => {
+  const splitACoord = a.splitCoord;
+  const splitBCoord = b.splitCoord;
+
+  const aWeight = R.pipe(R.reject(R.isEmpty), R.length)(splitACoord);
+  const bWeight = R.pipe(R.reject(R.isEmpty), R.length)(splitBCoord);
+  if (aWeight !== bWeight) {
+    return bWeight - aWeight;
+  }
+
+  let ind = 0;
+  while (splitACoord[ind] === splitBCoord[ind]) {
+    ind++;
+  }
+  const _a = R.isEmpty(splitACoord[ind]) ? 0 : Number(splitACoord[ind]);
+  const _b = R.isEmpty(splitBCoord[ind]) ? 0 : Number(splitBCoord[ind]);
+  return _b - _a;
+};
+
+// options = { display, attributesLabel }
+export const getSidebarData = (attributesSeries, metadataSeries, dataflow, dimensions, options) => {
+  const coordinates = R.uniq(R.concat(R.keys(attributesSeries), R.keys(metadataSeries)));
+  return R.pipe(
+    R.map(coordinate => {
+      const attributes = R.prop(coordinate, attributesSeries);
+      const metadata = R.prop(coordinate, metadataSeries);
+      const children = R.concat(
+        R.isNil(attributes) ? [] : [{ id: `${coordinate}-attr`, label: options.attributesLabel, children: attributes }],
+        R.isNil(metadata) ? [] : metadata,
+      );
+      const splitCoord = R.split(':', coordinate);
+      let label = null;
+      if (R.all(R.isEmpty, splitCoord)) {
+        label = dimensionValueDisplay(options.display)(dataflow);
+      }
+      else {
+        label = R.pipe(
+          R.addIndex(R.reduce)((acc, valIndex, dimIndex) => {
+            if (R.isEmpty(valIndex)) {
+              return acc;
+            }
+            const dim = R.nth(dimIndex, dimensions);
+            const dimLabel = dimensionValueDisplay(options.display)(dim);
+            const value = R.nth(Number(valIndex), dim.values);
+            const valLabel = dimensionValueDisplay(options.display)(value);
+            return R.append(`${dimLabel}: ${valLabel}`, acc);
+          }, []),
+          R.join(' - ')
+        )(splitCoord);
+      }
+
+      return ({
+        id: coordinate,
+        splitCoord,
+        label,
+        children: R.filter(R.identity, children),
+      });
+    }),
+    R.sort(sortByCoordinates)
+  )(coordinates);
+};

package/src/rules2/src/hasCellMetadata.js

@@ -0,0 +1,11 @@
+import * as R from 'ramda';
+
+export const hasCellMetadata = (metadataCoordinates, cellCoordinates) => {
+  return R.pipe(
+    R.find(coordinates => {
+      const mergedCoord = R.mergeLeft(coordinates, cellCoordinates);
+      return R.equals(mergedCoord, cellCoordinates);
+    }),
+    R.complement(R.isNil)
+  )(metadataCoordinates);
+};

package/src/rules2/src/hasLayoutEntryMetadata.js

@@ -0,0 +1,9 @@
+import * as R from 'ramda';
+
+/*
+const layoutData = [{ dimension: { id: 'D1', __index: 2 }, value: { id: 'V', __index: 0 } }];
+*/
+
+export const getLayoutEntryMetadataCoordinates = (layoutData, metadataSeries) => {
+  
+};

package/src/rules2/src/index.js

@@ -0,0 +1,8 @@
+export {
+  SDMX_3_0_JSON_DATA_FORMAT,
+  SDMX_3_0_CSV_DATA_FORMAT
+} from './constants';
+
+export { getSidebarData } from './getSidebarData';
+export { parseMetadataSeries } from './parseMetadataSeries';
+export { sdmx_3_0_DataFormatPatch } from './sdmx3.0DataFormatPatch';

package/src/rules2/src/parseMetadataSeries.js

@@ -0,0 +1,80 @@
+import * as R from 'ramda';
+import { getLocalisedName } from '@sis-cc/dotstatsuite-sdmxjs';
+
+const dimensionValueDisplay = (locale, display) => data => {
+  if (display === 'code') {
+    return R.prop('id', data);
+  }
+  if (display ===  'both') {
+    return `${R.prop('id', data)}: ${getLocalisedName(locale)(data)}`;
+  }
+  return getLocalisedName(locale)(data);
+};
+// options = { locale, display, dimensions = [] };
+export const parseMetadataSeries = (metadataJson, options) => {
+  const metadataAttributes = R.pathOr([], ['data', 'structures', 0, 'attributes', 'dimensionGroup'], metadataJson);
+  const metaAttrLength = R.length(metadataAttributes);
+
+  if (!metaAttrLength) {
+    return ({});
+  }
+
+  const dimensions = R.pipe(
+    R.pathOr([], ['data', 'structures', 0, 'dimensions']),
+    ({ series = [], observation = [] }) => R.concat(series, observation),
+    dims => R.isEmpty(options.dimensions || [])
+      ? dims
+      : R.props(R.pluck('id', options.dimensions), R.indexBy(R.prop('id'), dims))
+  )(metadataJson);
+
+  const metadataSeries = R.pipe(
+    R.pathOr({}, ['data', 'dataSets', 0, 'dimensionGroupAttributes']),
+    series => R.reduce((acc, serieKey) => {
+      const indexes = series[serieKey];
+      const metaIndexes = R.take(metaAttrLength, indexes);
+
+      const evolvedKey = R.pipe(
+        R.split(':'),
+        R.addIndex(R.map)((vInd, dInd) => {
+          if (R.isEmpty(vInd)) {
+            return vInd;
+          }
+          const dim = R.nth(dInd, dimensions);
+          const val = R.nth(Number(vInd), dim.values || []);
+
+          const originalVal = R.find(
+            R.propEq('id', val.id),
+          )(R.propOr([], 'values', R.nth(dInd, options.dimensions)));
+          return R.propOr('', '__index', originalVal);
+        }),
+        R.join(':')
+      )(serieKey)
+
+      const attributes = R.addIndex(R.reduce)(
+        (acc, valueIndex, attrIndex) => {
+          if (R.isNil(valueIndex)) {
+            return acc;
+          }
+          const attribute = R.nth(attrIndex, metadataAttributes);
+          const label = dimensionValueDisplay(options.locale, options.display)(attribute);
+
+          const value = R.prop('value', R.nth(valueIndex, attribute.values || []));
+
+          return R.append({
+            id: attribute.id,
+            label,
+            value: R.is(Object, value) ? R.prop(options.locale, value) : value
+          }, acc);
+        },
+        [],
+        metaIndexes
+      );
+
+      return R.assoc(evolvedKey, attributes, acc);
+    },
+    {},
+    R.keys(series)
+  ))(metadataJson);
+
+  return metadataSeries;
+};

package/src/rules2/src/refineMetadataCoordinates.js

@@ -0,0 +1,27 @@
+import * as R from 'ramda';
+
+export const refineMetadataCoordinates = (metadataCoordinates, layoutIds, headerDimensionsIds) => {
+  return R.reduce(
+    (acc, coordinates) => {
+      const refinedCoord = R.omit(headerDimensionsIds, coordinates);
+      if (R.isEmpty(refinedCoord)) {
+        return acc;
+      }
+      const removedHeaderCodes = R.omit(layoutIds.header, refinedCoord);
+      if (R.isEmpty(removedHeaderCodes)) {
+        return R.over(R.lensProp('layout'), R.append(refinedCoord))(acc);
+      }
+      const removedSectionCodes = R.omit(layoutIds.sections, refinedCoord);
+      if (R.isEmpty(removedSectionCodes)) {
+        return R.over(R.lensProp('layout'), R.append(refinedCoord))(acc);
+      }
+      const removedRowsCodes = R.omit(layoutIds.rows, removedSectionCodes);
+      if (R.isEmpty(removedRowsCodes)) {
+        return R.over(R.lensProp('layout'), R.append(refinedCoord))(acc);
+      }
+      return R.over(R.lensProp('cells'), R.append(refinedCoord))(acc);
+    }, 
+    { cells: [], layout: [] },
+    metadataCoordinates
+  );
+};

package/src/rules2/src/sdmx3.0DataFormatPatch.js

@@ -0,0 +1,9 @@
+import * as R from 'ramda';
+
+export const sdmx_3_0_DataFormatPatch = (sdmxJson) => {
+  const dataSet = R.pipe(R.pathOr({}, ['data', 'dataSets']), R.head)(sdmxJson);
+  const structureIndex = R.prop('structure', dataSet);
+  const structure = R.pipe(R.pathOr([], ['data', 'structures']), R.nth(structureIndex))(sdmxJson);
+
+  return R.set(R.lensPath(['data', 'structure']), structure)(sdmxJson);
+};