export directly.

packages/server/src/api/routes/tests/screen.spec.ts

@@ -11,9 +11,9 @@ import {
 
 const {
   basicScreen,
-  tableScreen,
-  viewScreen,
-  queryScreen,
+  createTableScreen,
+  createViewScreen,
+  createQueryScreen,
   basicTable,
   viewV2,
   basicQuery,
@@ -202,7 +202,7 @@ describe("/screens", () => {
     it("should find table usage", async () => {
       const table = await config.api.table.save(basicTable())
       const screen = await config.api.screen.save(
-        tableScreen("BudibaseDB", table)
+        createTableScreen("BudibaseDB", table)
       )
       const usage = await config.api.screen.usage(table._id!)
       expect(usage.sourceType).toEqual(SourceType.TABLE)
@@ -216,7 +216,7 @@ describe("/screens", () => {
         { status: 201 }
       )
       const screen = await config.api.screen.save(
-        viewScreen("BudibaseDB", view)
+        createViewScreen("BudibaseDB", view)
       )
       const usage = await config.api.screen.usage(view.id)
       expect(usage.sourceType).toEqual(SourceType.VIEW)
@@ -229,7 +229,7 @@ describe("/screens", () => {
       )
       const query = await config.api.query.save(basicQuery(datasource._id!))
       const screen = await config.api.screen.save(
-        queryScreen(datasource._id!, query)
+        createQueryScreen(datasource._id!, query)
       )
       const dsUsage = await config.api.screen.usage(datasource._id!)
       expect(dsUsage.sourceType).toEqual(SourceType.DATASOURCE)

packages/server/src/tests/utilities/structures.ts

@@ -1,10 +1,5 @@
 import { roles, utils } from "@budibase/backend-core"
-import {
-  createHomeScreen,
-  createTableScreen,
-  createQueryScreen,
-  createViewScreen,
-} from "../../constants/screens"
+import { createHomeScreen } from "../../constants/screens"
 import { EMPTY_LAYOUT } from "../../constants/layouts"
 import { cloneDeep } from "lodash/fp"
 import {
@@ -45,6 +40,11 @@ import {
 import { LoopInput } from "../../definitions/automations"
 import { merge } from "lodash"
 import { generator } from "@budibase/backend-core/tests"
+export {
+  createTableScreen,
+  createQueryScreen,
+  createViewScreen,
+} from "../../constants/screens"
 
 const { BUILTIN_ROLE_IDS } = roles
 
@@ -523,18 +523,6 @@ export function basicScreen(route = "/") {
   })
 }
 
-export function tableScreen(datasourceName: string, table: Table) {
-  return createTableScreen(datasourceName, table)
-}
-
-export function viewScreen(datasourceName: string, view: ViewV2) {
-  return createViewScreen(datasourceName, view)
-}
-
-export function queryScreen(datasourceId: string, query: Query) {
-  return createQueryScreen(datasourceId, query)
-}
-
 export function powerScreen(route = "/") {
   return createHomeScreen({
     roleId: BUILTIN_ROLE_IDS.POWER,