From 527a25c7943b87fa0af92ba8e452fe7bef3660dd Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Tue, 2 Jun 2020 11:40:33 +0100 Subject: [PATCH] model bugfixes --- packages/builder/src/builderStore/store/backend.js | 4 ++-- packages/builder/src/components/common/Switcher.svelte | 2 +- .../src/components/nav/SchemaManagementDrawer.svelte | 2 +- .../components/userInterface/ComponentDropdownMenu.svelte | 2 +- .../userInterface/ComponentPropertiesPanel.svelte | 2 +- .../src/components/workflow/SetupPanel/SetupPanel.svelte | 8 ++++---- .../backend/database/[selectedDatabase]/index.svelte | 4 +++- packages/server/src/api/routes/view.js | 2 +- 8 files changed, 14 insertions(+), 12 deletions(-) diff --git a/packages/builder/src/builderStore/store/backend.js b/packages/builder/src/builderStore/store/backend.js index f4f4c20fd2..9a5a7b1fbc 100644 --- a/packages/builder/src/builderStore/store/backend.js +++ b/packages/builder/src/builderStore/store/backend.js @@ -32,7 +32,7 @@ export const getBackendUiStore = () => { state.selectedDatabase = db if (models && models.length > 0) { state.selectedModel = models[0] - state.selectedView = `${models[0]._id}` + state.selectedView = `all_${models[0]._id}` } state.breadcrumbs = [db.name] state.models = models @@ -76,7 +76,7 @@ export const getBackendUiStore = () => { state.models.push(model) state.models = state.models state.selectedModel = model - state.selectedView = `${model._id}` + state.selectedView = `all_${model._id}` return state }), }, diff --git a/packages/builder/src/components/common/Switcher.svelte b/packages/builder/src/components/common/Switcher.svelte index 391f4d7048..484d52ee07 100644 --- a/packages/builder/src/components/common/Switcher.svelte +++ b/packages/builder/src/components/common/Switcher.svelte @@ -69,7 +69,7 @@ .switcher > .selected { color: var(--ink); } - + .panel { min-height: 0; height: 100%; diff --git a/packages/builder/src/components/nav/SchemaManagementDrawer.svelte b/packages/builder/src/components/nav/SchemaManagementDrawer.svelte index 5fb6ed6c25..cc9e5d86a7 100644 --- a/packages/builder/src/components/nav/SchemaManagementDrawer.svelte +++ b/packages/builder/src/components/nav/SchemaManagementDrawer.svelte @@ -46,7 +46,7 @@ function selectModel(model) { backendUiStore.update(state => { state.selectedModel = model - state.selectedView = `${model._id}` + state.selectedView = `all_${model._id}` return state }) } diff --git a/packages/builder/src/components/userInterface/ComponentDropdownMenu.svelte b/packages/builder/src/components/userInterface/ComponentDropdownMenu.svelte index cfdf01be84..151f013ffe 100644 --- a/packages/builder/src/components/userInterface/ComponentDropdownMenu.svelte +++ b/packages/builder/src/components/userInterface/ComponentDropdownMenu.svelte @@ -145,7 +145,7 @@ regenerateCssForCurrentScreen(s) saveCurrentPreviewItem(s) selectComponent(s, componentToPaste) - + return s }) } diff --git a/packages/builder/src/components/userInterface/ComponentPropertiesPanel.svelte b/packages/builder/src/components/userInterface/ComponentPropertiesPanel.svelte index ab02d0c4ff..02b8f986c7 100644 --- a/packages/builder/src/components/userInterface/ComponentPropertiesPanel.svelte +++ b/packages/builder/src/components/userInterface/ComponentPropertiesPanel.svelte @@ -107,7 +107,7 @@ display: flex; flex-direction: column; overflow-x: hidden; - overflow-y: hidden; + overflow-y: hidden; padding: 20px; box-sizing: border-box; } diff --git a/packages/builder/src/components/workflow/SetupPanel/SetupPanel.svelte b/packages/builder/src/components/workflow/SetupPanel/SetupPanel.svelte index 676aa18d77..7d681a9ac0 100644 --- a/packages/builder/src/components/workflow/SetupPanel/SetupPanel.svelte +++ b/packages/builder/src/components/workflow/SetupPanel/SetupPanel.svelte @@ -12,13 +12,13 @@ const ACCESS_LEVELS = [ { name: "Admin", - key: "ADMIN" + key: "ADMIN", }, { name: "Power User", - key: "POWER_USER" - } - ]; + key: "POWER_USER", + }, + ] let selectedTab = "SETUP" let testResult diff --git a/packages/builder/src/pages/[application]/backend/database/[selectedDatabase]/index.svelte b/packages/builder/src/pages/[application]/backend/database/[selectedDatabase]/index.svelte index cc5260e4b1..3ebe117636 100644 --- a/packages/builder/src/pages/[application]/backend/database/[selectedDatabase]/index.svelte +++ b/packages/builder/src/pages/[application]/backend/database/[selectedDatabase]/index.svelte @@ -43,7 +43,9 @@ {#if $backendUiStore.selectedDatabase._id && $backendUiStore.selectedModel.name} {:else} - create your first model to start building + + create your first model to start building + {/if}