Skip to content

Commit

Permalink
Fix route reactivity for personal view
Browse files Browse the repository at this point in the history
  • Loading branch information
kulmann committed Jun 13, 2022
1 parent 8b3b9e8 commit 8765a18
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 7 deletions.
12 changes: 10 additions & 2 deletions packages/web-app-files/src/router/deprecated.ts
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,19 @@ export const buildRoutes = (): RouteConfig[] =>
[
{
path: '/list',
redirect: (to) => createLocationSpaces('files-spaces-personal', to)
redirect: (to) =>
createLocationSpaces('files-spaces-personal', {
...to,
params: { ...to.params, storageId: 'home' }
})
},
{
path: '/list/all/:item*',
redirect: (to) => createLocationSpaces('files-spaces-personal', to)
redirect: (to) =>
createLocationSpaces('files-spaces-personal', {
...to,
params: { ...to.params, storageId: 'home' }
})
},
{
path: '/list/favorites',
Expand Down
13 changes: 8 additions & 5 deletions packages/web-app-files/src/views/Personal.vue
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ import Pagination from '../components/FilesList/Pagination.vue'
import ContextActions from '../components/FilesList/ContextActions.vue'
import { createLocationSpaces } from '../router'
import { useResourcesViewDefaults } from '../composables'
import { defineComponent, unref } from '@vue/composition-api'
import { defineComponent, unref, computed } from '@vue/composition-api'
import { Resource, move } from '../helpers/resource'
import { useCapabilityShareJailEnabled, useRouteParam, useStore } from 'web-pkg/src/composables'
import { clientService } from 'web-pkg/src/services'
Expand Down Expand Up @@ -134,13 +134,16 @@ export default defineComponent({
store.getters.getToken
)
const storageId = useRouteParam('storageId')
return {
...useResourcesViewDefaults<Resource, any, any[]>(),
resourceTargetLocation: createLocationSpaces('files-spaces-personal', {
const resourceTargetLocation = computed(() => {
return createLocationSpaces('files-spaces-personal', {
params: {
storageId: unref(storageId)
}
}),
})
})
return {
...useResourcesViewDefaults<Resource, any, any[]>(),
resourceTargetLocation,
hasShareJail: useCapabilityShareJailEnabled(),
graphClient
}
Expand Down

0 comments on commit 8765a18

Please sign in to comment.