{#each schemaFields as [field, schema]}
{#if !schema.autocolumn && schema.type !== "attachment"}
-
onChange(e, field)}
- {bindings}
- allowJS={true}
- updateOnChange={false}
- drawerLeft="260px"
- >
+ {#if isTestModal}
-
+ {:else}
+
onChange(e, field)}
+ {bindings}
+ allowJS={true}
+ updateOnChange={false}
+ drawerLeft="260px"
+ >
+
+
+ {/if}
{/if}
{#if isUpdateRow && schema.type === "link"}
diff --git a/packages/builder/src/components/backend/DataTable/TableDataTable.svelte b/packages/builder/src/components/backend/DataTable/TableDataTable.svelte
index 2b7cde9201..5fee849afb 100644
--- a/packages/builder/src/components/backend/DataTable/TableDataTable.svelte
+++ b/packages/builder/src/components/backend/DataTable/TableDataTable.svelte
@@ -4,6 +4,7 @@
import { TableNames } from "constants"
import { Grid } from "@budibase/frontend-core"
import { API } from "api"
+ import { store } from "builderStore"
import GridAddColumnModal from "components/backend/DataTable/modals/grid/GridCreateColumnModal.svelte"
import GridCreateEditRowModal from "components/backend/DataTable/modals/grid/GridCreateEditRowModal.svelte"
import GridEditUserModal from "components/backend/DataTable/modals/grid/GridEditUserModal.svelte"
@@ -17,11 +18,11 @@
import GridUsersTableButton from "components/backend/DataTable/modals/grid/GridUsersTableButton.svelte"
const userSchemaOverrides = {
- firstName: { displayName: "First name" },
- lastName: { displayName: "Last name" },
- email: { displayName: "Email" },
- roleId: { displayName: "Role" },
- status: { displayName: "Status" },
+ firstName: { displayName: "First name", disabled: true },
+ lastName: { displayName: "Last name", disabled: true },
+ email: { displayName: "Email", disabled: true },
+ roleId: { displayName: "Role", disabled: true },
+ status: { displayName: "Status", disabled: true },
}
$: id = $tables.selected?._id
@@ -60,14 +61,14 @@
datasource={gridDatasource}
canAddRows={!isUsersTable}
canDeleteRows={!isUsersTable}
- canEditRows={!isUsersTable}
- canEditColumns={!isUsersTable}
+ canEditRows={!isUsersTable || !$store.features.disableUserMetadata}
+ canEditColumns={!isUsersTable || !$store.features.disableUserMetadata}
schemaOverrides={isUsersTable ? userSchemaOverrides : null}
showAvatars={false}
on:updatedatasource={handleGridTableUpdate}
>
- {#if isUsersTable}
+ {#if isUsersTable && $store.features.disableUserMetadata}
{/if}
diff --git a/packages/builder/src/components/backend/DataTable/buttons/TableFilterButton.svelte b/packages/builder/src/components/backend/DataTable/buttons/TableFilterButton.svelte
index 23f6d1dea1..91456da655 100644
--- a/packages/builder/src/components/backend/DataTable/buttons/TableFilterButton.svelte
+++ b/packages/builder/src/components/backend/DataTable/buttons/TableFilterButton.svelte
@@ -13,7 +13,13 @@
let modal
$: tempValue = filters || []
- $: schemaFields = Object.values(schema || {})
+ $: schemaFields = Object.entries(schema || {}).map(
+ ([fieldName, fieldSchema]) => ({
+ name: fieldName, // Using the key as name if not defined in the schema, for example in some autogenerated columns
+ ...fieldSchema,
+ })
+ )
+
$: text = getText(filters)
$: selected = tempValue.filter(x => !x.onEmptyFilter)?.length > 0
diff --git a/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte b/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte
index c67ce67d57..7b51e6c839 100644
--- a/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte
+++ b/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte
@@ -33,17 +33,16 @@
import { getBindings } from "components/backend/DataTable/formula"
import JSONSchemaModal from "./JSONSchemaModal.svelte"
import { ValidColumnNameRegex } from "@budibase/shared-core"
- import { FieldType } from "@budibase/types"
+ import { FieldType, FieldSubtype, SourceName } from "@budibase/types"
import RelationshipSelector from "components/common/RelationshipSelector.svelte"
- const AUTO_TYPE = "auto"
+ const AUTO_TYPE = FIELDS.AUTO.type
const FORMULA_TYPE = FIELDS.FORMULA.type
const LINK_TYPE = FIELDS.LINK.type
const STRING_TYPE = FIELDS.STRING.type
const NUMBER_TYPE = FIELDS.NUMBER.type
const JSON_TYPE = FIELDS.JSON.type
const DATE_TYPE = FIELDS.DATETIME.type
- const USER_REFRENCE_TYPE = FIELDS.BB_REFERENCE_USER.compositeType
const dispatch = createEventDispatcher()
const PROHIBITED_COLUMN_NAMES = ["type", "_id", "_rev", "tableId"]
@@ -52,7 +51,24 @@
export let field
let mounted = false
- let fieldDefinitions = cloneDeep(FIELDS)
+ const fieldDefinitions = Object.values(FIELDS).reduce(
+ // Storing the fields by complex field id
+ (acc, field) => ({
+ ...acc,
+ [makeFieldId(field.type, field.subtype)]: field,
+ }),
+ {}
+ )
+
+ function makeFieldId(type, subtype, autocolumn) {
+ // don't make field IDs for auto types
+ if (type === AUTO_TYPE || autocolumn) {
+ return type.toUpperCase()
+ } else {
+ return `${type}${subtype || ""}`.toUpperCase()
+ }
+ }
+
let originalName
let linkEditDisabled
let primaryDisplay
@@ -72,8 +88,8 @@
let jsonSchemaModal
let allowedTypes = []
let editableColumn = {
- type: fieldDefinitions.STRING.type,
- constraints: fieldDefinitions.STRING.constraints,
+ type: FIELDS.STRING.type,
+ constraints: FIELDS.STRING.constraints,
// Initial value for column name in other table for linked records
fieldName: $tables.selected.name,
}
@@ -139,9 +155,6 @@
$tables.selected.primaryDisplay == null ||
$tables.selected.primaryDisplay === editableColumn.name
- if (editableColumn.type === FieldType.BB_REFERENCE) {
- editableColumn.type = `${editableColumn.type}_${editableColumn.subtype}`
- }
// Here we are setting the relationship values based on the editableColumn
// This part of the code is used when viewing an existing field hence the check
// for the tableId
@@ -172,7 +185,18 @@
}
}
- allowedTypes = getAllowedTypes()
+ if (!savingColumn) {
+ editableColumn.fieldId = makeFieldId(
+ editableColumn.type,
+ editableColumn.subtype,
+ editableColumn.autocolumn
+ )
+
+ allowedTypes = getAllowedTypes().map(t => ({
+ fieldId: makeFieldId(t.type, t.subtype),
+ ...t,
+ }))
+ }
}
$: initialiseField(field, savingColumn)
@@ -249,13 +273,7 @@
let saveColumn = cloneDeep(editableColumn)
- // Handle types on composite types
- const definition = fieldDefinitions[saveColumn.type.toUpperCase()]
- if (definition && saveColumn.type === definition.compositeType) {
- saveColumn.type = definition.type
- saveColumn.subtype = definition.subtype
- delete saveColumn.compositeType
- }
+ delete saveColumn.fieldId
if (saveColumn.type === AUTO_TYPE) {
saveColumn = buildAutoColumn(
@@ -320,27 +338,33 @@
}
}
- function handleTypeChange(event) {
+ function onHandleTypeChange(event) {
+ handleTypeChange(event.detail)
+ }
+
+ function handleTypeChange(type) {
// remove any extra fields that may not be related to this type
delete editableColumn.autocolumn
delete editableColumn.subtype
delete editableColumn.tableId
delete editableColumn.relationshipType
delete editableColumn.formulaType
+ delete editableColumn.constraints
// Add in defaults and initial definition
- const definition = fieldDefinitions[event.detail?.toUpperCase()]
+ const definition = fieldDefinitions[type?.toUpperCase()]
if (definition?.constraints) {
editableColumn.constraints = definition.constraints
}
+ editableColumn.type = definition.type
+ editableColumn.subtype = definition.subtype
+
// Default relationships many to many
if (editableColumn.type === LINK_TYPE) {
editableColumn.relationshipType = RelationshipType.MANY_TO_MANY
} else if (editableColumn.type === FORMULA_TYPE) {
editableColumn.formulaType = "dynamic"
- } else if (editableColumn.type === USER_REFRENCE_TYPE) {
- editableColumn.relationshipType = RelationshipType.ONE_TO_MANY
}
}
@@ -381,10 +405,27 @@
return ALLOWABLE_NUMBER_OPTIONS
}
+ const isUsers =
+ editableColumn.type === FieldType.BB_REFERENCE &&
+ editableColumn.subtype === FieldSubtype.USERS
+
if (!external) {
return [
- ...Object.values(fieldDefinitions),
- { name: "Auto Column", type: AUTO_TYPE },
+ FIELDS.STRING,
+ FIELDS.BARCODEQR,
+ FIELDS.LONGFORM,
+ FIELDS.OPTIONS,
+ FIELDS.ARRAY,
+ FIELDS.NUMBER,
+ FIELDS.BIGINT,
+ FIELDS.BOOLEAN,
+ FIELDS.DATETIME,
+ FIELDS.ATTACHMENT,
+ FIELDS.LINK,
+ FIELDS.FORMULA,
+ FIELDS.JSON,
+ isUsers ? FIELDS.USERS : FIELDS.USER,
+ FIELDS.AUTO,
]
} else {
let fields = [
@@ -397,7 +438,7 @@
FIELDS.BOOLEAN,
FIELDS.FORMULA,
FIELDS.BIGINT,
- FIELDS.BB_REFERENCE_USER,
+ isUsers ? FIELDS.USERS : FIELDS.USER,
]
// no-sql or a spreadsheet
if (!external || table.sql) {
@@ -472,6 +513,13 @@
return newError
}
+ function isUsersColumn(column) {
+ return (
+ column.type === FieldType.BB_REFERENCE &&
+ [FieldSubtype.USER, FieldSubtype.USERS].includes(column.subtype)
+ )
+ }
+
onMount(() => {
mounted = true
})
@@ -489,14 +537,14 @@
{/if}