Merge branch 'master' into fix/uuid-hbs-to-js

lerna.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.15.0",
+  "version": "2.15.1",
   "npmClient": "yarn",
   "packages": [
     "packages/*",

packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte

@@ -172,22 +172,6 @@
         }
       }
     }
-    if (!savingColumn && !originalName) {
-      let highestNumber = 0
-      Object.keys(table.schema).forEach(columnName => {
-        const columnNumber = extractColumnNumber(columnName)
-        if (columnNumber > highestNumber) {
-          highestNumber = columnNumber
-        }
-        return highestNumber
-      })
-
-      if (highestNumber >= 1) {
-        editableColumn.name = `Column 0${highestNumber + 1}`
-      } else {
-        editableColumn.name = "Column 01"
-      }
-    }
 
     if (!savingColumn) {
       editableColumn.fieldId = makeFieldId(
@@ -389,11 +373,6 @@
     deleteColName = ""
   }
 
-  function extractColumnNumber(columnName) {
-    const match = columnName.match(/Column (\d+)/)
-    return match ? parseInt(match[1]) : 0
-  }
-
   function getAllowedTypes() {
     if (
       originalName &&

packages/builder/src/components/backend/TableNavigator/popovers/EditTablePopover.svelte

@@ -17,7 +17,7 @@
 
   export let table
 
-  let editorModal
+  let editorModal, editTableNameModal
   let confirmDeleteDialog
   let error = ""
 
@@ -101,18 +101,21 @@
 
 <Modal bind:this={editorModal} on:show={initForm}>
   <ModalContent
+    bind:this={editTableNameModal}
     title="Edit Table"
     confirmText="Save"
     onConfirm={save}
     disabled={updatedName === originalName || error}
   >
-    <Input
+    <form on:submit|preventDefault={() => editTableNameModal.confirm()}>
-      label="Table Name"
+      <Input
-      thin
+        label="Table Name"
-      bind:value={updatedName}
+        thin
-      on:input={checkValid}
+        bind:value={updatedName}
-      {error}
+        on:input={checkValid}
-    />
+        {error}
+      />
+    </form>
   </ModalContent>
 </Modal>
 <ConfirmDialog

packages/client/src/components/app/blocks/CardsBlock.svelte

@@ -88,7 +88,7 @@
     <BlockComponent
       type="form"
       bind:id={formId}
-      props={{ dataSource, disableValidation: true }}
+      props={{ dataSource, disableSchemaValidation: true }}
     >
       {#if title || enrichedSearchColumns?.length || showTitleButton}
         <BlockComponent

packages/client/src/components/app/blocks/TableBlock.svelte

@@ -147,7 +147,7 @@
       bind:id={formId}
       props={{
         dataSource,
-        disableValidation: true,
+        disableSchemaValidation: true,
         editAutoColumns: true,
         size,
       }}

packages/client/src/components/app/forms/Form.svelte

@@ -14,7 +14,7 @@
 
   // Not exposed as a builder setting. Used internally to disable validation
   // for fields rendered in things like search blocks.
-  export let disableValidation = false
+  export let disableSchemaValidation = false
 
   // Not exposed as a builder setting. Used internally to allow searching on
   // auto columns.
@@ -103,7 +103,7 @@
       {schema}
       {table}
       {initialValues}
-      {disableValidation}
+      {disableSchemaValidation}
       {editAutoColumns}
       {currentStep}
     >

packages/client/src/components/app/forms/InnerForm.svelte

@@ -11,7 +11,7 @@
   export let size
   export let schema
   export let table
-  export let disableValidation = false
+  export let disableSchemaValidation = false
   export let editAutoColumns = false
 
   // We export this store so that when we remount the inner form we can still
@@ -156,17 +156,16 @@
       if (!field) {
         return
       }
-
       // Create validation function based on field schema
-      const schemaConstraints = schema?.[field]?.constraints
+      const schemaConstraints = disableSchemaValidation
-      const validator = disableValidation
         ? null
-        : createValidatorFromConstraints(
+        : schema?.[field]?.constraints
-            schemaConstraints,
+      const validator = createValidatorFromConstraints(
-            validationRules,
+        schemaConstraints,
-            field,
+        validationRules,
-            table
+        field,
-          )
+        table
+      )
 
       // Sanitise the default value to ensure it doesn't contain invalid data
       defaultValue = sanitiseValue(defaultValue, schema?.[field], type)
@@ -332,15 +331,15 @@
       const { value, error } = fieldState
 
       // Create new validator
-      const schemaConstraints = schema?.[field]?.constraints
+      const schemaConstraints = disableSchemaValidation
-      const validator = disableValidation
         ? null
-        : createValidatorFromConstraints(
+        : schema?.[field]?.constraints
-            schemaConstraints,
+      const validator = createValidatorFromConstraints(
-            validationRules,
+        schemaConstraints,
-            field,
+        validationRules,
-            table
+        field,
-          )
+        table
+      )
 
       // Update validator
       fieldInfo.update(state => {

yarn.lock

@@ -6290,6 +6290,11 @@
     js-yaml "^3.10.0"
     tslib "^2.4.0"
 
+"@zerodevx/svelte-json-view@^1.0.7":
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/@zerodevx/svelte-json-view/-/svelte-json-view-1.0.7.tgz#abf3efa71dedcb3e9d16bc9cc61d5ea98c8d00b1"
+  integrity sha512-yW0MV+9BCKOwzt3h86y3xDqYdI5st+Rxk+L5pa0Utq7nlPD+VvxyhL7R1gJoLxQvWwjyAvY/fyUCFTdwDyI14w==
+
 "@zkochan/js-yaml@0.0.6":
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/@zkochan/js-yaml/-/js-yaml-0.0.6.tgz#975f0b306e705e28b8068a07737fa46d3fc04826"