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

Review feedback changes. Changed 'Code' labelling to 'Scanned Code'

This commit is contained in:
Dean 2022-10-06 13:02:17 +01:00
parent e060db2929
commit 4b5fa6a093
13 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -138,7 +138,7 @@ const fieldTypeToComponentMap = {
attachment: "attachmentfield",
link: "relationshipfield",
json: "jsonfield",
code: "codescanner",
scannedcode: "codescanner",
}
export function makeDatasourceFormComponents(datasource) {

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

@ -261,7 +261,7 @@
} else {
return [
FIELDS.STRING,
FIELDS.CODE,
FIELDS.SCANNEDCODE,
FIELDS.LONGFORM,
FIELDS.OPTIONS,
FIELDS.DATETIME,

4
packages/builder/src/components/backend/TableNavigator/TableDataImport.svelte
View File

@ -125,8 +125,8 @@
value: FIELDS.ARRAY.type,
},
{
label: "Code",
value: FIELDS.CODE.type,
label: "Scanned Code",
value: FIELDS.SCANNEDCODE.type,
},
]
</script>

2
packages/builder/src/components/design/settings/componentSettings.js
View File

@ -51,7 +51,7 @@ const componentMap = {
"field/link": FormFieldSelect,
"field/array": FormFieldSelect,
"field/json": FormFieldSelect,
"field/code": FormFieldSelect,
"field/scannedcode": FormFieldSelect,
// Some validation types are the same as others, so not all types are
// explicitly listed here. e.g. options uses string validation
"validation/string": ValidationEditor,

2
packages/builder/src/components/design/settings/controls/FormFieldSelect.svelte
View File

@ -26,7 +26,7 @@
let entries = Object.entries(schema ?? {})
let types = []
if ((type === "field/options", type === "field/code")) {
if ((type === "field/options", type === "field/scannedcode")) {
// allow options to be used on both options and string fields
types = [type, "field/string"]
} else {

8
packages/builder/src/constants/backend/index.js
View File

@ -8,9 +8,9 @@ export const FIELDS = {
presence: false,
},
},
CODE: {
name: "Code",
type: "code",
SCANNEDCODE: {
name: "Scanned Code",
type: "scannedcode",
constraints: {
type: "string",
length: {},
@ -157,7 +157,7 @@ export const ALLOWABLE_STRING_OPTIONS = [
FIELDS.STRING,
FIELDS.OPTIONS,
FIELDS.LONGFORM,
FIELDS.CODE,
FIELDS.SCANNEDCODE,
]
export const ALLOWABLE_STRING_TYPES = ALLOWABLE_STRING_OPTIONS.map(
opt => opt.type

2
packages/client/manifest.json
View File

@ -3169,7 +3169,7 @@
],
"settings": [
{
"type": "field/code",
"type": "field/scannedcode",
"label": "Field",
"key": "field",
"required": true

2
packages/client/src/components/app/forms/CodeScannerField.svelte
View File

@ -4,7 +4,7 @@
export let field
export let label
export let type = "code"
export let type = "scannedcode"
export let disabled = false
export let validation
export let defaultValue = ""

2
packages/client/src/constants.js
View File

@ -1,6 +1,6 @@
export const FieldTypes = {
STRING: "string",
CODE: "code",
SCANNEDCODE: "scannedcode",
LONGFORM: "longform",
OPTIONS: "options",
NUMBER: "number",

4
packages/server/src/constants/index.js
View File

@ -31,7 +31,7 @@ exports.NoEmptyFilterStrings = [
exports.FieldTypes = {
STRING: "string",
CODE: "code",
SCANNEDCODE: "scannedcode",
LONGFORM: "longform",
OPTIONS: "options",
NUMBER: "number",
@ -52,7 +52,7 @@ exports.CanSwitchTypes = [
exports.FieldTypes.STRING,
exports.FieldTypes.OPTIONS,
exports.FieldTypes.LONGFORM,
exports.FieldTypes.CODE,
exports.FieldTypes.SCANNEDCODE,
],
[exports.FieldTypes.BOOLEAN, exports.FieldTypes.NUMBER],
]

2
packages/server/src/integrations/base/sqlTable.ts
View File

@ -40,7 +40,7 @@ function generateSchema(
case FieldTypes.STRING:
case FieldTypes.OPTIONS:
case FieldTypes.LONGFORM:
case FieldTypes.CODE:
case FieldTypes.SCANNEDCODE:
schema.text(key)
break
case FieldTypes.NUMBER:

2
packages/server/src/utilities/csvParser.js
View File

@ -4,7 +4,7 @@ const { FieldTypes } = require("../constants")
const VALIDATORS = {
[FieldTypes.STRING]: () => true,
[FieldTypes.OPTIONS]: () => true,
[FieldTypes.CODE]: () => true,
[FieldTypes.SCANNEDCODE]: () => true,
[FieldTypes.NUMBER]: attribute => {
// allow not to be present
if (!attribute) {

2
packages/server/src/utilities/rowProcessor/index.js
View File

@ -48,7 +48,7 @@ const TYPE_TRANSFORM_MAP = {
[null]: "",
[undefined]: undefined,
},
[FieldTypes.CODE]: {
[FieldTypes.SCANNEDCODE]: {
"": "",
[null]: "",
[undefined]: undefined,