fix finish session -- closing all similar categories

Author: bryanlundberg

src/hooks/useSolvesPage.ts

@@ -9,10 +9,17 @@ import { MoveData } from "@/components/solves/MoveModal";
 import { ConfirmDeleteData } from "@/components/solves/ConfirmDelete";
 import { sort } from "fast-sort";
 import calcStatistics from "@/lib/calcStatistics";
+import { getAllCubes, getCubeById } from "@/db/dbOperations";
 
 export default function useSolvesPage() {
   const [currentTab, setCurrentTab] = useState<SolveTab>("Session");
-  const { selectedCube, cubes, mergeUpdateSelectedCube } = useTimerStore();
+  const {
+    selectedCube,
+    cubes,
+    mergeUpdateSelectedCube,
+    setCubes,
+    setSelectedCube,
+  } = useTimerStore();
   const [displaySolves, setDisplaySolves] = useState<Solve[] | null>(null);
   const [isOpenMoveModal, setIsOpenMoveModal] = useState(false);
   const [isOpenDeleteModal, setIsOpenDeleteModal] = useState(false);
@@ -46,8 +53,11 @@ export default function useSolvesPage() {
 
   const handleMoveAll = async () => {
     if (!selectedCube) return;
-    const updatedCube = await finishSession({ selectedCube, cubesDB: cubes });
-    mergeUpdateSelectedCube(updatedCube, cubes);
+    await finishSession({ selectedCube, cubesDB: cubes });
+    const cubesDB = await getAllCubes();
+    setCubes(cubesDB);
+    const currentCube = await getCubeById(selectedCube.id);
+    setSelectedCube(currentCube);
   };
 
   const handleTrashAll = async () => {

src/lib/finishSession.ts

@@ -13,7 +13,7 @@ export default async function finishSession({
 }: {
   selectedCube: Cube | null;
   cubesDB: Cube[] | null;
-}): Promise<Cube | null> {
+}): Promise<Cube[] | null> {
   if (!selectedCube) return null;
   if (!cubesDB) return null;
 
@@ -29,11 +29,10 @@ export default async function finishSession({
         id: cube.id,
         name: cube.name,
         category: cube.category,
+        solves: cube.solves,
       });
-
-      return cube;
     }
   }
 
-  return null;
+  return cubesDB;
 }