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 const activityIds = activityTargets
?.map((activityTarget) => activityTarget.activityId) ? [
.filter(isNonEmptyString) ...activityTargets
.toSorted(sortByAscString); .map((activityTarget) => activityTarget.activityId)
.filter(isNonEmptyString),
].sort(sortByAscString)
: [];
const activityTargetsFound = const activityTargetsFound =
initializedActivityTargets && isNonEmptyArray(activityTargets); initializedActivityTargets && isNonEmptyArray(activityTargets);

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

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

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

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

15
packages/twenty-front/src/modules/activities/timeline/components/TimelineQueryEffect.tsx
View File

@ -45,17 +45,16 @@ export const TimelineQueryEffect = ({
return; return;
} }
const activitiesForGroup = activities const activitiesForGroup = [
.map((activity) => ({ ...activities.map((activity) => ({
id: activity.id, id: activity.id,
createdAt: activity.createdAt, createdAt: activity.createdAt,
})) })),
.toSorted(sortObjectRecordByDateField('createdAt', 'DescNullsLast')); ].sort(sortObjectRecordByDateField('createdAt', 'DescNullsLast'));
const timelineActivitiesForGroupSorted = const timelineActivitiesForGroupSorted = [
timelineActivitiesForGroup.toSorted( ...timelineActivitiesForGroup,
sortObjectRecordByDateField('createdAt', 'DescNullsLast'), ].sort(sortObjectRecordByDateField('createdAt', 'DescNullsLast'));
);
if (!isDeeplyEqual(activitiesForGroup, timelineActivitiesForGroupSorted)) { if (!isDeeplyEqual(activitiesForGroup, timelineActivitiesForGroupSorted)) {
setTimelineActivitiesForGroup(activitiesForGroup); setTimelineActivitiesForGroup(activitiesForGroup);

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

@ -45,9 +45,12 @@ export const useTimelineActivities = ({
const activityIds = Array.from( const activityIds = Array.from(
new Set( new Set(
activityTargets activityTargets
?.map((activityTarget) => activityTarget.activityId) ? [
.filter(isNonEmptyString) ...activityTargets
.toSorted(sortByAscString), .map((activityTarget) => activityTarget.activityId)
.filter(isNonEmptyString),
].sort(sortByAscString)
: [],
), ),
); );

2
packages/twenty-front/src/modules/activities/timeline/utils/makeTimelineActivitiesQueryVariables.ts
View File

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