@ynput/ayon-frontend-shared 0.3.36 → 0.3.38

package/dist/shared/src/components/SearchFilter/useBuildFilterOptions.es.js

@@ -1,7 +1,7 @@
 import { j as N } from "../../../../_virtual/jsx-runtime.es.js";
 import { isEmpty as q } from "lodash";
 import "react-toastify";
-import { getEntityTypeIcon as M } from "../../util/getEntityTypeIcon.es.js";
+import { getEntityTypeIcon as D } from "../../util/getEntityTypeIcon.es.js";
 import { getAttributeIcon as O } from "../../util/getAttributeIcon.es.js";
 import "uuid";
 import "../../util/pubsub.es.js";
@@ -75,7 +75,7 @@ import "../../api/queries/entityLists/updateListsAttributes.es.js";
 import "../../api/queries/entityLists/listFolders.es.js";
 import "../../api/queries/folders/getFolders.es.js";
 import "../../api/queries/folders/getFolderDeleteInfo.es.js";
-import { useGetEntityGroupsQuery as D } from "../../api/queries/grouping/getGrouping.es.js";
+import { useGetEntityGroupsQuery as W } from "../../api/queries/grouping/getGrouping.es.js";
 import "../../api/queries/links/updateLinks.es.js";
 import "../../api/queries/links/getLinks.es.js";
 import "../../api/queries/permissions/getPermissions.es.js";
