Follow up changes

- Sanitize query params
greenpeace · Jan 9, 2025 · 40999b8 · 40999b8
1 parent f558372
commit 40999b8
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 23 deletions.
diff --git a/assets/src/block-editor/QueryLoopBlockExtension/index.js b/assets/src/block-editor/QueryLoopBlockExtension/index.js
@@ -108,6 +108,20 @@ export const setupQueryLoopBlockExtension = () => {
           wp.data.select('core/block-editor').getSelectedBlock(),
         ]);
 
+        useEffect(() => {
+          const IS_NEW_IA = window.p4_vars.options.new_ia;
+          const queryPostType = IS_NEW_IA ? 'p4_action' : 'page';
+
+          if(query.postType !== queryPostType) {
+            setAttributes({
+              query: {
+                ...query,
+                postType: IS_NEW_IA ? 'p4_action' : 'page',
+              }
+            });
+          }
+        }, [query])
+
         return useMemo(() => (
           <>
             <InspectorControls>

diff --git a/assets/src/blocks/ActionsList/index.js b/assets/src/blocks/ActionsList/index.js
@@ -14,13 +14,13 @@ export const registerActionsListBlock = () => {
 
   const queryPostType = IS_NEW_IA ? 'p4_action' : 'page';
 
-  console.log("+++ IS_NEW_IA: %d ACT_PAGE: %d queryPostType: %s +++", IS_NEW_IA, ACT_PAGE, queryPostType)
-  console.log('Query', {
+  const query = {
     pages: 0,
     perPage: 3,
     offset: 0,
     order: 'desc',
     orderBy: 'date',
+    postStatus: 'publish',
     author: '',
     search: '',
     exclude: [],
@@ -29,8 +29,8 @@ export const registerActionsListBlock = () => {
     postType: queryPostType,
     postIn: [],
     hasPassword: false,
-    ...!IS_NEW_IA && {postParent: ACT_PAGE},
-  });
+    ...!IS_NEW_IA && {parent: ACT_PAGE},
+  };
 
   registerBlockVariation('core/query', {
     name: ACTIONS_LIST_BLOCK_NAME,
@@ -44,22 +44,7 @@ export const registerActionsListBlock = () => {
     attributes: {
       namespace: ACTIONS_LIST_BLOCK_NAME,
       className: 'actions-list p4-query-loop is-custom-layout-grid',
-      query: {
-        pages: 0,
-        perPage: 3,
-        offset: 0,
-        order: 'desc',
-        orderBy: 'date',
-        author: '',
-        search: '',
-        exclude: [],
-        sticky: '',
-        inherit: false,
-        postType: queryPostType,
-        postIn: [],
-        hasPassword: false,
-        ...!IS_NEW_IA && {postParent: ACT_PAGE},
-      },
+      query,
       layout: {
         type: 'grid',
         columnCount: 3,

diff --git a/src/Blocks/Covers.php b/src/Blocks/Covers.php
@@ -84,9 +84,6 @@ public function __construct()
                     }
 
                     $attributes['covers'] = self::get_covers($attributes);
-                    // var_dump(self::get_covers($attributes));
-                    // die();
-                    // $attributes['covers'] = [];
 
                     return self::hydrate_frontend($attributes, $content);
                 },

diff --git a/src/Blocks/QueryLoopExtension.php b/src/Blocks/QueryLoopExtension.php
@@ -43,13 +43,26 @@ public static function registerFrontendQuery(): void
             'query_loop_block_query_vars',
             function ($query, $block) {
                 $blockQuery = $block->context['query'] ?? [];
+
+                // Sanitize query only applied to ActionsList block.
+                if ((bool) array_key_exists('isCustomQueryLoop', $blockQuery)) {
+                    $is_new_ia = !empty(planet4_get_option('new_ia'));
+                    $query['post_type'] = $is_new_ia ? 'p4_action' : 'page';
+
+                    if(!$is_new_ia) {
+                        $query['post_parent'] = $blockQuery['parent'];
+                    }
+                }
+
                 if (!empty($blockQuery['postIn'])) {
                     $query['post__in'] = array_map('intval', (array) $blockQuery['postIn']);
                     $query['orderby'] = 'post__in';
                 }
+
                 if (isset($blockQuery['hasPassword'])) {
                     $query['has_password'] = (bool) $blockQuery['hasPassword'];
                 }
+
                 return $query;
             },
             10,