@open-mercato/core 0.10.1-develop.7870.1.63e4c252d3 → 0.10.1-develop.7879.1.80d3740285

package/dist/modules/customers/backend/customers/deals/pipeline/page.js

@@ -443,10 +443,6 @@ function DealsKanbanPage() {
   });
   const [extraCardsByStage, setExtraCardsByStage] = React.useState({});
   const [loadingMoreByStage, setLoadingMoreByStage] = React.useState({});
-  React.useEffect(() => {
-    setExtraCardsByStage({});
-    setLoadingMoreByStage({});
-  }, [selectedPipelineId, search, statusFilters, ownerFilters, peopleFilters, companyFilters, closeDateFilter, currencyFilter]);
   const filterSignature = React.useMemo(
     () => ({
       pipelineId: selectedPipelineId,
@@ -526,28 +522,38 @@ function DealsKanbanPage() {
     const mapped = mapSortOptionToApi(sortBy);
     return mapped ?? { sortField: "updatedAt", sortDir: "desc" };
   }, [sortBy]);
+  const laneQueryKey = React.useMemo(
+    () => [
+      "customers",
+      "deals",
+      "kanban-lane",
+      `scope:${scopeVersion}`,
+      `organization:${activeOrgId ?? "none"}`,
+      `pipeline:${filterSignature.pipelineId ?? "none"}`,
+      `search:${filterSignature.search}`,
+      `status:${filterSignature.status}`,
+      `owners:${filterSignature.owners}`,
+      `people:${filterSignature.people}`,
+      `companies:${filterSignature.companies}`,
+      `close:${filterSignature.closeFrom}-${filterSignature.closeTo}`,
+      `sort:${apiSort.sortField}:${apiSort.sortDir}`,
+      `currency:${filterSignature.currency}`
+    ],
+    [scopeVersion, activeOrgId, filterSignature, apiSort]
+  );
+  const paginationGeneration = React.useRef(0);
+  React.useEffect(() => {
+    paginationGeneration.current += 1;
+    setExtraCardsByStage({});
+    setLoadingMoreByStage({});
+    return () => {
+      paginationGeneration.current += 1;
+    };
+  }, [laneQueryKey]);
   const laneQueries = useQueries({
     queries: lanes.map((stage) => {
       return {
-        queryKey: [
-          "customers",
-          "deals",
-          "kanban-lane",
-          `scope:${scopeVersion}`,
-          `pipeline:${filterSignature.pipelineId ?? "none"}`,
-          `search:${filterSignature.search}`,
-          `status:${filterSignature.status}`,
-          `owners:${filterSignature.owners}`,
-          `people:${filterSignature.people}`,
-          `companies:${filterSignature.companies}`,
-          `close:${filterSignature.closeFrom}-${filterSignature.closeTo}`,
-          // Sort affects which 25 deals come back on page 1, so it MUST be in the key —
-          // otherwise switching from "Value (high to low)" to "Close (soonest)" reuses
-          // the old (wrong-sort) cache and silently keeps the wrong slice on screen.
-          `sort:${apiSort.sortField}:${apiSort.sortDir}`,
-          `currency:${filterSignature.currency}`,
-          `stage:${stage.id}`
-        ],
+        queryKey: [...laneQueryKey, `stage:${stage.id}`],
         enabled: !!selectedPipelineId,
         staleTime: 3e4,
         queryFn: async () => {
@@ -688,6 +694,7 @@ function DealsKanbanPage() {
       if (loadingMoreByStage[stageId]) return;
       const already = extraCardsByStage[stageId]?.length ?? 0;
       const nextPage = Math.floor((LANE_PAGE_SIZE + already) / LANE_PAGE_SIZE) + 1;
+      const requestGeneration = paginationGeneration.current;
       setLoadingMoreByStage((prev) => ({ ...prev, [stageId]: true }));
       try {
         const params = new URLSearchParams();
@@ -708,18 +715,20 @@ function DealsKanbanPage() {
         const call = await apiCall(
           `/api/customers/deals?${params.toString()}`
         );
-        if (!call.ok) return;
+        if (requestGeneration !== paginationGeneration.current || !call.ok) return;
         const items = Array.isArray(call.result?.items) ? call.result.items : [];
         setExtraCardsByStage((prev) => ({
           ...prev,
           [stageId]: [...prev[stageId] ?? [], ...items]
         }));
       } finally {
-        setLoadingMoreByStage((prev) => {
-          const next = { ...prev };
-          delete next[stageId];
-          return next;
-        });
+        if (requestGeneration === paginationGeneration.current) {
+          setLoadingMoreByStage((prev) => {
+            const next = { ...prev };
+            delete next[stageId];
+            return next;
+          });
+        }
       }
     },
     [
@@ -733,7 +742,9 @@ function DealsKanbanPage() {
       companyFilters,
       closeDateFilter.from,
       closeDateFilter.to,
-      apiSort
+      currencyFilter,
+      apiSort,
+      laneQueryKey
     ]
   );
   const isInitialLoading = !!selectedPipelineId && lanes.length === 0 ? stagesQuery.isLoading : laneQueries.some((laneQuery) => laneQuery.isLoading && !laneQuery.data);