Support orderBy as array (#5681)

closes: #4301

---------

Co-authored-by: Félix Malfait <felix.malfait@gmail.com>

packages/twenty-front/src/modules/activities/emails/graphql/operation-signatures/factories/fetchAllThreadMessagesOperationSignatureFactory.ts

@@ -10,9 +10,11 @@ export const fetchAllThreadMessagesOperationSignatureFactory: RecordGqlOperation
           eq: messageThreadId || '',
         },
       },
-      orderBy: {
-        receivedAt: 'AscNullsLast',
-      },
+      orderBy: [
+        {
+          receivedAt: 'AscNullsLast',
+        },
+      ],
       limit: 10,
     },
     fields: {

packages/twenty-front/src/modules/activities/files/hooks/useAttachments.tsx

@@ -17,9 +17,11 @@ export const useAttachments = (targetableObject: ActivityTargetableObject) => {
         eq: targetableObject.id,
       },
     },
-    orderBy: {
-      createdAt: 'DescNullsFirst',
-    },
+    orderBy: [
+      {
+        createdAt: 'DescNullsFirst',
+      },
+    ],
   });
 
   return {

packages/twenty-front/src/modules/activities/hooks/__tests__/useActivities.test.tsx

@@ -49,7 +49,7 @@ const mocks: MockedResponse[] = [
       query: gql`
         query FindManyActivityTargets(
           $filter: ActivityTargetFilterInput
-          $orderBy: ActivityTargetOrderByInput
+          $orderBy: [ActivityTargetOrderByInput]
           $lastCursor: String
           $limit: Int
         ) {
@@ -103,7 +103,7 @@ const mocks: MockedResponse[] = [
       query: gql`
         query FindManyActivities(
           $filter: ActivityFilterInput
-          $orderBy: ActivityOrderByInput
+          $orderBy: [ActivityOrderByInput]
           $lastCursor: String
           $limit: Int
         ) {
@@ -142,7 +142,7 @@ const mocks: MockedResponse[] = [
       variables: {
         filter: { id: { in: ['234'] } },
         limit: undefined,
-        orderBy: {},
+        orderBy: [{}],
       },
     },
     result: jest.fn(() => ({
@@ -178,7 +178,7 @@ describe('useActivities', () => {
         useActivities({
           targetableObjects: [],
           activitiesFilters: {},
-          activitiesOrderByVariables: {},
+          activitiesOrderByVariables: [{}],
           skip: false,
         }),
       { wrapper: Wrapper },
@@ -202,7 +202,7 @@ describe('useActivities', () => {
             { targetObjectNameSingular: 'company', id: '123' },
           ],
           activitiesFilters: {},
-          activitiesOrderByVariables: {},
+          activitiesOrderByVariables: [{}],
           skip: false,
         });
         return { activities, setCurrentWorkspaceMember };

packages/twenty-front/src/modules/activities/hooks/__tests__/useActivityTargetsForTargetableObject.test.tsx

@@ -34,7 +34,7 @@ const mocks: MockedResponse[] = [
       query: gql`
         query FindManyActivityTargets(
           $filter: ActivityTargetFilterInput
-          $orderBy: ActivityTargetOrderByInput
+          $orderBy: [ActivityTargetOrderByInput]
           $lastCursor: String
           $limit: Int
         ) {

packages/twenty-front/src/modules/activities/hooks/usePrepareFindManyActivitiesQuery.ts

@@ -109,7 +109,7 @@ export const usePrepareFindManyActivitiesQuery = () => {
       objectRecordsToOverwrite: filteredActivities,
       queryVariables: {
         ...nextFindManyActivitiesQueryFilter,
-        orderBy: { createdAt: 'DescNullsFirst' },
+        orderBy: [{ createdAt: 'DescNullsFirst' }],
       },
       recordGqlFields: FIND_ACTIVITIES_OPERATION_SIGNATURE.fields,
       computeReferences: true,

packages/twenty-front/src/modules/activities/notes/hooks/useNotes.ts

@@ -24,7 +24,7 @@ export const useNotes = (targetableObject: ActivityTargetableObject) => {
 
   const { activities, loading } = useActivities({
     activitiesFilters: notesQueryVariables.filter ?? {},
-    activitiesOrderByVariables: notesQueryVariables.orderBy ?? {},
+    activitiesOrderByVariables: notesQueryVariables.orderBy ?? [{}],
     targetableObjects: [targetableObject],
   });
 

packages/twenty-front/src/modules/activities/tasks/hooks/useTasks.ts

@@ -110,13 +110,13 @@ export const useTasks = ({
   const { activities: completeTasksData } = useActivities({
     targetableObjects,
     activitiesFilters: completedQueryVariables.filter ?? {},
-    activitiesOrderByVariables: completedQueryVariables.orderBy ?? {},
+    activitiesOrderByVariables: completedQueryVariables.orderBy ?? [{}],
   });
 
   const { activities: incompleteTaskData } = useActivities({
     targetableObjects,
     activitiesFilters: incompleteQueryVariables.filter ?? {},
-    activitiesOrderByVariables: incompleteQueryVariables.orderBy ?? {},
+    activitiesOrderByVariables: incompleteQueryVariables.orderBy ?? [{}],
   });
 
   const todayOrPreviousTasks = incompleteTaskData?.filter((task) => {

packages/twenty-front/src/modules/activities/timeline/constants/FindManyTimelineActivitiesOrderBy.ts

@@ -1,6 +1,8 @@
 import { RecordGqlOperationOrderBy } from '@/object-record/graphql/types/RecordGqlOperationOrderBy';
 
 export const FIND_MANY_TIMELINE_ACTIVITIES_ORDER_BY: RecordGqlOperationOrderBy =
-  {
-    createdAt: 'DescNullsFirst',
-  };
+  [
+    {
+      createdAt: 'DescNullsFirst',
+    },
+  ];

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

@@ -13,8 +13,10 @@ export const makeTimelineActivitiesQueryVariables = ({
         in: [...activityIds].sort(sortByAscString),
       },
     },
-    orderBy: {
-      createdAt: 'DescNullsFirst',
-    },
+    orderBy: [
+      {
+        createdAt: 'DescNullsFirst',
+      },
+    ],
   };
 };

packages/twenty-front/src/modules/activities/timelineActivities/hooks/useTimelineActivities.tsx

@@ -23,9 +23,11 @@ export const useTimelineActivities = (
         eq: targetableObject.id,
       },
     },
-    orderBy: {
-      createdAt: 'DescNullsFirst',
-    },
+    orderBy: [
+      {
+        createdAt: 'DescNullsFirst',
+      },
+    ],
     recordGqlFields: {
       id: true,
       createdAt: true,