Merge pull request #8705 from owncloud/fix-open-in-external-app

[full-ci] fix: appProviders capability check
owncloud · Mar 24, 2023 · 318fd46 · 318fd46
2 parents 70ea710 + ae6b443
commit 318fd46
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 14 deletions.
diff --git a/changelog/unreleased/bugfix-open-external-apps b/changelog/unreleased/bugfix-open-external-apps
@@ -0,0 +1,6 @@
+Bugfix: Open files in external app
+
+We've fixed a bug that caused office documents not to be opened in app provider editors anymore.
+
+https://github.com/owncloud/web/pull/8705
+https://github.com/owncloud/web/issues/8695
diff --git a/packages/web-app-files/src/composables/actions/files/useFileActions.ts b/packages/web-app-files/src/composables/actions/files/useFileActions.ts
@@ -1,4 +1,3 @@
-import get from 'lodash-es/get'
 import kebabCase from 'lodash-es/kebabCase'
 import { Store } from 'vuex'
 import { ShareStatus } from 'web-client/src/helpers/share'
@@ -7,7 +6,7 @@ import { configurationManager } from 'web-pkg/src/configuration'
 
 import { isLocationSharesActive, isLocationTrashActive } from '../../../router'
 import { computed, unref } from 'vue'
-import { useRouter, useStore } from 'web-pkg/src/composables'
+import { useCapabilityFilesAppProviders, useRouter, useStore } from 'web-pkg/src/composables'
 import { useGettext } from 'vue3-gettext'
 import {
   Action,
@@ -39,6 +38,10 @@ export const useFileActions = ({ store }: { store?: Store<any> } = {}) => {
   const router = useRouter()
   const { $gettext, interpolate: $gettextInterpolate } = useGettext()
   const isSearchActive = useIsSearchActive()
+  const appProviders = useCapabilityFilesAppProviders()
+  const appProvidersEnabled = computed(() => {
+    return !!unref(appProviders).find((appProvider) => appProvider.enabled)
+  })
 
   const { actions: acceptShareActions } = useFileActionsAcceptShare({ store })
   const { actions: copyActions } = useFileActionsCopy({ store })
@@ -257,11 +260,7 @@ export const useFileActions = ({ store }: { store?: Store<any> } = {}) => {
     }
 
     const mimeTypes = store.getters['External/mimeTypes'] || []
-    if (
-      mimeType === undefined ||
-      !get(this, 'capabilities.files.app_providers') ||
-      !mimeTypes.length
-    ) {
+    if (mimeType === undefined || !unref(appProvidersEnabled) || !mimeTypes.length) {
       return []
     }
 

diff --git a/packages/web-client/src/ocs/capabilities.ts b/packages/web-client/src/ocs/capabilities.ts
@@ -2,6 +2,13 @@ import { AxiosInstance } from 'axios'
 import get from 'lodash-es/get'
 
 /* eslint-disable camelcase */
+export interface AppProviderCapability {
+  apps_url: string
+  enabled: boolean
+  new_url: string
+  open_url: string
+  version: string
+}
 export interface Capabilities {
   capabilities: {
     notifications: {
@@ -27,13 +34,7 @@ export interface Capabilities {
       reports: string[]
     }
     files: {
-      app_providers?: {
-        apps_url: string
-        enabled: boolean
-        new_url: string
-        open_url: string
-        version: string
-      }[]
+      app_providers?: AppProviderCapability[]
       archivers?: {
         archiver_url: string
         enabled: boolean

diff --git a/packages/web-pkg/src/composables/capability/useCapability.ts b/packages/web-pkg/src/composables/capability/useCapability.ts
@@ -2,6 +2,7 @@ import { Store } from 'vuex'
 import get from 'lodash-es/get'
 import { computed, ComputedRef } from 'vue'
 import { useStore } from '../store'
+import { AppProviderCapability } from 'web-client/src/ocs/capabilities'
 
 export const useCapability = <T>(
   store: Store<any>,
@@ -73,6 +74,10 @@ export const useCapabilityPrivateLinks = createCapabilityComposable<boolean>(
   'files.privateLinks',
   false
 )
+export const useCapabilityFilesAppProviders = createCapabilityComposable<AppProviderCapability[]>(
+  'files.app_providers',
+  []
+)
 export const useCapabilityFilesSharingCanDenyAccess = createCapabilityComposable(
   'files_sharing.deny_access',
   false