From 2cc924f9e717f1aa26969c68459d6fe239546c3e Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Tue, 1 Aug 2023 12:08:40 +0200
Subject: [PATCH] Fix tests

---
 packages/server/src/api/routes/tests/row.spec.ts  | 10 +++++-----
 .../server/src/api/routes/tests/viewV2.spec.ts    | 15 +++++++--------
 packages/types/src/api/web/app/view.ts            |  6 +++---
 3 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/packages/server/src/api/routes/tests/row.spec.ts b/packages/server/src/api/routes/tests/row.spec.ts
index 479f27d679..b986ffb945 100644
--- a/packages/server/src/api/routes/tests/row.spec.ts
+++ b/packages/server/src/api/routes/tests/row.spec.ts
@@ -1033,7 +1033,7 @@ describe("/rows", () => {
       }
 
       const view = await config.api.viewV2.create({
-        columns: ["name"],
+        schema: { name: {} },
       })
       const response = await config.api.viewV2.search(view.id)
 
@@ -1102,7 +1102,7 @@ describe("/rows", () => {
         const table = await config.createTable(userTable())
         const view = await config.api.viewV2.create({
           tableId: table._id!,
-          columns: {
+          schema: {
             name: { visible: true },
             surname: { visible: true },
             address: { visible: true },
@@ -1150,7 +1150,7 @@ describe("/rows", () => {
         const tableId = table._id!
         const view = await config.api.viewV2.create({
           tableId,
-          columns: {
+          schema: {
             name: { visible: true },
             address: { visible: true },
           },
@@ -1203,7 +1203,7 @@ describe("/rows", () => {
         const tableId = table._id!
         const view = await config.api.viewV2.create({
           tableId,
-          columns: {
+          schema: {
             name: { visible: true },
             address: { visible: true },
           },
@@ -1231,7 +1231,7 @@ describe("/rows", () => {
         const tableId = table._id!
         const view = await config.api.viewV2.create({
           tableId,
-          columns: {
+          schema: {
             name: { visible: true },
             address: { visible: true },
           },
diff --git a/packages/server/src/api/routes/tests/viewV2.spec.ts b/packages/server/src/api/routes/tests/viewV2.spec.ts
index b665b261e6..452d15bde0 100644
--- a/packages/server/src/api/routes/tests/viewV2.spec.ts
+++ b/packages/server/src/api/routes/tests/viewV2.spec.ts
@@ -1,6 +1,7 @@
 import * as setup from "./utilities"
 import {
   CreateViewRequest,
+  FieldSchema,
   FieldType,
   SortOrder,
   SortType,
@@ -42,8 +43,6 @@ describe("/v2/views", () => {
     },
     schema: {
       name: {
-        name: "name",
-        type: FieldType.STRING,
         visible: true,
       },
     },
@@ -108,7 +107,7 @@ describe("/v2/views", () => {
             visible: false,
             icon: "ic",
           },
-        },
+        } as Record<string, FieldSchema>,
       }
 
       const createdView = await config.api.viewV2.create(newView)
@@ -151,7 +150,7 @@ describe("/v2/views", () => {
               presence: true,
             },
           },
-        },
+        } as Record<string, FieldSchema>,
       }
 
       await config.api.viewV2.create(newView, {
@@ -173,7 +172,7 @@ describe("/v2/views", () => {
             name: "Category",
             type: FieldType.STRING,
           },
-        },
+        } as Record<string, FieldSchema>,
       }
 
       await config.api.viewV2.create(newView, {
@@ -316,7 +315,7 @@ describe("/v2/views", () => {
             visible: false,
             icon: "ic",
           },
-        },
+        } as Record<string, FieldSchema>,
       })
 
       expect(await config.api.viewV2.get(view.id)).toEqual({
@@ -357,7 +356,7 @@ describe("/v2/views", () => {
                 presence: true,
               },
             },
-          },
+          } as Record<string, FieldSchema>,
         },
         {
           expectStatus: 400,
@@ -379,7 +378,7 @@ describe("/v2/views", () => {
               name: "Category",
               type: FieldType.STRING,
             },
-          },
+          } as Record<string, FieldSchema>,
         },
         {
           expectStatus: 200,
diff --git a/packages/types/src/api/web/app/view.ts b/packages/types/src/api/web/app/view.ts
index 411bbef44e..60b5a01b15 100644
--- a/packages/types/src/api/web/app/view.ts
+++ b/packages/types/src/api/web/app/view.ts
@@ -1,4 +1,4 @@
-import { ViewV2, FieldSchema } from "../../../documents"
+import { ViewV2, UIFieldMetadata } from "../../../documents"
 
 export interface ViewResponse {
   data: ViewV2
@@ -6,10 +6,10 @@ export interface ViewResponse {
 
 export interface CreateViewRequest
   extends Omit<ViewV2, "version" | "id" | "columns" | "schemaUI"> {
-  schema?: Record<string, FieldSchema>
+  schema?: Record<string, UIFieldMetadata>
 }
 
 export interface UpdateViewRequest
   extends Omit<ViewV2, "columns" | "schemaUI"> {
-  schema?: Record<string, FieldSchema>
+  schema?: Record<string, UIFieldMetadata>
 }