CodeMirror/budibase
1
0
Fork 0
mirror of synced 2024-09-20 11:27:56 +12:00
Code Issues Projects Releases Wiki Activity

Merge pull request #14210 from Budibase/fix/formula-type-picker

Browse source 
Fix to show Formula column type picker again
This commit is contained in:
deanhannigan 2024-07-22 14:03:43 +01:00 committed by GitHub
commit fddfc77ffa
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte
View file

@ -682,7 +682,7 @@
{errors} {errors}
/> />
{:else if editableColumn.type === FORMULA_TYPE} {:else if editableColumn.type === FORMULA_TYPE}
{#if !table.sql} {#if !externalTable}
<div class="split-label"> <div class="split-label">
<div class="label-length"> <div class="label-length">
<Label size="M">Formula Type</Label> <Label size="M">Formula Type</Label>

4
packages/builder/src/dataBinding.js
View file

@ -29,7 +29,7 @@ import { JSONUtils, Constants } from "@budibase/frontend-core"
import ActionDefinitions from "components/design/settings/controls/ButtonActionEditor/manifest.json" import ActionDefinitions from "components/design/settings/controls/ButtonActionEditor/manifest.json"
import { environment, licensing } from "stores/portal" import { environment, licensing } from "stores/portal"
import { convertOldFieldFormat } from "components/design/settings/controls/FieldConfiguration/utils" import { convertOldFieldFormat } from "components/design/settings/controls/FieldConfiguration/utils"
import { FIELDS } from "constants/backend" import { FIELDS, DB_TYPE_INTERNAL } from "constants/backend"
import { FieldType } from "@budibase/types" import { FieldType } from "@budibase/types"
const { ContextScopes } = Constants const { ContextScopes } = Constants
@ -991,7 +991,7 @@ export const getSchemaForDatasource = (asset, datasource, options) => {
} }
// Determine if we should add ID and rev to the schema // Determine if we should add ID and rev to the schema
const isInternal = table && !table.sql const isInternal = table && table?.sourceType === DB_TYPE_INTERNAL
const isDSPlus = ["table", "link", "viewV2"].includes(datasource.type) const isDSPlus = ["table", "link", "viewV2"].includes(datasource.type)
// ID is part of the readable schema for all tables // ID is part of the readable schema for all tables