Merge branch 'master' of github.com:budibase/budibase into test-api-unification

This commit is contained in:
Sam Rose 2024-02-29 10:19:17 +00:00
commit 4a2f688456
No known key found for this signature in database
2 changed files with 7 additions and 6 deletions

View File

@ -1,5 +1,5 @@
{ {
"version": "2.20.12", "version": "2.20.13",
"npmClient": "yarn", "npmClient": "yarn",
"packages": [ "packages": [
"packages/*", "packages/*",

View File

@ -69,11 +69,12 @@
// brought back to the same screen. // brought back to the same screen.
const topItemNavigate = path => () => { const topItemNavigate = path => () => {
const activeTopNav = $layout.children.find(c => $isActive(c.path)) const activeTopNav = $layout.children.find(c => $isActive(c.path))
if (!activeTopNav) return if (activeTopNav) {
builderStore.setPreviousTopNavPath( builderStore.setPreviousTopNavPath(
activeTopNav.path, activeTopNav.path,
window.location.pathname window.location.pathname
) )
}
$goto($builderStore.previousTopNavPath[path] || path) $goto($builderStore.previousTopNavPath[path] || path)
} }