mirror of
https://github.com/MODSetter/SurfSense.git
synced 2026-05-17 18:35:19 +02:00
feat(ui): add multiple folder selection with checkboxes to Google Drive tree
- Replace single folder selection with multi-select checkboxes - Remove cascading auto-select for clearer UX - Each folder must be selected individually - Visual indicators for selected folders
This commit is contained in:
parent
c4a95ecc02
commit
e0edfef5fc
1 changed files with 72 additions and 46 deletions
|
|
@ -15,6 +15,7 @@ import {
|
||||||
} from "lucide-react";
|
} from "lucide-react";
|
||||||
import { useState } from "react";
|
import { useState } from "react";
|
||||||
import { Button } from "@/components/ui/button";
|
import { Button } from "@/components/ui/button";
|
||||||
|
import { Checkbox } from "@/components/ui/checkbox";
|
||||||
import { ScrollArea } from "@/components/ui/scroll-area";
|
import { ScrollArea } from "@/components/ui/scroll-area";
|
||||||
import { cn } from "@/lib/utils";
|
import { cn } from "@/lib/utils";
|
||||||
import { authenticatedFetch } from "@/lib/auth-utils";
|
import { authenticatedFetch } from "@/lib/auth-utils";
|
||||||
|
|
@ -36,10 +37,15 @@ interface ItemTreeNode {
|
||||||
isLoading: boolean;
|
isLoading: boolean;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
interface SelectedFolder {
|
||||||
|
id: string;
|
||||||
|
name: string;
|
||||||
|
}
|
||||||
|
|
||||||
interface GoogleDriveFolderTreeProps {
|
interface GoogleDriveFolderTreeProps {
|
||||||
connectorId: number;
|
connectorId: number;
|
||||||
selectedFolderId: string | null;
|
selectedFolders: SelectedFolder[];
|
||||||
onSelectFolder: (folderId: string, folderName: string) => void;
|
onSelectFolders: (folders: SelectedFolder[]) => void;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Helper to get appropriate icon for file type
|
// Helper to get appropriate icon for file type
|
||||||
|
|
@ -59,25 +65,32 @@ function getFileIcon(mimeType: string, className: string = "h-4 w-4") {
|
||||||
return <File className={`${className} text-gray-500`} />;
|
return <File className={`${className} text-gray-500`} />;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Helper to format file size
|
|
||||||
function formatFileSize(bytes: number | undefined): string {
|
|
||||||
if (!bytes) return "";
|
|
||||||
if (bytes < 1024) return `${bytes} B`;
|
|
||||||
if (bytes < 1024 * 1024) return `${(bytes / 1024).toFixed(1)} KB`;
|
|
||||||
if (bytes < 1024 * 1024 * 1024) return `${(bytes / (1024 * 1024)).toFixed(1)} MB`;
|
|
||||||
return `${(bytes / (1024 * 1024 * 1024)).toFixed(1)} GB`;
|
|
||||||
}
|
|
||||||
|
|
||||||
export function GoogleDriveFolderTree({
|
export function GoogleDriveFolderTree({
|
||||||
connectorId,
|
connectorId,
|
||||||
selectedFolderId,
|
selectedFolders,
|
||||||
onSelectFolder,
|
onSelectFolders,
|
||||||
}: GoogleDriveFolderTreeProps) {
|
}: GoogleDriveFolderTreeProps) {
|
||||||
const [rootItems, setRootItems] = useState<DriveItem[]>([]);
|
const [rootItems, setRootItems] = useState<DriveItem[]>([]);
|
||||||
const [itemStates, setItemStates] = useState<Map<string, ItemTreeNode>>(new Map());
|
const [itemStates, setItemStates] = useState<Map<string, ItemTreeNode>>(new Map());
|
||||||
const [isLoadingRoot, setIsLoadingRoot] = useState(false);
|
const [isLoadingRoot, setIsLoadingRoot] = useState(false);
|
||||||
const [isInitialized, setIsInitialized] = useState(false);
|
const [isInitialized, setIsInitialized] = useState(false);
|
||||||
|
|
||||||
|
// Helper to check if a folder is selected
|
||||||
|
const isFolderSelected = (folderId: string): boolean => {
|
||||||
|
return selectedFolders.some((f) => f.id === folderId);
|
||||||
|
};
|
||||||
|
|
||||||
|
// Handle folder checkbox toggle
|
||||||
|
const toggleFolderSelection = (folderId: string, folderName: string) => {
|
||||||
|
if (isFolderSelected(folderId)) {
|
||||||
|
// Remove from selection
|
||||||
|
onSelectFolders(selectedFolders.filter((f) => f.id !== folderId));
|
||||||
|
} else {
|
||||||
|
// Add to selection
|
||||||
|
onSelectFolders([...selectedFolders, { id: folderId, name: folderName }]);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
// Load root items (folders and files) on mount
|
// Load root items (folders and files) on mount
|
||||||
const loadRootItems = async () => {
|
const loadRootItems = async () => {
|
||||||
if (isInitialized) return; // Already loaded
|
if (isInitialized) return; // Already loaded
|
||||||
|
|
@ -215,7 +228,7 @@ export function GoogleDriveFolderTree({
|
||||||
const isExpanded = state?.isExpanded || false;
|
const isExpanded = state?.isExpanded || false;
|
||||||
const isLoading = state?.isLoading || false;
|
const isLoading = state?.isLoading || false;
|
||||||
const children = state?.children;
|
const children = state?.children;
|
||||||
const isSelected = selectedFolderId === item.id;
|
const isSelected = isFolderSelected(item.id);
|
||||||
const isFolder = item.isFolder;
|
const isFolder = item.isFolder;
|
||||||
|
|
||||||
// Separate folders and files for children
|
// Separate folders and files for children
|
||||||
|
|
@ -224,15 +237,13 @@ export function GoogleDriveFolderTree({
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div key={item.id} className="w-full" style={{ marginLeft: `${level * 1.25}rem` }}>
|
<div key={item.id} className="w-full" style={{ marginLeft: `${level * 1.25}rem` }}>
|
||||||
<Button
|
<div
|
||||||
variant="ghost"
|
|
||||||
className={cn(
|
className={cn(
|
||||||
"w-full justify-start gap-2 h-auto py-2 px-2 font-normal overflow-hidden",
|
"flex items-center gap-2 h-auto py-2 px-2 rounded-md",
|
||||||
isFolder && "hover:bg-accent cursor-pointer",
|
isFolder && "hover:bg-accent cursor-pointer",
|
||||||
!isFolder && "cursor-default opacity-70 hover:bg-transparent",
|
!isFolder && "cursor-default opacity-60",
|
||||||
isSelected && isFolder && "bg-accent"
|
isSelected && isFolder && "bg-accent/50"
|
||||||
)}
|
)}
|
||||||
onClick={() => isFolder && onSelectFolder(item.id, item.name)}
|
|
||||||
>
|
>
|
||||||
{/* Expand/Collapse Icon (only for folders) */}
|
{/* Expand/Collapse Icon (only for folders) */}
|
||||||
{isFolder ? (
|
{isFolder ? (
|
||||||
|
|
@ -255,20 +266,37 @@ export function GoogleDriveFolderTree({
|
||||||
<span className="w-4 h-4 shrink-0" /> // Empty space for alignment
|
<span className="w-4 h-4 shrink-0" /> // Empty space for alignment
|
||||||
)}
|
)}
|
||||||
|
|
||||||
{/* Icon */}
|
{/* Checkbox (only for folders) */}
|
||||||
{isFolder ? (
|
{isFolder && (
|
||||||
isExpanded ? (
|
<Checkbox
|
||||||
<FolderOpen className="h-4 w-4 text-blue-500 shrink-0" />
|
checked={isSelected}
|
||||||
) : (
|
onCheckedChange={() => toggleFolderSelection(item.id, item.name)}
|
||||||
<Folder className="h-4 w-4 text-gray-500 shrink-0" />
|
className="shrink-0"
|
||||||
)
|
onClick={(e) => e.stopPropagation()}
|
||||||
) : (
|
/>
|
||||||
getFileIcon(item.mimeType, "h-4 w-4 shrink-0")
|
|
||||||
)}
|
)}
|
||||||
|
|
||||||
|
{/* Icon */}
|
||||||
|
<div className="shrink-0" style={{ marginLeft: isFolder ? "0" : "1.25rem" }}>
|
||||||
|
{isFolder ? (
|
||||||
|
isExpanded ? (
|
||||||
|
<FolderOpen className="h-4 w-4 text-blue-500" />
|
||||||
|
) : (
|
||||||
|
<Folder className="h-4 w-4 text-gray-500" />
|
||||||
|
)
|
||||||
|
) : (
|
||||||
|
getFileIcon(item.mimeType, "h-4 w-4")
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
|
||||||
{/* Item Name */}
|
{/* Item Name */}
|
||||||
<span className="truncate flex-1 text-left text-sm min-w-0">{item.name}</span>
|
<span
|
||||||
</Button>
|
className="truncate flex-1 text-left text-sm min-w-0"
|
||||||
|
onClick={() => isFolder && toggleFolder(item)}
|
||||||
|
>
|
||||||
|
{item.name}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
|
||||||
{/* Render children if expanded (folders first, then files) */}
|
{/* Render children if expanded (folders first, then files) */}
|
||||||
{isExpanded && isFolder && children && (
|
{isExpanded && isFolder && children && (
|
||||||
|
|
@ -281,9 +309,7 @@ export function GoogleDriveFolderTree({
|
||||||
|
|
||||||
{/* Empty state */}
|
{/* Empty state */}
|
||||||
{children.length === 0 && (
|
{children.length === 0 && (
|
||||||
<div className="text-xs text-muted-foreground py-2 pl-2">
|
<div className="text-xs text-muted-foreground py-2 pl-2">Empty folder</div>
|
||||||
Empty folder
|
|
||||||
</div>
|
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
|
@ -302,17 +328,17 @@ export function GoogleDriveFolderTree({
|
||||||
<div className="p-2 pr-4 w-full overflow-x-hidden">
|
<div className="p-2 pr-4 w-full overflow-x-hidden">
|
||||||
{/* My Drive Header (always visible, selectable) */}
|
{/* My Drive Header (always visible, selectable) */}
|
||||||
<div className="mb-2 pb-2 border-b">
|
<div className="mb-2 pb-2 border-b">
|
||||||
<Button
|
<div className="flex items-center gap-2 h-auto py-2 px-2 rounded-md hover:bg-accent cursor-pointer">
|
||||||
variant="ghost"
|
<Checkbox
|
||||||
className={cn(
|
checked={isFolderSelected("root")}
|
||||||
"w-full justify-start gap-2 h-auto py-2 px-2 font-normal hover:bg-accent overflow-hidden",
|
onCheckedChange={() => toggleFolderSelection("root", "My Drive")}
|
||||||
selectedFolderId === "root" && "bg-accent"
|
className="shrink-0"
|
||||||
)}
|
/>
|
||||||
onClick={() => onSelectFolder("root", "My Drive")}
|
|
||||||
>
|
|
||||||
<HardDrive className="h-4 w-4 text-primary shrink-0" />
|
<HardDrive className="h-4 w-4 text-primary shrink-0" />
|
||||||
<span className="font-semibold truncate">My Drive</span>
|
<span className="font-semibold truncate" onClick={() => toggleFolderSelection("root", "My Drive")}>
|
||||||
</Button>
|
My Drive
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{/* Loading indicator */}
|
{/* Loading indicator */}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue