From a0b4062a1fe7fc87262e6ce7f967a15642ea3a55 Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Thu, 3 Dec 2020 15:15:14 +0000 Subject: [PATCH] more intelligent routing for screens and pages --- packages/builder/package.json | 2 +- .../src/builderStore/store/frontend.js | 3 +- .../AppPreview/CurrentItemPreview.svelte | 2 +- .../ComponentDropdownMenu.svelte | 4 +- .../ComponentTree.svelte | 15 +- .../ComponentNavigationTree/index.svelte | 2 - .../ComponentSelectionList.svelte | 13 +- .../userInterface/FrontendNavigatePane.svelte | 25 +- .../components/userInterface/Layout.svelte | 5 +- .../design/layouts/[layout]/_fallback.svelte | 4 - .../design/layouts/[layout]/_layout.svelte | 57 ++++- .../[application]/design/screens/index.svelte | 8 +- packages/builder/yarn.lock | 239 +++++++++++++++++- packages/standard-components/package.json | 2 +- packages/standard-components/rollup.config.js | 4 +- packages/standard-components/yarn.lock | 57 ++++- 16 files changed, 371 insertions(+), 71 deletions(-) diff --git a/packages/builder/package.json b/packages/builder/package.json index a298d823c7..542c35205e 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -63,7 +63,7 @@ } }, "dependencies": { - "@budibase/bbui": "^1.50.2", + "@budibase/bbui": "^1.52.2", "@budibase/client": "^0.3.8", "@budibase/colorpicker": "^1.0.1", "@budibase/svelte-ag-grid": "^0.0.16", diff --git a/packages/builder/src/builderStore/store/frontend.js b/packages/builder/src/builderStore/store/frontend.js index cde89707d4..6977d238dc 100644 --- a/packages/builder/src/builderStore/store/frontend.js +++ b/packages/builder/src/builderStore/store/frontend.js @@ -192,8 +192,9 @@ export const getFrontendStore = () => { const selectedAsset = get(currentAsset) if (state.currentFrontEndType !== FrontendTypes.LAYOUT) { await store.actions.screens.save(selectedAsset) + } else { + await store.actions.layouts.save(selectedAsset) } - await store.actions.layouts.save(selectedAsset) }, }, layouts: { diff --git a/packages/builder/src/components/userInterface/AppPreview/CurrentItemPreview.svelte b/packages/builder/src/components/userInterface/AppPreview/CurrentItemPreview.svelte index 067b66c804..674eedfa21 100644 --- a/packages/builder/src/components/userInterface/AppPreview/CurrentItemPreview.svelte +++ b/packages/builder/src/components/userInterface/AppPreview/CurrentItemPreview.svelte @@ -26,7 +26,7 @@ } else { screen = $currentAsset layout = $store.layouts.find( - layout => layout._id === screen.props.layoutId + layout => layout._id === screen?.props.layoutId ) } } diff --git a/packages/builder/src/components/userInterface/ComponentDropdownMenu.svelte b/packages/builder/src/components/userInterface/ComponentDropdownMenu.svelte index 615b3d0852..29d1cd1460 100644 --- a/packages/builder/src/components/userInterface/ComponentDropdownMenu.svelte +++ b/packages/builder/src/components/userInterface/ComponentDropdownMenu.svelte @@ -28,7 +28,7 @@ const selectComponent = component => { store.actions.components.select(component) const path = store.actions.components.findRoute(component) - // $goto(`./:screen/${path}`) + $goto(`./${$store.currentFrontEndType}/${path}`) } const moveUpComponent = () => { @@ -79,7 +79,7 @@ const parent = getParent(state.currentPreviewItem.props, component) if (parent) { - parent._children = parent._children.filter(c => c !== component) + parent._children = parent._children.filter(child => child !== component) selectComponent(parent) } diff --git a/packages/builder/src/components/userInterface/ComponentNavigationTree/ComponentTree.svelte b/packages/builder/src/components/userInterface/ComponentNavigationTree/ComponentTree.svelte index e11008b291..347ce00ed2 100644 --- a/packages/builder/src/components/userInterface/ComponentNavigationTree/ComponentTree.svelte +++ b/packages/builder/src/components/userInterface/ComponentNavigationTree/ComponentTree.svelte @@ -1,12 +1,11 @@
diff --git a/packages/builder/src/components/userInterface/ComponentSelectionList.svelte b/packages/builder/src/components/userInterface/ComponentSelectionList.svelte index b3d1238323..9e9cb31c4a 100644 --- a/packages/builder/src/components/userInterface/ComponentSelectionList.svelte +++ b/packages/builder/src/components/userInterface/ComponentSelectionList.svelte @@ -1,5 +1,5 @@ @@ -40,9 +39,13 @@ class="category" on:click={() => onCategoryChosen(category, idx)} class:active={idx === selectedIndex}> - {#if category.icon}{/if} + {#if category.icon} + + {/if} {category.name} - {#if category.isCategory}{/if} + {#if category.isCategory} + + {/if}
{/each} diff --git a/packages/builder/src/components/userInterface/FrontendNavigatePane.svelte b/packages/builder/src/components/userInterface/FrontendNavigatePane.svelte index ee61d82c68..e8732cb8e0 100644 --- a/packages/builder/src/components/userInterface/FrontendNavigatePane.svelte +++ b/packages/builder/src/components/userInterface/FrontendNavigatePane.svelte @@ -1,6 +1,6 @@
- + {#if tab === 'screens'} - {#if $currentAsset} {/if} @@ -60,16 +58,6 @@
- - - - - - - - - -