Merge remote-tracking branch 'origin/improvement/merge-suggestions-bt…

…n-permissions' into lf-staging-main
CrowdDotDev · Jan 16, 2024 · 48c47df · 48c47df
2 parents db531fb + 571f66a
commit 48c47df
Show file tree

Hide file tree

Showing 4 changed files with 83 additions and 54 deletions.
diff --git a/frontend/src/modules/member/components/member-actions.vue b/frontend/src/modules/member/components/member-actions.vue
@@ -11,14 +11,15 @@
         placement="top"
         :disabled="hasPermissionsToMerge"
       >
-        <el-button
-          v-if="mergeSuggestionsCount > 0"
-          class="btn btn--bordered btn--sm !h-8 !-ml-px !-mr-0.5 !bg-brand-25"
-          :disabled="isEditLockedForSampleData || !hasPermissionsToMerge"
-          @click="mergeSuggestions()"
-        >
-          <span class="mr-2 h-5 px-1.5 rounded-md bg-brand-100 text-brand-500 leading-5">{{ mergeSuggestionsCount }}</span>Merge suggestion
-        </el-button>
+        <span>
+          <el-button
+            class="btn btn--bordered btn--sm !h-8 !-ml-px !-mr-0.5 !bg-brand-25 !rounded-l-none"
+            :disabled="isEditLockedForSampleData || !hasPermissionsToMerge"
+            @click="mergeSuggestions()"
+          >
+            <span class="mr-2 h-5 px-1.5 rounded-md bg-brand-100 text-brand-500 leading-5">{{ mergeSuggestionsCount }}</span>Merge suggestion
+          </el-button>
+        </span>
       </el-tooltip>
 
       <el-tooltip
@@ -27,13 +28,15 @@
         placement="top"
         :disabled="hasPermissionsToMerge"
       >
-        <el-button
-          class="btn btn--bordered btn--sm !h-8 !-ml-px !-mr-0.5"
-          :disabled="isEditLockedForSampleData || !hasPermissionsToMerge"
-          @click="merge()"
-        >
-          <span class="ri-shuffle-line text-base mr-2" />Merge
-        </el-button>
+        <span>
+          <el-button
+            class="btn btn--bordered btn--sm !h-8 !-ml-px !-mr-0.5 !rounded-l-none"
+            :disabled="isEditLockedForSampleData || !hasPermissionsToMerge"
+            @click="merge()"
+          >
+            <span class="ri-shuffle-line text-base mr-2" />Merge
+          </el-button>
+        </span>
       </el-tooltip>
 
       <app-member-dropdown

diff --git a/frontend/src/modules/member/components/member-dropdown-content.vue b/frontend/src/modules/member/components/member-dropdown-content.vue
@@ -36,20 +36,27 @@
     ><i class="ri-github-fill" /></span>
     <span class="ml-2 text-xs"> Find GitHub </span>
   </button>
-  <button
+
+  <el-tooltip
     v-if="!props.hideMerge"
-    class="h-10 el-dropdown-menu__item w-full"
-    :disabled="isEditLockedForSampleData"
-    type="button"
-    @click="
-      handleCommand({
-        action: Actions.MERGE_CONTACT,
-        member,
-      })
-    "
+    content="Coming soon"
+    placement="top"
+    :disabled="hasPermissionsToMerge"
   >
-    <i class="ri-group-line text-base mr-2" /><span class="text-xs">Merge contributor</span>
-  </button>
+    <button
+      class="h-10 el-dropdown-menu__item w-full"
+      :disabled="isEditLockedForSampleData || !hasPermissionsToMerge"
+      type="button"
+      @click="
+        handleCommand({
+          action: Actions.MERGE_CONTACT,
+          member,
+        })
+      "
+    >
+      <i class="ri-group-line text-base mr-2" /><span class="text-xs">Merge contributor</span>
+    </button>
+  </el-tooltip>
   <a
     class="h-10 el-dropdown-menu__item"
     href="https://app.formbricks.com/s/clr4u0mp29k228up0nh9yurm5"
@@ -240,6 +247,11 @@ const isDeleteLockedForSampleData = computed(
     .destroyLockedForSampleData,
 );
 
