0.50.10

package-lock.json

@@ -1,11 +1,11 @@
 {
   "name": "traxxx-web",
-  "version": "0.50.9",
+  "version": "0.50.10",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
-      "version": "0.50.9",
+      "version": "0.50.10",
       "dependencies": {
         "@brillout/json-serializer": "^0.5.8",
         "@dicebear/collection": "^7.0.5",

package.json

@@ -92,7 +92,7 @@
   "overrides": {
     "vite": "$vite"
   },
-  "version": "0.50.9",
+  "version": "0.50.10",
   "imports": {
     "#/*": "./*.js"
   }

pages/admin/actors/+Page.vue

@@ -88,13 +88,16 @@
 								v-tooltip="'Merge'"
 								icon="make-group"
 								class="actor-action action-merge"
+								@click="activeActor = actor; showMergeDialog = true;"
 							/>
 
+							<!--
 							<Icon
 								v-tooltip="'Delete'"
 								icon="bin"
 								class="actor-action action-delete"
 							/>
+							-->
 						</div>
 					</td>
 				</tr>
@@ -103,9 +106,8 @@
 
 		<Merge
 			v-if="showMergeDialog"
-			:actor="actors[0]"
+			:actors="activeActor ? [activeActor] : actors.filter((actor) => selectedActors.has(actor.id))"
-			:actors="actors.filter((actor) => selectedActors.has(actor.id))"
+			@close="showMergeDialog = false; activeActor = null;"
-			@close="showMergeDialog = false"
 		/>
 	</Admin>
 </template>
@@ -125,14 +127,13 @@ const { pageProps, urlParsed } = inject('pageContext');
 
 const actors = ref(pageProps.actors);
 const selectedActors = ref(new Set([]));
+const activeActor = ref(null);
 const actorQuery = ref(urlParsed.search.q || null);
 
 const lastSelectedIndex = ref(null);
 const holdingShift = ref(false);
 const showMergeDialog = ref(false);
 
-console.log(actors.value);
-
 function selectActors(selectedActor, isChecked, index) {
 	const [start, end] = holdingShift.value
 		? [index, lastSelectedIndex.value].toSorted((indexA, indexB) => indexA - indexB)