feat: define root meta for root redirect

owncloud · Apr 25, 2023 · c6bc3aa · c6bc3aa
1 parent 1abcbc0
commit c6bc3aa
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/packages/web-app-webfinger/src/index.ts b/packages/web-app-webfinger/src/index.ts
@@ -15,13 +15,10 @@ const appInfo = {
 
 const routes = () => [
  {
- name: 'root',
+ name: 'webfinger-root',
  path: '/',
  redirect: () => {
  return { name: 'webfinger-resolve' }
- },
- meta: {
- root: true
  }
  },
  {
@@ -30,7 +27,8 @@ const routes = () => [
  component: Resolve,
  meta: {
  authContext: 'user',
- title: $gettext('Resolve ownCloud')
+ title: $gettext('Resolve ownCloud'),
+ root: true
  }
  }
 ]

diff --git a/packages/web-runtime/src/container/bootstrap.ts b/packages/web-runtime/src/container/bootstrap.ts
@@ -368,7 +368,12 @@ export const announceDefaults = ({
  defaultExtensionId = appIds[0]
  }
 
- const route = store.getters.getNavItemsByExtension(defaultExtensionId)[0]?.route
+ let route = store.getters.getNavItemsByExtension(defaultExtensionId)[0]?.route
+ if (!route) {
+ route = router.getRoutes().find((r) => {
+ return r.path.startsWith(`/${defaultExtensionId}`) && r.meta?.root === true
+ })
+ }
  if (route) {
  router.addRoute({
  path: '/',