Adjust to sdk changes

owncloud · Jul 20, 2022 · 5dbc5bd · 5dbc5bd
1 parent 6fdb96e
commit 5dbc5bd
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 25 deletions.
diff --git a/packages/web-app-files/src/components/Search/List.vue b/packages/web-app-files/src/components/Search/List.vue
@@ -28,18 +28,18 @@
       </template>
       <template #footer>
         <pagination :pages="paginationPages" :current-page="paginationPage" />
+        <div
+          v-if="searchResultExceedsLimit"
+          class="oc-text-nowrap oc-text-center oc-width-1-1 oc-my-s"
+          v-text="searchResultExceedsLimitText"
+        />
         <list-info
-          v-if="paginatedResources.length > 0"
+          v-else-if="paginatedResources.length > 0"
           class="oc-width-1-1 oc-my-s"
           :files="totalFilesCount.files"
           :folders="totalFilesCount.folders"
           :size="totalFilesSize"
         />
-        <div
-          v-if="searchResultExceedsLimit"
-          class="oc-text-nowrap oc-text-center oc-width-1-1 oc-my-s"
-          v-text="searchResultExceedsLimitText"
-        />
       </template>
     </resource-table>
   </div>
@@ -75,7 +75,7 @@ export default defineComponent({
     searchResults: {
       type: Object,
       default: function () {
-        return { foundItems: 0, resources: [] }
+        return { range: 0, resources: [] }
       }
     }
   },
@@ -98,13 +98,19 @@ export default defineComponent({
     itemCount() {
       return this.totalFilesCount.files + this.totalFilesCount.folders
     },
+    rangeItems() {
+      return this.searchResults.range.split('/')[1]
+    },
     searchResultExceedsLimit() {
-      return this.searchResults.foundItems > searchLimit
+      return this.rangeItems > searchLimit
     },
     searchResultExceedsLimitText() {
-      const translated = this.$gettext('Found many, showing the %{itemCount} best matching results')
+      const translated = this.$gettext(
+        'Found %{rangeItems}, showing the %{itemCount} best matching results'
+      )
       return this.$gettextInterpolate(translated, {
-        itemCount: this.itemCount
+        itemCount: this.itemCount,
+        rangeItems: this.rangeItems
       })
     }
   },

diff --git a/packages/web-app-files/src/search/sdk/list.ts b/packages/web-app-files/src/search/sdk/list.ts
@@ -5,7 +5,7 @@ import { buildResource } from '../../helpers/resources'
 import { Component } from 'vue'
 import { DavProperties } from 'web-pkg/src/constants'
 
-export const searchLimit = 300
+export const searchLimit = 200
 
 export default class List implements SearchList {
   public readonly component: Component
@@ -19,15 +19,15 @@ export default class List implements SearchList {
       return []
     }
 
-    const plainResources = await clientService.owncloudSdk.files.search(
+    const searchResponse = await clientService.owncloudSdk.files.search(
       term,
       searchLimit,
       DavProperties.Default
     )
 
     return {
-      foundItems: 400,
-      resources: plainResources.map((plainResource) => {
+      range: searchResponse.range,
+      resources: searchResponse.results.map((plainResource) => {
         let resourceName = decodeURIComponent(plainResource.name)
         if (resourceName.startsWith('/dav')) {
           resourceName = resourceName.slice(4)
@@ -37,15 +37,5 @@ export default class List implements SearchList {
         return { id: resource.id, data: resource }
       })
     }
-
-    return plainResources.map((plainResource) => {
-      let resourceName = decodeURIComponent(plainResource.name)
-      if (resourceName.startsWith('/dav')) {
-        resourceName = resourceName.slice(4)
-      }
-
-      const resource = buildResource({ ...plainResource, name: resourceName })
-      return { id: resource.id, data: resource }
-    })
   }
 }
diff --git a/packages/web-app-files/src/search/sdk/preview.ts b/packages/web-app-files/src/search/sdk/preview.ts
@@ -43,7 +43,7 @@ export default class Preview implements SearchPreview {
       DavProperties.Default
     )
 
-    const resources = plainResources.reduce((acc, plainResource) => {
+    const resources = plainResources.results.reduce((acc, plainResource) => {
       let resourceName = decodeURIComponent(plainResource.name)
       if (resourceName.startsWith('/dav')) {
         resourceName = resourceName.slice(4)