diff --git a/packages/bbui/src/Form/Core/TextArea.svelte b/packages/bbui/src/Form/Core/TextArea.svelte index 8b530cdb03..a022a98e5f 100644 --- a/packages/bbui/src/Form/Core/TextArea.svelte +++ b/packages/bbui/src/Form/Core/TextArea.svelte @@ -8,6 +8,7 @@ export let error = null export let id = null export let height = null + export let minHeight = null export const getCaretPosition = () => ({ start: textarea.selectionStart, end: textarea.selectionEnd, @@ -23,7 +24,8 @@
{ @@ -27,6 +28,7 @@ {value} {placeholder} {height} + {minHeight} on:change={onChange} /> diff --git a/packages/builder/src/builderStore/datasource.js b/packages/builder/src/builderStore/datasource.js index 47b9bc3f3c..61cead2e16 100644 --- a/packages/builder/src/builderStore/datasource.js +++ b/packages/builder/src/builderStore/datasource.js @@ -1,5 +1,5 @@ import { datasources, tables } from "../stores/backend" -import { IntegrationNames } from "../constants" +import { IntegrationNames } from "../constants/backend" import analytics, { Events } from "../analytics" import { get } from "svelte/store" import cloneDeep from "lodash/cloneDeepWith" diff --git a/packages/builder/src/components/backend/DataTable/Table.svelte b/packages/builder/src/components/backend/DataTable/Table.svelte index 1ffac83b1a..3c646bde68 100644 --- a/packages/builder/src/components/backend/DataTable/Table.svelte +++ b/packages/builder/src/components/backend/DataTable/Table.svelte @@ -39,7 +39,7 @@ $: editRowComponent = isUsersTable ? CreateEditUser : CreateEditRow $: { UNSORTABLE_TYPES.forEach(type => { - Object.values(schema).forEach(col => { + Object.values(schema || {}).forEach(col => { if (col.type === type) { col.sortable = false } @@ -113,16 +113,16 @@
-
- {#if title} + {#if title} +
{title} - {/if} - {#if loading} -
- -
- {/if} -
+ {#if loading} +
+ +
+ {/if} +
+ {/if}
{#if !isUsersTable && selectedRows.length > 0} diff --git a/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/IntegrationConfigForm.svelte b/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/IntegrationConfigForm.svelte index 16ddf54af4..27358df0be 100644 --- a/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/IntegrationConfigForm.svelte +++ b/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/IntegrationConfigForm.svelte @@ -9,7 +9,7 @@ } from "@budibase/bbui" import KeyValueBuilder from "components/integration/KeyValueBuilder.svelte" import { capitalise } from "helpers" - import { IntegrationTypes } from "constants" + import { IntegrationTypes } from "constants/backend" export let datasource export let schema diff --git a/packages/builder/src/components/backend/DatasourceNavigator/modals/CreateDatasourceModal.svelte b/packages/builder/src/components/backend/DatasourceNavigator/modals/CreateDatasourceModal.svelte index f491f9a6ce..2235de0634 100644 --- a/packages/builder/src/components/backend/DatasourceNavigator/modals/CreateDatasourceModal.svelte +++ b/packages/builder/src/components/backend/DatasourceNavigator/modals/CreateDatasourceModal.svelte @@ -3,7 +3,7 @@ import { onMount } from "svelte" import ICONS from "../icons" import api from "builderStore/api" - import { IntegrationNames, IntegrationTypes } from "constants" + import { IntegrationNames, IntegrationTypes } from "constants/backend" import CreateTableModal from "components/backend/TableNavigator/modals/CreateTableModal.svelte" import DatasourceConfigModal from "components/backend/DatasourceNavigator/modals/DatasourceConfigModal.svelte" import { createRestDatasource } from "builderStore/datasource" diff --git a/packages/builder/src/components/backend/DatasourceNavigator/modals/DatasourceConfigModal.svelte b/packages/builder/src/components/backend/DatasourceNavigator/modals/DatasourceConfigModal.svelte index 1e835065ae..b2a314c92f 100644 --- a/packages/builder/src/components/backend/DatasourceNavigator/modals/DatasourceConfigModal.svelte +++ b/packages/builder/src/components/backend/DatasourceNavigator/modals/DatasourceConfigModal.svelte @@ -2,7 +2,7 @@ import { goto } from "@roxi/routify" import { ModalContent, notifications, Body, Layout } from "@budibase/bbui" import IntegrationConfigForm from "components/backend/DatasourceNavigator/TableIntegrationMenu/IntegrationConfigForm.svelte" - import { IntegrationNames } from "constants" + import { IntegrationNames } from "constants/backend" import cloneDeep from "lodash/cloneDeepWith" import { saveDatasource as save } from "builderStore/datasource" diff --git a/packages/builder/src/components/integration/JSONPreview.svelte b/packages/builder/src/components/integration/JSONPreview.svelte new file mode 100644 index 0000000000..155c593cc5 --- /dev/null +++ b/packages/builder/src/components/integration/JSONPreview.svelte @@ -0,0 +1,11 @@ + + +