From 121c4ed71c327ce863c1db49ac02480992426fc9 Mon Sep 17 00:00:00 2001 From: mertmit Date: Sat, 24 Sep 2022 18:33:42 +0300 Subject: [PATCH] fix: show only tables within same base as child table for LTAR Signed-off-by: mertmit --- .../smartsheet/column/LinkedToAnotherRecordOptions.vue | 2 +- .../nc-gui/components/smartsheet/column/LookupOptions.vue | 2 +- .../nc-gui/components/smartsheet/column/RollupOptions.vue | 8 +++++++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/packages/nc-gui/components/smartsheet/column/LinkedToAnotherRecordOptions.vue b/packages/nc-gui/components/smartsheet/column/LinkedToAnotherRecordOptions.vue index e5840621e9..f137ed3edd 100644 --- a/packages/nc-gui/components/smartsheet/column/LinkedToAnotherRecordOptions.vue +++ b/packages/nc-gui/components/smartsheet/column/LinkedToAnotherRecordOptions.vue @@ -44,7 +44,7 @@ const refTables = $computed(() => { return [] } - return tables.filter((t) => t.type === ModelTypes.TABLE) + return tables.filter((t) => t.type === ModelTypes.TABLE && t.base_id === meta?.base_id) }) const filterOption = (value: string, option: { key: string }) => option.key.toLowerCase().includes(value.toLowerCase()) diff --git a/packages/nc-gui/components/smartsheet/column/LookupOptions.vue b/packages/nc-gui/components/smartsheet/column/LookupOptions.vue index 77279ae9f1..0667cc7b9f 100644 --- a/packages/nc-gui/components/smartsheet/column/LookupOptions.vue +++ b/packages/nc-gui/components/smartsheet/column/LookupOptions.vue @@ -34,7 +34,7 @@ const refTables = $computed(() => { } const _refTables = meta.columns - .filter((column) => column.uidt === UITypes.LinkToAnotherRecord && !column.system) + .filter((column) => column.uidt === UITypes.LinkToAnotherRecord && !column.system && column.base_id === meta?.base_id) .map((column) => ({ col: column.colOptions, column, diff --git a/packages/nc-gui/components/smartsheet/column/RollupOptions.vue b/packages/nc-gui/components/smartsheet/column/RollupOptions.vue index 960cbb7507..20e1a54333 100644 --- a/packages/nc-gui/components/smartsheet/column/RollupOptions.vue +++ b/packages/nc-gui/components/smartsheet/column/RollupOptions.vue @@ -47,7 +47,13 @@ const refTables = $computed(() => { } const _refTables = meta.columns - .filter((c) => c.uidt === UITypes.LinkToAnotherRecord && (c.colOptions as LinkToAnotherRecordType).type !== 'bt' && !c.system) + .filter( + (c) => + c.uidt === UITypes.LinkToAnotherRecord && + (c.colOptions as LinkToAnotherRecordType).type !== 'bt' && + !c.system && + c.base_id === meta?.base_id, + ) .map((c) => ({ col: c.colOptions, column: c,