MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #744 from Budibase/fix-issues 

Fix Calculation View Issues In App Components
This commit is contained in:
Martin McKeaveney 2020-10-17 12:16:27 +01:00 committed by GitHub
parent 51c41243eb 4d3fb4f847
commit 9ed321a797
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/builder/src/pages/index.svelte
View File

@ -66,7 +66,7 @@
</div> </div>
</div> </div>
<TemplateList onSelect={selectTemplate} /> <!-- <TemplateList onSelect={selectTemplate} /> -->
<AppList /> <AppList />
</div> </div>

1
packages/server/src/api/index.js
View File

@ -51,6 +51,7 @@ router
process.env.NODE_ENV !== "cypress" process.env.NODE_ENV !== "cypress"
await next() await next()
}) })
.use("/health", ctx => (ctx.status = 200))
.use(authenticated) .use(authenticated)
// error handling middleware // error handling middleware

11
packages/standard-components/src/fetchData.js
View File

@ -46,13 +46,18 @@ export default async function fetchData(datasource, store) {
} }
async function fetchViewData() { async function fetchViewData() {
const { field, groupBy } = datasource const { field, groupBy, calculation } = datasource
const params = new URLSearchParams() const params = new URLSearchParams()
if (field) { if (calculation) {
params.set("field", field) params.set("field", field)
params.set("stats", true) params.set("calculation", calculation)
} }
if (groupBy) {
params.set("group", groupBy)
}
if (groupBy) params.set("group", groupBy) if (groupBy) params.set("group", groupBy)
let QUERY_VIEW_URL = field let QUERY_VIEW_URL = field