Move to Apollo v3

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

js/src/mixins/event.ts

@@ -11,6 +11,7 @@ import {
   LEAVE_EVENT,
 } from "../graphql/event";
 import { IPerson } from "../types/actor";
+import { ApolloCache, FetchResult, InMemoryCache } from "@apollo/client/core";
 
 @Component
 export default class EventMixin extends mixins(Vue) {
@@ -30,7 +31,7 @@ export default class EventMixin extends mixins(Vue) {
           actorId,
           token,
         },
-        update: (store, { data }) => {
+        update: (store: ApolloCache<InMemoryCache>, { data }: FetchResult) => {
           if (data == null) return;
           let participation;
 

js/src/mixins/relay.ts

@@ -1,106 +1,30 @@
-import { Component, Vue, Ref } from "vue-property-decorator";
 import { IActor } from "@/types/actor";
-import { IFollower } from "@/types/actor/follower.model";
-import { RELAY_FOLLOWERS, RELAY_FOLLOWINGS } from "@/graphql/admin";
-import { Paginate } from "@/types/paginate";
 import { ActorType } from "@/types/enums";
+import { Component, Vue, Ref } from "vue-property-decorator";
+import VueRouter from "vue-router";
+const { isNavigationFailure, NavigationFailureType } = VueRouter;
 
-@Component({
-  apollo: {
-    relayFollowings: {
-      query: RELAY_FOLLOWINGS,
-      fetchPolicy: "cache-and-network",
-      variables() {
-        return {
-          page: this.followingsPage,
-          limit: this.perPage,
-        };
-      },
-    },
-    relayFollowers: {
-      query: RELAY_FOLLOWERS,
-      fetchPolicy: "cache-and-network",
-      variables() {
-        return {
-          page: this.followersPage,
-          limit: this.perPage,
-        };
-      },
-    },
-  },
-})
+@Component
 export default class RelayMixin extends Vue {
   @Ref("table") readonly table!: any;
 
-  relayFollowers: Paginate<IFollower> = { elements: [], total: 0 };
-
-  relayFollowings: Paginate<IFollower> = { elements: [], total: 0 };
-
-  checkedRows: IFollower[] = [];
-
-  followingsPage = 1;
-
-  followersPage = 1;
-
-  perPage = 10;
-
   toggle(row: Record<string, unknown>): void {
     this.table.toggleDetails(row);
   }
 
-  async onFollowingsPageChange(page: number): Promise<void> {
-    this.followingsPage = page;
+  protected async pushRouter(
+    routeName: string,
+    args: Record<string, string>
+  ): Promise<void> {
     try {
-      await this.$apollo.queries.relayFollowings.fetchMore({
-        variables: {
-          page: this.followingsPage,
-          limit: this.perPage,
-        },
-        updateQuery: (previousResult, { fetchMoreResult }) => {
-          if (!fetchMoreResult) return previousResult;
-          const newFollowings = fetchMoreResult.relayFollowings.elements;
-          return {
-            relayFollowings: {
-              __typename: previousResult.relayFollowings.__typename,
-              total: previousResult.relayFollowings.total,
-              elements: [
-                ...previousResult.relayFollowings.elements,
-                ...newFollowings,
-              ],
-            },
-          };
-        },
+      await this.$router.push({
+        name: routeName,
+        query: { ...this.$route.query, ...args },
       });
-    } catch (err) {
-      console.error(err);
-    }
-  }
-
-  async onFollowersPageChange(page: number): Promise<void> {
-    this.followersPage = page;
-    try {
-      await this.$apollo.queries.relayFollowers.fetchMore({
-        variables: {
-          page: this.followersPage,
-          limit: this.perPage,
-        },
-        updateQuery: (previousResult, { fetchMoreResult }) => {
-          if (!fetchMoreResult) return previousResult;
-          const newFollowers = fetchMoreResult.relayFollowers.elements;
-          return {
-            relayFollowers: {
-              __typename: previousResult.relayFollowers.__typename,
-              total: previousResult.relayFollowers.total,
-              elements: [
-                ...previousResult.relayFollowers.elements,
-                ...newFollowers,
-              ],
-            },
-          };
-        },
-      });
-    } catch (err) {
-      console.error(err);
+    } catch (e) {
+      if (isNavigationFailure(e, NavigationFailureType.redirected)) {
+        throw Error(e.toString());
+      }
     }
   }