diff --git a/packages/nc-gui/components/smartsheet/column/EditOrAdd.vue b/packages/nc-gui/components/smartsheet/column/EditOrAdd.vue index 8facb75ec0..9f0cf0a7e6 100644 --- a/packages/nc-gui/components/smartsheet/column/EditOrAdd.vue +++ b/packages/nc-gui/components/smartsheet/column/EditOrAdd.vue @@ -209,7 +209,7 @@ useEventListener('keydown', (e: KeyboardEvent) => { diff --git a/packages/nc-gui/utils/virtualCell.ts b/packages/nc-gui/utils/virtualCell.ts index b761006f2a..4b4e633736 100644 --- a/packages/nc-gui/utils/virtualCell.ts +++ b/packages/nc-gui/utils/virtualCell.ts @@ -19,4 +19,4 @@ export const isFormula = (column: ColumnType) => column.uidt === UITypes.Formula export const isQrCode = (column: ColumnType) => column.uidt === UITypes.QrCode export const isBarcode = (column: ColumnType) => column.uidt === UITypes.Barcode export const isCount = (column: ColumnType) => column.uidt === UITypes.Count -export const isLink = (column: ColumnType) => column.uidt === UITypes.Link +export const isLink = (column: ColumnType) => column.uidt === UITypes.Links diff --git a/packages/nocodb-sdk/src/lib/Api.ts b/packages/nocodb-sdk/src/lib/Api.ts index f0a6f9a05c..db416e39bb 100644 --- a/packages/nocodb-sdk/src/lib/Api.ts +++ b/packages/nocodb-sdk/src/lib/Api.ts @@ -434,7 +434,7 @@ export interface ColumnType { | 'URL' | 'Year' | 'QrCode' - | 'Link'; + | 'Links'; /** Is Unsigned? */ un?: BoolType; /** Is unique? */ @@ -1469,7 +1469,7 @@ export interface LinkToAnotherColumnReqType { /** The type of the relationship */ type: 'bt' | 'hm' | 'mm'; /** Abstract type of the relationship */ - uidt: 'LinkToAnotherRecord' | 'Link'; + uidt: 'LinkToAnotherRecord' | 'Links'; /** Is this relationship virtual? */ virtual?: BoolType; } @@ -1722,7 +1722,7 @@ export interface NormalColumnRequestType { | 'URL' | 'Year' | 'QrCode' - | 'Link'; + | 'Links'; /** Is this column unique? */ un?: BoolType; /** Is this column unique? */ diff --git a/packages/nocodb-sdk/src/lib/UITypes.ts b/packages/nocodb-sdk/src/lib/UITypes.ts index 62b0b4dfaa..70aa3ae706 100644 --- a/packages/nocodb-sdk/src/lib/UITypes.ts +++ b/packages/nocodb-sdk/src/lib/UITypes.ts @@ -38,7 +38,7 @@ enum UITypes { Barcode = 'Barcode', QrCode = 'QrCode', Button = 'Button', - Link = 'Link', + Links = 'Links', } export const numericUITypes = [ @@ -80,7 +80,7 @@ export function isVirtualCol( UITypes.Barcode, UITypes.Rollup, UITypes.Lookup, - UITypes.Link, + UITypes.Links, // UITypes.Count, ].includes((typeof col === 'object' ? col?.uidt : col)); } diff --git a/packages/nocodb/src/db/BaseModelSqlv2.ts b/packages/nocodb/src/db/BaseModelSqlv2.ts index bc47c46ac9..26ec38a774 100644 --- a/packages/nocodb/src/db/BaseModelSqlv2.ts +++ b/packages/nocodb/src/db/BaseModelSqlv2.ts @@ -1777,7 +1777,7 @@ class BaseModelSqlv2 { } break; case UITypes.Rollup: - case UITypes.Link: + case UITypes.Links: qb.select( ( await genRollupSelectv2({ diff --git a/packages/nocodb/src/helpers/columnHelpers.ts b/packages/nocodb/src/helpers/columnHelpers.ts index d8b4e59c1e..4fba0830b2 100644 --- a/packages/nocodb/src/helpers/columnHelpers.ts +++ b/packages/nocodb/src/helpers/columnHelpers.ts @@ -228,7 +228,7 @@ export async function populateRollupForLTAR({ column }: { column: Column }) { relatedModel.primaryKey?.id || (await relatedModel.getColumns())[0]?.id; await Column.insert({ - uidt: UITypes.Link, + uidt: UITypes.Links, title: getUniqueColumnAliasName( await model.getColumns(), `${relatedModel.title} Count`, diff --git a/packages/nocodb/src/models/Column.ts b/packages/nocodb/src/models/Column.ts index 06f26e8696..b22e55a922 100644 --- a/packages/nocodb/src/models/Column.ts +++ b/packages/nocodb/src/models/Column.ts @@ -193,7 +193,7 @@ export default class Column implements ColumnType { ); break; } - case UITypes.Link: + case UITypes.Links: case UITypes.Rollup: { await RollupColumn.insert( { @@ -418,7 +418,7 @@ export default class Column implements ColumnType { res = await LookupColumn.read(this.id, ncMeta); break; case UITypes.Rollup: - case UITypes.Link: + case UITypes.Links: res = await RollupColumn.read(this.id, ncMeta); break; case UITypes.LinkToAnotherRecord: diff --git a/packages/nocodb/src/schema/swagger.json b/packages/nocodb/src/schema/swagger.json index 6d3f7916cd..4c31b15c24 100644 --- a/packages/nocodb/src/schema/swagger.json +++ b/packages/nocodb/src/schema/swagger.json @@ -14888,7 +14888,7 @@ "URL", "Year", "QrCode", - "Link" + "Links" ], "type": "string" }, @@ -17425,7 +17425,7 @@ "description": "The type of the relationship" }, "uidt": { - "enum": ["LinkToAnotherRecord", "Link"], + "enum": ["LinkToAnotherRecord", "Links"], "type": "string", "description": "Abstract type of the relationship" }, @@ -17976,7 +17976,7 @@ "URL", "Year", "QrCode", - "Link" + "Links" ], "type": "string", "description": "UI Data Type"