From e939e6a86de30ed9beb8447340c184141d717a57 Mon Sep 17 00:00:00 2001 From: Adam Lamers Date: Fri, 1 May 2026 10:55:27 -0400 Subject: [PATCH] add discrepancy mode for filebrowser --- backend/app/api/schemas.py | 3 +- backend/app/api/system.py | 131 ++++++ backend/app/services/scanner.py | 1 + backend/tests/test_service_scanner.py | 18 +- frontend/src/lib/api/index.ts | 4 +- frontend/src/lib/api/sdk.gen.ts | 14 + frontend/src/lib/api/types.gen.ts | 60 +++ .../file-browser/FileBrowser.svelte | 25 +- .../file-browser/FileBrowserRowItem.svelte | 67 ++- .../file-browser/FileBrowserTreeItem.svelte | 27 +- frontend/src/lib/types.ts | 6 + .../src/routes/discrepancies/+page.svelte | 417 ++---------------- 12 files changed, 382 insertions(+), 391 deletions(-) diff --git a/backend/app/api/schemas.py b/backend/app/api/schemas.py index a5ee5fe..dbf5a30 100644 --- a/backend/app/api/schemas.py +++ b/backend/app/api/schemas.py @@ -1,4 +1,4 @@ -from pydantic import BaseModel, ConfigDict +from pydantic import BaseModel, ConfigDict, Field from typing import Optional, List, Dict, Any from datetime import datetime @@ -7,6 +7,7 @@ class TreeNodeSchema(BaseModel): name: str path: str has_children: bool = True + children: List["TreeNodeSchema"] = Field(default_factory=list) class ItemMetadataSchema(BaseModel): diff --git a/backend/app/api/system.py b/backend/app/api/system.py index 81c97c9..9f0f0ec 100644 --- a/backend/app/api/system.py +++ b/backend/app/api/system.py @@ -1399,3 +1399,134 @@ def delete_file_record(file_id: int, db_session: Session = Depends(get_db)): db_session.delete(record) db_session.commit() return {"message": f"File record '{file_path}' permanently deleted"} + + +# --- Discrepancy Tree & Browse Endpoints --- + + +@router.get("/discrepancies/tree", response_model=List[TreeNodeSchema]) +def get_discrepancies_tree(db_session: Session = Depends(get_db)): + """Returns tree of directories that contain discrepancy files, grouped by source root.""" + from app.api.inventory import TreeNodeSchema, get_source_roots + + roots = get_source_roots(db_session) + + # Query all discrepancy files + records = ( + db_session.query(models.FilesystemState) + .filter( + models.FilesystemState.is_ignored.is_(False), + models.FilesystemState.missing_acknowledged_at.is_(None), + ( + models.FilesystemState.is_deleted.is_(True) + | models.FilesystemState.sha256_hash.is_(None) + ), + ) + .all() + ) + + # Build directory nodes keyed by directory path + dir_nodes: Dict[str, TreeNodeSchema] = {} + for record in records: + directory = ( + record.file_path.rsplit("/", 1)[0] if "/" in record.file_path else "" + ) + if directory not in dir_nodes: + dir_nodes[directory] = TreeNodeSchema( + name=directory.split("/")[-1] or directory, + path=directory, + has_children=True, + children=[], + ) + dir_nodes[directory].children.append( + TreeNodeSchema( + name=record.file_path.split("/")[-1], + path=record.file_path, + has_children=False, + ) + ) + + # Build top-level nodes from source roots + result = [] + for root in roots: + root_dirs = [d for d in dir_nodes.keys() if d.startswith(root) or d == root] + if root_dirs: + children = [dir_nodes[d] for d in sorted(root_dirs)] + result.append( + TreeNodeSchema( + name=root, path=root, has_children=True, children=children + ) + ) + + return result + + +@router.get("/discrepancies/browse", response_model=List[DiscrepancySchema]) +def browse_discrepancies( + path: Optional[str] = None, db_session: Session = Depends(get_db) +): + """Returns discrepancy files under a given directory path.""" + # Reuse the query logic from list_discrepancies + deleted_records = db_session.query(models.FilesystemState).filter( + models.FilesystemState.is_deleted.is_(True), + models.FilesystemState.is_ignored.is_(False), + models.FilesystemState.missing_acknowledged_at.is_(None), + ) + + unhashed_missing = db_session.query(models.FilesystemState).filter( + models.FilesystemState.sha256_hash.is_(None), + models.FilesystemState.is_ignored.is_(False), + models.FilesystemState.is_deleted.is_(False), + models.FilesystemState.missing_acknowledged_at.is_(None), + ) + + # Batch-load valid version flags + all_records = deleted_records.all() + unhashed_missing.all() + record_ids = {r.id for r in all_records} + ids_with_valid_versions = set() + if record_ids: + valid_version_rows = ( + db_session.query(models.FileVersion.filesystem_state_id) + .join(models.StorageMedia) + .filter( + models.FileVersion.filesystem_state_id.in_(record_ids), + models.StorageMedia.status.in_(["active", "full"]), + ) + .distinct() + .all() + ) + ids_with_valid_versions = {row[0] for row in valid_version_rows} + + # Filter by path prefix if specified + results = [] + seen_ids = set() + for record in all_records: + if record.id in seen_ids: + continue + seen_ids.add(record.id) + + # Filter by path prefix + if ( + path + and not record.file_path.startswith(path + "/") + and record.file_path != path + ): + continue + + has_valid_versions = record.id in ids_with_valid_versions + + if record.is_deleted or not os.path.exists(record.file_path): + results.append( + DiscrepancySchema( + id=record.id, + path=record.file_path, + size=record.size, + mtime=datetime.fromtimestamp(record.mtime, tz=timezone.utc), + last_seen_timestamp=record.last_seen_timestamp, + sha256_hash=record.sha256_hash, + is_deleted=record.is_deleted, + has_versions=has_valid_versions, + ) + ) + + return results diff --git a/backend/app/services/scanner.py b/backend/app/services/scanner.py index 64af8c2..f2cafb6 100644 --- a/backend/app/services/scanner.py +++ b/backend/app/services/scanner.py @@ -817,6 +817,7 @@ class ScannerService: target_record = path_to_record.get(file_path) if not target_record: continue + if file_path in batch_results: target_record.sha256_hash = batch_results[ file_path diff --git a/backend/tests/test_service_scanner.py b/backend/tests/test_service_scanner.py index bc2e538..f3cfca6 100644 --- a/backend/tests/test_service_scanner.py +++ b/backend/tests/test_service_scanner.py @@ -145,11 +145,19 @@ def test_scan_sources_mocked(db_session, mocker): def test_run_hashing_mocked(db_session, mocker): """Tests the background hashing runner.""" + scanner = ScannerService() + # Reset state + scanner.is_hashing = False + scanner.is_running = False + # Disable fast hash so the test uses the Python hashlib fallback path mocker.patch("app.services.scanner._FAST_HASH_BINARY", None) + # Mock compute_sha256 to return a fixed hash + mocker.patch.object(ScannerService, "compute_sha256", return_value="mocked_hash") + # Setup unindexed file f = models.FilesystemState( file_path="/data/hash.me", size=10, mtime=1, is_ignored=False @@ -162,7 +170,13 @@ def test_run_hashing_mocked(db_session, mocker): # run_hashing runs in a loop until work is done. # Since we aren't in 'is_running' state, it should process the 1 file and stop. - scanner.run_hashing() + try: + scanner.run_hashing() + except Exception as e: + print(f"DEBUG: run_hashing raised exception: {e}") + import traceback + + traceback.print_exc() db_session.refresh(f) assert f.sha256_hash == "mocked_hash" @@ -247,6 +261,8 @@ def test_missing_file_marked_deleted_at_end_of_scan(db_session, mocker): def test_existing_file_not_marked_deleted(db_session, mocker): """Tests that files found during scan retain is_deleted=False.""" scanner = ScannerService() + print(f"DEBUG test_existing: scanner.is_running = {scanner.is_running}") + print(f"DEBUG test_existing: scanner.is_hashing = {scanner.is_hashing}") mocker.patch("app.services.scanner._FAST_FIND_BINARY", None) mocker.patch("app.api.system.get_source_roots", return_value=["/mock_source"]) diff --git a/frontend/src/lib/api/index.ts b/frontend/src/lib/api/index.ts index d31e2d3..33c0ffa 100644 --- a/frontend/src/lib/api/index.ts +++ b/frontend/src/lib/api/index.ts @@ -1,4 +1,4 @@ // This file is auto-generated by @hey-api/openapi-ts -export { addDirectoryToRecoveryQueueRestoresQueueDirectoryPost, addFileToRecoveryQueueRestoresQueueFileFileIdPost, batchAddToRecoveryQueueRestoresQueueBatchPost, batchConfirmDeletedSystemDiscrepanciesBatchConfirmPost, batchDismissSystemDiscrepanciesBatchDismissPost, batchHardDeleteSystemDiscrepanciesBatchDeletePost, batchUpdateTrackingSystemTrackBatchPost, browseArchiveIndexInventoryBrowseGet, browseRecoveryQueueVirtualFsRestoresQueueBrowseGet, browseSystemPathSystemBrowseGet, calculateRecoveryManifestRestoresManifestGet, cancelJobSystemJobsJobIdCancelPost, clearRecoveryQueueRestoresQueueClearPost, confirmFileDeletedSystemDiscrepanciesFileIdConfirmPost, deleteFileRecordSystemDiscrepanciesFileIdDelete, deleteMediaAssetInventoryMediaMediaIdDelete, detectUnregisteredMediaInventoryDetectGet, discoverHardwareNodesSystemHardwareDiscoverGet, dismissDiscrepancySystemDiscrepanciesFileIdDismissPost, exportDatabaseIndexSystemDatabaseExportGet, getArchiveItemMetadataInventoryMetadataGet, getArchiveTreeInventoryTreeGet, getDashboardStatsSystemDashboardStatsGet, getJobDetailSystemJobsJobIdGet, getJobLogsSystemJobsJobIdLogsGet, getJobsCountSystemJobsCountGet, getJobsStatsSystemJobsStatsGet, getRecoveryQueueTreeRestoresQueueTreeGet, getScanStatusSystemScanStatusGet, getSystemAnalyticsInventoryInsightsGet, getSystemSettingsSystemSettingsGet, getSystemTreeSystemTreeGet, healthHeartbeatHealthGet, ignoreHardwareNodeSystemHardwareIgnorePost, importDatabaseIndexSystemDatabaseImportPost, initializeStorageHardwareInventoryMediaMediaIdInitializePost, listArchivalHistoryBackupsGet, listDiscrepanciesSystemDiscrepanciesGet, listHostDirectoriesSystemLsGet, listJobsSystemJobsGet, listRecoveryQueueRestoresQueueGet, listStorageFleetInventoryMediaGet, listStorageProvidersInventoryProvidersGet, type Options, registerNewMediaInventoryMediaPost, removeFromRecoveryQueueRestoresQueueItemItemIdDelete, reorderArchivalPriorityInventoryMediaReorderPost, resetTestEnvironmentSystemTestResetPost, retryJobSystemJobsJobIdRetryPost, searchArchiveIndexInventorySearchGet, searchSystemIndexSystemSearchGet, streamJobsSystemJobsStreamGet, testNotificationDispatchSystemNotificationsTestPost, triggerAutoBackupBackupsTriggerAutoPost, triggerBackupJobBackupsTriggerMediaIdPost, triggerIndexingSystemIndexHashPost, triggerRecoveryJobRestoresTriggerPost, triggerScanSystemScanPost, updateMediaAssetInventoryMediaMediaIdPatch, updateSystemSettingSystemSettingsPost } from './sdk.gen'; -export type { AddDirectoryToRecoveryQueueRestoresQueueDirectoryPostData, AddDirectoryToRecoveryQueueRestoresQueueDirectoryPostError, AddDirectoryToRecoveryQueueRestoresQueueDirectoryPostErrors, AddDirectoryToRecoveryQueueRestoresQueueDirectoryPostResponses, AddFileToRecoveryQueueRestoresQueueFileFileIdPostData, AddFileToRecoveryQueueRestoresQueueFileFileIdPostError, AddFileToRecoveryQueueRestoresQueueFileFileIdPostErrors, AddFileToRecoveryQueueRestoresQueueFileFileIdPostResponses, AppApiBackupsJobSchema, AppApiSystemJobSchema, BatchAddToRecoveryQueueRestoresQueueBatchPostData, BatchAddToRecoveryQueueRestoresQueueBatchPostError, BatchAddToRecoveryQueueRestoresQueueBatchPostErrors, BatchAddToRecoveryQueueRestoresQueueBatchPostResponses, BatchCartRequest, BatchConfirmDeletedSystemDiscrepanciesBatchConfirmPostData, BatchConfirmDeletedSystemDiscrepanciesBatchConfirmPostError, BatchConfirmDeletedSystemDiscrepanciesBatchConfirmPostErrors, BatchConfirmDeletedSystemDiscrepanciesBatchConfirmPostResponses, BatchDiscrepancyAction, BatchDismissSystemDiscrepanciesBatchDismissPostData, BatchDismissSystemDiscrepanciesBatchDismissPostError, BatchDismissSystemDiscrepanciesBatchDismissPostErrors, BatchDismissSystemDiscrepanciesBatchDismissPostResponses, BatchHardDeleteSystemDiscrepanciesBatchDeletePostData, BatchHardDeleteSystemDiscrepanciesBatchDeletePostError, BatchHardDeleteSystemDiscrepanciesBatchDeletePostErrors, BatchHardDeleteSystemDiscrepanciesBatchDeletePostResponses, BatchTrackRequest, BatchUpdateTrackingSystemTrackBatchPostData, BatchUpdateTrackingSystemTrackBatchPostError, BatchUpdateTrackingSystemTrackBatchPostErrors, BatchUpdateTrackingSystemTrackBatchPostResponses, BrowseArchiveIndexInventoryBrowseGetData, BrowseArchiveIndexInventoryBrowseGetError, BrowseArchiveIndexInventoryBrowseGetErrors, BrowseArchiveIndexInventoryBrowseGetResponses, BrowseRecoveryQueueVirtualFsRestoresQueueBrowseGetData, BrowseRecoveryQueueVirtualFsRestoresQueueBrowseGetError, BrowseRecoveryQueueVirtualFsRestoresQueueBrowseGetErrors, BrowseRecoveryQueueVirtualFsRestoresQueueBrowseGetResponse, BrowseRecoveryQueueVirtualFsRestoresQueueBrowseGetResponses, BrowseResponseSchema, BrowseSystemPathSystemBrowseGetData, BrowseSystemPathSystemBrowseGetError, BrowseSystemPathSystemBrowseGetErrors, BrowseSystemPathSystemBrowseGetResponse, BrowseSystemPathSystemBrowseGetResponses, CalculateRecoveryManifestRestoresManifestGetData, CalculateRecoveryManifestRestoresManifestGetResponse, CalculateRecoveryManifestRestoresManifestGetResponses, CancelJobSystemJobsJobIdCancelPostData, CancelJobSystemJobsJobIdCancelPostError, CancelJobSystemJobsJobIdCancelPostErrors, CancelJobSystemJobsJobIdCancelPostResponses, CartFileItemSchema, CartItemSchema, CartTreeNodeSchema, ClearRecoveryQueueRestoresQueueClearPostData, ClearRecoveryQueueRestoresQueueClearPostResponses, ClientOptions, ConfirmFileDeletedSystemDiscrepanciesFileIdConfirmPostData, ConfirmFileDeletedSystemDiscrepanciesFileIdConfirmPostError, ConfirmFileDeletedSystemDiscrepanciesFileIdConfirmPostErrors, ConfirmFileDeletedSystemDiscrepanciesFileIdConfirmPostResponses, DashboardStatsSchema, DeleteFileRecordSystemDiscrepanciesFileIdDeleteData, DeleteFileRecordSystemDiscrepanciesFileIdDeleteError, DeleteFileRecordSystemDiscrepanciesFileIdDeleteErrors, DeleteFileRecordSystemDiscrepanciesFileIdDeleteResponses, DeleteMediaAssetInventoryMediaMediaIdDeleteData, DeleteMediaAssetInventoryMediaMediaIdDeleteError, DeleteMediaAssetInventoryMediaMediaIdDeleteErrors, DeleteMediaAssetInventoryMediaMediaIdDeleteResponses, DetectUnregisteredMediaInventoryDetectGetData, DetectUnregisteredMediaInventoryDetectGetResponses, DirectoryCartRequest, DiscoverHardwareNodesSystemHardwareDiscoverGetData, DiscoverHardwareNodesSystemHardwareDiscoverGetResponses, DiscrepancySchema, DismissDiscrepancySystemDiscrepanciesFileIdDismissPostData, DismissDiscrepancySystemDiscrepanciesFileIdDismissPostError, DismissDiscrepancySystemDiscrepanciesFileIdDismissPostErrors, DismissDiscrepancySystemDiscrepanciesFileIdDismissPostResponses, ExportDatabaseIndexSystemDatabaseExportGetData, ExportDatabaseIndexSystemDatabaseExportGetResponses, FileItemSchema, GetArchiveItemMetadataInventoryMetadataGetData, GetArchiveItemMetadataInventoryMetadataGetError, GetArchiveItemMetadataInventoryMetadataGetErrors, GetArchiveItemMetadataInventoryMetadataGetResponse, GetArchiveItemMetadataInventoryMetadataGetResponses, GetArchiveTreeInventoryTreeGetData, GetArchiveTreeInventoryTreeGetError, GetArchiveTreeInventoryTreeGetErrors, GetArchiveTreeInventoryTreeGetResponse, GetArchiveTreeInventoryTreeGetResponses, GetDashboardStatsSystemDashboardStatsGetData, GetDashboardStatsSystemDashboardStatsGetResponse, GetDashboardStatsSystemDashboardStatsGetResponses, GetJobDetailSystemJobsJobIdGetData, GetJobDetailSystemJobsJobIdGetError, GetJobDetailSystemJobsJobIdGetErrors, GetJobDetailSystemJobsJobIdGetResponse, GetJobDetailSystemJobsJobIdGetResponses, GetJobLogsSystemJobsJobIdLogsGetData, GetJobLogsSystemJobsJobIdLogsGetError, GetJobLogsSystemJobsJobIdLogsGetErrors, GetJobLogsSystemJobsJobIdLogsGetResponse, GetJobLogsSystemJobsJobIdLogsGetResponses, GetJobsCountSystemJobsCountGetData, GetJobsCountSystemJobsCountGetResponses, GetJobsStatsSystemJobsStatsGetData, GetJobsStatsSystemJobsStatsGetResponses, GetRecoveryQueueTreeRestoresQueueTreeGetData, GetRecoveryQueueTreeRestoresQueueTreeGetError, GetRecoveryQueueTreeRestoresQueueTreeGetErrors, GetRecoveryQueueTreeRestoresQueueTreeGetResponse, GetRecoveryQueueTreeRestoresQueueTreeGetResponses, GetScanStatusSystemScanStatusGetData, GetScanStatusSystemScanStatusGetResponse, GetScanStatusSystemScanStatusGetResponses, GetSystemAnalyticsInventoryInsightsGetData, GetSystemAnalyticsInventoryInsightsGetResponses, GetSystemSettingsSystemSettingsGetData, GetSystemSettingsSystemSettingsGetResponse, GetSystemSettingsSystemSettingsGetResponses, GetSystemTreeSystemTreeGetData, GetSystemTreeSystemTreeGetError, GetSystemTreeSystemTreeGetErrors, GetSystemTreeSystemTreeGetResponse, GetSystemTreeSystemTreeGetResponses, HealthHeartbeatHealthGetData, HealthHeartbeatHealthGetResponses, HttpValidationError, IgnoreHardwareNodeSystemHardwareIgnorePostData, IgnoreHardwareNodeSystemHardwareIgnorePostError, IgnoreHardwareNodeSystemHardwareIgnorePostErrors, IgnoreHardwareNodeSystemHardwareIgnorePostResponses, IgnoreHardwareRequest, ImportDatabaseIndexSystemDatabaseImportPostData, ImportDatabaseIndexSystemDatabaseImportPostError, ImportDatabaseIndexSystemDatabaseImportPostErrors, ImportDatabaseIndexSystemDatabaseImportPostResponses, InitializeStorageHardwareInventoryMediaMediaIdInitializePostData, InitializeStorageHardwareInventoryMediaMediaIdInitializePostError, InitializeStorageHardwareInventoryMediaMediaIdInitializePostErrors, InitializeStorageHardwareInventoryMediaMediaIdInitializePostResponses, ItemMetadataSchema, JobLogSchema, ListArchivalHistoryBackupsGetData, ListArchivalHistoryBackupsGetResponse, ListArchivalHistoryBackupsGetResponses, ListDiscrepanciesSystemDiscrepanciesGetData, ListDiscrepanciesSystemDiscrepanciesGetResponse, ListDiscrepanciesSystemDiscrepanciesGetResponses, ListHostDirectoriesSystemLsGetData, ListHostDirectoriesSystemLsGetError, ListHostDirectoriesSystemLsGetErrors, ListHostDirectoriesSystemLsGetResponses, ListJobsSystemJobsGetData, ListJobsSystemJobsGetError, ListJobsSystemJobsGetErrors, ListJobsSystemJobsGetResponse, ListJobsSystemJobsGetResponses, ListRecoveryQueueRestoresQueueGetData, ListRecoveryQueueRestoresQueueGetResponse, ListRecoveryQueueRestoresQueueGetResponses, ListStorageFleetInventoryMediaGetData, ListStorageFleetInventoryMediaGetError, ListStorageFleetInventoryMediaGetErrors, ListStorageFleetInventoryMediaGetResponse, ListStorageFleetInventoryMediaGetResponses, ListStorageProvidersInventoryProvidersGetData, ListStorageProvidersInventoryProvidersGetResponse, ListStorageProvidersInventoryProvidersGetResponses, ManifestMediaSchema, MediaCreateSchema, MediaSchema, MediaUpdateSchema, RegisterNewMediaInventoryMediaPostData, RegisterNewMediaInventoryMediaPostError, RegisterNewMediaInventoryMediaPostErrors, RegisterNewMediaInventoryMediaPostResponse, RegisterNewMediaInventoryMediaPostResponses, RemoveFromRecoveryQueueRestoresQueueItemItemIdDeleteData, RemoveFromRecoveryQueueRestoresQueueItemItemIdDeleteError, RemoveFromRecoveryQueueRestoresQueueItemItemIdDeleteErrors, RemoveFromRecoveryQueueRestoresQueueItemItemIdDeleteResponses, ReorderArchivalPriorityInventoryMediaReorderPostData, ReorderArchivalPriorityInventoryMediaReorderPostError, ReorderArchivalPriorityInventoryMediaReorderPostErrors, ReorderArchivalPriorityInventoryMediaReorderPostResponses, ReorderMediaRequest, ResetTestEnvironmentSystemTestResetPostData, ResetTestEnvironmentSystemTestResetPostResponses, RestoreManifestSchema, RestoreTriggerRequest, RetryJobSystemJobsJobIdRetryPostData, RetryJobSystemJobsJobIdRetryPostError, RetryJobSystemJobsJobIdRetryPostErrors, RetryJobSystemJobsJobIdRetryPostResponses, ScanStatusSchema, SearchArchiveIndexInventorySearchGetData, SearchArchiveIndexInventorySearchGetError, SearchArchiveIndexInventorySearchGetErrors, SearchArchiveIndexInventorySearchGetResponses, SearchSystemIndexSystemSearchGetData, SearchSystemIndexSystemSearchGetError, SearchSystemIndexSystemSearchGetErrors, SearchSystemIndexSystemSearchGetResponse, SearchSystemIndexSystemSearchGetResponses, SettingSchema, StorageProviderSchema, StreamJobsSystemJobsStreamGetData, StreamJobsSystemJobsStreamGetResponses, TestNotificationDispatchSystemNotificationsTestPostData, TestNotificationDispatchSystemNotificationsTestPostError, TestNotificationDispatchSystemNotificationsTestPostErrors, TestNotificationDispatchSystemNotificationsTestPostResponses, TestNotificationRequest, TreeNodeSchema, TriggerAutoBackupBackupsTriggerAutoPostData, TriggerAutoBackupBackupsTriggerAutoPostResponses, TriggerBackupJobBackupsTriggerMediaIdPostData, TriggerBackupJobBackupsTriggerMediaIdPostError, TriggerBackupJobBackupsTriggerMediaIdPostErrors, TriggerBackupJobBackupsTriggerMediaIdPostResponses, TriggerIndexingSystemIndexHashPostData, TriggerIndexingSystemIndexHashPostResponses, TriggerRecoveryJobRestoresTriggerPostData, TriggerRecoveryJobRestoresTriggerPostError, TriggerRecoveryJobRestoresTriggerPostErrors, TriggerRecoveryJobRestoresTriggerPostResponses, TriggerScanSystemScanPostData, TriggerScanSystemScanPostResponses, UpdateMediaAssetInventoryMediaMediaIdPatchData, UpdateMediaAssetInventoryMediaMediaIdPatchError, UpdateMediaAssetInventoryMediaMediaIdPatchErrors, UpdateMediaAssetInventoryMediaMediaIdPatchResponse, UpdateMediaAssetInventoryMediaMediaIdPatchResponses, UpdateSystemSettingSystemSettingsPostData, UpdateSystemSettingSystemSettingsPostError, UpdateSystemSettingSystemSettingsPostErrors, UpdateSystemSettingSystemSettingsPostResponses, ValidationError } from './types.gen'; +export { addDirectoryToRecoveryQueueRestoresQueueDirectoryPost, addFileToRecoveryQueueRestoresQueueFileFileIdPost, batchAddToRecoveryQueueRestoresQueueBatchPost, batchConfirmDeletedSystemDiscrepanciesBatchConfirmPost, batchDismissSystemDiscrepanciesBatchDismissPost, batchHardDeleteSystemDiscrepanciesBatchDeletePost, batchUpdateTrackingSystemTrackBatchPost, browseArchiveIndexInventoryBrowseGet, browseDiscrepanciesGet, browseRecoveryQueueVirtualFsRestoresQueueBrowseGet, browseSystemPathSystemBrowseGet, calculateRecoveryManifestRestoresManifestGet, cancelJobSystemJobsJobIdCancelPost, clearRecoveryQueueRestoresQueueClearPost, confirmFileDeletedSystemDiscrepanciesFileIdConfirmPost, deleteFileRecordSystemDiscrepanciesFileIdDelete, deleteMediaAssetInventoryMediaMediaIdDelete, detectUnregisteredMediaInventoryDetectGet, discoverHardwareNodesSystemHardwareDiscoverGet, dismissDiscrepancySystemDiscrepanciesFileIdDismissPost, exportDatabaseIndexSystemDatabaseExportGet, getArchiveItemMetadataInventoryMetadataGet, getArchiveTreeInventoryTreeGet, getDiscrepanciesTreeGet, getDashboardStatsSystemDashboardStatsGet, getJobDetailSystemJobsJobIdGet, getJobLogsSystemJobsJobIdLogsGet, getJobsCountSystemJobsCountGet, getJobsStatsSystemJobsStatsGet, getRecoveryQueueTreeRestoresQueueTreeGet, getScanStatusSystemScanStatusGet, getSystemAnalyticsInventoryInsightsGet, getSystemSettingsSystemSettingsGet, getSystemTreeSystemTreeGet, healthHeartbeatHealthGet, ignoreHardwareNodeSystemHardwareIgnorePost, importDatabaseIndexSystemDatabaseImportPost, initializeStorageHardwareInventoryMediaMediaIdInitializePost, listArchivalHistoryBackupsGet, listDiscrepanciesSystemDiscrepanciesGet, listHostDirectoriesSystemLsGet, listJobsSystemJobsGet, listRecoveryQueueRestoresQueueGet, listStorageFleetInventoryMediaGet, listStorageProvidersInventoryProvidersGet, type Options, registerNewMediaInventoryMediaPost, removeFromRecoveryQueueRestoresQueueItemItemIdDelete, reorderArchivalPriorityInventoryMediaReorderPost, resetTestEnvironmentSystemTestResetPost, retryJobSystemJobsJobIdRetryPost, searchArchiveIndexInventorySearchGet, searchSystemIndexSystemSearchGet, streamJobsSystemJobsStreamGet, testNotificationDispatchSystemNotificationsTestPost, triggerAutoBackupBackupsTriggerAutoPost, triggerBackupJobBackupsTriggerMediaIdPost, triggerIndexingSystemIndexHashPost, triggerRecoveryJobRestoresTriggerPost, triggerScanSystemScanPost, updateMediaAssetInventoryMediaMediaIdPatch, updateSystemSettingSystemSettingsPost } from './sdk.gen'; +export type { AddDirectoryToRecoveryQueueRestoresQueueDirectoryPostData, AddDirectoryToRecoveryQueueRestoresQueueDirectoryPostError, AddDirectoryToRecoveryQueueRestoresQueueDirectoryPostErrors, AddDirectoryToRecoveryQueueRestoresQueueDirectoryPostResponses, AddFileToRecoveryQueueRestoresQueueFileFileIdPostData, AddFileToRecoveryQueueRestoresQueueFileFileIdPostError, AddFileToRecoveryQueueRestoresQueueFileFileIdPostErrors, AddFileToRecoveryQueueRestoresQueueFileFileIdPostResponses, AppApiBackupsJobSchema, AppApiSystemJobSchema, BatchAddToRecoveryQueueRestoresQueueBatchPostData, BatchAddToRecoveryQueueRestoresQueueBatchPostError, BatchAddToRecoveryQueueRestoresQueueBatchPostErrors, BatchAddToRecoveryQueueRestoresQueueBatchPostResponses, BatchCartRequest, BatchConfirmDeletedSystemDiscrepanciesBatchConfirmPostData, BatchConfirmDeletedSystemDiscrepanciesBatchConfirmPostError, BatchConfirmDeletedSystemDiscrepanciesBatchConfirmPostErrors, BatchConfirmDeletedSystemDiscrepanciesBatchConfirmPostResponses, BatchDiscrepancyAction, BatchDismissSystemDiscrepanciesBatchDismissPostData, BatchDismissSystemDiscrepanciesBatchDismissPostError, BatchDismissSystemDiscrepanciesBatchDismissPostErrors, BatchDismissSystemDiscrepanciesBatchDismissPostResponses, BatchHardDeleteSystemDiscrepanciesBatchDeletePostData, BatchHardDeleteSystemDiscrepanciesBatchDeletePostError, BatchHardDeleteSystemDiscrepanciesBatchDeletePostErrors, BatchHardDeleteSystemDiscrepanciesBatchDeletePostResponses, BatchTrackRequest, BatchUpdateTrackingSystemTrackBatchPostData, BatchUpdateTrackingSystemTrackBatchPostError, BatchUpdateTrackingSystemTrackBatchPostErrors, BatchUpdateTrackingSystemTrackBatchPostResponses, BrowseArchiveIndexInventoryBrowseGetData, BrowseDiscrepanciesGetData, BrowseDiscrepanciesGetError, BrowseDiscrepanciesGetErrors, BrowseDiscrepanciesGetResponse, BrowseDiscrepanciesGetResponses, BrowseArchiveIndexInventoryBrowseGetError, BrowseArchiveIndexInventoryBrowseGetErrors, BrowseArchiveIndexInventoryBrowseGetResponses, BrowseRecoveryQueueVirtualFsRestoresQueueBrowseGetData, BrowseRecoveryQueueVirtualFsRestoresQueueBrowseGetError, BrowseRecoveryQueueVirtualFsRestoresQueueBrowseGetErrors, BrowseRecoveryQueueVirtualFsRestoresQueueBrowseGetResponse, BrowseRecoveryQueueVirtualFsRestoresQueueBrowseGetResponses, BrowseResponseSchema, BrowseSystemPathSystemBrowseGetData, BrowseSystemPathSystemBrowseGetError, BrowseSystemPathSystemBrowseGetErrors, BrowseSystemPathSystemBrowseGetResponse, BrowseSystemPathSystemBrowseGetResponses, CalculateRecoveryManifestRestoresManifestGetData, CalculateRecoveryManifestRestoresManifestGetResponse, CalculateRecoveryManifestRestoresManifestGetResponses, CancelJobSystemJobsJobIdCancelPostData, CancelJobSystemJobsJobIdCancelPostError, CancelJobSystemJobsJobIdCancelPostErrors, CancelJobSystemJobsJobIdCancelPostResponses, CartFileItemSchema, CartItemSchema, CartTreeNodeSchema, ClearRecoveryQueueRestoresQueueClearPostData, ClearRecoveryQueueRestoresQueueClearPostResponses, ClientOptions, ConfirmFileDeletedSystemDiscrepanciesFileIdConfirmPostData, ConfirmFileDeletedSystemDiscrepanciesFileIdConfirmPostError, ConfirmFileDeletedSystemDiscrepanciesFileIdConfirmPostErrors, ConfirmFileDeletedSystemDiscrepanciesFileIdConfirmPostResponses, DashboardStatsSchema, DeleteFileRecordSystemDiscrepanciesFileIdDeleteData, DeleteFileRecordSystemDiscrepanciesFileIdDeleteError, DeleteFileRecordSystemDiscrepanciesFileIdDeleteErrors, DeleteFileRecordSystemDiscrepanciesFileIdDeleteResponses, DeleteMediaAssetInventoryMediaMediaIdDeleteData, DeleteMediaAssetInventoryMediaMediaIdDeleteError, DeleteMediaAssetInventoryMediaMediaIdDeleteErrors, DeleteMediaAssetInventoryMediaMediaIdDeleteResponses, DetectUnregisteredMediaInventoryDetectGetData, DetectUnregisteredMediaInventoryDetectGetResponses, DirectoryCartRequest, DiscoverHardwareNodesSystemHardwareDiscoverGetData, DiscoverHardwareNodesSystemHardwareDiscoverGetResponses, DiscrepancySchema, DismissDiscrepancySystemDiscrepanciesFileIdDismissPostData, DismissDiscrepancySystemDiscrepanciesFileIdDismissPostError, DismissDiscrepancySystemDiscrepanciesFileIdDismissPostErrors, DismissDiscrepancySystemDiscrepanciesFileIdDismissPostResponses, ExportDatabaseIndexSystemDatabaseExportGetData, ExportDatabaseIndexSystemDatabaseExportGetResponses, FileItemSchema, GetArchiveItemMetadataInventoryMetadataGetData, GetArchiveItemMetadataInventoryMetadataGetError, GetArchiveItemMetadataInventoryMetadataGetErrors, GetArchiveItemMetadataInventoryMetadataGetResponse, GetArchiveItemMetadataInventoryMetadataGetResponses, GetArchiveTreeInventoryTreeGetData, GetDiscrepanciesTreeGetData, GetDiscrepanciesTreeGetError, GetDiscrepanciesTreeGetErrors, GetDiscrepanciesTreeGetResponse, GetDiscrepanciesTreeGetResponses, GetArchiveTreeInventoryTreeGetError, GetArchiveTreeInventoryTreeGetErrors, GetArchiveTreeInventoryTreeGetResponse, GetArchiveTreeInventoryTreeGetResponses, GetDashboardStatsSystemDashboardStatsGetData, GetDashboardStatsSystemDashboardStatsGetResponse, GetDashboardStatsSystemDashboardStatsGetResponses, GetJobDetailSystemJobsJobIdGetData, GetJobDetailSystemJobsJobIdGetError, GetJobDetailSystemJobsJobIdGetErrors, GetJobDetailSystemJobsJobIdGetResponse, GetJobDetailSystemJobsJobIdGetResponses, GetJobLogsSystemJobsJobIdLogsGetData, GetJobLogsSystemJobsJobIdLogsGetError, GetJobLogsSystemJobsJobIdLogsGetErrors, GetJobLogsSystemJobsJobIdLogsGetResponse, GetJobLogsSystemJobsJobIdLogsGetResponses, GetJobsCountSystemJobsCountGetData, GetJobsCountSystemJobsCountGetResponses, GetJobsStatsSystemJobsStatsGetData, GetJobsStatsSystemJobsStatsGetResponses, GetRecoveryQueueTreeRestoresQueueTreeGetData, GetRecoveryQueueTreeRestoresQueueTreeGetError, GetRecoveryQueueTreeRestoresQueueTreeGetErrors, GetRecoveryQueueTreeRestoresQueueTreeGetResponse, GetRecoveryQueueTreeRestoresQueueTreeGetResponses, GetScanStatusSystemScanStatusGetData, GetScanStatusSystemScanStatusGetResponse, GetScanStatusSystemScanStatusGetResponses, GetSystemAnalyticsInventoryInsightsGetData, GetSystemAnalyticsInventoryInsightsGetResponses, GetSystemSettingsSystemSettingsGetData, GetSystemSettingsSystemSettingsGetResponse, GetSystemSettingsSystemSettingsGetResponses, GetSystemTreeSystemTreeGetData, GetSystemTreeSystemTreeGetError, GetSystemTreeSystemTreeGetErrors, GetSystemTreeSystemTreeGetResponse, GetSystemTreeSystemTreeGetResponses, HealthHeartbeatHealthGetData, HealthHeartbeatHealthGetResponses, HttpValidationError, IgnoreHardwareNodeSystemHardwareIgnorePostData, IgnoreHardwareNodeSystemHardwareIgnorePostError, IgnoreHardwareNodeSystemHardwareIgnorePostErrors, IgnoreHardwareNodeSystemHardwareIgnorePostResponses, IgnoreHardwareRequest, ImportDatabaseIndexSystemDatabaseImportPostData, ImportDatabaseIndexSystemDatabaseImportPostError, ImportDatabaseIndexSystemDatabaseImportPostErrors, ImportDatabaseIndexSystemDatabaseImportPostResponses, InitializeStorageHardwareInventoryMediaMediaIdInitializePostData, InitializeStorageHardwareInventoryMediaMediaIdInitializePostError, InitializeStorageHardwareInventoryMediaMediaIdInitializePostErrors, InitializeStorageHardwareInventoryMediaMediaIdInitializePostResponses, ItemMetadataSchema, JobLogSchema, ListArchivalHistoryBackupsGetData, ListArchivalHistoryBackupsGetResponse, ListArchivalHistoryBackupsGetResponses, ListDiscrepanciesSystemDiscrepanciesGetData, ListDiscrepanciesSystemDiscrepanciesGetResponse, ListDiscrepanciesSystemDiscrepanciesGetResponses, ListHostDirectoriesSystemLsGetData, ListHostDirectoriesSystemLsGetError, ListHostDirectoriesSystemLsGetErrors, ListHostDirectoriesSystemLsGetResponses, ListJobsSystemJobsGetData, ListJobsSystemJobsGetError, ListJobsSystemJobsGetErrors, ListJobsSystemJobsGetResponse, ListJobsSystemJobsGetResponses, ListRecoveryQueueRestoresQueueGetData, ListRecoveryQueueRestoresQueueGetResponse, ListRecoveryQueueRestoresQueueGetResponses, ListStorageFleetInventoryMediaGetData, ListStorageFleetInventoryMediaGetError, ListStorageFleetInventoryMediaGetErrors, ListStorageFleetInventoryMediaGetResponse, ListStorageFleetInventoryMediaGetResponses, ListStorageProvidersInventoryProvidersGetData, ListStorageProvidersInventoryProvidersGetResponse, ListStorageProvidersInventoryProvidersGetResponses, ManifestMediaSchema, MediaCreateSchema, MediaSchema, MediaUpdateSchema, RegisterNewMediaInventoryMediaPostData, RegisterNewMediaInventoryMediaPostError, RegisterNewMediaInventoryMediaPostErrors, RegisterNewMediaInventoryMediaPostResponse, RegisterNewMediaInventoryMediaPostResponses, RemoveFromRecoveryQueueRestoresQueueItemItemIdDeleteData, RemoveFromRecoveryQueueRestoresQueueItemItemIdDeleteError, RemoveFromRecoveryQueueRestoresQueueItemItemIdDeleteErrors, RemoveFromRecoveryQueueRestoresQueueItemItemIdDeleteResponses, ReorderArchivalPriorityInventoryMediaReorderPostData, ReorderArchivalPriorityInventoryMediaReorderPostError, ReorderArchivalPriorityInventoryMediaReorderPostErrors, ReorderArchivalPriorityInventoryMediaReorderPostResponses, ReorderMediaRequest, ResetTestEnvironmentSystemTestResetPostData, ResetTestEnvironmentSystemTestResetPostResponses, RestoreManifestSchema, RestoreTriggerRequest, RetryJobSystemJobsJobIdRetryPostData, RetryJobSystemJobsJobIdRetryPostError, RetryJobSystemJobsJobIdRetryPostErrors, RetryJobSystemJobsJobIdRetryPostResponses, ScanStatusSchema, SearchArchiveIndexInventorySearchGetData, SearchArchiveIndexInventorySearchGetError, SearchArchiveIndexInventorySearchGetErrors, SearchArchiveIndexInventorySearchGetResponses, SearchSystemIndexSystemSearchGetData, SearchSystemIndexSystemSearchGetError, SearchSystemIndexSystemSearchGetErrors, SearchSystemIndexSystemSearchGetResponse, SearchSystemIndexSystemSearchGetResponses, SettingSchema, StorageProviderSchema, StreamJobsSystemJobsStreamGetData, StreamJobsSystemJobsStreamGetResponses, TestNotificationDispatchSystemNotificationsTestPostData, TestNotificationDispatchSystemNotificationsTestPostError, TestNotificationDispatchSystemNotificationsTestPostErrors, TestNotificationDispatchSystemNotificationsTestPostResponses, TestNotificationRequest, TreeNodeSchema, TriggerAutoBackupBackupsTriggerAutoPostData, TriggerAutoBackupBackupsTriggerAutoPostResponses, TriggerBackupJobBackupsTriggerMediaIdPostData, TriggerBackupJobBackupsTriggerMediaIdPostError, TriggerBackupJobBackupsTriggerMediaIdPostErrors, TriggerBackupJobBackupsTriggerMediaIdPostResponses, TriggerIndexingSystemIndexHashPostData, TriggerIndexingSystemIndexHashPostResponses, TriggerRecoveryJobRestoresTriggerPostData, TriggerRecoveryJobRestoresTriggerPostError, TriggerRecoveryJobRestoresTriggerPostErrors, TriggerRecoveryJobRestoresTriggerPostResponses, TriggerScanSystemScanPostData, TriggerScanSystemScanPostResponses, UpdateMediaAssetInventoryMediaMediaIdPatchData, UpdateMediaAssetInventoryMediaMediaIdPatchError, UpdateMediaAssetInventoryMediaMediaIdPatchErrors, UpdateMediaAssetInventoryMediaMediaIdPatchResponse, UpdateMediaAssetInventoryMediaMediaIdPatchResponses, UpdateSystemSettingSystemSettingsPostData, UpdateSystemSettingSystemSettingsPostError, UpdateSystemSettingSystemSettingsPostErrors, UpdateSystemSettingSystemSettingsPostResponses, ValidationError } from './types.gen'; diff --git a/frontend/src/lib/api/sdk.gen.ts b/frontend/src/lib/api/sdk.gen.ts index 3308d52..905a15b 100644 --- a/frontend/src/lib/api/sdk.gen.ts +++ b/frontend/src/lib/api/sdk.gen.ts @@ -509,6 +509,20 @@ export const browseRecoveryQueueVirtualFsRestoresQueueBrowseGet = (options?: Options) => (options?.client ?? client).get({ url: '/restores/queue/tree', ...options }); +/** + * Get Discrepancies Tree + * + * Returns a nested tree structure for the discrepancies view, grouped by source root. + */ +export const getDiscrepanciesTreeGet = (options?: Options) => (options?.client ?? client).get({ url: '/system/discrepancies/tree', ...options }); + +/** + * Browse Discrepancies + * + * Browse the discrepancies filesystem with optional path prefix filtering. + */ +export const browseDiscrepanciesGet = (options?: Options) => (options?.client ?? client).get({ url: '/system/discrepancies/browse', ...options }); + /** * Health Heartbeat * diff --git a/frontend/src/lib/api/types.gen.ts b/frontend/src/lib/api/types.gen.ts index e6d7082..db650c8 100644 --- a/frontend/src/lib/api/types.gen.ts +++ b/frontend/src/lib/api/types.gen.ts @@ -1354,6 +1354,66 @@ export type GetSystemTreeSystemTreeGetResponses = { export type GetSystemTreeSystemTreeGetResponse = GetSystemTreeSystemTreeGetResponses[keyof GetSystemTreeSystemTreeGetResponses]; +export type GetDiscrepanciesTreeGetData = { + body?: never; + path?: never; + query?: { + /** + * Path + */ + path?: string | null; + }; + url: '/system/discrepancies/tree'; +}; + +export type GetDiscrepanciesTreeGetErrors = { + /** + * Validation Error + */ + 422: HttpValidationError; +}; + +export type GetDiscrepanciesTreeGetError = GetDiscrepanciesTreeGetErrors[keyof GetDiscrepanciesTreeGetErrors]; + +export type GetDiscrepanciesTreeGetResponses = { + /** + * Successful Response + */ + 200: Array; +}; + +export type GetDiscrepanciesTreeGetResponse = GetDiscrepanciesTreeGetResponses[keyof GetDiscrepanciesTreeGetResponses]; + +export type BrowseDiscrepanciesGetData = { + body?: never; + path?: never; + query?: { + /** + * Path + */ + path?: string | null; + }; + url: '/system/discrepancies/browse'; +}; + +export type BrowseDiscrepanciesGetErrors = { + /** + * Validation Error + */ + 422: HttpValidationError; +}; + +export type BrowseDiscrepanciesGetError = BrowseDiscrepanciesGetErrors[keyof BrowseDiscrepanciesGetErrors]; + +export type BrowseDiscrepanciesGetResponses = { + /** + * Successful Response + */ + 200: BrowseResponseSchema; +}; + +export type BrowseDiscrepanciesGetResponse = BrowseDiscrepanciesGetResponses[keyof BrowseDiscrepanciesGetResponses]; + export type ListDiscrepanciesSystemDiscrepanciesGetData = { body?: never; path?: never; diff --git a/frontend/src/lib/components/file-browser/FileBrowser.svelte b/frontend/src/lib/components/file-browser/FileBrowser.svelte index bf577cf..c275c93 100644 --- a/frontend/src/lib/components/file-browser/FileBrowser.svelte +++ b/frontend/src/lib/components/file-browser/FileBrowser.svelte @@ -18,6 +18,14 @@ import FileBrowserRowItem from "./FileBrowserRowItem.svelte"; import type { FileItem, Breadcrumb } from "$lib/types"; import { cn } from "$lib/utils"; + import { + getSystemTreeSystemTreeGet, + getArchiveTreeInventoryTreeGet, + browseSystemPathSystemBrowseGet, + browseArchiveIndexInventoryBrowseGet, + getDiscrepanciesTreeGet, + browseDiscrepanciesGet, + } from "$lib/api"; let { currentPath = $bindable("ROOT"), @@ -26,6 +34,8 @@ onNavigate = (path: string) => {}, onToggleTrack = (item: FileItem) => {}, onSelect = (item: FileItem) => {}, + onUndoDismiss = (item: FileItem) => {}, + onDelete = (item: FileItem) => {}, mode = "host", isSearching = false, pendingChanges = new Map() @@ -36,7 +46,9 @@ onNavigate?: (path: string) => void; onToggleTrack?: (item: FileItem) => void; onSelect?: (item: FileItem) => void; - mode?: "host" | "index" | "cart" | "live"; + onUndoDismiss?: (item: FileItem) => void; + onDelete?: (item: FileItem) => void; + mode?: "host" | "index" | "cart" | "live" | "discrepancies"; isSearching?: boolean; pendingChanges?: Map; }>(); @@ -173,9 +185,18 @@ hasChildren: true }); + const discrepancyRoot = $derived({ + name: "Discrepancies", + path: "ROOT", + expanded: true, + children: [], + hasChildren: true + }); + const activeRoot = $derived( mode === "host" ? sourceDataRoot : mode === "index" ? virtualIndexRoot : + mode === "discrepancies" ? discrepancyRoot : recoveryQueueRoot ); @@ -559,6 +580,8 @@ onClick={(e) => handleRowClick(e, item)} onDoubleClick={() => handleRowDoubleClick(item)} onToggleTrack={() => onToggleTrack(item)} + onUndoDismiss={() => onUndoDismiss(item)} + onDelete={() => onDelete(item)} /> {/each} {/if} diff --git a/frontend/src/lib/components/file-browser/FileBrowserRowItem.svelte b/frontend/src/lib/components/file-browser/FileBrowserRowItem.svelte index 0fb0dc1..afec5cb 100644 --- a/frontend/src/lib/components/file-browser/FileBrowserRowItem.svelte +++ b/frontend/src/lib/components/file-browser/FileBrowserRowItem.svelte @@ -13,7 +13,9 @@ ShieldCheck, ShieldAlert, Square, - EyeOff + EyeOff, + Undo2, + Trash2 } from "lucide-svelte"; import { Checkbox } from "$lib/components/ui/checkbox"; import { Button } from "$lib/components/ui/button"; @@ -27,6 +29,8 @@ onClick = (e: MouseEvent) => {}, onDoubleClick = () => {}, onToggleTrack = () => {}, + onUndoDismiss = () => {}, + onDelete = () => {}, mode = "host", colWidths = { mtime: 200, type: 150, size: 120 } } = $props<{ @@ -36,7 +40,9 @@ onClick?: (e: MouseEvent) => void; onDoubleClick?: () => void; onToggleTrack?: () => void; - mode?: "host" | "index" | "live" | "cart"; + onUndoDismiss?: () => void; + onDelete?: () => void; + mode?: "host" | "index" | "live" | "cart" | "discrepancies"; colWidths?: { mtime: number; type: number; size: number }; }>(); @@ -200,6 +206,20 @@ {/if} {/if} + {#if mode === "discrepancies"} + {#if item.is_deleted} + + + Deleted + + {/if} + {#if item.has_versions} + + + Has Versions + + {/if} + {/if} @@ -229,13 +249,40 @@ -
- +
+ {#if mode === "discrepancies"} + {#if item.discrepancy_id} + + {/if} + {#if item.is_deleted} + + {/if} + {:else} +
+ +
+ {/if}
diff --git a/frontend/src/lib/components/file-browser/FileBrowserTreeItem.svelte b/frontend/src/lib/components/file-browser/FileBrowserTreeItem.svelte index 79c8d15..a336fc0 100644 --- a/frontend/src/lib/components/file-browser/FileBrowserTreeItem.svelte +++ b/frontend/src/lib/components/file-browser/FileBrowserTreeItem.svelte @@ -5,7 +5,7 @@ import type { TreeNode } from "$lib/types"; import { cn } from "$lib/utils"; import FileBrowserTreeItem from "./FileBrowserTreeItem.svelte"; - import { getSystemTreeSystemTreeGet, getArchiveTreeInventoryTreeGet } from "$lib/api"; + import { getSystemTreeSystemTreeGet, getArchiveTreeInventoryTreeGet, getDiscrepanciesTreeGet } from "$lib/api"; let { node, @@ -20,7 +20,7 @@ onSelect?: (path: string) => void; level?: number; isSpecial?: boolean; - mode?: "host" | "index" | "live"; + mode?: "host" | "index" | "live" | "discrepancies"; }>(); let expanded = $state(false); @@ -60,10 +60,17 @@ loading = true; try { - const fetchFn = (mode === "host" || mode === "live") ? getSystemTreeSystemTreeGet : getArchiveTreeInventoryTreeGet; - const response = await fetchFn({ - query: { path: node.path } - }); + let response; + if (mode === "discrepancies") { + response = await getDiscrepanciesTreeGet({ + query: { path: node.path } + }); + } else { + const fetchFn = (mode === "host" || mode === "live") ? getSystemTreeSystemTreeGet : getArchiveTreeInventoryTreeGet; + response = await fetchFn({ + query: { path: node.path } + }); + } const data = response.data as any[]; if (data && Array.isArray(data)) { @@ -72,7 +79,8 @@ path: d.path, children: [], expanded: false, - hasChildren: d.has_children + hasChildren: d.has_children, + discrepancy_count: d.discrepancy_count })); } loaded = true; @@ -136,6 +144,11 @@ {node.name === "ROOT" ? "Virtual Root" : node.name} + {#if node.discrepancy_count && node.discrepancy_count > 0} + + {node.discrepancy_count} + + {/if} {#if loading} diff --git a/frontend/src/lib/types.ts b/frontend/src/lib/types.ts index 907faaa..ee8f851 100644 --- a/frontend/src/lib/types.ts +++ b/frontend/src/lib/types.ts @@ -11,6 +11,10 @@ export interface FileItem { sha256_hash?: string | null; vulnerable?: boolean; indeterminate?: boolean; + // Discrepancy fields + discrepancy_id?: number; + is_deleted?: boolean; + has_versions?: boolean; } export interface TreeNode { @@ -18,6 +22,8 @@ export interface TreeNode { path: string; children?: TreeNode[]; expanded?: boolean; + hasChildren?: boolean; + discrepancy_count?: number; } export interface Breadcrumb { diff --git a/frontend/src/routes/discrepancies/+page.svelte b/frontend/src/routes/discrepancies/+page.svelte index 24dab96..c3d25b2 100644 --- a/frontend/src/routes/discrepancies/+page.svelte +++ b/frontend/src/routes/discrepancies/+page.svelte @@ -1,27 +1,11 @@ Discrepancies - TapeHoard -
+
{:else} -
+
- - {#if selectedIds.size > 0} - - - {selectedIds.size} file(s) selected - {#if selectedWithBackups.length > 0 && selectedWithoutBackups.length > 0} - - ({selectedWithBackups.length} backed up, {selectedWithoutBackups.length} no backup) - - {/if} - -
- {#if selectedWithBackups.length > 0} - - {/if} - {#if selectedWithoutBackups.length > 0} - - {/if} - - - {/if} - - - {#if batchAction} - -
-
- {#if batchAction === 'recover'} -

- Add {selectedWithBackups.length} file(s) to recovery queue? -

-

- These files will be queued for restoration from archive media. -

- {:else} -

- Acknowledge loss of {selectedWithoutBackups.length} file(s)? -

-

- These files have no backup on archive media. They will be marked as acknowledged lost. -

- {/if} -
-
- - -
-
- - {/if} - -
- - {#if missingItems.length > 0} -
-
- - -
- -
- {#each groupedItems.filter(g => g.items.some(i => i.is_deleted)) as group} -
-
- - -
- - {#if !collapsedDirs['missing-' + group.directory]} - {#each group.items.filter(i => i.is_deleted) as item (item.id)} - {@const path = formatPath(item.path)} - -
- toggleSelect(item.id)} - /> - - Missing - -
- {#if typeof path === 'string'} - - {path} - - {:else} -
- - {path.head} - - - {path.tail} - -
- {/if} -

{formatSize(item.size)}

-
- -
- {#if item.has_versions} -
- - On archive -
- - {:else} -
- - No backup -
- - {/if} -
-
- - {/each} - {/if} -
- {/each} -
-
- {/if} + +
+
{/if}