@devgateway/dvz-ui-react 1.6.0 → 1.6.1

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

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

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

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devgateway/dvz-ui-react",
-  "version": "1.6.0",
+  "version": "1.6.1",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
   "types": "dist/types/index.d.ts",
@@ -121,7 +121,7 @@
     "vite-plugin-env-compatible": "^2.0.1",
     "vite-plugin-eslint": "^1.8.1",
     "vite-tsconfig-paths": "^5.1.4",
-    "@devgateway/wp-react-lib": "0.6.0"
+    "@devgateway/wp-react-lib": "0.5.1"
   },
   "peerDependencies": {
     "react": "^18.3.1",