@devgateway/dvz-ui-react 1.9.6 → 1.9.8

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

@@ -1,31 +1,165 @@
-import c from "react";
-const i = (d) => {
-  const { data: e, measures: o, customMeasureLabels: t, children: h, source: m } = d, l = {
+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 = {
     locationsData: [],
     nationalData: {},
     measureLabelMap: {}
   };
-  e.metadata && e.metadata.measures && e.metadata.measures.forEach((a) => {
-    t && t[a.value] && t[a.value].hasCustomLabel && t[a.value].customLabel ? l.measureLabelMap[a.value] = t[a.value].customLabel : l.measureLabelMap[a.value] = a.label;
+  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) => {
+    const n = e.category || e.type;
+    n && (y[n] = e.items || []);
   });
-  const s = o.split(",");
-  return e && e.children && (e.children.forEach((a) => {
-    s.forEach((r) => {
-      const u = {
+  const L = (e, n) => {
+    const a = y[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;
+    }) || null;
+  }, u = (e, n) => {
+    const a = L(e, n);
+    return a ? a.value ?? a.label ?? a.id ?? a.code ?? n : n;
+  }, K = (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));
+    }), 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) => {
+    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 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];
+        if (s != null && s !== "")
+          return s;
+      }
+    }
+  }, P = (e, n) => {
+    const a = [
+      p,
+      "country",
+      e.type
+    ].filter(Boolean), r = [
+      v(n, "country"),
+      v(e, "country"),
+      p ? v(n, p) : void 0,
+      p ? v(e, p) : 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;
+          });
+          if (B >= 0)
+            return B;
+        }
+    }
+    return -1;
+  }, j = (e, n, a) => {
+    const r = P(n, a);
+    if (r < 0)
+      return;
+    const t = y[e] || [];
+    if (!t.length || r >= t.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))
+      return t;
+    const l = j(e, n, a);
+    if (c(l))
+      return l;
+    const i = N(e);
+    if (c(i))
+      return i;
+    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);
+  }
+  const A = K(V), q = (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);
+    return e.children && Array.isArray(e.children) && e.children.forEach((a) => {
+      n = { ...n, ...C(a) };
+    }), n;
+  }, w = (e, n) => {
+    if (!(!e.children || !Array.isArray(e.children)))
+      return e.children.map((a) => ({
         ...a,
         label: a.value,
-        value: a[r],
-        measure: r
+        value: a[n],
+        variables: C(a),
+        children: w(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;
+  });
+  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 r = {
+        ...e,
+        label: e.value,
+        value: e[n],
+        measure: n,
+        variables: a
       };
-      a.children && (u.children = [], a.children.forEach((n) => {
-        u.children.push({ ...n, label: n.value, value: n[r] });
-      })), l.locationsData.push(u);
+      r.variables.selectedDataFrameTooltipValue = e[n], d && (r.variables[d] = R), r.children = w(e, n), f.locationsData.push(r);
     });
-  }), l.measures = s.length > 1 ? s : null, l.nationalData.value = e[o]), c.Children.map(h, (a) => c.cloneElement(a, { transformedData: {
-    ...l,
-    types: e.metadata ? e.metadata.types : []
+  }), 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 : []
   } }));
 };
 export {
-  i as default
+  U as default
 };

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

