fix linter and react errors

franciscoBSalgueiro · Sep 20, 2023 · 566675f · 566675f
1 parent 2230aec
commit 566675f
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 28 deletions.
diff --git a/src-tauri/src/db/mod.rs b/src-tauri/src/db/mod.rs
@@ -467,7 +467,7 @@ pub async fn convert_pgn(
     let event_count: i64 = events::table.count().get_result(db)?;
     let site_count: i64 = sites::table.count().get_result(db)?;
 
-    let counts = vec![
+    let counts = [
         ("GameCount", game_count),
         ("PlayerCount", player_count),
         ("EventCount", event_count),

diff --git a/src/components/panels/analysis/AnalysisPanel.tsx b/src/components/panels/analysis/AnalysisPanel.tsx
@@ -19,6 +19,7 @@ import ProgressButton from "@/components/common/ProgressButton";
 import { TreeStateContext } from "@/components/common/TreeStateContext";
 import BestMoves from "./BestMoves";
 import EngineSelection from "./EngineSelection";
+import React from "react";
 
 const labels = {
   action: "Generate report",
@@ -137,14 +138,14 @@ const GameStats = memo(
             .map((annotation) => {
               const s = annotation as "??" | "?" | "?!" | "!!" | "!" | "!?";
               return (
-                <>
+                <React.Fragment key={annotation}>
                   <Grid.Col span={4} sx={{ textAlign: "center" }}>
                     {whiteAnnotations[s]}
                   </Grid.Col>
                   <Grid.Col span={1}>{annotation}</Grid.Col>
                   <Grid.Col span={4}>{ANNOTATION_INFO[s].name}</Grid.Col>
                   <Grid.Col span={2}>{blackAnnotations[s]}</Grid.Col>
-                </>
+                </React.Fragment>
               );
             })}
         </Grid>

diff --git a/src/components/panels/analysis/AnalysisRow.tsx b/src/components/panels/analysis/AnalysisRow.tsx
@@ -4,6 +4,7 @@ import { Score } from "@/utils/score";
 import MoveCell from "@/components/boards/MoveCell";
 import { TreeDispatchContext } from "@/components/common/TreeStateContext";
 import ScoreBubble from "./ScoreBubble";
+import React from "react";
 
 function AnalysisRow({
   score,
@@ -42,14 +43,12 @@ function AnalysisRow({
             const total_moves = halfMoves + index + 1 + (threat ? 1 : 0);
             const is_white = total_moves % 2 === 1;
             const move_number = Math.ceil(total_moves / 2);
-
             return (
-              <>
+              <React.Fragment key={index + move}>
                 {(index === 0 || is_white) && (
                   <>{`${move_number.toString()}${is_white ? "." : "..."}`}</>
                 )}
                 <MoveCell
-                  key={index + move}
                   move={move}
                   isCurrentVariation={false}
                   annotation={""}
@@ -64,7 +63,7 @@ function AnalysisRow({
                     }
                   }}
                 />
-              </>
+              </React.Fragment>
             );
           })}
         </Flex>

diff --git a/src/components/panels/analysis/EngineSelection.tsx b/src/components/panels/analysis/EngineSelection.tsx
@@ -7,38 +7,39 @@ import { Engine } from "@/utils/engines";
 import ImageCheckbox from "./ImageCheckbox";
 import { convertFileSrc } from "@tauri-apps/api/tauri";
 
-function EngineBox(props: {
+function EngineBox({
+  engine,
+  setEngines,
+}: {
   engine: Engine;
   setEngines: React.Dispatch<React.SetStateAction<Engine[]>>;
 }) {
   const [imageSrc, setImageSrc] = useState<string | undefined>(undefined);
 
   useEffect(() => {
     (async () => {
-      if (props.engine.image.startsWith("http")) {
-        setImageSrc(props.engine.image);
-      } else if (props.engine.image) {
-        setImageSrc(await convertFileSrc(props.engine.image));
+      if (engine.image && engine.image.startsWith("http")) {
+        setImageSrc(engine.image);
+      } else if (engine.image) {
+        setImageSrc(await convertFileSrc(engine.image));
       }
     })();
-  }, [props.engine.image]);
+  }, [engine.image]);
 
   return (
     <Grid.Col span={4}>
-      {imageSrc && (
-        <ImageCheckbox
-          title={props.engine.name}
-          image={imageSrc}
-          checked={props.engine.loaded}
-          onChange={(checked) =>
-            props.setEngines((engines) =>
-              engines.map((e) =>
-                e.name === props.engine.name ? { ...e, loaded: checked } : e
-              )
+      <ImageCheckbox
+        title={engine.name}
+        image={imageSrc}
+        checked={engine.loaded}
+        onChange={(checked) =>
+          setEngines((engines) =>
+            engines.map((e) =>
+              e.name === engine.name ? { ...e, loaded: checked } : e
             )
-          }
-        />
-      )}
+          )
+        }
+      />
     </Grid.Col>
   );
 }

diff --git a/src/components/panels/analysis/ImageCheckbox.tsx b/src/components/panels/analysis/ImageCheckbox.tsx
@@ -45,7 +45,7 @@ interface ImageCheckboxProps {
   onChange?(checked: boolean): void;
   title: string;
   description?: string;
-  image: string;
+  image?: string;
 }
 
 export default function ImageCheckbox({

diff --git a/src/utils/engines.ts b/src/utils/engines.ts
@@ -7,7 +7,7 @@ export interface Engine {
     name: string;
     version: string;
     path: string;
-    image: string;
+    image?: string;
     elo: number | "";
     downloadSize?: number;
     downloadLink?: string;