@ynput/ayon-frontend-shared 0.3.41 → 0.3.43

package/dist/shared/src/containers/ProjectTreeTable/hooks/useFetchOverviewData.es.js

@@ -40,7 +40,6 @@ import "../../../api/generated/grouping.es.js";
 import "../../../api/generated/views.es.js";
 import "../../../api/queries/actions/getActions.es.js";
 import "../../../api/queries/activities/getActivities.es.js";
-import "../../../api/queries/activities/updateActivities.es.js";
 import "../../../api/queries/activities/updateReaction.es.js";
 import "../../../api/queries/activities/getMentions.es.js";
 import "../../../api/queries/activities/getCategories.es.js";
@@ -55,7 +54,7 @@ import "../../../api/queries/config/getConfig.es.js";
 import "../../../api/queries/config/updateConfig.es.js";
 import "../../../api/queries/entities/getEntity.es.js";
 import "../../../api/queries/entities/getEntityPanel.es.js";
-import { useGetOverviewTasksByFoldersQuery as bt, useGetSearchFoldersQuery as Bt, useGetTasksListInfiniteInfiniteQuery as Ct, useGetGroupedTasksListQuery as Ft } from "../../../api/queries/overview/getOverview.es.js";
+import { useGetOverviewTasksByFoldersQuery as bt, useGetSearchFoldersQuery as Bt, useGetTasksListInfiniteInfiniteQuery as Ct, useGetGroupedTasksListQuery as Ot } from "../../../api/queries/overview/getOverview.es.js";
 import "../../../api/queries/overview/updateOverview.es.js";
 import "../../../api/queries/versions/getVersionsProducts.es.js";
 import { useGetEntityLinksQuery as V } from "../../../api/queries/links/getEntityLinks.es.js";
@@ -93,7 +92,7 @@ import "../../../api/queries/views/getViews.es.js";
 import "../../../api/queries/views/updateViews.es.js";
 import "../../../api/queries/watchers/getWatchers.es.js";
 import "../../../api/queries/uris/getUris.es.js";
-import { useMemo as p, useState as At, useEffect as Ot } from "react";
+import { useMemo as d, useState as At, useEffect as Ft } from "react";
 import "../../../context/RemoteModulesContext.es.js";
 import "../../../../../_virtual/runtime.es.js";
 import "../../../../../_virtual/semver.es.js";
@@ -103,6 +102,9 @@ import "../../../../../_virtual/jsx-runtime.es.js";
 import "../../../context/PowerpackContextInstance.es.js";
 import "../../../context/UriContext.es.js";
 import "../../../context/DetailsPanelContextInstance.es.js";
+import "uuid";
+import { getGroupByDataType as _t } from "../../../util/getGroupByDataType.es.js";
+import "../../../util/pubsub.es.js";
 import "../../../context/SubtasksModulesContextInstance.es.js";
 import "../../../context/ThumbnailUploaderContext.es.js";
 import "../../../context/SettingsPanelContext.es.js";
@@ -116,173 +118,161 @@ import "../../../context/MenuContext.es.js";
 import "../../../context/WebsocketContext.es.js";
 import "../../../context/GlobalContext.es.js";
 import "../../../context/ProjectContext.es.js";
-import { useProjectFoldersContext as wt } from "../../../context/ProjectFoldersContext.es.js";
+import { useProjectFoldersContext as Rt } from "../../../context/ProjectFoldersContext.es.js";
 import "react-redux";
 import "custom-protocol-check";
-import { useQueryArgumentChangeLoading as tt } from "../../../hooks/useQueryArgumentChangeLoading.es.js";
-import { useGroupedPagination as _t } from "../../../hooks/useGroupedPagination.es.js";
+import { useGroupedPagination as Wt } from "../../../hooks/useGroupedPagination.es.js";
 import "../components/GroupSettingsFallback.es.js";
