Move to Apollo v3

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

js/src/graphql/actor.ts

@@ -37,12 +37,14 @@ export const FETCH_PERSON = gql`
 `;
 
 export const GET_PERSON = gql`
-  query (
+  query Person(
     $actorId: ID!
     $organizedEventsPage: Int
     $organizedEventsLimit: Int
     $participationPage: Int
     $participationLimit: Int
+    $membershipsPage: Int
+    $membershipsLimit: Int
   ) {
     person(id: $actorId) {
       id
@@ -89,6 +91,24 @@ export const GET_PERSON = gql`
           }
         }
       }
+      memberships(page: $membershipsPage, limit: $membershipsLimit) {
+        total
+        elements {
+          id
+          role
+          insertedAt
+          parent {
+            id
+            preferredUsername
+            name
+            domain
+            avatar {
+              id
+              url
+            }
+          }
+        }
+      }
       user {
         id
         email

js/src/graphql/admin.ts

@@ -37,6 +37,7 @@ export const DASHBOARD = gql`
 
 export const RELAY_FRAGMENT = gql`
   fragment relayFragment on Follower {
+    id
     actor {
       id
       preferredUsername

js/src/graphql/discussion.ts

@@ -67,6 +67,17 @@ export const DISCUSSION_FIELDS_FRAGMENT = gql`
       text
       insertedAt
       updatedAt
+      deletedAt
+      publishedAt
+      actor {
+        id
+        domain
+        name
+        preferredUsername
+        avatar {
+          url
+        }
+      }
     }
     actor {
       id
@@ -104,8 +115,7 @@ export const REPLY_TO_DISCUSSION = gql`
 export const GET_DISCUSSION = gql`
   query getDiscussion($slug: String!, $page: Int, $limit: Int) {
     discussion(slug: $slug) {
-      comments(page: $page, limit: $limit)
-        @connection(key: "discussion-comments", filter: ["slug"]) {
+      comments(page: $page, limit: $limit) {
         total
         elements {
           id
@@ -158,6 +168,8 @@ export const DISCUSSION_COMMENT_CHANGED = gql`
         text
         updatedAt
         insertedAt
+        deletedAt
+        publishedAt
         actor {
           id
           preferredUsername

js/src/graphql/group.ts

@@ -125,13 +125,13 @@ export const GROUP_FIELDS_FRAGMENTS = gql`
         ...DiscussionBasicFields
       }
     }
-    posts {
+    posts(page: $postsPage, limit: $postsLimit) {
       total
       elements {
         ...PostBasicFields
       }
     }
-    members {
+    members(page: $membersPage, limit: $membersLimit) {
       elements {
         id
         role
@@ -212,6 +212,10 @@ export const GET_GROUP = gql`
     $beforeDateTime: DateTime
     $organisedEventsPage: Int
     $organisedEventslimit: Int
+    $postsPage: Int
+    $postsLimit: Int
+    $membersPage: Int
+    $membersLimit: Int
   ) {
     getGroup(id: $id) {
       mediaSize

js/src/graphql/report.ts

@@ -1,41 +1,44 @@
 import gql from "graphql-tag";
 
 export const REPORTS = gql`
-  query Reports($status: ReportStatus) {
-    reports(status: $status) {
-      id
-      reported {
+  query Reports($status: ReportStatus, $page: Int, $limit: Int) {
+    reports(status: $status, page: $page, limit: $limit) {
+      total
+      elements {
         id
-        preferredUsername
-        domain
-        name
-        avatar {
+        reported {
           id
-          url
+          preferredUsername
+          domain
+          name
+          avatar {
+            id
+            url
+          }
         }
-      }
-      reporter {
-        id
-        preferredUsername
-        name
-        avatar {
+        reporter {
           id
-          url
+          preferredUsername
+          name
+          avatar {
+            id
+            url
+          }
+          domain
+          type
         }
-        domain
-        type
-      }
-      event {
-        id
-        uuid
-        title
-        picture {
+        event {
           id
-          url
+          uuid
+          title
+          picture {
+            id
+            url
+          }
         }
+        status
+        content
       }
-      status
-      content
     }
   }
 `;