Use default app from app provider and early returns in fileActions

Author: kulmann

packages/web-app-external/src/App.vue

@@ -101,8 +101,12 @@ export default {
     headers.append('X-Requested-With', 'XMLHttpRequest')
 
     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',

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
     },

packages/web-app-files/src/mixins/fileActions.js

@@ -143,10 +143,32 @@ 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 {
+          handler: () => this.$_fileActions_openLink(undefined, resource.fileId)
+        }
+      }
+
+      // fallback: system actions
+      return this.$_fileActions_systemActions.filter(filterCallback)
     },
 
     $_fileActions_getAllAvailableActions(resource) {
@@ -195,9 +217,11 @@ export default {
     },
 
     $_fileActions_openLink(appName, resourceId) {
+      const params = { file_id: resourceId }
+      if (appName) params.app = appName
       const routeData = this.$router.resolve({
         name: 'external-apps',
-        params: { app: appName, file_id: resourceId }
+        params
       })
       // TODO: Let users configure whether to open in same/new tab (`_blank` vs `_self`)
       window.open(routeData.href, '_blank')