+const hasPermissionsToMerge = computed(() => new MemberPermissions(
+  currentTenant.value,
+  currentUser.value,
+)?.mergeMembers);
+
 const isSyncingWithHubspot = computed(
   () => props.member.attributes?.syncRemote?.hubspot || false,
 );

diff --git a/frontend/src/modules/organization/components/organization-actions.vue b/frontend/src/modules/organization/components/organization-actions.vue
@@ -11,14 +11,15 @@
         placement="top"
         :disabled="hasPermissionsToMerge"
       >
-        <el-button
-          v-if="mergeSuggestionsCount > 0"
-          class="btn btn--sm !h-8 !-ml-px !-mr-0.5 !bg-brand-25"
-          :disabled="isEditLockedForSampleData || !hasPermissionsToMerge"
-          @click="mergeSuggestions()"
-        >
-          <span class="mr-2 h-5 px-1.5 rounded-md bg-brand-100 text-brand-500 leading-5">{{ mergeSuggestionsCount }}</span>Merge suggestion
-        </el-button>
+        <span>
+          <el-button
+            class="btn btn--sm !h-8 !-ml-px !-mr-0.5 !bg-brand-25 !rounded-l-none"
+            :disabled="isEditLockedForSampleData || !hasPermissionsToMerge"
+            @click="mergeSuggestions()"
+          >
+            <span class="mr-2 h-5 px-1.5 rounded-md bg-brand-100 text-brand-500 leading-5">{{ mergeSuggestionsCount }}</span>Merge suggestion
+          </el-button>
+        </span>
       </el-tooltip>
 
       <el-tooltip
@@ -27,13 +28,15 @@
         placement="top"
         :disabled="hasPermissionsToMerge"
       >
-        <el-button
-          class="btn btn--bordered btn--sm !h-8 !-ml-px !-mr-0.5"
-          :disabled="isEditLockedForSampleData || !hasPermissionsToMerge"
-          @click="merge()"
-        >
-          <span class="ri-shuffle-line text-base mr-2" />Merge
-        </el-button>
+        <span>
+          <el-button
+            class="btn btn--bordered btn--sm !h-8 !-ml-px !-mr-0.5 !rounded-l-none"
+            :disabled="isEditLockedForSampleData || !hasPermissionsToMerge"
+            @click="merge()"
+          >
+            <span class="ri-shuffle-line text-base mr-2" />Merge
+          </el-button>
+        </span>
       </el-tooltip>
       <app-organization-dropdown
         :organization="props.organization"

diff --git a/frontend/src/modules/organization/components/organization-dropdown-content.vue b/frontend/src/modules/organization/components/organization-dropdown-content.vue
@@ -25,20 +25,26 @@
   </router-link>
 
   <!-- Merge organization -->
-  <button
+  <el-tooltip
     v-if="!hideMerge"
-    class="h-10 el-dropdown-menu__item w-full"
-    type="button"
-    :disabled="isEditLockedForSampleData"
-    @click="
-      handleCommand({
-        action: Actions.MERGE_ORGANIZATION,
-        organization,
-      })
-    "
+    content="Coming soon"
+    placement="top"
+    :disabled="hasPermissionsToMerge"
   >
-    <i class="ri-shuffle-line text-base mr-2" /><span class="text-xs">Merge organization</span>
-  </button>
+    <button
+      class="h-10 el-dropdown-menu__item w-full"
+      type="button"
+      :disabled="isEditLockedForSampleData || !hasPermissionsToMerge"
+      @click="
+        handleCommand({
+          action: Actions.MERGE_ORGANIZATION,
+          organization,
+        })
+      "
+    >
+      <i class="ri-shuffle-line text-base mr-2" /><span class="text-xs">Merge organization</span>
+    </button>
+  </el-tooltip>
 
   <!-- Hubspot -->
   <button
@@ -196,6 +202,11 @@ const isDeleteLockedForSampleData = computed(
     .destroyLockedForSampleData,
 );
 
+const hasPermissionsToMerge = computed(() => new OrganizationPermissions(
+  currentTenant.value,
+  currentUser.value,
+)?.mergeOrganizations);
+
 const isSyncingWithHubspot = (organization: Organization) => organization.attributes?.syncRemote?.hubspot || false;
 
 const isHubspotConnected = computed(() => {