ASSETS-34548 : Update the Collection API Endpoints

blocks/adp-add-to-collection-modal/adp-add-to-collection-modal.js

@@ -1,6 +1,6 @@
 import { decorateIcons } from '../../scripts/lib-franklin.js';
 import {
-  listCollection, createCollection, patchCollection, getCollection,
+  searchListCollection, createCollection, patchCollection, getCollection,
 } from '../../scripts/collections.js';
 import { getSelectedAssetsFromInfiniteResultsBlock, populateAssetViewLeftDialog } from '../../scripts/scripts.js';
 import createMultiSelectedAssetsTable from '../../scripts/multi-selected-assets-table.js';
@@ -43,38 +43,18 @@ async function createDropdown(addToExistingRadioDropboxContainer) {
     dropdownSelect.classList.add('add-to-existing-dropdown'); // Add the new class
 
     // Function to load more data when reaching the end of the dropdown
-    const loadMoreData = async (cursor) => {
-      const collectionData = await listCollection({ cursor, limit: 10 }); // Adjust the limit as needed
+    const loadMoreData = async (page) => {
+      // Call to get the nbHits for the total number of Collections
+      const collectionMax = await searchListCollection(0, 0);
+      // Get all the collections
+      const collectionData = await searchListCollection(collectionMax.nbHits, page);
       return collectionData;
     };
 
-    let cursor = null;
-
-    // Event listener to detect scroll and load more data when at the bottom
-    dropdownSelect.addEventListener('scroll', async () => {
-      if (dropdownSelect.scrollTop + dropdownSelect.clientHeight >= dropdownSelect.scrollHeight) {
-        const moreData = await loadMoreData(cursor);
-        if (moreData.items.length > 0) {
-          // Update the cursor for the next load
-          cursor = moreData.cursor;
-
-          // Populate the options in the dropdown from the additional data
-          moreData.items.forEach((collection) => {
-            const option = document.createElement('option');
-            option.value = collection.id;
-            option.textContent = collection.title;
-            dropdownSelect.appendChild(option);
-          });
-        }
-      }
-    });
-
+    const page = 0;
     // Initial data loading
-    const initialData = await loadMoreData(cursor);
+    const initialData = await loadMoreData(page);
     if (initialData.items.length > 0) {
-      // Update the cursor for the next load
-      cursor = initialData.cursor;
-
       // Populate the options in the dropdown with the initial data
       initialData.items.forEach((collection) => {
         const option = document.createElement('option');
@@ -160,6 +140,7 @@ export async function openModal(items) {
           const { etag } = collection;
           patchCollection(collectionId, etag, payload);
         });
+
       resetDialogState();
     }
 

blocks/adp-collection-header/adp-collection-header.js

@@ -36,7 +36,7 @@ function createCollectionInfoHeader(collectionInfoHeader, collection) {
         'Delete collection',
         `Are you sure you want to delete the collection "${collection.title}"?`,
         async () => {
-          await deleteCollection(collectionId, collection.title);
+          await deleteCollection(collectionId, collection.title, collection.etag);
           navigateTo(createLinkHref('/collections'));
         },
         'Proceed',

blocks/adp-infinite-results-collections/CollectionsDatasource.js

@@ -2,23 +2,29 @@
 import {
   getCollectionID,
   getCollectionTitle,
-  listCollection,
+  searchListCollection,
 } from '../../scripts/collections.js';
 import { createCollectionCardElement } from '../../scripts/card-html-builder.js';
 
 export default class CollectionsDatasource {
-  cursor;
-
   infiniteResultsContainer = null;
 
   container = null;
 
   pageNumber = 0;
 
+  lastPage = false;
+
   async showMore() {
-    const list = await listCollection(5, this.cursor);
-    this.cursor = list.cursor;
+
+    const list = await searchListCollection(5, this.pageNumber);
+
     this.pageNumber += 1;
+
+    if (this.pageNumber >= list.nbPages){
+      this.lastPage = true;
+    }
+
     this.infiniteResultsContainer.resultsCallback(
       this.container,
       list.items,
@@ -31,14 +37,15 @@
   }
 
   isLastPage() {
-    return !this.cursor;
+    return this.lastPage;
   }
 
   async registerResultsCallback(container, infiniteResultsContainer) {
     this.infiniteResultsContainer = infiniteResultsContainer;
     this.container = container;
-    const list = await listCollection(5, this.cursor);
-    this.cursor = list.cursor;
+
+    const list = await searchListCollection(5, this.pageNumber);
+
     infiniteResultsContainer.resultsCallback(
       container,
       list.items,