From 9509b8f42bcbce404f1f0d7f123d9d6ea33c1432 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Keviin=20=C3=85berg=20Kultalahti?= Date: Fri, 30 Apr 2021 13:31:45 +0200 Subject: [PATCH] Convert Body component to use size="" prop --- packages/bbui/src/Drawer/Drawer.svelte | 2 +- packages/bbui/src/Typography/Body.svelte | 24 ++------------ .../DataTable/modals/FilterModal.svelte | 32 ++++++++++++------- .../DataTable/modals/ManageAccessModal.svelte | 2 +- .../TableIntegrationMenu/index.svelte | 10 +++--- .../components/common/ConfirmDialog.svelte | 2 +- .../EventsEditor/actions/LogOut.svelte | 2 +- .../EventsEditor/actions/SaveRow.svelte | 19 ++++++----- .../PropertyControls/FilterEditor.svelte | 2 +- .../integration/QueryParameterBuilder.svelte | 2 +- .../components/integration/QueryViewer.svelte | 4 +-- .../start/BuilderSettingsModal.svelte | 10 +++--- .../src/components/start/TemplateList.svelte | 4 +-- .../[selectedDatasource]/index.svelte | 2 +- 14 files changed, 57 insertions(+), 60 deletions(-) diff --git a/packages/bbui/src/Drawer/Drawer.svelte b/packages/bbui/src/Drawer/Drawer.svelte index b5af512475..60f3461756 100644 --- a/packages/bbui/src/Drawer/Drawer.svelte +++ b/packages/bbui/src/Drawer/Drawer.svelte @@ -38,7 +38,7 @@
{title} - +
diff --git a/packages/bbui/src/Typography/Body.svelte b/packages/bbui/src/Typography/Body.svelte index 550bac675d..3b690fd1b9 100644 --- a/packages/bbui/src/Typography/Body.svelte +++ b/packages/bbui/src/Typography/Body.svelte @@ -1,29 +1,11 @@ -

\ No newline at end of file diff --git a/packages/builder/src/components/backend/DataTable/modals/FilterModal.svelte b/packages/builder/src/components/backend/DataTable/modals/FilterModal.svelte index 51ccc7db70..f2dd629348 100644 --- a/packages/builder/src/components/backend/DataTable/modals/FilterModal.svelte +++ b/packages/builder/src/components/backend/DataTable/modals/FilterModal.svelte @@ -102,7 +102,7 @@ return viewTable.schema[field].type === "number" } - const fieldChanged = filter => ev => { + const fieldChanged = (filter) => (ev) => { // reset if type changed if ( filter.key && @@ -113,15 +113,16 @@ } } - const getOptionLabel = x => x.name - const getOptionValue = x => x.key + const getOptionLabel = (x) => x.name + const getOptionValue = (x) => x.key + size="large" +> {#if view.filters.length}
{#each view.filters as filter, idx} @@ -133,41 +134,48 @@ options={CONJUNCTIONS} placeholder={null} {getOptionLabel} - {getOptionValue} /> + {getOptionValue} + /> {/if} + {getOptionValue} + /> {#if filter.key && isMultipleChoice(filter.key)} + type="number" + /> {:else} + bind:value={filter.value} + /> {/if} removeFilter(idx)} /> {/each}
{:else} - Add a filter to get started. + Add a filter to get started. {/if}
diff --git a/packages/builder/src/components/backend/DataTable/modals/ManageAccessModal.svelte b/packages/builder/src/components/backend/DataTable/modals/ManageAccessModal.svelte index b49d4f52d0..f7bc5b5089 100644 --- a/packages/builder/src/components/backend/DataTable/modals/ManageAccessModal.svelte +++ b/packages/builder/src/components/backend/DataTable/modals/ManageAccessModal.svelte @@ -30,7 +30,7 @@ - Specify the minimum access level role for this data. + Specify the minimum access level role for this data.
diff --git a/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/index.svelte b/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/index.svelte index ab465f4b51..db99a5d001 100644 --- a/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/index.svelte +++ b/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/index.svelte @@ -39,12 +39,14 @@
selectIntegration(integrationType)}> + on:click={() => selectIntegration(integrationType)} + > - {integrationType} + width="50" + /> + {integrationType}
{/each}
@@ -53,7 +55,7 @@