Merge pull request #744 from Budibase/fix-issues
Fix Calculation View Issues In App Components
This commit is contained in:
commit
500be144ef
|
@ -66,7 +66,7 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<TemplateList onSelect={selectTemplate} />
|
||||
<!-- <TemplateList onSelect={selectTemplate} /> -->
|
||||
|
||||
<AppList />
|
||||
</div>
|
||||
|
|
|
@ -51,6 +51,7 @@ router
|
|||
process.env.NODE_ENV !== "cypress"
|
||||
await next()
|
||||
})
|
||||
.use("/health", ctx => (ctx.status = 200))
|
||||
.use(authenticated)
|
||||
|
||||
// error handling middleware
|
||||
|
|
|
@ -46,13 +46,18 @@ export default async function fetchData(datasource, store) {
|
|||
}
|
||||
|
||||
async function fetchViewData() {
|
||||
const { field, groupBy } = datasource
|
||||
const { field, groupBy, calculation } = datasource
|
||||
const params = new URLSearchParams()
|
||||
|
||||
if (field) {
|
||||
if (calculation) {
|
||||
params.set("field", field)
|
||||
params.set("stats", true)
|
||||
params.set("calculation", calculation)
|
||||
}
|
||||
|
||||
if (groupBy) {
|
||||
params.set("group", groupBy)
|
||||
}
|
||||
|
||||
if (groupBy) params.set("group", groupBy)
|
||||
|
||||
let QUERY_VIEW_URL = field
|
||||
|
|
Loading…
Reference in New Issue