From 36f79f745e39c76b00d8a1ebfc664ae5e76aef8b Mon Sep 17 00:00:00 2001
From: Lukas Hirt <lukashirt@mail.com>
Date: Tue, 7 Jul 2020 14:18:20 +0200
Subject: [PATCH] Do not fallback to appId if the file action route is not
 defined

---
 apps/pdf-viewer/src/PdfViewer.vue      | 7 ++++---
 apps/pdf-viewer/src/app.js             | 2 +-
 changelog/unreleased/file-editors-path | 9 +++++++++
 src/store/apps.js                      | 2 +-
 4 files changed, 15 insertions(+), 5 deletions(-)
 create mode 100644 changelog/unreleased/file-editors-path

diff --git a/apps/pdf-viewer/src/PdfViewer.vue b/apps/pdf-viewer/src/PdfViewer.vue
index bf6576d43d7..6f4d2926fae 100644
--- a/apps/pdf-viewer/src/PdfViewer.vue
+++ b/apps/pdf-viewer/src/PdfViewer.vue
@@ -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>
diff --git a/apps/pdf-viewer/src/app.js b/apps/pdf-viewer/src/app.js
index 3bc80c809b9..fb612d7dee9 100644
--- a/apps/pdf-viewer/src/app.js
+++ b/apps/pdf-viewer/src/app.js
@@ -10,7 +10,7 @@ const PdfViewer = () => ({
 
 const routes = [
   {
-    path: '/pdf-viewer',
+    path: '/',
     components: {
       app: PdfViewer
     },
diff --git a/changelog/unreleased/file-editors-path b/changelog/unreleased/file-editors-path
new file mode 100644
index 00000000000..c7a34fcfd4c
--- /dev/null
+++ b/changelog/unreleased/file-editors-path
@@ -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
\ No newline at end of file
diff --git a/src/store/apps.js b/src/store/apps.js
index 49882fea4c3..275052792a9 100644
--- a/src/store/apps.js
+++ b/src/store/apps.js
@@ -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]) {