From 87f7c75057d1617218ce12ce38df27247bc83468 Mon Sep 17 00:00:00 2001 From: Charles Bochet Date: Sat, 24 Feb 2024 12:12:55 +0100 Subject: [PATCH] Remove usage of toSorted as it is not fully supported (#4168) --- .../src/modules/activities/hooks/useActivities.ts | 9 ++++++--- .../hooks/useInjectIntoActivitiesQueries.ts | 4 ++-- .../hooks/useRemoveFromActivitiesQueries.ts | 4 ++-- .../timeline/components/TimelineQueryEffect.tsx | 15 +++++++-------- .../timeline/hooks/useTimelineActivities.ts | 9 ++++++--- .../utils/makeTimelineActivitiesQueryVariables.ts | 2 +- 6 files changed, 24 insertions(+), 19 deletions(-) diff --git a/packages/twenty-front/src/modules/activities/hooks/useActivities.ts b/packages/twenty-front/src/modules/activities/hooks/useActivities.ts index b28f1f6f9..0806cece8 100644 --- a/packages/twenty-front/src/modules/activities/hooks/useActivities.ts +++ b/packages/twenty-front/src/modules/activities/hooks/useActivities.ts @@ -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); diff --git a/packages/twenty-front/src/modules/activities/hooks/useInjectIntoActivitiesQueries.ts b/packages/twenty-front/src/modules/activities/hooks/useInjectIntoActivitiesQueries.ts index e6d09e329..eb07c0ddc 100644 --- a/packages/twenty-front/src/modules/activities/hooks/useInjectIntoActivitiesQueries.ts +++ b/packages/twenty-front/src/modules/activities/hooks/useInjectIntoActivitiesQueries.ts @@ -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, }, diff --git a/packages/twenty-front/src/modules/activities/hooks/useRemoveFromActivitiesQueries.ts b/packages/twenty-front/src/modules/activities/hooks/useRemoveFromActivitiesQueries.ts index 766d50feb..e65b8058c 100644 --- a/packages/twenty-front/src/modules/activities/hooks/useRemoveFromActivitiesQueries.ts +++ b/packages/twenty-front/src/modules/activities/hooks/useRemoveFromActivitiesQueries.ts @@ -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, }, diff --git a/packages/twenty-front/src/modules/activities/timeline/components/TimelineQueryEffect.tsx b/packages/twenty-front/src/modules/activities/timeline/components/TimelineQueryEffect.tsx index f6ec016c8..50566855a 100644 --- a/packages/twenty-front/src/modules/activities/timeline/components/TimelineQueryEffect.tsx +++ b/packages/twenty-front/src/modules/activities/timeline/components/TimelineQueryEffect.tsx @@ -45,17 +45,16 @@ export const TimelineQueryEffect = ({ return; } - const activitiesForGroup = activities - .map((activity) => ({ + const activitiesForGroup = [ + ...activities.map((activity) => ({ id: activity.id, createdAt: activity.createdAt, - })) - .toSorted(sortObjectRecordByDateField('createdAt', 'DescNullsLast')); + })), + ].sort(sortObjectRecordByDateField('createdAt', 'DescNullsLast')); - const timelineActivitiesForGroupSorted = - timelineActivitiesForGroup.toSorted( - sortObjectRecordByDateField('createdAt', 'DescNullsLast'), - ); + const timelineActivitiesForGroupSorted = [ + ...timelineActivitiesForGroup, + ].sort(sortObjectRecordByDateField('createdAt', 'DescNullsLast')); if (!isDeeplyEqual(activitiesForGroup, timelineActivitiesForGroupSorted)) { setTimelineActivitiesForGroup(activitiesForGroup); diff --git a/packages/twenty-front/src/modules/activities/timeline/hooks/useTimelineActivities.ts b/packages/twenty-front/src/modules/activities/timeline/hooks/useTimelineActivities.ts index 1e6b97eea..0af9d4931 100644 --- a/packages/twenty-front/src/modules/activities/timeline/hooks/useTimelineActivities.ts +++ b/packages/twenty-front/src/modules/activities/timeline/hooks/useTimelineActivities.ts @@ -45,9 +45,12 @@ export const useTimelineActivities = ({ const activityIds = Array.from( new Set( activityTargets - ?.map((activityTarget) => activityTarget.activityId) - .filter(isNonEmptyString) - .toSorted(sortByAscString), + ? [ + ...activityTargets + .map((activityTarget) => activityTarget.activityId) + .filter(isNonEmptyString), + ].sort(sortByAscString) + : [], ), ); diff --git a/packages/twenty-front/src/modules/activities/timeline/utils/makeTimelineActivitiesQueryVariables.ts b/packages/twenty-front/src/modules/activities/timeline/utils/makeTimelineActivitiesQueryVariables.ts index 86af23487..eaf14bdab 100644 --- a/packages/twenty-front/src/modules/activities/timeline/utils/makeTimelineActivitiesQueryVariables.ts +++ b/packages/twenty-front/src/modules/activities/timeline/utils/makeTimelineActivitiesQueryVariables.ts @@ -9,7 +9,7 @@ export const makeTimelineActivitiesQueryVariables = ({ return { filter: { id: { - in: activityIds.toSorted(sortByAscString), + in: [...activityIds].sort(sortByAscString), }, }, orderBy: {