@sis-cc/dotstatsuite-components 21.4.0 → 21.6.0

package/dist/dotstatsuite-components.js

@@ -1,4 +1,4 @@
-import { get as get$2, isEmpty as isEmpty$2, isNil as isNil$2, reduce as reduce$2, has as has$9, sortBy as sortBy$2, map as map$3, head as head$2, split as split$2, omit as omit$2, keys as keys$2, each, isArray as isArray$1, find as find$2, findIndex as findIndex$1, reject as reject$2, filter as filter$2, includes as includes$2, isUndefined, fill, size, take as take$2, transform as transform$2, pick as pick$2, partition as partition$2, keyBy, flatten as flatten$3, compact, isEqual } from "lodash";
+import { get as get$2, isEmpty as isEmpty$2, isNil as isNil$2, reduce as reduce$2, has as has$9, sortBy as sortBy$2, map as map$3, head as head$2, split as split$2, omit as omit$2, keys as keys$2, each, isArray as isArray$1, findIndex as findIndex$2, fill, size, find as find$2, isUndefined, reject as reject$2, take as take$2, transform as transform$2, pick as pick$2, partition as partition$2, filter as filter$2, keyBy, includes as includes$2, flatten as flatten$3, compact, isEqual } from "lodash";
 import memoizee from "memoizee";
 import numeral from "numeral";
 import { isRefAreaDimension, isTimePeriodDimension, getTimePeriodDimension, getRefAreaDimension, getDataFrequency, getNotDisplayedCombinations, getCodeOrder } from "@sis-cc/dotstatsuite-sdmxjs";
@@ -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.4.0";
+const version$1 = "21.6.0";
 const meta$1 = {
   name: name$1,
   version: version$1
@@ -1542,6 +1542,44 @@ var find$1 = /* @__PURE__ */ _curry2$c(/* @__PURE__ */ _dispatchable$1(["find"],
     idx += 1;
   }
 }));
+var XFindIndex$1 = /* @__PURE__ */ function() {
+  function XFindIndex2(f, xf) {
+    this.xf = xf;
+    this.f = f;
+    this.idx = -1;
+    this.found = false;
+  }
+  XFindIndex2.prototype["@@transducer/init"] = _xfBase$1.init;
+  XFindIndex2.prototype["@@transducer/result"] = function(result) {
+    if (!this.found) {
+      result = this.xf["@@transducer/step"](result, -1);
+    }
+    return this.xf["@@transducer/result"](result);
+  };
+  XFindIndex2.prototype["@@transducer/step"] = function(result, input) {
+    this.idx += 1;
+    if (this.f(input)) {
+      this.found = true;
+      result = _reduced$1(this.xf["@@transducer/step"](result, this.idx));
+    }
+    return result;
+  };
+  return XFindIndex2;
+}();
+var _xfindIndex$1 = /* @__PURE__ */ _curry2$c(function _xfindIndex(f, xf) {
+  return new XFindIndex$1(f, xf);
+});
+var findIndex$1 = /* @__PURE__ */ _curry2$c(/* @__PURE__ */ _dispatchable$1([], _xfindIndex$1, function findIndex(fn, list) {
+  var idx = 0;
+  var len = list.length;
+  while (idx < len) {
+    if (fn(list[idx])) {
+      return idx;
+    }
+    idx += 1;
+  }
+  return -1;
+}));
 var XFindLastIndex$1 = /* @__PURE__ */ function() {
   function XFindLastIndex2(f, xf) {
     this.xf = xf;
@@ -2158,48 +2196,50 @@ function focus$3(series2, focusSelections) {
   return [{ ...serie2, datapoints: _datapoints }];
 }
 function dimensionValueIsValid(dimensionValue, chartDimension) {
-  return includes$2(
-    map$3(["x", "y"], (k2) => get$2(chartDimension, `${k2}Id`)),
-    get$2(dimensionValue, "id")
+  return includes$1(
+    prop$1("id", dimensionValue),
+    map$2((k2) => prop$1(`${k2}Id`, chartDimension), ["x", "y"])
   );
 }
 function getDimensionValues$2(dimensionValuesIndexes, dimensions, dimensionsWithValuesIndexedById2, chartDimensionId, display) {
-  const dimensionsWithValuesIds = keys$2(dimensionsWithValuesIndexedById2);
-  return reduce$2(
-    dimensionValuesIndexes,
-    (m, dvi, i) => {
-      const dimension = get$2(dimensions, `[${i}]`);
-      const dimensionId = get$2(dimension, "id");
-      const dimensionValue = get$2(dimension, `values[${dvi}]`);
-      if (dimensionId !== chartDimensionId && includes$2(dimensionsWithValuesIds, dimensionId)) {
-        m[dimensionId] = { ...dimensionValue, name: dimensionValueDisplay$1(display)(dimensionValue) };
+  const dimensionsWithValuesIds = keys$1(dimensionsWithValuesIndexedById2);
+  return addIndex$1(reduce$1)(
+    (acc, dvi, i) => {
+      const dimension = nth$1(i, dimensions);
+      const dimensionId = prop$1("id", dimension);
+      const dimensionValue = nth$1(dvi, propOr$1([], "values", dimension || {}));
+      if (dimensionId !== chartDimensionId && includes$1(dimensionId, dimensionsWithValuesIds)) {
+        return assoc$1(
+          dimensionId,
+          { ...dimensionValue, name: dimensionValueDisplay$1(display)(dimensionValue) },
+          acc
+        );
       }
-      return m;
+      return acc;
     },
-    {}
+    {},
+    dimensionValuesIndexes
   );
 }
 function getDimensionValueKey(chartDimension, dimensionValue) {
-  return get$2(chartDimension, "xId") === get$2(dimensionValue, "id") ? "x" : "y";
+  return prop$1("xId", chartDimension) === prop$1("id", dimensionValue) ? "x" : "y";
 }
 function datapoints(observations, dimensions, dimensionsWithValuesIndexedById2, chartDimension, display, formaterAttrs) {
-  const chartDimensionId = get$2(chartDimension, "id");
-  const chartDimensionIndex = findIndex$1(dimensions, { id: chartDimensionId });
-  const datapoints2 = reduce$2(
-    observations,
-    (m, o3, k2) => {
-      const oDimensionValuesIndexes = split$2(k2, ":");
+  const chartDimensionId = prop$1("id", chartDimension);
+  const chartDimensionIndex = findIndex$1(propEq$1("id", chartDimensionId), dimensions);
+  const datapoints2 = reduce$1(
+    (acc, k2) => {
+      const o3 = prop$1(k2, observations);
+      const oDimensionValuesIndexes = split$1(":", k2);
       const oDimensionValueIndex = oDimensionValuesIndexes[chartDimensionIndex];
-      const oDimensionValue = get$2(
-        dimensions,
-        `[${chartDimensionIndex}].values[${oDimensionValueIndex}]`
-      );
+      const _chartDimension = nth$1(chartDimensionIndex, dimensions);
+      const oDimensionValue = nth$1(oDimensionValueIndex, propOr$1([], "values", _chartDimension || {}));
       if (dimensionValueIsValid(oDimensionValue, chartDimension)) {
-        const oPartialKey = reject$2(
-          oDimensionValuesIndexes,
-          (o22, i) => i === chartDimensionIndex
-        ).join("");
-        if (!has$9(m, oPartialKey)) {
+        const oPartialKey = pipe$1(
+          addIndex$1(reject$1)((_2, i) => i === chartDimensionIndex),
+          join$1(":")
+        )(oDimensionValuesIndexes);
+        if (!has$8(oPartialKey, acc)) {
           const dimensionValues = getDimensionValues$2(
             oDimensionValuesIndexes,
             dimensions,
@@ -2207,26 +2247,26 @@ function datapoints(observations, dimensions, dimensionsWithValuesIndexedById2,
             chartDimensionId,
             display
           );
-          m[oPartialKey] = { dimensionValues };
+          acc[oPartialKey] = { dimensionValues };
         }
         const dimensionValueKey = getDimensionValueKey(chartDimension, oDimensionValue);
-        m[oPartialKey][dimensionValueKey] = head$2(o3);
-        m[oPartialKey][`${dimensionValueKey}Format`] = getFormatedObservation(o3, formaterAttrs);
+        acc[oPartialKey][dimensionValueKey] = head$1(o3);
+        acc[oPartialKey][`${dimensionValueKey}Format`] = getFormatedObservation(o3, formaterAttrs);
       }
-      return m;
+      return acc;
     },
-    {}
-  );
-  return filter$2(
-    datapoints2,
-    (dp) => !isNil$2(dp.x) && !isNil$2(dp.y)
+    {},
+    keys$1(observations)
   );
+  return pipe$1(
+    filter$1((dp) => !isNil$1(dp.x) && !isNil$1(dp.y)),
+    values$1
+  )(datapoints2);
 }
 const series$3 = (observations, dimensions, dimensionsWithValuesIndexedById2, chartDimension, display, formaterAttrs) => {
-  const xValues = get$2(dimensionsWithValuesIndexedById2, `${get$2(chartDimension, "id")}.values`, []);
-  const yValues = get$2(dimensionsWithValuesIndexedById2, `${get$2(chartDimension, "id")}.values`, []);
-  const xValue = find$2(xValues, { id: get$2(chartDimension, "xId") });
-  const yValue = find$2(yValues, { id: get$2(chartDimension, "yId") });
+  const values4 = pipe$1(prop$1(prop$1("id", chartDimension || {})), propOr$1([], "values"))(dimensionsWithValuesIndexedById2);
+  const xValue = find$1(propEq$1("id", prop$1("xId", chartDimension)), values4);
+  const yValue = find$1(propEq$1("id", prop$1("yId", chartDimension)), values4);
   return [{
     dimensionValues: {
       x: { ...xValue, name: dimensionValueDisplay$1(display)(xValue) },
@@ -2262,31 +2302,32 @@ function focus$2(series2, focusSelections) {
   });
   return [{ ...serie2, datapoints: __datapoints }];
 }
-const __scatterDimension = (dimensions, ids) => {
-  if (isEmpty$2(dimensions)) return;
+const __scatterDimension = (dimensions, { id: id2, xId, yId }) => {
+  if (isEmpty$1(dimensions))
+    return;
   let chartDimension;
-  const id2 = get$2(ids, "id");
-  if (!isNil$2(id2)) chartDimension = find$2(dimensions, { id: id2 });
-  if (isUndefined(chartDimension)) {
-    const _dimensions = reject$2(dimensions, isRefAreaDimension);
-    chartDimension = head$2(isEmpty$2(_dimensions) ? dimensions : _dimensions);
-  }
-  const chartDimensionId = get$2(chartDimension, "id");
-  const values4 = get$2(chartDimension, "values", []);
-  const xValue = find$2(values4, (value) => value.id === get$2(ids, "xId", null));
-  const yValue = find$2(values4, (value) => value.id === get$2(ids, "yId", null) && value.id !== xId);
-  const xId = isUndefined(xValue) ? head$2(isUndefined(yValue) ? values4 : reject$2(values4, yValue)).id : xValue.id;
-  const yId = isUndefined(yValue) ? find$2(values4, (value) => value.id !== xId).id : yValue.id;
+  if (!isNil$1(id2))
+    chartDimension = find$1(propEq$1("id", id2), dimensions);
+  if (isNil$1(chartDimension)) {
+    const _dimensions = reject$1(isRefAreaDimension, dimensions);
+    chartDimension = head$1(isEmpty$1(_dimensions) ? dimensions : _dimensions);
+  }
+  const chartDimensionId = prop$1("id", chartDimension || {});
+  const values4 = propOr$1([], "values", chartDimension || {});
+  const xValue = find$1(propEq$1("id", xId), values4);
+  const yValue = find$1((v) => propEq$1("id", yId, v) && v.id !== xId, values4);
+  const _xId = isNil$1(xValue) ? pipe$1(reject$1(propEq$1("id", prop$1("id", yValue || {}))), head$1, prop$1("id"))(values4) : xValue.id;
+  const _yId = isNil$1(yValue) ? pipe$1(find$1((v) => v.id !== _xId), prop$1("id"))(values4) : yValue.id;
   return {
     id: chartDimensionId,
-    xId,
-    yId
+    xId: _xId,
+    yId: _yId
   };
 };
 const series$2 = (observations, dimensions, dimensionsWithValuesIndexedById2, symbolDimension2, sortDirection, display, formaterAttrs) => {
   const symbolDimensionId = get$2(symbolDimension2, "id", null);
   if (symbolDimensionId === null) return [];
-  const symbolDimensionIndex = findIndex$1(dimensions, (d) => d.id === symbolDimensionId);
+  const symbolDimensionIndex = findIndex$2(dimensions, (d) => d.id === symbolDimensionId);
   const datapoints2 = sortBy$2(
     reduce$2(
       observations,
@@ -2297,13 +2338,13 @@ const series$2 = (observations, dimensions, dimensionsWithValuesIndexedById2, sy
         const oDimensionValuesIndexes = split$2(observationKey, ":");
         const oSymbolDimensionValueIndex = Number(oDimensionValuesIndexes[symbolDimensionIndex]);
         const oSymbolDimensionValueId = dimensions[symbolDimensionIndex].values[oSymbolDimensionValueIndex].id;
-        const symbolIndex = findIndex$1(symbolDimension2.serie, (v) => v.id === oSymbolDimensionValueId);
+        const symbolIndex = findIndex$2(symbolDimension2.serie, (v) => v.id === oSymbolDimensionValueId);
         if (symbolIndex === -1) {
           return memo;
         }
         const category = categoryDisplay(oDimensionValuesIndexes, dimensions, dimensionsWithValuesIndexedById2, symbolDimensionId, display);
         const ids = categoryDisplay(oDimensionValuesIndexes, dimensions, dimensionsWithValuesIndexedById2, symbolDimensionId, "code");
-        let dpIndex = findIndex$1(memo, (dp) => dp.key === ids);
+        let dpIndex = findIndex$2(memo, (dp) => dp.key === ids);
         let dpValues = dpIndex === -1 ? fill(Array(size(symbolDimension2.serie)), null) : memo[dpIndex].values;
         let dpFormatedValues = dpIndex === -1 ? fill(Array(size(symbolDimension2.serie)), null) : memo[dpIndex].formatedValues;
         dpValues[oSymbolDimensionValueIndex] = head$2(observationValue);
@@ -2412,7 +2453,7 @@ const series$1 = (observations, dimensions, dimensionsWithValuesIndexedById2, ti
       if (isNil$2(key) || isEmpty$2(key)) {
         key = "uniq-dp";
       }
-      const serieIndex = findIndex$1(memo, (serie2) => serie2.key === key);
+      const serieIndex = findIndex$2(memo, (serie2) => serie2.key === key);
       if (serieIndex !== -1) memo[serieIndex].datapoints.push(datapoint);
       else memo.push({ datapoints: [datapoint], category, key });
       return memo;
@@ -2450,7 +2491,7 @@ function focus$1(series2, focusSelections) {
     (serie2, index2) => {
       each(focusSelections, (focusSelection, focusKey) => {
         const _focusKey = `${focusKey}Index`;
-        const res = findIndex$1(
+        const res = findIndex$2(
           isArray$1(focusSelection) ? focusSelection : [focusSelection],
           (focus2) => focus2.value === serie2.key
         );
@@ -5640,47 +5681,8 @@ const addParentId = (id2, ids) => {
   const last2 = last$1(ids);
   return append$1(isNil$1(last2) ? id2 : `${last2}.${id2}`, ids);
 };
-const refineUnconfirmedPaths = (paths3) => {
-  let confirmedPaths = filter$1((p) => p.length === 1, paths3);
-  if (!isEmpty$1(confirmedPaths)) {
-    confirmedPaths = reduce$1((acc, k2) => {
-      if (has$8(k2, acc)) {
-        return acc;
-      }
-      const ps = prop$1(k2, paths3);
-      const flatConfirmed = unnest$1(values$1(acc));
-      const filtered = filter$1((p) => !!find$1((cP) => includes$1(p, cP) || includes$1(cP, p), flatConfirmed), ps);
-      if (!isEmpty$1(filtered)) {
-        return assoc$1(k2, [head$1(filtered)], acc);
-      }
-      return acc;
-    }, confirmedPaths, keys$1(paths3));
-  }
-  const remainingIds = reject$1((id2) => has$8(id2, confirmedPaths), keys$1(paths3));
-  const getCommonPaths = (ids) => {
-    const { commonPaths, rejectedIds } = reduce$1(
-      (acc, id2) => {
-        const ps = prop$1(id2, paths3);
-        if (isEmpty$1(acc.commonPaths)) {
-          return assoc$1("commonPaths", ps, acc);
-        }
-        const common = intersection$1(acc.commonPaths, ps);
-        return isEmpty$1(common) ? assoc$1("rejectedChildrenIds", id2, acc) : assoc$1("commonPaths", common, acc);
-      },
-      { commonPaths: [], rejectedIds: [] }
-    )(ids);
-    if (!isEmpty$1(rejectedIds)) {
-      return append$1(head$1(commonPaths), getCommonPaths(rejectedIds));
-    }
-    return [head$1(commonPaths)];
-  };
-  const commons = getCommonPaths(remainingIds);
-  return reduce$1(
-    (acc, id2) => assoc$1(id2, intersection$1(commons, prop$1(id2, paths3)), acc),
-    confirmedPaths,
-    remainingIds
-  );
-};
+const _refineUnconfirmedPaths = (paths3) => map$2((p) => [head$1(p)], paths3);
+const getHierId = (v) => isNil$1(v.parent) || isEmpty$1(v.parent) ? v.id : `${v.parent}.${v.id}`;
 const applyHierarchicalCodesToDim = (hCodes, dim) => {
   const confirmedHierarchisedChilds = /* @__PURE__ */ new Set([]);
   let unconfirmedPaths = {};
@@ -5722,25 +5724,35 @@ const applyHierarchicalCodesToDim = (hCodes, dim) => {
     reject$1((id2) => confirmedHierarchisedChilds.has(id2)),
     (ids) => pick$1(ids, unconfirmedPaths)
   )(keys$1(unconfirmedPaths));
-  const refinedUnconfirmedPaths = refineUnconfirmedPaths(_unconfirmedPaths);
+  const refinedUnconfirmedPaths = _refineUnconfirmedPaths(_unconfirmedPaths);
   const flattenDescendants = reduce$1((acc, val) => {
     const children = flattenDescendants(val.children || []);
     return concat$1(acc, prepend$1(val, children));
   }, []);
-  const isValid = (val) => !val.unconfirmed || includes$1(val.path, propOr$1([], val.id, refinedUnconfirmedPaths));
+  const isValid = (val) => !val.unconfirmed || val.path === head$1(refinedUnconfirmedPaths[val.id] || []);
   const refineCodes = reduce$1((acc, hC) => {
     const _flatDescendants = flattenDescendants(hC.children);
     const flatDescendants = prepend$1(hC, _flatDescendants);
-    const validDescendant = find$1(isValid, flatDescendants);
-    if (!validDescendant) {
+    const valids = filter$1(isValid, flatDescendants);
+    if (isEmpty$1(valids)) {
       return acc;
     }
     const refined2 = pipe$1(
-      map$2((v) => {
+      reduce$1((_acc, v) => {
         confirmedHierarchisedChilds.add(v.id);
-        return omit$1(["unconfirmed", "children", "path"], v);
-      })
-    )(flatDescendants);
+        const prev = last$1(_acc);
+        const parents = pipe$1(
+          (p) => isNil$1(p) ? [] : append$1(getHierId(p), prev.parents || []),
+          filter$1((id2) => includes$1(id2, v.parents))
+        )(prev);
+        const rV = {
+          ...omit$1(["unconfirmed", "children", "path"], v),
+          parents,
+          parent: isEmpty$1(parents) ? void 0 : last$1(parents)
+        };
+        return append$1(rV, _acc);
+      }, [])
+    )(valids);
     return concat$1(acc, refined2);
   }, []);
   const refined = refineCodes(parsed);
@@ -5756,10 +5768,10 @@ const applyHierarchicalCodesToDim = (hCodes, dim) => {
     concat$1,
     addIndex$1(map$2)((v, ind) => {
       const parents = props$1(v.parents, hierarchicalIndexes);
-      const hierId = last$1(v.parents) ? `${last$1(v.parents)}.${v.id}` : v.id;
+      const hierId = getHierId(v);
       hierarchicalIndexes[hierId] = ind;
       return {
-        ...v,
+        ...dissoc$1("path", v),
         parents,
         __indexPosition: ind
       };
@@ -7298,7 +7310,7 @@ const getTopologyAreasCollections = memoizee(_getTopologyAreasCollections);
 const _isNonIdealState = (data, type4, map22) => {
   const defaultSeries = series(data, type4, null, null, map22);
   if (type4 === "ChoroplethChart") {
-    return findIndex$1(get$2(defaultSeries, "objects.areas.geometries", []), (geometry) => get$2(geometry, "properties.value", null)) === -1;
+    return findIndex$2(get$2(defaultSeries, "objects.areas.geometries", []), (geometry) => get$2(geometry, "properties.value", null)) === -1;
   }
   return isEmpty$2(get$2(defaultSeries, "[0].datapoints", []));
 };
@@ -20075,11 +20087,11 @@ var XFindIndex = /* @__PURE__ */ function() {
   };
   return XFindIndex2;
 }();
-var _xfindIndex = /* @__PURE__ */ _curry2$b(function _xfindIndex2(f, xf) {
+var _xfindIndex2 = /* @__PURE__ */ _curry2$b(function _xfindIndex3(f, xf) {
   return new XFindIndex(f, xf);
 });
-var findIndex = /* @__PURE__ */ _curry2$b(
-  /* @__PURE__ */ _dispatchable([], _xfindIndex, function findIndex2(fn, list) {
+var findIndex2 = /* @__PURE__ */ _curry2$b(
+  /* @__PURE__ */ _dispatchable([], _xfindIndex2, function findIndex3(fn, list) {
     var idx = 0;
     var len = list.length;
     while (idx < len) {
@@ -21273,7 +21285,7 @@ const es = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   evolve: evolve2,
   filter,
   find: find2,
-  findIndex,
+  findIndex: findIndex2,
   findLast,
   findLastIndex: findLastIndex2,
   flatten: flatten$1,

package/package.json

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