Remove usage of toSorted as it is not fully supported (#4168)
This commit is contained in:
@ -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);
|
||||
|
||||
@ -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,
|
||||
},
|
||||
|
||||
@ -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,
|
||||
},
|
||||
|
||||
@ -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);
|
||||
|
||||
@ -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)
|
||||
: [],
|
||||
),
|
||||
);
|
||||
|
||||
|
||||
@ -9,7 +9,7 @@ export const makeTimelineActivitiesQueryVariables = ({
|
||||
return {
|
||||
filter: {
|
||||
id: {
|
||||
in: activityIds.toSorted(sortByAscString),
|
||||
in: [...activityIds].sort(sortByAscString),
|
||||
},
|
||||
},
|
||||
orderBy: {
|
||||
|
||||
Reference in New Issue
Block a user