checkbox selection logic optimisation and bug fix where loading does not disappear if the file upload is cancelled

Author: barrymun

src/features/diffViewer/components/uploadButton/index.tsx

@@ -14,12 +14,12 @@ export default function UploadButton() {
 
   const handleFileUpload = async (e: React.ChangeEvent<HTMLInputElement>) => {
     try {
-      startLoading();
       const file = e.target.files?.[0];
       if (!file) {
         return;
       }
 
+      startLoading();
       const content = await file.text();
       const parsedPatch = parsePatch(content);
       setParsedDiffs(parsedPatch);

src/features/directoryTree/index.tsx

@@ -2,6 +2,7 @@ import FolderIcon from "@mui/icons-material/Folder";
 import FolderOpenIcon from "@mui/icons-material/FolderOpen";
 import { Box, Button, useTheme } from "@mui/material";
 import { RichTreeView } from "@mui/x-tree-view/RichTreeView";
+import type { StructuredPatch } from "diff";
 import { useCallback, useEffect, useMemo, useState } from "react";
 
 import { CustomTreeItem } from "@/components/styled/customTreeItem";
@@ -17,6 +18,15 @@ export default function DirectoryTree() {
   const [selectedItems, setSelectedItems] = useState<string[]>([]);
 
   const patchFileInfos = useMemo(() => extractFileInfoFromPatches(parsedDiffs ?? []), [parsedDiffs]);
+  const matchingStructuredPatches = useMemo(() => {
+    const selectedItemsSet = new Set(selectedItems);
+    return patchFileInfos.reduce((acc: StructuredPatch[], obj) => {
+      if (selectedItemsSet.has(obj.actualFilePath)) {
+        acc.push(obj.patch);
+      }
+      return acc;
+    }, []);
+  }, [patchFileInfos, selectedItems]);
 
   const handleExpandClick = useCallback(() => {
     setExpandedItems((oldExpanded) => (oldExpanded.length === 0 ? getAllItemsWithChildrenItemIds(directoryData) : []));
@@ -34,13 +44,8 @@ export default function DirectoryTree() {
    * Update the visible patch files based on the selected items.
    */
   useEffect(() => {
-    const selectedItemsSet = new Set(selectedItems);
-    const matchingPatches = patchFileInfos
-      .filter((obj) => selectedItemsSet.has(obj.actualFilePath))
-      .map((obj) => obj.patch);
-
-    setSelectedParsedDiffs(matchingPatches);
-  }, [patchFileInfos, selectedItems, setSelectedParsedDiffs]);
+    setSelectedParsedDiffs(matchingStructuredPatches);
+  }, [matchingStructuredPatches, setSelectedParsedDiffs]);
 
   /*
    * When the directory structure changes: