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

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

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);

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,
},

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,
},

View File

@ -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);

View File

@ -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)
: [],
),
);

View File

@ -9,7 +9,7 @@ export const makeTimelineActivitiesQueryVariables = ({
return {
filter: {
id: {
in: activityIds.toSorted(sortByAscString),
in: [...activityIds].sort(sortByAscString),
},
},
orderBy: {