Skip to content

Fix sort order list #600

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

Open
alisonjsilva wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix sort order list #600

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6979430
fix: update vitest to 3.0.5+ to patch RCE vulnerability
alisonjsilva Feb 25, 2025
f97c0f3
fix: update vitest to patch critical security vulnerability
alisonjsilva Feb 25, 2025
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
4 changes: 2 additions & 2 deletions packages/react-components/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@
"@types/react-test-renderer": "^18.3.1",
"@types/react-window": "^1.8.8",
"@vitejs/plugin-react": "^4.3.4",
"@vitest/coverage-v8": "^3.0.4",
"@vitest/coverage-v8": "^3.0.7",
"jsdom": "^26.0.0",
"minimize-js": "^1.4.0",
"msw": "^2.7.0",
Expand All @@ -239,7 +239,7 @@
"typescript": "^5.7.3",
"vite": "^6.0.11",
"vite-tsconfig-paths": "^5.1.4",
"vitest": "^3.0.4"
"vitest": "^3.0.7"
},
"peerDependencies": {
"react": ">=18.0.0"
Expand Down
26 changes: 20 additions & 6 deletions packages/react-components/src/reducers/CustomerReducer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ import type {
Order,
OrderSubscription,
OrderUpdate,
QueryPageSize
QueryPageSize,
QuerySort,
} from '@commercelayer/sdk'
import type { CommerceLayerConfig } from '#context/CommerceLayerContext'
import type { updateOrder } from './OrderReducer'
Expand Down Expand Up @@ -283,13 +284,19 @@ interface GetCustomerOrdersProps {
* Retrieve a specific subscription or order by id
*/
id?: string
/**
* Sorting parameter for the orders
* @example 'created_at' | '-created_at' | 'updated_at' | '-updated_at'
*/
sort?: QuerySort<Order>
}

export async function getCustomerOrders({
config,
dispatch,
pageSize = 10,
pageNumber = 1
pageNumber = 1,
sort = { created_at: 'desc' }
}: GetCustomerOrdersProps): Promise<void> {
if (config.accessToken) {
const { owner } = jwt(config.accessToken)
Expand All @@ -298,7 +305,8 @@ export async function getCustomerOrders({
const orders = await sdk.customers.orders(owner.id, {
filters: { status_not_in: 'draft,pending' },
pageSize,
pageNumber
pageNumber,
sort
})
dispatch({
type: 'setOrders',
Expand All @@ -313,29 +321,35 @@ export async function getCustomerSubscriptions({
config,
dispatch,
pageSize = 10,
pageNumber = 1
pageNumber = 1,
sort = { created_at: 'desc' }
}: GetCustomerOrdersProps): Promise<void> {
if (config.accessToken) {
const { owner } = jwt(config.accessToken)
if (owner?.id) {
const sdk = getSdk(config)
if (id != null) {
// When fetching orders with subscription_id, we need to use Order sort type
// because this endpoint returns orders related to a subscription
const subscriptions = await sdk.customers.orders(owner.id, {
filters: { order_subscription_id_eq: id },
include: ['authorizations'],
pageSize,
pageNumber
pageNumber,
sort
})
dispatch({
type: 'setSubscriptions',
payload: { subscriptions }
})
} else {
// When fetching order_subscriptions directly, we use OrderSubscription sort type
const subscriptions = await sdk.customers.order_subscriptions(
owner.id,
{
pageSize,
pageNumber
pageNumber,
sort: sort as QuerySort<OrderSubscription>
}
)
dispatch({
Expand Down