feat: implement selection mode for managing duplicate assets
- Added a `selectionMode` prop to `DuplicateAssetRecord`, `DuplicateAssetItem`, and `VirtualizedDuplicateList` components to toggle between "keep" and "discard" modes. - Updated UI elements to reflect the current selection mode, including button states and labels. - Enhanced the logic for keeping or deleting selected assets based on the selected mode in the `BulkDuplicatePage` component. - Improved user experience by providing clear visual feedback for asset selection actions.
This commit is contained in:
1 parent
6259481d3e
commit
afb2fb09d4
3 files changed
+103
-13
No files matched your search
@@ -16,15 +16,17 @@ interface DuplicateAssetRecordProps {
|
|||||||
onDeleteRecord: (record: IDuplicateAssetRecord) => void
|
onDeleteRecord: (record: IDuplicateAssetRecord) => void
|
||||||
onKeepSelected: (record: IDuplicateAssetRecord, selectedIds: string[], unselectedIds: string[]) => void
|
onKeepSelected: (record: IDuplicateAssetRecord, selectedIds: string[], unselectedIds: string[]) => void
|
||||||
onKeepAllInRecord: (record: IDuplicateAssetRecord) => void
|
onKeepAllInRecord: (record: IDuplicateAssetRecord) => void
|
||||||
|
selectionMode: 'keep' | 'discard'
|
||||||
}
|
}
|
||||||
|
|
||||||
interface DuplicateAssetItemProps {
|
interface DuplicateAssetItemProps {
|
||||||
asset: IDuplicateAsset
|
asset: IDuplicateAsset
|
||||||
isSelected: boolean
|
isSelected: boolean
|
||||||
onSelect: (assetId: string, isShiftClick?: boolean) => void
|
onSelect: (assetId: string, isShiftClick?: boolean) => void
|
||||||
|
selectionMode: 'keep' | 'discard'
|
||||||
}
|
}
|
||||||
|
|
||||||
function DuplicateAssetItem({ asset, isSelected, onSelect }: DuplicateAssetItemProps) {
|
function DuplicateAssetItem({ asset, isSelected, onSelect, selectionMode }: DuplicateAssetItemProps) {
|
||||||
const handleCheckboxChange = (event: React.MouseEvent) => {
|
const handleCheckboxChange = (event: React.MouseEvent) => {
|
||||||
const isShiftClick = event.shiftKey
|
const isShiftClick = event.shiftKey
|
||||||
onSelect(asset.id, isShiftClick)
|
onSelect(asset.id, isShiftClick)
|
||||||
@@ -51,7 +53,8 @@ function DuplicateAssetItem({ asset, isSelected, onSelect }: DuplicateAssetItemP
|
|||||||
|
|
||||||
{/* Keep/Trash label */}
|
{/* Keep/Trash label */}
|
||||||
<div className="absolute top-2 right-2">
|
<div className="absolute top-2 right-2">
|
||||||
{isSelected ? (
|
{selectionMode === 'keep' ? (
|
||||||
|
isSelected ? (
|
||||||
<div className="bg-green-600 text-white text-xs px-2 py-1 rounded font-bold flex items-center gap-1">
|
<div className="bg-green-600 text-white text-xs px-2 py-1 rounded font-bold flex items-center gap-1">
|
||||||
<Shield size={12} />
|
<Shield size={12} />
|
||||||
KEEP
|
KEEP
|
||||||
@@ -59,8 +62,21 @@ function DuplicateAssetItem({ asset, isSelected, onSelect }: DuplicateAssetItemP
|
|||||||
) : (
|
) : (
|
||||||
<div className="bg-red-600 text-white text-xs px-2 py-1 rounded font-bold flex items-center gap-1">
|
<div className="bg-red-600 text-white text-xs px-2 py-1 rounded font-bold flex items-center gap-1">
|
||||||
<Trash2 size={12} />
|
<Trash2 size={12} />
|
||||||
TRASH
|
DISCARD
|
||||||
</div>
|
</div>
|
||||||
|
)
|
||||||
|
) : (
|
||||||
|
isSelected ? (
|
||||||
|
<div className="bg-red-600 text-white text-xs px-2 py-1 rounded font-bold flex items-center gap-1">
|
||||||
|
<Trash2 size={12} />
|
||||||
|
DISCARD
|
||||||
|
</div>
|
||||||
|
) : (
|
||||||
|
<div className="bg-green-600 text-white text-xs px-2 py-1 rounded font-bold flex items-center gap-1">
|
||||||
|
<Shield size={12} />
|
||||||
|
KEEP
|
||||||
|
</div>
|
||||||
|
)
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@@ -120,7 +136,8 @@ export default function DuplicateAssetRecord({
|
|||||||
onAssetSelect,
|
onAssetSelect,
|
||||||
onDeleteRecord,
|
onDeleteRecord,
|
||||||
onKeepSelected,
|
onKeepSelected,
|
||||||
onKeepAllInRecord
|
onKeepAllInRecord,
|
||||||
|
selectionMode
|
||||||
}: DuplicateAssetRecordProps) {
|
}: DuplicateAssetRecordProps) {
|
||||||
const recordAssetIds = record.assets.map(asset => asset.id)
|
const recordAssetIds = record.assets.map(asset => asset.id)
|
||||||
const selectedInRecord = recordAssetIds.filter(id => selectedAssets.has(id)).length
|
const selectedInRecord = recordAssetIds.filter(id => selectedAssets.has(id)).length
|
||||||
@@ -162,7 +179,13 @@ export default function DuplicateAssetRecord({
|
|||||||
|
|
||||||
if (selectedAssetIds.length === 0) return
|
if (selectedAssetIds.length === 0) return
|
||||||
|
|
||||||
|
if (selectionMode === 'keep') {
|
||||||
|
// Keep selected, delete unselected
|
||||||
onKeepSelected(record, selectedAssetIds, unselectedAssetIds)
|
onKeepSelected(record, selectedAssetIds, unselectedAssetIds)
|
||||||
|
} else {
|
||||||
|
// Delete selected, keep unselected
|
||||||
|
onKeepSelected(record, unselectedAssetIds, selectedAssetIds)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
@@ -180,6 +203,8 @@ export default function DuplicateAssetRecord({
|
|||||||
</div>
|
</div>
|
||||||
{selectedInRecord > 0 && (
|
{selectedInRecord > 0 && (
|
||||||
<div className="flex items-center gap-2 text-sm">
|
<div className="flex items-center gap-2 text-sm">
|
||||||
|
{selectionMode === 'keep' ? (
|
||||||
|
<>
|
||||||
<div className="flex items-center gap-1 text-green-600 dark:text-green-400 font-medium">
|
<div className="flex items-center gap-1 text-green-600 dark:text-green-400 font-medium">
|
||||||
<Shield size={16} />
|
<Shield size={16} />
|
||||||
{selectedInRecord} to keep ({humanizeBytes(selectedSize)})
|
{selectedInRecord} to keep ({humanizeBytes(selectedSize)})
|
||||||
@@ -188,6 +213,19 @@ export default function DuplicateAssetRecord({
|
|||||||
<Trash2 size={16} />
|
<Trash2 size={16} />
|
||||||
{unselectedInRecord} to delete ({humanizeBytes(unselectedSize)} savings)
|
{unselectedInRecord} to delete ({humanizeBytes(unselectedSize)} savings)
|
||||||
</div>
|
</div>
|
||||||
|
</>
|
||||||
|
) : (
|
||||||
|
<>
|
||||||
|
<div className="flex items-center gap-1 text-red-600 dark:text-red-400 font-medium">
|
||||||
|
<Trash2 size={16} />
|
||||||
|
{selectedInRecord} to delete ({humanizeBytes(selectedSize)} savings)
|
||||||
|
</div>
|
||||||
|
<div className="flex items-center gap-1 text-green-600 dark:text-green-400 font-medium">
|
||||||
|
<Shield size={16} />
|
||||||
|
{unselectedInRecord} to keep ({humanizeBytes(unselectedSize)})
|
||||||
|
</div>
|
||||||
|
</>
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
@@ -211,8 +249,11 @@ export default function DuplicateAssetRecord({
|
|||||||
|
|
||||||
{selectedInRecord > 0 && (
|
{selectedInRecord > 0 && (
|
||||||
<AlertDialog
|
<AlertDialog
|
||||||
title="Keep Selected Assets"
|
title={selectionMode === 'keep' ? "Keep Selected Assets" : "Delete Selected Assets"}
|
||||||
description={`Keep ${selectedInRecord} selected assets and delete ${unselectedInRecord} unselected assets? The selected assets will be removed from duplicate detection. Storage savings: ${humanizeBytes(unselectedSize)}. This action cannot be undone.`}
|
description={selectionMode === 'keep'
|
||||||
|
? `Keep ${selectedInRecord} selected assets and delete ${unselectedInRecord} unselected assets? The selected assets will be removed from duplicate detection. Storage savings: ${humanizeBytes(unselectedSize)}. This action cannot be undone.`
|
||||||
|
: `Delete ${selectedInRecord} selected assets and keep ${unselectedInRecord} unselected assets? The unselected assets will be removed from duplicate detection. Storage savings: ${humanizeBytes(selectedSize)}. This action cannot be undone.`
|
||||||
|
}
|
||||||
onConfirm={handleKeepSelected}
|
onConfirm={handleKeepSelected}
|
||||||
variant="destructive"
|
variant="destructive"
|
||||||
asChild
|
asChild
|
||||||
@@ -221,10 +262,13 @@ export default function DuplicateAssetRecord({
|
|||||||
variant="default"
|
variant="default"
|
||||||
size="sm"
|
size="sm"
|
||||||
className="flex items-center gap-1"
|
className="flex items-center gap-1"
|
||||||
title={`Keep selected, delete others (${humanizeBytes(unselectedSize)} savings)`}
|
title={selectionMode === 'keep'
|
||||||
|
? `Keep selected, delete others (${humanizeBytes(unselectedSize)} savings)`
|
||||||
|
: `Delete selected, keep others (${humanizeBytes(selectedSize)} savings)`
|
||||||
|
}
|
||||||
>
|
>
|
||||||
<Shield size={16} />
|
{selectionMode === 'keep' ? <Shield size={16} /> : <Trash2 size={16} />}
|
||||||
Keep Selected ({selectedInRecord})
|
{selectionMode === 'keep' ? 'Keep' : 'Delete'} Selected ({selectedInRecord})
|
||||||
</Button>
|
</Button>
|
||||||
</AlertDialog>
|
</AlertDialog>
|
||||||
)}
|
)}
|
||||||
@@ -257,6 +301,7 @@ export default function DuplicateAssetRecord({
|
|||||||
asset={asset}
|
asset={asset}
|
||||||
isSelected={selectedAssets.has(asset.id)}
|
isSelected={selectedAssets.has(asset.id)}
|
||||||
onSelect={onAssetSelect}
|
onSelect={onAssetSelect}
|
||||||
|
selectionMode={selectionMode}
|
||||||
/>
|
/>
|
||||||
))}
|
))}
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -11,6 +11,7 @@ interface VirtualizedDuplicateListProps {
|
|||||||
onKeepSelected: (record: IDuplicateAssetRecord, selectedIds: string[], unselectedIds: string[]) => void
|
onKeepSelected: (record: IDuplicateAssetRecord, selectedIds: string[], unselectedIds: string[]) => void
|
||||||
onKeepAllInRecord: (record: IDuplicateAssetRecord) => void
|
onKeepAllInRecord: (record: IDuplicateAssetRecord) => void
|
||||||
height: number
|
height: number
|
||||||
|
selectionMode: 'keep' | 'discard'
|
||||||
}
|
}
|
||||||
|
|
||||||
interface ListItemProps {
|
interface ListItemProps {
|
||||||
@@ -23,11 +24,12 @@ interface ListItemProps {
|
|||||||
onDeleteRecord: (record: IDuplicateAssetRecord) => void
|
onDeleteRecord: (record: IDuplicateAssetRecord) => void
|
||||||
onKeepSelected: (record: IDuplicateAssetRecord, selectedIds: string[], unselectedIds: string[]) => void
|
onKeepSelected: (record: IDuplicateAssetRecord, selectedIds: string[], unselectedIds: string[]) => void
|
||||||
onKeepAllInRecord: (record: IDuplicateAssetRecord) => void
|
onKeepAllInRecord: (record: IDuplicateAssetRecord) => void
|
||||||
|
selectionMode: 'keep' | 'discard'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const ListItem: React.FC<ListItemProps> = ({ index, style, data }) => {
|
const ListItem: React.FC<ListItemProps> = ({ index, style, data }) => {
|
||||||
const { duplicates, selectedAssets, onAssetSelect, onDeleteRecord, onKeepSelected, onKeepAllInRecord } = data
|
const { duplicates, selectedAssets, onAssetSelect, onDeleteRecord, onKeepSelected, onKeepAllInRecord, selectionMode } = data
|
||||||
const record = duplicates[index]
|
const record = duplicates[index]
|
||||||
|
|
||||||
return (
|
return (
|
||||||
@@ -40,6 +42,7 @@ const ListItem: React.FC<ListItemProps> = ({ index, style, data }) => {
|
|||||||
onDeleteRecord={onDeleteRecord}
|
onDeleteRecord={onDeleteRecord}
|
||||||
onKeepSelected={onKeepSelected}
|
onKeepSelected={onKeepSelected}
|
||||||
onKeepAllInRecord={onKeepAllInRecord}
|
onKeepAllInRecord={onKeepAllInRecord}
|
||||||
|
selectionMode={selectionMode}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -68,7 +71,8 @@ export default function VirtualizedDuplicateList({
|
|||||||
onDeleteRecord,
|
onDeleteRecord,
|
||||||
onKeepSelected,
|
onKeepSelected,
|
||||||
onKeepAllInRecord,
|
onKeepAllInRecord,
|
||||||
height
|
height,
|
||||||
|
selectionMode
|
||||||
}: VirtualizedDuplicateListProps) {
|
}: VirtualizedDuplicateListProps) {
|
||||||
// Custom item size getter for VariableSizeList
|
// Custom item size getter for VariableSizeList
|
||||||
const getItemHeight = (index: number) => {
|
const getItemHeight = (index: number) => {
|
||||||
@@ -83,7 +87,8 @@ export default function VirtualizedDuplicateList({
|
|||||||
onAssetSelect,
|
onAssetSelect,
|
||||||
onDeleteRecord,
|
onDeleteRecord,
|
||||||
onKeepSelected,
|
onKeepSelected,
|
||||||
onKeepAllInRecord
|
onKeepAllInRecord,
|
||||||
|
selectionMode
|
||||||
}
|
}
|
||||||
|
|
||||||
// For better performance with many items, we'll use a custom implementation
|
// For better performance with many items, we'll use a custom implementation
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ import Header from '@/components/shared/Header'
|
|||||||
import VirtualizedDuplicateList from '@/components/assets/duplicate-assets/VirtualizedDuplicateList'
|
import VirtualizedDuplicateList from '@/components/assets/duplicate-assets/VirtualizedDuplicateList'
|
||||||
import Loader from '@/components/ui/loader'
|
import Loader from '@/components/ui/loader'
|
||||||
import { Button } from '@/components/ui/button'
|
import { Button } from '@/components/ui/button'
|
||||||
import { RefreshCw, Search } from 'lucide-react'
|
import { RefreshCw, Search, Shield, Trash2 } from 'lucide-react'
|
||||||
|
|
||||||
import { toast } from '@/components/ui/use-toast'
|
import { toast } from '@/components/ui/use-toast'
|
||||||
import { humanizeBytes } from '@/helpers/string.helper'
|
import { humanizeBytes } from '@/helpers/string.helper'
|
||||||
@@ -19,6 +19,7 @@ export default function BulkDuplicatePage() {
|
|||||||
const [isDeleting, setIsDeleting] = useState(false);
|
const [isDeleting, setIsDeleting] = useState(false);
|
||||||
const [lastSelectedIndex, setLastSelectedIndex] = useState<number>(-1);
|
const [lastSelectedIndex, setLastSelectedIndex] = useState<number>(-1);
|
||||||
const [containerHeight, setContainerHeight] = useState<number>(600);
|
const [containerHeight, setContainerHeight] = useState<number>(600);
|
||||||
|
const [selectionMode, setSelectionMode] = useState<'keep' | 'discard'>('keep');
|
||||||
const containerRef = useRef<HTMLDivElement>(null);
|
const containerRef = useRef<HTMLDivElement>(null);
|
||||||
|
|
||||||
const fetchDuplicates = async () => {
|
const fetchDuplicates = async () => {
|
||||||
@@ -228,6 +229,43 @@ export default function BulkDuplicatePage() {
|
|||||||
<Header
|
<Header
|
||||||
leftComponent="Bulk Duplicate Finder"
|
leftComponent="Bulk Duplicate Finder"
|
||||||
rightComponent={
|
rightComponent={
|
||||||
|
<div className="flex items-center gap-4">
|
||||||
|
{/* Selection Mode Button Group */}
|
||||||
|
<div className="flex items-center gap-2">
|
||||||
|
<span className="text-sm font-medium text-gray-700 dark:text-gray-300">
|
||||||
|
Select to:
|
||||||
|
</span>
|
||||||
|
<div className="flex rounded-lg border border-gray-300 dark:border-gray-600 overflow-hidden">
|
||||||
|
<Button
|
||||||
|
variant={selectionMode === 'keep' ? 'default' : 'ghost'}
|
||||||
|
size="sm"
|
||||||
|
onClick={() => setSelectionMode('keep')}
|
||||||
|
className={`rounded-none border-0 ${
|
||||||
|
selectionMode === 'keep'
|
||||||
|
? 'bg-green-600 hover:bg-green-700 text-white'
|
||||||
|
: 'hover:bg-gray-100 dark:hover:bg-gray-700'
|
||||||
|
}`}
|
||||||
|
>
|
||||||
|
<Shield size={14} className="mr-1" />
|
||||||
|
Keep
|
||||||
|
</Button>
|
||||||
|
<Button
|
||||||
|
variant={selectionMode === 'discard' ? 'default' : 'ghost'}
|
||||||
|
size="sm"
|
||||||
|
onClick={() => setSelectionMode('discard')}
|
||||||
|
className={`rounded-none border-0 ${
|
||||||
|
selectionMode === 'discard'
|
||||||
|
? 'bg-red-600 hover:bg-red-700 text-white'
|
||||||
|
: 'hover:bg-gray-100 dark:hover:bg-gray-700'
|
||||||
|
}`}
|
||||||
|
>
|
||||||
|
<Trash2 size={14} className="mr-1" />
|
||||||
|
Discard
|
||||||
|
</Button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* Refresh Button */}
|
||||||
<Button
|
<Button
|
||||||
onClick={fetchDuplicates}
|
onClick={fetchDuplicates}
|
||||||
disabled={loading}
|
disabled={loading}
|
||||||
@@ -236,6 +274,7 @@ export default function BulkDuplicatePage() {
|
|||||||
<RefreshCw size={16} className={loading ? 'animate-spin' : ''} />
|
<RefreshCw size={16} className={loading ? 'animate-spin' : ''} />
|
||||||
Refresh
|
Refresh
|
||||||
</Button>
|
</Button>
|
||||||
|
</div>
|
||||||
}
|
}
|
||||||
/>
|
/>
|
||||||
|
|
||||||
@@ -299,6 +338,7 @@ export default function BulkDuplicatePage() {
|
|||||||
onKeepSelected={handleKeepSelected}
|
onKeepSelected={handleKeepSelected}
|
||||||
onKeepAllInRecord={handleKeepAllInRecord}
|
onKeepAllInRecord={handleKeepAllInRecord}
|
||||||
height={containerHeight}
|
height={containerHeight}
|
||||||
|
selectionMode={selectionMode}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
|||||||
Reference in new issue
Block a user