@sis-cc/dotstatsuite-components 21.5.0 → 21.6.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.5.0";
+const version$1 = "21.6.0";
 const meta$1 = {
   name: name$1,
   version: version$1
@@ -5681,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 = {};
@@ -5763,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);
@@ -5797,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
       };

package/package.json

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