Merge branch 'linked-records' of github.com:Budibase/budibase into linked-records

packages/builder/src/components/backend/DataTable/popovers/ColumnHeader.svelte

@@ -15,6 +15,7 @@
 
   $: sortColumn = $backendUiStore.sort && $backendUiStore.sort.column
   $: sortDirection = $backendUiStore.sort && $backendUiStore.sort.direction
+  $: type = field?.type
 
   function showEditor() {
     editing = true
@@ -54,10 +55,12 @@
     <CreateEditColumnModal onClosed={hideEditor} {field} />
   {:else}
     <ul>
-      <li data-cy="edit-column-header" on:click={showEditor}>
-        <Icon name="edit" />
-        Edit
-      </li>
+      {#if type !== 'link'}
+        <li data-cy="edit-column-header" on:click={showEditor}>
+          <Icon name="edit" />
+          Edit
+        </li>
+      {/if}
       <li
         data-cy="delete-column-header"
         on:click={() => confirmDeleteDialog.show()}>

packages/builder/src/components/backend/DataTable/popovers/CreateEditRecord.svelte

@@ -13,9 +13,10 @@
   export let onClosed
 
   let errors = []
-  $: model = record.modelId ? $backendUiStore.models.find(model => model._id === record?.modelId) : $backendUiStore.selectedModel
+  $: model = record.modelId
+    ? $backendUiStore.models.find(model => model._id === record?.modelId)
+    : $backendUiStore.selectedModel
   $: modelSchema = Object.entries(model?.schema ?? {})
-  $: console.log(modelSchema)
 
   async function saveRecord() {
     const recordResponse = await api.saveRecord(

packages/builder/src/components/settings/Modal.svelte

@@ -46,7 +46,7 @@
 
 <style>
   .container {
-    padding: var(--spacing-xl);
+    padding: 30px;
     display: grid;
     grid-gap: var(--spacing-xl);
   }