Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: use more generic private link error message #12054

Merged
merged 1 commit into from
Dec 23, 2024
Merged

feat: use more generic private link error message #12054

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions changelog/unreleased/enhancement-use-generic-private-link-error.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
Enhancement: Use generic private link error

We've added a more generic error message to the unavailable private links as the previous message was confusing.

https://github.com/owncloud/web/pull/12054
https://github.com/owncloud/web/issues/12009
19 changes: 3 additions & 16 deletions packages/web-runtime/src/pages/resolvePrivateLink.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,6 @@
</div>
<div class="oc-card-body oc-link-resolve-error-message">
<p class="oc-text-xlarge">{{ errorMessage }}</p>
<p
v-if="isUnacceptedShareError"
v-text="$gettext('You can reload this page after you have enabled syncing the share.')"
/>
</div>
</template>
</div>
Expand Down Expand Up @@ -170,18 +166,9 @@ export default defineComponent({

const errorMessage = computed(() => {
if (unref(isUnacceptedShareError)) {
if (!unref(sharedParentResource)) {
return $gettext(
'This file or folder has been shared with you. Enable the sync in "Shares" > "Shared with me" to view it.'
)
} else {
return $gettext(
'This file or folder has been shared with you via "%{parentShareName}". Enable the sync for the share "%{parentShareName}" in "Shares" > "Shared with me" to view it.',
{
parentShareName: unref(sharedParentResource).name
}
)
}
return $gettext(
'The link you are trying to access is invalid or you do not have permission to view the content. Please check the link for any errors or contact the person who shared it for assistance.'
)
}

if (resolvePrivateLinkTask.isError) {
Expand Down