From 813fca6bb71cb4daecf5dd6c287be63ab24fdc58 Mon Sep 17 00:00:00 2001 From: Alexander Ackermann Date: Wed, 5 Nov 2025 11:15:25 +0100 Subject: [PATCH 1/2] fix: private link doesn't reliably open default app --- .../components/Shares/SharedWithMeSection.vue | 28 +++++++++++-------- .../src/views/shares/SharedWithMe.vue | 3 ++ .../features/navigation/shortcut.feature | 5 ++-- 3 files changed, 21 insertions(+), 15 deletions(-) diff --git a/packages/web-app-files/src/components/Shares/SharedWithMeSection.vue b/packages/web-app-files/src/components/Shares/SharedWithMeSection.vue index 981f29b6d8..783a811909 100644 --- a/packages/web-app-files/src/components/Shares/SharedWithMeSection.vue +++ b/packages/web-app-files/src/components/Shares/SharedWithMeSection.vue @@ -75,6 +75,7 @@ import { FolderView, ResourceTable, + SortField, useCapabilityStore, useConfigStore, useFileActions, @@ -93,8 +94,6 @@ import { useSelectedResources } from '@opencloud-eu/web-pkg' import { RouteLocationNamedRaw } from 'vue-router' import { CreateTargetRouteOptions } from '@opencloud-eu/web-pkg' import { createFileRouteOptions } from '@opencloud-eu/web-pkg' -import { useResourcesViewDefaults } from '../../composables' -import { folderViewsSharedWithMeExtensionPoint } from '../../extensionPoints' export default defineComponent({ components: { @@ -161,6 +160,18 @@ export default defineComponent({ type: Number, default: 0 }, + viewMode: { + type: String, + required: true + }, + viewSize: { + type: Number, + required: true + }, + sortFields: { + type: Object as PropType, + required: true + }, /** * This is only relevant for CERN and can be ignored in any other cases. @@ -171,16 +182,12 @@ export default defineComponent({ default: null } }, - setup() { + setup(props) { const capabilityStore = useCapabilityStore() const configStore = useConfigStore() const { getMatchingSpace } = useGetMatchingSpace() - const { viewMode, viewSize, sortFields } = useResourcesViewDefaults({ - folderViewExtensionPoint: folderViewsSharedWithMeExtensionPoint - }) - - const { loadPreview } = useLoadPreview(viewMode) + const { loadPreview } = useLoadPreview(computed(() => props.viewMode)) const { triggerDefaultAction } = useFileActions() const { actions: hideShareActions } = useFileActionsToggleHideShare() @@ -214,10 +221,7 @@ export default defineComponent({ updateResourceField, isExternalShare, ShareTypes, - loadPreview, - viewMode, - viewSize, - sortFields + loadPreview } }, diff --git a/packages/web-app-files/src/views/shares/SharedWithMe.vue b/packages/web-app-files/src/views/shares/SharedWithMe.vue index 6a27c13563..f4d48c008e 100644 --- a/packages/web-app-files/src/views/shares/SharedWithMe.vue +++ b/packages/web-app-files/src/views/shares/SharedWithMe.vue @@ -79,6 +79,9 @@ areHiddenFilesShown ? $gettext('No hidden shares') : $gettext('No shares') " :grouping-settings="groupingSettings" + :view-mode="viewMode" + :view-size="viewSize" + :sort-fields="sortFields" /> diff --git a/tests/e2e/cucumber/features/navigation/shortcut.feature b/tests/e2e/cucumber/features/navigation/shortcut.feature index a82d094fe3..5b85d95e85 100644 --- a/tests/e2e/cucumber/features/navigation/shortcut.feature +++ b/tests/e2e/cucumber/features/navigation/shortcut.feature @@ -50,9 +50,8 @@ Feature: Users can create shortcuts for resources and sites | resource | name | type | | testavatar.jpg | logo | file | And "Brian" opens a shortcut "logo.url" - # issue #1360 - # Then "Brian" is in a media-viewer - # And "Brian" closes the file viewer + Then "Brian" is in a media-viewer + And "Brian" closes the file viewer # create a shortcut to the public link When "Brian" opens the "files" app From 83d08533b2d7db05b521e565a37ef9f88ce92585 Mon Sep 17 00:00:00 2001 From: Alexander Ackermann Date: Wed, 5 Nov 2025 11:32:17 +0100 Subject: [PATCH 2/2] fix: type check --- packages/web-pkg/src/components/FilesList/ResourceTable.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/web-pkg/src/components/FilesList/ResourceTable.vue b/packages/web-pkg/src/components/FilesList/ResourceTable.vue index e355d69aaa..01e930f270 100644 --- a/packages/web-pkg/src/components/FilesList/ResourceTable.vue +++ b/packages/web-pkg/src/components/FilesList/ResourceTable.vue @@ -401,7 +401,7 @@ defineSlots<{ usedQuota?: (props: { resource: Resource }) => unknown remainingQuota?: (props: { resource: Resource }) => unknown quickActions?: (props: { resource: Resource }) => unknown - contextMenu?: (props: { resource: Resource; isOpen: boolean }) => unknown + contextMenu?: (props: { resource: Resource }) => unknown footer?: () => unknown }>() @@ -1200,6 +1200,7 @@ const getSharedWithAvatarItems = (resource: Resource) => { .resource-table-resource-wrapper-limit-max-width { max-width: calc(100% - 4 * var(--spacing)); } + .oc-table.condensed > tbody > tr { @apply h-0; }