From c726dfbedbd27a4ae71c5f3f9472612315264fcb Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Wed, 22 May 2024 09:22:06 +0100
Subject: [PATCH 1/8] Add link in navigation when duplicating screens

---
 .../_components/ScreenList/DropdownMenu.svelte         | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ScreenList/DropdownMenu.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ScreenList/DropdownMenu.svelte
index 0d96dcda93..7421bfa68a 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ScreenList/DropdownMenu.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ScreenList/DropdownMenu.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { screenStore, componentStore } from "stores/builder"
+  import { screenStore, componentStore, navigationStore } from "stores/builder"
   import ConfirmDialog from "components/common/ConfirmDialog.svelte"
   import {
     ActionMenu,
@@ -12,6 +12,7 @@
   import ScreenDetailsModal from "components/design/ScreenDetailsModal.svelte"
   import sanitizeUrl from "helpers/sanitizeUrl"
   import { makeComponentUnique } from "helpers/components"
+  import { capitalise } from "helpers"
 
   export let screenId
 
@@ -48,6 +49,13 @@
     try {
       // Create the screen
       await screenStore.save(duplicateScreen)
+
+      // Add new screen to navigation
+      await navigationStore.saveLink(
+        duplicateScreen.routing.route,
+        capitalise(duplicateScreen.routing.route.split("/")[1]),
+        duplicateScreen.routing.roleId
+      )
     } catch (error) {
       notifications.error("Error duplicating screen")
     }

From c89a7a261fede85b746dc7ad3936cf813bc9d8e6 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Wed, 22 May 2024 09:35:27 +0100
Subject: [PATCH 2/8] Ensure in-app navigation via navigate to action
 automatically prefixes URLs with slashes

---
 packages/client/src/utils/buttonActions.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/packages/client/src/utils/buttonActions.js b/packages/client/src/utils/buttonActions.js
index 0c3866768e..25e0892fc0 100644
--- a/packages/client/src/utils/buttonActions.js
+++ b/packages/client/src/utils/buttonActions.js
@@ -238,7 +238,13 @@ const triggerAutomationHandler = async action => {
   }
 }
 const navigationHandler = action => {
-  const { url, peek, externalNewTab } = action.parameters
+  let { url, peek, externalNewTab, type } = action.parameters
+
+  // Ensure in-app navigation starts with a slash
+  if (type === "screen" && url && !url.startsWith("/")) {
+    url = `/${url}`
+  }
+
   routeStore.actions.navigate(url, peek, externalNewTab)
   closeSidePanelHandler()
 }

From 7a6863763a0a5b7903a04c076c27a364f2211dab Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Wed, 22 May 2024 09:53:44 +0100
Subject: [PATCH 3/8] Allow opening app nav links in new tabs

---
 packages/client/src/components/app/NavItem.svelte | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/packages/client/src/components/app/NavItem.svelte b/packages/client/src/components/app/NavItem.svelte
index fcdda57ace..a5ac61a39f 100644
--- a/packages/client/src/components/app/NavItem.svelte
+++ b/packages/client/src/components/app/NavItem.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { createEventDispatcher, getContext } from "svelte"
+  import { createEventDispatcher } from "svelte"
   import active from "svelte-spa-router/active"
   import { Icon } from "@budibase/bbui"
 
@@ -13,8 +13,6 @@
   export let navStateStore
 
   const dispatch = createEventDispatcher()
-  const sdk = getContext("sdk")
-  const { linkable } = sdk
 
   let renderKey
 
@@ -46,10 +44,9 @@
       styled
     -->
     <a
-      href={url}
+      href="#{url}"
       on:click={onClickLink}
       use:active={url}
-      use:linkable
       class:active={false}
     >
       {text}
