@devgateway/dvz-ui-react 1.4.0 → 1.5.1

package/dist/esm/embeddable/chart/colors/ManualColors.js

@@ -1,45 +1,56 @@
-import x from "./Colors.js";
-class O extends x {
-  constructor(t, a, o, m, y, n, b, v, u, e = {}, f, g, c) {
-    if (super(o, m, y, v, u), this._manualColor = {}, this._manualColor[g] = e ? e.Overall : null, t != "csv") {
-      const _ = (i) => {
-        h = [...n][i] ? [...n][i].items : [], e != null && e != null && Object.keys(e).forEach((r) => {
-          const l = h.filter((s) => s.code === r);
+import I from "./Colors.js";
+class j extends I {
+  constructor(s, h, n, p, g, i, c, y, _, t = {}, o, v, b, u) {
+    if (super(n, p, g, y, _), this._manualColor = {}, this._manualColor[v] = t ? t.Overall : null, s != "csv") {
+      const m = (e) => {
+        f = [...i][e] ? [...i][e].items : [], t != null && t != null && Object.keys(t).forEach((a) => {
+          const l = f.filter((r) => r.code === a);
           if (l.length > 0 && l[0].labels) {
-            let s;
-            f && (s = l[0].labels[f.toUpperCase()]), s ? this._manualColor[s] = e[r] : this._manualColor[l[0].value] = e[r];
+            let r;
+            o && (r = l[0].labels[o.toUpperCase()]), r ? this._manualColor[r] = t[a] : this._manualColor[l[0].value] = t[a];
           }
         });
-      }, C = () => {
-        h = b, Object.keys(e).forEach((i) => {
-          const r = [...h].filter((l) => l.value === i);
-          if (r.length > 0 && r[0].labels) {
-            const l = c[i];
-            c && l && (this._manualColor[l] = e[i]);
-            let s;
-            f && (s = r[0].labels[f.toUpperCase()]), s ? this._manualColor[s] = e[i] : this._manualColor[r[0].label] = e[i];
+      }, x = (e) => e == null ? void 0 : e.map((l) => {
+        const r = l.group.label;
+        return l.label.includes(r) ? l : {
+          ...l,
+          label: `${r} - ${l.label}`
+        };
+      }), B = () => {
+        var e;
+        return c && c.size > 0 ? c : ((e = u == null ? void 0 : u.metadata) == null ? void 0 : e.measures.length) > 0 ? (u.metadata.measures = x(
+          u.metadata.measures
+        ), u.metadata.measures) : [];
+      }, d = () => {
+        f = B(), Object.keys(t).forEach((e) => {
+          const a = [...f].filter((l) => l.value === e);
+          if (a.length > 0 && a[0].labels) {
+            const l = b[e];
+            b && l && (this._manualColor[l] = t[e]);
+            let r;
+            o && (r = a[0].labels[o.toUpperCase()]), r ? this._manualColor[r] = t[e] : this._manualColor[a[0].label] = t[e];
           }
         });
       };
-      let h = [];
-      const p = o === "index" ? 0 : 1;
-      n ? n.size == 1 && p == 1 ? u == "measure" ? _(0) : C() : _(p) : C();
+      let f = [];
+      const C = h === "line" ? 1 : n === "index" ? 0 : 1;
+      i ? i.size == 1 && C == 1 ? _ == "measure" ? m(0) : d() : m(C) : d();
     } else
-      this._manualColor = e;
+      this._manualColor = t;
   }
-  getColor(t, a) {
+  getColor(s, h) {
     if (this.colorBy === "index") {
-      const o = this._manualColor[t] || this._manualColor[a[this.indexBy]];
-      return o || "#5555";
+      const n = this._manualColor[s] || this._manualColor[h[this.indexBy]];
+      return n || "#5555";
     }
-    return this.colorBy === "id" && this._manualColor[t] ? this._manualColor[t] : "#5555";
+    return this.colorBy === "id" && this._manualColor[s] ? this._manualColor[s] : "#5555";
   }
-  getColorByIndex(t) {
+  getColorByIndex(s) {
   }
-  getColorByKey(t) {
-    return this._manualColor[t] ? this._manualColor[t] : "#5555";
+  getColorByKey(s) {
+    return this._manualColor[s] ? this._manualColor[s] : "#5555";
   }
 }
 export {
-  O as default
+  j as default
 };

package/dist/esm/embeddable/chart/colors/SystemColors.js

@@ -1,25 +1,36 @@
-import M from "./Colors.js";
-const l = "#9F9F9F";
-class b extends M {
-  constructor(r, e, i, a, y, c, f, p, h, t) {
-    super(i, a, y, c, f), this.colorMap = {}, this._colorBy = e == "line" ? "id" : i, this._indexBy && p && [...p].forEach((o) => {
-      o && o.items && o.items.forEach((s) => {
-        t && s.labels && s.labels[t.toUpperCase()] ? this.colorMap[s.labels[t.toUpperCase()]] = s.categoryStyle : this.colorMap[s.value] = s.categoryStyle;
+import x from "./Colors.js";
+const c = "#9F9F9F";
+class M extends x {
+  constructor(e, h, u, i, y, b, C, a, o, s, t) {
+    super(u, i, y, b, C), this.colorMap = {}, this._colorBy = h == "line" ? "id" : u;
+    const n = (r) => r == null ? void 0 : r.map((p) => {
+      const f = p.group.label;
+      return p.label.includes(f) ? p : {
+        ...p,
+        label: `${f} - ${p.label}`
+      };
+    }), g = () => {
+      var r;
+      return o && o.size > 0 ? o : ((r = t == null ? void 0 : t.metadata) == null ? void 0 : r.measures.length) > 0 ? (t.metadata.measures = n(t.metadata.measures), t.metadata.measures) : [];
+    };
+    this._indexBy && (a == null ? void 0 : a.size) > 0 && [...a].forEach((r) => {
+      r && r.items && r.items.forEach((l) => {
+        s && l.labels && l.labels[s.toUpperCase()] ? this.colorMap[l.labels[s.toUpperCase()]] = l.categoryStyle : this.colorMap[l.value] = l.categoryStyle;
       });
-    }), h && [...h].forEach((o) => {
-      o && o.styles && (t && o.labels && o.labels[t.toUpperCase()] ? this.colorMap[o.labels[t.toUpperCase()]] = o.styles : this.colorMap[o.label] = o.styles);
-    });
+    }), o && (o = g(), [...o].forEach((r) => {
+      r && r.styles && (s && r.labels && r.labels[s.toUpperCase()] ? this.colorMap[r.labels[s.toUpperCase()]] = r.styles : this.colorMap[r.label] = r.styles);
+    }));
   }
-  getColor(r, e) {
-    return this._colorBy === "index" ? this.colorMap[e[this._indexBy]] ? this.colorMap[e[this._indexBy]].color : l : this.colorMap[r] ? this.colorMap[r].color : l;
+  getColor(e, h) {
+    return this._colorBy === "index" ? this.colorMap[h[this._indexBy]] ? this.colorMap[h[this._indexBy]].color : c : this.colorMap[e] ? this.colorMap[e].color : c;
   }
-  getColorByIndex(r) {
-    return this.colorMap[r] ? this.colorMap[r].color : l;
+  getColorByIndex(e) {
+    return this.colorMap[e] ? this.colorMap[e].color : c;
   }
-  getColorByKey(r) {
-    return this.colorMap[r] ? this.colorMap[r].color : l;
+  getColorByKey(e) {
+    return this.colorMap[e] ? this.colorMap[e].color : c;
   }
 }
 export {
-  b as default
+  M as default
 };

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

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