feat: Diff logging for deposition page (#1467)

chanzuckerberg · Jan 16, 2025 · 3947969 · 3947969
1 parent 4dca0a6
commit 3947969
Show file tree

Hide file tree

Showing 4 changed files with 505 additions and 12 deletions.
diff --git a/frontend/packages/data-portal/app/graphql/getDatasetsDiffer.ts b/frontend/packages/data-portal/app/graphql/getDatasetsDiffer.ts
@@ -63,16 +63,11 @@ export function logIfHasDiff(
     delete group.count
   }
   v2.distinctReconstructionSoftwares.aggregate =
-    v2.distinctReconstructionSoftwares
-      .aggregate!.filter(
-        // Bug in APIv2 returns this as a duplicate of 'AreTomo3 v2.0.4'
-        (group) => group.groupBy?.reconstructionSoftware !== 'AreTomo3_v2.0.4',
-      )
-      .sort((groupA, groupB) =>
-        String(groupA.groupBy!.reconstructionSoftware).localeCompare(
-          String(groupB.groupBy!.reconstructionSoftware),
-        ),
-      )
+    v2.distinctReconstructionSoftwares.aggregate!.sort((groupA, groupB) =>
+      String(groupA.groupBy!.reconstructionSoftware).localeCompare(
+        String(groupB.groupBy!.reconstructionSoftware),
+      ),
+    )
   for (const group of v2.distinctObjectNames.aggregate!) {
     delete group.count
   }

diff --git a/frontend/packages/data-portal/app/graphql/getDepositionByIdV2.server.ts b/frontend/packages/data-portal/app/graphql/getDepositionByIdV2.server.ts
@@ -82,7 +82,14 @@ const GET_DEPOSITION_BY_ID = gql(`
           count
           groupBy {
             annotationMethod
-            annotationSoftware
+          }
+        }
+      }
+      annotationMethodAndMethodLinksCombinations: annotationsAggregate {
+        aggregate {
+          count
+          groupBy {
+            annotationMethod
             methodType
             methodLinks {
               link
@@ -107,7 +114,6 @@ const GET_DEPOSITION_BY_ID = gql(`
       id
       title
       organismName
-      datasetPublications
       keyPhotoThumbnailUrl
       authors(orderBy: { authorListOrder: asc }) {
         edges {