From 8765a1830507eaf8c5967eadc33a8b7f0731acf1 Mon Sep 17 00:00:00 2001 From: Benedikt Kulmann Date: Mon, 13 Jun 2022 11:58:39 +0200 Subject: [PATCH] Fix route reactivity for personal view --- packages/web-app-files/src/router/deprecated.ts | 12 ++++++++++-- packages/web-app-files/src/views/Personal.vue | 13 ++++++++----- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/packages/web-app-files/src/router/deprecated.ts b/packages/web-app-files/src/router/deprecated.ts index 4b8e6762ea2..590e50dbc8a 100644 --- a/packages/web-app-files/src/router/deprecated.ts +++ b/packages/web-app-files/src/router/deprecated.ts @@ -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', diff --git a/packages/web-app-files/src/views/Personal.vue b/packages/web-app-files/src/views/Personal.vue index f2d58acceb8..a59a5ebecd8 100644 --- a/packages/web-app-files/src/views/Personal.vue +++ b/packages/web-app-files/src/views/Personal.vue @@ -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' @@ -134,13 +134,16 @@ export default defineComponent({ store.getters.getToken ) const storageId = useRouteParam('storageId') - return { - ...useResourcesViewDefaults(), - resourceTargetLocation: createLocationSpaces('files-spaces-personal', { + const resourceTargetLocation = computed(() => { + return createLocationSpaces('files-spaces-personal', { params: { storageId: unref(storageId) } - }), + }) + }) + return { + ...useResourcesViewDefaults(), + resourceTargetLocation, hasShareJail: useCapabilityShareJailEnabled(), graphClient }