@yuuvis/client-core 2.1.26 → 2.1.28

package/fesm2022/yuuvis-client-core.mjs

@@ -1866,7 +1866,7 @@ class SearchService {
      * @returns Observable of a SearchResult
      */
     search(query) {
-        return this.searchRaw(query).pipe(map((res) => this.toSearchResult(res)));
+        return this.searchRaw(query).pipe(map((res) => this.toSearchResult(res, query.size || SearchService.DEFAULT_QUERY_SIZE, query.from || 0)));
     }
     /**
      * Execute a raw search query and return the result as is.
@@ -1884,20 +1884,23 @@ class SearchService {
      * @param size The number of items to return
      * @returns Observable of a SearchResult
      */
-    searchCmis(statement, size = 50) {
+    searchCmis(statement, size = SearchService.DEFAULT_QUERY_SIZE) {
+        return this.#executeCmisSearch(statement, size);
+    }
+    #executeCmisSearch(statement, maxItems, skipCount = 0) {
         return this.#backend
-            .post('/dms/objects/search', {
+            .post('/dms/objects/cmisSearch', {
             query: {
                 statement,
-                skipCount: 0,
-                maxItems: size,
+                skipCount,
+                maxItems,
                 handleDeletedDocuments: 'DELETED_DOCUMENTS_EXCLUDE'
             }
         }
         // Using API-WEB because it enriches the response with additional information (resolved user names, etc.)
         // ApiBase.core
         )
-            .pipe(map((res) => this.toSearchResult(res)));
+            .pipe(map((res) => this.toSearchResult(res, maxItems, skipCount)));
     }
     /**
      * Fetch aggragations for a given query.
@@ -1935,18 +1938,24 @@ class SearchService {
     }
     /**
      * Go to a page of a search result.
-     * @param searchResult The search result (that supports pagination)
+     * @param query SearchQuery or CMIS query statement
      * @param page The number of the page to go to
      */
-    getPage(query, page) {
-        query.from = (page - 1) * (query.size || SearchService.DEFAULT_QUERY_SIZE);
-        return this.search(query);
+    getPage(query, page, pageSize = SearchService.DEFAULT_QUERY_SIZE) {
+        const isCmis = typeof query === 'string';
+        if (isCmis) {
+            return this.#executeCmisSearch(query, pageSize, (page - 1) * pageSize);
+        }
+        else {
+            query.from = (page - 1) * (query.size || pageSize);
+            return this.search(query);
+        }
     }
     /**
      * Map search result from the backend to applications SearchResult object
      * @param searchResponse The backend response
      */
-    toSearchResult(searchResponse) {
+    toSearchResult(searchResponse, pageSize = SearchService.DEFAULT_QUERY_SIZE, skipCount = 0) {
         const resultListItems = [];
         const objectTypes = [];
         searchResponse.objects.forEach((o) => {
@@ -2012,11 +2021,14 @@ class SearchService {
                 permissions: o.permissions
             });
         });
+        const totalPages = Math.ceil(searchResponse.totalNumItems / pageSize);
+        const page = (!skipCount ? 0 : skipCount / pageSize) + 1;
         const result = {
             hasMoreItems: searchResponse.hasMoreItems,
             totalNumItems: searchResponse.totalNumItems,
             items: resultListItems,
-            objectTypes
+            objectTypes: objectTypes,
+            paging: !!totalPages ? { page, totalPages } : undefined
         };
         return result;
     }
@@ -2089,7 +2101,7 @@ class SearchService {
                     f: property,
                     o: rv.operator,
                     v1: this.#dateToISOString(v1, 'start'),
-                    v2: v2 ? this.#dateToISOString(v2, 'end') : '',
+                    v2: v2 ? this.#dateToISOString(v2, 'end') : ''
                 };
             }
             default: