Merge branch 'main' into Node22asLTS

plone · Oct 18, 2024 · 163f5a1 · 163f5a1
2 parents 03d753d + ac87fd7
commit 163f5a1
Show file tree

Hide file tree

Showing 6 changed files with 121 additions and 193 deletions.
diff --git a/packages/volto/news/6414.feature b/packages/volto/news/6414.feature
@@ -0,0 +1,3 @@
+URL Management control panel: add a filter for redirects created after a given date.
+**Note:** This requires `Products.CMFPlone` 6.0.14 and `plone.restapi` 9.7.3 or later.
+@davisagli
diff --git a/packages/volto/src/actions/aliases/aliases.js b/packages/volto/src/actions/aliases/aliases.js
@@ -16,17 +16,19 @@ import {
  * @param {Object} options Options data.
  * @returns {Object} Get aliases action.
  */
-export function getAliases(url, options) {
-  const { query, manual, datetime, batchSize, batchStart } = options || {};
+export function getAliases(url, options = {}) {
+  const { query, batchSize, batchStart, ...rest } = options;
+  const params = new URLSearchParams({
+    q: query ?? '',
+    b_start: batchStart ?? 0,
+    b_size: batchSize ?? 99999999999,
+    ...rest,
+  });
   return {
     type: GET_ALIASES,
     request: {
       op: 'get',
-      path: `${url}/@aliases?q=${query ? query : ''}&manual=${
-        manual ? manual : ''
-      }&datetime=${datetime !== null ? datetime : ''}&b_size=${
-        batchSize ? batchSize : 99999999999
-      }&b_start=${batchStart ? batchStart : 0}`,
+      path: `${url}/@aliases?${params.toString()}`,
     },
   };
 }

diff --git a/packages/volto/src/actions/aliases/aliases.test.js b/packages/volto/src/actions/aliases/aliases.test.js
@@ -14,7 +14,7 @@ describe('Aliases action', () => {
       expect(action.type).toEqual(GET_ALIASES);
       expect(action.request.op).toEqual('get');
       expect(action.request.path).toEqual(
-        '/news/@aliases?q=&manual=&datetime=undefined&b_size=99999999999&b_start=0',
+        '/news/@aliases?q=&b_start=0&b_size=99999999999',
       );
     });
   });