Browse Source

Improve handling of routes and screens. Fix issue which could prevent logging in depending on order of screens in app definition

gh-pages
Andrew Kingston 6 years ago
parent
commit
2657008b14
  1. 2
      packages/client/package.json
  2. 2
      packages/client/src/store/routes.js
  3. 4
      packages/client/src/store/screens.js

2
packages/client/package.json

@ -3,7 +3,7 @@
"version": "0.3.8", "version": "0.3.8",
"license": "MPL-2.0", "license": "MPL-2.0",
"main": "dist/budibase-client.js", "main": "dist/budibase-client.js",
"module": "dist/budibase-client.esm.mjs", "module": "dist/budibase-client.js",
"scripts": { "scripts": {
"build": "rollup -c", "build": "rollup -c",
"dev:builder": "rollup -cw" "dev:builder": "rollup -cw"

2
packages/client/src/store/routes.js

@ -34,7 +34,7 @@ const createRouteStore = () => {
} }
const setActiveRoute = route => { const setActiveRoute = route => {
store.update(state => { store.update(state => {
state.activeRoute = route state.activeRoute = state.routes.find(x => x.path === route)
return state return state
}) })
} }

4
packages/client/src/store/screens.js

@ -24,9 +24,9 @@ const createScreenStore = () => {
activeLayout = layouts[0] activeLayout = layouts[0]
if (screens.length === 1) { if (screens.length === 1) {
activeScreen = screens[0] activeScreen = screens[0]
} else { } else if ($routeStore.activeRoute) {
activeScreen = screens.find( activeScreen = screens.find(
screen => screen.routing.route === $routeStore.activeRoute screen => screen._id === $routeStore.activeRoute.screenId
) )
} }
if (activeScreen) { if (activeScreen) {

Loading…
Cancel
Save