Merge branch 'affiliation-order-bug' of 'https://github.com/evamillan…

…/grimoirelab-sortinghat' Merges #956 Closes #956 Fixes #955
chaoss · Mar 10, 2025 · 752dd31 · 752dd31
2 parents c2d340e + c4447a1
commit 752dd31
Show file tree

Hide file tree

Showing 6 changed files with 1,032 additions and 1,360 deletions.
diff --git a/releases/unreleased/order-enrollments-by-date.yml b/releases/unreleased/order-enrollments-by-date.yml
@@ -0,0 +1,10 @@
+---
+title: Wrong order of affiliations
+category: fixed
+author: Eva Millán <[email protected]>
+issue: 955
+notes: >
+  Multiple affiliations to the same company caused
+  a wrong order in the list of organizations at the
+  individual's profile. All affiliations are now
+  sorted by date.
diff --git a/ui/src/apollo/fragments.js b/ui/src/apollo/fragments.js
@@ -5,12 +5,14 @@ const INDIVIDUAL_ENROLLMENTS = gql`
     enrollments {
       start
       end
+      id
       group {
         name
         type
         parentOrg {
           name
         }
+        numchild
       }
     }
   }
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,12 +5,14 @@ const INDIVIDUAL_ENROLLMENTS = gql` @@
         enrollments {
           start
           end
+          id
           group {
             name
             type
             parentOrg {
               name
             }
+            numchild
           }
         }
       }
@@ Expand Down @@