Primary is set before merging (#1754)

(cherry picked from commit a4bac6f)

Author: gaspergrom

frontend/src/modules/member/pages/member-merge-suggestions-page.vue

@@ -209,8 +209,9 @@ const fetch = (page) => {
       count.value = res.count;
       [membersToMerge.value] = res.rows;
       const { members } = membersToMerge.value;
+      primary.value = 0;
       // Set member with maximum identities and activities as primary
-      if (members.length > 2 && ((members[0].identities.length < members[1].identities.length)
+      if (members.length >= 2 && ((members[0].identities.length < members[1].identities.length)
         || (members[0].activityCount < members[1].activityCount))) {
         primary.value = 1;
       }
@@ -248,17 +249,17 @@ const mergeSuggestion = () => {
     return;
   }
   sendingMerge.value = true;
-  primary.value = 0;
   MemberService.merge(
     membersToMerge.value.members[primary.value],
     membersToMerge.value.members[(primary.value + 1) % 2],
   )
     .then(() => {
-      Message.success('Members merged successfuly');
+      primary.value = 0;
+      Message.success('Contributors merged successfuly');
       fetch();
     })
     .catch(() => {
-      Message.error('There was an error merging members');
+      Message.error('There was an error merging contributors');
     })
     .finally(() => {
       sendingMerge.value = false;

frontend/src/modules/organization/pages/organization-merge-suggestions-page.vue

@@ -203,6 +203,7 @@ const fetch = (page) => {
       const { organizations } = organizationsToMerge.value;
       // Set organization with maximum identities and activities as primary
       const [firstOrganization, secondOrganization] = organizations;
+      primary.value = 0;
       if (firstOrganization && secondOrganization && ((firstOrganization.identities.length < secondOrganization.identities.length)
         || (firstOrganization.activityCount < secondOrganization.activityCount))) {
         primary.value = 1;
@@ -241,12 +242,12 @@ const mergeSuggestion = () => {
     return;
   }
   sendingMerge.value = true;
-  primary.value = 0;
   OrganizationService.mergeOrganizations(
     organizationsToMerge.value.organizations[primary.value].id,
     organizationsToMerge.value.organizations[(primary.value + 1) % 2].id,
   )
     .then(() => {
+      primary.value = 0;
       Message.success('Organizations merged successfuly');
       fetch();
     })