remove 'solve.category' dependency in 'Solve' inheritance

Author: bryanlundberg

src/components/solves/ModalSolve.tsx

@@ -182,7 +182,9 @@ export default function ModalSolve({ currentTab }: { currentTab: SolveTab }) {
                     className="w-full h-32 my-3"
                     show={status}
                     scramble={solve.scramble}
-                    event={solve ? solve.category : "3x3"}
+                    event={
+                      solve && selectedCube ? selectedCube.category : "3x3"
+                    }
                   ></ScrambleDisplay>
                 )}
                 <div>{solve.comment}</div>

src/components/timer/ManualMode.tsx

@@ -57,7 +57,6 @@ export default function ManualMode() {
             dnf: false,
             plus2: false,
             rating: Math.floor(Math.random() * 20) + scramble.length,
-            category: selectedCube.category,
             cubeId: selectedCube.id,
           };
           setLastSolve(newSolve);

src/hooks/useTimer.ts

@@ -134,7 +134,6 @@ export default function useTimer() {
           dnf: false,
           plus2: false,
           rating: Math.floor(Math.random() * 20) + scramble.length,
-          category: selectedCube.category,
           cubeId: selectedCube.id,
           comment: "",
         };

src/interfaces/Solve.tsx

@@ -1,5 +1,3 @@
-import { Categories } from "./Categories";
-
 export interface Solve {
   id: string;
   cubeId: string;
@@ -11,6 +9,5 @@ export interface Solve {
   rating: number;
   dnf: boolean;
   plus2: boolean;
-  category: Categories;
   comment?: string;
 }

src/lib/importDataFromFile.ts

@@ -1,6 +1,7 @@
 import { Cube } from "@/interfaces/Cube";
 import { ChangeEvent } from "react";
 import genId from "./genId";
+import { Solve } from "@/interfaces/Solve";
 
 export default function importDataFromFile(
   event: ChangeEvent<HTMLInputElement>
@@ -116,7 +117,7 @@ function isValidCubesData(uploadedFileData: string): boolean {
       console.log(endTime - solvingTime, endTime, solvingTime);
 
       // adjust the calculations trying to match the data structure
-      const newSolve = {
+      const newSolve: Solve = {
         id: genId(),
         startTime: endTime - solvingTime,
         endTime: endTime,
@@ -126,7 +127,6 @@ function isValidCubesData(uploadedFileData: string): boolean {
         dnf: hasDNF,
         plus2: plus2,
         rating: Math.floor(Math.random() * 20) + scramble.length,
-        category: newCube.category,
         cubeId: newCube.id,
         comment: comment,
       };