Merge pull request #5970 from owncloud/use-default-app-from-app-provider

Use default app from app provider and early returns in fileActions
owncloud · Nov 16, 2021 · c0e09f4 · c0e09f4
2 parents a80bcbd + a04ba51
commit c0e09f4
Show file tree

Hide file tree

Showing 4 changed files with 60 additions and 25 deletions.
diff --git a/changelog/unreleased/enhancement-app-provider-defaults b/changelog/unreleased/enhancement-app-provider-defaults
@@ -0,0 +1,6 @@
+Enhancement: Use default info from app provider
+
+The app provider returns information about the default application per mime type. This information is now respected when triggering the default action for a file.
+
+https://github.com/owncloud/web/issues/5962
+https://github.com/owncloud/web/pull/5970
diff --git a/packages/web-app-external/src/App.vue b/packages/web-app-external/src/App.vue
@@ -110,8 +110,12 @@ export default {
 
     // fetch iframe params for app and file
     const configUrl = this.configuration.server
-    const appOpenUrl = this.capabilities.files.app_providers[0].open_url.replace('/app', 'app')
-    const url = configUrl + appOpenUrl + '?file_id=' + this.fileId + '&app_name=' + this.appName
+    const appOpenUrl = this.capabilities.files.app_providers[0].open_url.replace(/^\/+/, '')
+    const url =
+      configUrl +
+      appOpenUrl +
+      `?file_id=${this.fileId}` +
+      (this.appName ? `&app_name=${this.appName}` : '')
 
     const response = await fetch(url, {
       method: 'POST',

diff --git a/packages/web-app-external/src/index.js b/packages/web-app-external/src/index.js
@@ -15,7 +15,7 @@ const appInfo = {
 const routes = [
   {
     name: 'apps',
-    path: '/:app/:file_id',
+    path: '/:file_id/:app?',
     components: {
       app: App
     },

diff --git a/packages/web-app-files/src/mixins/fileActions.js b/packages/web-app-files/src/mixins/fileActions.js
@@ -144,10 +144,30 @@ export default {
     // returns the _first_ action from actions array which we now construct from
     // available mime-types coming from the app-provider and existing actions
     $_fileActions_triggerDefaultAction(resource) {
-      const actions = this.$_fileActions_getAllAvailableActions(resource).filter(
-        (action) => action.canBeDefault
-      )
-      actions[0].handler(resource, actions[0].handlerData)
+      const action = this.$_fileActions_getDefaultAction(resource)
+      action.handler(resource, action.handlerData)
+    },
+
+    $_fileActions_getDefaultAction(resource) {
+      const filterCallback = (action) =>
+        action.canBeDefault && action.isEnabled({ resource, parent: this.currentFolder })
+
+      // first priority: handlers from config
+      const defaultEditorActions = this.$_fileActions_editorActions.filter(filterCallback)
+      if (defaultEditorActions.length) {
+        return defaultEditorActions[0]
+      }
+
+      // second priority: `/app/open` endpoint of app provider if available
+      // FIXME: files app should not know anything about the `external apps` app
+      const externalAppsActions =
+        this.$_fileActions_loadExternalAppActions(resource).filter(filterCallback)
+      if (externalAppsActions.length) {
+        return externalAppsActions[0]
+      }
+
+      // fallback: system actions
+      return this.$_fileActions_systemActions.filter(filterCallback)
     },
 
     $_fileActions_getAllAvailableActions(resource) {
@@ -176,35 +196,40 @@ export default {
         return []
       }
 
-      const { app_providers: appProviders = [] } = this.mimeTypes.find(
-        (t) => t.mime_type === mimeType
-      )
+      const { app_providers: appProviders = [], default_application: defaultApplication } =
+        this.mimeTypes.find((t) => t.mime_type === mimeType)
 
       return appProviders.map((app) => {
         const label = this.$gettext('Open in %{ appName }')
         return {
+          name: app.name,
           img: app.icon,
           componentType: 'oc-button',
           class: `oc-files-actions-${app.name}-trigger`,
           isEnabled: () => true,
-          canBeDefault: true,
-          handler: () => {
-            const routeData = this.$router.resolve({
-              name: 'external-apps',
-              params: { app: app.name, file_id: resource.fileId },
-              // public-token retrieval is weak, same as packages/web-app-files/src/index.js:106
-              query: {
-                ...(this.isPublicPage && {
-                  'public-token': (this.$route.params.item || '').split('/')[0]
-                })
-              }
-            })
-            // TODO: Let users configure whether to open in same/new tab (`_blank` vs `_self`)
-            window.open(routeData.href, '_blank')
-          },
+          canBeDefault: defaultApplication === app.name,
+          handler: () => this.$_fileActions_openLink(app.name, resource.fileId),
           label: () => this.$gettextInterpolate(label, { appName: app.name })
         }
       })
+    },
+
+    $_fileActions_openLink(appName, resourceId) {
+      const routeData = this.$router.resolve({
+        name: 'external-apps',
+        params: {
+          file_id: resourceId,
+          app: appName
+        },
+        // public-token retrieval is weak, same as packages/web-app-files/src/index.js:106
+        query: {
+          ...(this.isPublicPage && {
+            'public-token': (this.$route.params.item || '').split('/')[0]
+          })
+        }
+      })
+      // TODO: Let users configure whether to open in same/new tab (`_blank` vs `_self`)
+      window.open(routeData.href, '_blank')
     }
   }
 }