wip

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

@@ -144,7 +144,7 @@ describe.each([
         })
       })
 
-      it("can persist views with all fields", async () => {
+      it.only("can persist views with all fields", async () => {
         const newView: Required<Omit<CreateViewRequest, "queryUI" | "type">> = {
           name: generator.name(),
           tableId: table._id!,
@@ -178,6 +178,7 @@ describe.each([
               visible: true,
             },
           },
+          queryUI: {},
           id: expect.any(String),
           version: 2,
         })

packages/server/src/sdk/app/views/internal.ts

@@ -4,6 +4,19 @@ import { context, HTTPError } from "@budibase/backend-core"
 import sdk from "../../../sdk"
 import * as utils from "../../../db/utils"
 import { enrichSchema, isV2 } from "."
+import { utils as sharedUtils, dataFilters } from "@budibase/shared-core"
+
+function ensureQueryUISet(view: ViewV2) {
+  if (!view.queryUI && view.query) {
+    view.queryUI = sharedUtils.processSearchFilters(view.query)
+  }
+}
+
+function ensureQuerySet(view: ViewV2) {
+  if (!view.query && view.queryUI) {
+    view.query = dataFilters.buildQuery(view.queryUI)
+  }
+}
 
 export async function get(viewId: string): Promise<ViewV2> {
   const { tableId } = utils.extractViewInfoFromID(viewId)
@@ -13,6 +26,7 @@ export async function get(viewId: string): Promise<ViewV2> {
   if (!found) {
     throw new Error("No view found")
   }
+  ensureQueryUISet(found)
   return found
 }
 
@@ -24,6 +38,7 @@ export async function getEnriched(viewId: string): Promise<ViewV2Enriched> {
   if (!found) {
     throw new Error("No view found")
   }
+  ensureQueryUISet(found)
   return await enrichSchema(found, table.schema)
 }
 

packages/shared-core/src/filters.ts

@@ -572,19 +572,25 @@ export const buildQueryLegacy = (
  *
  * @returns {SearchFilters}
  */
-
+export function buildQuery(filter: undefined): undefined
-export const buildQuery = (
+export function buildQuery(
+  filter: SearchFilterGroup | LegacyFilter[]
+): SearchFilters
+export function buildQuery(
   filter?: SearchFilterGroup | LegacyFilter[]
-): SearchFilters | undefined => {
+): SearchFilters | undefined {
-  const parsedFilter: SearchFilterGroup | undefined =
+  if (!filter) {
-    processSearchFilters(filter)
-
-  if (!parsedFilter) {
     return
   }
 
-  const operatorMap: { [key in FilterGroupLogicalOperator]: LogicalOperator } =
+  let parsedFilter: SearchFilterGroup
-    {
+  if (Array.isArray(filter)) {
+    parsedFilter = processSearchFilters(filter)
+  } else {
+    parsedFilter = filter
+  }
+
+  const operatorMap = {
     [FilterGroupLogicalOperator.ALL]: LogicalOperator.AND,
     [FilterGroupLogicalOperator.ANY]: LogicalOperator.OR,
   }
@@ -593,8 +599,7 @@ export const buildQuery = (
     ? parsedFilter.onEmptyFilter
     : null
 
-  const globalOperator: LogicalOperator =
+  const globalOperator = operatorMap[parsedFilter.logicalOperator]
-    operatorMap[parsedFilter.logicalOperator as FilterGroupLogicalOperator]
 
   return {
     ...(globalOnEmpty ? { onEmptyFilter: globalOnEmpty } : {}),

packages/shared-core/src/utils.ts

@@ -137,12 +137,8 @@ export function isSupportedUserSearch(query: SearchFilters) {
  * @param {LegacyFilter[] | SearchFilterGroup} filters
  */
 export const processSearchFilters = (
-  filters: LegacyFilter[] | SearchFilterGroup | undefined
+  filters: LegacyFilter[]
-): SearchFilterGroup | undefined => {
+): SearchFilterGroup => {
-  if (!filters) {
-    return
-  }
-
   // Base search config.
   const defaultCfg: SearchFilterGroup = {
     logicalOperator: FilterGroupLogicalOperator.ALL,
@@ -160,7 +156,6 @@ export const processSearchFilters = (
     "formulaType",
   ]
 
-  if (Array.isArray(filters)) {
   let baseGroup: SearchFilterGroup = {
     filters: [],
     logicalOperator: FilterGroupLogicalOperator.ALL,
@@ -217,8 +212,4 @@ export const processSearchFilters = (
 
     return acc
   }, defaultCfg)
-  } else if (!filters?.groups) {
-    return
-  }
-  return filters
 }