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

lint fix

This commit is contained in:
Keviin Åberg Kultalahti 2021-02-19 13:56:24 +01:00
parent 78ee1edf40
commit b89573e1f2
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
packages/builder/src/builderStore/store/backend.js
View File

@ -234,7 +234,13 @@ export const getBackendUiStore = () => {
return state return state
}) })
}, },
saveField: ({ originalName, field, primaryDisplay = false, indexes, relationshipType }) => { saveField: ({
originalName,
field,
primaryDisplay = false,
indexes,
relationshipType,
}) => {
store.update(state => { store.update(state => {
// delete the original if renaming // delete the original if renaming
// need to handle if the column had no name, empty string // need to handle if the column had no name, empty string
@ -250,9 +256,9 @@ export const getBackendUiStore = () => {
if (primaryDisplay) { if (primaryDisplay) {
state.draftTable.primaryDisplay = field.name state.draftTable.primaryDisplay = field.name
} }
// Set relationship type // Set relationship type
if (field.type === 'link') { if (field.type === "link") {
state.draftTable.relationshipType = relationshipType state.draftTable.relationshipType = relationshipType
} }

5
packages/builder/src/builderStore/store/screenTemplates/utils/commonComponents.js
View File

@ -199,7 +199,10 @@ export function makeDatasourceFormComponents(datasource) {
component.customProps({ placeholder: "Choose an option " }) component.customProps({ placeholder: "Choose an option " })
} }
if (fieldType === "link") { if (fieldType === "link") {
let placeholder = fieldSchema.relationshipType === 'one-to-many' ? 'Choose an option' : 'Choose some options' let placeholder =
fieldSchema.relationshipType === "one-to-many"
? "Choose an option"
: "Choose some options"
component.customProps({ placeholder }) component.customProps({ placeholder })
} }
if (fieldType === "boolean") { if (fieldType === "boolean") {