From 726064ded55b9d150813829077ed4e47f18f1083 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Tue, 26 Apr 2022 12:13:44 +0530
Subject: [PATCH] refactor: show LTAR column name instead of table name in
 Lookup/Rollup

re #1811 #1768

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 .../spreadsheet/components/editColumn/lookupOptions.vue      | 5 +++--
 .../spreadsheet/components/editColumn/rollupOptions.vue      | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

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 0606047029..2484e2a6bc 100644
--- a/packages/nc-gui/components/project/spreadsheet/components/editColumn/lookupOptions.vue
+++ b/packages/nc-gui/components/project/spreadsheet/components/editColumn/lookupOptions.vue
@@ -18,9 +18,9 @@
             dense
           >
             <template #item="{item}">
-              <span class="caption"><span class="font-weight-bold"> {{
+              <span class="caption"><span class="font-weight-bold">{{ item.column.title }}</span> <small>({{ relationNames[item.col.type] }} {{
                 item.title || item.table_name
-              }}</span> <small>({{ relationNames[item.col.type] }})
+              }})
               </small></span>
             </template>
           </v-autocomplete>
@@ -74,6 +74,7 @@ export default {
         c.uidt === UITypes.LinkToAnotherRecord && !c.system
       ).map(c => ({
         col: c.colOptions,
+        column: c,
         ...this.tables.find(t => t.id === c.colOptions.fk_related_model_id)
       }))
 
diff --git a/packages/nc-gui/components/project/spreadsheet/components/editColumn/rollupOptions.vue b/packages/nc-gui/components/project/spreadsheet/components/editColumn/rollupOptions.vue
index bae2ede28d..73b9f445c9 100644
--- a/packages/nc-gui/components/project/spreadsheet/components/editColumn/rollupOptions.vue
+++ b/packages/nc-gui/components/project/spreadsheet/components/editColumn/rollupOptions.vue
@@ -18,9 +18,9 @@
             dense
           >
             <template #item="{item}">
-              <span class="caption"><span class="font-weight-bold"> {{
+              <span class="caption"><span class="font-weight-bold">{{ item.column.title }}</span> <small>({{ relationNames[item.col.type] }} {{
                 item.title || item.table_name
-              }}</span> <small>({{ relationNames[item.col.type] }})
+              }})
               </small></span>
             </template>
           </v-autocomplete>
@@ -98,6 +98,7 @@ export default {
         c.uidt === UITypes.LinkToAnotherRecord && c.colOptions.type !== 'bt' && !c.system
       ).map(c => ({
         col: c.colOptions,
+        column: c,
         ...this.tables.find(t => t.id === c.colOptions.fk_related_model_id)
       }))