From b465c36fc78aa454af2d8dcdc6e03779efbcc420 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Wed, 29 Jul 2020 11:51:20 +1000
Subject: [PATCH] Fix tag delete (#690)

* Fix tag list delete button not working
* Fix tags not refreshed when created/deleted
---
 ui/v2.5/src/components/Tags/TagList.tsx | 30 ++++++++++++-------------
 ui/v2.5/src/core/StashService.ts        | 10 +++++----
 2 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/ui/v2.5/src/components/Tags/TagList.tsx b/ui/v2.5/src/components/Tags/TagList.tsx
index a65b397ca..80d48471a 100644
--- a/ui/v2.5/src/components/Tags/TagList.tsx
+++ b/ui/v2.5/src/components/Tags/TagList.tsx
@@ -10,8 +10,8 @@ import { mutateMetadataAutoTag, useTagDestroy } from "src/core/StashService";
 import { useToast } from "src/hooks";
 import { FormattedNumber } from "react-intl";
 import { NavUtils } from "src/utils";
+import { Icon, Modal } from "src/components/Shared";
 import { TagCard } from "./TagCard";
-import { Icon, Modal } from "../Shared";
 
 interface ITagList {
   filterHook?: (filter: ListFilterModel) => ListFilterModel;
@@ -60,20 +60,6 @@ export const TagList: React.FC<ITagList> = ({ filterHook }) => {
     }
   }
 
-  const deleteAlert = (
-    <Modal
-      onHide={() => {}}
-      show={!!deletingTag}
-      icon="trash-alt"
-      accept={{ onClick: onDelete, variant: "danger", text: "Delete" }}
-      cancel={{ onClick: () => setDeletingTag(null) }}
-    >
-      <span>
-        Are you sure you want to delete {deletingTag && deletingTag.name}?
-      </span>
-    </Modal>
-  );
-
   function renderContent(
     result: FindTagsQueryResult,
     filter: ListFilterModel,
@@ -92,6 +78,20 @@ export const TagList: React.FC<ITagList> = ({ filterHook }) => {
       );
     }
     if (filter.displayMode === DisplayMode.List) {
+      const deleteAlert = (
+        <Modal
+          onHide={() => {}}
+          show={!!deletingTag}
+          icon="trash-alt"
+          accept={{ onClick: onDelete, variant: "danger", text: "Delete" }}
+          cancel={{ onClick: () => setDeletingTag(null) }}
+        >
+          <span>
+            Are you sure you want to delete {deletingTag && deletingTag.name}?
+          </span>
+        </Modal>
+      );
+
       const tagElements = result.data.findTags.tags.map((tag) => {
         return (
           <div key={tag.id} className="tag-list-row row">
diff --git a/ui/v2.5/src/core/StashService.ts b/ui/v2.5/src/core/StashService.ts
index b55c34b91..fffae348e 100644
--- a/ui/v2.5/src/core/StashService.ts
+++ b/ui/v2.5/src/core/StashService.ts
@@ -334,23 +334,25 @@ export const tagMutationImpactedQueries = [
   "findSceneMarkers",
   "sceneMarkerTags",
   "allTags",
+  "findTags",
 ];
 
 export const useTagCreate = (input: GQL.TagCreateInput) =>
   GQL.useTagCreateMutation({
     variables: input,
-    refetchQueries: ["AllTags", "AllTagsForFilter"],
-    // update: () => StashService.invalidateQueries(StashService.tagMutationImpactedQueries)
+    refetchQueries: ["AllTags", "AllTagsForFilter", "FindTags"],
+    update: () => invalidateQueries(tagMutationImpactedQueries),
   });
 export const useTagUpdate = (input: GQL.TagUpdateInput) =>
   GQL.useTagUpdateMutation({
     variables: input,
-    refetchQueries: ["AllTags", "AllTagsForFilter"],
+    refetchQueries: ["AllTags", "AllTagsForFilter", "FindTags"],
+    update: () => invalidateQueries(tagMutationImpactedQueries),
   });
 export const useTagDestroy = (input: GQL.TagDestroyInput) =>
   GQL.useTagDestroyMutation({
     variables: input,
-    refetchQueries: ["AllTags", "AllTagsForFilter"],
+    refetchQueries: ["AllTags", "AllTagsForFilter", "FindTags"],
     update: () => invalidateQueries(tagMutationImpactedQueries),
   });