@devgateway/dvz-ui-react 1.9.8 → 1.9.9

package/dist/cjs/embeddable/map/MapDataFrame.js

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const z=require("react"),Q=M=>{const{data:o,measures:S,customMeasureLabels:g,children:B,source:O,extraDimension:d,allDimensions:D}=M;console.log("MapDataFrame props:",M);const x=(O||"").split("/").filter(Boolean),h=x.length>0?x[0]:null,f={locationsData:[],nationalData:{},measureLabelMap:{}};o.metadata&&o.metadata.measures&&Array.isArray(o.metadata.measures),o.children&&o.children[0]&&o.children[0].children;const p=o.metadata||{},P=["value","count","type","children","label","measure"],E=D&&D.length>0?D:p.types||[],y={};E.forEach(e=>{const n=e.category||e.type;n&&(y[n]=e.items||[])});const F=(e,n)=>{const t=y[e];if(!t)return null;const r=n!=null?String(n):n;return t.find(a=>{const l=a.value!=null?String(a.value):a.value,i=a.id!=null?String(a.id):a.id,s=a.code!=null?String(a.code):a.code;return l===r||i===r||s===r})||null},u=(e,n)=>{const t=F(e,n);return t?t.value??t.label??t.id??t.code??n:n},j=(e={})=>{const n={};return Object.keys(e).forEach(t=>{const r=e[t];r!=null&&(Array.isArray(r)?n[t]=r.map(a=>u(t,a)).join(" ,"):n[t]=u(t,r))}),n},I=e=>{const n=y[e]||[];return n.length===1?u(e,n[0].value??n[0].id??n[0].code):null},c=e=>e!=null&&e!=="",L=e=>{if(e)return c(e.value)?e.value:c(e.id)?e.id:e.code},b=e=>e==null?"":String(e).trim().toLowerCase().replace(/[^a-z0-9]+/g,"_").replace(/^_+|_+$/g,""),v=(e,n)=>{if(!e)return;const t=b(n),r=e[n];if(r!=null&&r!=="")return r;const a=Object.keys(e);for(let l=0;l<a.length;l++){const i=a[l];if(b(i)===t){const s=e[i];if(s!=null&&s!=="")return s}}},K=(e,n)=>{const t=[h,"country",e.type].filter(Boolean),r=[v(n,"country"),v(e,"country"),h?v(n,h):void 0,h?v(e,h):void 0,e.label,e.value].filter(a=>c(a));for(let a=0;a<t.length;a++){const l=t[a],i=y[l]||[];if(i.length)for(let s=0;s<r.length;s++){const _=r[s],G=b(_),w=i.findIndex(H=>{const J=L(H);return b(J)===G});if(w>=0)return w}}return-1},N=(e,n,t)=>{const r=K(n,t);if(r<0)return;const a=y[e]||[];if(!a.length||r>=a.length)return;const l=L(a[r]);if(c(l))return u(e,l)},q=(e,n,t)=>{const r=v(t,e);if(c(r))return r;if(c(A[e]))return A[e];const a=v(n,e);if(c(a))return a;const l=N(e,n,t);if(c(l))return l;const i=I(e);if(c(i))return i;const s=n.value;return F(e,s)?u(e,s):""},V=o.appliedFilters||{};let R=null;if(d){const e=V[d]?V[d][0]:void 0;R=u(d,e)}const A=j(V),$=e=>{const n={};return Object.keys(e).forEach(t=>{P.includes(t)||(n[t]=e[t])}),e.type&&e.value!==void 0&&(n[e.type]=u(e.type,e.value)),n},C=e=>{let n=$(e);return e.children&&Array.isArray(e.children)&&e.children.forEach(t=>{n={...n,...C(t)}}),n},T=(e,n)=>{if(!(!e.children||!Array.isArray(e.children)))return e.children.map(t=>({...t,label:t.value,value:t[n],variables:C(t),children:T(t,n)}))};p.measures&&p.measures.forEach(e=>{g&&g[e.value]&&g[e.value].hasCustomLabel&&g[e.value].customLabel?f.measureLabelMap[e.value]=g[e.value].customLabel:f.measureLabelMap[e.value]=e.label});const m=S.split(",");return o&&o.children&&(o.children.forEach(e=>{m.forEach(n=>{const t={...C(e),...A};E.forEach(a=>{const l=a.category||a.type;l&&(t[l]=q(l,e,t))});const r={...e,label:e.value,value:e[n],measure:n,variables:t};r.variables.selectedDataFrameTooltipValue=e[n],d&&(r.variables[d]=R),r.children=T(e,n),f.locationsData.push(r)})}),f.measures=m.length>1?m:null,f.nationalData.value=o[S]||o[m[0]]),z.Children.map(B,e=>z.cloneElement(e,{transformedData:{...f,types:p.types?p.types:[]}}))};exports.default=Q;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const K=require("react"),ee=x=>{var P,j;const{data:l,measures:D,customMeasureLabels:h,children:W,source:B,extraDimension:A,allDimensions:C}=x;console.log("MapDataFrame props:",x);const T=(B||"").split("/").filter(Boolean),y=T.length>0?T[0]:null,i={locationsData:[],nationalData:{},measureLabelMap:{}};l.metadata&&l.metadata.measures&&Array.isArray(l.metadata.measures),l.children&&l.children[0]&&l.children[0].children;const L=l.metadata||{},q=["value","count","type","children","label","measure"],O=C&&C.length>0?C:L.types||[],b={};O.forEach(e=>{const n=e.category||e.type;n&&(b[n]=e.items||[])});const w=(e,n)=>{const a=b[e];if(!a)return null;const t=n!=null?String(n):n;return a.find(r=>{const o=r.value!=null?String(r.value):r.value,c=r.id!=null?String(r.id):r.id,s=r.code!=null?String(r.code):r.code;return o===t||c===t||s===t})||null},f=(e,n)=>{const a=w(e,n);return a?a.value??a.label??a.id??a.code??n:n},J=(e={})=>{const n={};return Object.keys(e).forEach(a=>{const t=e[a];t!=null&&(Array.isArray(t)?n[a]=t.map(r=>f(a,r)).join(" ,"):n[a]=f(a,t))}),n},$=e=>{const n=b[e]||[];return n.length===1?f(e,n[0].value??n[0].id??n[0].code):null},d=e=>e!=null&&e!=="",R=e=>{if(e)return d(e.value)?e.value:d(e.id)?e.id:e.code},V=e=>e==null?"":String(e).trim().toLowerCase().replace(/[^a-z0-9]+/g,"_").replace(/^_+|_+$/g,""),v=(e,n)=>{if(!e)return;const a=V(n),t=e[n];if(t!=null&&t!=="")return t;const r=Object.keys(e);for(let o=0;o<r.length;o++){const c=r[o];if(V(c)===a){const s=e[c];if(s!=null&&s!=="")return s}}},G=(e,n)=>{const a=[y,"country",e.type].filter(Boolean),t=[v(n,"country"),v(e,"country"),y?v(n,y):void 0,y?v(e,y):void 0,e.label,e.value].filter(r=>d(r));for(let r=0;r<a.length;r++){const o=a[r],c=b[o]||[];if(c.length)for(let s=0;s<t.length;s++){const g=t[s],U=V(g),N=c.findIndex(k=>{const m=R(k);return V(m)===U});if(N>=0)return N}}return-1},H=(e,n,a)=>{const t=G(n,a);if(t<0)return;const r=b[e]||[];if(!r.length||t>=r.length)return;const o=R(r[t]);if(d(o))return f(e,o)},Q=(e,n,a)=>{const t=v(a,e);if(d(t))return t;if(d(S[e]))return S[e];const r=v(n,e);if(d(r))return r;const o=H(e,n,a);if(d(o))return o;const c=$(e);if(d(c))return c;const s=n.value;return w(e,s)?f(e,s):""},E=l.appliedFilters||{};if(A){const e=E[A]?E[A][0]:void 0;f(A,e)}const S=J(E),X=e=>{const n={};return Object.keys(e).forEach(a=>{q.includes(a)||(n[a]=e[a])}),e.type&&e.value!==void 0&&(n[e.type]=f(e.type,e.value)),n},F=e=>{let n=X(e);return e.children&&Array.isArray(e.children)&&e.children.forEach(a=>{n={...n,...F(a)}}),n},_=(e,n)=>{if(!(!e.children||!Array.isArray(e.children)))return e.children.map(a=>({...a,label:a.value,value:a[n],variables:F(a),children:_(a,n)}))};L.measures&&L.measures.forEach(e=>{h&&h[e.value]&&h[e.value].hasCustomLabel&&h[e.value].customLabel?i.measureLabelMap[e.value]=h[e.value].customLabel:i.measureLabelMap[e.value]=e.label});const z=(((P=l==null?void 0:l.metadata)==null?void 0:P.measures)||[]).map(e=>e==null?void 0:e.value).filter(Boolean),u=(()=>{if(Array.isArray(D))return D.map(e=>(""+e).trim()).filter(Boolean);if(typeof D=="string"){const e=D.trim();if(!e||e==="[]")return z;if(e.startsWith("[")&&e.endsWith("]"))try{const n=JSON.parse(e);if(Array.isArray(n))return n.map(a=>(""+a).trim()).filter(Boolean)}catch{}return e.split(",").map(n=>n.trim()).filter(Boolean)}return z})(),M=((j=l==null?void 0:l.metadata)==null?void 0:j.types)||[],Y=(B||"").split("/")[0],Z=M.find(e=>e.dimension===Y)||M[0],I=(e,n)=>{var o;if(typeof(e==null?void 0:e.value)=="string")return e.value;const t=M.find(c=>c.dimension===(e==null?void 0:e.type))||Z,r=(o=t==null?void 0:t.items)==null?void 0:o[n];return(r==null?void 0:r.value)||(r==null?void 0:r.code)||(e==null?void 0:e.label)||(e==null?void 0:e.value)},p=(e,n)=>{if(e&&Object.prototype.hasOwnProperty.call(e,n))return e[n];if(n==="value")return e==null?void 0:e.value};if(l&&l.children){l.children.forEach((n,a)=>{const t=I(n,a);u.forEach(r=>{const o={...F(n),...S};O.forEach(s=>{const g=s.category||s.type;g&&(o[g]=Q(g,n,o))});const c={...n,label:t,value:p(n,r),measure:r,variables:o};c.variables.selectedDataFrameTooltipValue=p(n,r),n.children&&(c.children=[],n.children.forEach(s=>{c.children.push({...s,label:s.value,value:p(s,r)})})),c.children=_(n,r),i.locationsData.push(c)})}),i.measures=u.length>1?u:null;const e=u.length>0?u[0]:null;i.nationalData.value=e?p(l,e):null}else if(l&&u.length>0){const e=typeof l.value=="string"&&l.value||l.label||l.type||"total";u.forEach(n=>{const a=p(l,n);a!==void 0&&i.locationsData.push({label:e,value:a,measure:n})}),i.measures=u.length>1?u:null,i.nationalData.value=p(l,u[0])}return K.Children.map(W,e=>K.cloneElement(e,{transformedData:{...i,types:M}}))};exports.default=ee;

