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

Remove usage of toSorted as it is not fully supported (#4168)

Browse Source
This commit is contained in:
Charles Bochet
2024-02-24 12:12:55 +01:00
committed by GitHub
parent 400ac447d8
commit 87f7c75057
6 changed files with 24 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/twenty-front/src/modules/activities/hooks/useActivities.ts
View File

@ -41,9 +41,12 @@ export const useActivities = ({
});
const activityIds = activityTargets
?.map((activityTarget) => activityTarget.activityId)
.filter(isNonEmptyString)
.toSorted(sortByAscString);
? [
...activityTargets
.map((activityTarget) => activityTarget.activityId)
.filter(isNonEmptyString),
].sort(sortByAscString)
: [];
const activityTargetsFound =
initializedActivityTargets && isNonEmptyArray(activityTargets);

4
packages/twenty-front/src/modules/activities/hooks/useInjectIntoActivitiesQueries.ts
View File

@ -91,7 +91,7 @@ export const useInjectIntoActivitiesQueries = () => {
const currentFindManyActivitiesQueryVariables = {
filter: {
id: {
in: existingActivityIdsFromTargets.toSorted(sortByAscString),
in: [...existingActivityIdsFromTargets].sort(sortByAscString),
},
...activitiesFilters,
},
@ -110,7 +110,7 @@ export const useInjectIntoActivitiesQueries = () => {
const nextFindManyActivitiesQueryVariables = {
filter: {
id: {
in: nextActivityIds.toSorted(sortByAscString),
in: [...nextActivityIds].sort(sortByAscString),
},
...activitiesFilters,
},

4
packages/twenty-front/src/modules/activities/hooks/useRemoveFromActivitiesQueries.ts
View File

@ -72,7 +72,7 @@ export const useRemoveFromActivitiesQueries = () => {
const currentFindManyActivitiesQueryVariables = {
filter: {
id: {
in: existingActivityIds.toSorted(sortByAscString),
in: [...existingActivityIds].sort(sortByAscString),
},
...activitiesFilters,
},
@ -94,7 +94,7 @@ export const useRemoveFromActivitiesQueries = () => {
const nextFindManyActivitiesQueryVariables = {
filter: {
id: {
in: activityIdsAfterRemoval.toSorted(sortByAscString),
in: [...activityIdsAfterRemoval].sort(sortByAscString),
},
...activitiesFilters,
},