@@ -1,12 +1,13 @@
-import { jsx as r } from "react/jsx-runtime";
-import "react";
-import { connect as Va } from "react-redux";
-import Wa from "../data/DataProvider.js";
-import Ga from "../data/DataConsumer.js";
-import ja from "./map.js";
-import Za from "./MapDataFrame.js";
-import Ha from "./MapCSVDataFrame.js";
-const Ja = [
+import { jsx as i } from "react/jsx-runtime";
+import { useMemo as He, useEffect as Ke } from "react";
+import { connect as qe, useDispatch as Ye, useSelector as $e } from "react-redux";
+import Qe from "../data/DataProvider.js";
+import Xe from "../data/DataConsumer.js";
+import { getCategories as _e } from "../reducers/data.js";
+import ea from "./map.js";
+import aa from "./MapDataFrame.js";
+import ta from "./MapCSVDataFrame.js";
+const oa = [
   { label: "KENYA", value: "KEN", center: [35.8166634, 0.1], scale: 2e3 },
   { label: "Nigeria", value: "NGA", center: [7.491302, 9.072264], scale: 2e3 },
   { label: "South Africa", value: "ZAF", center: [24.676997, -28.48322], scale: 2e3 },
@@ -16,212 +17,222 @@ const Ja = [
   { label: "Zambia", value: "ZMB", center: [26.459455, -14.668135], scale: 2e3 },
   { label: "Democratic Republic of the Congo", value: "DRC", center: [23.174338, -5.837475], scale: 1250 },
   { label: "World", value: "World", center: [0, 20.050043], scale: 150 }
-], Ka = (n) => /* @__PURE__ */ r(qa, { ...n }), qa = (n) => {
-  var B;
+], la = (n) => /* @__PURE__ */ i(ra, { ...n }), ra = (n) => {
+  var E;
   const {
-    unique: c,
-    editing: s,
-    "data-filters": E = "{}",
-    "data-app": i = "csv",
+    unique: u,
+    editing: d,
+    "data-filters": P = "{}",
+    "data-app": o = "csv",
     "data-csv": k = "",
-    "data-dimension1": M = "",
-    "data-dimension2": P = "",
-    "data-measures": u = "[]",
-    "data-height": O = 600,
-    width: V = 960,
-    "data-data-source-text": W = "",
-    "data-data-source-label": G = "Source",
-    "data-national-average-label": j = "National Average",
-    "data-legend-title": Z = "Legend Title",
-    "data-legend-breaks": H = "[]",
-    "data-zoom-enabled": b = !1,
-    "data-show-legend-labels": h = !1,
-    "data-map-file": J,
-    "data-mapping-field": K = "zone",
-    "data-map-label-field": q = "admin",
-    "data-has-multiple-measures": C = "false",
-    topoJSONField: Y = "collection",
-    "data-map-center": $ = "NGA",
+    "data-dimension1": O = "",
+    "data-dimension2": W = "",
+    "data-dimension3": p = "",
+    "data-measures": f = "[]",
+    "data-height": V = 600,
+    width: G = 960,
+    "data-data-source-text": j = "",
+    "data-data-source-label": J = "Source",
+    "data-national-average-label": Z = "National Average",
+    "data-legend-title": H = "Legend Title",
+    "data-legend-breaks": K = "[]",
+    "data-zoom-enabled": C = !1,
+    "data-show-legend-labels": y = !1,
+    "data-map-file": q,
+    "data-mapping-field": Y = "zone",
+    "data-map-label-field": $ = "admin",
+    "data-has-multiple-measures": v = "false",
+    topoJSONField: Q = "collection",
+    "data-map-center": X = "NGA",
     //country
-    "data-map-label-show-value": y = "false",
-    "data-show-tooltip": F = "true",
-    "data-measure-selector-label": Q = "",
-    "data-value-format": X = "",
-    "data-show-overall-value": v = "false",
-    "data-auto-generate-breaks": L = "false",
-    "data-number-of-breaks": _ = 5,
-    "data-scheme": aa = "reds",
-    "data-show-no-data-label": w = "false",
-    "data-group": S = "default",
-    "data-map-symbols": ea = "[]",
-    "data-tooltip-theme": ta = "map-tooltip-dark",
-    "data-label-font-size": oa = 12,
-    "data-label-font-weight": la = "normal",
-    "data-label-font-color": ra = "#595959",
-    "data-legend-font-size": na = 12,
-    "data-legend-font-weight": sa = "normal",
-    "data-custom-tooltips": ia = "[]",
-    "data-format-style": p = "decimal",
-    "data-decimals": D = "2",
-    "data-currency": da = "",
-    "data-tooltip-font-size": ma = 14,
-    "data-show-admin-unit-label": ca = "showAll",
-    "data-map-no-data-color": ua = "#f8f8f8",
-    "data-map-boundary-color": pa = "#000",
-    "data-map-focus-boundary-color": fa = "#000",
-    "data-highlighted-location": ga = "",
-    "data-tooltip-format": ba = `{locationName} %({value},2) 
+    "data-map-label-show-value": F = "false",
+    "data-show-tooltip": L = "true",
+    "data-measure-selector-label": _ = "",
+    "data-value-format": ee = "",
+    "data-show-overall-value": w = "false",
+    "data-auto-generate-breaks": D = "false",
+    "data-number-of-breaks": ae = 5,
+    "data-scheme": te = "reds",
+    "data-show-no-data-label": S = "false",
+    "data-group": I = "default",
+    "data-map-symbols": oe = "[]",
+    "data-tooltip-theme": le = "map-tooltip-dark",
+    "data-label-font-size": re = 12,
+    "data-label-font-weight": ne = "normal",
+    "data-label-font-color": se = "#595959",
+    "data-legend-font-size": ie = 12,
+    "data-legend-font-weight": de = "normal",
+    "data-custom-tooltips": me = "[]",
+    "data-format-style": g = "decimal",
+    "data-decimals": N = "2",
+    "data-currency": ce = "",
+    "data-tooltip-font-size": ue = 14,
+    "data-show-admin-unit-label": pe = "showAll",
+    "data-map-no-data-color": fe = "#f8f8f8",
+    "data-map-boundary-color": ge = "#000",
+    "data-map-focus-boundary-color": he = "#000",
+    "data-highlighted-location": be = "",
+    "data-tooltip-format": Ce = `{locationName} %({value},2) 
  {label}: %({value},2)`,
-    "data-show-no-data-tooltip": I = "false",
-    "data-map-container-bg-color": ha = "#fff",
-    "data-map-position": Ca = "{}",
-    "data-main-layer-id": ya = "",
-    "data-enabled-layers": Fa,
-    "data-point-label-color": va = "#fff",
-    "data-point-label-format": La = "{locationName} %({value},2)",
-    "data-show-no-data-legend-item": N = !1,
-    "data-highlighted-loc-label-format": wa = "{locationName} - Score: #({value},2)",
-    "data-enable-summary-view": Qa = "false",
-    "data-map-type": z = "DEFAULT",
-    "data-default-point-color": Sa = "#FFFF00",
-    "data-aggregation-formula": Da = "COUNT",
-    "data-zoom-level-to-show-points": Ia = 2,
-    "data-zoom-on-filter": T = "false",
-    "data-zoom-on-filter-field": Na = "",
-    "data-no-data-text": za = "No Data",
-    "data-labels-exclusion-list": Ta = "",
-    "data-custom-measure-labels": xa = "{}",
-    "data-show-shading-layer-labels": Ua = "ifUnitHasData",
-    "data-dvz-proxy-dataset-id": f,
-    "data-recently-toggled-layer-id": Aa = null,
-    intl: Xa,
-    settings: _a
-  } = n, Ba = (a) => s ? a : decodeURIComponent(a), o = (a) => {
+    "data-show-no-data-tooltip": z = "false",
+    "data-map-container-bg-color": ye = "#fff",
+    "data-map-position": ve = "{}",
+    "data-main-layer-id": Fe = "",
+    "data-enabled-layers": Le,
+    "data-point-label-color": we = "#fff",
+    "data-point-label-format": De = "{locationName} %({value},2)",
+    "data-show-no-data-legend-item": T = !1,
+    "data-highlighted-loc-label-format": Se = "{locationName} - Score: #({value},2)",
+    "data-enable-summary-view": ia = "false",
+    "data-map-type": x = "DEFAULT",
+    "data-default-point-color": Ie = "#FFFF00",
+    "data-aggregation-formula": Ne = "COUNT",
+    "data-zoom-level-to-show-points": ze = 2,
+    "data-zoom-on-filter": U = "false",
+    "data-zoom-on-filter-field": Te = "",
+    "data-no-data-text": xe = "No Data",
+    "data-labels-exclusion-list": Ue = "",
+    "data-custom-measure-labels": Ae = "{}",
+    "data-show-shading-layer-labels": Be = "ifUnitHasData",
+    "data-dvz-proxy-dataset-id": r,
+    "data-recently-toggled-layer-id": Re = null,
+    intl: da,
+    settings: ma
+  } = n;
+  console.log("MapWrapper props", n);
+  const Ee = (e) => d ? e : decodeURIComponent(e), l = (e) => {
     try {
-      if (a)
-        return JSON.parse(Ba(a));
+      if (e)
+        return JSON.parse(Ee(e));
     } catch {
-      console.error("error parsing value:" + a);
+      console.error("error parsing value:" + e);
     }
     return null;
-  }, Ra = (a) => {
-    let t = o(a) || [];
-    return t = t.map((e) => (e.min && (e.min = parseFloat(e.min)), e.max && (e.max = parseFloat(e.max)), e.color = decodeURIComponent(e.color), e)), t;
-  }, Ea = (a) => {
-    const t = o(a) || [];
-    let e = {};
-    return t && t.forEach ? t.forEach((m) => {
-      m.value != null && m.value.filter((R) => R != null && R.toString().trim() != "").length > 0 && (e[m.param] = m.value);
-    }) : e = t, e;
-  }, ka = {
-    style: p === "compacted" ? "decimal" : p,
-    notation: p === "compacted" ? "compact" : "standard",
-    currency: da,
-    minimumFractionDigits: parseInt(D),
-    maximumFractionDigits: parseInt(D)
+  }, Me = (e) => {
+    let t = l(e) || [];
+    return t = t.map((a) => (a.min && (a.min = parseFloat(a.min)), a.max && (a.max = parseFloat(a.max)), a.color = decodeURIComponent(a.color), a)), t;
+  }, Pe = (e) => {
+    const t = l(e) || [];
+    let a = {};
+    return t && t.forEach ? t.forEach((c) => {
+      c.value != null && c.value.filter((M) => M != null && M.toString().trim() != "").length > 0 && (a[c.param] = c.value);
+    }) : a = t, a;
+  }, ke = {
+    style: g === "compacted" ? "decimal" : g,
+    notation: g === "compacted" ? "compact" : "standard",
+    currency: ce,
+    minimumFractionDigits: parseInt(N),
+    maximumFractionDigits: parseInt(N)
   };
-  let g = o(Fa) || [];
-  g = g.map((a) => (a.bgColor = decodeURIComponent(a.bgColor), a.fontColor = decodeURIComponent(a.fontColor), a));
-  const x = Ja.find((a) => a.value === $), U = C == !0 || C == "true";
-  let l = [M, P].filter((a) => a != "none" && a != null).join("/");
-  const d = {
-    unique: c,
-    editing: s,
-    source: `/${J}`,
-    center: x.center,
-    scale: x.scale,
-    measures: u,
-    legendTitle: Z,
-    height: O,
-    width: V,
-    topoJSONField: Y,
-    mappingField: K,
-    dataSourceText: W,
-    dataSourceLabel: G,
-    nationalAverageLabel: j,
-    legendBreaks: Ra(H),
-    mapLabelField: q,
-    zoomEnabled: b == !0 || b == "true",
-    showLegendLabels: h == !0 || h == "true",
-    multipleMeasures: U,
-    app: i,
-    mapLabelShowValue: y == !0 || y == "true",
-    showTooltip: F == !0 || F == "true",
-    showOverallValue: v == !0 || v == "true",
-    measureSelectorLabel: Q,
-    valueFormat: X,
-    autoGenerateBreaks: L == !0 || L == "true",
-    showNoDataLabel: w == !0 || w == "true",
-    numberOfBreaks: _,
-    colorScheme: aa,
-    group: S,
-    symbols: o(ea) || [],
-    tooltipTheme: ta,
-    labelFontSize: oa,
-    labelFontColor: decodeURIComponent(ra),
-    labelFontWeight: la,
-    legendFontSize: na,
-    legendFontWeight: sa,
-    customTooltips: o(ia) || [],
-    format: ka,
-    tooltipFontSize: ma,
-    showAdminUnitLabel: ca,
-    mapNoDataColor: decodeURIComponent(ua),
-    mapBoundaryColor: decodeURIComponent(pa),
-    mapFocusBoundaryColor: decodeURIComponent(fa),
-    highlightedLocation: ga,
-    tooltipFormat: ba,
-    showNoDataTooltip: I == !0 || I == "true",
-    fields: l.split("/"),
-    mapContainerBgColor: decodeURIComponent(ha),
-    mapPosition: o(Ca),
-    mainLayerId: ya,
-    enabledLayers: g,
-    pointLabelColor: decodeURIComponent(va),
-    pointLabelFormat: La,
-    showNoDataLegendItem: N == !0 || N == "true",
-    highlightedLocLabelFormat: wa,
-    mapType: z,
-    defaultPointColor: decodeURIComponent(Sa),
-    zoomLevelToShowPoints: Ia,
-    zoomOnFilter: T == !0 || T == "true",
-    zoomOnFilterField: Na,
-    noDataText: za,
-    labelsExclusionList: Ta.split(",").map((a) => a.trim()),
-    showShadingLayerLabels: Ua,
-    dvzProxyDatasetId: f,
-    recentlyToggledLayerId: Aa
+  let h = l(Le) || [];
+  h = h.map((e) => (e.bgColor = decodeURIComponent(e.bgColor), e.fontColor = decodeURIComponent(e.fontColor), e));
+  const A = oa.find((e) => e.value === X), B = v == !0 || v == "true";
+  let s = [O, W].filter((e) => e !== "none" && e !== null).join("/");
+  const Oe = p && p !== "none" ? p : null, m = {
+    unique: u,
+    editing: d,
+    source: `/${q}`,
+    center: A.center,
+    scale: A.scale,
+    measures: f,
+    legendTitle: H,
+    height: V,
+    width: G,
+    topoJSONField: Q,
+    mappingField: Y,
+    dataSourceText: j,
+    dataSourceLabel: J,
+    nationalAverageLabel: Z,
+    legendBreaks: Me(K),
+    mapLabelField: $,
+    zoomEnabled: C == !0 || C == "true",
+    showLegendLabels: y == !0 || y == "true",
+    multipleMeasures: B,
+    app: o,
+    mapLabelShowValue: F == !0 || F == "true",
+    showTooltip: L == !0 || L == "true",
+    showOverallValue: w == !0 || w == "true",
+    measureSelectorLabel: _,
+    valueFormat: ee,
+    autoGenerateBreaks: D == !0 || D == "true",
+    showNoDataLabel: S == !0 || S == "true",
+    numberOfBreaks: ae,
+    colorScheme: te,
+    group: I,
+    symbols: l(oe) || [],
+    tooltipTheme: le,
+    labelFontSize: re,
+    labelFontColor: decodeURIComponent(se),
+    labelFontWeight: ne,
+    legendFontSize: ie,
+    legendFontWeight: de,
+    customTooltips: l(me) || [],
+    format: ke,
+    tooltipFontSize: ue,
+    showAdminUnitLabel: pe,
+    mapNoDataColor: decodeURIComponent(fe),
+    mapBoundaryColor: decodeURIComponent(ge),
+    mapFocusBoundaryColor: decodeURIComponent(he),
+    highlightedLocation: be,
+    tooltipFormat: Ce,
+    showNoDataTooltip: z == !0 || z == "true",
+    fields: s.split("/"),
+    mapContainerBgColor: decodeURIComponent(ye),
+    mapPosition: l(ve),
+    mainLayerId: Fe,
+    enabledLayers: h,
+    pointLabelColor: decodeURIComponent(we),
+    pointLabelFormat: De,
+    showNoDataLegendItem: T == !0 || T == "true",
+    highlightedLocLabelFormat: Se,
+    mapType: x,
+    defaultPointColor: decodeURIComponent(Ie),
+    zoomLevelToShowPoints: ze,
+    zoomOnFilter: U == !0 || U == "true",
+    zoomOnFilterField: Te,
+    noDataText: xe,
+    labelsExclusionList: Ue.split(",").map((e) => e.trim()),
+    showShadingLayerLabels: Be,
+    dvzProxyDatasetId: r,
+    recentlyToggledLayerId: Re
   };
-  if (d.recentlyToggledLayerId) {
-    const a = d.enabledLayers.find((t) => String(t.id) === String(d.recentlyToggledLayerId));
-    a && (a != null && a.apiField) && (l = (B = a.apiField) == null ? void 0 : B.toLowerCase());
+  if (m.recentlyToggledLayerId) {
+    const e = m.enabledLayers.find((t) => String(t.id) === String(m.recentlyToggledLayerId));
+    e && (e != null && e.apiField) && (s = (E = e.apiField) == null ? void 0 : E.toLowerCase());
   }
-  const Ma = o(xa) || {}, Pa = i === "csv" ? Ha : Za, Oa = s ? (o(u) || []).join(",") : u, A = Ea(E);
-  return f && (A.dvzProxyDatasetId = f), /* @__PURE__ */ r(
-    Wa,
+  const We = l(Ae) || {}, Ve = o === "csv" ? ta : aa, Ge = d ? (l(f) || []).join(",") : f, R = Pe(P);
+  r && (R.dvzProxyDatasetId = r);
+  const je = Ye(), Je = ["data", "categories", o, ...r ? [r] : [], "items"], b = $e((e) => e.getIn(Je)), Ze = He(() => b ? b.toJS() : [], [b]);
+  return Ke(() => {
+    o && o !== "csv" && je(_e({ app: o, dvzProxyDatasetId: r }));
+  }, [o, r]), /* @__PURE__ */ i(
+    Qe,
     {
-      params: A,
-      app: i,
+      params: R,
+      app: o,
       csv: decodeURIComponent(k),
-      group: S,
-      editing: s,
-      store: [i, c, ...l.split("/")],
-      source: l,
-      children: /* @__PURE__ */ r(Ga, { children: /* @__PURE__ */ r(
-        Pa,
+      group: I,
+      editing: d,
+      store: [o, u, ...s.split("/")],
+      source: s,
+      children: /* @__PURE__ */ i(Xe, { children: /* @__PURE__ */ i(
+        Ve,
         {
-          measures: Oa,
-          multipleMeasures: U,
-          mapType: z,
-          aggregationFormula: Da,
-          customMeasureLabels: Ma,
-          source: l,
-          children: /* @__PURE__ */ r(ja, { ...d })
+          measures: Ge,
+          multipleMeasures: B,
+          mapType: x,
+          aggregationFormula: Ne,
+          customMeasureLabels: We,
+          source: s,
+          extraDimension: Oe,
+          allDimensions: Ze,
+          children: /* @__PURE__ */ i(ea, { ...m })
         }
       ) })
     }
   );
-}, Ya = (n, c) => ({}), $a = {}, de = Va(Ya, $a)(Ka);
+}, na = (n, u) => {
+}, sa = {}, Fa = qe(na, sa)(la);
 export {
-  de as default
+  Fa as default
 };