From 86848e7d70dfd8e5ee7dbea122678557f49ff7f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Marseault?= <larsluph@larsluph.dev>
Date: Mon, 2 Jun 2025 09:12:17 +0200
Subject: [PATCH] feat(onDelete): Redirect to previous page to preserve filters
 (#5818)

---
 ui/v2.5/src/components/Galleries/GalleryDetails/Gallery.tsx   | 2 +-
 ui/v2.5/src/components/Groups/GroupDetails/Group.tsx          | 4 ++--
 ui/v2.5/src/components/Images/ImageDetails/Image.tsx          | 2 +-
 .../src/components/Performers/PerformerDetails/Performer.tsx  | 4 ++--
 ui/v2.5/src/components/Scenes/SceneDetails/Scene.tsx          | 2 +-
 ui/v2.5/src/components/Studios/StudioDetails/Studio.tsx       | 4 ++--
 ui/v2.5/src/components/Tags/TagDetails/Tag.tsx                | 4 ++--
 7 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/ui/v2.5/src/components/Galleries/GalleryDetails/Gallery.tsx b/ui/v2.5/src/components/Galleries/GalleryDetails/Gallery.tsx
index 7dc2a17b6..20023904b 100644
--- a/ui/v2.5/src/components/Galleries/GalleryDetails/Gallery.tsx
+++ b/ui/v2.5/src/components/Galleries/GalleryDetails/Gallery.tsx
@@ -167,7 +167,7 @@ export const GalleryPage: React.FC<IProps> = ({ gallery, add }) => {
   function onDeleteDialogClosed(deleted: boolean) {
     setIsDeleteAlertOpen(false);
     if (deleted) {
-      history.push("/galleries");
+      history.goBack();
     }
   }
 
diff --git a/ui/v2.5/src/components/Groups/GroupDetails/Group.tsx b/ui/v2.5/src/components/Groups/GroupDetails/Group.tsx
index 4636d1e5e..9ff626908 100644
--- a/ui/v2.5/src/components/Groups/GroupDetails/Group.tsx
+++ b/ui/v2.5/src/components/Groups/GroupDetails/Group.tsx
@@ -252,10 +252,10 @@ const GroupPage: React.FC<IProps> = ({ group, tabKey }) => {
       await deleteGroup();
     } catch (e) {
       Toast.error(e);
+      return;
     }
 
-    // redirect to groups page
-    history.push(`/groups`);
+    history.goBack();
   }
 
   function toggleEditing(value?: boolean) {
diff --git a/ui/v2.5/src/components/Images/ImageDetails/Image.tsx b/ui/v2.5/src/components/Images/ImageDetails/Image.tsx
index 1adfd81a6..4ab6641d7 100644
--- a/ui/v2.5/src/components/Images/ImageDetails/Image.tsx
+++ b/ui/v2.5/src/components/Images/ImageDetails/Image.tsx
@@ -156,7 +156,7 @@ const ImagePage: React.FC<IProps> = ({ image }) => {
   function onDeleteDialogClosed(deleted: boolean) {
     setIsDeleteAlertOpen(false);
     if (deleted) {
-      history.push("/images");
+      history.goBack();
     }
   }
 
diff --git a/ui/v2.5/src/components/Performers/PerformerDetails/Performer.tsx b/ui/v2.5/src/components/Performers/PerformerDetails/Performer.tsx
index c86960f37..f1de9a5f1 100644
--- a/ui/v2.5/src/components/Performers/PerformerDetails/Performer.tsx
+++ b/ui/v2.5/src/components/Performers/PerformerDetails/Performer.tsx
@@ -298,10 +298,10 @@ const PerformerPage: React.FC<IProps> = PatchComponent(
         await deletePerformer({ variables: { id: performer.id } });
       } catch (e) {
         Toast.error(e);
+        return;
       }
 
-      // redirect to performers page
-      history.push("/performers");
+      history.goBack();
     }
 
     function toggleEditing(value?: boolean) {
diff --git a/ui/v2.5/src/components/Scenes/SceneDetails/Scene.tsx b/ui/v2.5/src/components/Scenes/SceneDetails/Scene.tsx
index a507568c7..c4088654a 100644
--- a/ui/v2.5/src/components/Scenes/SceneDetails/Scene.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneDetails/Scene.tsx
@@ -909,7 +909,7 @@ const SceneLoader: React.FC<RouteComponentProps<ISceneParams>> = ({
     ) {
       loadScene(queueScenes[currentQueueIndex + 1].id);
     } else {
-      history.push("/scenes");
+      history.goBack();
     }
   }
 
diff --git a/ui/v2.5/src/components/Studios/StudioDetails/Studio.tsx b/ui/v2.5/src/components/Studios/StudioDetails/Studio.tsx
index 01b2d7524..2140af340 100644
--- a/ui/v2.5/src/components/Studios/StudioDetails/Studio.tsx
+++ b/ui/v2.5/src/components/Studios/StudioDetails/Studio.tsx
@@ -375,10 +375,10 @@ const StudioPage: React.FC<IProps> = ({ studio, tabKey }) => {
       await deleteStudio();
     } catch (e) {
       Toast.error(e);
+      return;
     }
 
-    // redirect to studios page
-    history.push(`/studios`);
+    history.goBack();
   }
 
   function renderDeleteAlert() {
diff --git a/ui/v2.5/src/components/Tags/TagDetails/Tag.tsx b/ui/v2.5/src/components/Tags/TagDetails/Tag.tsx
index 94dda6950..7cded1934 100644
--- a/ui/v2.5/src/components/Tags/TagDetails/Tag.tsx
+++ b/ui/v2.5/src/components/Tags/TagDetails/Tag.tsx
@@ -417,10 +417,10 @@ const TagPage: React.FC<IProps> = ({ tag, tabKey }) => {
       });
     } catch (e) {
       Toast.error(e);
+      return;
     }
 
-    // redirect to tags page
-    history.push(`/tags`);
+    history.goBack();
   }
 
   function renderDeleteAlert() {