Address PR issues

owncloud · Sep 5, 2022 · 50b67f3 · 50b67f3
1 parent 9c43891
commit 50b67f3
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 10 deletions.
diff --git a/changelog/unreleased/bugfix-resolve-upload-existing-folder b/changelog/unreleased/bugfix-resolve-upload-existing-folder
@@ -1,6 +1,6 @@
 Bugfix: Resolve upload existing folder
 
-We've added an conflict dialog when uploading an already existing folder
+We've added an conflict dialog when uploading files and folders
 
 https://github.com/owncloud/web/pull/7504
 https://github.com/owncloud/web/issues/6996
diff --git a/package.json b/package.json
@@ -148,8 +148,5 @@
     "vue-concurrency": {
       "built": true
     }
-  },
-  "resolutions": {
-    "owncloud-design-system": "portal:/Users/paul/repos/owncloud-design-system"
   }
 }
diff --git a/packages/web-runtime/src/composables/upload/useUpload.ts b/packages/web-runtime/src/composables/upload/useUpload.ts
@@ -133,9 +133,9 @@ const createDirectoryTree = ({
 
       let existingFiles
       if (unref(isPublicLinkContext)) {
-        existingFiles = await client.publicFiles.list(`${file.meta.webDavBasePath}/`, unref(publicLinkPassword), DavProperties.Default, 'infinity')
+        existingFiles = await client.publicFiles.list(`${file.meta.webDavBasePath}/`, unref(publicLinkPassword), DavProperties.Default, 1)
       }
-      existingFiles = await client.files.list(`${file.meta.webDavBasePath}/`, 'infinity', DavProperties.Default)
+      existingFiles = await client.files.list(`${file.meta.webDavBasePath}/`, 1, DavProperties.Default)
       existingFiles = existingFiles.map(buildResource)
 
       if (!directory || createdFolders.includes(directory)) {

diff --git a/yarn.lock b/yarn.lock
@@ -9745,9 +9745,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"owncloud-design-system@portal:/Users/paul/repos/owncloud-design-system::locator=root-workspace-0b6124%40workspace%3A.":
-  version: 0.0.0-use.local
-  resolution: "owncloud-design-system@portal:/Users/paul/repos/owncloud-design-system::locator=root-workspace-0b6124%40workspace%3A."
+"owncloud-design-system@npm:14.0.0-alpha.16":
+  version: 14.0.0-alpha.16
+  resolution: "owncloud-design-system@npm:14.0.0-alpha.16"
   peerDependencies:
     "@popperjs/core": ^2.4.0
     "@vue/composition-api": ^1.4.3
@@ -9764,8 +9764,9 @@ __metadata:
     vue-inline-svg: ^2.0.0
     vue-select: ^3.12.0
     webfontloader: ^1.6.28
+  checksum: 182d05099f648cf93abe997fcbea15064630be311fce788e467ca33f96a3918dc39c1f31a9d8ca1ce4c30765a799799b18fad88f00d28b236dac271582f6d396
   languageName: node
-  linkType: soft
+  linkType: hard
 
 "owncloud-sdk@npm:~3.0.0-alpha.15":
   version: 3.0.0-alpha.15