Support orderBy as array

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

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/object-metadata/hooks/__mocks__/useCreateOneObjectMetadataItem.ts

@@ -24,7 +24,7 @@ export const query = gql`
 export const findManyViewsQuery = gql`
   query FindManyViews(
     $filter: ViewFilterInput
-    $orderBy: ViewOrderByInput
+    $orderBy: [ViewOrderByInput]
     $lastCursor: String
     $limit: Int
   ) {

packages/twenty-front/src/modules/object-record/hooks/__tests__/useFindManyRecordsQuery.test.tsx

@@ -5,7 +5,7 @@ import { RecoilRoot } from 'recoil';
 import { useFindManyRecordsQuery } from '@/object-record/hooks/useFindManyRecordsQuery';
 
 const expectedQueryTemplate = `
-  query FindManyPeople($filter: PersonFilterInput, $orderBy: PersonOrderByInput, $lastCursor: String, $limit: Int) {
+  query FindManyPeople($filter: PersonFilterInput, $orderBy: [PersonOrderByInput], $lastCursor: String, $limit: Int) {
     people(filter: $filter, orderBy: $orderBy, first: $limit, after: $lastCursor) {
       edges {
         node {

packages/twenty-front/src/modules/object-record/multiple-objects/hooks/useGenerateCombinedFindManyRecordsQuery.ts

@@ -32,9 +32,9 @@ export const useGenerateCombinedFindManyRecordsQuery = ({
   const orderByPerMetadataItemArray = operationSignatures
     .map(
       ({ objectNameSingular }) =>
-        `$orderBy${capitalize(objectNameSingular)}: ${capitalize(
+        `$orderBy${capitalize(objectNameSingular)}: [${capitalize(
           objectNameSingular,
-        )}OrderByInput`,
+        )}OrderByInput]`,
     )
     .join(', ');
 

packages/twenty-front/src/modules/object-record/relation-picker/hooks/__tests__/useMultiObjectSearch.test.tsx

@@ -11,7 +11,7 @@ import { FieldMetadataType } from '~/generated/graphql';
 const query = gql`
   query CombinedFindManyRecords(
     $filterNameSingular: NameSingularFilterInput
-    $orderByNameSingular: NameSingularOrderByInput
+    $orderByNameSingular: [NameSingularOrderByInput]
     $lastCursorNameSingular: String
     $limitNameSingular: Int
   ) {

packages/twenty-front/src/modules/object-record/utils/generateFindManyRecordsQuery.ts

@@ -21,9 +21,9 @@ query FindMany${capitalize(
   objectMetadataItem.namePlural,
 )}($filter: ${capitalize(
   objectMetadataItem.nameSingular,
-)}FilterInput, $orderBy: ${capitalize(
+)}FilterInput, $orderBy: [${capitalize(
   objectMetadataItem.nameSingular,
-)}OrderByInput, $lastCursor: String, $limit: Int) {
+)}OrderByInput], $lastCursor: String, $limit: Int) {
   ${
     objectMetadataItem.namePlural
   }(filter: $filter, orderBy: $orderBy, first: $limit, after: $lastCursor){

packages/twenty-server/src/engine/api/graphql/workspace-query-builder/factories/__tests__/args-string.factory.spec.ts

@@ -68,10 +68,7 @@ describe('ArgsStringFactory', () => {
 
     it('when orderBy is present, should return an array of objects', () => {
       const args = {
-        orderBy: {
-          id: 'AscNullsFirst',
-          name: 'AscNullsFirst',
-        },
+        orderBy: [{ id: 'AscNullsFirst' }, { name: 'AscNullsFirst' }],
       };
 
       argsAliasCreate.mockReturnValue(args);
@@ -85,11 +82,11 @@ describe('ArgsStringFactory', () => {
 
     it('when orderBy is present with position criteria, should return position at the end of the list', () => {
       const args = {
-        orderBy: {
-          position: 'AscNullsFirst',
-          id: 'AscNullsFirst',
-          name: 'AscNullsFirst',
-        },
+        orderBy: [
+          { position: 'AscNullsFirst' },
+          { id: 'AscNullsFirst' },
+          { name: 'AscNullsFirst' },
+        ],
       };
 
       argsAliasCreate.mockReturnValue(args);
@@ -103,11 +100,11 @@ describe('ArgsStringFactory', () => {
 
     it('when orderBy is present with position in the middle, should return position at the end of the list', () => {
       const args = {
-        orderBy: {
-          id: 'AscNullsFirst',
-          position: 'AscNullsFirst',
-          name: 'AscNullsFirst',
-        },
+        orderBy: [
+          { id: 'AscNullsFirst' },
+          { position: 'AscNullsFirst' },
+          { name: 'AscNullsFirst' },
+        ],
       };
 
       argsAliasCreate.mockReturnValue(args);

packages/twenty-server/src/engine/api/graphql/workspace-query-builder/factories/args-string.factory.ts

@@ -36,11 +36,16 @@ export class ArgsStringFactory {
         typeof computedArgs[key] === 'object' &&
         computedArgs[key] !== null
       ) {
-        // If it's an object (and not null), stringify it
-        argsString += `${key}: ${this.buildStringifiedObject(
-          key,
-          computedArgs[key],
-        )}, `;
+        if (key === 'orderBy') {
+          argsString += `${key}: ${this.buildStringifiedObjectFromArray(
+            computedArgs[key],
+          )}, `;
+        } else {
+          // If it's an object (and not null), stringify it
+          argsString += `${key}: ${stringifyWithoutKeyQuote(
+            computedArgs[key],
+          )}, `;
+        }
       } else {
         // For other types (number, boolean), add as is
         argsString += `${key}: ${computedArgs[key]}, `;
@@ -55,22 +60,39 @@ export class ArgsStringFactory {
     return argsString;
   }
 
-  private buildStringifiedObject(
-    key: string,
-    obj: Record<string, any>,
+  private buildStringifiedObjectFromArray(
+    keyValuePairArray: Array<Record<string, any>>,
   ): string {
     // PgGraphql is expecting the orderBy argument to be an array of objects
-    if (key === 'orderBy') {
-      const orderByString = Object.keys(obj)
-        .sort((_, b) => {
-          return b === 'position' ? -1 : 0;
-        })
-        .map((orderByKey) => `{${orderByKey}: ${obj[orderByKey]}}`)
-        .join(', ');
+    let argsString = '';
+    // if position argument is present we want to put it at the very last
+    const positionObj = keyValuePairArray.find((obj) =>
+      Object.hasOwnProperty.call(obj, 'position'),
+    );
+
+    // we put filter only if positionObj is defined otherwise we loop through normal array
+    const orderByKeyValuePairs = positionObj
+      ? keyValuePairArray.filter(
+          (obj) => !Object.hasOwnProperty.call(obj, 'position'),
+        )
+      : keyValuePairArray;
+
+    for (const obj of orderByKeyValuePairs) {
+      for (const key in obj) {
+        argsString += `{${key}: ${obj[key]}}, `;
+      }
+    }
 
-      return `[${orderByString}]`;
+    if (positionObj) {
+      for (const key in positionObj) {
+        argsString += `{${key}: ${positionObj[key]}}, `;
+      }
+    }
+
+    if (argsString.endsWith(', ')) {
+      argsString = argsString.slice(0, -2);
     }
 
-    return stringifyWithoutKeyQuote(obj);
+    return `[${argsString}]`;
   }
 }

packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/utils/__tests__/get-resolver-args.spec.ts

@@ -13,7 +13,11 @@ describe('getResolverArgs', () => {
       before: { type: GraphQLString, isNullable: true },
       after: { type: GraphQLString, isNullable: true },
       filter: { kind: InputTypeDefinitionKind.Filter, isNullable: true },
-      orderBy: { kind: InputTypeDefinitionKind.OrderBy, isNullable: true },
+      orderBy: {
+        kind: InputTypeDefinitionKind.OrderBy,
+        isNullable: true,
+        isArray: true,
+      },
       limit: { type: GraphQLInt, isNullable: true },
     },
     findOne: {

packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/utils/get-resolver-args.util.ts

@@ -38,6 +38,7 @@ export const getResolverArgs = (
         orderBy: {
           kind: InputTypeDefinitionKind.OrderBy,
           isNullable: true,
+          isArray: true,
         },
       };
     case 'findOne':

packages/twenty-server/src/engine/api/rest/rest-api-core-query-builder/factories/find-many-query.factory.ts

@@ -14,7 +14,7 @@ export class FindManyQueryFactory {
     return `
       query FindMany${capitalize(objectNamePlural)}(
         $filter: ${objectNameSingular}FilterInput,
-        $orderBy: ${objectNameSingular}OrderByInput,
+        $orderBy: [${objectNameSingular}OrderByInput],
         $lastCursor: String,
         $limit: Int = 60
         ) {