@devgateway/dvz-ui-react 1.0.7 → 1.1.1

package/dist/esm/embeddable/chart/data/Line.js

@@ -1,212 +1,165 @@
-import { jsx as T, Fragment as P } from "react/jsx-runtime";
-import R from "react";
-import { measuresMap as U, typesMap as z, getTranslatedValue as K, alphaSort as G, dateSort as Q, numericSort as q } from "./Utils.js";
-const H = (n) => {
-  const { data: t, measures: u, swap: b, dimensions: h, locale: O, customLabels: y } = n;
-  let i = {};
-  const x = h.filter((w) => w != ""), F = /* @__PURE__ */ new Set();
-  if (x.length == 0 && t) {
-    const w = U(t), B = /* @__PURE__ */ new Set(), V = /* @__PURE__ */ new Set();
-    let a = [], m;
-    if (t.metadata && t.metadata.measures) {
-      const M = t.metadata.measures.filter((c) => u.includes(c.value)).sort((c, f) => c.position != null && f.position != null && c.position != f.position ? c.position - f.position : 0);
-      a = [], m = "measure", B.add("measure");
-      const E = {};
-      Object.keys(t).forEach((c) => {
-        E[c] = t[c];
-      }), M.forEach((c) => {
-        const f = {}, g = y[c.value] || K(w[c.value], O);
-        f.type = "measure", f.measureFieldName = c.value, f.measure = g, f[g] = t[c.value], f.variables = E, a.push(f), V.add(g), F.add(w[c.value]);
-      }), i = {
-        categories: B,
-        indexBy: m,
-        keys: Array.from(V),
-        measuresMetadata: F,
-        data: a
+import { jsx as F, Fragment as P } from "react/jsx-runtime";
+import k from "react";
+import { measuresMap as V, typesMap as z, alphaSort as J, numericSort as Q, dateSort as K, getTranslatedValue as T } from "./Utils.js";
+const G = (t) => {
+  const { data: e, measures: n, swap: h, dimensions: f, locale: v, customLabels: d } = t;
+  let s = {};
+  const D = f.filter((g) => g != ""), L = /* @__PURE__ */ new Set();
+  if (D.length == 0 && e) {
+    const g = V(e), b = /* @__PURE__ */ new Set(), w = /* @__PURE__ */ new Set();
+    let x = [], R;
+    if (e.metadata && e.metadata.measures) {
+      const l = e.metadata.measures.filter((i) => n.includes(i.value)).sort((i, u) => i.position != null && u.position != null && i.position != u.position ? i.position - u.position : 0);
+      x = [], R = "measure", b.add("measure");
+      const m = {};
+      Object.keys(e).forEach((i) => {
+        m[i] = e[i];
+      }), l.forEach((i) => {
+        const u = {}, p = d[i.value] || T(g[i.value], v);
+        u.type = "measure", u.measureFieldName = i.value, u.measure = p, u[p] = e[i.value], u.variables = m, x.push(u), w.add(p), L.add(g[i.value]);
+      }), s = {
+        categories: b,
+        indexBy: R,
+        keys: Array.from(w),
+        measuresMetadata: L,
+        data: x
       };
     }
   }
-  return i;
-}, I = (n) => {
-  const { data: t, measures: u, dimensions: b, overallLabel: h } = n;
-  if (b.length == 1 && t.children) {
-    if (!(t.children.filter((y) => y.value == h).length > 0)) {
-      const y = {};
-      y.type = b[0], y.value = h, y.label = h, Object.keys(t).forEach((i) => {
-        ["children", "metadata", "type", "value"].includes(i) || (y[i] = t[i]);
-      }), t.children = [y, ...t.children];
+  return s;
+}, H = (t) => {
+  const { data: e, measures: n, dimensions: h, overallLabel: f } = t;
+  if (h.length == 1 && e.children) {
+    if (!(e.children.filter((d) => d.value == f).length > 0)) {
+      const d = {};
+      d.type = h[0], d.value = f, d.label = f, Object.keys(e).forEach((s) => {
+        ["children", "metadata", "type", "value"].includes(s) || (d[s] = e[s]);
+      }), e.children = [d, ...e.children];
     }
-  } else b.length == 2 && t.children && t.children.forEach((O) => {
-    if (!(O.children.filter((i) => i.value == h).length > 0)) {
-      const i = {};
-      i.type = b[1], i.value = h, i.label = h, Object.keys(O).forEach((x) => {
-        ["children", "metadata", "type", "value"].includes(x) || (i[x] = O[x]);
-      }), O.children = [i, ...O.children];
+  } else h.length == 2 && e.children && e.children.forEach((v) => {
+    if (!(v.children.filter((s) => s.value == f).length > 0)) {
+      const s = {};
+      s.type = h[1], s.value = f, s.label = f, Object.keys(v).forEach((D) => {
+        ["children", "metadata", "type", "value"].includes(D) || (s[D] = v[D]);
+      }), v.children = [s, ...v.children];
     }
   });
-  return t;
-}, W = (n) => {
-  let t = {};
+  return e;
+}, U = (t) => {
+  var w, x, R;
+  let e = {};
   const {
-    data: u,
-    measures: b,
-    swap: h,
-    dimensions: O,
-    includeOverall: y,
-    locale: i,
-    customLabels: x,
-    colorBy: F,
-    hiddenBars: w
-  } = n, B = O.filter((a) => a != ""), V = u.metadata.measures.filter((a) => b.includes(a.value)).sort((a, m) => a.position != null && m.position != null && a.position != m.position ? a.position - m.position : 0);
-  if (y && b.length == 1 && I(n), B.length == 0 && u)
-    t = H(n);
-  else if (u && u.children && B.length > 0) {
-    const a = U(u), m = z(u), M = /* @__PURE__ */ new Set(), E = /* @__PURE__ */ new Set(), c = /* @__PURE__ */ new Set(), f = /* @__PURE__ */ new Set(), g = [];
-    let J;
-    h && B.length == 1 && b.length > 0 ? (J = "measure", V.forEach((s) => {
-      const p = {};
-      p.measure = x[s.value] || K(a[s.value], i), c.add(a[s.value]), u.children.forEach((r) => {
-        const A = K(
-          m[r.type].items.filter((o) => o.value === r.value)[0],
-          i
-        ) || r.value, e = {};
-        Object.keys(r).forEach((o) => {
-          e[o] = r[o];
-        }), e[r.type] = r.value.toString(), p.variables = e, E.add(m[r.type]), p[A] = r[s.value], f.add(A);
-      }), g.push({ ...p });
-    })) : (J = u.children[0].type, Object.keys(u).filter((s) => b.indexOf(s) > -1).forEach((s) => {
-      var A;
-      const p = {}, r = {};
-      M.add(x[s] || ((A = a[s]) == null ? void 0 : A.label)), c.add(a[s]), r.id = x[s] || K(a[s], i), r.label = x[s] || K(a[s], i), r.position = a && a[s] && a[s].position ? a[s].position : 0, r.data = u.children.map((e) => {
-        const o = K(
-          m[e.type].items.filter((d) => d.value === e.value)[0],
-          i
-        ) || e.value, l = {};
-        return Object.keys(e).forEach((d) => {
-          l[d] = e[d];
-        }), l.value = e[s], l[e.type] = e.value.toString(), E.add(m[e.type]), f.add(o), {
-          x: o,
-          y: e[s],
-          variables: l
-        };
-      }), g.push({ ...r, variables: p, parent_variables: p });
-    }));
-    const S = Array.from(f);
-    let v = w && g ? g.filter((s) => w.indexOf(s[J]) == -1) : g;
-    if (n.sort == "alphabetically")
-      for (let s = 0; s < v.length; s++)
-        v[s].data && (v[s].data = v[s].data.sort(
-          (p, r) => G(n.sortreverse, i, p.x, r.x)
-        ));
-    if (n.sort == "date")
-      for (let s = 0; s < v.length; s++)
-        v[s].data = v[s].data.sort(
-          (p, r) => Q(n.sortreverse, p.x, r.x)
-        );
-    t = {
-      metadata: u.metadata,
-      indexBy: J,
-      categories: M,
-      dimensionsMetadata: E,
-      measuresMetadata: c,
-      keys: S,
-      data: v
+    data: n,
+    measures: h,
+    swap: f,
+    dimensions: v,
+    includeOverall: d,
+    locale: s,
+    customLabels: D,
+    colorBy: L,
+    hiddenBars: g
+  } = t, b = v.filter((l) => l != "");
+  if (n.metadata.measures.filter((l) => h.includes(l.value)).sort((l, m) => l.position != null && m.position != null && l.position != m.position ? l.position - m.position : 0), d && h.length == 1 && H(t), b.length == 0 && n)
+    e = G(t);
+  else if (n && n.children && n.children.length > 0 && b.length > 0) {
+    const l = V(n), m = z(n), i = /* @__PURE__ */ new Set(), u = /* @__PURE__ */ new Set(), p = /* @__PURE__ */ new Set(), N = /* @__PURE__ */ new Set(), E = [], B = n.children[0].type, M = ((R = (x = (w = n == null ? void 0 : n.metadata) == null ? void 0 : w.types) == null ? void 0 : x.find((r) => r.dimension == b[0])) == null ? void 0 : R.items) || [];
+    t.sort == "alphabetically" ? M.sort(
+      (r, y) => J(t.sortReverse, s, r.value, y.value)
+    ) : t.sort == "values" ? M.sort(
+      (r, y) => Q(t.sortReverse, r.value, y.value)
+    ) : t.sort == "date" && M.sort(
+      (r, y) => K(t.sortReverse, r.value, y.value)
+    ), h.forEach((r) => {
+      const y = { variables: {} };
+      y.id = T(l[r], s), y.label = T(l[r], s);
+      const a = [];
+      M.forEach((c) => {
+        const o = n.children.find((j) => j.value === c.value);
+        if (o) {
+          const j = {};
+          Object.keys(o).forEach((S) => {
+            j[S] = o[S];
+          }), j.value = o[r], j[o.type] = o.value.toString(), u.add(m[o.type]), a.push({ x: o.value, y: o[r], variables: j }), y.data = a;
+        }
+      }), E.push(y);
+    });
+    const C = Array.from(N);
+    let I = g && E ? E.filter((r) => g.indexOf(r[B]) == -1) : E;
+    e = {
+      metadata: n.metadata,
+      indexBy: B,
+      categories: i,
+      dimensionsMetadata: u,
+      measuresMetadata: p,
+      keys: C,
+      data: I
     };
   }
-  return R.Children.map(
-    n.children,
-    (a) => R.cloneElement(a, { options: t })
+  return k.Children.map(
+    t.children,
+    (l) => k.cloneElement(l, { options: e })
   );
-}, X = (n) => {
-  var B, V;
+}, W = (t) => {
+  var g, b, w, x, R, l;
   const {
-    data: t,
-    measures: u,
-    includeOverall: b,
-    dimensions: h,
-    hiddenBars: O,
-    colorBy: y,
-    locale: i,
-    customLabels: x
-  } = n, F = h.filter((a) => a != "");
-  let w = {};
-  if (b && I(n), F.length == 0 && t)
-    w = H(n);
-  else if (t && t.children && F.length > 0) {
-    U(t);
-    const a = z(t), m = u[0], M = /* @__PURE__ */ new Set(), E = /* @__PURE__ */ new Set(), c = [], f = [], g = t.children[0].type;
-    let J = 0, S, v;
-    t.children.forEach((e) => {
-      const o = { variables: {} };
-      if (v = K(
-        a[e.type] && a[e.type].items ? a[e.type].items.filter((l) => l.value === e.value)[0] : e.value,
-        i
-      ) || e.value, o[e.type] = v, o[v] = e[m], S = new Object(), S[e.type] = v, o.parent_variables = S, Object.keys(e).forEach((l) => {
-        S[l] = e[l];
-      }), M.add(a[e.type]), e.children || E.add(v), e.children)
-        e.children.forEach((l) => {
-          S = new Object(), M.add(a[l.type]);
-          const d = K(
-            a[l.type] && a[l.type].items ? a[l.type].items.filter((L) => L.value === l.value)[0] : l.value,
-            i
-          ) || l.value;
-          S[e.type] = v, S[l.type] = d, Object.keys(l).forEach((L) => {
-            S[L] = l[L];
-          }), o.variables[d] = S, E.add(d), J += l[m], f.push(l[m]), o[d] = l[m];
-        });
-      else {
-        const l = new Object();
-        l[e.type] = v, M.add(a[e.type]), Object.keys(t).forEach((d) => {
-          l[d] = e[d];
-        }), o.variables = l;
-      }
-      c.push(o);
-    });
-    const s = i.toUpperCase(), p = y == "id" ? c : c.filter((e) => O.indexOf(e[g]) == -1), r = Array.from(E);
-    n.sort == "alphabetically" ? p.sort(
-      (e, o) => G(n.sortreverse, i, e[g], o[g])
-    ) : n.sort == "values" && p.sort((e, o) => {
-      var l, d, L;
-      if (n.sort2Dimension == "_total") {
-        const C = Math.max(...r.map((N) => e[N])), D = Math.max(...r.map((N) => o[N]));
-        return q(n.sortreverse, C, D);
-      } else if (((d = (l = t == null ? void 0 : t.metadata) == null ? void 0 : l.types) == null ? void 0 : d.length) > 1) {
-        const C = (L = t == null ? void 0 : t.metadata) == null ? void 0 : L.types[1].items.filter((D) => !!(n.sort2Dimension === D.value || D.labels && D.labels[s] === n.sort2Dimension));
-        if (C.length > 0) {
-          const D = C[0].labels[s] ? C[0].labels[s] : C[0].value, N = Math.max(
-            ...r.filter((_) => _ === D).map((_) => e[_])
-          ), j = Math.max(
-            ...r.filter((_) => _ === D).map((_) => o[_])
-          );
-          return q(n.sortreverse, N || 0, j || 0);
+    data: e,
+    measures: n,
+    includeOverall: h,
+    dimensions: f,
+    hiddenBars: v,
+    colorBy: d,
+    locale: s
+  } = t, D = f.filter((m) => m != "");
+  let L = {};
+  if (h && H(t), D.length == 0 && e)
+    L = G(t);
+  else if (e && e.children && e.children.length > 0 && D.length > 0) {
+    const m = V(e), i = z(e), u = n[0], p = /* @__PURE__ */ new Set(), N = /* @__PURE__ */ new Set(), E = [], B = [], M = e.children[0].type, C = ((w = (b = (g = e == null ? void 0 : e.metadata) == null ? void 0 : g.types) == null ? void 0 : b.find((a) => a.dimension == D[0])) == null ? void 0 : w.items) || [], I = ((l = (R = (x = e == null ? void 0 : e.metadata) == null ? void 0 : x.types) == null ? void 0 : R.find((a) => a.dimension == D[1])) == null ? void 0 : l.items) || [];
+    t.sortSecondDimension == "alphabetically" ? I.sort(
+      (a, c) => J(t.sortReverseSecondDimension, s, a.value, c.value)
+    ) : t.sortSecondDimension == "date" && I.sort(
+      (a, c) => K(t.sortReverseSecondDimension, a.value, c.value)
+    ), N.add(m[u]), I.forEach((a) => {
+      const c = { variables: {} };
+      c.id = a.value, c.label = a.value;
+      const o = [];
+      C.forEach((j) => {
+        const S = e.children.find((O) => O.value === j.value);
+        p.add(i[S.type]);
+        const A = S.children.find((O) => O.value === a.value);
+        if (A) {
+          p.add(i[A.type]);
+          const O = {};
+          Object.keys(A).forEach((q) => {
+            O[q] = A[q];
+          }), O.value = A[n[0]], O[S.type] = S.value.toString(), O[A.type] = A.value.toString(), o.push({ x: S.value, y: A[n[0]], variables: O }), E.indexOf(S.value) == -1 && E.push(S.value);
         }
-      }
+      }), c.data = o, B.push(c);
+    }), B.forEach((a) => {
+      E.forEach((c) => {
+        a.data.find((o) => o.x == c) || a.data.push({ x: c, y: null, variables: {} });
+      });
+    }), B.forEach((a) => {
+      a.data.sort((c, o) => t.sort == "alphabetically" ? J(t.sortReverse, s, c.x, o.x) : t.sort == "date" ? K(t.sortReverse, c.x, o.x) : 0);
     });
-    const A = [...E];
-    ((V = (B = t == null ? void 0 : t.metadata) == null ? void 0 : B.types) == null ? void 0 : V.length) > 1 && A.sort((e, o) => {
-      var D, N;
-      const l = t.metadata.types[1].items.filter(
-        (j) => j.value == e || j.labels && j.labels[s] == e
-      ), d = t.metadata.types[1].items.filter(
-        (j) => j.value == o || j.labels && j.labels[s] == o
-      ), L = (D = l[0]) == null ? void 0 : D.position, C = (N = d[0]) == null ? void 0 : N.position;
-      return L - C;
-    }), w = {
-      metadata: t.metadata,
-      dimensionsMetadata: M,
-      indexBy: g,
-      keys: y == "index" ? A : A.filter((e) => O.indexOf(e) == -1),
-      data: p
+    const r = d == "id" ? B : B.filter((a) => v.indexOf(a[M]) == -1), y = [...E];
+    L = {
+      metadata: e.metadata,
+      dimensionsMetadata: p,
+      measuresMetadata: N,
+      indexBy: M,
+      keys: d == "index" ? y : y.filter((a) => v.indexOf(a) == -1),
+      data: r
     };
   }
-  return /* @__PURE__ */ T(P, { children: R.Children.map(
-    n.children,
-    (a) => R.cloneElement(a, { options: w })
+  return /* @__PURE__ */ F(P, { children: k.Children.map(
+    t.children,
+    (m) => k.cloneElement(m, { options: L })
   ) });
-}, k = (n) => {
-  const { data: t, measures: u, dimensions: b } = n, h = JSON.parse(JSON.stringify(t));
-  return b.length === 1 ? /* @__PURE__ */ T(W, { ...n, data: h }) : /* @__PURE__ */ T(X, { ...n, data: h });
+}, _ = (t) => {
+  const { data: e, measures: n, dimensions: h } = t, f = JSON.parse(JSON.stringify(e));
+  return h.length === 1 ? /* @__PURE__ */ F(U, { ...t, data: f }) : /* @__PURE__ */ F(W, { ...t, data: f });
 };
 export {
-  k as default
+  _ as default
 };

package/dist/esm/embeddable/chart/data/Utils.js

@@ -1,30 +1,46 @@
-const n = (e) => {
-  const { metadata: t } = e || {}, r = {};
-  return t && t.measures.forEach((a) => {
-    r[a.value] = a;
-  }), r;
-}, i = (e) => {
-  const { metadata: t } = e || {}, r = {};
-  return t && t.types.forEach((a) => {
-    r[a.dimension] = {
-      dimension: a.dimension,
-      category: a.category,
-      items: a.items
+const i = (e) => {
+  const { metadata: t } = e || {}, a = {};
+  return t && t.measures.forEach((r) => {
+    a[r.value] = r;
+  }), a;
+}, u = (e) => {
+  const { metadata: t } = e || {}, a = {};
+  return t && t.types.forEach((r) => {
+    a[r.dimension] = {
+      dimension: r.dimension,
+      category: r.category,
+      items: r.items
     };
-  }), r;
-}, l = (e, t) => e ? e.labels && e.labels[t.toUpperCase()] ? e.labels[t.toUpperCase()] : e.label ? e.label : e.value : null, o = (e, t, r, a) => new Intl.Collator(t, {
+  }), a;
+}, m = (e, t) => e ? e.labels && e.labels[t.toUpperCase()] ? e.labels[t.toUpperCase()] : e.label ? e.label : e.value : null, c = (e, t, a, r) => new Intl.Collator(t, {
   caseFirst: "upper",
   numeric: !0,
   sensitivity: "variant"
-}).compare(e ? a : r, e ? r : a), u = (e, t, r) => e ? r - t : t - r, c = (e, t, r) => {
-  let a = Date.parse(t + ""), s = Date.parse(r + "");
-  return !isNaN(a) && !isNaN(s) ? e ? s - a : a - s : 0;
+}).compare(e ? r : a, e ? a : r), l = (e, t, a) => !isNaN(t) && !isNaN(a) ? e ? Number(a) - Number(t) : Number(t) - Number(a) : 0, o = (e) => {
+  const [t, a] = e.split(" "), n = [
+    "Jan",
+    "Feb",
+    "Mar",
+    "Apr",
+    "May",
+    "Jun",
+    "Jul",
+    "Aug",
+    "Sep",
+    "Oct",
+    "Nov",
+    "Dec"
+  ].indexOf(t), s = parseInt(a, 10);
+  return (n === -1 || isNaN(s)) && console.error(`Invalid month/year format: ${e}`), new Date(s, n, 1);
+}, p = (e, t, a) => {
+  let r = Date.parse(t), n = Date.parse(a);
+  return isNaN(r) && (r = o(t)), isNaN(n) && (n = o(a)), !isNaN(r) && !isNaN(n) ? e ? n - r : r - n : 0;
 };
 export {
-  o as alphaSort,
-  c as dateSort,
-  l as getTranslatedValue,
-  n as measuresMap,
-  u as numericSort,
-  i as typesMap
+  c as alphaSort,
+  p as dateSort,
+  m as getTranslatedValue,
+  i as measuresMap,
+  l as numericSort,
+  u as typesMap
 };