From f2d696ce82b051e63f5eb5ebb4c993974c02bdd8 Mon Sep 17 00:00:00 2001
From: Michael Shanks <mike@budibase.com>
Date: Tue, 2 Jun 2020 16:18:25 +0100
Subject: [PATCH 1/5] bugfix: could not set style on screen root

---
 .../src/utilities/appDirectoryTemplate/pages/main/page.json | 6 ++++--
 .../appDirectoryTemplate/pages/unauthenticated/page.json    | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/packages/server/src/utilities/appDirectoryTemplate/pages/main/page.json b/packages/server/src/utilities/appDirectoryTemplate/pages/main/page.json
index 89a23a78e5..dbb9e3d441 100644
--- a/packages/server/src/utilities/appDirectoryTemplate/pages/main/page.json
+++ b/packages/server/src/utilities/appDirectoryTemplate/pages/main/page.json
@@ -9,8 +9,10 @@
 		"_id": 0,
 		"type": "div",
 		"_styles": {
-			"layout": {},
-			"position": {}
+			"active": {},
+			"hover": {},
+			"normal": {},
+			"selected": {}
 		},
 		"_code": ""
 	},
diff --git a/packages/server/src/utilities/appDirectoryTemplate/pages/unauthenticated/page.json b/packages/server/src/utilities/appDirectoryTemplate/pages/unauthenticated/page.json
index 14d0301c24..bfcd9d55f9 100644
--- a/packages/server/src/utilities/appDirectoryTemplate/pages/unauthenticated/page.json
+++ b/packages/server/src/utilities/appDirectoryTemplate/pages/unauthenticated/page.json
@@ -9,8 +9,10 @@
 		"_id": 1,
 		"type": "div",
 		"_styles": {
-			"layout": {},
-			"position": {}
+			"active": {},
+			"hover": {},
+			"normal": {},
+			"selected": {}
 		},
 		"_code": ""
 	},

From 81f11d16fa8bbc7577b493b72eb7aedcf10b8302 Mon Sep 17 00:00:00 2001
From: Michael Shanks <mike@budibase.com>
Date: Wed, 3 Jun 2020 06:55:21 +0100
Subject: [PATCH 2/5] ModelSelect - added blank option

---
 packages/builder/src/components/userInterface/ModelSelect.svelte | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/builder/src/components/userInterface/ModelSelect.svelte b/packages/builder/src/components/userInterface/ModelSelect.svelte
index 4eab7a3745..ae5014e31f 100644
--- a/packages/builder/src/components/userInterface/ModelSelect.svelte
+++ b/packages/builder/src/components/userInterface/ModelSelect.svelte
@@ -7,6 +7,7 @@
 <div class="uk-margin block-field">
   <div class="uk-form-controls">
     <select class="budibase__input" on:change {value}>
+      <option value=""></option>
       {#each $backendUiStore.models as model}
         <option value={model._id}>{model.name}</option>
       {/each}

From 82d0f1ea868d7a6c2df3f6fe78609f3775907d3f Mon Sep 17 00:00:00 2001
From: Michael Shanks <mike@budibase.com>
Date: Wed, 3 Jun 2020 12:29:42 +0100
Subject: [PATCH 3/5] bugfix: links not respecting appRootPath

---
 packages/server/src/api/index.js                   | 1 +
 packages/server/src/utilities/builder/buildPage.js | 3 +--
 packages/standard-components/src/Link.svelte       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/server/src/api/index.js b/packages/server/src/api/index.js
index 66c3168f23..990714fdc7 100644
--- a/packages/server/src/api/index.js
+++ b/packages/server/src/api/index.js
@@ -38,6 +38,7 @@ router
     ctx.config = {
       latestPackagesFolder: budibaseAppsDir(),
       jwtSecret: env.JWT_SECRET,
+      useAppRootPath: true,
     }
     ctx.isDev = env.NODE_ENV !== "production" && env.NODE_ENV !== "jest"
     await next()
diff --git a/packages/server/src/utilities/builder/buildPage.js b/packages/server/src/utilities/builder/buildPage.js
index e56e040329..f1b5d6d724 100644
--- a/packages/server/src/utilities/builder/buildPage.js
+++ b/packages/server/src/utilities/builder/buildPage.js
@@ -28,8 +28,7 @@ module.exports = async (config, appId, pageName, pkg) => {
   await savePageJson(appPath, pageName, pkg)
 }
 
-const rootPath = (config, appname) =>
-  config.useAppRootPath ? `/${appname}` : ""
+const rootPath = (config, appId) => (config.useAppRootPath ? `/${appId}` : "")
 
 const copyClientLib = async (appPath, pageName) => {
   const sourcepath = require.resolve("@budibase/client")
diff --git a/packages/standard-components/src/Link.svelte b/packages/standard-components/src/Link.svelte
index ef0b71d62e..d557df6abd 100644
--- a/packages/standard-components/src/Link.svelte
+++ b/packages/standard-components/src/Link.svelte
@@ -13,7 +13,7 @@
   $: target = openInNewTab ? "_blank" : "_self"
 </script>
 
-<a href={url} bind:this={anchorElement} {target}>{text}</a>
+<a href={_bb.relativeUrl(url)} bind:this={anchorElement} {target}>{text}</a>
 
 <style>
   .textDecoration {

From 06e9f9fd076ece05a6cbc83fd5f09fea2206b4c1 Mon Sep 17 00:00:00 2001
From: Michael Shanks <mike@budibase.com>
Date: Wed, 3 Jun 2020 12:29:15 +0100
Subject: [PATCH 4/5] StateBindingCascader - nod handling onChange

---
 .../userInterface/EventsEditor/StateBindingCascader.svelte      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/builder/src/components/userInterface/EventsEditor/StateBindingCascader.svelte b/packages/builder/src/components/userInterface/EventsEditor/StateBindingCascader.svelte
index 1edf5d45a0..e86d503a59 100644
--- a/packages/builder/src/components/userInterface/EventsEditor/StateBindingCascader.svelte
+++ b/packages/builder/src/components/userInterface/EventsEditor/StateBindingCascader.svelte
@@ -28,7 +28,7 @@
         {/each}
       </select>
     {:else}
-      <Input on:change={onChange} value={parameter.value} />
+      <Input onChange={onChange} value={parameter.value} />
       <button on:click={() => (isOpen = !isOpen)}>
         <div class="icon" style={`transform: rotate(${isOpen ? 0 : 90}deg);`}>
           <ArrowDownIcon size={36} />

From 63a87066c7e75762686e07ccca470fdd2b7e5fe9 Mon Sep 17 00:00:00 2001
From: Michael Shanks <mike@budibase.com>
Date: Wed, 3 Jun 2020 12:33:57 +0100
Subject: [PATCH 5/5] Workflow model selector - blank option

---
 .../workflow/SetupPanel/ParamInputs/ModelSelector.svelte         | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/builder/src/components/workflow/SetupPanel/ParamInputs/ModelSelector.svelte b/packages/builder/src/components/workflow/SetupPanel/ParamInputs/ModelSelector.svelte
index 1c39e19505..2cce5f7863 100644
--- a/packages/builder/src/components/workflow/SetupPanel/ParamInputs/ModelSelector.svelte
+++ b/packages/builder/src/components/workflow/SetupPanel/ParamInputs/ModelSelector.svelte
@@ -7,6 +7,7 @@
 <div class="uk-margin block-field">
   <div class="uk-form-controls">
     <select class="budibase__input" bind:value>
+      <option value=""></option>
       {#each $backendUiStore.models as model}
         <option value={model}>{model.name}</option>
       {/each}