Fix merge suggestions loading (#2048)

(cherry picked from commit 29d7e36)
CrowdDotDev · Jan 9, 2024 · fc9f438 · fc9f438
1 parent 112ab78
commit fc9f438
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 4 deletions.
diff --git a/frontend/src/modules/member/pages/member-merge-suggestions-page.vue b/frontend/src/modules/member/pages/member-merge-suggestions-page.vue
@@ -84,14 +84,20 @@
       <!-- Comparison -->
       <!-- Loading -->
       <div v-if="loading" class="flex p-5">
-        <div class="w-1/2 border rounded-l-lg">
+        <div class="w-1/3 border rounded-l-lg">
           <app-member-merge-suggestions-details
             :member="null"
             :loading="true"
             :is-primary="true"
           />
         </div>
-        <div class="w-1/2 -ml-px border rounded-r-lg">
+        <div class="w-1/3 -ml-px border rounded-r-lg">
+          <app-member-merge-suggestions-details
+            :member="null"
+            :loading="true"
+          />
+        </div>
+        <div class="w-1/3 ml-8 border rounded-lg bg-brand-25">
           <app-member-merge-suggestions-details
             :member="null"
             :loading="true"

diff --git a/frontend/src/modules/organization/pages/organization-merge-suggestions-page.vue b/frontend/src/modules/organization/pages/organization-merge-suggestions-page.vue
@@ -81,19 +81,26 @@
       <!-- Comparison -->
       <!-- Loading -->
       <div v-if="loading" class="flex p-5">
-        <div class="w-1/2 border rounded-l-lg">
+        <div class="w-1/3 border rounded-l-lg">
           <app-organization-merge-suggestions-details
             :organization="null"
             :loading="true"
             :is-primary="true"
           />
         </div>
-        <div class="w-1/2 -ml-px border rounded-r-lg">
+        <div class="w-1/3 -ml-px border rounded-r-lg">
           <app-organization-merge-suggestions-details
             :organization="null"
             :loading="true"
           />
         </div>
+
+        <div class="w-1/3 ml-8 border rounded-lg bg-brand-25">
+          <app-member-merge-suggestions-details
+            :member="null"
+            :loading="true"
+          />
+        </div>
       </div>
       <div v-else class="flex p-5">
         <div
@@ -150,6 +157,8 @@ import { useOrganizationStore } from '@/modules/organization/store/pinia';
 import { storeToRefs } from 'pinia';
 import { useRoute } from 'vue-router';
 import { merge } from 'lodash';
+import AppMemberMergeSuggestionsDetails
+  from '@/modules/member/components/suggestions/member-merge-suggestions-details.vue';
 import { OrganizationService } from '../organization-service';
 import { OrganizationPermissions } from '../organization-permissions';