@devgateway/dvz-ui-react 1.6.20 → 1.7.1

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

@@ -9,14 +9,14 @@ const z = (a) => {
     const j = U(t), A = /* @__PURE__ */ new Set(), M = /* @__PURE__ */ new Set();
     let u = [], r;
     if (t.metadata && t.metadata.measures) {
-      const y = t.metadata.measures.filter((o) => v.includes(o.value)).sort((o, b) => o.position != null && b.position != null && o.position != b.position ? o.position - b.position : 0);
+      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) => {
         x[o] = t[o];
       }), y.forEach((o) => {
-        const b = {}, p = O[o.value] || N(j[o.value], E);
-        b.type = "measure", b.measureFieldName = o.value, b.measure = p, b[p] = t[o.value], b.variables = x, u.push(b), M.add(p), C.add(j[o.value]);
+        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: A,
         indexBy: r,
@@ -62,7 +62,7 @@ const z = (a) => {
   if (O && w.length == 1 && G(a), A.length == 0 && v)
     t = z(a);
   else if (v && v.children && A.length > 0) {
-    const r = U(v), y = q(v), x = /* @__PURE__ */ new Set(), o = /* @__PURE__ */ new Set(), b = /* @__PURE__ */ new Set(), p = [];
+    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 = {};
@@ -73,8 +73,8 @@ const z = (a) => {
         ) || m.value, e = {};
         Object.keys(m).forEach((i) => {
           e[i] = m[i];
-        }), e[m.type] = m.value.toString(), c.variables = e, x.add(y[m.type]), c[f] = m[s.value], b.add(f);
-      }), p.push({ ...c });
+        }), 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(
@@ -84,11 +84,11 @@ const z = (a) => {
         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]), b.add(e);
-      }), p.push({ ...m, variables: c, parent_variables: c });
+        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(b);
-    let S = j && p ? p.filter((s) => j.indexOf(s[B]) == -1) : p;
+    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(
@@ -126,7 +126,7 @@ const z = (a) => {
     j = z(a);
   else if (t && t.children && t.children.length > 0 && C.length > 0) {
     U(t);
-    const u = q(t), r = v[0], y = /* @__PURE__ */ new Set(), x = /* @__PURE__ */ new Set(), o = [], b = [], p = t.children[0].type;
+    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: {} };
@@ -144,7 +144,7 @@ const z = (a) => {
           ) || l.value;
           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], b.push(l[r]), i[h] = l[r];
+          }), i.variables[h] = D, x.add(h), B += l[r], p.push(l[r]), i[h] = l[r];
         });
       else {
         const l = new Object();
@@ -154,18 +154,16 @@ const z = (a) => {
       }
       o.push(i);
     });
-    const s = n.toUpperCase(), c = O == "id" ? o : o.filter((e) => E.indexOf(e[p]) == -1), m = Array.from(x);
+    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[p], i[p])
+      (e, i) => V(a.sortReverse, n, e[b], i[b])
     ) : a.sort == "date" ? c.sort(
-      (e, i) => _(a.sortReverse, e[p], i[p])
+      (e, i) => _(a.sortReverse, e[b], i[b])
     ) : a.sort == "values" ? c.sort((e, i) => {
-      debugger;
       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];
-      debugger;
       return l == null ? 1 : h == null ? -1 : T(a.sortReverse, l, h);
     });
     const f = [...x];
@@ -186,7 +184,7 @@ const z = (a) => {
     }), j = {
       metadata: t.metadata,
       dimensionsMetadata: y,
-      indexBy: p,
+      indexBy: b,
       keys: O == "index" ? f : f.filter((e) => E.indexOf(e) == -1),
       data: c
     };

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

