refactor: apply all LTAR behaviour to Links

Signed-off-by: Pranav C <pranavxc@gmail.com>

packages/nc-gui/components/erd/TableNode.vue

@@ -2,7 +2,7 @@
 import type { NodeProps } from '@vue-flow/core'
 import { Handle, Position, useVueFlow } from '@vue-flow/core'
 import type { LinkToAnotherRecordType } from 'nocodb-sdk'
-import { UITypes, isVirtualCol } from 'nocodb-sdk'
+import { isLinksOrLTAR, isVirtualCol } from 'nocodb-sdk'
 import type { NodeData } from './utils'
 import { MetaInj, computed, provide, refAutoReset, toRef, useNuxtApp, watch } from '#imports'
 
@@ -86,7 +86,7 @@ watch(
             :class="index + 1 === data.nonPkColumns.length ? 'rounded-b-lg' : 'border-b-1'"
           >
             <div
-              v-if="col.uidt === UITypes.LinkToAnotherRecord"
+              v-if="isLinksOrLTAR(col)"
               class="flex w-full"
               :class="`nc-erd-table-node-${table.table_name}-column-${col.title?.toLowerCase().replace(' ', '_')}`"
             >

packages/nc-gui/components/erd/View.vue

@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import type { LinkToAnotherRecordType, TableType } from 'nocodb-sdk'
-import { UITypes } from 'nocodb-sdk'
+import { UITypes, isLinksOrLTAR } from 'nocodb-sdk'
 import type { ERDConfig } from './utils'
 import { reactive, ref, storeToRefs, useMetas, useProject, watch } from '#imports'
 
@@ -42,9 +42,7 @@ const populateTables = async () => {
       (t) =>
         t.id === props.table?.id ||
         props.table?.columns?.find(
-          (column) =>
-            column.uidt === UITypes.LinkToAnotherRecord &&
-            (column.colOptions as LinkToAnotherRecordType)?.fk_related_model_id === t.id,
+          (column) => isLinksOrLTAR(column.uidt) && (column.colOptions as LinkToAnotherRecordType)?.fk_related_model_id === t.id,
         ),
     )
   } else {

packages/nc-gui/components/erd/utils.ts

@@ -1,5 +1,5 @@
 import type { ColumnType, LinkToAnotherRecordType, TableType } from 'nocodb-sdk'
-import { UITypes } from 'nocodb-sdk'
+import { UITypes, isLinksOrLTAR } from 'nocodb-sdk'
 import dagre from 'dagre'
 import type { Edge, EdgeMarker, Elements, Node } from '@vue-flow/core'
 import type { MaybeRef } from '@vueuse/core'
@@ -73,8 +73,7 @@ export function useErdElements(tables: MaybeRef<TableType[]>, props: MaybeRef<ER
   const relations = computed(() =>
     erdTables.value.reduce((acc, table) => {
       const meta = metasWithIdAsKey.value[table.id!]
-      const columns =
-        meta.columns?.filter((column: ColumnType) => column.uidt === UITypes.LinkToAnotherRecord && column.system !== 1) || []
+      const columns = meta.columns?.filter((column: ColumnType) => isLinksOrLTAR(column) && column.system !== 1) || []
 
       columns.forEach((column: ColumnType) => {
         const colOptions = column.colOptions as LinkToAnotherRecordType

packages/nc-gui/components/smartsheet/Form.vue

@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import Draggable from 'vuedraggable'
-import { RelationTypes, UITypes, ViewTypes, getSystemColumns, isVirtualCol } from 'nocodb-sdk'
+import { RelationTypes, UITypes, ViewTypes, getSystemColumns, isLinksOrLTAR, isVirtualCol } from 'nocodb-sdk'
 import {
   ActiveViewInj,
   IsFormInj,
@@ -148,7 +148,7 @@ function isDbRequired(column: Record<string, any>) {
       // confirm it's not foreign key
       !columns.value.some(
         (c: Record<string, any>) =>
-          c.uidt === UITypes.LinkToAnotherRecord &&
+          isLinksOrLTAR(c.uidt) &&
           c?.colOptions?.type === RelationTypes.BELONGS_TO &&
           column.fk_column_id === c.colOptions.fk_child_column_id,
       )) ||
@@ -297,11 +297,7 @@ function setFormData() {
 
 function isRequired(_columnObj: Record<string, any>, required = false) {
   let columnObj = _columnObj
-  if (
-    columnObj.uidt === UITypes.LinkToAnotherRecord &&
-    columnObj.colOptions &&
-    columnObj.colOptions.type === RelationTypes.BELONGS_TO
-  ) {
+  if (isLinksOrLTAR(columnObj.uidt) && columnObj.colOptions && columnObj.colOptions.type === RelationTypes.BELONGS_TO) {
     columnObj = columns.value.find((c: Record<string, any>) => c.id === columnObj.colOptions.fk_child_column_id) as Record<
       string,
       any

packages/nc-gui/components/smartsheet/Grid.vue

@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 import { nextTick } from '@vue/runtime-core'
 import type { ColumnReqType, ColumnType, GridType, PaginatedType, TableType, ViewType } from 'nocodb-sdk'
-import { UITypes, isSystemColumn, isVirtualCol } from 'nocodb-sdk'
+import { UITypes, isLinksOrLTAR, isSystemColumn, isVirtualCol } from 'nocodb-sdk'
 import {
   ActiveViewInj,
   CellUrlDisableOverlayInj,
@@ -491,12 +491,7 @@ watch(contextMenu, () => {
 const rowRefs = $ref<any[]>()
 
 async function clearCell(ctx: { row: number; col: number } | null, skipUpdate = false) {
-  if (
-    !ctx ||
-    !hasEditPermission ||
-    (fields.value[ctx.col].uidt !== UITypes.LinkToAnotherRecord && isVirtualCol(fields.value[ctx.col]))
-  )
-    return
+  if (!ctx || !hasEditPermission || (isLinksOrLTAR(fields.value[ctx.col]) && isVirtualCol(fields.value[ctx.col]))) return
 
   const rowObj = data.value[ctx.row]
   const columnObj = fields.value[ctx.col]
@@ -1133,8 +1128,7 @@ function addEmptyRow(row?: number) {
               v-if="
                 contextMenuTarget &&
                 selectedRange.isSingleCell() &&
-                (fields[contextMenuTarget.col].uidt === UITypes.LinkToAnotherRecord ||
-                  !isVirtualCol(fields[contextMenuTarget.col]))
+                (isLinksOrLTAR(fields[contextMenuTarget.col]) || !isVirtualCol(fields[contextMenuTarget.col]))
               "
               @click="clearCell(contextMenuTarget)"
             >

packages/nc-gui/components/smartsheet/VirtualCell.vue

@@ -14,11 +14,11 @@ import {
   isCount,
   isFormula,
   isHm,
+  isLink,
   isLookup,
   isMm,
   isQrCode,
   isRollup,
-  isLink,
   provide,
   toRef,
 } from '#imports'

packages/nc-gui/components/smartsheet/column/EditOrAdd.vue

@@ -209,13 +209,10 @@ useEventListener('keydown', (e: KeyboardEvent) => {
         <LazySmartsheetColumnDateTimeOptions v-if="formState.uidt === UITypes.DateTime" v-model:value="formState" />
         <LazySmartsheetColumnRollupOptions v-if="formState.uidt === UITypes.Rollup" v-model:value="formState" />
         <LazySmartsheetColumnLinkedToAnotherRecordOptions
-          v-if="!isEdit && (formState.uidt === UITypes.LinkToAnotherRecord||formState.uidt === UITypes.Links)"
-          v-model:value="formState"
-        />
-        <LazySmartsheetColumnLinkOptions
-          v-if="isEdit && formState.uidt === UITypes.Links"
+          v-if="!isEdit && (formState.uidt === UITypes.LinkToAnotherRecord || formState.uidt === UITypes.Links)"
           v-model:value="formState"
         />
+        <LazySmartsheetColumnLinkOptions v-if="isEdit && formState.uidt === UITypes.Links" v-model:value="formState" />
         <LazySmartsheetColumnSpecificDBTypeOptions v-if="formState.uidt === UITypes.SpecificDBType" />
         <LazySmartsheetColumnSelectOptions
           v-if="formState.uidt === UITypes.SingleSelect || formState.uidt === UITypes.MultiSelect"

packages/nc-gui/components/smartsheet/column/LookupOptions.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { onMounted } from '@vue/runtime-core'
 import type { ColumnType, LinkToAnotherRecordType, TableType } from 'nocodb-sdk'
-import { UITypes, isSystemColumn } from 'nocodb-sdk'
+import { isLinksOrLTAR, isSystemColumn } from 'nocodb-sdk'
 import { getRelationName } from './utils'
 import { MetaInj, inject, ref, storeToRefs, useColumnCreateStoreOrThrow, useMetas, useProject, useVModel } from '#imports'
 
@@ -35,7 +35,7 @@ const refTables = $computed(() => {
   }
 
   const _refTables = meta.columns
-    .filter((column) => column.uidt === UITypes.LinkToAnotherRecord && !column.system && column.base_id === meta?.base_id)
+    .filter((column) => isLinksOrLTAR(column) && !column.system && column.base_id === meta?.base_id)
     .map((column) => ({
       col: column.colOptions,
       column,

packages/nc-gui/components/smartsheet/column/RollupOptions.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { onMounted } from '@vue/runtime-core'
-import type { ColumnType, LinkToAnotherRecordType, TableType } from 'nocodb-sdk'
-import { UITypes, isSystemColumn, isVirtualCol } from 'nocodb-sdk'
+import type { ColumnType, LinkToAnotherRecordType, TableType, UITypes } from 'nocodb-sdk'
+import { isLinksOrLTAR, isSystemColumn, isVirtualCol } from 'nocodb-sdk'
 import { getRelationName } from './utils'
 import { MetaInj, inject, ref, storeToRefs, useColumnCreateStoreOrThrow, useMetas, useProject, useVModel } from '#imports'
 
@@ -50,10 +50,7 @@ const refTables = $computed(() => {
   const _refTables = meta.columns
     .filter(
       (c) =>
-        c.uidt === UITypes.LinkToAnotherRecord &&
-        (c.colOptions as LinkToAnotherRecordType).type !== 'bt' &&
-        !c.system &&
-        c.base_id === meta?.base_id,
+        isLinksOrLTAR(c) && (c.colOptions as LinkToAnotherRecordType).type !== 'bt' && !c.system && c.base_id === meta?.base_id,
     )
     .map((c) => ({
       col: c.colOptions,

packages/nc-gui/components/smartsheet/expanded-form/index.vue

@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import type { TableType, ViewType } from 'nocodb-sdk'
-import { UITypes, isSystemColumn, isVirtualCol } from 'nocodb-sdk'
+import { isLinksOrLTAR, isSystemColumn, isVirtualCol } from 'nocodb-sdk'
 import type { Ref } from 'vue'
 import {
   CellClickHookInj,
@@ -324,7 +324,7 @@ export default {
             <div
               v-for="(col, i) of fields"
               v-else
-              v-show="!isVirtualCol(col) || !isNew || col.uidt === UITypes.LinkToAnotherRecord"
+              v-show="!isVirtualCol(col) || !isNew || isLinksOrLTAR(col)"
               :key="col.title"
               class="mt-2 py-2"
               :class="`nc-expand-col-${col.title}`"

packages/nc-gui/components/smartsheet/header/Menu.vue

@@ -1,6 +1,6 @@
 <script lang="ts" setup>
 import type { ColumnReqType, LinkToAnotherRecordType } from 'nocodb-sdk'
-import { RelationTypes, UITypes } from 'nocodb-sdk'
+import { RelationTypes, UITypes, isLinksOrLTAR } from 'nocodb-sdk'
 import {
   ActiveViewInj,
   ColumnInj,
@@ -66,7 +66,7 @@ const deleteColumn = () =>
         await getMeta(meta?.value?.id as string, true)
 
         /** force-reload related table meta if deleted column is a LTAR and not linked to same table */
-        if (column?.value?.uidt === UITypes.LinkToAnotherRecord && column.value?.colOptions) {
+        if (isLinksOrLTAR(column?.value) && column.value?.colOptions) {
           await getMeta((column.value?.colOptions as LinkToAnotherRecordType).fk_related_model_id!, true)
 
           // reload tables if deleted column is mm and include m2m is true
@@ -181,6 +181,7 @@ const duplicateColumn = async () => {
   // construct column create payload
   switch (column?.value.uidt) {
     case UITypes.LinkToAnotherRecord:
+    case UITypes.Links:
     case UITypes.Lookup:
     case UITypes.Rollup:
     case UITypes.Formula:
@@ -315,7 +316,7 @@ const hideField = async () => {
             {{ $t('general.edit') }}
           </div>
         </a-menu-item>
-        <template v-if="column.uidt !== UITypes.LinkToAnotherRecord || column.colOptions.type !== RelationTypes.BELONGS_TO">
+        <template v-if="isLinksOrLTAR(column) || column.colOptions.type !== RelationTypes.BELONGS_TO">
           <a-divider class="!my-0" />
           <a-menu-item @click="sortByColumn('asc')">
             <div v-e="['a:field:sort', { dir: 'asc' }]" class="nc-column-insert-after nc-header-menu-item">

packages/nc-gui/components/smartsheet/header/VirtualCellIcon.ts

@@ -22,6 +22,7 @@ import CountIcon from '~icons/mdi/counter'
 const renderIcon = (column: ColumnType, relationColumn?: ColumnType) => {
   switch (column.uidt) {
     case UITypes.LinkToAnotherRecord:
+    case UITypes.Links:
       switch ((column.colOptions as LinkToAnotherRecordType)?.type) {
         case RelationTypes.MANY_TO_MANY:
           return { icon: iconMap.mm, color: 'text-accent' }

packages/nc-gui/components/smartsheet/toolbar/FieldListAutoCompleteDropdown.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import type { SelectProps } from 'ant-design-vue'
 import type { ColumnType, LinkToAnotherRecordType } from 'nocodb-sdk'
-import { RelationTypes, UITypes, isSystemColumn, isVirtualCol } from 'nocodb-sdk'
+import { RelationTypes, UITypes, isLinksOrLTAR, isSystemColumn, isVirtualCol } from 'nocodb-sdk'
 import { ActiveViewInj, MetaInj, computed, inject, ref, resolveComponent, useViewColumns } from '#imports'
 
 const { modelValue, isSort } = defineProps<{
@@ -36,9 +36,7 @@ const options = computed<SelectProps['options']>(() =>
         return false
       } else if (isSort) {
         /** ignore hasmany and manytomany relations if it's using within sort menu */
-        return !(
-          c.uidt === UITypes.LinkToAnotherRecord && (c.colOptions as LinkToAnotherRecordType).type !== RelationTypes.BELONGS_TO
-        )
+        return !(isLinksOrLTAR(c) && (c.colOptions as LinkToAnotherRecordType).type !== RelationTypes.BELONGS_TO)
         /** ignore virtual fields which are system fields ( mm relation ) and qr code fields */
       } else {
         const isVirtualSystemField = c.colOptions && c.system

packages/nc-gui/components/tabs/Smartsheet.vue

@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import type { ColumnType, LinkToAnotherRecordType, TableType } from 'nocodb-sdk'
-import { UITypes } from 'nocodb-sdk'
+import { UITypes, isLinksOrLTAR } from 'nocodb-sdk'
 import {
   ActiveViewInj,
   FieldsInj,
@@ -91,7 +91,7 @@ const onDrop = async (event: DragEvent) => {
 
     // if already a link column exists, create a new Lookup column
     const relationCol = parentMeta.columns?.find((c: ColumnType) => {
-      if (c.uidt !== UITypes.LinkToAnotherRecord) return false
+      if (isLinksOrLTAR(c)) return false
 
       const ltarOptions = c.colOptions as LinkToAnotherRecordType
 

packages/nc-gui/components/virtual-cell/components/ListChildItems.vue

@@ -149,7 +149,7 @@ const onClick = (row: Row) => {
             <div class="flex items-center">
               <div class="flex-1 overflow-hidden min-w-0">
                 <VirtualCellComponentsItemChip :value="row[relatedTableDisplayValueProp]" :column="props.column" />
-<!--                <span class="text-gray-400 text-[11px] ml-1">(Primary key : {{ getRelatedTableRowId(row) }})</span>-->
+                <!--                <span class="text-gray-400 text-[11px] ml-1">(Primary key : {{ getRelatedTableRowId(row) }})</span> -->
               </div>
 
               <div v-if="!readonly" class="flex gap-2">
@@ -209,8 +209,7 @@ const onClick = (row: Row) => {
   line-height: 21px !important;
 }
 
-
-:deep(.nc-nested-list-item .ant-card-body){
-  @apply !p-2
+:deep(.nc-nested-list-item .ant-card-body) {
+  @apply !p-2;
 }
 </style>

packages/nc-gui/components/virtual-cell/components/ListItems.vue

@@ -234,9 +234,9 @@ watch(vModel, (nextVal) => {
               :column="props.column"
               :show-unlink-button="false"
             />
-<!--            <span class="hidden group-hover:(inline) text-gray-400 text-[11px] ml-1">-->
-<!--              ({{ $t('labels.primaryKey') }} : {{ getRelatedTableRowId(refRow) }})-->
-<!--            </span>-->
+            <!--            <span class="hidden group-hover:(inline) text-gray-400 text-[11px] ml-1"> -->
+            <!--              ({{ $t('labels.primaryKey') }} : {{ getRelatedTableRowId(refRow) }}) -->
+            <!--            </span> -->
           </a-card>
         </div>
 
@@ -282,7 +282,7 @@ watch(vModel, (nextVal) => {
   @apply !ring;
 }
 
-:deep(.nc-nested-list-item .ant-card-body){
-  @apply !p-2
+:deep(.nc-nested-list-item .ant-card-body) {
+  @apply !p-2;
 }
 </style>

packages/nc-gui/composables/useColumnCreateStore.ts

@@ -1,6 +1,6 @@
 import rfdc from 'rfdc'
 import type { ColumnReqType, ColumnType, TableType } from 'nocodb-sdk'
-import { UITypes } from 'nocodb-sdk'
+import { UITypes, isLinksOrLTAR } from 'nocodb-sdk'
 import type { Ref } from 'vue'
 import type { RuleObject } from 'ant-design-vue/es/form'
 import {
@@ -252,7 +252,7 @@ const [useProvideColumnCreateStore, useColumnCreateStore] = createInjectionState
           await $api.dbTableColumn.create(meta.value?.id as string, { ...formState.value, ...columnPosition })
 
           /** if LTAR column then force reload related table meta */
-          if (formState.value.uidt === UITypes.LinkToAnotherRecord && meta.value?.id !== formState.value.childId) {
+          if (isLinksOrLTAR(formState.value) && meta.value?.id !== formState.value.childId) {
             getMeta(formState.value.childId, true).then(() => {})
           }
 

packages/nc-gui/composables/useSharedFormViewStore.ts

@@ -11,7 +11,7 @@ import type {
   TableType,
   ViewType,
 } from 'nocodb-sdk'
-import { ErrorMessages, RelationTypes, UITypes, isVirtualCol } from 'nocodb-sdk'
+import { ErrorMessages, RelationTypes, UITypes, isLinksOrLTAR, isVirtualCol } from 'nocodb-sdk'
 import { isString } from '@vueuse/core'
 import {
   SharedViewPasswordInj,
@@ -74,7 +74,7 @@ const [useProvideSharedFormStore, useSharedFormStore] = useInjectionState((share
   const fieldRequired = (fieldName = 'Value') => helpers.withMessage(t('msg.error.fieldRequired', { value: fieldName }), required)
 
   const formColumns = computed(() =>
-    columns.value?.filter((c) => c.show).filter((col) => !isVirtualCol(col) || col.uidt === UITypes.LinkToAnotherRecord),
+    columns.value?.filter((c) => c.show).filter((col) => !isVirtualCol(col) || isLinksOrLTAR(col.uidt)),
   )
 
   const loadSharedView = async () => {
@@ -151,7 +151,7 @@ const [useProvideSharedFormStore, useSharedFormStore] = useInjectionState((share
       ) {
         obj.localState[column.title!] = { required: fieldRequired(column.label || column.title) }
       } else if (
-        column.uidt === UITypes.LinkToAnotherRecord &&
+        isLinksOrLTAR(column) &&
         column.colOptions &&
         (column.colOptions as LinkToAnotherRecordType).type === RelationTypes.BELONGS_TO
       ) {

packages/nc-gui/composables/useSmartsheetRowStore.ts

@@ -1,4 +1,4 @@
-import { RelationTypes, UITypes } from 'nocodb-sdk'
+import { RelationTypes, isLinksOrLTAR } from 'nocodb-sdk'
 import type { ColumnType, LinkToAnotherRecordType, TableType } from 'nocodb-sdk'
 import type { Ref } from 'vue'
 import type { MaybeRef } from '@vueuse/core'
@@ -96,7 +96,7 @@ const [useProvideSmartsheetRowStore, useSmartsheetRowStore] = useInjectionState(
     const syncLTARRefs = async (row: Record<string, any>, { metaValue = meta.value }: { metaValue?: TableType } = {}) => {
       const id = extractPkFromRow(row, metaValue?.columns as ColumnType[])
       for (const column of metaValue?.columns ?? []) {
-        if (column.uidt !== UITypes.LinkToAnotherRecord) continue
+        if (isLinksOrLTAR(column)) continue
 
         const colOptions = column.colOptions as LinkToAnotherRecordType
 
@@ -132,7 +132,7 @@ const [useProvideSmartsheetRowStore, useSmartsheetRowStore] = useInjectionState(
     // clear LTAR cell
     const clearLTARCell = async (column: ColumnType) => {
       try {
-        if (!column || column.uidt !== UITypes.LinkToAnotherRecord) return
+        if (!column || isLinksOrLTAR(column)) return
 
         const relatedTableMeta = metas.value?.[(<LinkToAnotherRecordType>column?.colOptions)?.fk_related_model_id as string]
 

packages/nc-gui/composables/useTable.ts

@@ -1,5 +1,5 @@
 import type { ColumnType, LinkToAnotherRecordType, TableType } from 'nocodb-sdk'
-import { UITypes, isSystemColumn } from 'nocodb-sdk'
+import { UITypes, isLinksOrLTAR, isSystemColumn } from 'nocodb-sdk'
 import {
   Modal,
   SYSTEM_COLUMNS,
@@ -86,7 +86,7 @@ export function useTable(onTableCreate?: (tableMeta: TableType) => void, baseId?
       async onOk() {
         try {
           const meta = (await getMeta(table.id as string, true)) as TableType
-          const relationColumns = meta?.columns?.filter((c) => c.uidt === UITypes.LinkToAnotherRecord && !isSystemColumn(c))
+          const relationColumns = meta?.columns?.filter((c) => isLinksOrLTAR(c) && !isSystemColumn(c))
 
           // Check if table has any relation columns and show notification
           // skip for xcdb base

packages/nocodb-sdk/src/index.ts

@@ -12,6 +12,7 @@ export {
   numericUITypes,
   isNumericCol,
   isVirtualCol,
+  isLinksOrLTAR,
 } from './lib/UITypes';
 export { default as CustomAPI } from './lib/CustomAPI';
 export { default as TemplateGenerator } from './lib/TemplateGenerator';

packages/nocodb-sdk/src/lib/UITypes.ts

@@ -85,4 +85,12 @@ export function isVirtualCol(
   ].includes(<UITypes>(typeof col === 'object' ? col?.uidt : col));
 }
 
+export function isLinksOrLTAR(
+  colOrUidt: ColumnType | { uidt: UITypes | string } | UITypes | string
+) {
+  return [UITypes.LinkToAnotherRecord, UITypes.Links].includes(
+    <UITypes>(typeof colOrUidt === 'object' ? colOrUidt?.uidt : colOrUidt)
+  );
+}
+
 export default UITypes;