Don't add breaking changes

packages/server/src/api/controllers/row/views.ts

@@ -5,11 +5,14 @@ import {
   SearchViewRowRequest,
   RequiredKeys,
   RowSearchParams,
+  SearchFilterKey,
+  LogicalOperator,
 } from "@budibase/types"
 import { dataFilters } from "@budibase/shared-core"
 import sdk from "../../../sdk"
-import { context } from "@budibase/backend-core"
+import { db, context } from "@budibase/backend-core"
 import { enrichSearchContext } from "./utils"
+import { isExternalTableID } from "../../../integrations/utils"
 
 export async function searchView(
   ctx: UserCtx<SearchViewRowRequest, SearchRowResponse>
@@ -38,10 +41,28 @@ export async function searchView(
     delete body.query.allOr
     delete body.query.onEmptyFilter
 
-    query = {
+    if (!isExternalTableID(view.tableId) && !db.isSqsEnabledForTenant()) {
-      $and: {
+      // Extract existing fields
-        conditions: [query, body.query],
+      const existingFields =
-      },
+        view.query
+          ?.filter(filter => filter.field)
+          .map(filter => db.removeKeyNumbering(filter.field)) || []
+
+      // Carry over filters for unused fields
+      Object.keys(body.query).forEach(key => {
+        const operator = key as Exclude<SearchFilterKey, LogicalOperator>
+        Object.keys(body.query[operator] || {}).forEach(field => {
+          if (!existingFields.includes(db.removeKeyNumbering(field))) {
+            query[operator]![field] = body.query[operator]![field]
+          }
+        })
+      })
+    } else {
+      query = {
+        $and: {
+          conditions: [query, body.query],
+        },
+      }
     }
   }
 

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

@@ -1486,6 +1486,48 @@ describe.each([
         )
       })
 
+      isLucene &&
+        it("in lucene, cannot override a view filter", async () => {
+          await config.api.row.save(table._id!, {
+            one: "foo",
+            two: "bar",
+          })
+          const two = await config.api.row.save(table._id!, {
+            one: "foo2",
+            two: "bar2",
+          })
+
+          const view = await config.api.viewV2.create({
+            tableId: table._id!,
+            name: generator.guid(),
+            query: [
+              {
+                operator: BasicOperator.EQUAL,
+                field: "two",
+                value: "bar2",
+              },
+            ],
+            schema: {
+              id: { visible: true },
+              one: { visible: false },
+              two: { visible: true },
+            },
+          })
+
+          const response = await config.api.viewV2.search(view.id, {
+            query: {
+              equal: {
+                two: "bar",
+              },
+            },
+          })
+          expect(response.rows).toHaveLength(1)
+          expect(response.rows).toEqual([
+            expect.objectContaining({ _id: two._id }),
+          ])
+        })
+
+      !isLucene &&
       it("can filter a view without a view filter", async () => {
         const one = await config.api.row.save(table._id!, {
           one: "foo",
@@ -1519,6 +1561,7 @@ describe.each([
         ])
       })
 
+      !isLucene &&
       it("cannot bypass a view filter", async () => {
         await config.api.row.save(table._id!, {
           one: "foo",