diff --git a/components/actors/merge.vue b/components/actors/merge.vue
index 28763d7..6a17ec7 100644
--- a/components/actors/merge.vue
+++ b/components/actors/merge.vue
@@ -4,14 +4,18 @@
@close="emit('close')"
>
+
#{{ actor.id }} {{ actor.name }} ({{ actor.entity.name }})
+
+
merging into
+
-
+
#{{ targetActor.id }}
{{ targetActor.name }}
-
+
@@ -89,13 +94,20 @@ async function searchActors() {
const res = await get('/actors', {
q: `${actorQuery.value}*`, // return partial matches
limit: 10,
+ global: true,
});
actorResults.value = res.actors;
}
async function merge() {
- console.log('MERGE', props.actor.id, targetActor.value.id);
+ await post(`/actors/${targetActor.value.id}/merge/${props.actor.id}`, null, {
+ successFeedback: `Merged ${props.actor.entity ? `${props.actor.name} (${props.actor.entity.name})` : props.actor.name} into ${targetActor.value.name}`,
+ errorFeedback: `Failed to merge ${props.actor.entity ? `${props.actor.name} (${props.actor.entity.name})` : props.actor.name} into ${targetActor.value.name}`,
+ appendErrorMessage: true,
+ });
+
+ emit('close');
}
function selectActor(actor) {
@@ -111,19 +123,27 @@ onMounted(() => {