[record-merging] Create event for record-merging

This fixes a bug in which the Merging Dialog was closing right when beginning the merge for exactly two agents.
specify · Aug 14, 2023 · bc9fb10 · bc9fb10
1 parent 7a2ee15
commit bc9fb10
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/specifyweb/frontend/js_src/lib/components/DataModel/resource.ts b/specifyweb/frontend/js_src/lib/components/DataModel/resource.ts
@@ -24,6 +24,10 @@ import type { Tables } from './types';
 
 // FEATURE: use this everywhere
 export const resourceEvents = eventListener<{
+  readonly merged: [
+    source: SpecifyResource<AnySchema>,
+    target: SpecifyResource<AnySchema>
+  ];
   readonly deleted: SpecifyResource<AnySchema>;
 }>();
 

diff --git a/specifyweb/frontend/js_src/lib/components/Merging/index.tsx b/specifyweb/frontend/js_src/lib/components/Merging/index.tsx
@@ -76,7 +76,7 @@ export function RecordMergingLink({
 
   React.useEffect(
     () =>
-      resourceEvents.on('deleted', (resource) => {
+      resourceEvents.on('merged', ([resource]) => {
         needUpdateQueryResults.current = true;
         handleDeleted(resource.id);
       }),
@@ -111,8 +111,10 @@ export function MergingDialog(): JSX.Element | null {
   );
   React.useEffect(
     () =>
-      resourceEvents.on('deleted', (resource) =>
-        setIds(ids.filter((id) => id !== resource.id).join(','))
+      resourceEvents.on('merged', ([resource, target]) =>
+        setIds(
+          ids.filter((id) => id !== resource.id || id !== target.id).join(',')
+        )
       ),
     [ids, setIds]
   );
@@ -252,7 +254,7 @@ function Merging({
                * (the RecordMergingLink component is listening to the event)
                */
               for (const clone of clones) {
-                resourceEvents.trigger('deleted', clone);
+                resourceEvents.trigger('merged', [clone, target]);
               }
             })
           );