@devgateway/dvz-ui-react 1.5.4 → 1.6.1

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

@@ -1,215 +1,184 @@
-import { jsxs as re, jsx as L } from "react/jsx-runtime";
-import { useRef as oe, useState as d, useEffect as x } from "react";
-import { Container as ae } from "semantic-ui-react";
-import { toNumber as le, toBoolean as n } from "../../utils/data.js";
-import { getYearRange as ne } from "@devgateway/wp-react-lib";
-import q from "./PostsFilterDropdown.js";
-import { Config as ie } from "../../conf/index.js";
-import { useAppDispatch as se } from "../../redux/hooks.js";
-import { useSelector as ce } from "react-redux";
-const ye = (m) => {
+import { jsxs as de, jsx as U } from "react/jsx-runtime";
+import { useRef as $, useState as f, useMemo as N, useEffect as V } from "react";
+import { Container as me } from "semantic-ui-react";
+import { toBoolean as i, toNumber as fe } from "../../utils/data.js";
+import { useAppDispatch as he } from "../../redux/hooks.js";
+import { useSelector as Se } from "react-redux";
+import Ce from "./CategoricalFilter.js";
+import Te from "./YearFilter.js";
+const Ee = (k) => {
   const {
-    taxonomy: p,
-    group: O,
-    placeholder: l,
-    allLabel: S,
-    noneLabel: h,
-    useSingleColumn: f,
-    enableTextSearch: b,
-    filterType: A,
-    showNoDataOption: F,
-    closeOnSelect: N,
-    allNoneSameBehaviour: v,
-    autoApply: B,
-    alphabeticalSort: Y,
-    ascOrder: o,
-    type: i,
-    categories: C,
-    onChange: _
-  } = m, [T, c] = d([]), g = async () => {
-    if (!p || p === "none") {
-      c([]);
-      return;
+    "data-alphabetical-sort": G,
+    "data-asc-order": H,
+    "data-group": c,
+    "data-placeholder": A,
+    "data-all-label": Y,
+    "data-none-label": I,
+    "data-use-single-column": Q,
+    "data-enable-text-search": W,
+    "data-filter-type": S,
+    "data-show-no-data-option": X,
+    "data-close-on-select": Z,
+    "data-all-none-same-behaviour": ee,
+    "data-auto-apply": te,
+    "data-taxonomy": s,
+    "data-categories": y = "[]",
+    "data-is-country-filter": re,
+    "data-is-year-filter": ae,
+    "data-type": oe,
+    "data-sort-first-by": _,
+    "data-default-values": le = "[]",
+    editing: ne = !1
+  } = k, h = he(), t = Se((e) => e.getIn(["data", "posts", c])) || {}, o = S === "multi-select", B = $(0), E = (e) => ne ? e : decodeURIComponent(e);
+  let n = ((e) => {
+    try {
+      return JSON.parse(E(e));
+    } catch (r) {
+      return console.warn("JSON parsing failed for value:", e, "- treating as plain string. Error:", r), E(e);
     }
-    const e = await (await fetch(ie.REACT_APP_WP_API + "/wp/v2/" + p)).json();
-    if (e) {
-      const a = e.map((s) => ({
-        key: s.id,
-        value: s.id,
-        text: s.name
-      }));
-      if (C) {
-        const s = a.filter((w) => C.indexOf(w.value.toString()) > -1);
-        c(s);
-      } else
-        c(a);
-    }
-  };
-  return x(() => (g(), () => {
-    c([]);
-  }), [i]), /* @__PURE__ */ L(
-    q,
-    {
-      ...m,
-      group: O,
-      placeholder: l,
-      allLabel: S,
-      noneLabel: h,
-      useSingleColumn: f,
-      enableTextSearch: b,
-      filterType: A,
-      showNoDataOption: F,
-      closeOnSelect: N,
-      allNoneSameBehaviour: v,
-      autoApply: B,
-      alphabeticalSort: Y,
-      ascOrder: o,
-      options: T,
-      onChange: _
-    }
-  );
-}, Ce = (m) => {
-  const {
-    "data-alphabetical-sort": p,
-    "data-asc-order": O,
-    "data-group": l,
-    "data-placeholder": S,
-    "data-all-label": h,
-    "data-none-label": f,
-    "data-use-single-column": b,
-    "data-enable-text-search": A,
-    "data-filter-type": F,
-    "data-show-no-data-option": N,
-    "data-close-on-select": v,
-    "data-all-none-same-behaviour": B,
-    "data-auto-apply": Y,
-    "data-taxonomy": o,
-    "data-categories": i,
-    "data-is-country-filter": C,
-    "data-is-year-filter": _,
-    "data-type": T,
-    "data-sort-first-by": c
-  } = m, g = se(), e = ce((r) => r.getIn(["data", "posts", l])) || {}, a = F === "multi-select", s = oe(0), w = n(p), G = n(O), D = n(N), R = n(v), j = n(B), K = n(Y), t = n(C), y = n(_), k = n(b), $ = n(A), V = c !== "none" ? le(c) : null, [H, J] = d([]), [Q, U] = d(
-    a ? Array.isArray(e.yearFilter) ? e.yearFilter : e.yearFilter != null ? [e.yearFilter] : [] : e.yearFilter || void 0
-  ), [M, P] = d(
-    a ? Array.isArray(e.countryFilter) ? e.countryFilter : e.countryFilter != null ? [e.countryFilter] : [] : e.countryFilter || void 0
-  ), [W, E] = d(
-    a ? Array.isArray(e.categoryFilter) ? e.categoryFilter : e.categoryFilter != null ? [e.categoryFilter] : [] : e.categoryFilter || void 0
-  );
-  x(() => {
-    U(e.yearFilter || void 0), a ? (P(Array.isArray(e.countryFilter) ? e.countryFilter : e.countryFilter != null ? [e.countryFilter] : []), E(Array.isArray(e.categoryFilter) ? e.categoryFilter : e.categoryFilter != null ? [e.categoryFilter] : [])) : (P(e.countryFilter || void 0), E(e.categoryFilter || void 0));
-  }, [e, a]);
-  const X = (r) => {
-    g({
+  })(le);
+  n || (n = []), typeof n == "string" && (n = n.split(",").map(Number)), typeof n == "number" && (n = [n]);
+  const ie = i(G), se = i(H), L = i(X), R = i(Z), w = i(ee), D = i(te), a = i(re), l = i(ae), P = i(Q), v = i(W), C = _ !== "none" ? fe(_) : null, [u, ce] = f([]), [T, ye] = f(!1), O = (e, r) => r ? Array.isArray(e) ? e : e != null ? [e] : [] : e || void 0, x = (e, r) => Array.isArray(e) && Array.isArray(r) ? e.length !== r.length ? !1 : e.every((d, m) => d === r[m]) : e === r, F = N(
+    () => O(t.countryFilter, o),
+    [t.countryFilter, o]
+  ), p = N(
+    () => O(t.categoryFilter, o),
+    [t.categoryFilter, o]
+  ), g = N(
+    () => l ? O(t.yearFilter, o) : void 0,
+    [t.yearFilter, o, l]
+  ), [ue, z] = f(g), [K, M] = f(F), [j, J] = f(p), q = $({
+    countryFilter: F,
+    categoryFilter: p,
+    yearFilter: g,
+    isMultiSelectFilter: o
+  });
+  V(() => {
+    const e = q.current, r = !x(e.countryFilter, F), d = !x(e.categoryFilter, p), m = l && !x(e.yearFilter, g), b = e.isMultiSelectFilter !== o;
+    (r || d || m || b) && (r && M(F), d && J(p), m && z(g), q.current = {
+      countryFilter: F,
+      categoryFilter: p,
+      yearFilter: g,
+      isMultiSelectFilter: o
+    });
+  }, [F, p, g, o, l]);
+  const Fe = (e) => {
+    z(e), h({
       type: "SET_POSTS_FILTER",
-      group: l,
-      isYearFilter: y,
-      yearFilter: r,
-      isCountryFilter: t,
-      categoryFilter: e.categoryFilter,
-      countryFilter: e.countryFilter,
-      sortFirstBy: V,
-      countryCategory: o,
-      categoryTaxonomy: o,
-      countryTaxonomy: o
+      group: c,
+      ...t,
+      isYearFilter: l,
+      yearFilter: l ? e : null,
+      isCountryFilter: a,
+      categoryFilter: t.categoryFilter,
+      countryFilter: t.countryFilter,
+      sortFirstBy: C,
+      countryCategory: s,
+      categoryTaxonomy: s,
+      countryTaxonomy: s
     });
-  }, Z = (r) => {
-    t ? P(r) : E(r), g({
+  }, pe = (e) => {
+    a ? M(e) : J(e), h({
       type: "SET_POSTS_FILTER",
-      group: l,
+      group: c,
+      ...t,
       // Preserve both filters so they can work together
-      categoryFilter: t ? e.categoryFilter : r,
-      countryFilter: t ? r : e.countryFilter,
-      yearFilter: e.yearFilter,
-      isYearFilter: y,
-      isCountryFilter: t,
-      sortFirstBy: t ? V : e.sortFirstBy,
-      countryCategory: t ? o : e.countryCategory,
-      categoryCategory: t ? e.categoryCategory : r,
-      categoryTaxonomy: t ? e.categoryTaxonomy : o,
-      countryTaxonomy: t ? o : e.countryTaxonomy
+      categoryFilter: a ? t.categoryFilter : e,
+      countryFilter: a ? e : t.countryFilter,
+      isYearFilter: l,
+      yearFilter: t.yearFilter,
+      isCountryFilter: a,
+      sortFirstBy: a ? C : t.sortFirstBy,
+      countryCategory: a ? s : t.countryCategory,
+      categoryCategory: a ? t.categoryCategory : e,
+      categoryTaxonomy: a ? t.categoryTaxonomy : s,
+      countryTaxonomy: a ? s : t.countryTaxonomy
     });
   };
-  x(() => {
-    const r = t ? e.categoryFilter : a ? i ? i.split(",").map(Number) : [] : e.categoryFilter, u = t && a ? i ? i.split(",").map(Number) : [] : e.countryFilter;
-    g({
+  return V(() => {
+    const e = n.length > 0, r = o ? n : n[0], d = a ? t.categoryFilter : e ? r : o ? y ? y.split(",").map(Number) : [] : t.categoryFilter, m = a ? e ? r : o ? y ? y.split(",").map(Number) : [] : t.countryFilter : t.countryFilter, b = l && o ? u.length > 0 ? u.map((ge) => ge.value) : [] : t.yearFilter;
+    h({
       type: "SET_INITIAL_POSTS_FILTER",
-      group: l,
-      categoryFilter: r,
-      countryFilter: u,
-      isYearFilter: y,
-      isCountryFilter: t,
-      sortFirstBy: V,
-      categoryCategory: t ? null : e.categoryCategory,
-      categoryTaxonomy: t ? null : o,
-      countryCategory: t ? e.countryCategory : null,
-      countryTaxonomy: t ? o : null
+      group: c,
+      categoryFilter: d,
+      countryFilter: m,
+      isYearFilter: l,
+      isCountryFilter: a,
+      sortFirstBy: C,
+      yearFilter: l ? b : null,
+      categoryCategory: a ? null : t.categoryCategory,
+      categoryTaxonomy: a ? null : s,
+      countryCategory: a ? t.countryCategory : null,
+      countryTaxonomy: a ? s : null,
+      page: 1
     });
-  }, [l]), x(() => {
-    y && ee();
-  }, [y]);
-  const ee = async () => {
-    const te = (await ne()).data.map((I) => ({
-      key: I,
-      value: I,
-      text: `Year ${I}`
-    }));
-    J(te || []);
-  };
-  return /* @__PURE__ */ re(ae, { fluid: !0, className: "filter", children: [
-    y && /* @__PURE__ */ L(
-      q,
+  }, []), V(() => {
+    if (l && !T) {
+      const e = l && o ? u.length > 0 ? u.map((r) => r.value) : [] : t.yearFilter;
+      h({
+        type: "SET_INITIAL_POSTS_FILTER",
+        group: c,
+        ...t,
+        isYearFilter: l,
+        yearFilter: l ? e : null
+      });
+    }
+  }, [T]), /* @__PURE__ */ de(me, { fluid: !0, className: "filter post-filter", children: [
+    l && /* @__PURE__ */ U(
+      Te,
       {
-        group: l,
-        placeholder: S,
-        allLabel: h,
-        noneLabel: f,
-        useSingleColumn: k,
-        enableTextSearch: $,
-        filterType: F,
-        showNoDataOption: D,
+        group: c,
+        placeholder: A,
+        allLabel: Y,
+        noneLabel: I,
+        useSingleColumn: P,
+        enableTextSearch: v,
+        filterType: S,
+        showNoDataOption: L,
         closeOnSelect: R,
-        allNoneSameBehaviour: j,
-        autoApply: K,
-        alphabeticalSort: w,
-        ascOrder: G,
-        options: H,
-        taxonomy: o,
-        type: T,
-        value: Q,
-        onChange: (r, u) => {
-          X(u);
+        allNoneSameBehaviour: w,
+        autoApply: D,
+        alphabeticalSort: ie,
+        ascOrder: se,
+        options: u,
+        value: ue,
+        yearOptions: u,
+        setYearOptions: ce,
+        yearFilterLoading: T,
+        setYearFilterLoading: ye,
+        onChange: (e, r) => {
+          Fe(r);
         },
-        resetKey: s.current
+        resetKey: B.current
       }
     ),
-    !y && /* @__PURE__ */ L(
-      ye,
+    !l && /* @__PURE__ */ U(
+      Ce,
       {
-        group: l,
-        placeholder: S,
-        allLabel: h,
-        noneLabel: f,
-        useSingleColumn: k,
-        enableTextSearch: $,
-        filterType: F,
-        showNoDataOption: D,
+        group: c,
+        placeholder: A,
+        allLabel: Y,
+        noneLabel: I,
+        useSingleColumn: P,
+        enableTextSearch: v,
+        filterType: S,
+        showNoDataOption: L,
         closeOnSelect: R,
-        allNoneSameBehaviour: j,
-        autoApply: K,
-        taxonomy: o,
-        type: T,
-        value: t ? M : W,
-        onChange: (r, u) => {
-          Z(u);
+        allNoneSameBehaviour: w,
+        autoApply: D,
+        taxonomy: s,
+        type: oe,
+        value: a ? K : j,
+        onChange: (e, r) => {
+          pe(r);
         },
-        categories: i ? i.split(",") : [],
-        resetKey: s.current
+        categories: y ? y.split(",") : [],
+        resetKey: B.current
       },
-      `cat-${l}`
+      `cat-${c}`
     )
   ] });
 };
 export {
-  Ce as default
+  Ee as default
 };

package/dist/esm/embeddable/posts-filters-reset-button/index.js

@@ -1,33 +1,39 @@
-import { jsxs as d, jsx as a } from "react/jsx-runtime";
-import p from "react";
-import { useDispatch as u, useSelector as i } from "react-redux";
+import { jsxs as p, jsx as a } from "react/jsx-runtime";
+import d from "react";
+import { useDispatch as u, useSelector as n } from "react-redux";
 import { Container as m, Icon as f } from "semantic-ui-react";
 import I from "lodash.isequal";
-const S = (l) => {
+const R = (i) => {
   const {
-    "data-group": t,
-    "data-reset-label": n = "Reset All Filters"
-  } = l, c = u(), s = i((r) => r.getIn(["data", "posts", t])), e = i((r) => r.getIn(["data", "posts", "initialFilters", t])), o = p.useMemo(() => s && e ? !I(s, e) : !1, [s, e]);
-  return /* @__PURE__ */ d(
+    "data-group": s,
+    "data-reset-label": l = "Reset All Filters"
+  } = i, c = u(), r = n((o) => o.getIn(["data", "posts", s])), t = n((o) => o.getIn(["data", "posts", "initialFilters", s])), e = d.useMemo(() => r && t ? !I(r, t) : !1, [r, t]);
+  return /* @__PURE__ */ p(
     m,
     {
       fluid: !0,
-      className: `data-filters-reset ignore ${o ? "" : "disabled"}`,
+      style: {
+        pointerEvents: e ? "auto" : "none",
+        cursor: e ? "pointer" : "not-allowed",
+        opacity: e ? 1 : 0.5
+      },
+      className: `data-filters-reset ignore ${e ? "" : "disabled"}`,
       onClick: () => {
         c({
           type: "SET_INITIAL_POSTS_FILTER",
-          group: t,
-          ...e,
-          reset: !0
+          group: s,
+          ...t,
+          reset: !0,
+          page: 1
         });
       },
       children: [
-        /* @__PURE__ */ a("span", { children: n }),
-        /* @__PURE__ */ a("span", { children: /* @__PURE__ */ a(f, { disabled: !o, name: "undo alternate", className: "custom-undo-icon" }) })
+        /* @__PURE__ */ a("span", { children: l }),
+        /* @__PURE__ */ a("span", { children: /* @__PURE__ */ a(f, { disabled: !e, name: "undo alternate", className: "custom-undo-icon" }) })
       ]
     }
   );
 };
 export {
-  S as default
+  R as default
 };

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

@@ -1,69 +1,72 @@
-import { jsxs as a, jsx as r } from "react/jsx-runtime";
-import P, { useState as c, useEffect as v } from "react";
-import { useDispatch as C, useSelector as x } from "react-redux";
-import { Container as I, Dropdown as y, Icon as d } from "semantic-ui-react";
-import { injectIntl as b } from "react-intl";
-const j = (u) => {
+import { jsxs as i, jsx as r } from "react/jsx-runtime";
+import I, { useState as g, useEffect as u } from "react";
+import { useDispatch as x, useSelector as m } from "react-redux";
+import { Container as y, Dropdown as b, Icon as p } from "semantic-ui-react";
+import { injectIntl as j } from "react-intl";
+const k = (f) => {
   const {
-    "data-group": l
-  } = u, p = C(), e = x((t) => t.getIn(["data", "postsPagination", l])), s = e && (e != null && e.totalPages) ? e.totalPages : 1, [o, g] = c(1), [m, f] = c([]), h = () => {
-    const t = [];
-    for (let n = 1; n <= s; n++)
-      t.push({ key: n, text: n, value: n });
-    f(t);
-  }, i = (t) => {
-    t !== o && (t < 1 || t > s || (g(t), p({
+    "data-group": c
+  } = f, h = x(), n = m((e) => e.getIn(["data", "postsPagination", c])), t = m((e) => e.getIn(["data", "posts", c])), s = n && (n != null && n.totalPages) ? n.totalPages : 1, [o, d] = g((t == null ? void 0 : t.page) ?? 1), [P, v] = g([]), C = () => {
+    const e = [];
+    for (let a = 1; a <= s; a++)
+      e.push({ key: a, text: a, value: a });
+    v(e);
+  }, l = (e) => {
+    e !== o && (e < 1 || e > s || (d(e), h({
       type: "SET_POSTS_FILTER",
-      group: l,
-      ...e,
-      page: t
+      group: c,
+      ...t,
+      page: e
     })));
   };
-  return v(() => {
-    h();
-  }, [e == null ? void 0 : e.totalPages]), /* @__PURE__ */ a(I, { fluid: !0, className: "posts-pagination", children: [
-    /* @__PURE__ */ a("div", { className: "posts-pagination-dropdown", children: [
+  return u(() => {
+    C();
+  }, [n == null ? void 0 : n.totalPages]), u(() => {
+    const e = (t == null ? void 0 : t.page) ?? 1;
+    e !== o && d(e);
+  }, [t == null ? void 0 : t.page]), /* @__PURE__ */ i(y, { fluid: !0, className: "posts-pagination", children: [
+    /* @__PURE__ */ i("div", { className: "posts-pagination-dropdown", children: [
       /* @__PURE__ */ r("span", { children: "Page" }),
       /* @__PURE__ */ r(
-        y,
+        b,
         {
-          options: m,
+          options: P,
           placeholder: "Select Item",
           selection: !0,
           compact: !0,
           value: o,
-          onChange: (t, n) => i(Number(n.value))
+          onChange: (e, a) => l(Number(a.value))
         }
       ),
-      /* @__PURE__ */ r("div", { children: /* @__PURE__ */ a("span", { children: [
+      /* @__PURE__ */ r("div", { children: /* @__PURE__ */ i("span", { children: [
         "of ",
-        e && (e == null ? void 0 : e.totalPages)
+        n && (n == null ? void 0 : n.totalPages)
       ] }) })
     ] }),
-    /* @__PURE__ */ a("div", { children: [
+    /* @__PURE__ */ i("div", { children: [
       /* @__PURE__ */ r(
-        d,
+        p,
         {
           size: "large",
           style: { cursor: "pointer" },
-          onClick: () => i(o - 1),
+          onClick: () => l(o - 1),
           name: "angle left",
           disabled: o === 1
         }
       ),
       /* @__PURE__ */ r(
-        d,
+        p,
         {
           size: "large",
           style: { cursor: "pointer" },
-          onClick: () => i(o + 1),
+          onClick: () => l(o + 1),
           name: "angle right",
           disabled: o === s
         }
       )
     ] })
   ] });
-}, w = b(P.memo(j));
+}, z = j(I.memo(k));
 export {
-  w as default
+  z as default
 };

package/dist/esm/embeddable/reducers/data-api.js

@@ -1,48 +1,48 @@
-import { Config as S } from "../../conf/index.js";
-import { get as y } from "../../api/commons.js";
-function p(n) {
+import { Config as A } from "../../conf/index.js";
+import { get as h } from "../../api/commons.js";
+function f(n) {
   return JSON.parse(JSON.stringify(n));
 }
-const g = process.env.VITE_REACT_APP_API_ROOT || S.REACT_APP_API_ROOT || null, A = typeof window < "u" ? window.location.origin : "", l = {}, f = {}, C = 3 * 60 * 1e3;
-function O(n) {
+const d = process.env.VITE_REACT_APP_API_ROOT || A.REACT_APP_API_ROOT || null, O = typeof window < "u" ? window.location.origin : "", l = {}, u = {}, q = 3 * 60 * 1e3;
+function _(n) {
   return Object.keys(n).map((t) => encodeURIComponent(t) + "=" + encodeURIComponent(n[t])).join("&");
 }
-function _(n, t = !1) {
-  const e = n, r = Date.now();
-  if (f[e] && r - f[e].timestamp < C)
-    return Promise.resolve(p(f[e].data));
+function w(n, t = !1) {
+  const e = n, i = Date.now();
+  if (u[e] && i - u[e].timestamp < q)
+    return Promise.resolve(f(u[e].data));
   if (l[e])
-    return l[e].then(p);
-  const c = y(n, {}).then((a) => (f[e] = { data: a, timestamp: Date.now() }, t ? { data: p(a), meta: f[e].meta } : p(a))).finally(() => {
+    return l[e].then(f);
+  const p = h(n, {}).then((a) => (u[e] = { data: a, timestamp: Date.now() }, t ? { data: f(a), meta: u[e].meta } : f(a))).finally(() => {
     delete l[e];
   });
-  return l[e] = c, c;
+  return l[e] = p, p;
 }
-const E = ({ app: n, params: t }) => {
-  const e = `${g || A}/api/${n}/categories${t ? "?" + O(t) : ""}`;
-  return _(e);
-}, U = ({ source: n, app: t, params: e }) => {
-  const r = `${g || A}/api/${t}/stats/${n}${e ? "?" + O(e) : ""}`;
-  return _(r);
-}, D = ({ postType: n, taxonomy: t, category: e, taxonomyFilters: r, before: c, perPage: a, page: h, locale: w, after: m }) => {
-  const R = `${S.REACT_APP_WP_API}/wp/v2/${n}`, i = new URLSearchParams(), d = /* @__PURE__ */ new Map(), T = (s, o) => {
+const D = ({ app: n, params: t }) => {
+  const e = `${d || O}/api/${n}/categories${t ? "?" + _(t) : ""}`;
+  return w(e);
+}, b = ({ source: n, app: t, params: e }) => {
+  const i = `${d || O}/api/${t}/stats/${n}${e ? "?" + _(e) : ""}`;
+  return w(i);
+}, j = ({ postType: n, taxonomy: t, category: e, taxonomyFilters: i, before: p, perPage: a, page: R, locale: T, after: m, ordering: $, orderingDirection: y }) => {
+  const C = `${A.REACT_APP_WP_API}/wp/v2/${n}`, r = new URLSearchParams(), g = /* @__PURE__ */ new Map(), P = (s, o) => {
     if (!s || o == null) return;
-    const u = d.get(s) || [];
-    Array.isArray(o) ? o.forEach((P) => {
-      P != null && u.push(String(P));
-    }) : u.push(String(o)), d.set(s, u);
+    const c = g.get(s) || [];
+    Array.isArray(o) ? o.forEach((S) => {
+      S != null && c.push(String(S));
+    }) : c.push(String(o)), g.set(s, c);
   };
-  r && r instanceof Map && r.forEach((s, o) => {
-    T(o, s);
-  }), d.forEach((s, o) => {
-    const u = Array.from(new Set(s));
-    i.set(o, u.join(","));
-  }), c && i.append("before", c.toISOString()), a && i.append("per_page", a.toString()), i.append("page", h.toString()), i.append("locale", w), m && i.append("after", m.toISOString());
-  const $ = i.toString().replace(/%2C/g, ",");
-  return y(`${R}?${$}`, {});
+  i && i instanceof Map && i.forEach((s, o) => {
+    P(o, s);
+  }), t && e != null && P(t, e), g.forEach((s, o) => {
+    const c = Array.from(new Set(s));
+    c.length !== 0 && r.set(o, c.join(","));
+  }), p && r.append("before", p.toISOString()), a && r.append("per_page", a.toString()), r.append("page", R.toString()), r.append("locale", T), m && r.append("after", m.toISOString()), r.append("orderby", $), r.append("order", y);
+  const I = r.toString().replace(/%2C/g, ",");
+  return h(`${C}?${I}`, {});
 };
 export {
-  E as getCategories,
-  D as getCustomPosts,
-  U as getData
+  D as getCategories,
+  j as getCustomPosts,
+  b as getData
 };