-import "uuid";
-import { getGroupByDataType as Rt } from "../../../util/getGroupByDataType.es.js";
-import "../../../util/pubsub.es.js";
-import { determineLoadingTaskFolders as Wt } from "../utils/loadingUtils.es.js";
-import { isGroupId as it, GROUP_BY_ID as qt } from "./useBuildGroupByTableData.es.js";
-const uo = ({
-  projectName: m,
-  selectedFolders: d,
+import { determineLoadingTaskFolders as qt } from "../utils/loadingUtils.es.js";
+import { isGroupId as tt, GROUP_BY_ID as wt } from "./useBuildGroupByTableData.es.js";
+const ho = ({
+  projectName: k,
+  selectedFolders: a,
   // comes from the slicer
-  excludeSelectedFolders: k = !1,
+  excludeSelectedFolders: T = !1,
   taskIds: f,
   // specific task IDs from entity list slicer
-  taskFilters: a,
-  folderFilters: g,
+  taskFilters: p,
+  folderFilters: h,
   sorting: _,
   groupBy: c,
-  taskGroups: P = [],
-  taskGroupsCount: rt,
-  expanded: y,
-  showHierarchy: T,
-  isFlatFolderView: h = !1,
-  attribFields: ot,
-  modules: et,
-  skipLinks: L,
-  showComments: F = !1
+  taskGroups: v = [],
+  taskGroupsCount: it,
+  expanded: L,
+  showHierarchy: g,
+  isFlatFolderView: l = !1,
+  attribFields: rt,
+  modules: ot,
+  skipLinks: M,
+  showComments: B = !1
 }) => {
-  const { getGroupQueries: R, isLoading: W } = et, {
-    folders: l,
-    isLoading: st,
-    isUninitialized: nt,
-    refetch: at
-  } = wt(), v = Object.entries(y).filter(([, t]) => t).filter(([t]) => !it(t)).map(([t]) => t), q = k ? Array.from(/* @__PURE__ */ new Set([...v, ...d])) : v, {
-    data: S = [],
-    isFetching: Y,
-    refetch: pt,
-    isUninitialized: dt
+  const { getGroupQueries: R, isLoading: W } = ot, {
+    folders: m,
+    isLoading: et,
+    isUninitialized: st,
+    refetch: nt
+  } = Rt(), C = Object.entries(L).filter(([, t]) => t).filter(([t]) => !tt(t)).map(([t]) => t), q = C, {
+    data: I = [],
+    isFetching: w,
+    refetch: at,
+    isUninitialized: pt
   } = bt(
     {
-      projectName: m,
+      projectName: k,
       parentIds: q,
-      filter: a.filterString,
-      folderFilter: g.filterString,
-      search: a.search,
-      showComments: F
+      filter: p.filterString,
+      folderFilter: h.filterString,
+      search: p.search,
+      showComments: B
     },
-    { skip: !q.length || !T && !h }
-  ), J = !a.filterString && !g.filterString && !a.search && !g.search || !l.length || !T && !h, {
-    data: z,
-    isUninitialized: K,
-    isLoading: mt,
-    isUninitialized: ft,
-    refetch: ct
+    { skip: !q.length || !g && !l }
+  ), N = !p.filterString && !h.filterString && !p.search && !h.search || !m.length || !g && !l, {
+    data: S,
+    isUninitialized: Y,
+    isLoading: dt,
+    isUninitialized: mt,
+    refetch: ft
   } = Bt(
     {
-      projectName: m,
+      projectName: k,
       folderSearchRequest: {
-        taskFilter: a.filter?.conditions?.length ? a.filter : void 0,
-        folderFilter: g.filter?.conditions?.length ? g.filter : void 0,
-        search: a.search
+        taskFilter: p.filter?.conditions?.length ? p.filter : void 0,
+        folderFilter: h.filter?.conditions?.length ? h.filter : void 0,
+        search: p.search
       }
     },
     {
-      skip: J
+      skip: N
     }
-  ), U = p(() => {
+  ), O = d(() => {
     const t = /* @__PURE__ */ new Set();
-    return l.forEach((e) => {
-      if (!e.parentId) {
-        t.add(e.id);
+    return m.forEach((s) => {
+      if (!s.parentId) {
+        t.add(s.id);
         return;
       }
-      const i = e.parentId, r = k ? d.includes(i) : d.includes(e.id);
-      (y[i] === !0 || r) && t.add(e.id);
+      const i = s.parentId, r = T ? a.includes(i) : a.includes(s.id);
+      (L[i] === !0 || r) && t.add(s.id);
     }), t;
   }, [
-    l,
-    z,
-    J,
-    y,
-    d,
-    k
+    m,
+    S,
+    N,
+    L,
+    a,
+    T
   ]), {
-    data: G = [],
-    refetch: lt,
-    isUninitialized: gt,
-    isFetching: x
+    data: z = [],
+    refetch: ct,
+    isUninitialized: lt,
+    isFetching: J
   } = V(
     {
-      projectName: m,
-      entityIds: Array.from(U),
+      projectName: k,
+      entityIds: Array.from(O),
       entityType: "folder"
     },
-    { skip: L }
-  );
-  tt(
-    {
-      isLoading: x,
-      dependencies: [U, m]
-    },
-    x
-  );
-  const u = p(() => {
-    const t = /* @__PURE__ */ new Map(), e = (i) => ({
+    { skip: M }
+  ), u = d(() => {
+    const t = /* @__PURE__ */ new Map(), s = (i) => ({
       ...i,
       entityId: i.id,
       entityType: "folder",
-      links: G?.find((o) => o.id === i.id)?.links || []
+      links: z?.find((o) => o.id === i.id)?.links || []
     });
-    if (!K && z && l.length) {
+    if (!Y && S && m.length) {
       const i = /* @__PURE__ */ new Set();
-      for (const s of z)
-        i.add(s);
+      for (const e of S)
+        i.add(e);
       const r = /* @__PURE__ */ new Map();
-      for (const s of l)
-        r.set(s.id, s);
-      const o = (s) => {
-        const n = r.get(s);
+      for (const e of m)
+        r.set(e.id, e);
+      const o = (e) => {
+        const n = r.get(e);
         n && n.parentId && (i.add(n.parentId), o(n.parentId));
       };
-      if (!h) {
-        const s = [...i];
-        for (const n of s)
+      if (!l) {
+        const e = [...i];
+        for (const n of e)
           o(n);
       }
-      for (const s of l)
-        i.has(s.id) && t.set(s.id, e(s));
+      for (const e of m)
+        i.has(e.id) && t.set(e.id, s(e));
     } else
-      for (const i of l)
-        t.set(i.id, e(i));
-    if (d.length) {
-      const i = d.map((o) => t.get(o)?.path).filter(Boolean), r = /* @__PURE__ */ new Map();
-      return t.forEach((o, s) => {
-        const n = o.path, C = i.includes(n);
+      for (const i of m)
+        t.set(i.id, s(i));
+    if (a.length) {
+      const i = a.map((o) => m.find((e) => e.id === o)?.path).filter(Boolean), r = /* @__PURE__ */ new Map();
+      return t.forEach((o, e) => {
+        const n = o.path, b = i.includes(n);
         (i.some(
           (Qt) => n.startsWith(Qt + "/")
-        ) || C && !k) && r.set(s, e(o));
+        ) || b && (!T || l)) && r.set(e, s(o));
       }), r;
     }
     return t;
   }, [
-    l,
+    m,
+    S,
+    Y,
+    a,
+    T,
     z,
-    K,
-    d,
-    k,
-    G,
-    h
-  ]), ht = p(() => Y ? Wt({
-    expandedFoldersTasks: S,
-    expandedParentIds: v,
+    l
+  ]), ht = d(() => w ? qt({
+    expandedFoldersTasks: I,
+    expandedParentIds: C,
     foldersMap: u
-  }) : {}, [Y, S, v, u]), [X, ut] = At("");
-  Ot(() => {
-    X && ut("");
-  }, [_, X]);
-  const I = { ..._[0] }, E = I?.id === "name" && !T ? "path" : I?.id === "subType" ? "taskType" : I?.id, Z = d.length ? Array.from(
-    /* @__PURE__ */ new Set([...u.keys(), ...k ? d : []])
-  ) : void 0, {
+  }) : {}, [w, I, C, u]), [K, gt] = At("");
+  Ft(() => {
+    K && gt("");
+  }, [_, K]);
+  const y = { ..._[0] }, U = y?.id === "name" && !g ? "path" : y?.id === "subType" ? "taskType" : y?.id, ut = a.length ? Array.from(
+    /* @__PURE__ */ new Set([...u.keys(), ...T ? a : []])
+  ) : void 0, P = g && T && a.length ? a : void 0, {
     data: A,
     isLoading: kt,
-    isFetching: Jt,
+    isFetching: Yt,
     fetchNextPage: Tt,
     hasNextPage: It,
     isFetchingNextPage: yt,
@@ -290,173 +280,170 @@ const uo = ({
     refetch: Mt
   } = Ct(
     {
-      projectName: m,
-      filter: a.filterString,
-      folderFilter: g.filterString,
-      search: a.search,
-      folderIds: f?.length ? void 0 : Z,
+      projectName: k,
+      filter: p.filterString,
+      folderFilter: h.filterString,
+      search: p.search,
+      folderIds: f?.length ? void 0 : P ?? (a?.length ? a : void 0),
       taskIds: f?.length ? f : void 0,
-      sortBy: E ? E.replace("_", ".") : void 0,
-      desc: !!I?.desc,
-      showComments: F
+      sortBy: U ? U.replace("_", ".") : void 0,
+      desc: !!y?.desc,
+      showComments: B,
+      includeFolderChildren: !P
+      // Disable recursive task fetch for hierarchy+slicer mode
     },
     {
-      // Use flat task list when entity list provides specific task IDs, even in hierarchy mode
-      skip: (T || h) && !f?.length,
+      // Skip flat task list for flat folder view (tasks loaded on folder expand).
+      // In hierarchy+slicer mode, run it to fetch tasks under selected-but-hidden folders.
+      // Always run it when entity list provides specific task IDs.
+      skip: (g && !P || l) && !f?.length,
       initialPageParam: {
         cursor: "",
-        desc: !!I?.desc
+        desc: !!y?.desc
       }
     }
-  ), O = p(() => A?.pages ? A.pages.flatMap((t) => t.tasks || []) : [], [A?.pages]), { pageCounts: w, incrementPageCount: Pt } = _t({
-    groups: P
-  }), vt = Rt(c, ot), $ = p(() => Object.entries(y).filter(([, t]) => t).filter(([t]) => it(t)).map(([t]) => t.slice(qt.length)), [y]), N = p(() => c ? (R?.({
-    groups: P,
-    taskGroups: P,
+  ), G = d(() => A?.pages ? A.pages.flatMap((t) => t.tasks || []) : [], [A?.pages]), { pageCounts: F, incrementPageCount: Pt } = Wt({
+    groups: v
+  }), vt = _t(c, rt), X = d(() => Object.entries(L).filter(([, t]) => t).filter(([t]) => tt(t)).map(([t]) => t.slice(wt.length)), [L]), Z = d(() => c ? (R?.({
+    groups: v,
+    taskGroups: v,
     // deprecated, but keep for backward compatibility
-    filters: a.filter,
+    filters: p.filter,
     groupBy: c,
-    groupPageCounts: w
-  }) ?? []).filter((e) => $.includes(e.value)) : [], [
+    groupPageCounts: F
+  }) ?? []).filter((s) => X.includes(s.value)) : [], [
     c,
-    P,
-    w,
+    v,
+    F,
     vt,
-    a.filter,
+    p.filter,
     R,
-    $
+    X
   ]), {
-    data: { tasks: j = [] } = {},
+    data: { tasks: $ = [] } = {},
     isUninitialized: St,
     refetch: zt
-  } = Ft(
+  } = Ot(
     {
-      projectName: m,
-      groups: N,
-      sortBy: E ? E.replace("_", ".") : void 0,
-      desc: !!I?.desc,
-      search: a.search,
-      folderFilter: g.filterString,
-      folderIds: Z,
-      groupCount: rt,
-      showComments: F
+      projectName: k,
+      groups: Z,
+      sortBy: U ? U.replace("_", ".") : void 0,
+      desc: !!y?.desc,
+      search: p.search,
+      folderFilter: h.filterString,
+      folderIds: ut,
+      groupCount: it,
+      showComments: B
     },
     {
-      skip: !c || !N.length || W
+      skip: !c || !Z.length || W
     }
-  ), D = p(() => f?.length ? O : T || h ? S : c ? j : O, [
+  ), x = d(() => f?.length ? G : l ? I : g ? P ? [...I, ...G] : I : c ? $ : G, [
     f,
-    T,
-    h,
+    g,
+    P,
+    l,
     c,
-    O,
-    S,
-    j
-  ]), M = p(() => new Set(D.map((t) => t.id)), [D]), {
-    data: Q = [],
+    G,
+    I,
+    $
+  ]), E = d(() => new Set(x.map((t) => t.id)), [x]), {
+    data: D = [],
     refetch: Ut,
     isUninitialized: Gt,
-    isFetching: b
+    isFetching: j
   } = V(
     {
-      projectName: m,
-      entityIds: Array.from(M),
+      projectName: k,
+      entityIds: Array.from(E),
       entityType: "task"
     },
     {
-      skip: M.size === 0 || L
+      skip: E.size === 0 || M
     }
-  );
-  tt(
-    {
-      isLoading: b,
-      dependencies: [M, m]
-    },
-    b
-  );
-  const xt = p(() => {
+  ), xt = d(() => {
     const t = /* @__PURE__ */ new Set();
-    if (x && !L) {
-      const e = new Set(G.map((i) => i.id));
-      for (const i of U)
-        e.has(i) || t.add(i);
+    if (J && !M) {
+      const s = new Set(z.map((i) => i.id));
+      for (const i of O)
+        s.has(i) || t.add(i);
     }
-    if (b && !L) {
-      const e = new Set(Q.map((i) => i.id));
-      for (const i of M)
-        e.has(i) || t.add(i);
+    if (j && !M) {
+      const s = new Set(D.map((i) => i.id));
+      for (const i of E)
+        s.has(i) || t.add(i);
     }
     return t;
   }, [
-    x,
-    b,
-    G,
-    Q,
-    U,
-    M,
-    L
+    J,
+    j,
+    z,
+    D,
+    O,
+    E,
+    M
   ]), Et = (t) => {
-    c ? t && t in w && Pt(t) : It && Tt();
-  }, { tasksMap: Dt, tasksByFolderMap: B } = p(() => {
-    const t = /* @__PURE__ */ new Map(), e = /* @__PURE__ */ new Map(), i = (r) => ({
+    c ? t && t in F && Pt(t) : It && Tt();
+  }, { tasksMap: Dt, tasksByFolderMap: Q } = d(() => {
+    const t = /* @__PURE__ */ new Map(), s = /* @__PURE__ */ new Map(), i = (r) => ({
       ...r,
       entityId: r.id,
       entityType: "task",
-      links: Q?.find((o) => o.id === r.id)?.links || []
+      links: D?.find((o) => o.id === r.id)?.links || []
     });
-    for (const r of D) {
-      const o = r.id, s = r.folderId;
+    for (const r of x) {
+      const o = r.id, e = r.folderId;
       if (t.has(o)) {
-        const n = t.get(o), C = i(r), H = {
+        const n = t.get(o), b = i(r), H = {
           ...n,
-          ...C,
-          groups: [...n.groups || [], ...C.groups || []]
+          ...b,
+          groups: [...n.groups || [], ...b.groups || []]
         };
         t.set(o, H);
       } else
         t.set(o, i(r));
-      if (e.has(s)) {
-        const n = e.get(s);
+      if (s.has(e)) {
+        const n = s.get(e);
         n.includes(o) || n.push(o);
       } else
-        e.set(s, [o]);
+        s.set(e, [o]);
     }
-    return { tasksMap: t, tasksByFolderMap: e };
-  }, [D, Q]);
+    return { tasksMap: t, tasksByFolderMap: s };
+  }, [x, D]);
   return {
-    foldersMap: p(() => {
-      if (!f?.length || !B.size) return u;
+    foldersMap: d(() => {
+      if (!f?.length || !Q.size) return u;
       const t = /* @__PURE__ */ new Set();
-      for (const r of B.keys())
+      for (const r of Q.keys())
         t.add(r);
-      const e = (r) => {
+      const s = (r) => {
         const o = u.get(r);
         if (o && o.parentId) {
-          const s = o.parentId;
-          t.has(s) || (t.add(s), e(s));
+          const e = o.parentId;
+          t.has(e) || (t.add(e), s(e));
         }
       };
       for (const r of t)
-        e(r);
+        s(r);
       const i = /* @__PURE__ */ new Map();
       for (const [r, o] of u)
         t.has(r) && i.set(r, o);
       return i;
-    }, [u, B, f]),
+    }, [u, Q, f]),
     tasksMap: Dt,
-    tasksByFolderMap: B,
-    isLoadingAll: st || kt || mt || W,
+    tasksByFolderMap: Q,
+    isLoadingAll: et || kt || dt || W,
     // these all show a full loading state
     isLoadingMore: yt,
     loadingTasks: ht,
     loadingLinksEntityIds: xt,
     fetchNextPage: Et,
     reloadTableData: () => {
-      nt || at(), dt || pt(), ft || ct(), Lt || Mt(), St || zt(), gt || lt(), Gt || Ut();
+      st || nt(), pt || at(), mt || ft(), Lt || Mt(), St || zt(), lt || ct(), Gt || Ut();
     }
   };
 };
 export {
-  uo as useFetchOverviewData
+  ho as useFetchOverviewData
 };
 //# sourceMappingURL=useFetchOverviewData.es.js.map