mirror of
https://github.com/Stirling-Tools/Stirling-PDF.git
synced 2025-09-18 09:29:24 +00:00
Fix deleting history
This commit is contained in:
parent
777c54dbe4
commit
410a6b8e9d
@ -10,7 +10,7 @@ interface FileHistoryGroupProps {
|
|||||||
isExpanded: boolean;
|
isExpanded: boolean;
|
||||||
onDownloadSingle: (file: StirlingFileStub) => void;
|
onDownloadSingle: (file: StirlingFileStub) => void;
|
||||||
onFileDoubleClick: (file: StirlingFileStub) => void;
|
onFileDoubleClick: (file: StirlingFileStub) => void;
|
||||||
onFileRemove: (index: number) => void;
|
onHistoryFileRemove: (file: StirlingFileStub) => void;
|
||||||
isFileSupported: (fileName: string) => boolean;
|
isFileSupported: (fileName: string) => boolean;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -20,7 +20,7 @@ const FileHistoryGroup: React.FC<FileHistoryGroupProps> = ({
|
|||||||
isExpanded,
|
isExpanded,
|
||||||
onDownloadSingle,
|
onDownloadSingle,
|
||||||
onFileDoubleClick,
|
onFileDoubleClick,
|
||||||
onFileRemove,
|
onHistoryFileRemove,
|
||||||
isFileSupported,
|
isFileSupported,
|
||||||
}) => {
|
}) => {
|
||||||
const { t } = useTranslation();
|
const { t } = useTranslation();
|
||||||
@ -44,14 +44,14 @@ const FileHistoryGroup: React.FC<FileHistoryGroupProps> = ({
|
|||||||
</Group>
|
</Group>
|
||||||
|
|
||||||
<Box ml="md">
|
<Box ml="md">
|
||||||
{sortedHistory.map((historyFile, index) => (
|
{sortedHistory.map((historyFile, _index) => (
|
||||||
<FileListItem
|
<FileListItem
|
||||||
key={`history-${historyFile.id}-${historyFile.versionNumber || 1}`}
|
key={`history-${historyFile.id}-${historyFile.versionNumber || 1}`}
|
||||||
file={historyFile}
|
file={historyFile}
|
||||||
isSelected={false} // History files are not selectable
|
isSelected={false} // History files are not selectable
|
||||||
isSupported={isFileSupported(historyFile.name)}
|
isSupported={isFileSupported(historyFile.name)}
|
||||||
onSelect={() => {}} // No selection for history files
|
onSelect={() => {}} // No selection for history files
|
||||||
onRemove={() => onFileRemove(index)} // Pass through remove handler
|
onRemove={() => onHistoryFileRemove(historyFile)} // Remove specific history file
|
||||||
onDownload={() => onDownloadSingle(historyFile)}
|
onDownload={() => onDownloadSingle(historyFile)}
|
||||||
onDoubleClick={() => onFileDoubleClick(historyFile)}
|
onDoubleClick={() => onFileDoubleClick(historyFile)}
|
||||||
isHistoryFile={true} // This enables "Add to Recents" in menu
|
isHistoryFile={true} // This enables "Add to Recents" in menu
|
||||||
|
@ -25,6 +25,7 @@ const FileListArea: React.FC<FileListAreaProps> = ({
|
|||||||
loadedHistoryFiles,
|
loadedHistoryFiles,
|
||||||
onFileSelect,
|
onFileSelect,
|
||||||
onFileRemove,
|
onFileRemove,
|
||||||
|
onHistoryFileRemove,
|
||||||
onFileDoubleClick,
|
onFileDoubleClick,
|
||||||
onDownloadSingle,
|
onDownloadSingle,
|
||||||
isFileSupported,
|
isFileSupported,
|
||||||
@ -78,7 +79,7 @@ const FileListArea: React.FC<FileListAreaProps> = ({
|
|||||||
isExpanded={isExpanded}
|
isExpanded={isExpanded}
|
||||||
onDownloadSingle={onDownloadSingle}
|
onDownloadSingle={onDownloadSingle}
|
||||||
onFileDoubleClick={onFileDoubleClick}
|
onFileDoubleClick={onFileDoubleClick}
|
||||||
onFileRemove={onFileRemove}
|
onHistoryFileRemove={onHistoryFileRemove}
|
||||||
isFileSupported={isFileSupported}
|
isFileSupported={isFileSupported}
|
||||||
/>
|
/>
|
||||||
</React.Fragment>
|
</React.Fragment>
|
||||||
|
@ -24,6 +24,7 @@ interface FileManagerContextValue {
|
|||||||
onLocalFileClick: () => void;
|
onLocalFileClick: () => void;
|
||||||
onFileSelect: (file: StirlingFileStub, index: number, shiftKey?: boolean) => void;
|
onFileSelect: (file: StirlingFileStub, index: number, shiftKey?: boolean) => void;
|
||||||
onFileRemove: (index: number) => void;
|
onFileRemove: (index: number) => void;
|
||||||
|
onHistoryFileRemove: (file: StirlingFileStub) => void;
|
||||||
onFileDoubleClick: (file: StirlingFileStub) => void;
|
onFileDoubleClick: (file: StirlingFileStub) => void;
|
||||||
onOpenFiles: () => void;
|
onOpenFiles: () => void;
|
||||||
onSearchChange: (value: string) => void;
|
onSearchChange: (value: string) => void;
|
||||||
@ -172,7 +173,7 @@ export const FileManagerProvider: React.FC<FileManagerProviderProps> = ({
|
|||||||
|
|
||||||
// Helper function to safely determine which files can be deleted
|
// Helper function to safely determine which files can be deleted
|
||||||
const getSafeFilesToDelete = useCallback((
|
const getSafeFilesToDelete = useCallback((
|
||||||
leafFileIds: string[],
|
fileIds: string[],
|
||||||
allStoredStubs: StirlingFileStub[]
|
allStoredStubs: StirlingFileStub[]
|
||||||
): string[] => {
|
): string[] => {
|
||||||
const fileMap = new Map(allStoredStubs.map(f => [f.id as string, f]));
|
const fileMap = new Map(allStoredStubs.map(f => [f.id as string, f]));
|
||||||
@ -180,7 +181,7 @@ export const FileManagerProvider: React.FC<FileManagerProviderProps> = ({
|
|||||||
const filesToPreserve = new Set<string>();
|
const filesToPreserve = new Set<string>();
|
||||||
|
|
||||||
// First, identify all files in the lineages of the leaf files being deleted
|
// First, identify all files in the lineages of the leaf files being deleted
|
||||||
for (const leafFileId of leafFileIds) {
|
for (const leafFileId of fileIds) {
|
||||||
const currentFile = fileMap.get(leafFileId);
|
const currentFile = fileMap.get(leafFileId);
|
||||||
if (!currentFile) continue;
|
if (!currentFile) continue;
|
||||||
|
|
||||||
@ -206,7 +207,7 @@ export const FileManagerProvider: React.FC<FileManagerProviderProps> = ({
|
|||||||
const fileOriginalId = file.originalFileId || file.id;
|
const fileOriginalId = file.originalFileId || file.id;
|
||||||
|
|
||||||
// If this file is a leaf node (not being deleted) and its lineage overlaps with files we want to delete
|
// If this file is a leaf node (not being deleted) and its lineage overlaps with files we want to delete
|
||||||
if (file.isLeaf !== false && !leafFileIds.includes(file.id)) {
|
if (file.isLeaf !== false && !fileIds.includes(file.id)) {
|
||||||
// Find all files in this preserved lineage
|
// Find all files in this preserved lineage
|
||||||
const preservedChainFiles = allStoredStubs.filter((chainFile: StirlingFileStub) =>
|
const preservedChainFiles = allStoredStubs.filter((chainFile: StirlingFileStub) =>
|
||||||
(chainFile.originalFileId || chainFile.id) === fileOriginalId
|
(chainFile.originalFileId || chainFile.id) === fileOriginalId
|
||||||
@ -287,6 +288,46 @@ export const FileManagerProvider: React.FC<FileManagerProviderProps> = ({
|
|||||||
}
|
}
|
||||||
}, [filteredFiles, onFileRemove, refreshRecentFiles, getSafeFilesToDelete]);
|
}, [filteredFiles, onFileRemove, refreshRecentFiles, getSafeFilesToDelete]);
|
||||||
|
|
||||||
|
// Handle deletion of specific history files (not index-based)
|
||||||
|
const handleHistoryFileRemove = useCallback(async (fileToRemove: StirlingFileStub) => {
|
||||||
|
const deletedFileId = fileToRemove.id;
|
||||||
|
|
||||||
|
// Clear from expanded state to prevent ghost entries
|
||||||
|
setExpandedFileIds(prev => {
|
||||||
|
const newExpanded = new Set(prev);
|
||||||
|
newExpanded.delete(deletedFileId);
|
||||||
|
return newExpanded;
|
||||||
|
});
|
||||||
|
|
||||||
|
// Clear from history cache - remove all files in the chain
|
||||||
|
setLoadedHistoryFiles(prev => {
|
||||||
|
const newCache = new Map(prev);
|
||||||
|
|
||||||
|
// Remove cache entries for all deleted files
|
||||||
|
newCache.delete(deletedFileId);
|
||||||
|
|
||||||
|
// Also remove deleted files from any other file's history cache
|
||||||
|
for (const [mainFileId, historyFiles] of newCache.entries()) {
|
||||||
|
const filteredHistory = historyFiles.filter(histFile => deletedFileId != histFile.id);
|
||||||
|
if (filteredHistory.length !== historyFiles.length) {
|
||||||
|
newCache.set(mainFileId, filteredHistory);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return newCache;
|
||||||
|
});
|
||||||
|
|
||||||
|
// Delete safe files from IndexedDB
|
||||||
|
try {
|
||||||
|
await fileStorage.deleteStirlingFile(deletedFileId);
|
||||||
|
} catch (error) {
|
||||||
|
console.error('Failed to delete files from chain:', error);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Refresh to ensure consistent state
|
||||||
|
await refreshRecentFiles();
|
||||||
|
}, [filteredFiles, onFileRemove, refreshRecentFiles, getSafeFilesToDelete]);
|
||||||
|
|
||||||
const handleFileDoubleClick = useCallback((file: StirlingFileStub) => {
|
const handleFileDoubleClick = useCallback((file: StirlingFileStub) => {
|
||||||
if (isFileSupported(file.name)) {
|
if (isFileSupported(file.name)) {
|
||||||
onRecentFilesSelected([file]);
|
onRecentFilesSelected([file]);
|
||||||
@ -540,6 +581,7 @@ export const FileManagerProvider: React.FC<FileManagerProviderProps> = ({
|
|||||||
onLocalFileClick: handleLocalFileClick,
|
onLocalFileClick: handleLocalFileClick,
|
||||||
onFileSelect: handleFileSelect,
|
onFileSelect: handleFileSelect,
|
||||||
onFileRemove: handleFileRemove,
|
onFileRemove: handleFileRemove,
|
||||||
|
onHistoryFileRemove: handleHistoryFileRemove,
|
||||||
onFileDoubleClick: handleFileDoubleClick,
|
onFileDoubleClick: handleFileDoubleClick,
|
||||||
onOpenFiles: handleOpenFiles,
|
onOpenFiles: handleOpenFiles,
|
||||||
onSearchChange: handleSearchChange,
|
onSearchChange: handleSearchChange,
|
||||||
|
Loading…
x
Reference in New Issue
Block a user