@ynput/ayon-frontend-shared 0.4.0 → 0.4.1

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

@@ -1,8 +1,8 @@
-import { j as A } from "../../../../_virtual/jsx-runtime.es.js";
-import { isEmpty as X } from "lodash";
+import { j as I } from "../../../../_virtual/jsx-runtime.es.js";
+import { isEmpty as oe, upperFirst as W } from "lodash";
 import "react-toastify";
-import { getEntityTypeIcon as I } from "../../util/getEntityTypeIcon.es.js";
-import { getAttributeIcon as O } from "../../util/getAttributeIcon.es.js";
+import { getEntityTypeIcon as x } from "../../util/getEntityTypeIcon.es.js";
+import { getAttributeIcon as V } from "../../util/getAttributeIcon.es.js";
 import "uuid";
 import "../../api/base/client.es.js";
 import "../../api/generated/graphql.es.js";
@@ -92,7 +92,7 @@ import "../../api/queries/system/getSystem.es.js";
 import "../../api/queries/tasks/getTasks.es.js";
 import "../../api/queries/tasks/updateTasks.es.js";
 import "../../api/queries/teams/getTeams.es.js";
-import { useGetProjectsInfoQuery as Z, useGetKanbanProjectUsersQuery as F } from "../../api/queries/userDashboard/getUserDashboard.es.js";
+import { useGetProjectsInfoQuery as se, useGetKanbanProjectUsersQuery as re } from "../../api/queries/userDashboard/getUserDashboard.es.js";
 import "../../api/queries/users/getUsers.es.js";
 import "../../api/queries/users/updateUsers.es.js";
 import "../../api/queries/users/guests.es.js";
@@ -102,9 +102,9 @@ import "../../api/queries/views/updateViews.es.js";
 import "../../api/queries/watchers/getWatchers.es.js";
 import "../../api/queries/uris/getUris.es.js";
 import "../../util/pubsub.es.js";
-import { Icon as S, SEARCH_FILTER_ID as ee } from "@ynput/ayon-react-components";
-import { customRangeOption as H, generateDatePresetOptions as B } from "./filterDates.es.js";
-import { FEATURED_VERSION_TYPES as te } from "../FeaturedVersionOrder/FeaturedVersionOrder.es.js";
+import { Icon as M, SEARCH_FILTER_ID as ae } from "@ynput/ayon-react-components";
+import { customRangeOption as $, generateDatePresetOptions as j } from "./filterDates.es.js";
+import { FEATURED_VERSION_TYPES as ie } from "../FeaturedVersionOrder/FeaturedVersionOrder.es.js";
 import "../../context/RemoteModulesContext.es.js";
 import "react";
 import "../../../../_virtual/runtime.es.js";
@@ -125,7 +125,7 @@ import "../../context/AddonProjectContext.es.js";
 import "../../context/AddonContext.es.js";
 import "../../context/MenuContext.es.js";
 import "../../context/WebsocketContext.es.js";
-import { useGlobalContext as oe } from "../../context/GlobalContext.es.js";
+import { useGlobalContext as le } from "../../context/GlobalContext.es.js";
 import "../../context/ProjectContext.es.js";
 import "../../context/ProjectFoldersContextInstance.es.js";
 import "../../context/EntityUpdatesContextInstance.es.js";
@@ -205,6 +205,7 @@ import "../Powerpack/PowerpackDialog.styled.es.js";
 import "../Powerpack/CTAButton.es.js";
 import "../Powerpack/RequiredAddonVersion.es.js";
 import "../ProjectTableSettings/ProjectTableSettings.es.js";
+import "../ProjectTableSettings/ColumnsSettings.es.js";
 import "../SizeSlider/SizeSlider.es.js";
 import "react-router-dom";
 import "../../containers/Slicer/components/Slicer.es.js";
@@ -213,6 +214,24 @@ import "../../containers/Slicer/components/SlicerDropdownFallback.es.js";
 import "../../containers/NewEntity/components/NewEntity.es.js";
 import "@tanstack/react-virtual";
 import "@tanstack/react-table";
+import "../../containers/ProjectTreeTable/buildTreeTableColumns.es.js";
+import "../../containers/ProjectTreeTable/ProjectTreeTable.styled.es.js";
+import "../../containers/ProjectTreeTable/components/HeaderActionButton.es.js";
+import "../../containers/ProjectTreeTable/components/RowSelectionHeader.es.js";
+import "../../containers/ProjectTreeTable/components/SelectionCell.es.js";
+import "../../containers/ProjectTreeTable/context/CellEditingContext.es.js";
+import "short-uuid";
+import "../../containers/ProjectTreeTable/utils/columnIds.es.js";
+import "../../containers/ProjectTreeTable/context/SelectionCellsContext.es.js";
+import "../../containers/ProjectTreeTable/context/ProjectTableQueriesContext.es.js";
+import "../../containers/ProjectTreeTable/context/ColumnSettingsContext.es.js";
+import "../../containers/ProjectTreeTable/context/ProjectTableContextInstance.es.js";
+import "../../containers/ProjectTreeTable/context/ClipboardContext.es.js";
+import "../../containers/ProjectTreeTable/context/SelectedRowsContext.es.js";
+import "../../containers/ProjectTreeTable/context/DetailsPanelEntityContext.es.js";
+import "../../containers/ProjectTreeTable/context/ProjectDataContextInstance.es.js";
+import "../../containers/ProjectTreeTable/components/TableFooterRow.es.js";
+import "../../containers/ProjectTreeTable/widgets/CellWidget.es.js";
 import "../../containers/ProjectTreeTable/widgets/CollapsedWidget.es.js";
 import "../../containers/ProjectTreeTable/widgets/DateWidget.es.js";
 import "../../containers/ProjectTreeTable/widgets/EnumWidget.es.js";
@@ -220,29 +239,13 @@ import "../../containers/ProjectTreeTable/widgets/EnumCellValue.es.js";
 import "../../containers/ProjectTreeTable/widgets/TextWidget.es.js";
 import "../../containers/ProjectTreeTable/widgets/MarkdownWidget.es.js";
 import "../../containers/ProjectTreeTable/widgets/BooleanWidget.es.js";
