From 56e6d48ec7891f02247057b8c8497cef2b159794 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Wed, 19 Jul 2023 18:26:24 +0200
Subject: [PATCH] Remove :tableid from view create

---
 .../server/src/api/controllers/view/viewsV2.ts |  2 +-
 .../server/src/api/routes/tests/row.spec.ts    | 18 ++++++------------
 .../server/src/api/routes/tests/viewV2.spec.ts |  4 ++--
 packages/server/src/api/routes/view.ts         |  2 +-
 .../server/src/tests/utilities/api/viewV2.ts   |  4 ++--
 5 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/packages/server/src/api/controllers/view/viewsV2.ts b/packages/server/src/api/controllers/view/viewsV2.ts
index 9b4d91a822..94e53e52fb 100644
--- a/packages/server/src/api/controllers/view/viewsV2.ts
+++ b/packages/server/src/api/controllers/view/viewsV2.ts
@@ -2,8 +2,8 @@ import sdk from "../../../sdk"
 import { CreateViewRequest, Ctx, ViewResponse } from "@budibase/types"
 
 export async function create(ctx: Ctx<CreateViewRequest, ViewResponse>) {
-  const { tableId } = ctx.params
   const view = ctx.request.body
+  const { tableId } = view
 
   const result = await sdk.views.create(tableId, view)
   ctx.status = 201
diff --git a/packages/server/src/api/routes/tests/row.spec.ts b/packages/server/src/api/routes/tests/row.spec.ts
index 24305ab261..2890085c88 100644
--- a/packages/server/src/api/routes/tests/row.spec.ts
+++ b/packages/server/src/api/routes/tests/row.spec.ts
@@ -743,12 +743,9 @@ describe("/rows", () => {
           })
         )
 
-      const createViewResponse = await config.api.viewV2.create(
-        config.table?._id!,
-        {
-          query: { equal: { age: 40 } },
-        }
-      )
+      const createViewResponse = await config.api.viewV2.create({
+        query: { equal: { age: 40 } },
+      })
 
       const response = await config.api.viewV2.search(createViewResponse.id)
 
@@ -833,12 +830,9 @@ describe("/rows", () => {
         })
       }
 
-      const createViewResponse = await config.api.viewV2.create(
-        config.table?._id!,
-        {
-          sort: sortParams,
-        }
-      )
+      const createViewResponse = await config.api.viewV2.create({
+        sort: sortParams,
+      })
 
       const response = await config.api.viewV2.search(createViewResponse.id)
 
diff --git a/packages/server/src/api/routes/tests/viewV2.spec.ts b/packages/server/src/api/routes/tests/viewV2.spec.ts
index 743b06f34d..2dc7a0f6cb 100644
--- a/packages/server/src/api/routes/tests/viewV2.spec.ts
+++ b/packages/server/src/api/routes/tests/viewV2.spec.ts
@@ -56,7 +56,7 @@ describe("/v2/views", () => {
         name: generator.name(),
         tableId: config.table!._id!,
       }
-      const res = await config.api.viewV2.create(config.table?._id, newView)
+      const res = await config.api.viewV2.create(newView)
 
       expect(res).toEqual({
         ...newView,
@@ -71,7 +71,7 @@ describe("/v2/views", () => {
         tableId: config.table!._id!,
         ...viewFilters,
       }
-      const res = await config.api.viewV2.create(config.table!._id!, newView)
+      const res = await config.api.viewV2.create(newView)
 
       expect(res).toEqual({
         ...newView,
diff --git a/packages/server/src/api/routes/view.ts b/packages/server/src/api/routes/view.ts
index 7a79d2dc44..f8ae4abf0d 100644
--- a/packages/server/src/api/routes/view.ts
+++ b/packages/server/src/api/routes/view.ts
@@ -9,7 +9,7 @@ const router: Router = new Router()
 
 router
   .post(
-    "/api/v2/views/:tableId",
+    "/api/v2/views",
     authorized(permissions.BUILDER),
     viewController.v2.create
   )
diff --git a/packages/server/src/tests/utilities/api/viewV2.ts b/packages/server/src/tests/utilities/api/viewV2.ts
index 33ec9493c6..d79f324d85 100644
--- a/packages/server/src/tests/utilities/api/viewV2.ts
+++ b/packages/server/src/tests/utilities/api/viewV2.ts
@@ -9,10 +9,10 @@ export class ViewV2API extends TestAPI {
   }
 
   create = async (
-    tableId?: string,
     viewData?: Partial<ViewV2>,
     { expectStatus } = { expectStatus: 201 }
   ): Promise<ViewV2> => {
+    let tableId = viewData?.tableId
     if (!tableId && !this.config.table) {
       throw "Test requires table to be configured."
     }
@@ -23,7 +23,7 @@ export class ViewV2API extends TestAPI {
       ...viewData,
     }
     const result = await this.request
-      .post(`/api/v2/views/${tableId}`)
+      .post(`/api/v2/views`)
       .send(view)
       .set(this.config.defaultHeaders())
       .expect("Content-Type", /json/)