From d08f33ab767ba45fded9cde89fe484e77788df5c Mon Sep 17 00:00:00 2001
From: Florian Schade <f.schade@icloud.com>
Date: Fri, 20 Aug 2021 11:09:55 +0200
Subject: [PATCH] fix(media-viewer): fix davProperties

mediaViewer still used davProperties from component scope, updated to
use shared DavProperties
---
 .../bugfix-load-folder-in-media-viewer         |  3 ++-
 .../web-app-media-viewer/src/mixins/loader.js  | 18 ++++++++----------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/changelog/4.1.0_2021-08-19/bugfix-load-folder-in-media-viewer b/changelog/4.1.0_2021-08-19/bugfix-load-folder-in-media-viewer
index c707e06b2d5..96576589eda 100644
--- a/changelog/4.1.0_2021-08-19/bugfix-load-folder-in-media-viewer
+++ b/changelog/4.1.0_2021-08-19/bugfix-load-folder-in-media-viewer
@@ -4,4 +4,5 @@ We've fixed the loading of a folder in the Media viewer extension.
 If a user reloads the Media viewer now, it load all the medias both in private and public context.
 
 https://github.com/owncloud/web/issues/5427
-https://github.com/owncloud/web/pull/5585
\ No newline at end of file
+https://github.com/owncloud/web/pull/5585
+https://github.com/owncloud/web/pull/5710
diff --git a/packages/web-app-media-viewer/src/mixins/loader.js b/packages/web-app-media-viewer/src/mixins/loader.js
index 0dac92a1b62..c631f6a01c8 100644
--- a/packages/web-app-media-viewer/src/mixins/loader.js
+++ b/packages/web-app-media-viewer/src/mixins/loader.js
@@ -2,6 +2,7 @@ import { mapGetters, mapMutations } from 'vuex'
 import queryString from 'query-string'
 import { basename, dirname } from 'path'
 import { buildResource } from '../../../web-app-files/src/helpers/resources' // TODO: place the helper in more global space not to create dep on files app
+import { DavProperties } from 'web-pkg/src/constants'
 
 // TODO: this file is a first attempt to separate file/folder loading logic out of the mediaviewer
 // Discussion how to progress from here can be found in this issue:
@@ -9,7 +10,7 @@ import { buildResource } from '../../../web-app-files/src/helpers/resources' //
 
 export default {
   computed: {
-    ...mapGetters('Files', ['publicLinkPassword', 'davProperties']),
+    ...mapGetters('Files', ['publicLinkPassword']),
     ...mapGetters(['configuration']),
     $_loader_publicContext() {
       return this.$route.params.contextRouteName === 'files-public-list'
@@ -39,17 +40,14 @@ export default {
       this.CLEAR_CURRENT_FILES_LIST()
 
       try {
-        const properties = this.davProperties.concat([
-          this.$client.publicFiles.PUBLIC_LINK_ITEM_TYPE,
-          this.$client.publicFiles.PUBLIC_LINK_PERMISSION,
-          this.$client.publicFiles.PUBLIC_LINK_EXPIRATION,
-          this.$client.publicFiles.PUBLIC_LINK_SHARE_DATETIME,
-          this.$client.publicFiles.PUBLIC_LINK_SHARE_OWNER
-        ])
         const absolutePath = filePath.substring(0, filePath.lastIndexOf('/'))
         const promise = this.$_loader_publicContext
-          ? this.$client.publicFiles.list(absolutePath, this.publicLinkPassword, properties)
-          : this.$client.files.list(absolutePath, 1, this.davProperties)
+          ? this.$client.publicFiles.list(
+              absolutePath,
+              this.publicLinkPassword,
+              DavProperties.PublicLink
+            )
+          : this.$client.files.list(absolutePath, 1, DavProperties.Default)
         let resources = await promise
 
         resources = resources.map(buildResource)