prioritize default app by hasPriority

owncloud · Mar 24, 2023 · 42f1656 · 42f1656
1 parent 7804067
commit 42f1656
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/packages/web-app-files/src/composables/actions/files/useFileActions.ts b/packages/web-app-files/src/composables/actions/files/useFileActions.ts
@@ -211,15 +211,17 @@ export const useFileActions = ({ store }: { store?: Store<any> } = {}) => {
 
     // first priority: handlers from config
     const defaultEditorActions = unref(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 = loadExternalAppActions(options).filter(filterCallback)
-    if (externalAppsActions.length) {
-      return externalAppsActions[0]
+
+    // prioritize apps that have hasPriority set
+    const appActions = [...defaultEditorActions, ...externalAppsActions].sort(
+      (a, b) => Number(b.hasPriority) - Number(a.hasPriority)
+    )
+    if (appActions.length) {
+      return appActions[0]
     }
 
     // fallback: system actions
@@ -282,6 +284,7 @@ export const useFileActions = ({ store }: { store?: Store<any> } = {}) => {
         class: `oc-files-actions-${app.name}-trigger`,
         isEnabled: () => true,
         canBeDefault: defaultApplication === app.name,
+        hasPriority: defaultApplication === app.name,
         handler: () =>
           openExternalApp(app.name, driveAliasAndItem, webDavPath, fileId, options.space.shareId),
         label: () => $gettextInterpolate(label, { appName: app.name })

diff --git a/packages/web-pkg/src/composables/actions/types.ts b/packages/web-pkg/src/composables/actions/types.ts
@@ -12,6 +12,7 @@ export interface Action<T = ActionOptions> {
   componentType: 'button' | 'router-link'
   class: string
   canBeDefault?: boolean
+  hasPriority?: boolean
   hideLabel?: boolean
   shortcut?: string
   keepOpen?: boolean