-import "../../containers/ProjectTreeTable/widgets/CellWidget.es.js";
 import "../../containers/ProjectTreeTable/widgets/EntityNameWidget.es.js";
+import "../../containers/ProjectTreeTable/widgets/EntityWidget.es.js";
 import "../../containers/ProjectTreeTable/widgets/GroupHeaderWidget.es.js";
 import "../../containers/ProjectTreeTable/widgets/ThumbnailWidget.es.js";
 import "../../containers/ProjectTreeTable/widgets/LinksWidget.es.js";
-import "short-uuid";
-import "../../containers/ProjectTreeTable/context/CellEditingContext.es.js";
-import "../../containers/ProjectTreeTable/context/SelectionCellsContext.es.js";
-import "../../containers/ProjectTreeTable/context/ProjectTableQueriesContext.es.js";
-import "../../containers/ProjectTreeTable/context/ClipboardContext.es.js";
-import "../../containers/ProjectTreeTable/context/ColumnSettingsContext.es.js";
-import "../../containers/ProjectTreeTable/context/SelectedRowsContext.es.js";
-import "../../containers/ProjectTreeTable/context/DetailsPanelEntityContext.es.js";
-import "../../containers/ProjectTreeTable/context/ProjectDataContextInstance.es.js";
-import "../../containers/ProjectTreeTable/context/ProjectTableContextInstance.es.js";
 import "../../containers/ProjectTreeTable/widgets/EmptyWidget.es.js";
 import "../../containers/ProjectTreeTable/widgets/ErrorWidget.es.js";
-import "../../containers/ProjectTreeTable/ProjectTreeTable.styled.es.js";
-import "../../containers/ProjectTreeTable/components/SelectionCell.es.js";
-import "../../containers/ProjectTreeTable/components/RowSelectionHeader.es.js";
-import "../../containers/ProjectTreeTable/widgets/LoadMoreWidget.es.js";
-import "../../containers/ProjectTreeTable/components/HeaderActionButton.es.js";
-import "../../containers/ProjectTreeTable/components/TableFooterRow.es.js";
 import "../../containers/NewEntity/context/NewEntityContextInstance.es.js";
 import "../../containers/NewEntity/components/NewEntityForm.es.js";
 import "../../containers/Slicer/hooks/useTableDataBySlice.es.js";
@@ -302,180 +305,220 @@ import "../../containers/Views/ViewsMenuContainer/ViewsMenuContainer.es.js";
 import "../../containers/ListTable/ListTableRow.es.js";
 import "../../containers/ListTable/ListTable.styled.es.js";
 import "../../context/DeleteEntitiesContext.es.js";
