Fix handpicked posts should orderby include

generoi · Aug 23, 2024 · a5e4805 · a5e4805
1 parent f61fee0
commit a5e4805
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/web/app/themes/gds/app/filters.php b/web/app/themes/gds/app/filters.php
@@ -42,7 +42,9 @@
  */
 add_filter('query_loop_block_query_vars', function (array $query, WP_Block $block) {
     if (! empty($block->context['query']['include'])) {
-        $query['post__in'] = $block->context['query']['include'];
+        $query['include'] = $block->context['query']['include'];
+        $query['orderby'] = 'include';
+        $query['order'] = 'DESC';
     }
 
     return $query;

diff --git a/web/app/themes/gds/resources/scripts/editor/filters/with-handpicked-posts.jsx b/web/app/themes/gds/resources/scripts/editor/filters/with-handpicked-posts.jsx
@@ -53,7 +53,11 @@ function HandPickedPostsControl({setAttributes, attributes}) {
         return acc;
       }, new Set());
 
-      updateQuery({include: Array.from(newPostsSet)});
+      updateQuery({
+        include: Array.from(newPostsSet),
+        orderby: 'include',
+        order: 'desc'
+      });
     },
     [postsMap],
   );
@@ -82,8 +86,8 @@ function HandPickedPostsControl({setAttributes, attributes}) {
     <ToolsPanelItem
       label={__('Hand-picked posts', 'gds')}
       hasValue={() => !!selectedPostIds?.length}
-      onDeselect={() => updateQuery({include: []})}
-      resetAllFilter={() => updateQuery({include: []})}
+      onDeselect={() => updateQuery({include: [], orderby: 'date', order: 'desc'})}
+      resetAllFilter={() => updateQuery({include: [], orderby: 'date', order: 'desc'})}
       isShownByDefault={true}
     >
       <FormTokenField