package/dist/esm/embeddable/map/MapDataFrame.js

@@ -1,165 +1,211 @@
-import T from "react";
-const U = (x) => {
-  const { data: o, measures: M, customMeasureLabels: g, children: O, source: _, extraDimension: d, allDimensions: D } = x;
-  console.log("MapDataFrame props:", x);
-  const E = (_ || "").split("/").filter(Boolean), p = E.length > 0 ? E[0] : null, f = {
+import K from "react";
+const ae = (S) => {
+  var P, _;
+  const { data: l, measures: D, customMeasureLabels: h, children: W, source: B, extraDimension: A, allDimensions: C } = S;
+  console.log("MapDataFrame props:", S);
+  const T = (B || "").split("/").filter(Boolean), y = T.length > 0 ? T[0] : null, u = {
     locationsData: [],
     nationalData: {},
     measureLabelMap: {}
   };
-  o.metadata && o.metadata.measures && Array.isArray(o.metadata.measures), o.children && o.children[0] && o.children[0].children;
-  const h = o.metadata || {}, I = ["value", "count", "type", "children", "label", "measure"], F = D && D.length > 0 ? D : h.types || [], y = {};
-  F.forEach((e) => {
+  l.metadata && l.metadata.measures && Array.isArray(l.metadata.measures), l.children && l.children[0] && l.children[0].children;
+  const L = l.metadata || {}, J = ["value", "count", "type", "children", "label", "measure"], O = C && C.length > 0 ? C : L.types || [], b = {};
+  O.forEach((e) => {
     const n = e.category || e.type;
-    n && (y[n] = e.items || []);
+    n && (b[n] = e.items || []);
   });
-  const L = (e, n) => {
-    const a = y[e];
+  const w = (e, n) => {
+    const a = b[e];
     if (!a)
       return null;
-    const r = n != null ? String(n) : n;
-    return a.find((t) => {
-      const l = t.value != null ? String(t.value) : t.value, i = t.id != null ? String(t.id) : t.id, s = t.code != null ? String(t.code) : t.code;
-      return l === r || i === r || s === r;
+    const t = n != null ? String(n) : n;
+    return a.find((r) => {
+      const o = r.value != null ? String(r.value) : r.value, c = r.id != null ? String(r.id) : r.id, s = r.code != null ? String(r.code) : r.code;
+      return o === t || c === t || s === t;
     }) || null;
-  }, u = (e, n) => {
-    const a = L(e, n);
+  }, f = (e, n) => {
+    const a = w(e, n);
     return a ? a.value ?? a.label ?? a.id ?? a.code ?? n : n;
-  }, K = (e = {}) => {
+  }, $ = (e = {}) => {
     const n = {};
     return Object.keys(e).forEach((a) => {
-      const r = e[a];
-      r != null && (Array.isArray(r) ? n[a] = r.map((t) => u(a, t)).join(" ,") : n[a] = u(a, r));
+      const t = e[a];
+      t != null && (Array.isArray(t) ? n[a] = t.map((r) => f(a, r)).join(" ,") : n[a] = f(a, t));
     }), n;
-  }, N = (e) => {
-    const n = y[e] || [];
-    return n.length === 1 ? u(e, n[0].value ?? n[0].id ?? n[0].code) : null;
-  }, c = (e) => e != null && e !== "", S = (e) => {
+  }, q = (e) => {
+    const n = b[e] || [];
+    return n.length === 1 ? f(e, n[0].value ?? n[0].id ?? n[0].code) : null;
+  }, d = (e) => e != null && e !== "", R = (e) => {
     if (e)
-      return c(e.value) ? e.value : c(e.id) ? e.id : e.code;
-  }, b = (e) => e == null ? "" : String(e).trim().toLowerCase().replace(/[^a-z0-9]+/g, "_").replace(/^_+|_+$/g, ""), v = (e, n) => {
+      return d(e.value) ? e.value : d(e.id) ? e.id : e.code;
+  }, V = (e) => e == null ? "" : String(e).trim().toLowerCase().replace(/[^a-z0-9]+/g, "_").replace(/^_+|_+$/g, ""), p = (e, n) => {
     if (!e)
       return;
-    const a = b(n), r = e[n];
-    if (r != null && r !== "")
-      return r;
-    const t = Object.keys(e);
-    for (let l = 0; l < t.length; l++) {
-      const i = t[l];
-      if (b(i) === a) {
-        const s = e[i];
+    const a = V(n), t = e[n];
+    if (t != null && t !== "")
+      return t;
+    const r = Object.keys(e);
+    for (let o = 0; o < r.length; o++) {
+      const c = r[o];
+      if (V(c) === a) {
+        const s = e[c];
         if (s != null && s !== "")
           return s;
       }
     }
-  }, P = (e, n) => {
+  }, G = (e, n) => {
     const a = [
-      p,
+      y,
       "country",
       e.type
-    ].filter(Boolean), r = [
-      v(n, "country"),
-      v(e, "country"),
-      p ? v(n, p) : void 0,
-      p ? v(e, p) : void 0,
+    ].filter(Boolean), t = [
+      p(n, "country"),
+      p(e, "country"),
+      y ? p(n, y) : void 0,
+      y ? p(e, y) : void 0,
       e.label,
       e.value
-    ].filter((t) => c(t));
-    for (let t = 0; t < a.length; t++) {
-      const l = a[t], i = y[l] || [];
-      if (i.length)
-        for (let s = 0; s < r.length; s++) {
-          const z = r[s], G = b(z), B = i.findIndex((H) => {
-            const J = S(H);
-            return b(J) === G;
+    ].filter((r) => d(r));
+    for (let r = 0; r < a.length; r++) {
+      const o = a[r], c = b[o] || [];
+      if (c.length)
+        for (let s = 0; s < t.length; s++) {
+          const g = t[s], U = V(g), j = c.findIndex((k) => {
+            const m = R(k);
+            return V(m) === U;
           });
-          if (B >= 0)
-            return B;
+          if (j >= 0)
+            return j;
         }
     }
     return -1;
-  }, j = (e, n, a) => {
-    const r = P(n, a);
-    if (r < 0)
+  }, H = (e, n, a) => {
+    const t = G(n, a);
+    if (t < 0)
       return;
-    const t = y[e] || [];
-    if (!t.length || r >= t.length)
+    const r = b[e] || [];
+    if (!r.length || t >= r.length)
       return;
-    const l = S(t[r]);
-    if (c(l))
-      return u(e, l);
-  }, $ = (e, n, a) => {
-    const r = v(a, e);
-    if (c(r))
-      return r;
-    if (c(A[e]))
-      return A[e];
-    const t = v(n, e);
-    if (c(t))
+    const o = R(r[t]);
+    if (d(o))
+      return f(e, o);
+  }, Q = (e, n, a) => {
+    const t = p(a, e);
+    if (d(t))
       return t;
-    const l = j(e, n, a);
-    if (c(l))
-      return l;
-    const i = N(e);
-    if (c(i))
-      return i;
+    if (d(x[e]))
+      return x[e];
+    const r = p(n, e);
+    if (d(r))
+      return r;
+    const o = H(e, n, a);
+    if (d(o))
+      return o;
+    const c = q(e);
+    if (d(c))
+      return c;
     const s = n.value;
-    return L(e, s) ? u(e, s) : "";
-  }, V = o.appliedFilters || {};
-  let R = null;
-  if (d) {
-    const e = V[d] ? V[d][0] : void 0;
-    R = u(d, e);
+    return w(e, s) ? f(e, s) : "";
+  }, E = l.appliedFilters || {};
+  if (A) {
+    const e = E[A] ? E[A][0] : void 0;
+    f(A, e);
   }
-  const A = K(V), q = (e) => {
+  const x = $(E), X = (e) => {
     const n = {};
     return Object.keys(e).forEach((a) => {
-      I.includes(a) || (n[a] = e[a]);
-    }), e.type && e.value !== void 0 && (n[e.type] = u(e.type, e.value)), n;
-  }, C = (e) => {
-    let n = q(e);
+      J.includes(a) || (n[a] = e[a]);
+    }), e.type && e.value !== void 0 && (n[e.type] = f(e.type, e.value)), n;
+  }, F = (e) => {
+    let n = X(e);
     return e.children && Array.isArray(e.children) && e.children.forEach((a) => {
-      n = { ...n, ...C(a) };
+      n = { ...n, ...F(a) };
     }), n;
-  }, w = (e, n) => {
+  }, z = (e, n) => {
     if (!(!e.children || !Array.isArray(e.children)))
       return e.children.map((a) => ({
         ...a,
         label: a.value,
         value: a[n],
-        variables: C(a),
-        children: w(a, n)
+        variables: F(a),
+        children: z(a, n)
       }));
   };
-  h.measures && h.measures.forEach((e) => {
-    g && g[e.value] && g[e.value].hasCustomLabel && g[e.value].customLabel ? f.measureLabelMap[e.value] = g[e.value].customLabel : f.measureLabelMap[e.value] = e.label;
+  L.measures && L.measures.forEach((e) => {
+    h && h[e.value] && h[e.value].hasCustomLabel && h[e.value].customLabel ? u.measureLabelMap[e.value] = h[e.value].customLabel : u.measureLabelMap[e.value] = e.label;
   });
-  const m = M.split(",");
-  return o && o.children && (o.children.forEach((e) => {
-    m.forEach((n) => {
-      const a = {
-        ...C(e),
-        // Dynamic fields for both formats, including nested dimensions
-        ...A
-      };
-      F.forEach((t) => {
-        const l = t.category || t.type;
-        l && (a[l] = $(l, e, a));
+  const N = (((P = l == null ? void 0 : l.metadata) == null ? void 0 : P.measures) || []).map((e) => e == null ? void 0 : e.value).filter(Boolean), i = (() => {
+    if (Array.isArray(D))
+      return D.map((e) => ("" + e).trim()).filter(Boolean);
+    if (typeof D == "string") {
+      const e = D.trim();
+      if (!e || e === "[]")
+        return N;
+      if (e.startsWith("[") && e.endsWith("]"))
+        try {
+          const n = JSON.parse(e);
+          if (Array.isArray(n))
+            return n.map((a) => ("" + a).trim()).filter(Boolean);
+        } catch {
+        }
+      return e.split(",").map((n) => n.trim()).filter(Boolean);
+    }
+    return N;
+  })(), M = ((_ = l == null ? void 0 : l.metadata) == null ? void 0 : _.types) || [], Y = (B || "").split("/")[0], Z = M.find((e) => e.dimension === Y) || M[0], I = (e, n) => {
+    var o;
+    if (typeof (e == null ? void 0 : e.value) == "string")
+      return e.value;
+    const t = M.find((c) => c.dimension === (e == null ? void 0 : e.type)) || Z, r = (o = t == null ? void 0 : t.items) == null ? void 0 : o[n];
+    return (r == null ? void 0 : r.value) || (r == null ? void 0 : r.code) || (e == null ? void 0 : e.label) || (e == null ? void 0 : e.value);
+  }, v = (e, n) => {
+    if (e && Object.prototype.hasOwnProperty.call(e, n))
+      return e[n];
+    if (n === "value")
+      return e == null ? void 0 : e.value;
+  };
+  if (l && l.children) {
+    l.children.forEach((n, a) => {
+      const t = I(n, a);
+      i.forEach((r) => {
+        const o = {
+          ...F(n),
+          // Dynamic fields for both formats, including nested dimensions
+          ...x
+        };
+        O.forEach((s) => {
+          const g = s.category || s.type;
+          g && (o[g] = Q(g, n, o));
+        });
+        const c = {
+          ...n,
+          label: t,
+          value: v(n, r),
+          measure: r,
+          variables: o
+        };
+        c.variables.selectedDataFrameTooltipValue = v(n, r), n.children && (c.children = [], n.children.forEach((s) => {
+          c.children.push({ ...s, label: s.value, value: v(s, r) });
+        })), c.children = z(n, r), u.locationsData.push(c);
       });
-      const r = {
-        ...e,
-        label: e.value,
-        value: e[n],
-        measure: n,
-        variables: a
-      };
-      r.variables.selectedDataFrameTooltipValue = e[n], d && (r.variables[d] = R), r.children = w(e, n), f.locationsData.push(r);
-    });
-  }), f.measures = m.length > 1 ? m : null, f.nationalData.value = o[M] || o[m[0]]), T.Children.map(O, (e) => T.cloneElement(e, { transformedData: {
-    ...f,
-    types: h.types ? h.types : []
+    }), u.measures = i.length > 1 ? i : null;
+    const e = i.length > 0 ? i[0] : null;
+    u.nationalData.value = e ? v(l, e) : null;
+  } else if (l && i.length > 0) {
+    const e = typeof l.value == "string" && l.value || l.label || l.type || "total";
+    i.forEach((n) => {
+      const a = v(l, n);
+      a !== void 0 && u.locationsData.push({
+        label: e,
+        value: a,
+        measure: n
+      });
+    }), u.measures = i.length > 1 ? i : null, u.nationalData.value = v(l, i[0]);
+  }
+  return K.Children.map(W, (e) => K.cloneElement(e, { transformedData: {
+    ...u,
+    types: M
   } }));
 };
 export {
-  U as default
+  ae as default
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devgateway/dvz-ui-react",
-  "version": "1.9.8",
+  "version": "1.9.9",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
   "types": "dist/types/index.d.ts",