Skip to content

Add order/order by support in Query block #24691

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
ntsekouras merged 5 commits into from
Sep 1, 2020
Merged

Add order/order by support in Query block #24691

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f06dc49
add basic order support in Query block
ntsekouras Aug 20, 2020
10644f2
move sort to block inspector
ntsekouras Aug 20, 2020
5ebbd9e
add orderby param in php
ntsekouras Aug 20, 2020
c0f5dca
add orderBy in query loop
ntsekouras Aug 20, 2020
3fc613a
lint php
ntsekouras Aug 20, 2020
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
move sort to block inspector
  • Loading branch information
@ntsekouras
ntsekouras committed Sep 1, 2020
commit 10644f28b3931556c5e9a433d7e8af0a91e5cba4
11 changes: 5 additions & 6 deletions packages/block-library/src/query/edit/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import {
*/
import QueryToolbar from './query-toolbar';
import QueryProvider from './query-provider';
import QueryInspectorControls from './query-inspector-controls';

const TEMPLATE = [ [ 'core/query-loop' ], [ 'core/query-pagination' ] ];
export default function QueryEdit( {
Expand All @@ -28,15 +29,13 @@ export default function QueryEdit( {
setAttributes( { queryId: instanceId } );
}
}, [ queryId, instanceId ] );
const updateQuery = ( newQuery ) =>
setAttributes( { query: { ...query, ...newQuery } } );
return (
<>
<QueryInspectorControls query={ query } setQuery={ updateQuery } />
<BlockControls>
<QueryToolbar
query={ query }
setQuery={ ( newQuery ) =>
setAttributes( { query: { ...query, ...newQuery } } )
}
/>
<QueryToolbar query={ query } setQuery={ updateQuery } />
</BlockControls>
<Block.div>
<QueryProvider>
Expand Down
23 changes: 23 additions & 0 deletions packages/block-library/src/query/edit/query-inspector-controls.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
/**
* WordPress dependencies
*/
import { PanelBody, QueryControls } from '@wordpress/components';
import { __ } from '@wordpress/i18n';
import { InspectorControls } from '@wordpress/block-editor';

export default function QueryInspectorControls( { query, setQuery } ) {
const { order, orderBy } = query;
return (
<InspectorControls>
<PanelBody title={ __( 'Sorting' ) }>
<QueryControls
{ ...{ order, orderBy } }
onOrderChange={ ( value ) => setQuery( { order: value } ) }
onOrderByChange={ ( value ) =>
setQuery( { orderBy: value } )
}
/>
</PanelBody>
</InspectorControls>
);
}
13 changes: 0 additions & 13 deletions packages/block-library/src/query/edit/query-toolbar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import {
Dropdown,
ToolbarButton,
RangeControl,
SelectControl,
FormTokenField,
} from '@wordpress/components';
import { __ } from '@wordpress/i18n';
Expand Down Expand Up @@ -39,10 +38,6 @@ export default function QueryToolbar( { query, setQuery } ) {
},
[]
);
const orderOptions = [
{ value: 'desc', label: __( 'Descending' ) },
{ value: 'asc', label: __( 'Ascending' ) },
];
return (
<Toolbar>
<Dropdown
Expand Down Expand Up @@ -82,14 +77,6 @@ export default function QueryToolbar( { query, setQuery } ) {
setQuery( { offset: value ?? 0 } )
}
/>
<SelectControl
label={ __( 'Order' ) }
value={ query.order }
options={ orderOptions }
onChange={ ( value ) =>
setQuery( { order: value } )
}
/>
{ categories && (
<FormTokenField
label={ __( 'Categories' ) }
Expand Down