@@ -130,45 +130,45 @@ import "../../context/ProjectFoldersContext.es.js";
 const Rs = ({
   filterTypes: i = [],
   projectNames: a,
-  scope: m,
+  scope: u,
   scopes: n,
-  data: o,
+  data: l,
   config: s,
   columnOrder: e = [],
-  power: u
+  power: c
 }) => {
-  let r = [];
-  const p = n || (m ? Array.isArray(m) ? m : [m] : []).map((d) => ({
-    scope: d,
+  let o = [];
+  const d = n || (u ? Array.isArray(u) ? u : [u] : []).map((m) => ({
+    scope: m,
     filterTypes: i
-  })), v = p.length > 1, _ = p.some(
-    (f) => ["entitySubType", "status"].some((d) => f.filterTypes.includes(d))
-  ), C = p.some(
+  })), h = d.length > 1, x = d.some(
+    (f) => ["entitySubType", "status"].some((m) => f.filterTypes.includes(m))
+  ), C = d.some(
     (f) => ["assignees", "users", "author"].some(
-      (d) => f.filterTypes.includes(d)
+      (m) => f.filterTypes.includes(m)
     )
-  ), x = (f) => p.some((d) => d.filterTypes.includes(f)), { data: { groups: A = [] } = {} } = D(
+  ), E = (f) => d.some((m) => m.filterTypes.includes(f)), { data: { groups: k = [] } = {} } = W(
     {
       entityType: "product",
       groupingKey: "productType",
       projectName: a[0],
       empty: !0
     },
-    { skip: !a?.length || !x("productType") }
-  ), { data: { groups: L = [] } = {} } = D(
+    { skip: !a?.length || !E("productType") }
+  ), { data: { groups: L = [] } = {} } = W(
     {
       entityType: "product",
       groupingKey: "productBaseType",
       projectName: a[0],
       empty: !0
     },
-    { skip: !a?.length || !x("productBaseType") }
-  ), { data: R = {} } = X(
+    { skip: !a?.length || !E("productBaseType") }
+  ), { data: T = {} } = X(
     {
       projects: a
     },
     {
-      skip: !a?.length || !_
+      skip: !a?.length || !x
     }
   ), { data: $ = [] } = Z(
     { projects: a },
@@ -176,9 +176,9 @@ const Rs = ({
       skip: !a?.length || !C
     }
   ), { attributes: z } = te(), K = (f) => f.charAt(0).toUpperCase() + f.slice(1);
-  return p.forEach(({ scope: f, filterTypes: d }) => {
-    const y = v ? f : void 0, w = v ? K(f) : void 0;
-    if (d.includes("taskType") && f !== "user") {
+  return d.forEach(({ scope: f, filterTypes: m }) => {
+    const y = h ? f : void 0, g = h ? K(f) : void 0;
+    if (m.includes("taskType") && f !== "user") {
       const t = V(
         "taskType",
         {
@@ -186,14 +186,14 @@ const Rs = ({
           enableOperatorChange: !1
         },
         y,
-        w
+        g
       );
       if (t) {
-        let l = I({ projectsInfo: R, productTypes: A }, "task");
-        t.values?.push(...l), r.push(t);
+        let r = I({ projectsInfo: T, productTypes: k }, "task");
+        t.values?.push(...r), o.push(t);
       }
     }
-    if (d.includes("folderType") && f !== "user") {
+    if (m.includes("folderType") && f !== "user") {
       const t = V(
         "folderType",
         {
@@ -201,14 +201,14 @@ const Rs = ({
           enableOperatorChange: !1
         },
         y,
-        w
+        g
       );
       if (t) {
-        let l = I({ projectsInfo: R, productTypes: A }, "folder");
-        t.values?.push(...l), r.push(t);
+        let r = I({ projectsInfo: T, productTypes: k }, "folder");
+        t.values?.push(...r), o.push(t);
       }
     }
-    if (d.includes("productType") && f !== "user") {
+    if (m.includes("productType") && f !== "user") {
       const t = V(
         "productType",
         {
@@ -216,14 +216,14 @@ const Rs = ({
           enableOperatorChange: !1
         },
         y,
-        w
+        g
       );
       if (t) {
-        let l = I({ projectsInfo: R, productTypes: A }, "product");
-        t.values?.push(...l), r.push(t);
+        let r = I({ projectsInfo: T, productTypes: k }, "product");
+        t.values?.push(...r), o.push(t);
       }
     }
-    if (d.includes("productBaseType") && f !== "user") {
+    if (m.includes("productBaseType") && f !== "user") {
       const t = V(
         "productBaseType",
         {
@@ -231,127 +231,124 @@ const Rs = ({
           enableOperatorChange: !1
         },
         y,
-        w
+        g
       );
-      t && (L.forEach(({ icon: l, label: h, value: c }) => {
-        t.values?.some((b) => b.id === c) || t.values?.push({
-          id: c,
-          type: "string",
-          label: h || c,
-          icon: l || M("product"),
-          inverted: !1,
-          values: []
+      t && (L.forEach(({ icon: r, label: b, value: p }) => {
+        t.values?.some((v) => v.id === p) || t.values?.push({
+          id: p,
+          label: b || p,
+          icon: r || D("product")
         });
-      }), o.productBaseTypes?.forEach((l) => {
-        t.values?.some((h) => h.id === l) || t.values?.push({
-          id: l,
-          label: l
+      }), l.productBaseTypes?.forEach((r) => {
+        t.values?.some((b) => b.id === r) || t.values?.push({
+          id: r,
+          label: r
         });
-      }), r.push(t));
+      }), o.push(t));
     }
-    if (d.includes("productName") && f === "product") {
-      const t = V("productName", s, y, w);
-      t && (o.productNames?.forEach((l) => {
-        t.values?.some((h) => h.id === l) || t.values?.push({
-          id: l,
-          label: l
+    if (m.includes("productName") && f === "product") {
+      const t = V("productName", s, y, g);
+      t && (l.productNames?.forEach((r) => {
+        t.values?.some((b) => b.id === r) || t.values?.push({
+          id: r,
+          label: r
         });
-      }), r.push(t));
+      }), o.push(t));
     }
-    if (d.includes("status")) {
+    if (m.includes("status")) {
       const t = V(
         "status",
         { ...s, enableOperatorChange: !1 },
         y,
-        w
+        g
       );
-      t && (Object.values(R).forEach((l) => {
-        (l?.statuses || []).filter((c) => c.scope?.includes(f)).forEach((c) => {
-          t.values?.some((b) => b.id === c.name) || t.values?.push({
-            id: c.name,
-            label: c.name,
-            icon: c.icon,
-            color: c.color
+      t && (Object.values(T).forEach((r) => {
+        (r?.statuses || []).filter((p) => p.scope?.includes(f)).forEach((p) => {
+          t.values?.some((v) => v.id === p.name) || t.values?.push({
+            id: p.name,
+            label: p.name,
+            icon: p.icon,
+            color: p.color
           });
         });
-      }), r.push(t));
+      }), o.push(t));
     }
-    if (d.includes("assignees")) {
-      const t = V("assignees", s, y, w);
-      t && ($.forEach((l) => {
-        t.values?.some((h) => h.id === l.name) || t.values?.push({
-          id: l.name,
-          label: l.attrib.fullName || l.name,
-          img: `/api/users/${l.name}/avatar`,
+    if (m.includes("assignees")) {
+      const t = V("assignees", s, y, g);
+      t && ($.forEach((r) => {
+        t.values?.some((b) => b.id === r.name) || t.values?.push({
+          id: r.name,
+          label: r.attrib.fullName || r.name,
+          img: `/api/users/${r.name}/avatar`,
           icon: null
         });
-      }), t.values?.sort((l, h) => {
-        const c = o.assignees?.filter((g) => g === l.id).length || 0;
-        return (o.assignees?.filter((g) => g === h.id).length || 0) - c;
-      }), r.push(t));
+      }), t.values?.sort((r, b) => {
+        const p = l.assignees?.filter((w) => w === r.id).length || 0;
+        return (l.assignees?.filter((w) => w === b.id).length || 0) - p;
+      }), o.push(t));
     }
-    if (d.includes("author")) {
-      const t = V("author", s, y, w);
-      t && ($.forEach((l) => {
-        t.values?.some((h) => h.id === l.name) || t.values?.push({
-          id: l.name,
-          label: l.attrib.fullName || l.name,
-          img: `/api/users/${l.name}/avatar`,
+    if (m.includes("author")) {
+      const t = V("author", s, y, g);
+      t && ($.forEach((r) => {
+        t.values?.some((b) => b.id === r.name) || t.values?.push({
+          id: r.name,
+          label: r.attrib.fullName || r.name,
+          img: `/api/users/${r.name}/avatar`,
           icon: null
         });
-      }), r.push(t));
+      }), o.push(t));
     }
-    if (d.includes("tags")) {
-      const t = V("tags", s, y, w);
+    if (m.includes("tags")) {
+      const t = V("tags", s, y, g);
       if (t) {
-        const l = /* @__PURE__ */ new Map();
-        Object.values(R).forEach((b) => {
-          b?.tags && b.tags.forEach((g) => {
-            l.has(g.name) || l.set(g.name, g);
+        const r = /* @__PURE__ */ new Map();
+        Object.values(T).forEach((v) => {
+          v?.tags && v.tags.forEach((w) => {
+            r.has(w.name) || r.set(w.name, w);
           });
         });
-        const h = /* @__PURE__ */ new Map();
-        o.tags?.forEach((b) => {
-          const g = h.get(b);
-          if (g) {
-            g.count++;
+        const b = /* @__PURE__ */ new Map();
+        l.tags?.forEach((v) => {
+          const w = b.get(v);
+          if (w) {
+            w.count++;
             return;
           } else {
-            const E = l.get(b);
-            h.set(b, {
-              id: b,
+            const R = r.get(v);
+            b.set(v, {
+              id: v,
               type: "string",
-              label: b,
+              label: v,
               values: [],
-              color: E?.color || null,
+              color: R?.color || null,
               count: 1
             });
           }
         });
-        const c = Array.from(h.values()).sort(
-          (b, g) => g.count - b.count
+        const p = Array.from(b.values()).sort(
+          (v, w) => w.count - v.count
         );
-        t.values?.push(...c), r.push(t);
+        t.values?.push(...p), o.push(t);
       }
     }
-    if (d.includes("version")) {
-      const t = V("version", s, y, w);
-      t && (ee.forEach((l) => {
+    if (m.includes("version")) {
+      const t = V("version", s, y, g);
+      t && (ee.forEach((r) => {
         t.values?.push({
-          id: l.value,
-          label: l.label,
-          icon: l.icon
+          id: r.value,
+          label: r.label,
+          icon: r.icon
         });
-      }), r.push(t));
+      }), o.push(t));
     }
-    if (d.includes("name")) {
-      const t = V("name", s, y, w);
-      t && r.push(t);
+    if (m.includes("name")) {
+      const t = V("name", s, y, g);
+      t && o.push(t);
     }
-    if (d.includes("hasReviewables")) {
-      const t = V("hasReviewables", s, y, w);
+    if (m.includes("hasReviewables")) {
+      const t = V("hasReviewables", s, y, g);
       if (t) {
-        const l = [
+        const r = [
           {
             id: "true",
             label: "Yes",
@@ -363,41 +360,41 @@ const Rs = ({
             values: []
           }
         ];
-        t.values?.push(...l), r.push(t);
+        t.values?.push(...r), o.push(t);
       }
     }
-    if (d.includes("createdAt")) {
-      const t = V("createdAt", s, y, w);
+    if (m.includes("createdAt")) {
+      const t = V("createdAt", s, y, g);
       t && (t.values?.push(H), t.values?.push(
-        ...B().map((l) => ({
-          ...l,
-          contentAfter: u ? void 0 : /* @__PURE__ */ N.jsx(S, { icon: "bolt" })
+        ...B().map((r) => ({
+          ...r,
+          contentAfter: c ? void 0 : /* @__PURE__ */ N.jsx(S, { icon: "bolt" })
         }))
-      ), r.push(t));
+      ), o.push(t));
     }
-    if (d.includes("updatedAt")) {
-      const t = V("updatedAt", s, y, w);
+    if (m.includes("updatedAt")) {
+      const t = V("updatedAt", s, y, g);
       t && (t.values?.push(H), t.values?.push(
-        ...B().map((l) => ({
-          ...l,
-          contentAfter: u ? void 0 : /* @__PURE__ */ N.jsx(S, { icon: "bolt" })
+        ...B().map((r) => ({
+          ...r,
+          contentAfter: c ? void 0 : /* @__PURE__ */ N.jsx(S, { icon: "bolt" })
         }))
-      ), r.push(t));
+      ), o.push(t));
     }
-    if (d.includes("attributes")) {
+    if (m.includes("attributes")) {
       const t = z.filter(
-        (c) => c.scope?.includes(f)
-      ), l = q(o.attributes) ? t : t.filter(
-        (c) => o.attributes && o.attributes[c.name]
+        (p) => p.scope?.includes(f)
+      ), r = q(l.attributes) ? t : t.filter(
+        (p) => l.attributes && l.attributes[p.name]
       );
-      (s?.enableRelativeValues ? l : l.filter((c) => c.data.type !== "datetime")).forEach((c) => {
-        const b = o.attributes && o.attributes[c.name], g = c.data.enum, E = c.data.type, j = [
+      (s?.enableRelativeValues ? r : r.filter((p) => p.data.type !== "datetime")).forEach((p) => {
+        const v = l.attributes && l.attributes[p.name], w = p.data.enum, R = p.data.type, j = [
           "list_of_strings",
           "list_of_integers",
           "list_of_any",
           "list_of_submodels"
-        ].includes(E || ""), P = E === "datetime", Q = j ? s?.enableOperatorChange : !1, Y = j || P ? s?.enableRelativeValues : !1, W = se(
-          c,
+        ].includes(R || ""), M = R === "datetime", Q = j ? s?.enableOperatorChange : !1, Y = j || M ? s?.enableRelativeValues : !1, P = se(
+          p,
           {
             ...s,
             allowsCustomValues: !0,
@@ -405,20 +402,20 @@ const Rs = ({
             enableRelativeValues: Y
           },
           y,
-          w
+          g
         ), J = [
           "string",
           "integer",
           "float",
           "list_of_strings",
           "list_of_integers"
-        ], k = [];
-        if (J.includes(E)) {
-          const T = ae(b, g, E);
-          k.push(...T);
+        ], _ = [];
+        if (J.includes(R)) {
+          const A = ae(v, w, R);
+          _.push(...A);
         }
-        if (E === "boolean") {
-          const T = [
+        if (R === "boolean") {
+          const A = [
             {
               id: "true",
               label: "Yes",
@@ -430,35 +427,35 @@ const Rs = ({
               values: []
             }
           ];
-          k.push(...T);
+          _.push(...A);
         }
-        P && (k.push(H), k.push(
-          ...B().map((T) => ({
-            ...T,
-            contentAfter: u ? void 0 : /* @__PURE__ */ N.jsx(S, { icon: "bolt" })
+        M && (_.push(H), _.push(
+          ...B().map((A) => ({
+            ...A,
+            contentAfter: c ? void 0 : /* @__PURE__ */ N.jsx(S, { icon: "bolt" })
           }))
-        )), W.values?.push(...k), r.push(W);
+        )), P.values?.push(..._), o.push(P);
       });
     }
-  }), e ? oe(r, e) : r;
+  }), e ? oe(o, e) : o;
 }, I = ({
   projectsInfo: i,
   productTypes: a
-}, m) => {
+}, u) => {
   const n = [];
-  return m === "product" ? a.forEach(({ icon: o, label: s, value: e }) => {
+  return u === "product" ? a.forEach(({ icon: l, label: s, value: e }) => {
     n.push({
       id: e,
       type: "string",
       label: s || e,
-      icon: o || M("product"),
+      icon: l || D("product"),
       inverted: !1,
       values: [],
       allowsCustomValues: !1
     });
-  }) : m === "task" ? Object.values(i).forEach((o) => {
-    (o?.taskTypes || []).forEach((e) => {
-      n.some((u) => u.id === e.name) || n.push({
+  }) : u === "task" ? Object.values(i).forEach((l) => {
+    (l?.taskTypes || []).forEach((e) => {
+      n.some((c) => c.id === e.name) || n.push({
         id: e.name,
         type: "string",
         label: e.name,
@@ -474,9 +471,9 @@ const Rs = ({
         }
       });
     });
-  }) : m === "folder" && Object.values(i).forEach((o) => {
-    (o?.folderTypes || []).forEach((e) => {
-      n.some((u) => u.id === e.name) || n.push({
+  }) : u === "folder" && Object.values(i).forEach((l) => {
+    (l?.folderTypes || []).forEach((e) => {
+      n.some((c) => c.id === e.name) || n.push({
         id: e.name,
         type: "string",
         label: e.name,
@@ -493,17 +490,17 @@ const Rs = ({
       });
     });
   }), n;
-}, U = (i, a, m, n) => {
-  const { prefixes: o, keys: s } = m || {};
+}, U = (i, a, u, n) => {
+  const { prefixes: l, keys: s } = u || {};
   let e = i;
-  return s && a in s ? e = `${s[a]}` : o && a in o && (e = `${o[a]}${i}`), n && (e = `${n}_${e}`), e;
-}, G = (i, a) => a ? `${i} - ${a}` : i, V = (i, a, m, n) => {
-  const o = (u) => U(u, i, a, m), s = (u) => G(u, n);
+  return s && a in s ? e = `${s[a]}` : l && a in l && (e = `${l[a]}${i}`), n && (e = `${n}_${e}`), e;
+}, G = (i, a) => a ? `${i} - ${a}` : i, V = (i, a, u, n) => {
+  const l = (c) => U(c, i, a, u), s = (c) => G(c, n);
   let e = null;
   switch (i) {
     case "taskType":
       e = {
-        id: o("taskType"),
+        id: l("taskType"),
         type: "string",
         label: s("Task Type"),
         icon: O("task"),
@@ -519,7 +516,7 @@ const Rs = ({
       break;
     case "folderType":
       e = {
-        id: o("folderType"),
+        id: l("folderType"),
         type: "string",
         label: s("Folder Type"),
         icon: O("folder"),
@@ -535,7 +532,7 @@ const Rs = ({
       break;
     case "productType":
       e = {
-        id: o("productType"),
+        id: l("productType"),
         type: "string",
         label: s("Product Type"),
         icon: O("product"),
@@ -551,7 +548,7 @@ const Rs = ({
       break;
     case "productBaseType":
       e = {
-        id: o("productBaseType"),
+        id: l("productBaseType"),
         type: "string",
         label: s("Product Base Type"),
         icon: O("product"),
@@ -567,7 +564,7 @@ const Rs = ({
       break;
     case "productName":
       e = {
-        id: o("productNames"),
+        id: l("productNames"),
         type: "string",
         label: s("Product Name"),
         icon: O("productName", "string"),
@@ -583,7 +580,7 @@ const Rs = ({
       break;
     case "status":
       e = {
-        id: o("status"),
+        id: l("status"),
         type: "string",
         label: s("Status"),
         icon: O("status"),
@@ -599,7 +596,7 @@ const Rs = ({
       break;
     case "assignees":
       e = {
-        id: o("assignees"),
+        id: l("assignees"),
         type: "list_of_strings",
         label: s("Assignee"),
         icon: O("assignees"),
@@ -615,7 +612,7 @@ const Rs = ({
       break;
     case "author":
       e = {
-        id: o("author"),
+        id: l("author"),
         type: "string",
         label: s("Author"),
         icon: O("author"),
@@ -631,7 +628,7 @@ const Rs = ({
       break;
     case "tags":
       e = {
-        id: o("tags"),
+        id: l("tags"),
         type: "list_of_strings",
         label: s("Tags"),
         icon: O("tags"),
@@ -647,7 +644,7 @@ const Rs = ({
       break;
     case "version":
       e = {
-        id: o("version"),
+        id: l("version"),
         type: "string",
         label: s("Version"),
         icon: O("version"),
@@ -663,7 +660,7 @@ const Rs = ({
       break;
     case "name":
       e = {
-        id: o("name"),
+        id: l("name"),
         type: "string",
         label: s("Name"),
         icon: "text_fields",
@@ -679,7 +676,7 @@ const Rs = ({
       break;
     case "hasReviewables":
       e = {
-        id: o("hasReviewables"),
+        id: l("hasReviewables"),
         type: "boolean",
         label: s("Has Reviewables"),
         icon: "play_circle",
@@ -696,7 +693,7 @@ const Rs = ({
       break;
     case "createdAt":
       e = {
-        id: o("createdAt"),
+        id: l("createdAt"),
         type: "datetime",
         label: s("Created"),
         icon: "calendar_add_on",
@@ -713,7 +710,7 @@ const Rs = ({
       break;
     case "updatedAt":
       e = {
-        id: o("updatedAt"),
+        id: l("updatedAt"),
         type: "datetime",
         label: s("Updated"),
         icon: "edit_calendar",
@@ -730,8 +727,8 @@ const Rs = ({
       break;
   }
   return e;
-}, se = (i, a, m, n) => ({
-  id: U(i.name, "attributes", a, m),
+}, se = (i, a, u, n) => ({
+  id: U(i.name, "attributes", a, u),
   type: i.data.type,
   label: n ? G(i.data.title || i.name, n) : i.data.title || i.name,
   operator: "OR",
@@ -744,12 +741,12 @@ const Rs = ({
   operatorChangeable: a?.enableOperatorChange,
   icon: O(i.name, i.data.type, !!i.data.enum?.length),
   singleSelect: ["boolean", "datetime"].includes(i.data.type || "")
-}), ae = (i, a, m) => {
-  const n = [], o = [];
+}), ae = (i, a, u) => {
+  const n = [], l = [];
   return a && a.forEach((s) => {
     n.push({
       id: s.value.toString(),
-      type: m,
+      type: u,
       label: s.label,
       values: [],
       icon: s.icon,
@@ -771,68 +768,82 @@ const Rs = ({
         Array.isArray(s) ? e = s.join(", ") : e = JSON.stringify(s);
         break;
     }
-    const u = e.trim().toLowerCase().replace(/[^a-z0-9\s]/g, "").replace(/\s+/g, "-");
-    if (n?.find((v) => v.id === u)) return;
-    const p = o.find((v) => v.id === u);
-    if (p) {
-      p.count++;
+    const c = e.trim().toLowerCase().replace(/[^a-z0-9\s]/g, "").replace(/\s+/g, "-");
+    if (n?.find((h) => h.id === c)) return;
+    const d = l.find((h) => h.id === c);
+    if (d) {
+      d.count++;
       return;
     } else
-      o.push({
-        id: u,
-        type: m,
+      l.push({
+        id: c,
+        type: u,
         label: e,
         values: [],
         count: 1
       });
-  }), o.sort((s, e) => e.count - s.count), [...n, ...o];
+  }), l.sort((s, e) => e.count - s.count), [...n, ...l];
 }, oe = (i, a) => {
-  const m = a.flatMap((n) => n === "subType" ? ["taskType", "folderType"] : n);
-  return [...i].sort((n, o) => {
-    const s = m.indexOf(n.id.replace(".", "_")), e = m.indexOf(o.id.replace(".", "_"));
+  const u = a.flatMap((n) => n === "subType" ? ["taskType", "folderType"] : n);
+  return [...i].sort((n, l) => {
+    const s = u.indexOf(n.id.replace(".", "_")), e = u.indexOf(l.id.replace(".", "_"));
     return s !== -1 && e !== -1 ? s - e : s !== -1 ? -1 : e !== -1 ? 1 : 0;
   });
-}, ks = (i, a, m, n) => {
-  const o = {
-    folder: { conditions: [] },
-    product: { conditions: [] },
-    task: { conditions: [] },
-    user: { conditions: [] },
-    version: { conditions: [] },
-    unscoped: { conditions: [] }
+}, ks = (i, a, u, n) => {
+  const l = {
+    folder: { conditions: [], operator: i?.operator || "and" },
+    product: { conditions: [], operator: i?.operator || "and" },
+    task: { conditions: [], operator: i?.operator || "and" },
+    user: { conditions: [], operator: i?.operator || "and" },
+    version: { conditions: [], operator: i?.operator || "and" },
+    unscoped: { conditions: [], operator: i?.operator || "and" }
   };
   if (!i?.conditions || i?.conditions.length === 0)
-    return o;
-  const s = (u, r) => {
-    const p = a.find((v) => u.startsWith(`${v}_`));
-    if (p) {
-      const v = u.substring(`${p}_`.length);
-      return { scope: p, cleanId: v };
-    } else if (m?.fallbackScope)
-      return { scope: m.fallbackScope, cleanId: u };
-    return { scope: null, cleanId: u };
-  }, e = (u, r) => {
-    !u || u.length === 0 || u.forEach((p) => {
-      if ("conditions" in p && !("key" in p))
-        e(p.conditions, r);
-      else if ("key" in p) {
-        const { scope: v, cleanId: _ } = s(p.key);
-        if (v && r[v])
-          r[v].conditions?.push({
-            ...p,
-            key: _
-          });
-        else if (!v) {
-          const C = n?.[p.key];
-          C && r[C] ? r[C].conditions?.push(p) : p.key === F || p.key === "name" || p.key?.endsWith("_name") ? a.forEach((x) => {
-            r[x] && r[x].conditions?.push(p);
-          }) : r.unscoped?.conditions?.push(p);
-        }
+    return l;
+  const s = (o) => {
+    const d = a.find((h) => o.startsWith(`${h}_`));
+    if (d) {
+      const h = o.substring(`${d}_`.length);
+      return { scope: d, cleanId: h };
+    } else if (u?.fallbackScope)
+      return { scope: u.fallbackScope, cleanId: o };
+    return { scope: null, cleanId: o };
+  }, e = (o) => {
+    const d = {
+      folder: [],
+      product: [],
+      task: [],
+      user: [],
+      version: [],
+      unscoped: []
+    };
+    if ("conditions" in o && !("key" in o)) {
+      const h = (o.conditions || []).map((x) => e(x));
+      Object.keys(d).forEach((x) => {
+        const C = x, E = h.flatMap((k) => k[C]);
+        E.length > 0 && (E.length === 1 && !o.operator ? d[C].push(E[0]) : d[C].push({
+          conditions: E,
+          operator: o.operator
+        }));
+      });
+    } else if ("key" in o) {
+      const { scope: h, cleanId: x } = s(o.key);
+      if (h)
+        d[h].push({ ...o, key: x });
+      else {
+        const C = n?.[o.key];
+        C ? d[C].push(o) : o.key === F || o.key === "name" || o.key?.endsWith("_name") ? a.forEach((E) => {
+          d[E].push(o);
+        }) : d.unscoped.push(o);
       }
-    });
-  };
-  return e(i.conditions, o), o;
-}, Ts = (i, a, m) => {
+    }
+    return d;
+  }, c = (i.conditions || []).map((o) => e(o));
+  return Object.keys(l).forEach((o) => {
+    const d = o;
+    l[d].conditions = c.flatMap((h) => h[d]);
+  }), l;
+}, Ts = (i, a, u) => {
   const n = {
     folder: [],
     product: [],
@@ -843,22 +854,22 @@ const Rs = ({
   };
   if (!i || i.length === 0)
     return n;
-  const o = (e) => a.find((r) => e.startsWith(`${r}_`)) || null, s = (e, u) => {
-    const r = `${u}_`;
-    return e.startsWith(r) ? e.substring(r.length) : e;
+  const l = (e) => a.find((o) => e.startsWith(`${o}_`)) || null, s = (e, c) => {
+    const o = `${c}_`;
+    return e.startsWith(o) ? e.substring(o.length) : e;
   };
   return i.forEach((e) => {
     if (!e.id) return;
-    const u = o(e.id);
-    if (u) {
-      const r = {
+    const c = l(e.id);
+    if (c) {
+      const o = {
         ...e,
-        id: s(e.id, u)
+        id: s(e.id, c)
       };
-      n[u].push(r);
+      n[c].push(o);
     } else {
-      const r = m?.[e.id];
-      r ? n[r].push(e) : n.unscoped.push(e);
+      const o = u?.[e.id];
+      o ? n[o].push(e) : n.unscoped.push(e);
     }
   }), n;
 };