Merge pull request #3142 from Budibase/scope-or-view

Scope view filters to table always

packages/server/src/api/controllers/view/tests/__snapshots__/viewBuilder.spec.js.snap

@@ -44,7 +44,7 @@ Object {
 exports[`viewBuilder Filter creates a view with multiple filters and conjunctions 1`] = `
 Object {
   "map": "function (doc) {
-      if (doc.tableId === \\"14f1c4e94d6a47b682ce89d35d4c78b0\\" && doc[\\"Name\\"] === \\"Test\\" || doc[\\"Yes\\"] > \\"Value\\") {
+      if (doc.tableId === \\"14f1c4e94d6a47b682ce89d35d4c78b0\\" && (doc[\\"Name\\"] === \\"Test\\" || doc[\\"Yes\\"] > \\"Value\\")) {
         emit(doc[\\"_id\\"], doc[\\"undefined\\"]);
       }
     }",

packages/server/src/api/controllers/view/viewBuilder.js

@@ -126,7 +126,7 @@ function viewTemplate({ field, tableId, groupBy, filters = [], calculation }) {
     delete filters[0].conjunction
   }
   const parsedFilters = parseFilterExpression(filters)
-  const filterExpression = parsedFilters ? `&& ${parsedFilters}` : ""
+  const filterExpression = parsedFilters ? `&& (${parsedFilters})` : ""
 
   const emitExpression = parseEmitExpression(field, groupBy)