@@ -73,10 +70,9 @@
           {#each subLinks || [] as subLink}
             {#if subLink.internalLink}
               <a
-                href={subLink.url}
+                href="#{subLink.url}"
                 on:click={onClickLink}
                 use:active={subLink.url}
-                use:linkable
               >
                 {subLink.text}
               </a>

From 1a47365d39529881e2a8f6646cf290c90ac03e6c Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Wed, 22 May 2024 10:04:54 +0100
Subject: [PATCH 4/8] Don't save empty JS expressions as JS

---
 .../common/bindings/DrawerBindableInput.svelte         | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/packages/builder/src/components/common/bindings/DrawerBindableInput.svelte b/packages/builder/src/components/common/bindings/DrawerBindableInput.svelte
index d11ebcf87a..0792866581 100644
--- a/packages/builder/src/components/common/bindings/DrawerBindableInput.svelte
+++ b/packages/builder/src/components/common/bindings/DrawerBindableInput.svelte
@@ -4,10 +4,9 @@
     readableToRuntimeBinding,
     runtimeToReadableBinding,
   } from "dataBinding"
-
   import ClientBindingPanel from "components/common/bindings/ClientBindingPanel.svelte"
   import { createEventDispatcher, setContext } from "svelte"
-  import { isJSBinding } from "@budibase/string-templates"
+  import { isJSBinding, decodeJSBinding } from "@budibase/string-templates"
   import { builderStore } from "stores/builder"
 
   export let panel = ClientBindingPanel
@@ -35,7 +34,12 @@
   $: isJS = isJSBinding(value)
 
   const saveBinding = () => {
-    onChange(tempValue)
+    // Don't bother saving empty JS expressions as JS
+    let val = tempValue
+    if (decodeJSBinding(tempValue)?.trim() === "") {
+      val = null
+    }
+    onChange(val)
     onBlur()
     builderStore.propertyFocus()
     bindingDrawer.hide()

From 96aa83d4548d57a076830a7ad031862ed264af85 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Wed, 22 May 2024 10:15:09 +0100
Subject: [PATCH 5/8] Change how empty JS values are handled to avoid weird
 lockup

---
 .../src/components/common/bindings/BindingPanel.svelte | 10 ++++++++--
 .../common/bindings/DrawerBindableInput.svelte         |  9 ++-------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/packages/builder/src/components/common/bindings/BindingPanel.svelte b/packages/builder/src/components/common/bindings/BindingPanel.svelte
index 8c94455c58..0046725a72 100644
--- a/packages/builder/src/components/common/bindings/BindingPanel.svelte
+++ b/packages/builder/src/components/common/bindings/BindingPanel.svelte
@@ -186,6 +186,8 @@
   }
 
   const updateValue = val => {
+    console.log("val", val)
+
     const runtimeExpression = readableToRuntimeBinding(enrichedBindings, val)
     dispatch("change", val)
     requestEval(runtimeExpression, context, snippets)
@@ -236,8 +238,12 @@
   }
 
   const onChangeJSValue = e => {
-    jsValue = encodeJSBinding(e.detail)
-    updateValue(jsValue)
+    if (!e.detail?.trim()) {
+      // Don't bother saving empty values as JS
+      updateValue("")
+    } else {
+      updateValue(encodeJSBinding(e.detail))
+    }
   }
 
   onMount(() => {
diff --git a/packages/builder/src/components/common/bindings/DrawerBindableInput.svelte b/packages/builder/src/components/common/bindings/DrawerBindableInput.svelte
index 0792866581..0cb10d1aa5 100644
--- a/packages/builder/src/components/common/bindings/DrawerBindableInput.svelte
+++ b/packages/builder/src/components/common/bindings/DrawerBindableInput.svelte
@@ -6,7 +6,7 @@
   } from "dataBinding"
   import ClientBindingPanel from "components/common/bindings/ClientBindingPanel.svelte"
   import { createEventDispatcher, setContext } from "svelte"
-  import { isJSBinding, decodeJSBinding } from "@budibase/string-templates"
+  import { isJSBinding } from "@budibase/string-templates"
   import { builderStore } from "stores/builder"
 
   export let panel = ClientBindingPanel
@@ -34,12 +34,7 @@
   $: isJS = isJSBinding(value)
 
   const saveBinding = () => {
-    // Don't bother saving empty JS expressions as JS
-    let val = tempValue
-    if (decodeJSBinding(tempValue)?.trim() === "") {
-      val = null
-    }
-    onChange(val)
+    onChange(tempValue)
     onBlur()
     builderStore.propertyFocus()
     bindingDrawer.hide()

From 41ab3685bebab8732c280427b0e7526c9b7a4d1a Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Wed, 22 May 2024 10:16:19 +0100
Subject: [PATCH 6/8] Remove log

---
 .../builder/src/components/common/bindings/BindingPanel.svelte  | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/builder/src/components/common/bindings/BindingPanel.svelte b/packages/builder/src/components/common/bindings/BindingPanel.svelte
index 0046725a72..c08509b0e4 100644
--- a/packages/builder/src/components/common/bindings/BindingPanel.svelte
+++ b/packages/builder/src/components/common/bindings/BindingPanel.svelte
@@ -186,8 +186,6 @@
   }
 
   const updateValue = val => {
-    console.log("val", val)
-
     const runtimeExpression = readableToRuntimeBinding(enrichedBindings, val)
     dispatch("change", val)
     requestEval(runtimeExpression, context, snippets)

From 3cf3dd3afac5893cac3c288e100e49437c59a76f Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Wed, 22 May 2024 10:45:03 +0100
Subject: [PATCH 7/8] Small tweak to JS bindings

---
 .../src/components/common/bindings/BindingPanel.svelte       | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/builder/src/components/common/bindings/BindingPanel.svelte b/packages/builder/src/components/common/bindings/BindingPanel.svelte
index c08509b0e4..5114ad2d7a 100644
--- a/packages/builder/src/components/common/bindings/BindingPanel.svelte
+++ b/packages/builder/src/components/common/bindings/BindingPanel.svelte
@@ -236,11 +236,12 @@
   }
 
   const onChangeJSValue = e => {
+    jsValue = encodeJSBinding(e.detail)
     if (!e.detail?.trim()) {
       // Don't bother saving empty values as JS
-      updateValue("")
+      updateValue(null)
     } else {
-      updateValue(encodeJSBinding(e.detail))
+      updateValue(jsValue)
     }
   }
 

From 6dc463610a8533008ebbf0cb62f884654001624e Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Wed, 22 May 2024 10:22:02 +0000
Subject: [PATCH 8/8] Bump version to 2.27.2

---
 lerna.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lerna.json b/lerna.json
index f0b3f51d47..a943000cea 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.27.1",
+  "version": "2.27.2",
   "npmClient": "yarn",
   "packages": [
     "packages/*",