From e4bdfc2689e2e3e8d9c526d92893be1108d82746 Mon Sep 17 00:00:00 2001 From: Jannik Stehle Date: Mon, 17 Oct 2022 14:32:52 +0200 Subject: [PATCH 1/4] Improve error message for internal links on unaccepted shares --- ...ancement-internal-link-on-unaccepted-share | 6 ++ .../src/pages/resolvePrivateLink.vue | 83 +++++++++++++++---- 2 files changed, 75 insertions(+), 14 deletions(-) create mode 100644 changelog/unreleased/enhancement-internal-link-on-unaccepted-share diff --git a/changelog/unreleased/enhancement-internal-link-on-unaccepted-share b/changelog/unreleased/enhancement-internal-link-on-unaccepted-share new file mode 100644 index 00000000000..400e55e5faa --- /dev/null +++ b/changelog/unreleased/enhancement-internal-link-on-unaccepted-share @@ -0,0 +1,6 @@ +Enhancement: Internal link on unaccepted share + +The error message when resolving an internal link to an unaccepted share has been improved for a better UX. + +https://github.com/owncloud/web/issues/7803 +https://github.com/owncloud/web/pull/7814 diff --git a/packages/web-runtime/src/pages/resolvePrivateLink.vue b/packages/web-runtime/src/pages/resolvePrivateLink.vue index fced25a0eb3..640b112de04 100644 --- a/packages/web-runtime/src/pages/resolvePrivateLink.vue +++ b/packages/web-runtime/src/pages/resolvePrivateLink.vue @@ -14,12 +14,28 @@
@@ -41,7 +57,7 @@ import { queryItemAsString, useCapabilitySpacesEnabled } from 'web-pkg/src/composables' -import { unref, defineComponent, computed, onMounted } from '@vue/composition-api' +import { unref, defineComponent, computed, onMounted, ref } from '@vue/composition-api' import { clientService } from 'web-pkg/src/services' import { createLocationSpaces } from 'files/src/router' import { dirname } from 'path' @@ -67,8 +83,11 @@ export default defineComponent({ const router = useRouter() const route = useRoute() const id = useRouteParam('fileId') - const { $gettext } = useTranslations() + const { $gettext, $gettextInterpolate } = useTranslations() const hasSpaces = useCapabilitySpacesEnabled(store) + const resource = ref(undefined) + const sharedParentResource = ref(undefined) + const isUnacceptedShareError = ref(false) const pageTitle = computed(() => $gettext(unref(route).meta.title)) const configuration = computed(() => { @@ -80,20 +99,27 @@ export default defineComponent({ }) const resolvePrivateLinkTask = useTask(function* (signal, id) { - let path, resource + let path let matchingSpace = getMatchingSpace(id) if (matchingSpace) { path = yield clientService.owncloudSdk.files.getPathForFileId(id) - resource = yield clientService.webdav.getFileInfo(matchingSpace, { path }) + resource.value = yield clientService.webdav.getFileInfo(matchingSpace, { path }) } else { // no matching space found => the file doesn't lie in own spaces => it's a share. // do PROPFINDs on parents until root of accepted share is found in `mountpoint` spaces let mountPoint = findMatchingMountPoint(id) - resource = yield fetchFileInfoById(id) - const sharePathSegments = mountPoint ? [] : [resource.name] - let tmpResource = resource + resource.value = yield fetchFileInfoById(id) + const sharePathSegments = mountPoint ? [] : [unref(resource).name] + let tmpResource = unref(resource) while (!mountPoint) { - tmpResource = yield fetchFileInfoById(tmpResource.parentFolderId) + try { + tmpResource = yield fetchFileInfoById(tmpResource.parentFolderId) + } catch (e) { + isUnacceptedShareError.value = true + throw Error(e) + } + + sharedParentResource.value = tmpResource mountPoint = findMatchingMountPoint(tmpResource.id) if (!mountPoint) { sharePathSegments.unshift(tmpResource.name) @@ -110,11 +136,11 @@ export default defineComponent({ let fileId let scrollTo - if (resource.type === 'folder') { - fileId = resource.fileId + if (unref(resource).type === 'folder') { + fileId = unref(resource).fileId } else { - fileId = resource.parentFolderId - scrollTo = resource.name + fileId = unref(resource).parentFolderId + scrollTo = unref(resource).name path = dirname(path) } @@ -164,7 +190,32 @@ export default defineComponent({ return !resolvePrivateLinkTask.last || resolvePrivateLinkTask.isRunning }) + const sharedWithMeRoute = computed(() => { + return { name: 'files-shares-with-me' } + }) + + const openSharedWithMeLabel = computed(() => { + return $gettext('Open "Shared with me"') + }) + const errorMessage = computed(() => { + if (unref(isUnacceptedShareError)) { + if ( + !unref(sharedParentResource) || + unref(resource).name === unref(sharedParentResource).name + ) { + return $gettext( + 'has been shared with you. Accept it in "Shares" > "Shared with me" to view it.' + ) + } + const translated = $gettext( + 'has been shared with you via "%{parentShareName}". Accept the share "%{parentShareName}" in "Shares" > "Shared with me" to view it.' + ) + return $gettextInterpolate(translated, { + parentShareName: unref(sharedParentResource).name + }) + } + if (resolvePrivateLinkTask.isError) { return resolvePrivateLinkTask.last.error } @@ -175,7 +226,11 @@ export default defineComponent({ pageTitle, configuration, errorMessage, - loading + loading, + resource, + isUnacceptedShareError, + sharedWithMeRoute, + openSharedWithMeLabel } } }) From 025542d8c3e374b14975f6c20eddd4e5e1a4e79f Mon Sep 17 00:00:00 2001 From: Jannik Stehle Date: Tue, 18 Oct 2022 10:23:16 +0200 Subject: [PATCH 2/4] Redesign the private link resolving page --- .../src/pages/resolvePrivateLink.vue | 91 ++++++++++--------- 1 file changed, 47 insertions(+), 44 deletions(-) diff --git a/packages/web-runtime/src/pages/resolvePrivateLink.vue b/packages/web-runtime/src/pages/resolvePrivateLink.vue index 640b112de04..437ff87b85c 100644 --- a/packages/web-runtime/src/pages/resolvePrivateLink.vue +++ b/packages/web-runtime/src/pages/resolvePrivateLink.vue @@ -1,48 +1,41 @@ @@ -238,8 +231,18 @@ export default defineComponent({