From 25a721e71edf87193f66515ebcfb2985b1095965 Mon Sep 17 00:00:00 2001 From: Reece Browne Date: Fri, 15 Aug 2025 00:59:55 +0100 Subject: [PATCH] Fix post merge issues --- .claude/settings.local.json | 3 ++- frontend/src/components/layout/Workbench.tsx | 6 +----- frontend/src/components/pageEditor/PageEditor.tsx | 14 -------------- frontend/src/contexts/FileContext.tsx | 2 -- frontend/src/tools/AddPassword.tsx | 3 +-- frontend/src/tools/ChangePermissions.tsx | 3 +-- frontend/src/tools/Sanitize.tsx | 2 +- 7 files changed, 6 insertions(+), 27 deletions(-) diff --git a/.claude/settings.local.json b/.claude/settings.local.json index 8032f1d50..dd65b777a 100644 --- a/.claude/settings.local.json +++ b/.claude/settings.local.json @@ -12,6 +12,7 @@ "Bash(ls:*)", "Bash(npx tsc:*)" ], - "deny": [] + "deny": [], + "defaultMode": "acceptEdits" } } \ No newline at end of file diff --git a/frontend/src/components/layout/Workbench.tsx b/frontend/src/components/layout/Workbench.tsx index c84354299..8d6a2243d 100644 --- a/frontend/src/components/layout/Workbench.tsx +++ b/frontend/src/components/layout/Workbench.tsx @@ -146,11 +146,7 @@ export default function Workbench() { {/* Top Controls */} >>>>>> origin/V2 + setCurrentView={setCurrentView} selectedToolKey={selectedToolKey} /> diff --git a/frontend/src/components/pageEditor/PageEditor.tsx b/frontend/src/components/pageEditor/PageEditor.tsx index 28d1332a6..ad0125f92 100644 --- a/frontend/src/components/pageEditor/PageEditor.tsx +++ b/frontend/src/components/pageEditor/PageEditor.tsx @@ -45,7 +45,6 @@ export interface PageEditorProps { exportLoading: boolean; selectionMode: boolean; selectedPages: number[]; - selectedPages: number[]; closePdf: () => void; }) => void; } @@ -205,7 +204,6 @@ const PageEditor = ({ // Drag and drop state const [draggedPage, setDraggedPage] = useState(null); const [dropTarget, setDropTarget] = useState(null); - const [dropTarget, setDropTarget] = useState(null); const [multiPageDrag, setMultiPageDrag] = useState<{pageNumbers: number[], count: number} | null>(null); const [dragPosition, setDragPosition] = useState<{x: number, y: number} | null>(null); @@ -869,7 +867,6 @@ const PageEditor = ({ if (!mergedPdfDocument) return; // Convert page numbers to page IDs for export service - const exportPageIds = selectedOnly const exportPageIds = selectedOnly ? selectedPageNumbers.map(pageNum => { const page = mergedPdfDocument.pages.find(p => p.pageNumber === pageNum); @@ -889,7 +886,6 @@ const PageEditor = ({ setExportLoading(true); try { // Convert page numbers to page IDs for export service - const exportPageIds = selectedOnly const exportPageIds = selectedOnly ? selectedPageNumbers.map(pageNum => { const page = mergedPdfDocument.pages.find(p => p.pageNumber === pageNum); @@ -900,7 +896,6 @@ const PageEditor = ({ const errors = pdfExportService.validateExport(mergedPdfDocument, exportPageIds, selectedOnly); if (errors.length > 0) { - setStatus(errors.join(', ')); setStatus(errors.join(', ')); return; } @@ -1156,10 +1151,6 @@ const PageEditor = ({ {Math.round(processingProgress || 0)}% -
Processing thumbnails... {Math.round(processingProgress || 0)}% -
(un const FileContext = createContext(undefined); // Provider component -export function FileContextProvider({ - children, export function FileContextProvider({ children, enableUrlSync = true, diff --git a/frontend/src/tools/AddPassword.tsx b/frontend/src/tools/AddPassword.tsx index e649de72d..2d265b84f 100644 --- a/frontend/src/tools/AddPassword.tsx +++ b/frontend/src/tools/AddPassword.tsx @@ -3,8 +3,7 @@ import { Box, Button, Stack, Text } from "@mantine/core"; import { useTranslation } from "react-i18next"; import DownloadIcon from "@mui/icons-material/Download"; import { useEndpointEnabled } from "../hooks/useEndpointConfig"; -import { useFileContext } from "../contexts/FileContext"; -import { useToolFileSelection } from "../contexts/FileSelectionContext"; +import { useFileContext, useToolFileSelection } from "../contexts/FileContext"; import ToolStep, { ToolStepContainer } from "../components/tools/shared/ToolStep"; import OperationButton from "../components/tools/shared/OperationButton"; diff --git a/frontend/src/tools/ChangePermissions.tsx b/frontend/src/tools/ChangePermissions.tsx index 0c9123052..3e42e1727 100644 --- a/frontend/src/tools/ChangePermissions.tsx +++ b/frontend/src/tools/ChangePermissions.tsx @@ -3,8 +3,7 @@ import { Button, Stack, Text } from "@mantine/core"; import { useTranslation } from "react-i18next"; import DownloadIcon from "@mui/icons-material/Download"; import { useEndpointEnabled } from "../hooks/useEndpointConfig"; -import { useFileContext } from "../contexts/FileContext"; -import { useToolFileSelection } from "../contexts/FileSelectionContext"; +import { useFileContext, useToolFileSelection } from "../contexts/FileContext"; import ToolStep, { ToolStepContainer } from "../components/tools/shared/ToolStep"; import OperationButton from "../components/tools/shared/OperationButton"; diff --git a/frontend/src/tools/Sanitize.tsx b/frontend/src/tools/Sanitize.tsx index bc3fcd67a..384565fdd 100644 --- a/frontend/src/tools/Sanitize.tsx +++ b/frontend/src/tools/Sanitize.tsx @@ -3,7 +3,7 @@ import { Button, Stack, Text } from "@mantine/core"; import { useTranslation } from "react-i18next"; import DownloadIcon from "@mui/icons-material/Download"; import { useEndpointEnabled } from "../hooks/useEndpointConfig"; -import { useToolFileSelection } from "../contexts/FileSelectionContext"; +import { useToolFileSelection } from "../contexts/FileContext"; import ToolStep, { ToolStepContainer } from "../components/tools/shared/ToolStep"; import OperationButton from "../components/tools/shared/OperationButton";