Fix #2209 - views, calculations and group by can't support formula or link fields, making sure these aren't options in the UI. Also fixing an issue where formula values were being saved to DB.

This commit is contained in:
mike12345567 2021-08-04 15:22:41 +01:00
parent a18a3c1ff1
commit 56cf236ebf
3 changed files with 18 additions and 7 deletions

View File

@ -2,6 +2,7 @@
import { Select, Label, notifications, ModalContent } from "@budibase/bbui" import { Select, Label, notifications, ModalContent } from "@budibase/bbui"
import { tables, views } from "stores/backend" import { tables, views } from "stores/backend"
import analytics from "analytics" import analytics from "analytics"
import { FIELDS } from "constants/backend"
const CALCULATIONS = [ const CALCULATIONS = [
{ {
@ -26,11 +27,15 @@
$: fields = $: fields =
viewTable && viewTable &&
Object.keys(viewTable.schema).filter( Object.keys(viewTable.schema).filter(
field => fieldName => {
view.calculation === "count" || const field = viewTable.schema[fieldName]
return field.type !== FIELDS.FORMULA.type && field.type !== FIELDS.LINK.type &&
(view.calculation === "count" ||
// don't want to perform calculations based on auto ID // don't want to perform calculations based on auto ID
(viewTable.schema[field].type === "number" && (field.type === "number" &&
!viewTable.schema[field].autocolumn) !field.autocolumn))
}
) )
function saveView() { function saveView() {

View File

@ -11,7 +11,7 @@
$: fields = $: fields =
viewTable && viewTable &&
Object.entries(viewTable.schema) Object.entries(viewTable.schema)
.filter(entry => entry[1].type !== FIELDS.LINK.type) .filter(entry => entry[1].type !== FIELDS.LINK.type && entry[1].type !== FIELDS.FORMULA.type)
.map(([key]) => key) .map(([key]) => key)
function saveView() { function saveView() {

View File

@ -184,8 +184,14 @@ exports.inputProcessing = (user = {}, table, row) => {
} }
continue continue
} }
// specific case to delete formula values if they get saved
// type coercion cannot completely remove the field, so have to do it here
if (field.type === FieldTypes.FORMULA) {
delete clonedRow[key]
} else {
clonedRow[key] = exports.coerce(value, field.type) clonedRow[key] = exports.coerce(value, field.type)
} }
}
// handle auto columns - this returns an object like {table, row} // handle auto columns - this returns an object like {table, row}
return processAutoColumn(user, copiedTable, clonedRow) return processAutoColumn(user, copiedTable, clonedRow)
} }