diff --git a/packages/backend-core/tests/core/utilities/jestUtils.ts b/packages/backend-core/tests/core/utilities/jestUtils.ts index a49c2a795e..7d2cfb41fa 100644 --- a/packages/backend-core/tests/core/utilities/jestUtils.ts +++ b/packages/backend-core/tests/core/utilities/jestUtils.ts @@ -1,6 +1,6 @@ import { CONSTANT_EXTERNAL_ROW_COLS, - CONSTANT_INTERNAL_ROW_COLS, + PROTECTED_INTERNAL_COLUMNS, } from "@budibase/shared-core" export function expectFunctionWasCalledTimesWith( @@ -14,7 +14,7 @@ export function expectFunctionWasCalledTimesWith( } export const expectAnyInternalColsAttributes: { - [K in (typeof CONSTANT_INTERNAL_ROW_COLS)[number]]: any + [K in (typeof PROTECTED_INTERNAL_COLUMNS)[number]]: any } = { tableId: expect.anything(), type: expect.anything(), diff --git a/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte b/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte index f982ef5333..6f96e77ca4 100644 --- a/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte +++ b/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte @@ -17,7 +17,7 @@ SWITCHABLE_TYPES, ValidColumnNameRegex, helpers, - CONSTANT_INTERNAL_ROW_COLS, + PROTECTED_INTERNAL_COLUMNS, CONSTANT_EXTERNAL_ROW_COLS, } from "@budibase/shared-core" import { createEventDispatcher, getContext, onMount } from "svelte" @@ -490,7 +490,7 @@ const newError = {} const prohibited = externalTable ? CONSTANT_EXTERNAL_ROW_COLS - : CONSTANT_INTERNAL_ROW_COLS + : PROTECTED_INTERNAL_COLUMNS if (!externalTable && fieldInfo.name?.startsWith("_")) { newError.name = `Column name cannot start with an underscore.` } else if (fieldInfo.name && !fieldInfo.name.match(ValidColumnNameRegex)) { diff --git a/packages/server/src/sdk/app/rows/search/internal.ts b/packages/server/src/sdk/app/rows/search/internal.ts index 097b16b104..46d2cd8c61 100644 --- a/packages/server/src/sdk/app/rows/search/internal.ts +++ b/packages/server/src/sdk/app/rows/search/internal.ts @@ -1,5 +1,5 @@ import { context, HTTPError } from "@budibase/backend-core" -import { CONSTANT_INTERNAL_ROW_COLS } from "@budibase/shared-core" +import { PROTECTED_INTERNAL_COLUMNS } from "@budibase/shared-core" import env from "../../../../environment" import { fullSearch, paginatedSearch } from "./utils" import { getRowParams, InternalTables } from "../../../../db/utils" @@ -75,7 +75,7 @@ export async function search( } if (options.fields) { - const fields = [...options.fields, ...CONSTANT_INTERNAL_ROW_COLS] + const fields = [...options.fields, ...PROTECTED_INTERNAL_COLUMNS] response.rows = response.rows.map((r: any) => pick(r, fields)) } diff --git a/packages/server/src/sdk/app/views/index.ts b/packages/server/src/sdk/app/views/index.ts index 3bdfec7448..2547788c64 100644 --- a/packages/server/src/sdk/app/views/index.ts +++ b/packages/server/src/sdk/app/views/index.ts @@ -11,7 +11,7 @@ import { features } from "@budibase/pro" import { helpers, CONSTANT_EXTERNAL_ROW_COLS, - CONSTANT_INTERNAL_ROW_COLS, + PROTECTED_INTERNAL_COLUMNS, } from "@budibase/shared-core" import { cloneDeep } from "lodash/fp" @@ -149,7 +149,7 @@ export function allowedFields(view: View | ViewV2) { return fieldSchema.visible && !fieldSchema.readonly }), ...CONSTANT_EXTERNAL_ROW_COLS, - ...CONSTANT_INTERNAL_ROW_COLS, + ...PROTECTED_INTERNAL_COLUMNS, ] } diff --git a/packages/shared-core/src/constants/rows.ts b/packages/shared-core/src/constants/rows.ts index bfa7595d62..47e05baae7 100644 --- a/packages/shared-core/src/constants/rows.ts +++ b/packages/shared-core/src/constants/rows.ts @@ -1,4 +1,4 @@ -export const CONSTANT_INTERNAL_ROW_COLS = [ +export const PROTECTED_INTERNAL_COLUMNS = [ "_id", "_rev", "type", @@ -10,5 +10,5 @@ export const CONSTANT_INTERNAL_ROW_COLS = [ export const CONSTANT_EXTERNAL_ROW_COLS = ["_id", "_rev", "tableId"] as const export function isInternalColumnName(name: string): boolean { - return (CONSTANT_INTERNAL_ROW_COLS as readonly string[]).includes(name) + return (PROTECTED_INTERNAL_COLUMNS as readonly string[]).includes(name) } diff --git a/packages/shared-core/src/table.ts b/packages/shared-core/src/table.ts index 8fd7909b18..615523f3eb 100644 --- a/packages/shared-core/src/table.ts +++ b/packages/shared-core/src/table.ts @@ -1,5 +1,5 @@ import { FieldType, Table } from "@budibase/types" -import { CONSTANT_INTERNAL_ROW_COLS } from "./constants" +import { PROTECTED_INTERNAL_COLUMNS } from "./constants" const allowDisplayColumnByType: Record = { [FieldType.STRING]: true, @@ -69,7 +69,7 @@ export function findDuplicateInternalColumns(table: Table): string[] { } } } - for (let internalColumn of CONSTANT_INTERNAL_ROW_COLS) { + for (let internalColumn of PROTECTED_INTERNAL_COLUMNS) { if (casedKeys.find(key => key === internalColumn)) { duplicates.push(internalColumn) }