admin/twenty
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Support orderBy as array (#5681)

Browse Source 
closes: #4301

---------

Co-authored-by: Félix Malfait <felix.malfait@gmail.com>
This commit is contained in:
Aditya Pimpalkar
2024-06-14 10:23:37 +01:00
committed by GitHub
parent 85fd801480
commit 4603999d1c
35 changed files with 249 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/twenty-front/src/modules/search/hooks/__mocks__/useFilteredSearchEntityQuery.ts
View File

@ -3,7 +3,7 @@ import { gql } from '@apollo/client';
export const query = gql`
query FindManyPeople(
$filter: PersonFilterInput
$orderBy: PersonOrderByInput
$orderBy: [PersonOrderByInput]
$lastCursor: String
$limit: Int = 60
) {
@ -166,7 +166,7 @@ export const variables = {
{ not: { id: { in: ['1', '2'] } } },
],
},
orderBy: { name: 'AscNullsLast' },
orderBy: [{ name: 'AscNullsLast' }],
},
filteredSelectedEntities: {
limit: 60,
@ -176,12 +176,12 @@ export const variables = {
{ id: { in: ['1'] } },
],
},
orderBy: { name: 'AscNullsLast' },
orderBy: [{ name: 'AscNullsLast' }],
},
selectedEntities: {
limit: 60,
filter: { id: { in: ['1'] } },
orderBy: { name: 'AscNullsLast' },
orderBy: [{ name: 'AscNullsLast' }],
},
};

6
packages/twenty-front/src/modules/search/hooks/useFilteredSearchEntityQuery.ts
View File

@ -49,7 +49,7 @@ export const useFilteredSearchEntityQuery = ({
useFindManyRecords({
objectNameSingular,
filter: selectedIdsFilter,
orderBy: { [orderByField]: sortOrder },
orderBy: [{ [orderByField]: sortOrder }],
skip: !selectedIds.length,
});
@ -93,7 +93,7 @@ export const useFilteredSearchEntityQuery = ({
} = useFindManyRecords({
objectNameSingular,
filter: makeAndFilterVariables([...searchFilters, selectedIdsFilter]),
orderBy: { [orderByField]: sortOrder },
orderBy: [{ [orderByField]: sortOrder }],
skip: !selectedIds.length,
});
@ -106,7 +106,7 @@ export const useFilteredSearchEntityQuery = ({
objectNameSingular,
filter: makeAndFilterVariables([...searchFilters, notFilter]),
limit: limit ?? DEFAULT_SEARCH_REQUEST_LIMIT,
orderBy: { [orderByField]: sortOrder },
orderBy: [{ [orderByField]: sortOrder }],
});
return {