Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions backend/app/routes/folders.py
Original file line number Diff line number Diff line change
Expand Up @@ -450,6 +450,8 @@ def get_all_folders():
ai_tagging,
tagging_completed,
) = folder_data
# Check if folder path still exists on filesystem
folder_exists = os.path.isdir(folder_path)
folders.append(
FolderDetails(
folder_id=folder_id,
Expand All @@ -458,6 +460,7 @@ def get_all_folders():
last_modified_time=last_modified_time,
AI_Tagging=ai_tagging,
taggingCompleted=tagging_completed,
exists=folder_exists,
)
)

Expand Down
1 change: 1 addition & 0 deletions backend/app/schemas/folders.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ class FolderDetails(BaseModel):
last_modified_time: int
AI_Tagging: bool
taggingCompleted: Optional[bool] = None
exists: bool = True


class GetAllFoldersData(BaseModel):
Expand Down
6 changes: 5 additions & 1 deletion backend/tests/test_folders.py
Original file line number Diff line number Diff line change
Expand Up @@ -586,11 +586,13 @@ def test_delete_folders_database_error(self, mock_delete_batch, client):
# ============================================================================

@patch("app.routes.folders.db_get_all_folder_details")
@patch("app.routes.folders.os.path.isdir")
def test_get_all_folders_success(
self, mock_get_all_folders, client, sample_folder_details
self, mock_isdir, mock_get_all_folders, client, sample_folder_details
):
"""Test successfully retrieving all folders."""
mock_get_all_folders.return_value = sample_folder_details
mock_isdir.return_value = True

response = client.get("/folders/all-folders")

Expand All @@ -608,8 +610,10 @@ def test_get_all_folders_success(
assert first_folder["parent_folder_id"] is None
assert first_folder["AI_Tagging"] is True
assert first_folder["taggingCompleted"] is False
assert first_folder["exists"] is True

mock_get_all_folders.assert_called_once()
assert mock_isdir.call_count == 2

@patch("app.routes.folders.db_get_all_folder_details")
def test_get_all_folders_empty(self, mock_get_all_folders, client):
Expand Down
5 changes: 5 additions & 0 deletions docs/backend/backend_python/openapi.json
Original file line number Diff line number Diff line change
Expand Up @@ -1686,6 +1686,11 @@
}
],
"title": "Taggingcompleted"
},
"exists": {
"type": "boolean",
"title": "Exists",
"default": true
}
},
"type": "object",
Expand Down
2 changes: 2 additions & 0 deletions frontend/src/hooks/useFolderOperations.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ export const useFolderOperations = () => {
const foldersQuery = usePictoQuery({
queryKey: ['folders'],
queryFn: getAllFolders,
// Ensure we re-check filesystem existence when navigating back to Settings
refetchOnMount: 'always',
});

const taggingStatusQuery = usePictoQuery({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,18 +37,26 @@ const FolderManagementCard: React.FC = () => {
>
{folders.length > 0 ? (
<div className="space-y-3">
{folders.map((folder: FolderDetails, index: number) => (
<div
key={index}
className="group border-border bg-background/50 relative rounded-lg border p-4 transition-all hover:border-gray-300 hover:shadow-sm dark:hover:border-gray-600"
>
{folders.map((folder: FolderDetails, index: number) => {
const isMissing = folder.exists === false;

return (
<div
key={index}
className="group border-border bg-background/50 relative rounded-lg border p-4 transition-all hover:border-gray-300 hover:shadow-sm dark:hover:border-gray-600"
>
<div className="flex items-center justify-between">
<div className="min-w-0 flex-1">
<div className="flex items-center gap-3">
<Folder className="h-4 w-4 flex-shrink-0 text-gray-500 dark:text-gray-400" />
<span className="text-foreground truncate">
{folder.folder_path}
</span>
{folder.exists === false && (
<span className="rounded bg-red-100 px-2 py-0.5 text-xs font-medium text-red-700 dark:bg-red-900/30 dark:text-red-300">
Missing
</span>
)}
</div>
</div>

Expand All @@ -62,7 +70,9 @@ const FolderManagementCard: React.FC = () => {
checked={folder.AI_Tagging}
onCheckedChange={() => toggleAITagging(folder)}
disabled={
enableAITaggingPending || disableAITaggingPending
enableAITaggingPending ||
disableAITaggingPending ||
folder.exists === false
}
/>
</div>
Expand All @@ -71,7 +81,11 @@ const FolderManagementCard: React.FC = () => {
onClick={() => deleteFolder(folder.folder_id)}
variant="outline"
size="sm"
className="h-8 w-8 cursor-pointer text-gray-500 hover:border-red-300 hover:text-red-600 dark:text-gray-400 dark:hover:text-red-400"
className={
isMissing
? 'h-8 w-8 cursor-pointer border-red-300 bg-red-50 text-red-700 hover:border-red-400 hover:bg-red-100 hover:text-red-800 dark:border-red-900/50 dark:bg-red-900/20 dark:text-red-300 dark:hover:bg-red-900/30'
: 'h-8 w-8 cursor-pointer text-gray-500 hover:border-red-300 hover:text-red-600 dark:text-gray-400 dark:hover:text-red-400'
}
disabled={deleteFolderPending}
>
<Trash2 className="h-4 w-4" />
Expand Down Expand Up @@ -113,8 +127,9 @@ const FolderManagementCard: React.FC = () => {
/>
</div>
)}
</div>
))}
</div>
);
})}
</div>
) : (
<div className="py-8 text-center">
Expand Down
1 change: 1 addition & 0 deletions frontend/src/types/Folder.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ export interface FolderDetails {
last_modified_time: number;
AI_Tagging: boolean;
taggingCompleted?: boolean;
exists?: boolean;
}

export interface GetAllFoldersData {
Expand Down