@devgateway/dvz-ui-react 1.5.4 → 1.6.1

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

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

package/dist/esm/embeddable/d3Map/BaseLayer.js

@@ -46,7 +46,10 @@ class F extends v {
     console.log("minLabelZoomVisible", s, r), r < s ? (console.log("remove layers"), this.g.selectAll(".feature-label").transition().style("display", "none")) : this.g.selectAll(".feature-label").style("display", ""), this.g.selectAll(".feature-label").attr("font-size", (o) => Math.max(0.5, e / r) + "px");
   }
   createLayer(e) {
-    this.createPaths(e), this.createLabels(e), this.props.onReady && this.props.onReady();
+    if (this.createPaths(e), this.createLabels(e), this.props.onReady) {
+      debugger;
+      this.props.onReady();
+    }
   }
   componentDidMount() {
     super.componentDidMount();

package/dist/esm/embeddable/d3Map/DataLayer.js

@@ -378,7 +378,11 @@ class ht extends pt {
   }
   componentDidUpdate(e, l, C) {
     const { app: i, file: u, featureJoinAttribute: h, data: c, measures: x, patternDiscriminator: o, editing: f, usePattern: n } = this.props;
-    if ((f || JSON.stringify(e.data) !== JSON.stringify(c)) && this.create(), e.visible != this.props.visible && this.g.style("display", this.props.visible ? "" : "none"), e.patternsVisible != this.props.patternsVisible) {
+    if ((f || JSON.stringify(e.data) !== JSON.stringify(c)) && this.create(), e.visible != this.props.visible) {
+      debugger;
+      this.g.style("display", this.props.visible ? "" : "none");
+    }
+    if (e.patternsVisible != this.props.patternsVisible) {
       const p = M.select(this.gRef.current.parentNode.parentNode).select(`.layer_${W(this.props.id)}`);
       p.select(".patterns-checkbox").text(this.props.patternsVisible ? "☑ " : "☐ "), p.selectAll(".patterns-labels").style("display", this.props.patternsVisible ? "" : "none"), p.selectAll("rect").style("display", this.props.patternsVisible ? "" : "none"), p.select("svg").attr("height", this.props.patternsVisible ? 30 + (p.selectAll("rect").size() - 1) * 23 + "px" : "30px"), this.g.selectAll(".shape-pattern").style("display", this.props.patternsVisible ? "" : "none");
     }

package/dist/esm/embeddable/filtered-posts/NoData.js

@@ -1,15 +1,20 @@
-import { jsx as c, jsxs as t } from "react/jsx-runtime";
-import { Segment as r, Header as s } from "semantic-ui-react";
-const d = (a) => {
-  const { noDataMsg: e, editing: n } = a;
-  return /* @__PURE__ */ c(r, { placeholder: !0, className: "chartNoDataMessage", children: /* @__PURE__ */ t(s, { icon: !0, children: [
-    /* @__PURE__ */ c(
-      "svg",
-      {
-        xmlns: "http://www.w3.org/2000/svg",
-        className: "noDataSVG",
-        viewBox: "0 0 512 512",
-        children: /* @__PURE__ */ c("path", { d: `M403.7,96.3c-41-41-95.6-63.6-153.7-63.6c-58,0-112.6,22.6-153.7,63.6c-41,41-63.6,95.6-63.6,153.7
+import { jsxs as a, jsx as e } from "react/jsx-runtime";
+import { useAppDispatch as p, useAppSelector as d } from "../../redux/hooks.js";
+import { Segment as m, Header as h, Button as g } from "semantic-ui-react";
+import { clearPostsFilter as u } from "../reducers/data.js";
+const f = (n) => {
+  const { noDataMsg: r, editing: s, group: t } = n, l = p(), o = d((c) => c.getIn(["data", "posts", "initialFilters", t])), i = (c) => {
+    c.preventDefault(), u({ group: t, dispatch: l, initialFilters: o });
+  };
+  return /* @__PURE__ */ a(m, { placeholder: !0, className: "chartNoDataMessage", children: [
+    /* @__PURE__ */ a(h, { icon: !0, children: [
+      /* @__PURE__ */ e(
+        "svg",
+        {
+          xmlns: "http://www.w3.org/2000/svg",
+          className: "noDataSVG",
+          viewBox: "0 0 512 512",
+          children: /* @__PURE__ */ e("path", { d: `M403.7,96.3c-41-41-95.6-63.6-153.7-63.6c-58,0-112.6,22.6-153.7,63.6c-41,41-63.6,95.6-63.6,153.7
                         c0,58,22.6,112.6,63.6,153.7c41,41,95.6,63.6,153.7,63.6c58,0,112.6-22.6,153.7-63.6c41-41,63.7-95.6,63.7-153.7
                         C467.3,192,444.7,137.4,403.7,96.3z M57.7,250C57.7,144,144,57.7,250,57.7c37.2,0,72,10.6,101.5,29l-63,77.1c-2.8-3.5-6-6.8-9.5-10
                         c-18.2-16.7-39.9-24.5-65.1-23.5c-25.2,1.1-46.2,10.7-62.9,28.9c-16.7,18.2-24.5,39.9-23.5,65.1c1.1,25.2,10.7,46.2,28.9,62.9
@@ -20,12 +25,14 @@ const d = (a) => {
                         c10.2-0.4,19.7-2.5,28.6-6.1c8.9-3.6,16.7-8.4,23.4-14.2l81,74.4c2.6,2.4,6,3.6,9.3,3.6c3.7,0,7.4-1.5,10.1-4.5
                         c5.1-5.6,4.8-14.3-0.8-19.4l-81-74.4c5.3-7.2,9.3-15.3,12.2-24.5c2.8-9.2,4.1-18.8,3.6-29c-0.5-10.7-2.5-20.6-6-29.8l69.8-85.5
                         c43,35.3,70.5,88.8,70.5,148.7C442.3,356,356,442.3,250,442.3z` })
-      }
-    ),
-    n && /* @__PURE__ */ c("div", { className: "WPnoDataMsg", children: "Not enough parameters to render the chart" }),
-    /* @__PURE__ */ c("div", { className: "WPnoDataMsg", children: e })
-  ] }) });
+        }
+      ),
+      s && /* @__PURE__ */ e("div", { className: "WPnoDataMsg", children: "Not enough parameters to render the chart" }),
+      /* @__PURE__ */ e("div", { className: "WPnoDataMsg", children: r })
+    ] }),
+    /* @__PURE__ */ e(g, { size: "medium", onClick: (c) => i(c), children: "Clear Filter" })
+  ] });
 };
 export {
-  d as default
+  f as default
 };

package/dist/esm/embeddable/filtered-posts/index.js

@@ -1,23 +1,23 @@
-import { jsx as o } from "react/jsx-runtime";
-import R, { useState as S, useEffect as W } from "react";
-import { Container as A, Loader as j, Grid as I, GridRow as L } from "semantic-ui-react";
-import M from "../connected-templates/PostIntro.js";
-import { injectIntl as V } from "react-intl";
-import { getStartDateAndEndDateFromYear as k } from "./utils.js";
-import Y from "./NoData.js";
-import { useDispatch as q, useSelector as z } from "react-redux";
-import { getCustomPosts as J } from "../reducers/data-api.js";
-import { useParams as K } from "react-router";
-import { toNumber as Q, toBoolean as U } from "../../utils/data.js";
-const X = (d) => {
-  const { posts: i, numberOfColumns: g, sortFirstBy: n, countryCategory: e, postWidth: b, postHeight: x } = d, l = [];
-  if (e && n) {
-    const a = i.filter((c) => c[e].includes(Number(n))), m = i.filter((c) => !c[e].includes(Number(n)));
-    l.push(...a, ...m);
+import { jsx as i } from "react/jsx-runtime";
+import K, { useState as Y, useEffect as Q } from "react";
+import { Container as j, Loader as X, Grid as B, GridRow as Z } from "semantic-ui-react";
+import $ from "../connected-templates/PostIntro.js";
+import { injectIntl as tt } from "react-intl";
+import { getStartDateAndEndDateFromYear as R } from "./utils.js";
+import et from "./NoData.js";
+import { useDispatch as ot, useSelector as rt } from "react-redux";
+import { getCustomPosts as nt } from "../reducers/data-api.js";
+import { useParams as at } from "react-router";
+import { toNumber as st, toBoolean as it } from "../../utils/data.js";
+const lt = (T) => {
+  const { posts: u, numberOfColumns: E, sortFirstBy: c, countryCategory: l, postWidth: h, postHeight: D } = T, f = [];
+  if (l && c && c !== "none") {
+    const m = u.filter((y) => y[l].includes(Number(c))), N = u.filter((y) => !y[l].includes(Number(c)));
+    f.push(...m), f.push(...N);
   } else
-    l.push(...i);
-  return /* @__PURE__ */ o(I, { columns: g, children: /* @__PURE__ */ o(L, { children: l.map((a) => /* @__PURE__ */ o(I.Column, { children: /* @__PURE__ */ o("div", { style: { width: b, height: x, overflow: "hidden" }, children: /* @__PURE__ */ o(
-    M,
+    f.push(...u);
+  return /* @__PURE__ */ i(B, { className: "filtered-posts", columns: E, children: /* @__PURE__ */ i(Z, { children: f.map((m) => /* @__PURE__ */ i(B.Column, { children: /* @__PURE__ */ i("div", { className: "filtered-posts-column", style: { width: h, height: D, overflow: "hidden" }, children: /* @__PURE__ */ i(
+    $,
     {
       style: {
         width: "100%",
@@ -26,98 +26,142 @@ const X = (d) => {
         margin: 0,
         padding: 0
       },
-      as: A,
+      as: j,
       fluid: !0,
-      post: a
+      post: m
     },
-    a.id
-  ) }) }, a.id)) }) });
-}, Z = (d) => {
+    m.id
+  ) }) }, m.id)) }) });
+}, ut = (T) => {
   const {
-    "data-group": i,
-    "data-number-of-columns": g,
-    "data-type": n,
-    "data-taxonomy": e,
-    "data-categories": b,
-    "data-height": x,
-    "data-post-width": l,
-    "data-post-height": a,
-    "data-number-of-items-per-page": m,
-    "data-enable-sorting": c,
-    "data-sort-first-by": F,
-    "data-sorting-taxonomy": D
-  } = d, v = q(), { locale: O } = K(), [P, p] = S(!1), B = z((t) => t), [f, T] = S([]), G = U(c), N = B.getIn(["data", "posts", i]), _ = G && F !== "none" ? Q(F) : null, s = N ?? {
+    "data-group": u,
+    "data-number-of-columns": E,
+    "data-type": c,
+    "data-taxonomy": l,
+    "data-categories": h,
+    "data-height": D,
+    "data-post-width": f,
+    "data-post-height": m,
+    "data-number-of-items-per-page": N,
+    "data-enable-sorting": y,
+    "data-sort-first-by": v,
+    "data-sorting-taxonomy": w,
+    editing: z
+  } = T, M = ot(), { locale: H } = at(), [A, b] = Y(!1), I = rt((t) => t).getIn(["data", "posts", u]), [P, x] = Y([]), O = it(y) && v !== "none" ? st(v) : null, g = I ?? {
     yearFilter: null,
     categoryFilter: null,
     countryFilter: null,
     page: 1,
     countryTaxonomy: null,
     categoryTaxonomy: null
-  }, E = () => {
-    const t = s.yearFilter ? k(Number(s.yearFilter)) : null, u = s.countryFilter ?? null, y = s.categoryFilter ?? null, h = s.categoryTaxonomy || (e && e !== "none" ? e : null), r = s.countryTaxonomy || null;
+  }, F = (t) => {
+    if (t == null)
+      return { values: [], isExplicitNone: !1 };
+    const e = Array.isArray(t) ? t : [t], a = e.some(
+      (o) => Number(o) === Number.MIN_SAFE_INTEGER
+    );
     return {
-      before: (t == null ? void 0 : t.endDate) || null,
-      after: (t == null ? void 0 : t.startDate) || null,
-      categoryFilter: y,
-      categoryTaxonomy: h,
-      countryFilter: u,
-      countryTaxonomy: r
+      values: e.map((o) => Number(o)).filter((o) => Number.isFinite(o) && o !== Number.MIN_SAFE_INTEGER),
+      isExplicitNone: a
     };
-  }, H = async () => {
-    const t = E();
-    if (!n) {
-      console.warn("FilteredPosts: missing post type. Configure 'type' in block settings."), T([]), p(!1);
+  }, W = (t) => {
+    if (!t || t.length === 0)
+      return null;
+    const e = Array.from(new Set(t)).sort((S, C) => S - C);
+    if (e.length === 0)
+      return null;
+    const a = e[0], r = e[e.length - 1], o = R(a), n = R(r);
+    return !(o != null && o.startDate) || !(n != null && n.endDate) ? null : {
+      startDate: o.startDate,
+      endDate: n.endDate
+    };
+  }, J = () => {
+    const t = F(g.yearFilter), e = t.isExplicitNone ? null : W(t.values), a = g.countryFilter ?? null, r = g.categoryFilter ?? null, o = g.categoryTaxonomy || (l && l !== "none" ? l : null), n = g.countryTaxonomy || null;
+    return {
+      before: (e == null ? void 0 : e.endDate) || null,
+      after: (e == null ? void 0 : e.startDate) || null,
+      categoryFilter: r,
+      categoryTaxonomy: o,
+      countryFilter: a,
+      countryTaxonomy: n
+    };
+  }, _ = (t) => z ? t : decodeURIComponent(t), L = (t) => {
+    try {
+      return JSON.parse(_(t));
+    } catch (e) {
+      return console.warn("JSON parsing failed for value:", t, "- treating as plain string. Error:", e), _(t);
+    }
+  }, q = () => {
+    const t = L(h);
+    return t ? typeof t == "string" ? t.split(",").map(Number) : typeof t == "number" ? [t] : t : [];
+  }, U = (t, e, a) => {
+    if (a) return null;
+    if (t.length === 0) return e.length > 0 ? e : null;
+    if (e.length === 0) return t;
+    const r = new Set(t), o = e.filter((n) => r.has(n));
+    return o.length > 0 ? o : null;
+  }, k = async () => {
+    b(!0);
+    const t = J(), e = F(q()).values, a = F(t.categoryFilter), r = U(
+      e,
+      a.values,
+      a.isExplicitNone
+    ), o = F(t.countryFilter);
+    if (a.isExplicitNone) {
+      x([]), b(!1);
       return;
     }
-    p(!0);
-    const u = /* @__PURE__ */ new Map();
-    t.categoryTaxonomy && t.categoryFilter != null && u.set(
-      t.categoryTaxonomy,
-      Array.isArray(t.categoryFilter) ? t.categoryFilter : [t.categoryFilter]
-    ), t.countryTaxonomy && t.countryFilter != null && u.set(
-      t.countryTaxonomy,
-      Array.isArray(t.countryFilter) ? t.countryFilter : [t.countryFilter]
-    ), await J({
+    if (o.isExplicitNone) {
+      x([]), b(!1);
+      return;
+    }
+    const n = /* @__PURE__ */ new Map();
+    t.categoryTaxonomy && r && r.length > 0 && n.set(t.categoryTaxonomy, r), t.countryTaxonomy && o.values.length > 0 && n.set(t.countryTaxonomy, o.values);
+    const S = r ? r.join(",") : void 0, C = {
       after: t.after,
       before: t.before,
-      perPage: Number(m || 10),
-      page: s.page || 1,
-      locale: O || "en",
-      postType: n,
-      // explicit undefineds for legacy params to satisfy types
-      taxonomy: void 0,
-      category: void 0,
-      taxonomyFilters: u
-    }).then((y) => {
-      if (y) {
-        const { data: h, meta: r } = y;
-        T(h);
-        const w = r && r["x-wp-totalpages"] ? r["x-wp-totalpages"] : 1, C = r && r["x-wp-total"] ? r["x-wp-total"] : 0;
-        w && C && v({
-          type: "SET_POSTS_PAGINATION",
-          group: i,
-          totalPages: Number(w),
-          totalItems: Number(C)
-        });
-      }
+      perPage: Number(N || 10),
+      page: g.page || 1,
+      locale: H || "en",
+      postType: c,
+      taxonomy: t.categoryTaxonomy || void 0,
+      category: S || void 0,
+      taxonomyFilters: n,
+      ordering: "date",
+      orderingDirection: "desc"
+    };
+    await nt(C).then((s) => {
+      if (s) {
+        let p = null, d = null;
+        if (s && typeof s == "object" && "data" in s ? (p = s.data, d = s.meta) : (Array.isArray(s), p = s), x(Array.isArray(p) ? p : []), d) {
+          const G = d["x-wp-totalpages"] ? d["x-wp-totalpages"] : 1, V = d["x-wp-total"] ? d["x-wp-total"] : 0;
+          G && V && M({
+            type: "SET_POSTS_PAGINATION",
+            group: u,
+            totalPages: Number(G),
+            totalItems: Number(V)
+          });
+        }
+      } else
+        x([]);
     }).finally(() => {
-      p(!1);
+      b(!1);
     });
   };
-  return W(() => {
-    H();
-  }, [N, n, e, m]), /* @__PURE__ */ o(A, { fluid: !0, children: P ? /* @__PURE__ */ o(j, { active: !0, inline: "centered" }) : !P && f && f.length > 0 ? /* @__PURE__ */ o(
-    X,
+  return Q(() => {
+    (async () => await k())();
+  }, [I, c, l, N, h, O, w]), /* @__PURE__ */ i(j, { fluid: !0, children: A ? /* @__PURE__ */ i(X, { active: !0, inline: "centered" }) : !A && P && P.length > 0 ? /* @__PURE__ */ i(
+    lt,
     {
-      posts: f,
-      postWidth: Number(l),
-      postHeight: Number(a),
-      numberOfColumns: Number(g),
-      sortFirstBy: _,
-      countryCategory: D
+      posts: P,
+      postWidth: Number(f),
+      postHeight: Number(m),
+      numberOfColumns: Number(E),
+      sortFirstBy: O,
+      countryCategory: w
     }
-  ) : /* @__PURE__ */ o(Y, { noDataMsg: "No posts found" }) });
-}, ut = V(R.memo(Z));
+  ) : /* @__PURE__ */ i(et, { noDataMsg: "No posts found", group: u }) });
+}, Tt = tt(K.memo(ut));
 export {
-  ut as default
+  Tt as default
 };

package/dist/esm/embeddable/filtered-posts/utils.js

@@ -1,7 +1,8 @@
 import "@devgateway/wp-react-lib";
 function D(t) {
-  const e = new Date(Date.UTC(t, 0, 1, 0, 0, 0, 0)), a = new Date(Date.UTC(t, 11, 31, 23, 59, 59, 999));
-  return { startDate: e, endDate: a };
+  if (!t) return { startDate: null, endDate: null };
+  const e = new Date(Date.UTC(t, 0, 1, 0, 0, 0, 0)), n = new Date(Date.UTC(t, 11, 31, 23, 59, 59, 999));
+  return { startDate: e, endDate: n };
 }
 export {
   D as getStartDateAndEndDateFromYear

package/dist/esm/embeddable/posts-filter/CategoricalFilter.js

@@ -0,0 +1,72 @@
+import { jsx as v } from "react/jsx-runtime";
+import { useState as A, useEffect as _ } from "react";
+import j from "./PostsFilterDropdown.js";
+import { Config as B } from "../../conf/index.js";
+const N = (r) => {
+  const {
+    taxonomy: o,
+    group: l,
+    placeholder: p,
+    allLabel: c,
+    noneLabel: f,
+    useSingleColumn: m,
+    enableTextSearch: u,
+    filterType: g,
+    showNoDataOption: y,
+    closeOnSelect: d,
+    allNoneSameBehaviour: x,
+    autoApply: O,
+    alphabeticalSort: S,
+    ascOrder: h,
+    type: P,
+    categories: n,
+    onChange: T
+  } = r, [w, e] = A([]), C = async () => {
+    if (!o || o === "none") {
+      e([]);
+      return;
+    }
+    const s = await (await fetch(B.REACT_APP_WP_API + "/wp/v2/" + o)).json();
+    if (s) {
+      const i = s.map((t) => ({
+        key: t.id,
+        value: t.id,
+        text: t.name
+      }));
+      if (n) {
+        const t = i.filter((b) => n.indexOf(b.value.toString()) > -1);
+        e([]), e(t);
+      } else
+        e([]), e(i);
+    }
+  };
+  return _(() => {
+    let a = !1;
+    return a || (e([]), C()), () => {
+      a = !0;
+    };
+  }, [P, o, n]), /* @__PURE__ */ v(
+    j,
+    {
+      ...r,
+      group: l,
+      placeholder: p,
+      allLabel: c,
+      noneLabel: f,
+      useSingleColumn: m,
+      enableTextSearch: u,
+      filterType: g,
+      showNoDataOption: y,
+      closeOnSelect: d,
+      allNoneSameBehaviour: x,
+      autoApply: O,
+      alphabeticalSort: S,
+      ascOrder: h,
+      options: w,
+      onChange: T
+    }
+  );
+};
+export {
+  N as default
+};