Skip to content

No pop up message when removing media from albums #215 #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kolev-sf merged 3 commits into from
Nov 25, 2025
Merged

No pop up message when removing media from albums #215 #24

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3ce7e22
No pop up message when removing media from albums #215
kolev-sf Nov 25, 2025
e16cce2
Fix typo
kolev-sf Nov 25, 2025
4c9657f
fix another typo
kolev-sf Nov 25, 2025
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
112 changes: 87 additions & 25 deletions src/components/ImageGallery.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,11 @@ import {
useMutation,
useQueryClient,
} from '@tanstack/react-query';
import { addObjectsToAlbum, bulkRemoveObjectsFromAlbum, getAlbumItems } from 'api/albumApi';
import {
addObjectsToAlbum,
bulkRemoveObjectsFromAlbum,
getAlbumItems,
} from 'api/albumApi';
import React, { useEffect, useState } from 'react';
import toast from 'react-hot-toast';
import { useInView } from 'react-intersection-observer';
Expand Down Expand Up @@ -110,10 +114,14 @@ export const ImageGallery: React.FC<{ albumId?: string }> = ({ albumId }) => {
toast.success('The file(s) were added to the selected album(s).');
setSelectedImages([]);
setOpenAddToAlbumDialog(false);
queryClient.invalidateQueries({ queryKey: ['fetchIds', albumId ?? null] });
queryClient.invalidateQueries({
queryKey: ['fetchIds', albumId ?? null],
});
},
onError: (error) => {
toast.error(`Error adding object to the album: ${error?.message ?? 'Error'}`);
toast.error(
`Error adding object to the album: ${error?.message ?? 'Error'}`
);
},
});

Expand All @@ -122,7 +130,9 @@ export const ImageGallery: React.FC<{ albumId?: string }> = ({ albumId }) => {
onSuccess: () => {
toast.success('Selected item(s) were removed from the album.');
setSelectedImages([]);
queryClient.invalidateQueries({ queryKey: ['fetchIds', albumId ?? null] });
queryClient.invalidateQueries({
queryKey: ['fetchIds', albumId ?? null],
});
},
onError: (error) => {
toast.error(`Error removing from album: ${error?.message ?? 'Error'}`);
Expand Down Expand Up @@ -187,7 +197,9 @@ export const ImageGallery: React.FC<{ albumId?: string }> = ({ albumId }) => {
{
onSuccess: () => {
handleClearSelection();
queryClient.invalidateQueries({ queryKey: ['fetchIds', albumId ?? null] });
queryClient.invalidateQueries({
queryKey: ['fetchIds', albumId ?? null],
});
},
}
);
Expand All @@ -203,8 +215,7 @@ export const ImageGallery: React.FC<{ albumId?: string }> = ({ albumId }) => {
const match = disposition.match(
/filename[^;=\n]*=((['"]).*?\2|[^;\n]*)/
);
if (match && match[1])
filename = match[1].replace(/['"]/g, '');
if (match && match[1]) filename = match[1].replace(/['"]/g, '');
}

const link = document.createElement('a');
Expand All @@ -224,7 +235,9 @@ export const ImageGallery: React.FC<{ albumId?: string }> = ({ albumId }) => {
{
onSuccess: () => {
handleClearSelection();
queryClient.invalidateQueries({ queryKey: ['fetchIds', albumId ?? null] });
queryClient.invalidateQueries({
queryKey: ['fetchIds', albumId ?? null],
});
},
}
);
Expand All @@ -235,7 +248,9 @@ export const ImageGallery: React.FC<{ albumId?: string }> = ({ albumId }) => {
{ objectIds: [id] },
{
onSuccess: () => {
queryClient.invalidateQueries({ queryKey: ['fetchIds', albumId ?? null] });
queryClient.invalidateQueries({
queryKey: ['fetchIds', albumId ?? null],
});
},
}
);
Expand All @@ -246,7 +261,9 @@ export const ImageGallery: React.FC<{ albumId?: string }> = ({ albumId }) => {
{ objectIds: [id] },
{
onSuccess: () => {
queryClient.invalidateQueries({ queryKey: ['fetchIds', albumId ?? null] });
queryClient.invalidateQueries({
queryKey: ['fetchIds', albumId ?? null],
});
},
}
);
Expand All @@ -255,11 +272,16 @@ export const ImageGallery: React.FC<{ albumId?: string }> = ({ albumId }) => {

const [openDeleteDialog, setOpenDeleteDialog] = useState(false);

const [openRemoveFromAlbumDialog, setOpenRemoveFromAlbumDialog] = useState(false);

const [openAddToAlbumDialog, setOpenAddToAlbumDialog] = React.useState(false);

const handleAddToAlbum = (albumIdToAdd: string) => {
if (selectedImages.length === 0) return;
addToAlbumMutation.mutate({ albumId: albumIdToAdd, objectIds: selectedImages });
addToAlbumMutation.mutate({
albumId: albumIdToAdd,
objectIds: selectedImages,
});
};

const handleRemoveFromAlbum = () => {
Expand Down Expand Up @@ -311,18 +333,60 @@ export const ImageGallery: React.FC<{ albumId?: string }> = ({ albumId }) => {
</IconButton>
</Tooltip>
{albumId && (
<Tooltip title="Remove from album">
<span>
<IconButton
color="inherit"
onClick={handleRemoveFromAlbum}
disabled={removeFromAlbumMutation.isPending}
aria-label="Remove from album"
<>
<Tooltip title="Remove from album">
<span>
<IconButton
color="inherit"
onClick={() => setOpenRemoveFromAlbumDialog(true)}
disabled={removeFromAlbumMutation.isPending}
aria-label="Remove from album"
>
<RemoveCircleOutlineIcon />
</IconButton>
</span>
</Tooltip>
<Dialog
open={openRemoveFromAlbumDialog}
onClose={() => setOpenRemoveFromAlbumDialog(false)}
aria-labelledby="remove-album-dialog-title"
aria-describedby="remove-album-dialog-description"
>
<DialogTitle
id="remove-album-dialog-title"
sx={{ display: 'flex', alignItems: 'center', gap: 1 }}
>
<RemoveCircleOutlineIcon color="error" sx={{ fontSize: 32 }} />
Remove from album {selectedImages.length}{' '}
{selectedImages.length === 1 ? 'item' : 'items'}?
</DialogTitle>
<Typography
id="remove-album-dialog-description"
sx={{ px: 3, pb: 1, color: 'text.secondary' }}
>
<RemoveCircleOutlineIcon />
</IconButton>
</span>
</Tooltip>
This action will remove the selected{' '}
{selectedImages.length === 1 ? 'item' : 'items'} from album.
</Typography>
<DialogActions>
<Button
onClick={() => setOpenRemoveFromAlbumDialog(false)}
variant="outlined"
>
Cancel
</Button>
<Button
onClick={() => {
handleRemoveFromAlbum();
setOpenRemoveFromAlbumDialog(false);
}}
color="error"
variant="contained"
>
Remove from Album
</Button>
</DialogActions>
</Dialog>
</>
)}
<Tooltip title="Delete">
<IconButton
Expand Down Expand Up @@ -392,9 +456,7 @@ export const ImageGallery: React.FC<{ albumId?: string }> = ({ albumId }) => {
</Typography>

{selectedImages.length > 0 && !albumId && (
<Tooltip
title="Add to Album"
>
<Tooltip title="Add to Album">
<span>
<Button
variant="outlined"
Expand Down
Loading
⚡