Skip to content

Query Loop: Default to querying posts when on singular content #65067

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
noisysocks merged 19 commits into from
Sep 18, 2024
Merged

Query Loop: Default to querying posts when on singular content #65067

Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
88fc422
Fix linter warnings
mikachan Sep 4, 2024
094bddc
Replace the postType if current post type is different
mikachan Sep 4, 2024
49ba8ca
Remove currentPostType logic
mikachan Sep 5, 2024
51f9383
Default to posts if is_singular
mikachan Sep 5, 2024
4053496
Update test_rendering_post_template_with_main_query_loop_already_star…
mikachan Sep 5, 2024
a2c1429
Add test for query loop not inside a singular query
mikachan Sep 5, 2024
13bfbcc
Revert changes to QueryContent
mikachan Sep 9, 2024
cbc42d7
Merge branch 'trunk' into fix/query-loop-posttype
mikachan Sep 13, 2024
58c0956
Show query type control only when on a template
mikachan Sep 13, 2024
e5f8195
Merge branch 'trunk' into fix/query-loop-posttype
mikachan Sep 16, 2024
457f0f3
Move template logic to QueryInspectorControls
mikachan Sep 16, 2024
92d937d
Ensure inherit value is updated when not in a template
mikachan Sep 16, 2024
82a81c5
Update comment
mikachan Sep 16, 2024
ba494de
Rename showDefaultControl to isTemplate
mikachan Sep 18, 2024
40ecda4
Get postType from context
mikachan Sep 18, 2024
0f26b80
Add a check for singular content based on available post type
mikachan Sep 18, 2024
52aaf5a
Move inherit reset to a useEffect
mikachan Sep 18, 2024
47c84a7
Move isTemplate logic to QueryContent
mikachan Sep 18, 2024
7447863
Fix lint warnings
mikachan Sep 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add a check for singular content based on available post type
  • Loading branch information
@mikachan
mikachan committed Sep 18, 2024
commit 0f26b805ea0695c36466e16a3b5cbb85bca941e0
18 changes: 12 additions & 6 deletions packages/block-library/src/query/edit/inspector-controls/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@ import { useToolsPanelDropdownMenuProps } from '../../../utils/hooks';
const { BlockInfo } = unlock( blockEditorPrivateApis );

export default function QueryInspectorControls( props ) {
const { attributes, setQuery, setDisplayLayout } = props;
const { attributes, setQuery, setDisplayLayout, postTypeFromContext } =
props;
const { query, displayLayout } = attributes;
const {
order,
Expand Down Expand Up @@ -126,11 +127,16 @@ export default function QueryInspectorControls( props ) {
return onChangeDebounced.cancel;
}, [ querySearch, onChangeDebounced ] );

const isTemplate = useSelect( ( select ) => {
const currentTemplate =
select( coreStore ).__experimentalGetTemplateForLink()?.type;
return 'wp_template' === currentTemplate;
}, [] );
const isTemplate = useSelect(
( select ) => {
const currentTemplate =
select( coreStore ).__experimentalGetTemplateForLink()?.type;
const isInTemplate = 'wp_template' === currentTemplate;
const isInSingularContent = postTypeFromContext !== undefined;
return isInTemplate && ! isInSingularContent;
},
[ postTypeFromContext ]
);

const showInheritControl =
isTemplate && isControlAllowed( allowedControls, 'inherit' );
Expand Down