fix(files): Resolve conflict with new release of @nextcloud/files

Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
nextcloud · Aug 10, 2023 · a92bb9c · a92bb9c
1 parent 242d510
commit a92bb9c
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/apps/files/src/services/Favorites.ts b/apps/files/src/services/Favorites.ts
@@ -19,7 +19,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  */
-import { File, Folder, parseWebdavPermissions } from '@nextcloud/files'
+import { File, Folder, davParsePermissions } from '@nextcloud/files'
 import { generateRemoteUrl } from '@nextcloud/router'
 import { getClient, rootPath } from './WebdavClient'
 import { getCurrentUser } from '@nextcloud/auth'
@@ -47,7 +47,7 @@ interface ResponseProps extends DAVResultResponseProps {
 
 const resultToNode = function(node: FileStat): File | Folder {
 	const props = node.props as ResponseProps
-	const permissions = parseWebdavPermissions(props?.permissions)
+	const permissions = davParsePermissions(props?.permissions)
 	const owner = getCurrentUser()?.uid as string
 
 	const nodeData = {

diff --git a/apps/files/src/services/Recent.ts b/apps/files/src/services/Recent.ts
@@ -19,7 +19,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  */
-import { File, Folder, Permission, parseWebdavPermissions } from '@nextcloud/files'
+import { File, Folder, Permission, davParsePermissions } from '@nextcloud/files'
 import { generateRemoteUrl } from '@nextcloud/router'
 import { getClient, rootPath } from './WebdavClient'
 import { getCurrentUser } from '@nextcloud/auth'
@@ -94,7 +94,7 @@ interface ResponseProps extends DAVResultResponseProps {
 
 const resultToNode = function(node: FileStat): File | Folder {
 	const props = node.props as ResponseProps
-	const permissions = parseWebdavPermissions(props?.permissions)
+	const permissions = davParsePermissions(props?.permissions)
 	const owner = getCurrentUser()?.uid as string
 
 	const nodeData = {

diff --git a/apps/files_trashbin/src/services/trashbin.ts b/apps/files_trashbin/src/services/trashbin.ts
@@ -21,7 +21,7 @@
  */
 /* eslint-disable */
 import { getCurrentUser } from '@nextcloud/auth'
-import { File, Folder, parseWebdavPermissions } from '@nextcloud/files'
+import { File, Folder, davParsePermissions } from '@nextcloud/files'
 import { generateRemoteUrl, generateUrl } from '@nextcloud/router'
 
 import type { FileStat, ResponseDataDetailed } from 'webdav'
@@ -43,7 +43,7 @@ const data = `<?xml version="1.0"?>
 
 
 const resultToNode = function(node: FileStat): File | Folder {
-	const permissions = parseWebdavPermissions(node.props?.permissions)
+	const permissions = davParsePermissions(node.props?.permissions)
 	const owner = getCurrentUser()?.uid as string
 	const previewUrl = generateUrl('/apps/files_trashbin/preview?fileId={fileid}&x=32&y=32', node.props)
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -45,7 +45,7 @@
     "@nextcloud/capabilities": "^1.0.4",
     "@nextcloud/dialogs": "^4.2.0-beta.1",
     "@nextcloud/event-bus": "^3.1.0",
-    "@nextcloud/files": "^3.0.0-beta.11",
+    "@nextcloud/files": "^3.0.0-beta.14",
     "@nextcloud/initial-state": "^2.0.0",
     "@nextcloud/l10n": "^2.1.0",
     "@nextcloud/logger": "^2.5.0",