diff --git a/changelog/unreleased/enhancement-single-file-link-open-with-default-app b/changelog/unreleased/enhancement-single-file-link-open-with-default-app
new file mode 100644
index 00000000000..f0b52a9929a
--- /dev/null
+++ b/changelog/unreleased/enhancement-single-file-link-open-with-default-app
@@ -0,0 +1,7 @@
+Enhancement: Single file link open with default app
+
+We've added a configurable functionality, that a single shared file via link will be opened in default app,
+for example text-editor.
+
+https://github.com/owncloud/web/pull/9046
+https://github.com/owncloud/web/issues/9045
diff --git a/docs/getting-started.md b/docs/getting-started.md
index badf3a54641..0384b7ba899 100644
--- a/docs/getting-started.md
+++ b/docs/getting-started.md
@@ -1,5 +1,5 @@
---
-title: "Getting Started"
+title: 'Getting Started'
date: 2018-05-02T00:00:00+00:00
weight: 10
geekdocRepo: https://github.com/owncloud/web
@@ -43,10 +43,11 @@ Depending on the backend you are using, there are sample config files provided i
- `customTranslations` You can specify one or multiple files to overwrite existing translations. For example set this option to `[{url: "https://localhost:9200/customTranslations.json"}]`.
#### Options
+
- `options.homeFolder` You can specify a folder that is used when the user navigates `home`. Navigating home gets triggered by clicking on the `All files`
-menu item. The user will not be jailed in that directory. It simply serves as a default location. You can either provide a static location, or you can use
-variables of the user object to come up with a user specific home path. This uses twig template variable style and allows you to pick a value or a
-substring of a value of the authenticated user. Examples are `/Shares`, `/{{.Id}}` and `/{{substr 0 3 .Id}}/{{.Id}`.
+ menu item. The user will not be jailed in that directory. It simply serves as a default location. You can either provide a static location, or you can use
+ variables of the user object to come up with a user specific home path. This uses twig template variable style and allows you to pick a value or a
+ substring of a value of the authenticated user. Examples are `/Shares`, `/{{.Id}}` and `/{{substr 0 3 .Id}}/{{.Id}`.
- `options.openAppsInTab` Configures whether apps and extensions generally should open in a new tab. Defaults to false.
- `options.disablePreviews` Set this option to `true` to disable previews in all the different file listing views. The only list view that is not affected
by this is the trash bin, as that doesn't allow showing previews at all.
@@ -64,13 +65,14 @@ substring of a value of the authenticated user. Examples are `/Shares`, `/{{.Id}
- `options.runningOnEos` Set this option to `true` if running on an [EOS storage backend](https://eos-web.web.cern.ch/eos-web/) to enable its specific features. Defaults to `false`.
- `options.cernFeatures` Enabling this will activate CERN-specific features. Defaults to `false`.
- `options.hoverableQuickActions` Set this option to `true` to hide the quick actions (buttons appearing on file rows), and only show them when the user
-hovers the row with his mouse. Defaults to `false`.
+ hovers the row with his mouse. Defaults to `false`.
- `option.routing` This accepts an object with the following fields to customize the routing behaviour:
- - `options.routing.idBased` Enable or disable fileIds being added to the URL. Defaults to `true` because otherwise e.g. spaces with name clashes can't be resolved correctly. Only disable this if you can guarantee server side that spaces of the same namespace can't have name clashes.
+ - `options.routing.idBased` Enable or disable fileIds being added to the URL. Defaults to `true` because otherwise e.g. spaces with name clashes can't be resolved correctly. Only disable this if you can guarantee server side that spaces of the same namespace can't have name clashes.
- `options.upload.xhr.timeout` Specifies the timeout for XHR uploads in milliseconds.
- `options.editor.autosaveEnabled` Specifies if the autosave for the editor apps is enabled.
- `options.editor.autosaveInterval` Specifies the time interval for the autosave of editor apps in seconds.
- `options.contextHelpersReadMore` Specifies whether the "Read more" link should be displayed or not.
+- `options.openLinksWithDefaultApp` Specifies whether single file link shares should be opened with default app or not.
### Sentry
diff --git a/packages/web-app-files/src/components/FilesList/ResourceDetails.vue b/packages/web-app-files/src/components/FilesList/ResourceDetails.vue
index 5b96dfe13ab..7f63a34b145 100644
--- a/packages/web-app-files/src/components/FilesList/ResourceDetails.vue
+++ b/packages/web-app-files/src/components/FilesList/ResourceDetails.vue
@@ -7,14 +7,16 @@
-
-
diff --git a/packages/web-app-files/src/composables/actions/files/useFileActions.ts b/packages/web-app-files/src/composables/actions/files/useFileActions.ts
index ebc0a3fec40..d439691856e 100644
--- a/packages/web-app-files/src/composables/actions/files/useFileActions.ts
+++ b/packages/web-app-files/src/composables/actions/files/useFileActions.ts
@@ -34,6 +34,10 @@ import {
export const EDITOR_MODE_EDIT = 'edit'
export const EDITOR_MODE_CREATE = 'create'
+export interface GetFileActionsOptions extends FileActionOptions {
+ omitSystemActions?: boolean
+}
+
export const useFileActions = ({ store }: { store?: Store } = {}) => {
store = store || useStore()
const router = useRouter()
@@ -214,7 +218,11 @@ export const useFileActions = ({ store }: { store?: Store } = {}) => {
action.handler(options)
}
- const getDefaultAction = (options: FileActionOptions): Action => {
+ const getDefaultEditorAction = (options: FileActionOptions): Action | null => {
+ return getDefaultAction({ ...options, omitSystemActions: true })
+ }
+
+ const getDefaultAction = (options: GetFileActionsOptions): Action | null => {
const filterCallback = (action) =>
action.canBeDefault &&
action.isEnabled({
@@ -236,7 +244,7 @@ export const useFileActions = ({ store }: { store?: Store } = {}) => {
}
// fallback: system actions
- return unref(systemActions).filter(filterCallback)[0]
+ return options.omitSystemActions ? null : unref(systemActions).filter(filterCallback)[0]
}
const getAllAvailableActions = (options: FileActionOptions) => {
@@ -323,6 +331,8 @@ export const useFileActions = ({ store }: { store?: Store } = {}) => {
return {
editorActions,
systemActions,
+ getDefaultAction,
+ getDefaultEditorAction,
getAllAvailableActions,
loadExternalAppActions,
openEditor,
diff --git a/packages/web-app-files/src/views/spaces/GenericSpace.vue b/packages/web-app-files/src/views/spaces/GenericSpace.vue
index 05d01e8ff88..4380fe19191 100644
--- a/packages/web-app-files/src/views/spaces/GenericSpace.vue
+++ b/packages/web-app-files/src/views/spaces/GenericSpace.vue
@@ -170,7 +170,7 @@ import AppLoadingSpinner from 'web-pkg/src/components/AppLoadingSpinner.vue'
import NoContentMessage from 'web-pkg/src/components/NoContentMessage.vue'
import WhitespaceContextMenu from 'web-app-files/src/components/Spaces/WhitespaceContextMenu.vue'
import Pagination from 'web-pkg/src/components/Pagination.vue'
-import { useRoute } from 'web-pkg/src/composables'
+import { useRoute, useRouteQuery } from 'web-pkg/src/composables'
import { useDocumentTitle } from 'web-pkg/src/composables/appDefaults/useDocumentTitle'
import { ImageType } from 'web-pkg/src/constants'
import { VisibilityObserver } from 'web-pkg/src/observer'
@@ -231,6 +231,8 @@ export default defineComponent({
setup(props) {
const store = useStore()
const { $gettext, $ngettext, interpolate: $gettextInterpolate } = useGettext()
+ const { getDefaultEditorAction } = useFileActions()
+ const openWithDefaultAppQuery = useRouteQuery('openWithDefaultApp')
let loadResourcesEventToken
const canUpload = computed(() => {
@@ -388,6 +390,25 @@ export default defineComponent({
}
}
+ const openWithDefaultApp = () => {
+ const highlightedFile = store.getters['Files/highlightedFile']
+
+ if (!highlightedFile || highlightedFile.isFolder) {
+ return
+ }
+
+ const fileActionsOptions = {
+ resources: [highlightedFile],
+ space: props.space
+ }
+
+ const defaultEditorAction = getDefaultEditorAction(fileActionsOptions)
+
+ if (defaultEditorAction) {
+ defaultEditorAction.handler({ ...fileActionsOptions })
+ }
+ }
+
const resourcesViewDefaults = useResourcesViewDefaults()
const performLoaderTask = async (
sameRoute: boolean,
@@ -412,6 +433,10 @@ export default defineComponent({
])
resourcesViewDefaults.refreshFileListHeaderPosition()
focusAndAnnounceBreadcrumb(sameRoute)
+
+ if (unref(openWithDefaultAppQuery) === 'true') {
+ openWithDefaultApp()
+ }
}
onMounted(() => {
diff --git a/packages/web-app-files/tests/unit/components/FilesList/ResourceDetails.spec.ts b/packages/web-app-files/tests/unit/components/FilesList/ResourceDetails.spec.ts
new file mode 100644
index 00000000000..f0a044292c0
--- /dev/null
+++ b/packages/web-app-files/tests/unit/components/FilesList/ResourceDetails.spec.ts
@@ -0,0 +1,90 @@
+import {
+ createStore,
+ defaultComponentMocks,
+ defaultPlugins,
+ defaultStoreMockOptions,
+ mount,
+ RouteLocation
+} from 'web-test-helpers'
+import ResourceDetails from '../../../../src/components/FilesList/ResourceDetails.vue'
+import { mock } from 'jest-mock-extended'
+import { useFileActions } from 'web-app-files/src/composables/actions/files/useFileActions'
+import { SpaceResource } from 'web-client'
+import { useRouteQuery } from 'web-pkg'
+import { ref } from 'vue'
+
+jest.mock('web-app-files/src/composables/actions/files/useFileActions')
+jest.mock('web-pkg/src/composables/router', () => ({
+ ...jest.requireActual('web-pkg/src/composables/router'),
+ useRouteQuery: jest.fn()
+}))
+
+describe('ResourceDetails component', () => {
+ jest.mocked(useFileActions).mockImplementation(() =>
+ mock>({
+ getDefaultEditorAction: () => ({ handler: jest.fn() } as any)
+ })
+ )
+
+ it('renders resource details correctly', () => {
+ const { wrapper } = getWrapper()
+ expect(wrapper.html()).toMatchSnapshot()
+ })
+
+ describe('open with default actions', () => {
+ it("doesn't open default action if query param 'openWithDefaultApp' isn't set true", () => {
+ const { wrapper } = getWrapper()
+ expect(wrapper.vm.defaultEditorAction.handler).not.toHaveBeenCalled()
+ })
+ it("opens default action if query param 'openWithDefaultApp' is set true", () => {
+ jest.mocked(useRouteQuery).mockImplementationOnce(() => ref('true'))
+ const { wrapper } = getWrapper()
+ expect(wrapper.vm.defaultEditorAction.handler).toHaveBeenCalled()
+ })
+ })
+
+ function getWrapper() {
+ const mocks = {
+ ...defaultComponentMocks({
+ currentRoute: mock({
+ name: 'files-public-link',
+ query: { openWithDefaultAppQuery: 'true' }
+ })
+ })
+ }
+ const storeOptions = { ...defaultStoreMockOptions }
+ const store = createStore(storeOptions)
+
+ const file = {
+ id: 0,
+ name: 'image.jpg',
+ size: 24064,
+ mdate: 'Wed, 21 Oct 2015 07:28:00 GMT',
+ mimeType: 'image/jpg',
+ owner: [
+ {
+ username: 'admin'
+ }
+ ]
+ }
+ const space = mock()
+
+ return {
+ mocks,
+ wrapper: mount(ResourceDetails, {
+ props: {
+ space,
+ singleResource: file
+ },
+ global: {
+ mocks,
+ plugins: [...defaultPlugins(), store],
+ provide: {
+ space,
+ resource: file
+ }
+ }
+ })
+ }
+ }
+})
diff --git a/packages/web-app-files/tests/unit/components/FilesList/__snapshots__/ResourceDetails.spec.ts.snap b/packages/web-app-files/tests/unit/components/FilesList/__snapshots__/ResourceDetails.spec.ts.snap
new file mode 100644
index 00000000000..37a901ff021
--- /dev/null
+++ b/packages/web-app-files/tests/unit/components/FilesList/__snapshots__/ResourceDetails.spec.ts.snap
@@ -0,0 +1,57 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`ResourceDetails component renders resource details correctly 1`] = `
+
+
+
+
+
+
+
+
+
+
+ image.jpg
+
+
+
+
+
+
+
+
+
+
+