@ynput/ayon-frontend-shared 0.3.41 → 0.3.43

package/dist/shared/src/api/queries/overview/getOverview.es.js

@@ -1,5 +1,5 @@
 import "../../base/client.es.js";
-import { api as O } from "../../generated/graphql.es.js";
+import { api as H } from "../../generated/graphql.es.js";
 import "../../generated/graphqlLinks.es.js";
 import "../../generated/access.es.js";
 import "../../generated/actions.es.js";
@@ -15,7 +15,7 @@ import "../../generated/desktop.es.js";
 import "../../generated/entityLists.es.js";
 import "../../generated/events.es.js";
 import "../../generated/files.es.js";
-import { api as H } from "../../generated/folders.es.js";
+import { api as q } from "../../generated/folders.es.js";
 import "../../generated/inbox.es.js";
 import "../../generated/links.es.js";
 import "../../generated/market.es.js";
@@ -38,82 +38,136 @@ import "../../generated/workfiles.es.js";
 import "../../generated/ynputCloud.es.js";
 import "../../generated/grouping.es.js";
 import "../../generated/views.es.js";
+import P from "../../../util/pubsub.es.js";
 import "lodash";
 import "react-toastify";
 import "uuid";
-import { subscribeToThumbnailUpdates as E } from "../../../util/thumbnailWebsocket.es.js";
-import F from "../../../util/pubsub.es.js";
-import { mergeFieldStats as N, normalizeFieldStats as x } from "../columnStats/columnStats.es.js";
-import { hasNewTargetFields as G } from "../columnStats/metricTargets.es.js";
-const q = (s) => {
+import { subscribeToThumbnailUpdates as _ } from "../../../util/thumbnailWebsocket.es.js";
+import "../actions/getActions.es.js";
+import "../activities/getActivities.es.js";
+import "../activities/updateReaction.es.js";
+import "../activities/getMentions.es.js";
+import "../activities/getCategories.es.js";
+import "../addons/getAddons.es.js";
+import "../addons/updateAddons.es.js";
+import "../attributes/getAttributes.es.js";
+import "../attributes/updateAttributes.es.js";
+import "../authentication/getAuthentication.es.js";
+import "../cloud/cloud.es.js";
+import { mergeFieldStats as N, transformStatsError as x, normalizeFieldStats as G } from "../columnStats/columnStats.es.js";
+import { hasNewTargetFields as L } from "../columnStats/metricTargets.es.js";
+import "../config/getConfig.es.js";
+import "../config/updateConfig.es.js";
+import "../entities/getEntity.es.js";
+import "../entities/getEntityPanel.es.js";
+import "./updateOverview.es.js";
+import "../versions/getVersionsProducts.es.js";
+import "../links/getEntityLinks.es.js";
+import "../entities/updateEntity.es.js";
+import "../entityLists/getLists.es.js";
+import "../entityLists/updateLists.es.js";
+import "../entityLists/getListsAttributes.es.js";
+import "../entityLists/listItemsColumnStats.es.js";
+import "../entityLists/updateListsAttributes.es.js";
+import "../entityLists/listFolders.es.js";
+import "../folders/getFolders.es.js";
+import "../folders/getFolderDeleteInfo.es.js";
+import "../grouping/getGrouping.es.js";
+import "../links/updateLinks.es.js";
+import "../links/getLinks.es.js";
+import "../permissions/getPermissions.es.js";
+import "../products/createProduct.es.js";
+import "../products/getFolderProducts.es.js";
+import "../project/getProject.es.js";
+import "../project/updateProject.es.js";
+import "../projectFolders/projectFolders.es.js";
+import "../review/getReview.es.js";
+import "../review/updateReview.es.js";
+import "../share/share.es.js";
+import "../system/getSystem.es.js";
+import "../tasks/getTasks.es.js";
+import "../tasks/updateTasks.es.js";
+import "../teams/getTeams.es.js";
+import "../userDashboard/getUserDashboard.es.js";
+import "../users/getUsers.es.js";
+import "../users/updateUsers.es.js";
+import "../users/guests.es.js";
+import "../versions/updateVersions.es.js";
+import "../views/getViews.es.js";
+import "../views/updateViews.es.js";
+import "../watchers/getWatchers.es.js";
+import "../uris/getUris.es.js";
+const Q = (s) => {
   try {
     return JSON.parse(s);
   } catch {
     return {};
   }
-}, L = (s) => {
+}, O = (s) => {
   if (!s.project)
     return [];
-  const e = [];
-  for (const { node: t } of s.project.tasks.edges)
-    e.push({
-      ...t,
-      folderId: t.folderId || "root",
-      attrib: q(t.allAttrib),
-      entityId: t.id,
+  const t = [];
+  for (const { node: e } of s.project.tasks.edges)
+    t.push({
+      ...e,
+      folderId: e.folderId || "root",
+      attrib: Q(e.allAttrib),
+      entityId: e.id,
       entityType: "task",
       links: []
     });
-  return e;
-}, R = (s = [], e, t) => {
-  const o = s?.map((l) => ({ type: "overviewTask", id: l.id })) || [], a = t ? (Array.isArray(t) ? t : [t]).map((l) => ({
+  return t;
+}, F = (s = [], t, e) => {
+  const o = s?.map((d) => ({ type: "overviewTask", id: d.id })) || [], i = e ? (Array.isArray(e) ? e : [e]).map((d) => ({
     type: "overviewTask",
-    id: l
+    id: d
   })) : [];
   return [
     ...o,
-    ...a,
-    { type: "overviewTask", id: e },
+    ...i,
+    { type: "overviewTask", id: t },
     { type: "overviewTask", id: "LIST" }
   ];
-}, P = O.enhanceEndpoints({
+}, A = H.enhanceEndpoints({
   endpoints: {
     // This gets tasks for all parent folders provided
     // But in this case it will only ever receive one parent folder from the getOverviewTasksByFolders query
     // It is only used by getOverviewTasksByFolders in this file
     GetTasksByParent: {
-      transformResponse: L,
-      providesTags: (s, e, { parentIds: t, projectName: o }) => R(s, o, t)
+      transformResponse: O,
+      providesTags: (s, t, { parentIds: e, projectName: o }) => F(s, o, e)
     },
     GetTasksList: {
       transformResponse: (s) => ({
-        tasks: L(s),
+        tasks: O(s),
         pageInfo: s.project.tasks.pageInfo
       }),
-      providesTags: (s, e, { projectName: t }) => R(s?.tasks || [], t)
+      providesTags: (s, t, { projectName: e }) => F(s?.tasks || [], e)
     },
     // footer stats: `targets` excluded from cache key + responses merged,
     // so column toggles reuse cache and only added targets refetch
     GetFolderColumnStats: {
-      transformResponse: (s) => x(s?.project?.folders?.fieldStats ?? []),
-      serializeQueryArgs: ({ queryArgs: { targets: s, ...e } }) => e,
-      merge: (s, e) => N(e, s),
-      forceRefetch: ({ currentArg: s, previousArg: e }) => G(s, e),
-      providesTags: (s, e, { projectName: t }) => [{ type: "folderColumnStats", id: t }]
+      transformResponse: (s) => G(s?.project?.folders?.fieldStats ?? []),
+      transformErrorResponse: (s) => x(s, "folder"),
+      serializeQueryArgs: ({ queryArgs: { targets: s, ...t } }) => t,
+      merge: (s, t) => N(t, s),
+      forceRefetch: ({ currentArg: s, previousArg: t }) => L(s, t),
+      providesTags: (s, t, { projectName: e }) => [{ type: "folderColumnStats", id: e }]
     },
     GetTaskColumnStats: {
-      transformResponse: (s) => x(s?.project?.tasks?.fieldStats ?? []),
-      serializeQueryArgs: ({ queryArgs: { targets: s, ...e } }) => e,
-      merge: (s, e) => N(e, s),
-      forceRefetch: ({ currentArg: s, previousArg: e }) => G(s, e),
-      providesTags: (s, e, { projectName: t }) => [{ type: "taskColumnStats", id: t }]
+      transformResponse: (s) => G(s?.project?.tasks?.fieldStats ?? []),
+      transformErrorResponse: (s) => x(s, "task"),
+      serializeQueryArgs: ({ queryArgs: { targets: s, ...t } }) => t,
+      merge: (s, t) => N(t, s),
+      forceRefetch: ({ currentArg: s, previousArg: t }) => L(s, t),
+      providesTags: (s, t, { projectName: e }) => [{ type: "taskColumnStats", id: e }]
     }
   }
-}), Q = H.enhanceEndpoints({
+}), B = q.enhanceEndpoints({
   endpoints: {
     searchFolders: {}
   }
-}), S = 100, B = P.injectEndpoints({
+}), S = 100, j = A.injectEndpoints({
   endpoints: (s) => ({
     // Each project has one cache for all the tasks of the expanded folders
     // Changing the expanded folders will trigger a refetch but not a new cache
@@ -121,164 +175,167 @@ const q = (s) => {
     // When new folders are expanded, the new tasks are fetched and we use the cache for the rest
     // This also solves the pagination issue of getting all tasks in one query, splitting it up in multiple queries to avoid pagination limits
     getOverviewTasksByFolders: s.query({
-      async queryFn({ projectName: e, parentIds: t, filter: o, folderFilter: a, search: l, showComments: I }, { dispatch: g, forced: w }) {
+      async queryFn({ projectName: t, parentIds: e, filter: o, folderFilter: i, search: d, showComments: I }, { dispatch: g, forced: v }) {
         try {
-          const y = [];
-          for (let u = 0; u < t.length; u += 20) {
-            const C = t.slice(u, u + 20), i = (await Promise.all(
+          const h = [];
+          for (let c = 0; c < e.length; c += 20) {
+            const C = e.slice(c, c + 20), f = (await Promise.all(
               C.map(
                 async (r) => g(
-                  P.endpoints.GetTasksByParent.initiate(
+                  A.endpoints.GetTasksByParent.initiate(
                     {
-                      projectName: e,
+                      projectName: t,
                       parentIds: [r],
                       filter: o,
-                      folderFilter: a,
-                      search: l,
+                      folderFilter: i,
+                      search: d,
                       showComments: !!I
                     },
-                    { forceRefetch: w }
+                    { forceRefetch: v }
                   )
                 )
               )
             )).filter((r) => !!r.data).flatMap((r) => r.data);
-            y.push(...i);
+            h.push(...f);
           }
-          return { data: y };
-        } catch (v) {
-          return console.error(v), { error: { status: "FETCH_ERROR", error: v.message } };
+          return { data: h };
+        } catch (b) {
+          return console.error(b), { error: { status: "FETCH_ERROR", error: b.message } };
         }
       },
       // keep one cache per project
-      serializeQueryArgs: ({ queryArgs: { parentIds: e, ...t } }) => ({
-        ...t
+      serializeQueryArgs: ({ queryArgs: { parentIds: t, ...e } }) => ({
+        ...e
       }),
       // Refetch when the page arg changes
-      forceRefetch({ currentArg: e, previousArg: t }) {
-        return JSON.stringify(e) !== JSON.stringify(t);
+      forceRefetch({ currentArg: t, previousArg: e }) {
+        return JSON.stringify(t) !== JSON.stringify(e);
       },
-      providesTags: (e, t, { parentIds: o, projectName: a }) => R(e, a, o),
-      async onCacheEntryAdded({ projectName: e, parentIds: t, filter: o, search: a, showComments: l }, { cacheDataLoaded: I, cacheEntryRemoved: g, updateCachedData: w, dispatch: v }) {
-        let y;
-        const u = /* @__PURE__ */ new Set(), C = 100, b = 500;
-        let i = !1;
+      providesTags: (t, e, { parentIds: o, projectName: i }) => F(t, i, o),
+      async onCacheEntryAdded({ projectName: t, parentIds: e, filter: o, search: i, showComments: d }, { cacheDataLoaded: I, cacheEntryRemoved: g, updateCachedData: v, dispatch: b }) {
+        let h;
+        const c = /* @__PURE__ */ new Set(), C = 100, w = 500;
+        let f = !1;
         const r = () => {
-          i || (i = !0, setTimeout(h, b));
-        }, h = async () => {
-          if (i = !1, !u.size) return;
-          const c = Array.from(u).slice(0, C);
-          c.forEach((n) => u.delete(n));
+          f || (f = !0, setTimeout(y, w));
+        }, y = async () => {
+          if (f = !1, !c.size) return;
+          const n = Array.from(c).slice(0, C);
+          n.forEach((a) => c.delete(a));
           try {
-            const p = (await v(
-              P.endpoints.GetTasksList.initiate(
+            const l = (await b(
+              A.endpoints.GetTasksList.initiate(
                 {
-                  projectName: e,
-                  taskIds: c,
-                  showComments: !!l
+                  projectName: t,
+                  taskIds: n,
+                  showComments: !!d
                 },
                 { forceRefetch: !0 }
               )
-            ).unwrap()).tasks || [], f = new Map(p.map((d) => [d.id, d]));
-            w((d) => {
-              for (const k of p) {
-                const A = d.findIndex((T) => T.id === k.id);
-                A > -1 ? d[A] = k : d.push(k);
+            ).unwrap()).tasks || [], u = new Map(l.map((p) => [p.id, p]));
+            v((p) => {
+              for (const k of l) {
+                const R = p.findIndex((T) => T.id === k.id);
+                R > -1 ? p[R] = k : p.push(k);
               }
-              for (const k of c)
-                if (!f.has(k)) {
-                  const A = d.findIndex((T) => T.id === k);
-                  A > -1 && d.splice(A, 1);
+              for (const k of n)
+                if (!u.has(k)) {
+                  const R = p.findIndex((T) => T.id === k);
+                  R > -1 && p.splice(R, 1);
                 }
             });
-          } catch (n) {
-            console.error("Realtime overview batch update failed", n);
+          } catch (a) {
+            console.error("Realtime overview batch update failed", a);
           } finally {
-            u.size && r();
+            c.size && r();
           }
         };
         let m;
         try {
-          await I, m = E(
-            (n) => {
-              w((p) => {
-                n.forEach((f) => {
-                  if (f.summary.entityType === "task" && f.summary.thumbnailHash) {
-                    const d = p.findIndex((k) => k.id === f.summary.entityId);
-                    d > -1 && (p[d].thumbnailHash = f.summary.thumbnailHash);
+          await I, m = _(
+            (a) => {
+              v((l) => {
+                a.forEach((u) => {
+                  if (u.summary.entityType === "task" && u.summary.thumbnailHash) {
+                    const p = l.findIndex((k) => k.id === u.summary.entityId);
+                    p > -1 && (l[p].thumbnailHash = u.summary.thumbnailHash);
                   }
                 });
               });
             },
             ["task"]
           );
-          const c = async (n, p) => {
-            const f = p?.summary?.entityId, d = p?.summary?.parentId;
-            !f || !d || t.includes(d) && (u.add(f), r());
+          const n = async (a, l) => {
+            const u = l?.summary?.entityId, p = l?.summary?.parentId;
+            !u || !p || e.includes(p) && (c.add(u), r());
           };
-          y = F.subscribe("entity.task", c);
+          h = P.subscribe("entity.task", n);
         } catch {
         }
-        await g, y && F.unsubscribe(y), m && m();
+        await g, h && P.unsubscribe(h), m && m();
       }
     }),
     // searchFolders is a post so it's a bit annoying to consume
     // we wrap it in a queryFn to make it easier to consume as a query hook
     getSearchFolders: s.query({
-      async queryFn({ projectName: e, folderSearchRequest: t }, { dispatch: o }) {
+      async queryFn({ projectName: t, folderSearchRequest: e }, { dispatch: o }) {
         try {
           return { data: (await o(
-            Q.endpoints.searchFolders.initiate({
-              projectName: e,
-              folderSearchRequest: t
+            B.endpoints.searchFolders.initiate({
+              projectName: t,
+              folderSearchRequest: e
             })
           )).data?.folderIds || [] };
-        } catch (a) {
-          return console.error(a), { error: { status: "FETCH_ERROR", error: a.message } };
+        } catch (i) {
+          return console.error(i), { error: { status: "FETCH_ERROR", error: i.message } };
         }
       },
-      providesTags: (e, t, { projectName: o }) => [{ type: "tasksFolder", id: o }]
+      providesTags: (t, e, { projectName: o }) => [{ type: "tasksFolder", id: o }]
     }),
     // Add new infinite query endpoint for tasks list
     getTasksListInfinite: s.infiniteQuery({
       infiniteQueryOptions: {
         initialPageParam: { cursor: "", desc: !1 },
         // Calculate the next page param based on current page response and params
-        getNextPageParam: (e, t, o, a) => {
-          const l = e.pageInfo;
-          if (!(!(o.desc ? l.hasPreviousPage : l.hasNextPage) || !l.endCursor))
+        getNextPageParam: (t, e, o, i) => {
+          const d = t.pageInfo;
+          if (!(!(o.desc ? d.hasPreviousPage : d.hasNextPage) || !d.endCursor))
             return {
-              cursor: l.endCursor,
+              cursor: d.endCursor,
               desc: o.desc
             };
         }
       },
-      queryFn: async ({ queryArg: e, pageParam: t }, o) => {
+      queryFn: async ({ queryArg: t, pageParam: e }, o) => {
         try {
           const {
-            projectName: a,
-            filter: l,
+            projectName: i,
+            filter: d,
             folderFilter: I,
             search: g,
-            folderIds: w,
-            taskIds: v,
-            sortBy: y,
-            desc: u,
-            showComments: C
-          } = e, { cursor: b } = t, i = {
-            projectName: a,
-            filter: l,
+            folderIds: v,
+            taskIds: b,
+            sortBy: h,
+            desc: c,
+            showComments: C,
+            includeFolderChildren: w
+          } = t, { cursor: f } = e, r = {
+            projectName: i,
+            filter: d,
             folderFilter: I,
             search: g,
-            folderIds: w,
-            taskIds: v,
-            showComments: !!C
+            folderIds: v,
+            taskIds: b,
+            showComments: !!C,
+            includeFolderChildren: w !== !1
+            // default to true
           };
-          y ? (i.sortBy = y, u ? (i.before = b || void 0, i.last = S) : (i.after = b || void 0, i.first = S)) : (i.after = b || void 0, i.first = S);
-          const r = await o.dispatch(
-            P.endpoints.GetTasksList.initiate(i, { forceRefetch: !0 })
+          h ? (r.sortBy = h, c ? (r.before = f || void 0, r.last = S) : (r.after = f || void 0, r.first = S)) : (r.after = f || void 0, r.first = S);
+          const y = await o.dispatch(
+            A.endpoints.GetTasksList.initiate(r, { forceRefetch: !0 })
           );
-          if (r.error) throw r.error;
-          const h = {
+          if (y.error) throw y.error;
+          const m = {
             tasks: [],
             pageInfo: {
               hasNextPage: !1,
@@ -288,47 +345,47 @@ const q = (s) => {
             }
           };
           return {
-            data: r.data || h
+            data: y.data || m
           };
-        } catch (a) {
-          return console.error("Error in getTasksListInfinite queryFn:", a), { error: { status: "FETCH_ERROR", error: a.message } };
+        } catch (i) {
+          return console.error("Error in getTasksListInfinite queryFn:", i), { error: { status: "FETCH_ERROR", error: i.message } };
         }
       },
-      providesTags: (e, t, { projectName: o }) => R(e?.pages.flatMap((a) => a.tasks) || [], o),
-      async onCacheEntryAdded(e, { cacheDataLoaded: t, cacheEntryRemoved: o, updateCachedData: a, dispatch: l }) {
+      providesTags: (t, e, { projectName: o }) => F(t?.pages.flatMap((i) => i.tasks) || [], o),
+      async onCacheEntryAdded(t, { cacheDataLoaded: e, cacheEntryRemoved: o, updateCachedData: i, dispatch: d }) {
         let I;
-        const g = /* @__PURE__ */ new Set(), w = 100, v = 500;
-        let y = !1;
-        const u = () => {
-          y || (y = !0, setTimeout(C, v));
+        const g = /* @__PURE__ */ new Set(), v = 100, b = 500;
+        let h = !1;
+        const c = () => {
+          h || (h = !0, setTimeout(C, b));
         }, C = async () => {
-          if (y = !1, !g.size) return;
-          const i = Array.from(g).slice(0, w);
-          i.forEach((r) => g.delete(r));
+          if (h = !1, !g.size) return;
+          const f = Array.from(g).slice(0, v);
+          f.forEach((r) => g.delete(r));
           try {
-            const h = (await l(
-              P.endpoints.GetTasksList.initiate(
+            const y = (await d(
+              A.endpoints.GetTasksList.initiate(
                 {
-                  projectName: e.projectName,
-                  taskIds: i,
-                  folderIds: e.folderIds,
-                  showComments: !!e.showComments
+                  projectName: t.projectName,
+                  taskIds: f,
+                  folderIds: t.folderIds,
+                  showComments: !!t.showComments
                 },
                 { forceRefetch: !0 }
               )
-            ).unwrap()).tasks || [], m = new Map(h.map((c) => [c.id, c]));
-            a((c) => {
-              for (const n of h) {
-                let p = !1;
-                for (const f of c.pages) {
-                  const d = f.tasks.findIndex((k) => k.id === n.id);
-                  if (d !== -1) {
-                    f.tasks[d] = n, p = !0;
+            ).unwrap()).tasks || [], m = new Map(y.map((n) => [n.id, n]));
+            i((n) => {
+              for (const a of y) {
+                let l = !1;
+                for (const u of n.pages) {
+                  const p = u.tasks.findIndex((k) => k.id === a.id);
+                  if (p !== -1) {
+                    u.tasks[p] = a, l = !0;
                     break;
                   }
                 }
-                p || (c.pages.length ? c.pages[0].tasks.unshift(n) : c.pages.push({
-                  tasks: [n],
+                l || (n.pages.length ? n.pages[0].tasks.unshift(a) : n.pages.push({
+                  tasks: [a],
                   pageInfo: {
                     startCursor: null,
                     endCursor: null,
@@ -337,12 +394,12 @@ const q = (s) => {
                   }
                 }));
               }
-              for (const n of i)
-                if (!m.has(n))
-                  for (const p of c.pages) {
-                    const f = p.tasks.findIndex((d) => d.id === n);
-                    if (f !== -1) {
-                      p.tasks.splice(f, 1);
+              for (const a of f)
+                if (!m.has(a))
+                  for (const l of n.pages) {
+                    const u = l.tasks.findIndex((p) => p.id === a);
+                    if (u !== -1) {
+                      l.tasks.splice(u, 1);
                       break;
                     }
                   }
@@ -350,20 +407,20 @@ const q = (s) => {
           } catch (r) {
             console.error("Realtime infinite tasks batch update failed", r);
           } finally {
-            g.size && u();
+            g.size && c();
           }
         };
-        let b;
+        let w;
         try {
-          await t, b = E(
+          await e, w = _(
             (r) => {
-              a((h) => {
+              i((y) => {
                 r.forEach((m) => {
                   if (m.summary.entityType === "task" && m.summary.thumbnailHash)
-                    for (const c of h.pages) {
-                      const n = c.tasks.findIndex((p) => p.id === m.summary.entityId);
-                      if (n > -1) {
-                        c.tasks[n].thumbnailHash = m.summary.thumbnailHash;
+                    for (const n of y.pages) {
+                      const a = n.tasks.findIndex((l) => l.id === m.summary.entityId);
+                      if (a > -1) {
+                        n.tasks[a].thumbnailHash = m.summary.thumbnailHash;
                         break;
                       }
                     }
@@ -372,111 +429,111 @@ const q = (s) => {
             },
             ["task"]
           );
-          const i = async (r, h) => {
-            const m = h?.summary?.entityId;
-            m && (g.add(m), u());
+          const f = async (r, y) => {
+            const m = y?.summary?.entityId;
+            m && (g.add(m), c());
           };
-          I = F.subscribe("entity.task", i);
+          I = P.subscribe("entity.task", f);
         } catch {
         }
-        await o, I && F.unsubscribe(I), b && b();
+        await o, I && P.unsubscribe(I), w && w();
       }
     }),
     getGroupedTasksList: s.query({
       queryFn: async ({
-        projectName: e,
-        groups: t,
+        projectName: t,
+        groups: e,
         search: o,
-        folderFilter: a,
-        folderIds: l,
+        folderFilter: i,
+        folderIds: d,
         desc: I,
         sortBy: g,
-        groupCount: w,
-        showComments: v
-      }, y) => {
+        groupCount: v,
+        showComments: b
+      }, h) => {
         try {
-          let u = [];
+          let c = [];
           const C = /* @__PURE__ */ new Set(["folderType"]);
-          for (const r of t) {
-            const h = w || r.count || 500;
-            let m = r.filter, c = a;
+          for (const r of e) {
+            const y = v || r.count || 500;
+            let m = r.filter, n = i;
             if (r.filter)
               try {
-                const f = JSON.parse(r.filter), d = f.conditions || [], k = d.filter((T) => !C.has(T.key)), A = d.filter((T) => C.has(T.key));
-                if (A.length > 0) {
-                  m = k.length ? JSON.stringify({ ...f, conditions: k }) : void 0;
-                  const T = a ? JSON.parse(a) : null, _ = [...T && Array.isArray(T.conditions) ? T.conditions : [], ...A];
-                  c = JSON.stringify(
-                    T ? { ...T, conditions: _ } : { conditions: _ }
+                const u = JSON.parse(r.filter), p = u.conditions || [], k = p.filter((T) => !C.has(T.key)), R = p.filter((T) => C.has(T.key));
+                if (R.length > 0) {
+                  m = k.length ? JSON.stringify({ ...u, conditions: k }) : void 0;
+                  const T = i ? JSON.parse(i) : null, E = [...T && Array.isArray(T.conditions) ? T.conditions : [], ...R];
+                  n = JSON.stringify(
+                    T ? { ...T, conditions: E } : { conditions: E }
                   );
                 }
               } catch {
               }
-            const n = {
-              projectName: e,
+            const a = {
+              projectName: t,
               filter: m,
-              folderFilter: c,
+              folderFilter: n,
               search: o,
-              folderIds: l,
+              folderIds: d,
               sortBy: g,
-              showComments: !!v,
+              showComments: !!b,
               // @ts-expect-error - we know group does not exist on query variables but we need it for later
               group: r.value
             };
-            I ? n.last = h : n.first = h;
-            const p = y.dispatch(
-              P.endpoints.GetTasksList.initiate(n, { forceRefetch: !0 })
+            I ? a.last = y : a.first = y;
+            const l = h.dispatch(
+              A.endpoints.GetTasksList.initiate(a, { forceRefetch: !0 })
             );
-            u.push(p);
+            c.push(l);
           }
-          const b = await Promise.all(u), i = [];
-          for (const r of b) {
+          const w = await Promise.all(c), f = [];
+          for (const r of w) {
             if (r.error) throw r.error;
-            const h = r.originalArgs?.group, m = r.data?.pageInfo?.hasNextPage || r.data?.pageInfo?.hasPreviousPage || !1, c = r.data?.tasks.map((n, p, f) => ({
-              ...n,
+            const y = r.originalArgs?.group, m = r.data?.pageInfo?.hasNextPage || r.data?.pageInfo?.hasPreviousPage || !1, n = r.data?.tasks.map((a, l, u) => ({
+              ...a,
               groups: [
                 {
-                  value: h,
-                  hasNextPage: p === f.length - 1 && m ? h : void 0
+                  value: y,
+                  hasNextPage: l === u.length - 1 && m ? y : void 0
                   // Only add hasNextPage to the last task in the group
                 }
               ]
             })) || [];
-            i.push(...c);
+            f.push(...n);
           }
           return {
             data: {
-              tasks: i
+              tasks: f
             }
           };
-        } catch (u) {
-          return console.error("Error in getGroupedTasksList queryFn:", u), { error: { status: "FETCH_ERROR", error: u.message } };
+        } catch (c) {
+          return console.error("Error in getGroupedTasksList queryFn:", c), { error: { status: "FETCH_ERROR", error: c.message } };
         }
       },
-      providesTags: (e, t, { projectName: o }) => R(e?.tasks, o)
+      providesTags: (t, e, { projectName: o }) => F(t?.tasks, o)
     })
   })
 }), {
-  useGetOverviewTasksByFoldersQuery: Le,
-  useGetSearchFoldersQuery: Oe,
-  useGetTasksListQuery: He,
-  useGetTasksListInfiniteInfiniteQuery: qe,
-  useLazyGetTasksByParentQuery: Qe,
-  useGetGroupedTasksListQuery: Be,
-  useGetFolderColumnStatsQuery: je,
-  useGetTaskColumnStatsQuery: ze
-} = B;
+  useGetOverviewTasksByFoldersQuery: Ge,
+  useGetSearchFoldersQuery: Le,
+  useGetTasksListQuery: Oe,
+  useGetTasksListInfiniteInfiniteQuery: He,
+  useLazyGetTasksByParentQuery: qe,
+  useGetGroupedTasksListQuery: Qe,
+  useGetFolderColumnStatsQuery: Be,
+  useGetTaskColumnStatsQuery: je
+} = j;
 export {
   S as TASKS_INFINITE_QUERY_COUNT,
-  B as default,
-  q as parseAllAttribs,
-  je as useGetFolderColumnStatsQuery,
-  Be as useGetGroupedTasksListQuery,
-  Le as useGetOverviewTasksByFoldersQuery,
-  Oe as useGetSearchFoldersQuery,
-  ze as useGetTaskColumnStatsQuery,
-  qe as useGetTasksListInfiniteInfiniteQuery,
-  He as useGetTasksListQuery,
-  Qe as useLazyGetTasksByParentQuery
+  j as default,
+  Q as parseAllAttribs,
+  Be as useGetFolderColumnStatsQuery,
+  Qe as useGetGroupedTasksListQuery,
+  Ge as useGetOverviewTasksByFoldersQuery,
+  Le as useGetSearchFoldersQuery,
+  je as useGetTaskColumnStatsQuery,
+  He as useGetTasksListInfiniteInfiniteQuery,
+  Oe as useGetTasksListQuery,
+  qe as useLazyGetTasksByParentQuery
 };
 //# sourceMappingURL=getOverview.es.js.map