From 0eb29ef73fa80f9eae8c63129cb93ac486f4d9e1 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Wed, 24 Jan 2024 18:00:32 +0000
Subject: [PATCH] PR comments.

---
 packages/server/src/api/controllers/table/bulkFormula.ts | 2 +-
 .../server/src/api/controllers/table/tests/utils.spec.ts | 3 +--
 packages/server/src/constants/index.ts                   | 6 ------
 packages/server/src/integrations/base/sqlTable.ts        | 2 +-
 .../src/utilities/rowProcessor/tests/utils.spec.ts       | 9 +++++++--
 5 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/packages/server/src/api/controllers/table/bulkFormula.ts b/packages/server/src/api/controllers/table/bulkFormula.ts
index 238ff86377..060b67e8ce 100644
--- a/packages/server/src/api/controllers/table/bulkFormula.ts
+++ b/packages/server/src/api/controllers/table/bulkFormula.ts
@@ -1,4 +1,3 @@
-import { FormulaType } from "../../../constants"
 import { clearColumns } from "./utils"
 import { doesContainStrings } from "@budibase/string-templates"
 import { cloneDeep } from "lodash/fp"
@@ -7,6 +6,7 @@ import uniq from "lodash/uniq"
 import { updateAllFormulasInTable } from "../row/staticFormula"
 import { context } from "@budibase/backend-core"
 import {
+  FormulaType,
   FieldSchema,
   FieldType,
   FormulaFieldMetadata,
diff --git a/packages/server/src/api/controllers/table/tests/utils.spec.ts b/packages/server/src/api/controllers/table/tests/utils.spec.ts
index d2aced9087..dad0146696 100644
--- a/packages/server/src/api/controllers/table/tests/utils.spec.ts
+++ b/packages/server/src/api/controllers/table/tests/utils.spec.ts
@@ -1,5 +1,4 @@
-import { FieldType } from "@budibase/types"
-import { AutoFieldSubType } from "../../../../constants"
+import { AutoFieldSubType, FieldType } from "@budibase/types"
 import TestConfiguration from "../../../../tests/utilities/TestConfiguration"
 import { importToRows } from "../utils"
 
diff --git a/packages/server/src/constants/index.ts b/packages/server/src/constants/index.ts
index 37fba34a9e..49f1d01afb 100644
--- a/packages/server/src/constants/index.ts
+++ b/packages/server/src/constants/index.ts
@@ -6,12 +6,6 @@ import {
   TableSourceType,
 } from "@budibase/types"
 
-export {
-  RelationshipType,
-  AutoFieldSubType,
-  FormulaType,
-} from "@budibase/types"
-
 export enum FilterTypes {
   STRING = "string",
   FUZZY = "fuzzy",
diff --git a/packages/server/src/integrations/base/sqlTable.ts b/packages/server/src/integrations/base/sqlTable.ts
index 1d3f542a10..f553690b23 100644
--- a/packages/server/src/integrations/base/sqlTable.ts
+++ b/packages/server/src/integrations/base/sqlTable.ts
@@ -1,5 +1,6 @@
 import { Knex, knex } from "knex"
 import {
+  RelationshipType,
   FieldSubtype,
   NumberFieldMetadata,
   Operation,
@@ -11,7 +12,6 @@ import {
 import { breakExternalTableId } from "../utils"
 import SchemaBuilder = Knex.SchemaBuilder
 import CreateTableBuilder = Knex.CreateTableBuilder
-import { RelationshipType } from "../../constants"
 import { utils } from "@budibase/shared-core"
 
 function isIgnoredType(type: FieldType) {
diff --git a/packages/server/src/utilities/rowProcessor/tests/utils.spec.ts b/packages/server/src/utilities/rowProcessor/tests/utils.spec.ts
index f94b876b8f..49dd05910d 100644
--- a/packages/server/src/utilities/rowProcessor/tests/utils.spec.ts
+++ b/packages/server/src/utilities/rowProcessor/tests/utils.spec.ts
@@ -1,6 +1,11 @@
 import { fixAutoColumnSubType } from "../utils"
-import { AutoFieldDefaultNames, AutoFieldSubType } from "../../../constants"
-import { FieldSchema, FieldType, RelationshipType } from "@budibase/types"
+import { AutoFieldDefaultNames } from "../../../constants"
+import {
+  AutoFieldSubType,
+  FieldSchema,
+  FieldType,
+  RelationshipType,
+} from "@budibase/types"
 
 describe("rowProcessor utility", () => {
   describe("fixAutoColumnSubType", () => {