-const Ur = ({
+const pe = /* @__PURE__ */ new Set([
+  "name",
+  "status",
+  "tags",
+  "assignees",
+  "author",
+  "folderType",
+  "taskType",
+  "productType",
+  "productBaseType",
+  "productName",
+  "version",
+  "hasReviewables",
+  "createdAt",
+  "updatedAt"
+]), Za = ({
   filterTypes: i = [],
-  projectNames: s,
-  scope: u,
-  scopes: p,
-  data: a,
-  config: o,
-  columnOrder: t = [],
-  power: c
+  projectNames: r,
+  scope: n,
+  scopes: u,
+  data: o,
+  config: e,
+  power: s
 }) => {
-  const l = a.productTypes || [], h = a.productBaseTypes || [];
-  let n = [];
-  const E = p || (u ? Array.isArray(u) ? u : [u] : []).map((d) => ({
-    scope: d,
+  const c = o.productTypes || [], a = o.productBaseTypes || [];
+  let p = [];
+  const v = /* @__PURE__ */ new Map(), y = u || (n ? Array.isArray(n) ? n : [n] : []).map((m) => ({
+    scope: m,
     filterTypes: i
-  })), x = E.length > 1, R = E.some(
-    (b) => ["entitySubType", "status"].some((d) => b.filterTypes.includes(d))
-  ), N = E.some(
-    (b) => ["assignees", "users", "author"].some(
-      (d) => b.filterTypes.includes(d)
+  })), R = y.length > 1, g = new Set(
+    Array.from(new Set(y.flatMap(({ filterTypes: h }) => h))).filter(
+      (h) => y.filter(({ filterTypes: m }) => m.includes(h)).length > 1
+    )
+  ), S = y.some(
+    (h) => ["entitySubType", "status"].some((m) => h.filterTypes.includes(m))
+  ), Y = y.some(
+    (h) => ["assignees", "users", "author"].some(
+      (m) => h.filterTypes.includes(m)
     )
-  ), { data: k = {} } = Z(
+  ), { data: k = {} } = se(
     {
-      projects: s
+      projects: r
     },
     {
-      skip: !s?.length || !R
+      skip: !r?.length || !S
     }
-  ), { data: $ = [] } = F(
-    { projects: s },
+  ), { data: D = [] } = re(
+    { projects: r },
     {
-      skip: !s?.length || !N
+      skip: !r?.length || !Y
     }
-  ), { attributes: L } = oe(), z = (b) => b.charAt(0).toUpperCase() + b.slice(1);
-  return E.forEach(({ scope: b, filterTypes: d }) => {
-    const v = x ? b : void 0, y = x ? z(b) : void 0;
-    if (d.includes("taskType") && b !== "user") {
-      const e = V(
+  ), { attributes: A } = le(), H = /* @__PURE__ */ new Map();
+  y.forEach(({ scope: h, filterTypes: m }) => {
+    m.includes("attributes") && A.filter((b) => b.scope?.includes(h)).forEach((b) => {
+      H.set(
+        b.name,
+        (H.get(b.name) || 0) + 1
+      );
+    });
+  }), y.forEach(({ scope: h, filterTypes: m }) => {
+    const b = R ? h : void 0;
+    if (m.includes("taskType") && h !== "user") {
+      const t = E(
         "taskType",
         {
-          ...o,
+          ...e,
           enableOperatorChange: !1
         },
-        v,
-        y
+        b,
+        g.has("taskType")
       );
-      if (e) {
-        let r = j({ projectsInfo: k, productTypes: l }, "task");
-        e.values?.push(...r), n.push(e);
+      if (t) {
+        let l = P({ projectsInfo: k, productTypes: c }, "task");
+        t.values?.push(...l), p.push(t);
       }
     }
-    if (d.includes("folderType") && b !== "user") {
-      const e = V(
+    if (m.includes("folderType") && h !== "user") {
+      const t = E(
         "folderType",
         {
-          ...o,
+          ...e,
           enableOperatorChange: !1
         },
-        v,
-        y
+        b,
+        g.has("folderType")
       );
-      if (e) {
-        let r = j({ projectsInfo: k, productTypes: l }, "folder");
-        e.values?.push(...r), n.push(e);
+      if (t) {
+        let l = P({ projectsInfo: k, productTypes: c }, "folder");
+        t.values?.push(...l), p.push(t);
       }
     }
-    if (d.includes("productType") && b !== "user") {
-      const e = V(
+    if (m.includes("productType") && h !== "user") {
+      const t = E(
         "productType",
         {
-          ...o,
+          ...e,
           enableOperatorChange: !1
         },
-        v,
-        y
+        b,
+        g.has("productType")
       );
-      if (e) {
-        let r = j({ projectsInfo: k, productTypes: l }, "product");
-        e.values?.push(...r), n.push(e);
+      if (t) {
+        let l = P({ projectsInfo: k, productTypes: c }, "product");
+        t.values?.push(...l), p.push(t);
       }
     }
-    if (d.includes("productBaseType") && b !== "user") {
-      const e = V(
+    if (m.includes("productBaseType") && h !== "user") {
+      const t = E(
         "productBaseType",
         {
-          ...o,
+          ...e,
           enableOperatorChange: !1
         },
-        v,
-        y
+        b,
+        g.has("productBaseType")
       );
-      e && (h.forEach(({ icon: r, name: f }) => {
-        e.values?.some((m) => m.id === f) || e.values?.push({
+      t && (a.forEach(({ icon: l, name: f }) => {
+        t.values?.some((d) => d.id === f) || t.values?.push({
           id: f,
           label: f,
-          icon: r || I("product")
+          icon: l || x("product")
         });
-      }), a.productBaseTypes?.forEach(({ icon: r, name: f }) => {
-        e.values?.some((m) => m.id === f) || e.values?.push({
+      }), o.productBaseTypes?.forEach(({ icon: l, name: f }) => {
+        t.values?.some((d) => d.id === f) || t.values?.push({
           id: f,
           label: f,
-          icon: r || I("product")
+          icon: l || x("product")
         });
-      }), n.push(e));
+      }), p.push(t));
     }
-    if (d.includes("productName") && b === "product") {
-      const e = V("productName", o, v, y);
-      e && (a.productNames?.forEach((r) => {
-        e.values?.some((f) => f.id === r) || e.values?.push({
-          id: r,
-          label: r
+    if (m.includes("productName") && h === "product") {
+      const t = E(
+        "productName",
+        e,
+        b,
+        g.has("productName")
+      );
+      t && (o.productNames?.forEach((l) => {
+        t.values?.some((f) => f.id === l) || t.values?.push({
+          id: l,
+          label: l
         });
-      }), n.push(e));
+      }), p.push(t));
     }
-    if (d.includes("status")) {
-      const e = V(
+    if (m.includes("status")) {
+      const t = E(
         "status",
-        { ...o, enableOperatorChange: !1 },
-        v,
-        y
+        { ...e, enableOperatorChange: !1 },
+        b,
+        g.has("status")
       );
-      e && (Object.values(k).forEach((r) => {
-        (r?.statuses || []).filter((m) => m.scope?.includes(b)).forEach((m) => {
-          e.values?.some((w) => w.id === m.name) || e.values?.push({
-            id: m.name,
-            label: m.name,
-            icon: m.icon,
-            color: m.color
+      t && (Object.values(k).forEach((l) => {
+        (l?.statuses || []).filter((d) => d.scope?.includes(h)).forEach((d) => {
+          t.values?.some((w) => w.id === d.name) || t.values?.push({
+            id: d.name,
+            label: d.name,
+            icon: d.icon,
+            color: d.color
           });
         });
-      }), n.push(e));
+      }), p.push(t));
     }
-    if (d.includes("assignees")) {
-      const e = V("assignees", o, v, y);
-      e && ($.forEach((r) => {
-        e.values?.some((f) => f.id === r.name) || e.values?.push({
-          id: r.name,
-          label: r.attrib.fullName || r.name,
-          img: `/api/users/${r.name}/avatar`,
+    if (m.includes("assignees")) {
+      const t = E(
+        "assignees",
+        e,
+        b,
+        g.has("assignees")
+      );
+      t && (D.forEach((l) => {
+        t.values?.some((f) => f.id === l.name) || t.values?.push({
+          id: l.name,
+          label: l.attrib.fullName || l.name,
+          img: `/api/users/${l.name}/avatar`,
           icon: null
         });
-      }), e.values?.sort((r, f) => {
-        const m = a.assignees?.filter((g) => g === r.id).length || 0;
-        return (a.assignees?.filter((g) => g === f.id).length || 0) - m;
-      }), n.push(e));
+      }), t.values?.sort((l, f) => {
+        const d = o.assignees?.filter((O) => O === l.id).length || 0;
+        return (o.assignees?.filter((O) => O === f.id).length || 0) - d;
+      }), p.push(t));
     }
-    if (d.includes("author")) {
-      const e = V("author", o, v, y);
-      e && ($.forEach((r) => {
-        e.values?.some((f) => f.id === r.name) || e.values?.push({
-          id: r.name,
-          label: r.attrib.fullName || r.name,
-          img: `/api/users/${r.name}/avatar`,
+    if (m.includes("author")) {
+      const t = E(
+        "author",
+        e,
+        b,
+        g.has("author")
+      );
+      t && (D.forEach((l) => {
+        t.values?.some((f) => f.id === l.name) || t.values?.push({
+          id: l.name,
+          label: l.attrib.fullName || l.name,
+          img: `/api/users/${l.name}/avatar`,
           icon: null
         });
-      }), n.push(e));
+      }), p.push(t));
     }
-    if (d.includes("tags")) {
-      const e = V("tags", o, v, y);
-      if (e) {
-        const r = /* @__PURE__ */ new Map();
+    if (m.includes("tags")) {
+      const t = E("tags", e, b, g.has("tags"));
+      if (t) {
+        const l = /* @__PURE__ */ new Map();
         Object.values(k).forEach((w) => {
-          w?.tags && w.tags.forEach((g) => {
-            r.has(g.name) || r.set(g.name, g);
+          w?.tags && w.tags.forEach((O) => {
+            l.has(O.name) || l.set(O.name, O);
           });
         });
         const f = /* @__PURE__ */ new Map();
-        a.tags?.forEach((w) => {
-          const g = f.get(w);
-          if (g) {
-            g.count++;
+        o.tags?.forEach((w) => {
+          const O = f.get(w);
+          if (O) {
+            O.count++;
             return;
           } else {
-            const C = r.get(w);
+            const C = l.get(w);
             f.set(w, {
               id: w,
               type: "string",
@@ -486,30 +529,35 @@ const Ur = ({
             });
           }
         });
-        const m = Array.from(f.values()).sort(
-          (w, g) => g.count - w.count
+        const d = Array.from(f.values()).sort(
+          (w, O) => O.count - w.count
         );
-        e.values?.push(...m), n.push(e);
+        t.values?.push(...d), p.push(t);
       }
     }
-    if (d.includes("version")) {
-      const e = V("version", o, v, y);
-      e && (te.forEach((r) => {
-        e.values?.push({
-          id: r.value,
-          label: r.label,
-          icon: r.icon
+    if (m.includes("version")) {
+      const t = E("version", e, b);
+      t && (ie.forEach((f) => {
+        t.values?.push({
+          id: f.value,
+          label: f.label,
+          icon: f.icon
         });
-      }), n.push(e));
+      }), p.push(t));
     }
-    if (d.includes("name")) {
-      const e = V("name", o, v, y);
-      e && n.push(e);
+    if (m.includes("name")) {
+      const t = E("name", e, b, g.has("name"));
+      t && p.push(t);
     }
-    if (d.includes("hasReviewables")) {
-      const e = V("hasReviewables", o, v, y);
-      if (e) {
-        const r = [
+    if (m.includes("hasReviewables")) {
+      const t = E(
+        "hasReviewables",
+        e,
+        b,
+        g.has("hasReviewables")
+      );
+      if (t) {
+        const l = [
           {
             id: "true",
             label: "Yes",
@@ -521,58 +569,68 @@ const Ur = ({
             values: []
           }
         ];
-        e.values?.push(...r), n.push(e);
+        t.values?.push(...l), p.push(t);
       }
     }
-    if (d.includes("createdAt")) {
-      const e = V("createdAt", o, v, y);
-      e && (e.values?.push(H), e.values?.push(
-        ...B().map((r) => ({
-          ...r,
-          contentAfter: c ? void 0 : /* @__PURE__ */ A.jsx(S, { icon: "bolt" })
+    if (m.includes("createdAt")) {
+      const t = E(
+        "createdAt",
+        e,
+        b,
+        g.has("createdAt")
+      );
+      t && (t.values?.push($), t.values?.push(
+        ...j().map((l) => ({
+          ...l,
+          contentAfter: s ? void 0 : /* @__PURE__ */ I.jsx(M, { icon: "bolt" })
         }))
-      ), n.push(e));
+      ), p.push(t));
     }
-    if (d.includes("updatedAt")) {
-      const e = V("updatedAt", o, v, y);
-      e && (e.values?.push(H), e.values?.push(
-        ...B().map((r) => ({
-          ...r,
-          contentAfter: c ? void 0 : /* @__PURE__ */ A.jsx(S, { icon: "bolt" })
+    if (m.includes("updatedAt")) {
+      const t = E(
+        "updatedAt",
+        e,
+        b,
+        g.has("updatedAt")
+      );
+      t && (t.values?.push($), t.values?.push(
+        ...j().map((l) => ({
+          ...l,
+          contentAfter: s ? void 0 : /* @__PURE__ */ I.jsx(M, { icon: "bolt" })
         }))
-      ), n.push(e));
+      ), p.push(t));
     }
-    if (d.includes("attributes")) {
-      const e = L.filter(
-        (m) => m.scope?.includes(b)
-      ), r = X(a.attributes) ? e : e.filter(
-        (m) => a.attributes && a.attributes[m.name]
+    if (m.includes("attributes")) {
+      const t = A.filter(
+        (d) => d.scope?.includes(h)
+      ), l = oe(o.attributes) ? t : t.filter(
+        (d) => o.attributes && o.attributes[d.name]
       );
-      (o?.enableRelativeValues ? r : r.filter((m) => m.data.type !== "datetime")).forEach((m) => {
-        const w = a.attributes && a.attributes[m.name], g = m.data.enum, C = m.data.type, M = [
+      (e?.enableRelativeValues ? l : l.filter((d) => d.data.type !== "datetime")).forEach((d) => {
+        const w = o.attributes && o.attributes[d.name], O = d.data.enum, C = d.data.type, L = [
           "list_of_strings",
           "list_of_integers",
           "list_of_any",
           "list_of_submodels"
-        ].includes(C || ""), P = C === "datetime", G = C === "string", Y = C === "integer" || C === "float", Q = M ? o?.enableOperatorChange : !1, J = m.data.default !== void 0 && m.data.default !== null && m.data.inherit !== !1, K = (M || P || G || Y) && !J ? o?.enableRelativeValues : !1, W = se(
-          m,
+        ].includes(C || ""), U = C === "datetime", K = C === "string", q = C === "integer" || C === "float", Z = L ? e?.enableOperatorChange : !1, F = d.data.default !== void 0 && d.data.default !== null && d.data.inherit !== !1, ee = (L || U || K || q) && !F ? e?.enableRelativeValues : !1, B = ne(
+          d,
           {
-            ...o,
+            ...e,
             allowsCustomValues: !0,
-            enableOperatorChange: Q,
-            enableRelativeValues: K
+            enableOperatorChange: Z,
+            enableRelativeValues: ee
           },
-          v,
-          y
-        ), q = [
+          b,
+          (H.get(d.name) || 0) > 1
+        ), te = [
           "string",
           "integer",
           "float",
           "list_of_strings",
           "list_of_integers"
         ], _ = [];
-        if (q.includes(C)) {
-          const T = ae(w, g, C);
+        if (te.includes(C)) {
+          const T = ue(w, O, C);
           _.push(...T);
         }
         if (C === "boolean") {
@@ -590,38 +648,54 @@ const Ur = ({
           ];
           _.push(...T);
         }
-        P && (_.push(H), _.push(
-          ...B().map((T) => ({
+        U && (_.push($), _.push(
+          ...j().map((T) => ({
             ...T,
-            contentAfter: c ? void 0 : /* @__PURE__ */ A.jsx(S, { icon: "bolt" })
+            contentAfter: s ? void 0 : /* @__PURE__ */ I.jsx(M, { icon: "bolt" })
           }))
-        )), W.values?.push(..._), n.push(W);
+        )), B.values?.push(..._), v.set(B.id, d.name), p.push(B);
       });
     }
-  }), t ? re(n, t) : n;
-}, j = ({
+  });
+  const Q = p.reduce((h, m) => {
+    if (!m.group) return h;
+    const b = typeof m.group == "string" ? void 0 : m.group, t = b?.name || m.group, l = y.some(({ scope: f }) => f === t);
+    return h.some((f) => f.name === t) || h.push({
+      name: t,
+      label: l ? W(t) : b?.label || m.label,
+      icon: l ? x(t) : b?.icon || m.icon,
+      color: b?.color || m.color
+    }), h;
+  }, []), G = me(p, v, A), J = ce(
+    Q,
+    G,
+    v,
+    A
+  );
+  return { options: G, groupOptions: J };
+}, P = ({
   projectsInfo: i,
-  productTypes: s
-}, u) => {
-  const p = [];
-  return u === "product" ? s.forEach(({ icon: a, name: o }) => {
-    p.push({
-      id: o,
+  productTypes: r
+}, n) => {
+  const u = [];
+  return n === "product" ? r.forEach(({ icon: o, name: e }) => {
+    u.push({
+      id: e,
       type: "string",
-      label: o,
-      icon: a || I("product"),
+      label: e,
+      icon: o || x("product"),
       inverted: !1,
       values: [],
       allowsCustomValues: !1
     });
-  }) : u === "task" ? Object.values(i).forEach((a) => {
-    (a?.taskTypes || []).forEach((t) => {
-      p.some((c) => c.id === t.name) || p.push({
-        id: t.name,
+  }) : n === "task" ? Object.values(i).forEach((o) => {
+    (o?.taskTypes || []).forEach((s) => {
+      u.some((c) => c.id === s.name) || u.push({
+        id: s.name,
         type: "string",
-        label: t.name,
-        icon: t.icon,
-        color: t.color,
+        label: s.name,
+        icon: s.icon,
+        color: s.color,
         inverted: !1,
         values: [],
         allowsCustomValues: !1,
@@ -632,14 +706,14 @@ const Ur = ({
         }
       });
     });
-  }) : u === "folder" && Object.values(i).forEach((a) => {
-    (a?.folderTypes || []).forEach((t) => {
-      p.some((c) => c.id === t.name) || p.push({
-        id: t.name,
+  }) : n === "folder" && Object.values(i).forEach((o) => {
+    (o?.folderTypes || []).forEach((s) => {
+      u.some((c) => c.id === s.name) || u.push({
+        id: s.name,
         type: "string",
-        label: t.name,
-        icon: t.icon,
-        color: t.color,
+        label: s.name,
+        icon: s.icon,
+        color: s.color,
         inverted: !1,
         values: [],
         allowsCustomValues: !1,
@@ -650,85 +724,85 @@ const Ur = ({
         }
       });
     });
-  }), p;
-}, D = (i, s, u, p) => {
-  const { prefixes: a, keys: o } = u || {};
-  let t = i;
-  return o && s in o ? t = `${o[s]}` : a && s in a && (t = `${a[s]}${i}`), p && (t = `${p}_${t}`), t;
-}, U = (i, s) => s ? `${i} - ${s}` : i, V = (i, s, u, p) => {
-  const a = (c) => D(c, i, s, u), o = (c) => U(c, p);
-  let t = null;
+  }), u;
+}, z = (i, r, n, u) => {
+  const { prefixes: o, keys: e } = n || {};
+  let s = i;
+  return e && r in e ? s = `${e[r]}` : o && r in o && (s = `${o[r]}${i}`), u && (s = `${u}_${s}`), s;
+}, E = (i, r, n, u = !1) => {
+  const o = (a) => z(a, i, r, n);
+  let e = null;
   switch (i) {
     case "taskType":
-      t = {
-        id: a("taskType"),
+      e = {
+        id: o("taskType"),
         type: "string",
-        label: o("Task Type"),
-        icon: O("task"),
+        label: "Task Type",
+        icon: V("task"),
         inverted: !1,
         operator: "OR",
         values: [],
         allowsCustomValues: !1,
         allowHasValue: !1,
         allowNoValue: !1,
-        allowExcludes: s?.enableExcludes,
+        allowExcludes: r?.enableExcludes,
         operatorChangeable: !1
       };
       break;
     case "folderType":
-      t = {
-        id: a("folderType"),
+      e = {
+        id: o("folderType"),
         type: "string",
-        label: o("Folder Type"),
-        icon: O("folder"),
+        label: "Folder Type",
+        icon: V("folder"),
         inverted: !1,
         operator: "OR",
         values: [],
         allowsCustomValues: !1,
         allowHasValue: !1,
         allowNoValue: !1,
-        allowExcludes: s?.enableExcludes,
+        allowExcludes: r?.enableExcludes,
         operatorChangeable: !1
       };
       break;
     case "productType":
-      t = {
-        id: a("productType"),
+      e = {
+        id: o("productType"),
         type: "string",
-        label: o("Product Type"),
-        icon: O("product"),
+        label: "Product Type",
+        icon: V("product"),
         inverted: !1,
         operator: "OR",
         values: [],
         allowsCustomValues: !1,
         allowHasValue: !1,
         allowNoValue: !1,
-        allowExcludes: s?.enableExcludes,
+        allowExcludes: r?.enableExcludes,
         operatorChangeable: !1
       };
       break;
     case "productBaseType":
-      t = {
-        id: a("productBaseType"),
+      e = {
+        id: o("productBaseType"),
         type: "string",
-        label: o("Product Base Type"),
-        icon: O("product"),
+        label: "Product Base Type",
+        icon: V("product"),
         inverted: !1,
         operator: "OR",
         values: [],
         allowsCustomValues: !0,
         allowHasValue: !1,
         allowNoValue: !1,
-        allowExcludes: s?.enableExcludes,
+        allowExcludes: r?.enableExcludes,
         operatorChangeable: !1
       };
       break;
     case "productName":
-      t = {
-        id: a("productNames"),
+      e = {
+        id: o("productNames"),
         type: "string",
-        label: o("Product Name"),
-        icon: O("productName", "string"),
+        label: "Product Name",
+        icon: V("productName", "string"),
         inverted: !1,
         operator: "OR",
         values: [],
@@ -740,90 +814,91 @@ const Ur = ({
       };
       break;
     case "status":
-      t = {
-        id: a("status"),
+      e = {
+        id: o("status"),
         type: "string",
-        label: o("Status"),
-        icon: O("status"),
+        label: "Status",
+        icon: V("status"),
         inverted: !1,
         operator: "OR",
         values: [],
         allowsCustomValues: !1,
         allowHasValue: !1,
         allowNoValue: !1,
-        allowExcludes: s?.enableExcludes,
+        allowExcludes: r?.enableExcludes,
         operatorChangeable: !1
       };
       break;
     case "assignees":
-      t = {
-        id: a("assignees"),
+      e = {
+        id: o("assignees"),
         type: "list_of_strings",
-        label: o("Assignee"),
-        icon: O("assignees"),
+        label: "Assignee",
+        icon: V("assignees"),
         inverted: !1,
         operator: "OR",
         values: [],
         allowsCustomValues: !1,
-        allowHasValue: s?.enableRelativeValues,
-        allowNoValue: s?.enableRelativeValues,
-        allowExcludes: s?.enableExcludes,
-        operatorChangeable: s?.enableOperatorChange
+        allowHasValue: r?.enableRelativeValues,
+        allowNoValue: r?.enableRelativeValues,
+        allowExcludes: r?.enableExcludes,
+        operatorChangeable: r?.enableOperatorChange
       };
       break;
     case "author":
-      t = {
-        id: a("author"),
+      e = {
+        id: o("author"),
         type: "string",
-        label: o("Author"),
-        icon: O("author"),
+        label: "Author",
+        icon: V("author"),
         inverted: !1,
         operator: "OR",
         values: [],
         allowsCustomValues: !1,
-        allowHasValue: s?.enableRelativeValues,
-        allowNoValue: s?.enableRelativeValues,
-        allowExcludes: s?.enableExcludes,
-        operatorChangeable: s?.enableOperatorChange
+        allowHasValue: r?.enableRelativeValues,
+        allowNoValue: r?.enableRelativeValues,
+        allowExcludes: r?.enableExcludes,
+        operatorChangeable: r?.enableOperatorChange
       };
       break;
     case "tags":
-      t = {
-        id: a("tags"),
+      e = {
+        id: o("tags"),
         type: "list_of_strings",
-        label: o("Tags"),
-        icon: O("tags"),
+        label: "Tags",
+        icon: V("tags"),
         inverted: !1,
         operator: "OR",
         values: [],
         allowsCustomValues: !0,
-        allowHasValue: s?.enableRelativeValues,
-        allowNoValue: s?.enableRelativeValues,
-        allowExcludes: s?.enableExcludes,
-        operatorChangeable: s?.enableOperatorChange
+        allowHasValue: r?.enableRelativeValues,
+        allowNoValue: r?.enableRelativeValues,
+        allowExcludes: r?.enableExcludes,
+        operatorChangeable: r?.enableOperatorChange
       };
       break;
     case "version":
-      t = {
-        id: a("version"),
+      e = {
+        id: o("version"),
         type: "string",
-        label: o("Version"),
-        icon: O("version"),
+        label: "Version",
+        icon: x("version"),
         inverted: !1,
         operator: "OR",
         values: [],
         allowsCustomValues: !0,
         allowHasValue: !1,
         allowNoValue: !1,
-        allowExcludes: !1,
-        operatorChangeable: !1
+        allowExcludes: !0,
+        operatorChangeable: !1,
+        singleSelect: !1
       };
       break;
     case "name":
-      t = {
-        id: a("name"),
+      e = {
+        id: o("name"),
         type: "string",
-        label: o("Name"),
+        label: "Name",
         icon: "text_fields",
         inverted: !1,
         operator: "OR",
@@ -836,10 +911,10 @@ const Ur = ({
       };
       break;
     case "hasReviewables":
-      t = {
-        id: a("hasReviewables"),
+      e = {
+        id: o("hasReviewables"),
         type: "boolean",
-        label: o("Has Reviewables"),
+        label: "Has Reviewables",
         icon: "play_circle",
         inverted: !1,
         operator: "OR",
@@ -847,16 +922,16 @@ const Ur = ({
         allowsCustomValues: !1,
         allowHasValue: !1,
         allowNoValue: !1,
-        allowExcludes: s?.enableExcludes,
+        allowExcludes: r?.enableExcludes,
         operatorChangeable: !1,
         singleSelect: !0
       };
       break;
     case "createdAt":
-      t = {
-        id: a("createdAt"),
+      e = {
+        id: o("createdAt"),
         type: "datetime",
-        label: o("Created"),
+        label: "Created",
         icon: "calendar_add_on",
         inverted: !1,
         operator: "OR",
@@ -870,10 +945,10 @@ const Ur = ({
       };
       break;
     case "updatedAt":
-      t = {
-        id: a("updatedAt"),
+      e = {
+        id: o("updatedAt"),
         type: "datetime",
-        label: o("Updated"),
+        label: "Updated",
         icon: "edit_calendar",
         inverted: !1,
         operator: "OR",
@@ -887,71 +962,113 @@ const Ur = ({
       };
       break;
   }
-  return t;
-}, se = (i, s, u, p) => ({
-  id: D(i.name, "attributes", s, u),
-  type: i.data.type,
-  label: p ? U(i.data.title || i.name, p) : i.data.title || i.name,
-  operator: "OR",
-  inverted: !1,
-  values: [],
-  allowsCustomValues: s?.allowsCustomValues,
-  allowHasValue: s.enableRelativeValues,
-  allowNoValue: s.enableRelativeValues,
-  allowExcludes: s?.enableExcludes,
-  operatorChangeable: s?.enableOperatorChange,
-  icon: O(i.name, i.data.type, !!i.data.enum?.length),
-  singleSelect: ["boolean", "datetime"].includes(i.data.type || "")
-}), ae = (i, s, u) => {
-  const p = [], a = [];
-  return s && s.forEach((o) => {
-    p.push({
-      id: o.value.toString(),
-      type: u,
-      label: o.label,
+  const s = W(n || ""), c = (a) => n ? `${s} ${a}` : a;
+  if ((u || n) && e) {
+    const a = n || i;
+    e.group = {
+      name: a,
+      label: e.label,
+      icon: e.icon
+    };
+  }
+  return e && n && (e.tooltip = c(e.label), e.value = { label: c(e.label) }), e && i === "version" && n === "version" && (e.value = { label: "Product Version" }, e.tooltip = "Product Version"), e;
+}, ne = (i, r, n, u = !1) => {
+  const o = i.data.title || i.name, e = u || n ? {
+    name: n || i.name,
+    label: o,
+    icon: V(
+      i.name,
+      i.data.type,
+      !!i.data.enum?.length
+    )
+  } : void 0;
+  return {
+    id: z(i.name, "attributes", r, n),
+    type: i.data.type,
+    label: o,
+    operator: "OR",
+    inverted: !1,
+    values: [],
+    allowsCustomValues: r?.allowsCustomValues,
+    allowHasValue: r.enableRelativeValues,
+    allowNoValue: r.enableRelativeValues,
+    allowExcludes: r?.enableExcludes,
+    operatorChangeable: r?.enableOperatorChange,
+    icon: V(i.name, i.data.type, !!i.data.enum?.length),
+    group: e,
+    tooltip: n ? `${W(n)} ${o}` : void 0,
+    value: n ? { icon: x(n) } : void 0,
+    singleSelect: ["boolean", "datetime"].includes(i.data.type || "")
+  };
+}, ue = (i, r, n) => {
+  const u = [], o = [];
+  return r && r.forEach((e) => {
+    u.push({
+      id: e.value.toString(),
+      type: n,
+      label: e.label,
       values: [],
-      icon: o.icon,
-      color: o.color,
+      icon: e.icon,
+      color: e.color,
       pt: {
         style: { color: "inherit" }
       }
     });
-  }), i?.forEach((o) => {
-    if (!o) return;
-    let t = "";
-    switch (typeof o) {
+  }), i?.forEach((e) => {
+    if (!e) return;
+    let s = "";
+    switch (typeof e) {
       case "string":
       case "number":
       case "boolean":
-        t = o.toString();
+        s = e.toString();
         break;
       case "object":
-        Array.isArray(o) ? t = o.join(", ") : t = JSON.stringify(o);
+        Array.isArray(e) ? s = e.join(", ") : s = JSON.stringify(e);
         break;
     }
-    const c = t.trim().toLowerCase().replace(/[^a-z0-9\s]/g, "").replace(/\s+/g, "-");
-    if (p?.find((n) => n.id === c)) return;
-    const h = a.find((n) => n.id === c);
-    if (h) {
-      h.count++;
+    const c = s.trim().toLowerCase().replace(/[^a-z0-9\s]/g, "").replace(/\s+/g, "-");
+    if (u?.find((v) => v.id === c)) return;
+    const p = o.find((v) => v.id === c);
+    if (p) {
+      p.count++;
       return;
     } else
-      a.push({
+      o.push({
         id: c,
-        type: u,
-        label: t,
+        type: n,
+        label: s,
         values: [],
         count: 1
       });
-  }), a.sort((o, t) => t.count - o.count), [...p, ...a];
-}, re = (i, s) => {
-  const u = s.flatMap((p) => p === "subType" ? ["taskType", "folderType"] : p);
-  return [...i].sort((p, a) => {
-    const o = u.indexOf(p.id.replace(".", "_")), t = u.indexOf(a.id.replace(".", "_"));
-    return o !== -1 && t !== -1 ? o - t : o !== -1 ? -1 : t !== -1 ? 1 : 0;
-  });
-}, Lr = (i, s, u, p) => {
-  const a = {
+  }), o.sort((e, s) => s.count - e.count), [...u, ...o];
+}, me = (i, r, n) => [...i].sort((u, o) => X(
+  N(u),
+  r.get(u.id),
+  N(o),
+  r.get(o.id),
+  n
+)), N = (i) => i.group ? typeof i.group == "string" ? i.group : i.group.name : i.id, ce = (i, r, n, u) => [...i].sort((o, e) => {
+  const s = r.find((a) => (typeof a.group == "string" ? a.group : a.group?.name) === o.name), c = r.find((a) => (typeof a.group == "string" ? a.group : a.group?.name) === e.name);
+  return X(
+    s ? N(s) : o.name,
+    s ? n.get(s.id) : o.name,
+    c ? N(c) : e.name,
+    c ? n.get(c.id) : e.name,
+    u
+  );
+}), X = (i, r, n, u, o) => {
+  const e = new Map(o.map((p, v) => [p.name, v])), s = (p) => {
+    let v = 0;
+    for (const y of pe) {
+      if (p === y || p.endsWith(`_${y}`)) return v;
+      v++;
+    }
+    return Number.MAX_SAFE_INTEGER;
+  }, c = r ? [1, e.get(r) ?? Number.MAX_SAFE_INTEGER] : [0, s(i)], a = u ? [1, e.get(u) ?? Number.MAX_SAFE_INTEGER] : [0, s(n)];
+  return c[0] - a[0] || c[1] - a[1];
+}, Fa = (i, r, n, u) => {
+  const o = {
     folder: { conditions: [], operator: i?.operator || "and" },
     product: { conditions: [], operator: i?.operator || "and" },
     task: { conditions: [], operator: i?.operator || "and" },
@@ -960,17 +1077,17 @@ const Ur = ({
     unscoped: { conditions: [], operator: i?.operator || "and" }
   };
   if (!i?.conditions || i?.conditions.length === 0)
-    return a;
-  const o = (l) => {
-    const h = s.find((n) => l.startsWith(`${n}_`));
-    if (h) {
-      const n = l.substring(`${h}_`.length);
-      return { scope: h, cleanId: n };
-    } else if (u?.fallbackScope)
-      return { scope: u.fallbackScope, cleanId: l };
-    return { scope: null, cleanId: l };
-  }, t = (l) => {
-    const h = {
+    return o;
+  const e = (a) => {
+    const p = r.find((v) => a.startsWith(`${v}_`));
+    if (p) {
+      const v = a.substring(`${p}_`.length);
+      return { scope: p, cleanId: v };
+    } else if (n?.fallbackScope)
+      return { scope: n.fallbackScope, cleanId: a };
+    return { scope: null, cleanId: a };
+  }, s = (a) => {
+    const p = {
       folder: [],
       product: [],
       task: [],
@@ -978,34 +1095,34 @@ const Ur = ({
       version: [],
       unscoped: []
     };
-    if ("conditions" in l && !("key" in l)) {
-      const n = (l.conditions || []).map((E) => t(E));
-      Object.keys(h).forEach((E) => {
-        const x = E, R = n.flatMap((N) => N[x]);
-        R.length > 0 && (R.length === 1 && !l.operator ? h[x].push(R[0]) : h[x].push({
-          conditions: R,
-          operator: l.operator
+    if ("conditions" in a && !("key" in a)) {
+      const v = (a.conditions || []).map((y) => s(y));
+      Object.keys(p).forEach((y) => {
+        const R = y, g = v.flatMap((S) => S[R]);
+        g.length > 0 && (g.length === 1 && !a.operator ? p[R].push(g[0]) : p[R].push({
+          conditions: g,
+          operator: a.operator
         }));
       });
-    } else if ("key" in l) {
-      const { scope: n, cleanId: E } = o(l.key);
-      if (n)
-        h[n].push({ ...l, key: E });
+    } else if ("key" in a) {
+      const { scope: v, cleanId: y } = e(a.key);
+      if (v)
+        p[v].push({ ...a, key: y });
       else {
-        const x = p?.[l.key];
-        x ? h[x].push(l) : l.key === ee || l.key === "name" || l.key?.endsWith("_name") ? s.forEach((R) => {
-          h[R].push(l);
-        }) : h.unscoped.push(l);
+        const R = u?.[a.key];
+        R ? p[R].push(a) : a.key === ae || a.key === "name" || a.key?.endsWith("_name") ? r.forEach((g) => {
+          p[g].push(a);
+        }) : p.unscoped.push(a);
       }
     }
-    return h;
-  }, c = (i.conditions || []).map((l) => t(l));
-  return Object.keys(a).forEach((l) => {
-    const h = l;
-    a[h].conditions = c.flatMap((n) => n[h]);
-  }), a;
-}, zr = (i, s, u) => {
-  const p = {
+    return p;
+  }, c = (i.conditions || []).map((a) => s(a));
+  return Object.keys(o).forEach((a) => {
+    const p = a;
+    o[p].conditions = c.flatMap((v) => v[p]);
+  }), o;
+}, ei = (i, r, n) => {
+  const u = {
     folder: [],
     product: [],
     task: [],
@@ -1014,29 +1131,29 @@ const Ur = ({
     unscoped: []
   };
   if (!i || i.length === 0)
-    return p;
-  const a = (t) => s.find((l) => t.startsWith(`${l}_`)) || null, o = (t, c) => {
-    const l = `${c}_`;
-    return t.startsWith(l) ? t.substring(l.length) : t;
+    return u;
+  const o = (s) => r.find((a) => s.startsWith(`${a}_`)) || null, e = (s, c) => {
+    const a = `${c}_`;
+    return s.startsWith(a) ? s.substring(a.length) : s;
   };
-  return i.forEach((t) => {
-    if (!t.id) return;
-    const c = a(t.id);
+  return i.forEach((s) => {
+    if (!s.id) return;
+    const c = o(s.id);
     if (c) {
-      const l = {
-        ...t,
-        id: o(t.id, c)
+      const a = {
+        ...s,
+        id: e(s.id, c)
       };
-      p[c].push(l);
+      u[c].push(a);
     } else {
-      const l = u?.[t.id];
-      l ? p[l].push(t) : p.unscoped.push(t);
+      const a = n?.[s.id];
+      a ? u[a].push(s) : u.unscoped.push(s);
     }
-  }), p;
+  }), u;
 };
 export {
-  zr as splitClientFiltersByScope,
-  Lr as splitFiltersByScope,
-  Ur as useBuildFilterOptions
+  ei as splitClientFiltersByScope,
+  Fa as splitFiltersByScope,
+  Za as useBuildFilterOptions
 };
 //# sourceMappingURL=useBuildFilterOptions.es.js.map