From ed8743cd3263c5b0c9b03e7f6638fe063973188c Mon Sep 17 00:00:00 2001
From: musharaf-nocodb <musharaf@nocodb.com>
Date: Mon, 11 Dec 2023 11:06:30 +0530
Subject: [PATCH] fix : added select component in role selection

---
 packages/nc-gui/components/roles/Selector.vue | 81 ++++++++++---------
 1 file changed, 45 insertions(+), 36 deletions(-)

diff --git a/packages/nc-gui/components/roles/Selector.vue b/packages/nc-gui/components/roles/Selector.vue
index cb140c9fea..3b0301a2fa 100644
--- a/packages/nc-gui/components/roles/Selector.vue
+++ b/packages/nc-gui/components/roles/Selector.vue
@@ -2,6 +2,7 @@
 import { RoleDescriptions } from 'nocodb-sdk'
 import type { RoleLabels } from 'nocodb-sdk'
 import { toRef } from '#imports'
+import type { SelectValue } from 'ant-design-vue/es/select'
 
 const props = withDefaults(
   defineProps<{
@@ -21,47 +22,55 @@ const props = withDefaults(
 const roleRef = toRef(props, 'role')
 const inheritRef = toRef(props, 'inherit')
 const descriptionRef = toRef(props, 'description')
+const isDropdownOpen = ref(false)
+const dropdownRef = ref(null)
 const sizeRef = toRef(props, 'size')
+
+onClickOutside(dropdownRef, () => (isDropdownOpen.value = false))
+
+function onChangeRole(val: SelectValue) {
+  props.onRoleChange(val as keyof typeof RoleLabels)
+  isDropdownOpen.value = false
+}
 </script>
 
 <template>
-  <NcDropdown size="lg" class="nc-roles-selector">
-    <RolesBadge data-testid="roles" :role="roleRef" :inherit="inheritRef === role" clickable :size="sizeRef" />
-    <template #overlay>
-      <div class="nc-role-select-dropdown flex flex-col gap-1 p-2">
-        <div class="flex flex-col gap-1">
-          <div
-            v-for="rl in props.roles"
-            :key="rl"
-            v-e="['c:workspace:settings:user-role-change']"
-            :value="rl"
-            :selected="rl === roleRef"
-            @click="props.onRoleChange(rl)"
-          >
-            <div
-              class="flex flex-col py-1.5 rounded-lg px-2 gap-1 bg-transparent cursor-pointer hover:bg-gray-100"
-              :class="{
-                'w-[350px]': descriptionRef,
-                'w-[200px]': !descriptionRef,
-              }"
-            >
-              <div class="flex items-center justify-between">
-                <RolesBadge
-                  class="!bg-white hover:!bg-gray-100"
-                  :class="`nc-role-select-${rl}`"
-                  :role="rl"
-                  :inherit="inheritRef === rl"
-                  :border="false"
-                />
-                <GeneralIcon v-if="rl === roleRef" icon="check" class="text-primary"/>
-              </div>
-              <div v-if="descriptionRef" class="text-gray-500">{{ RoleDescriptions[rl] }}</div>
-            </div>
+  <div size="lg" ref="dropdownRef" class="nc-roles-selector relative" @click="isDropdownOpen = !isDropdownOpen">
+    <RolesBadge data-testid="roles" :role="roleRef" :inherit="inheritRef === role" :size="sizeRef" />
+    <a-select
+      v-model:value="roleRef"
+      :open="isDropdownOpen"
+      :dropdown-match-select-width="false"
+      dropdown-class-name="!rounded-lg  !h-fit max-w-64"
+      class="py-1 !absolute top-0 left-0 w-full h-full z-10 text-xs opacity-0"
+      @change="onChangeRole"
+    >
+      <a-select-option
+        v-for="rl in props.roles"
+        :key="rl"
+        v-e="['c:workspace:settings:user-role-change']"
+        :value="rl"
+      >
+        <div
+          :class="{
+            'w-[350px]': descriptionRef,
+            'w-[200px]': !descriptionRef,
+          }"
+          class="flex flex-col nc-role-select-dropdown gap-1"
+        >
+          <div class="flex items-center justify-between">
+            <RolesBadge :class="`nc-role-select-${rl}`" :role="rl" :inherit="inheritRef === rl" :border="false" />
+            <GeneralIcon v-if="rl === roleRef" icon="check" class="text-primary" />
           </div>
+          <div v-if="descriptionRef" class="text-gray-500">{{ RoleDescriptions[rl] }}</div>
         </div>
-      </div>
-    </template>
-  </NcDropdown>
+      </a-select-option>
+    </a-select>
+  </div>
 </template>
 
-<style scoped lang="scss"></style>
+<style lang="scss">
+.ant-select-item-option-content {
+  white-space: normal; /* Change from 'nowrap' to 'normal' */
+}
+</style>