Extract stripDiffSearchParams helper to deduplicate diff param stripping logic

Consolidate the repeated pattern of destructuring and removing diff/diffTurnId/diffFilePath search params into a single stripDiffSearchParams() function in diffRouteSearch.ts. Replaces 5 identical destructuring blocks across 3 files with calls to the shared helper.

Cursor Agent committed 8 months ago

Commit f87f01f1 parent 891eb024 files · +35 −48Browse files

Showing the changes to apps/web/src/components (2 of 4 files). Show all

Unified · Split

2 files

apps/web/src/components/ChatView.tsx +21 −19
apps/web/src/components/DiffPanel.tsx +5 −19

apps/web/src/components/ChatView.tsx+21−19

 import { serverConfigQueryOptions, serverQueryKeys } from "~/lib/serverReactQuery";
 import { isElectron } from "../env";
-import { parseDiffRouteSearch } from "../diffRouteSearch";
+import { parseDiffRouteSearch, stripDiffSearchParams } from "../diffRouteSearch";
 import { buildBootstrapInput } from "../historyBootstrap";
 import {
   type ComposerTriggerKind,
       to: "/$threadId",
       params: { threadId },
       search: (previous) => {
-        const {
+        const rest = stripDiffSearchParams(previous);
-          diff: _diff,
-          diffTurnId: _diffTurnId,
-          diffFilePath: _diffFilePath,
-          ...rest
-        } = previous;
         return diffOpen ? rest : { ...rest, diff: "1" };
       },
     });
         to: "/$threadId",
         params: { threadId },
         search: (previous) => {
-          const {
+          const rest = stripDiffSearchParams(previous);
-            diff: _diff,
-            diffTurnId: _diffTurnId,
-            diffFilePath: _diffFilePath,
-            ...rest
-          } = previous;
           return filePath
             ? { ...rest, diff: "1", diffTurnId: turnId, diffFilePath: filePath }
             : { ...rest, diff: "1", diffTurnId: turnId };
                             row.message.id,
                           );
                           if (!turnSummary) return null;
-                          const checkpointFilesState = turnCheckpointFilesByTurnId.get(turnSummary.turnId);
+                          const checkpointFilesState = turnCheckpointFilesByTurnId.get(
+                            turnSummary.turnId,
+                          );
                           const checkpointFiles = checkpointFilesState?.files ?? [];
                           const summaryStat = checkpointFiles.reduce(
                             (acc, file) => {
-                              if (typeof file.additions !== "number" || typeof file.deletions !== "number") {
+                              if (
+                                typeof file.additions !== "number" ||
+                                typeof file.deletions !== "number"
+                              ) {
                                 return acc;
                               }
                               return {
                             { additions: 0, deletions: 0 },
                           );
                           const changedFileCountLabel =
-                            checkpointFilesState?.status === "ready" ? String(checkpointFiles.length) : "...";
+                            checkpointFilesState?.status === "ready"
+                              ? String(checkpointFiles.length)
+                              : "...";
                           return (
                             <div className="mt-2 rounded-lg border border-border/80 bg-card/45 p-2.5">
                               <div className="mb-1.5 flex items-center justify-between gap-2">
                                       <span className="mx-1">•</span>
                                       <span className="text-success">+{summaryStat.additions}</span>
                                       <span className="mx-0.5 text-muted-foreground/70">/</span>
-                                      <span className="text-destructive">-{summaryStat.deletions}</span>
+                                      <span className="text-destructive">
+                                        -{summaryStat.deletions}
+                                      </span>
                                     </>
                                   )}
                                 </p>
                                   type="button"
                                   size="xs"
                                   variant="outline"
-                                  onClick={() => onOpenTurnDiff(turnSummary.turnId, checkpointFiles[0]?.path)}
+                                  onClick={() =>
+                                    onOpenTurnDiff(turnSummary.turnId, checkpointFiles[0]?.path)
+                                  }
                                 >
                                   View diff
                                 </Button>
                               </div>
-                              {!checkpointFilesState || checkpointFilesState.status === "pending" ? (
+                              {!checkpointFilesState ||
+                              checkpointFilesState.status === "pending" ? (
                                 <p className="text-[11px] text-muted-foreground/70">
                                   Waiting for checkpoint metadata...
                                 </p>

apps/web/src/components/DiffPanel.tsx+5−19

 import { parsePatchFiles } from "@pierre/diffs";
-import {
+import { FileDiff, type FileDiffMetadata, Virtualizer } from "@pierre/diffs/react";
-  FileDiff,
-  type FileDiffMetadata,
-  Virtualizer,
-} from "@pierre/diffs/react";
 import { useQuery } from "@tanstack/react-query";
 import { useNavigate, useParams, useSearch } from "@tanstack/react-router";
 import { Columns2Icon, Rows3Icon } from "lucide-react";
 import { useEffect, useMemo, useRef, useState } from "react";
 import { checkpointDiffQueryOptions } from "~/lib/providerReactQuery";
 import { cn } from "~/lib/utils";
-import { parseDiffRouteSearch } from "../diffRouteSearch";
+import { parseDiffRouteSearch, stripDiffSearchParams } from "../diffRouteSearch";
 import { isElectron } from "../env";
 import { useNativeApi } from "../hooks/useNativeApi";
 import { useTheme } from "../hooks/useTheme";
     useTurnDiffSummaries(activeThread);
   const selectedTurnId = diffSearch.diffTurnId ?? null;
-  const selectedFilePath = selectedTurnId !== null ? diffSearch.diffFilePath ?? null : null;
+  const selectedFilePath = selectedTurnId !== null ? (diffSearch.diffFilePath ?? null) : null;
   const selectedTurn =
     selectedTurnId === null
       ? undefined
       to: "/$threadId",
       params: { threadId: activeThread.id },
       search: (previous) => {
-        const {
+        const rest = stripDiffSearchParams(previous);
-          diff: _diff,
-          diffTurnId: _diffTurnId,
-          diffFilePath: _diffFilePath,
-          ...rest
-        } = previous;
         return { ...rest, diff: "1", diffTurnId: turnId };
       },
     });
       to: "/$threadId",
       params: { threadId: activeThread.id },
       search: (previous) => {
-        const {
+        const rest = stripDiffSearchParams(previous);
-          diff: _diff,
-          diffTurnId: _diffTurnId,
-          diffFilePath: _diffFilePath,
-          ...rest
-        } = previous;
         return { ...rest, diff: "1" };
       },
     });

Extract stripDiffSearchParams helper to deduplicate diff param stripping logic

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code