From d9a87904ffad948046e21441cec884d3dfa15b13 Mon Sep 17 00:00:00 2001
From: Muhammed Mustafa <mustafa010199@gmail.com>
Date: Fri, 8 Jul 2022 13:31:35 +0530
Subject: [PATCH] fix/Fixed empty pills from appearing in lookup column,
 unwanted tables appearing in lookup dropdown and UI issue of sort

---
 .../project/spreadsheet/components/SortListMenu.vue        | 7 +++++--
 .../spreadsheet/components/editColumn/LookupOptions.vue    | 3 ++-
 .../spreadsheet/components/virtualCell/LookupCell.vue      | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/packages/nc-gui/components/project/spreadsheet/components/SortListMenu.vue b/packages/nc-gui/components/project/spreadsheet/components/SortListMenu.vue
index aafd143db9..5e3f72c598 100644
--- a/packages/nc-gui/components/project/spreadsheet/components/SortListMenu.vue
+++ b/packages/nc-gui/components/project/spreadsheet/components/SortListMenu.vue
@@ -1,7 +1,7 @@
 <template>
   <v-menu offset-y transition="slide-y-transition">
     <template #activator="{ on }">
-      <v-badge :value="sortList && sortList.length" color="primary" dot overlap>
+      <v-badge :value="validSortsExist" color="primary" dot overlap>
         <v-btn
           v-t="['c:sort']"
           class="nc-sort-menu-btn px-2 nc-remove-border"
@@ -10,7 +10,7 @@
           text
           outlined
           :class="{
-            'primary lighten-5 grey--text text--darken-3': sortList && sortList.length,
+            'primary lighten-5 grey--text text--darken-3': validSortsExist,
           }"
           v-on="on"
         >
@@ -98,6 +98,9 @@ export default {
           icon: getUIDTIcon(c.uidt),
         }));
     },
+    validSortsExist() {
+      return this.sortList && this.sortList.filter(sort => sort.fk_column_id !== null).length > 0;
+    },
   },
   watch: {
     value(v) {
diff --git a/packages/nc-gui/components/project/spreadsheet/components/editColumn/LookupOptions.vue b/packages/nc-gui/components/project/spreadsheet/components/editColumn/LookupOptions.vue
index 676ac6440d..7db223c373 100644
--- a/packages/nc-gui/components/project/spreadsheet/components/editColumn/LookupOptions.vue
+++ b/packages/nc-gui/components/project/spreadsheet/components/editColumn/LookupOptions.vue
@@ -75,7 +75,8 @@ export default {
           col: c.colOptions,
           column: c,
           ...this.tables.find(t => t.id === c.colOptions.fk_related_model_id),
-        }));
+        }))
+        .filter(table => table.col.fk_related_model_id === table.id && !table.mm);
 
       return refTables;
     },
diff --git a/packages/nc-gui/components/project/spreadsheet/components/virtualCell/LookupCell.vue b/packages/nc-gui/components/project/spreadsheet/components/virtualCell/LookupCell.vue
index 778b2ae83a..5177022a8b 100644
--- a/packages/nc-gui/components/project/spreadsheet/components/virtualCell/LookupCell.vue
+++ b/packages/nc-gui/components/project/spreadsheet/components/virtualCell/LookupCell.vue
@@ -141,7 +141,7 @@ export default {
     },
     localValueObj() {},
     localValue() {
-      return this.value && (Array.isArray(this.value) ? this.value : [this.value]);
+      return this.value && (Array.isArray(this.value) ? this.value : [this.value]).filter(v => v !== null);
     },
     queryParams() {},
   },