@devgateway/dvz-ui-react 1.6.20 → 1.7.0

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
     };