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.

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

Do not fallback to appId if the file action route is not defined #3740

Merged
merged 1 commit into from
Jul 8, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 4 additions & 3 deletions apps/pdf-viewer/src/PdfViewer.vue
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
<template lang="html">
<div id="pdf-viewer">
<div id="pdf-viewer" class="uk-flex uk-flex-column">
<pdf-viewer-app-bar />
<oc-progress v-if="loading" :max="100" indeterminate></oc-progress>
<oc-progress v-if="loading" :max="100" indeterminate />
<pdf
v-if="!loading"
:page="currentPage"
:src="content"
class="uk-overflow-auto uk-flex-1"
@error="error"
@num-pages="loadPages"
></pdf>
/>
</div>
</template>
<script>
Expand Down
2 changes: 1 addition & 1 deletion apps/pdf-viewer/src/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ const PdfViewer = () => ({

const routes = [
{
path: '/pdf-viewer',
path: '/',
components: {
app: PdfViewer
},
Expand Down
9 changes: 9 additions & 0 deletions changelog/unreleased/file-editors-path
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
Change: Don't fallback to appId in case the route of file action is not defined

When opening a file in a editor or a viewer the path was falling back to an appId.
This made it impossible to navigate via the file actions into an app which doesn't have duplicate appId in the route.
We've stopped falling back to this value and in case that the route of the file action is not defined, we use the root path of the app.

https://github.com/owncloud/product/issues/69
https://github.com/owncloud/ocis/issues/356
https://github.com/owncloud/phoenix/pull/3740
2 changes: 1 addition & 1 deletion src/store/apps.js
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ const mutations = {
app: appInfo.id,
icon: e.icon,
newTab: e.newTab || false,
routeName: e.routeName || appInfo.id,
routeName: e.routeName,
newFileMenu: e.newFileMenu || null
}
if (!state.extensions[e.extension]) {
Expand Down