MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Tidy up

This commit is contained in:
Andrew Kingston 2022-04-06 13:40:07 +01:00
parent c8e87cf24f
commit c25ca0cafd
2 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
packages/client/src/components/ClientApp.svelte
View File

@ -63,10 +63,10 @@
// If using devtools, find the first screen matching our role // If using devtools, find the first screen matching our role
if ($devToolsStore.role) { if ($devToolsStore.role) {
firstRoute = const roleRoutes = $screenStore.screens.filter(
$screenStore.screens.filter( screen => screen.routing?.roleId === $devToolsStore.role
screen => screen.routing?.roleId === $devToolsStore.role )
)[0]?.routing?.route || "/" firstRoute = roleRoutes[0]?.routing?.route || "/"
} }
// Otherwise just use the fist route // Otherwise just use the fist route
@ -143,10 +143,10 @@
{/key} {/key}
<!-- <!--
Flatpickr needs to be inside the theme wrapper. Flatpickr needs to be inside the theme wrapper.
It also needs its own container because otherwise it hijacks It also needs its own container because otherwise it hijacks
key events on the whole page. It is painful to work with. key events on the whole page. It is painful to work with.
--> -->
<div id="flatpickr-root" /> <div id="flatpickr-root" />
<!-- Modal container to ensure they sit on top --> <!-- Modal container to ensure they sit on top -->
@ -164,12 +164,10 @@
</div> </div>
</div> </div>
<!-- Selection indicators should be bounded by device --> <!-- Preview and dev tools utilities -->
<!-- {#if $appStore.isDevApp}
We don't want to key these by componentID as they control their own <SelectionIndicator />
re-mounting to avoid flashes. {/if}
-->
<SelectionIndicator />
{#if $builderStore.inBuilder || $devToolsStore.allowSelection} {#if $builderStore.inBuilder || $devToolsStore.allowSelection}
<HoverIndicator /> <HoverIndicator />
{/if} {/if}
@ -219,6 +217,7 @@
justify-content: flex-start; justify-content: flex-start;
align-items: stretch; align-items: stretch;
} }
#app-body { #app-body {
flex: 1 1 auto; flex: 1 1 auto;
display: flex; display: flex;

2
packages/server/src/middleware/currentapp.js
View File

@ -70,7 +70,7 @@ module.exports = async (ctx, next) => {
const isDevApp = appId && isDevAppID(appId) const isDevApp = appId && isDevAppID(appId)
const roleHeader = ctx.request.headers[Headers.PREVIEW_ROLE] const roleHeader = ctx.request.headers[Headers.PREVIEW_ROLE]
if (isBuilder && isDevApp && roleHeader) { if (isBuilder && isDevApp && roleHeader) {
// Ensure the role is valid ensuring a definition exists // Ensure the role is valid by ensuring a definition exists
try { try {
await getRole(roleHeader) await getRole(roleHeader)
roleId = roleHeader roleId = roleHeader