@@ -4,9 +4,9 @@ import { measuresMap as q, typesMap as G, alphaSort as K, numericSort as U, date
 const H = (t) => {
   const { data: e, measures: l, swap: m, dimensions: u, locale: v, customLabels: d } = t;
   let i = {};
-  const g = u.filter((h) => h != ""), A = /* @__PURE__ */ new Set();
-  if (g.length == 0 && e) {
-    const h = q(e), D = /* @__PURE__ */ new Set(), R = /* @__PURE__ */ new Set();
+  const h = u.filter((y) => y != ""), A = /* @__PURE__ */ new Set();
+  if (h.length == 0 && e) {
+    const y = q(e), D = /* @__PURE__ */ new Set(), R = /* @__PURE__ */ new Set();
     let E = [], j;
     if (e.metadata && e.metadata.measures) {
       const r = e.metadata.measures.filter((a) => l.includes(a.value)).sort((a, c) => a.position != null && c.position != null && a.position != c.position ? a.position - c.position : 0);
@@ -15,8 +15,9 @@ const H = (t) => {
       Object.keys(e).forEach((a) => {
         S[a] = e[a];
       }), r.forEach((a) => {
-        const c = {}, L = d[a.value] || V(h[a.value], v);
-        c.type = "measure", c.measureFieldName = a.value, c.measure = L, c[L] = e[a.value], c.variables = S, E.push(c), R.add(L), A.add(h[a.value]);
+        const c = {}, L = d[a.value] || V(y[a.value], v);
+        debugger;
+        c.type = "measure", c.measureFieldName = a.value, c.measure = L, c[L] = e[a.value], c.variables = S, E.push(c), R.add(L), A.add(y[a.value]);
       }), i = {
         categories: D,
         indexBy: j,
@@ -39,8 +40,8 @@ const H = (t) => {
   } else m.length == 2 && e.children && e.children.forEach((v) => {
     if (!(v.children.filter((i) => i.value == u).length > 0)) {
       const i = {};
-      i.type = m[1], i.value = u, i.label = u, Object.keys(v).forEach((g) => {
-        ["children", "metadata", "type", "value"].includes(g) || (i[g] = v[g]);
+      i.type = m[1], i.value = u, i.label = u, Object.keys(v).forEach((h) => {
+        ["children", "metadata", "type", "value"].includes(h) || (i[h] = v[h]);
       }), v.children = [i, ...v.children];
     }
   });
@@ -55,23 +56,25 @@ const H = (t) => {
     dimensions: v,
     includeOverall: d,
     locale: i,
-    customLabels: g,
+    customLabels: h,
     colorBy: A,
-    hiddenBars: h
+    hiddenBars: y
   } = t, D = v.filter((r) => r != "");
   if (l.metadata.measures.filter((r) => m.includes(r.value)).sort((r, S) => r.position != null && S.position != null && r.position != S.position ? r.position - S.position : 0), d && m.length == 1 && P(t), D.length == 0 && l)
     e = H(t);
   else if (l && l.children && l.children.length > 0 && D.length > 0) {
     const r = q(l), S = G(l), a = /* @__PURE__ */ new Set(), c = /* @__PURE__ */ new Set(), L = /* @__PURE__ */ new Set(), M = /* @__PURE__ */ new Set(), O = [], B = l.children[0].type, x = ((j = (E = (R = l == null ? void 0 : l.metadata) == null ? void 0 : R.types) == null ? void 0 : E.find((o) => o.dimension == D[0])) == null ? void 0 : j.items) || [];
     t.sort == "alphabetically" ? x.sort(
-      (o, y) => K(t.sortReverse, i, o.value, y.value)
+      (o, g) => K(t.sortReverse, i, o.value, g.value)
     ) : t.sort == "values" ? x.sort(
-      (o, y) => U(t.sortReverse, o.value, y.value)
+      (o, g) => U(t.sortReverse, o.value, g.value)
     ) : t.sort == "date" && x.sort(
-      (o, y) => T(t.sortReverse, o.value, y.value)
+      (o, g) => T(t.sortReverse, o.value, g.value)
     ), m.forEach((o) => {
-      const y = { variables: {} };
-      y.id = V(r[o], i), y.label = V(r[o], i);
+      const g = { variables: {} };
+      g.id = V(r[o], i);
+      debugger;
+      g.label = h[o] || V(r[o], i);
       const N = [];
       x.forEach((s) => {
         const n = l.children.find((f) => f.value === s.value);
@@ -79,12 +82,12 @@ const H = (t) => {
           const f = {};
           Object.keys(n).forEach((C) => {
             f[C] = n[C];
-          }), f.value = n[o], f[n.type] = n.value.toString(), c.add(S[n.type]), N.push({ x: n.value, y: n[o], variables: f }), y.data = N;
+          }), f.value = n[o], f[n.type] = n.value.toString(), c.add(S[n.type]), N.push({ x: n.value, y: n[o], variables: f }), g.data = N;
         }
-      }), O.push(y);
+      }), O.push(g);
     });
     const k = Array.from(M);
-    let I = (h == null ? void 0 : h.length) > 0 && (O == null ? void 0 : O.length) > 0 ? O.filter((o) => h.indexOf(o[B]) == -1) : O;
+    let I = (y == null ? void 0 : y.length) > 0 && (O == null ? void 0 : O.length) > 0 ? O.filter((o) => y.indexOf(o[B]) == -1) : O;
     e = {
       metadata: l.metadata,
       indexBy: B,
@@ -100,7 +103,7 @@ const H = (t) => {
     (r) => F.cloneElement(r, { options: e })
   );
 }, X = (t) => {
-  var h, D, R, E, j, r, S;
+  var y, D, R, E, j, r, S;
   const {
     data: e,
     measures: l,
@@ -109,12 +112,12 @@ const H = (t) => {
     hiddenBars: v,
     colorBy: d,
     locale: i
-  } = t, g = u.filter((a) => a != "");
+  } = t, h = u.filter((a) => a != "");
   let A = {};
-  if (m && P(t), g.length == 0 && e)
+  if (m && P(t), h.length == 0 && e)
     A = H(t);
-  else if (e && e.children && e.children.length > 0 && g.length > 0) {
-    const a = q(e), c = G(e), L = l[0], M = /* @__PURE__ */ new Set(), O = /* @__PURE__ */ new Set(), B = [], x = [], k = (h = e.children[0]) == null ? void 0 : h.type, I = ((E = (R = (D = e == null ? void 0 : e.metadata) == null ? void 0 : D.types) == null ? void 0 : R.find((s) => s.dimension == g[0])) == null ? void 0 : E.items) || [], o = ((S = (r = (j = e == null ? void 0 : e.metadata) == null ? void 0 : j.types) == null ? void 0 : r.find((s) => s.dimension == g[1])) == null ? void 0 : S.items) || [];
+  else if (e && e.children && e.children.length > 0 && h.length > 0) {
+    const a = q(e), c = G(e), L = l[0], M = /* @__PURE__ */ new Set(), O = /* @__PURE__ */ new Set(), B = [], x = [], k = (y = e.children[0]) == null ? void 0 : y.type, I = ((E = (R = (D = e == null ? void 0 : e.metadata) == null ? void 0 : D.types) == null ? void 0 : R.find((s) => s.dimension == h[0])) == null ? void 0 : E.items) || [], o = ((S = (r = (j = e == null ? void 0 : e.metadata) == null ? void 0 : j.types) == null ? void 0 : r.find((s) => s.dimension == h[1])) == null ? void 0 : S.items) || [];
     t.sortSecondDimension == "alphabetically" ? o.sort(
       (s, n) => K(t.sortReverseSecondDimension, i, s.value, n.value)
     ) : t.sortSecondDimension == "date" && o.sort(
@@ -142,14 +145,14 @@ const H = (t) => {
     }), x.forEach((s) => {
       s.data.sort((n, f) => t.sort == "alphabetically" ? K(t.sortReverse, i, n.x, f.x) : t.sort == "date" ? T(t.sortReverse, n.x, f.x) : 0);
     });
-    const y = d == "id" ? x : x.filter((s) => v.indexOf(s[k]) == -1), N = [...B];
+    const g = d == "id" ? x : x.filter((s) => v.indexOf(s[k]) == -1), N = [...B];
     A = {
       metadata: e.metadata,
       dimensionsMetadata: M,
       measuresMetadata: O,
       indexBy: k,
       keys: d == "index" ? N : N.filter((s) => v.indexOf(s) == -1),
-      data: y
+      data: g
     };
   }
   return /* @__PURE__ */ J(Q, { children: F.Children.map(

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

@@ -1,8 +1,10 @@
 const u = (e) => e == null ? void 0 : e.map((t) => {
   const a = t.group.label;
+  debugger;
   return t.label.includes(a) ? t : {
     ...t,
-    label: `${a} - ${t.label}`
+    //label: `${groupName} - ${item.label}`,
+    label: `${t.label}`
   };
 }), l = (e) => {
   const { metadata: r } = e || {}, t = {}, a = u((r == null ? void 0 : r.measures) || []);