Browse Source

Merge branch 'fix/lucene-filtering' of github.com:Budibase/budibase into feature/multi-tenants

pull/4023/head
mike12345567 5 years ago
parent
commit
26582f5ceb
  1. 5
      packages/client/src/api/api.js
  2. 8
      packages/client/src/constants.js
  3. 2
      packages/server/src/api/controllers/row/internalSearch.js

5
packages/client/src/api/api.js

@ -1,7 +1,9 @@
import { notificationStore } from "../store"
import { ApiVersion } from "../constants"
/**
* API cache for cached request responses.
*/
import { notificationStore } from "../store"
let cache = {}
/**
@ -22,6 +24,7 @@ const makeApiCall = async ({ method, url, body, json = true }) => {
const headers = {
Accept: "application/json",
"x-budibase-app-id": window["##BUDIBASE_APP_ID##"],
"x-budibase-api-version": ApiVersion,
...(json && { "Content-Type": "application/json" }),
...(!inBuilder && { "x-budibase-type": "client" }),
}

8
packages/client/src/constants.js

@ -7,3 +7,11 @@ export const ActionTypes = {
RefreshDatasource: "RefreshDatasource",
SetDataProviderQuery: "SetDataProviderQuery",
}
export const ApiVersion = "1"
/**
* API Version Changelog
* v1:
* - Coerce types for search endpoint
*/

2
packages/server/src/api/controllers/row/internalSearch.js

@ -28,6 +28,7 @@ class QueryBuilder {
setVersion(version) {
this.version = version
return this
}
setTable(tableId) {
@ -335,6 +336,7 @@ exports.paginatedSearch = async (appId, query, params) => {
}
limit = Math.min(limit, 200)
const search = new QueryBuilder(appId, query)
.setVersion(params.version)
.setTable(params.tableId)
.setSort(params.sort)
.setSortOrder(params.sortOrder)

Loading…
Cancel
Save