diff --git a/packages/server/src/api/routes/tests/viewV2.spec.ts b/packages/server/src/api/routes/tests/viewV2.spec.ts index d4c81db55c..fa69023530 100644 --- a/packages/server/src/api/routes/tests/viewV2.spec.ts +++ b/packages/server/src/api/routes/tests/viewV2.spec.ts @@ -60,7 +60,7 @@ describe("/v2/views", () => { expect(res).toEqual({ ...newView, - id: expect.any(String), + id: expect.stringMatching(new RegExp(`^vi_${config.table?._id!}_`)), version: 2, }) }) diff --git a/packages/server/src/db/utils.ts b/packages/server/src/db/utils.ts index 8854cbc824..ba6ca88330 100644 --- a/packages/server/src/db/utils.ts +++ b/packages/server/src/db/utils.ts @@ -277,9 +277,5 @@ export function getMultiIDParams(ids: string[]) { * @returns {string} The new view ID which the view doc can be stored under. */ export function generateViewID(tableId: string) { - return `${viewIDPrefix(tableId)}${newid()}` -} - -export function viewIDPrefix(tableId: string) { - return `${DocumentType.VIEW}${SEPARATOR}${tableId}${SEPARATOR}` + return `${DocumentType.VIEW}${SEPARATOR}${tableId}${SEPARATOR}${newid()}` } diff --git a/packages/server/src/sdk/app/views/index.ts b/packages/server/src/sdk/app/views/index.ts index bf02e03629..8492de51a3 100644 --- a/packages/server/src/sdk/app/views/index.ts +++ b/packages/server/src/sdk/app/views/index.ts @@ -2,7 +2,7 @@ import { HTTPError, context } from "@budibase/backend-core" import { View, ViewV2 } from "@budibase/types" import sdk from "../../../sdk" -import { utils as coreUtils } from "@budibase/backend-core" +import * as utils from "../../../db/utils" export async function get( tableId: string, @@ -21,7 +21,7 @@ export async function create( ): Promise { const view: ViewV2 = { ...viewRequest, - id: coreUtils.newid(), + id: utils.generateViewID(tableId), version: 2, }