@sis-cc/dotstatsuite-components 21.1.0 → 21.3.0

package/dist/dotstatsuite-components.js

@@ -61,7 +61,7 @@ import getISOWeek from "date-fns/get_iso_week";
 import makeStyles from "@mui/styles/makeStyles";
 import { useTheme } from "@mui/material/styles";
 const name$1 = "@sis-cc/dotstatsuite-components";
-const version$1 = "21.1.0";
+const version$1 = "21.3.0";
 const meta$1 = {
   name: name$1,
   version: version$1
@@ -4034,7 +4034,7 @@ const getMetadataCoordinates = (sdmxJson) => {
             return acc;
           }
           const dim = nth$1(dimIndex, dimensions);
-          if (isNil$1(dim)) {
+          if (isNil$1(dim) || prop$1("rejected", dim)) {
             return acc;
           }
           const val = path$1(["values", Number(vIndex)], dim);
@@ -4555,7 +4555,7 @@ const getManyValuesDimensions = (dimensions, attributesSeries, customAttributes,
   const combConceptsIds = pipe$1(pluck$1("concepts"), unnest$1)(combinations);
   return reduce$1(
     (acc, dim) => {
-      if (dim.header || !length$3(dim.values)) {
+      if (dim.header || dim.rejected) {
         return acc;
       }
       const enhancedValues = map$2((val) => {
@@ -4881,57 +4881,61 @@ const getLayoutPivots = (layoutEntry) => {
     layoutEntry
   );
 };
-const comparator$1 = (a, b) => {
-  const size2 = length$3(a);
+const comparator$1 = (firstSerie, secondSerie) => {
+  const firstIndexes = firstSerie.indexes;
+  const secondIndexes = secondSerie.indexes;
+  const size2 = length$3(firstIndexes);
   let i = 0;
   while (i < size2) {
-    if (is$1(Array, a[i])) {
-      const _a = a[i];
-      const _b = b[i];
-      const _size = length$3(_a);
+    if (is$1(Array, firstIndexes[i])) {
+      const firstSubIndexes = firstIndexes[i];
+      const secondSubIndexes = secondIndexes[i];
+      const _size = length$3(firstSubIndexes);
       let j = 0;
-      while (_a[j] === _b[j] && j < _size) {
+      while (firstSubIndexes[j] === secondSubIndexes[j] && j < _size) {
         j++;
       }
-      if (_a[j] !== _b[j]) {
-        return _a[j] - _b[j];
+      if (firstSubIndexes[j] !== secondSubIndexes[j]) {
+        return firstSubIndexes[j] - secondSubIndexes[j];
       }
-    } else if (a[i] !== b[i]) {
-      return a[i] - b[i];
+    } else if (firstIndexes[i] !== secondIndexes[i]) {
+      return firstIndexes[i] - secondIndexes[i];
     }
     i++;
   }
-  return a[i] - b[i];
+  return firstIndexes[i] - secondIndexes[i];
 };
-const uniqIndexes = (indexes) => pipe$1(
+const uniqIndexes = pipe$1(
   reduce$1(
-    (acc, i) => {
-      const key = join$1(":", unnest$1(i));
-      if (has$8(key, acc.keys)) {
-        return acc;
-      }
-      return {
-        indexes: append$1(i, acc.indexes),
-        keys: assoc$1(key, key, acc.keys)
-      };
+    (acc, { indexes, rejected }) => {
+      const key = join$1(":", unnest$1(indexes));
+      if (has$8(key, acc)) {
+        return over$1(
+          lensPath$1([key, "rejected"]),
+          addIndex$1(map$2)((v, i) => v === nth$1(i, rejected) ? v : null)
+        )(acc);
+      }
+      return assoc$1(key, { indexes, rejected, key }, acc);
     },
-    { indexes: [], keys: {} }
+    {}
   ),
-  prop$1("indexes")
-)(indexes);
-const getSortedLayoutIndexes = (layout, observations) => {
+  values$1
+);
+const getSortedLayoutIndexes = (layout, observations, rejectedDims = []) => {
   const dimIndexes = pipe$1(values$1, map$2(propOr$1([], "orderedDimIndexes")))(observations);
   const headerPivots = getLayoutPivots(layout.header);
   const sectionsPivots = getLayoutPivots(concat$1(layout.sections, layout.rows));
+  const rejectedPivots = getLayoutPivots(rejectedDims);
   const sectionLength = length$3(layout.sections);
   const { header: header2, sections } = pipe$1(
     reduce$1(
       (acc, indexes) => {
         const headerIndexes = headerPivots(indexes);
         const sectionsIndexes = sectionsPivots(indexes);
+        const rejectedIndexes = rejectedPivots(indexes);
         return {
-          header: append$1(headerIndexes, acc.header),
-          sections: append$1(sectionsIndexes, acc.sections)
+          header: append$1({ indexes: headerIndexes, rejected: rejectedIndexes }, acc.header),
+          sections: append$1({ indexes: sectionsIndexes, rejected: rejectedIndexes }, acc.sections)
         };
       },
       { header: [], sections: [] }
@@ -4944,16 +4948,26 @@ const getSortedLayoutIndexes = (layout, observations) => {
     (indexes) => ({
       ...indexes,
       sections: reduce$1(
-        (acc, i) => {
-          const [sectionIndexes, rowIndexes] = splitAt$1(sectionLength, i);
-          const previousSecIndexes = pipe$1(nth$1(-1), (i2) => isNil$1(i2) ? null : head$1(i2))(acc);
-          if (equals$1(unnest$1(sectionIndexes), previousSecIndexes ? unnest$1(previousSecIndexes) : null)) {
+        (acc, { indexes: indexes2, rejected, key }) => {
+          const [sectionIndexes, rowIndexes] = splitAt$1(sectionLength, indexes2);
+          const sectionKey = join$1(":", sectionIndexes);
+          const previousSecKey = pipe$1(nth$1(-1), (v) => isNil$1(v) ? null : head$1(v).key)(acc);
+          if (equals$1(sectionKey, previousSecKey)) {
             return over$1(
               lensIndex$1(-1),
-              over$1(lensIndex$1(1), append$1(rowIndexes))
+              pipe$1(
+                over$1(lensIndex$1(1), append$1({ indexes: rowIndexes, rejected, key })),
+                over$1(lensIndex$1(0), (v) => ({
+                  ...v,
+                  rejected: addIndex$1(map$2)((val, i) => val === nth$1(i, rejected) ? val : null, v.rejected)
+                }))
+              )
             )(acc);
           }
-          return append$1([sectionIndexes, [rowIndexes]], acc);
+          return append$1([
+            { indexes: sectionIndexes, rejected, key: sectionKey },
+            [{ indexes: rowIndexes, rejected, key }]
+          ], acc);
         },
         [],
         indexes.sections
@@ -5300,6 +5314,9 @@ const getCoordinates = (indexes, topCoordinates, definition) => addIndex$1(reduc
     }, acc, entry.dimensions);
   }
   const valInd = nth$1(index2, indexes);
+  if (isNil$1(valInd)) {
+    return acc;
+  }
   return assoc$1(entry.id, path$1(["values", Math.abs(valInd), "id"], entry), acc);
 }, topCoordinates, definition);
 const getAttributesSeries = (validator, attributesSeries) => reduce$1((acc, attrs) => {
@@ -5381,9 +5398,10 @@ const getSerieDimensionsData = (serie2, definition, attributesValues, missingPar
   { data: [], key: "", attributes: attributesValues },
   definition
 );
-const getSerieDataWithMissingLines = (serie2, definition, topCoordinates, attributesSeries, customAttributes, metadataCoordinates) => {
+const getSerieDataWithMissingLines = (serie2, definition, topCoordinates, attributesSeries, customAttributes, metadataCoordinates, rejectedDims = []) => {
   const lines2 = [];
-  const serieCoordinates = getCoordinates(serie2.indexes, topCoordinates, definition);
+  const coordinates2 = getCoordinates(serie2.indexes, topCoordinates, definition);
+  const serieCoordinates = getCoordinates(serie2.rejected || [], coordinates2, rejectedDims);
   const coordinatesValidator = getLayoutCoordinatesValidator(serieCoordinates, topCoordinates);
   const attributesValues = getAttributesSeries(coordinatesValidator, attributesSeries);
   const getMissingParents = (dataSetter) => (missingParentsIndexes, _parentsIndexes, dim, serieData2) => reduce$1(
@@ -5397,12 +5415,13 @@ const getSerieDataWithMissingLines = (serie2, definition, topCoordinates, attrib
   );
   const { attributes, ...serieData } = getSerieDimensionsData(serie2, definition, attributesValues, getMissingParents);
   const topCoordinatesValidator = getLayoutCoordinatesValidator(topCoordinates);
-  const flagsValidator = (coordinates2) => coordinatesValidator(coordinates2) && !topCoordinatesValidator(coordinates2);
+  const flagsValidator = (coordinates22) => coordinatesValidator(coordinates22) && !topCoordinatesValidator(coordinates22);
   const { flags, sideProps } = getSerieFlagsAndSideProps(serieCoordinates, flagsValidator, attributes, customAttributes, metadataCoordinates, serieData.data);
   return append$1({ ...serieData, flags, sideProps, coordinates: serieCoordinates }, lines2);
 };
-const getSerieDataWithoutMissingLines = (serie2, definition, topCoordinates, attributesSeries, customAttributes, metadataCoordinates) => {
-  const serieCoordinates = getCoordinates(serie2.indexes, topCoordinates, definition);
+const getSerieDataWithoutMissingLines = (serie2, definition, topCoordinates, attributesSeries, customAttributes, metadataCoordinates, rejectedDims = []) => {
+  const coordinates2 = getCoordinates(serie2.indexes, topCoordinates, definition);
+  const serieCoordinates = getCoordinates(serie2.rejected || [], coordinates2, rejectedDims);
   const coordinatesValidator = getLayoutCoordinatesValidator(serieCoordinates, topCoordinates);
   const attributesValues = getAttributesSeries(coordinatesValidator, attributesSeries);
   const getMissingParents = () => (missingParentsIndexes, _parentsIndexes, dim) => reduce$1(
@@ -5417,19 +5436,19 @@ const getSerieDataWithoutMissingLines = (serie2, definition, topCoordinates, att
   const { flags, sideProps } = getSerieFlagsAndSideProps(serieCoordinates, coordinatesValidator, attributes, customAttributes, metadataCoordinates, serieData.data);
   return { ...serieData, flags, sideProps, coordinates: serieCoordinates };
 };
-const getLayoutData = (layoutIndexes, layout, { metadataCoordinates, attributesSeries, customAttributes, topCoordinates = {} }) => {
+const getLayoutData = (layoutIndexes, layout, { metadataCoordinates, attributesSeries, customAttributes, topCoordinates = {}, rejectedDimensions = [] }) => {
   const { header: header2, sections, ...rest } = layoutIndexes;
   const headerData = reduce$1((acc, serie2) => {
-    const datas = getSerieDataWithMissingLines(serie2, layout.header, topCoordinates, attributesSeries, customAttributes, metadataCoordinates);
+    const datas = getSerieDataWithMissingLines(serie2, layout.header, topCoordinates, attributesSeries, customAttributes, metadataCoordinates, rejectedDimensions);
     return concat$1(acc, datas);
   }, [], header2);
   const sectionsData = map$2(
     ([sectionSerie, rowsSeries]) => {
-      const sectionData = getSerieDataWithoutMissingLines(sectionSerie, layout.sections, topCoordinates, attributesSeries, customAttributes, metadataCoordinates);
+      const sectionData = getSerieDataWithoutMissingLines(sectionSerie, layout.sections, topCoordinates, attributesSeries, customAttributes, metadataCoordinates, rejectedDimensions);
       return [
         sectionData,
         reduce$1((acc, serie2) => {
-          const datas = getSerieDataWithMissingLines(serie2, layout.rows, propOr$1(topCoordinates, "coordinates", sectionData), attributesSeries, customAttributes, metadataCoordinates);
+          const datas = getSerieDataWithMissingLines(serie2, layout.rows, propOr$1(topCoordinates, "coordinates", sectionData), attributesSeries, customAttributes, metadataCoordinates, rejectedDimensions);
           return concat$1(acc, datas);
         }, [], rowsSeries)
       ];
@@ -5768,6 +5787,7 @@ const prepareData$1 = (sdmxJson, { customAttributes, locale, hierarchies, datafl
   const attributesSeries = getAttributesSeries$1(enhancedObservations);
   const manyValuesDimensions = getManyValuesDimensions(refinedDimensions, attributesSeries, customAttributes, seriesCombinations);
   const oneValueDimensions = getOneValueDimensions(refinedDimensions, parsedAttributes);
+  const rejectedDimensions = filter$1(prop$1("rejected", dimensions));
   const headerCoordinates = getHeaderCoordinates(oneValueDimensions);
   const hierarchisedDimensions = map$2((dim) => {
     if (isEmpty$1(propOr$1({}, dim.id, hierarchies))) {
@@ -5788,6 +5808,7 @@ const prepareData$1 = (sdmxJson, { customAttributes, locale, hierarchies, datafl
     attributesSeries,
     metadataCoordinates,
     attributes: refinedAttributes,
+    rejectedDimensions,
     header: {
       title: headerTitle,
       subtitle: headerSubtitle,
@@ -5867,10 +5888,10 @@ const parseSerieIndexesHierarchies = (serieIndexes, previousSerie, dimensions, i
   }, { parentsIndexes: [], missingIndexes: [], isSameSerie }, serieIndexes);
 };
 const parseSeriesIndexesHierarchies = (seriesIndexes, dimensions, replicateMissing = false) => {
-  return reduce$1((acc, serieIndexes) => {
+  return reduce$1((acc, { indexes, ...rest }) => {
     const previousSerie = last$1(acc) || {};
-    const { isSameSerie, ...parsed } = parseSerieIndexesHierarchies(serieIndexes, previousSerie, dimensions, true, replicateMissing);
-    return append$1(assoc$1("indexes", serieIndexes, parsed), acc);
+    const { isSameSerie, ...parsed } = parseSerieIndexesHierarchies(indexes, previousSerie, dimensions, true, replicateMissing);
+    return append$1({ indexes, ...parsed, ...rest }, acc);
   }, [], seriesIndexes);
 };
 const parseLayoutIndexesHierarchies = (layoutIndexes, layout) => {
@@ -5897,7 +5918,8 @@ const getTableProps = ({ data, layoutIds, customAttributes, limit, isTimeInverte
     attributesSeries,
     metadataCoordinates,
     attributes,
-    header: header2
+    header: header2,
+    rejectedDimensions = []
   } = data;
   const obsAttributes = filter$1(
     (a) => a.series && isEmpty$1(a.relationship) && a.display && !a.combined,
@@ -5928,13 +5950,19 @@ const getTableProps = ({ data, layoutIds, customAttributes, limit, isTimeInverte
     }
     return append$1(entry.id, acc);
   }, []), layout);
-  const layoutIndexes = getSortedLayoutIndexes(layout, dupObs);
+  const layoutIndexes = getSortedLayoutIndexes(layout, dupObs, rejectedDimensions);
   const enhancedLayoutIndexes = parseLayoutIndexesHierarchies(
     layoutIndexes,
     layout
   );
   const refinedLayoutIndexes = refineLayoutSize({ layout, observations: dupObs, limit })(enhancedLayoutIndexes);
-  const layoutData = getLayoutData(refinedLayoutIndexes, layout, { metadataCoordinates, attributesSeries, customAttributes, topCoordinates: header2.coordinates });
+  const layoutData = getLayoutData(refinedLayoutIndexes, layout, {
+    metadataCoordinates,
+    attributesSeries,
+    customAttributes,
+    topCoordinates: header2.coordinates,
+    rejectedDimensions
+  });
   const cellsAttributesIds = getCellsAttributesIds(layoutDimsIds, attributes);
   const indexedCombinations = getIndexedCombinationsByDisplay(layout, seriesCombinations);
   const cellsMetadataCoordinates = getCellsMetadataCoordinates(metadataCoordinates, oneValueDimensions, layoutDimsIds);
@@ -6715,10 +6743,11 @@ const dataTransformer = (dataNew, options2 = {}) => {
       return {
         observation: append$1({
           ...observation2,
+          rejected: isAllDimHidden || isEmpty$1(values4),
           display: !isHidden,
           __index: obsIndex,
           name: getName2(observation2),
-          values: isAllDimHidden ? [] : values4,
+          values: values4,
           role: isTimeDimension ? TIME_PERIOD_ID : head$1(propOr$1([], "roles", observation2))
         })(acc.observation),
         dimensionsLayout: setAnnotationsLayout(

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sis-cc/dotstatsuite-components",
   "description": "Set components based on React.",
-  "version": "21.1.0",
+  "version": "21.3.0",
   "type": "module",
   "module": "./dist/dotstatsuite-components.js",
   "files": [