0.51.22

components/actors/merge.vue

@@ -17,6 +17,7 @@ const emit = defineEmits(['close', 'merged']);
 
 const targetActor = ref(null);
 const actorInput = ref(null);
+const comment = ref(null);
 const actorQuery = ref('');
 const actorResults = ref([]);
 const submitted = ref(false);
@@ -51,7 +52,9 @@ function getActorNames() {
 async function merge() {
 	submitted.value = true;
 
-	await post(`/actors/${targetActor.value.id}/merge/${props.actors.map((actor) => actor.id).join(',')}`, null, {
+	await post(`/actors/${targetActor.value.id}/merge/${props.actors.map((actor) => actor.id).join(',')}`, {
+		comment: comment.value || null,
+	}, {
 		successFeedback: `Merged ${getActorNames()} into ${targetActor.value.name}`,
 		errorFeedback: `Failed to merge ${getActorNames()} into ${targetActor.value.name}`,
 		appendErrorMessage: true,
@@ -173,6 +176,13 @@ onMounted(() => {
 				</VDropdown>
 			</template>
 
+			<textarea
+				v-model="comment"
+				placeholder="Optional comment"
+				rows="2"
+				class="input comment"
+			/>
+
 			<div class="dialog-actions">
 				<Ellipsis v-if="submitted" />
 
@@ -216,6 +226,10 @@ onMounted(() => {
 
 .input {
 	width: 100%;
+
+	&.comment {
+		flex-basis: auto;
+	}
 }
 
 .path {

package-lock.json

@@ -1,11 +1,11 @@
 {
   "name": "traxxx-web",
-  "version": "0.51.21",
+  "version": "0.51.22",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
-      "version": "0.51.21",
+      "version": "0.51.22",
       "dependencies": {
         "@brillout/json-serializer": "^0.5.25",
         "@dicebear/collection": "7.0.5",

package.json

@@ -87,7 +87,7 @@
   "overrides": {
     "vite": "$vite"
   },
-  "version": "0.51.21",
+  "version": "0.51.22",
   "imports": {
     "#/*": "./*.js"
   },

src/actors.js

@@ -809,7 +809,7 @@ export async function createActor(newActor, context, reqUser) {
 	return curateActor(actorEntry);
 }
 
-export async function mergeActors(targetActorId, sourceActorIds, reqUser) {
+export async function mergeActors(targetActorId, sourceActorIds, comment, reqUser) {
 	if (!verifyAbility(reqUser, 'actor', 'merge')) {
 		throw new HttpError('You are not permitted to merge actors', 403);
 	}
@@ -981,6 +981,7 @@ export async function mergeActors(targetActorId, sourceActorIds, reqUser) {
 					base: baseTargetActor,
 					deltas: targetDeltas,
 				}),
+				comment,
 				reviewed_by: reqUser.id,
 				reviewed_at: knex.fn.now(),
 				applied_at: knex.fn.now(),
@@ -1009,6 +1010,7 @@ export async function mergeActors(targetActorId, sourceActorIds, reqUser) {
 						base: baseSourceActor,
 						deltas: targetDeltas,
 					}),
+					comment,
 					reviewed_by: reqUser.id,
 					reviewed_at: knex.fn.now(),
 					applied_at: knex.fn.now(),

src/web/actors.js

@@ -192,7 +192,12 @@ export async function createActorApi(req, res) {
 }
 
 export async function mergeActorsApi(req, res) {
-	const result = await mergeActors(Number(req.params.targetActorId), req.params.sourceActorIds.split(',').map((actorId) => Number(actorId)), req.user);
+	const result = await mergeActors(
+		Number(req.params.targetActorId),
+		req.params.sourceActorIds.split(',').map((actorId) => Number(actorId)),
+		req.body.comment,
+		req.user,
+	);
 
 	res.send(result);
 }