From d0e40afbcb9cb8bfe82e2d5865ff4a310e02dae8 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Fri, 17 Nov 2023 14:42:37 +0100 Subject: [PATCH] Fix lint issues --- packages/client/src/components/app/forms/S3Upload.svelte | 2 +- packages/pro | 2 +- packages/server/src/sdk/app/links/links.ts | 8 ++++---- packages/server/src/sdk/app/tables/migration.ts | 3 +-- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/packages/client/src/components/app/forms/S3Upload.svelte b/packages/client/src/components/app/forms/S3Upload.svelte index 9985c83bb8..5ead872863 100644 --- a/packages/client/src/components/app/forms/S3Upload.svelte +++ b/packages/client/src/components/app/forms/S3Upload.svelte @@ -2,7 +2,7 @@ import Field from "./Field.svelte" import { CoreDropzone, ProgressCircle } from "@budibase/bbui" import { getContext, onMount, onDestroy } from "svelte" - import { cloneDeep } from "../../../../../bbui/src/helpers" + import { cloneDeep } from "@budibase/bbui/src/helpers" export let datasourceId export let bucket diff --git a/packages/pro b/packages/pro index e202f415d9..d017f81efd 160000 --- a/packages/pro +++ b/packages/pro @@ -1 +1 @@ -Subproject commit e202f415d9fa540d08cc2ba6e27394fbc22f357b +Subproject commit d017f81efdfc5fef3ec6c185cbccba54213be0b1 diff --git a/packages/server/src/sdk/app/links/links.ts b/packages/server/src/sdk/app/links/links.ts index fda07568f9..5d3420341f 100644 --- a/packages/server/src/sdk/app/links/links.ts +++ b/packages/server/src/sdk/app/links/links.ts @@ -1,5 +1,5 @@ -import { context } from "@budibase/backend-core" -import { isTableId } from "@budibase/backend-core/src/docIds" +import { context, docIds } from "@budibase/backend-core" + import { DatabaseQueryOpts, LinkDocument, @@ -8,7 +8,7 @@ import { import { ViewName, getQueryIndex } from "../../../../src/db/utils" export async function fetch(tableId: string): Promise { - if (!isTableId(tableId)) { + if (!docIds.isTableId(tableId)) { throw new Error(`Invalid tableId: ${tableId}`) } @@ -24,7 +24,7 @@ export async function fetch(tableId: string): Promise { export async function fetchWithDocument( tableId: string ): Promise { - if (!isTableId(tableId)) { + if (!docIds.isTableId(tableId)) { throw new Error(`Invalid tableId: ${tableId}`) } diff --git a/packages/server/src/sdk/app/tables/migration.ts b/packages/server/src/sdk/app/tables/migration.ts index 718223dbeb..e282251bfb 100644 --- a/packages/server/src/sdk/app/tables/migration.ts +++ b/packages/server/src/sdk/app/tables/migration.ts @@ -17,7 +17,6 @@ import sdk from "../../../sdk" import { isExternalTableID } from "../../../integrations/utils" import { EventType, updateLinks } from "../../../db/linkedRows" import { cloneDeep } from "lodash" -import { isInternalColumnName } from "@budibase/backend-core/src/db" export interface MigrationResult { tablesUpdated: Table[] @@ -36,7 +35,7 @@ export async function migrate( throw new BadRequestError(`Column name cannot be empty`) } - if (isInternalColumnName(newColumn.name)) { + if (dbCore.isInternalColumnName(newColumn.name)) { throw new BadRequestError(`Column name cannot be a reserved column name`) }