@vocollege/app 0.0.56 → 0.0.59

package/src/modules/Services/Vapor/Vapor.ts

@@ -20,7 +20,8 @@ class Vapor {
    */
   async store(file: any, options: { [key: string]: any } = {}) {
     const response = await axios.post(
-      "/vapor/signed-storage-url",
+      // "/vapor/signed-storage-url",
+      "/api/v1/vapor/signed-storage-url",
       {
         bucket: options.bucket || "",
         content_type: options.contentType || file.type,
@@ -53,20 +54,18 @@ class Vapor {
     await instance.put(response.data.url, file, {
       cancelToken: cancelToken,
       headers: headers,
-      onUploadProgress: function (progressEvent: any) {
-        console.log("progressEvent.loaded", progressEvent.loaded);
-
-        // options.progress(progressEvent.loaded / progressEvent.total);
-
-        let percentCompleted = Math.round(
-          (progressEvent.loaded * 100) / progressEvent.total
-        );
-        console.log(
-          "onUploadProgress called with",
-          arguments,
-          "Percent Completed:" + percentCompleted
-        );
-      },
+      // onUploadProgress: function (progressEvent: any) {
+      //   // console.log("progressEvent.loaded", progressEvent.loaded);
+      //   // options.progress(progressEvent.loaded / progressEvent.total);
+      //   // let percentCompleted = Math.round(
+      //   //   (progressEvent.loaded * 100) / progressEvent.total
+      //   // );
+      //   // console.log(
+      //   //   "onUploadProgress called with",
+      //   //   arguments,
+      //   //   "Percent Completed:" + percentCompleted
+      //   // );
+      // },
     });
 
     response.data.extension = file.name.split(".").pop();

package/src/modules/VoApi/GraphClient.ts

@@ -5,12 +5,18 @@ import {
   InMemoryCache,
   Observable,
   from,
+  split,
 } from "@apollo/client";
 import { onError } from "@apollo/client/link/error";
 import { createUploadLink } from "apollo-upload-client";
-
+// import { getMainDefinition } from "@apollo/client/utilities";
+// import { WebSocketLink } from "@apollo/client/link/ws";
 import VoAuth from "../VoAuth";
 import VoRouter from "../VoRouter";
+// import ws from "ws";
+import VoGroups from "../VoGroups";
+// import VoApp from "../VoApp";
+import { GeneralObject } from "../../global";
 
 async function redirect() {
   await VoAuth.logout();
@@ -18,7 +24,11 @@ async function redirect() {
 }
 
 class GraphClient {
-  static createGraphClient(url: string, uploadLink = false) {
+  static createGraphClient(
+    url: string,
+    uploadLink = false,
+    params: GeneralObject = {}
+  ) {
     let httpLink;
 
     if (!uploadLink) {
@@ -29,9 +39,34 @@ class GraphClient {
       httpLink = createUploadLink({ uri: url });
     }
 
+    // const wsLink = new WebSocketLink({
+    //   uri: wsUrl,
+    //   options: {
+    //     reconnect: true,
+    //   },
+    //   // webSocketImpl: ws,
+    // });
+
+    // The split function takes three parameters:
+    //
+    // * A function that's called for each operation to execute
+    // * The Link to use for an operation if the function returns a "truthy" value
+    // * The Link to use for an operation if the function returns a "falsy" value
+    // const splitLink = split(
+    //   ({ query }) => {
+    //     const definition = getMainDefinition(query);
+    //     return (
+    //       definition.kind === "OperationDefinition" &&
+    //       definition.operation === "subscription"
+    //     );
+    //   },
+    //   wsLink,
+    //   httpLink
+    // );
+
     // Get other Apollo Links.
     // const links = this.getGraphClientLinks(getToken, refreshToken);
-    const links = this.getGraphClientLinks();
+    const links = this.getGraphClientLinks(params);
 
     return new ApolloClient({
       cache: new InMemoryCache(),
@@ -39,7 +74,7 @@ class GraphClient {
     });
   }
 
-  static getGraphClientLinks() {
+  static getGraphClientLinks(params: GeneralObject = {}) {
     // Create an errorLink to handle errors, e.g. when the token has expired
     // and has to be renewed. This works as an interceptor for GraphQL calls.
     const errorLink = onError(
@@ -49,23 +84,28 @@ class GraphClient {
             switch (err.message) {
               case "Unauthenticated.":
                 return new Observable((observer) => {
-                  VoAuth.refreshToken().then((token: any) => {
-                    const oldHeaders = operation.getContext().headers;
-                    operation.setContext({
-                      headers: {
-                        ...oldHeaders,
-                        Authorization: token
-                          ? `${token.token_type} ${token.access_token}`
-                          : "",
-                      },
+                  VoAuth.refreshToken()
+                    .then((token: any) => {
+                      const oldHeaders = operation.getContext().headers;
+                      operation.setContext({
+                        headers: {
+                          ...oldHeaders,
+                          Authorization: token
+                            ? `${token.token_type} ${token.access_token}`
+                            : "",
+                        },
+                      });
+                      const subscriber = {
+                        next: observer.next.bind(observer),
+                        error: observer.error.bind(observer),
+                        complete: observer.complete.bind(observer),
+                      };
+                      forward(operation).subscribe(subscriber);
+                    })
+                    .catch((error: any) => {
+                      console.error(error);
+                      redirect();
                     });
-                    const subscriber = {
-                      next: observer.next.bind(observer),
-                      error: observer.error.bind(observer),
-                      complete: observer.complete.bind(observer),
-                    };
-                    forward(operation).subscribe(subscriber);
-                  });
                 });
             }
           }
@@ -74,9 +114,9 @@ class GraphClient {
 
           // @TODO Handle network error, e.g. through @apollo/client/link/retry
 
-          if ("statusCode" in networkError && networkError.statusCode === 403) {
-            redirect();
-          }
+          // if ("statusCode" in networkError && networkError.statusCode === 403) {
+          //   redirect();
+          // }
         }
       }
     );
@@ -84,14 +124,22 @@ class GraphClient {
     // Create authLink that ensures that all calls include
     // the access token.
     const authLink = new ApolloLink((operation, forward) => {
-      const token = VoAuth.getToken();
+      const token = params.token || VoAuth.getToken();
       const currentHeaders = operation.getContext().headers;
+      let groupId = "";
+      if (params.group) {
+        groupId = params.group;
+      } else {
+        const currentGroup = VoGroups.getCurrent(true);
+        groupId = currentGroup ? currentGroup.id : "";
+      }
       operation.setContext(() => ({
         ...currentHeaders,
         headers: {
           Authorization: token
             ? `${token.token_type} ${token.access_token}`
             : "",
+          VoGroup: groupId,
         },
       }));
       return forward(operation);
@@ -102,6 +150,21 @@ class GraphClient {
       authLink,
     };
   }
+
+  // static createGraphSubscriptionClient(url: string) {
+  //   const wsLink = new WebSocketLink({
+  //     uri: url,
+  //     options: {
+  //       reconnect: true,
+  //     },
+  //     // webSocketImpl: ws,
+  //   });
+  //   const links = this.getGraphClientLinks();
+  //   return new ApolloClient({
+  //     cache: new InMemoryCache(),
+  //     link: from([links.errorLink, links.authLink, wsLink]),
+  //   });
+  // }
 }
 
 export default GraphClient;

package/src/modules/VoApi/VoApi.ts

@@ -13,20 +13,40 @@ import { onError } from "@apollo/client/link/error";
 // Custom.
 import GraphClient from "./GraphClient";
 import VoBase from "../VoBase";
-import VoAuth from "../VoAuth";
+// import VoAuth from "../VoAuth";
 import VoConfig from "../VoConfig";
+import { GeneralObject } from "../../global";
 
 class VoApi extends VoBase {
   graphqlClient: any;
+  graphqlSubscriptionClient: any;
 
-  init() {
-    this.graphqlClient = GraphClient.createGraphClient(this.getGraphqlUrl);
+  init(params: GeneralObject = {}) {
+    this.graphqlClient = GraphClient.createGraphClient(
+      this.getGraphqlUrl,
+      false,
+      params
+    );
   }
 
+  // initSubscriptions() {
+  //   this.graphqlSubscriptionClient = GraphClient.createGraphSubscriptionClient(
+  //     this.getGraphqlSubscriptionUrl
+  //   );
+  // }
+
   get getGraphqlUrl() {
     return VoConfig.get.API_BASE_URL + "" + VoConfig.get.API_GRAPHQL;
   }
 
+  get getGraphqlSubscriptionUrl() {
+    return (
+      VoConfig.get.API_SUBSCRIPTIONS_BASE_URL +
+      "" +
+      VoConfig.get.API_GRAPHQL_SUBSCRIPTIONS
+    );
+  }
+
   async getUser() {
     try {
       const user = await axios.get(this.getUrl + "/user");

package/src/modules/VoApi/graphql.ts

@@ -0,0 +1,47 @@
+import { gql } from "@apollo/client";
+
+// Queries.
+export * from "./queries/applications";
+export * from "./queries/articles";
+export * from "./queries/acl";
+export * from "./queries/books";
+export * from "./queries/cards";
+export * from "./queries/events";
+export * from "./queries/help";
+export * from "./queries/navigation";
+export * from "./queries/pages";
+export * from "./queries/queues";
+export * from "./queries/users";
+export * from "./queries/vodocs";
+export * from "./queries/vogroups";
+export * from "./queries/settings";
+export * from "./queries/search";
+export * from "./queries/sections";
+
+// Mutations.
+export * from "./mutations/users";
+export * from "./mutations/acl";
+export * from "./mutations/applications";
+export * from "./mutations/articles";
+export * from "./mutations/books";
+export * from "./mutations/cards";
+export * from "./mutations/events";
+export * from "./mutations/navigation";
+export * from "./mutations/pages";
+export * from "./mutations/queues";
+export * from "./mutations/settings";
+export * from "./mutations/sections";
+export * from "./mutations/vodocs";
+export * from "./mutations/vogroups";
+
+export const fakeMutation = gql`
+  mutation fake {
+    id
+  }
+`;
+
+export const fakeQuery = gql`
+  query fake {
+    id
+  }
+`;

package/src/modules/VoApi/index.ts

@@ -2,40 +2,4 @@ import VoApi from "./VoApi";
 import GraphClient from "./GraphClient";
 export default VoApi;
 export { VoApi, GraphClient };
-
-import { gql } from "@apollo/client";
-
-// Queries.
-export * from "./queries/articles";
-export * from "./queries/acl";
-export * from "./queries/navigation";
-export * from "./queries/pages";
-export * from "./queries/queues";
-export * from "./queries/users";
-export * from "./queries/vodocs";
-export * from "./queries/vogroups";
-export * from "./queries/settings";
-export * from "./queries/search";
-
-// Mutations.
-export * from "./mutations/users";
-export * from "./mutations/acl";
-export * from "./mutations/articles";
-export * from "./mutations/navigation";
-export * from "./mutations/pages";
-export * from "./mutations/queues";
-export * from "./mutations/settings";
-export * from "./mutations/vodocs";
-export * from "./mutations/vogroups";
-
-export const fakeMutation = gql`
-  mutation fake {
-    id
-  }
-`;
-
-export const fakeQuery = gql`
-  query fake {
-    id
-  }
-`;
+export * from "./graphql";

package/src/modules/VoApi/mutations/applications.ts

@@ -0,0 +1,27 @@
+import { gql } from "@apollo/client";
+
+export const CREATE_APPLICATION = gql`
+  mutation CreateApplication($input: UpdateApplicationInput!) {
+    createApplication(input: $input) {
+      id
+      email
+    }
+  }
+`;
+
+export const UPDATE_APPLICATION = gql`
+  mutation UpdateApplication($id: ID!, $input: UpdateApplicationInput!) {
+    updateApplication(id: $id, input: $input) {
+      id
+      email
+    }
+  }
+`;
+
+export const DELETE_APPLICATION = gql`
+  mutation DeleteApplication($id: ID!) {
+    deleteApplication(id: $id) {
+      id
+    }
+  }
+`;

package/src/modules/VoApi/mutations/books.ts

@@ -0,0 +1,27 @@
+import { gql } from "@apollo/client";
+
+export const CREATE_BOOK = gql`
+  mutation CreateBook($input: UpdateBookInput!) {
+    createBook(input: $input) {
+      id
+      title
+    }
+  }
+`;
+
+export const UPDATE_BOOK = gql`
+  mutation UpdateBook($id: ID!, $input: UpdateBookInput!) {
+    updateBook(id: $id, input: $input) {
+      id
+      title
+    }
+  }
+`;
+
+export const DELETE_BOOK = gql`
+  mutation DeleteBook($id: ID!) {
+    deleteBook(id: $id) {
+      id
+    }
+  }
+`;

package/src/modules/VoApi/mutations/cards.ts

@@ -0,0 +1,27 @@
+import { gql } from "@apollo/client";
+
+export const CREATE_CARD = gql`
+  mutation CreateCard($input: UpdateCardInput!) {
+    createCard(input: $input) {
+      id
+      title
+    }
+  }
+`;
+
+export const UPDATE_CARD = gql`
+  mutation UpdateCard($id: ID!, $input: UpdateCardInput!) {
+    updateCard(id: $id, input: $input) {
+      id
+      title
+    }
+  }
+`;
+
+export const DELETE_CARD = gql`
+  mutation DeleteCard($id: ID!) {
+    deleteCard(id: $id) {
+      id
+    }
+  }
+`;

package/src/modules/VoApi/mutations/events.ts

@@ -0,0 +1,27 @@
+import { gql } from "@apollo/client";
+
+export const CREATE_EVENT = gql`
+  mutation CreateEvent($input: UpdateEventInput!) {
+    createEvent(input: $input) {
+      id
+      title
+    }
+  }
+`;
+
+export const UPDATE_EVENT = gql`
+  mutation UpdateEvent($id: ID!, $input: UpdateEventInput!) {
+    updateEvent(id: $id, input: $input) {
+      id
+      title
+    }
+  }
+`;
+
+export const DELETE_EVENT = gql`
+  mutation DeleteEvent($id: ID!) {
+    deleteEvent(id: $id) {
+      id
+    }
+  }
+`;

package/src/modules/VoApi/mutations/queues.ts

@@ -1,4 +1,4 @@
-import { gql } from '@apollo/client';
+import { gql } from "@apollo/client";
 
 export const CREATE_QUEUE = gql`
   mutation CreateQueue($input: UpdateQueueInput!) {
@@ -14,6 +14,10 @@ export const CREATE_QUEUE = gql`
           id
           title
         }
+        ... on Section {
+          id
+          title
+        }
       }
     }
   }
@@ -34,6 +38,10 @@ export const UPDATE_QUEUE = gql`
           id
           title
         }
+        ... on Section {
+          id
+          title
+        }
       }
       created_at
       updated_at

package/src/modules/VoApi/mutations/sections.ts

@@ -0,0 +1,27 @@
+import { gql } from '@apollo/client';
+
+export const CREATE_SECTION = gql`
+  mutation CreateSection($input: UpdateSectionInput!) {
+    createSection(input: $input) {
+      id
+      title
+    }
+  }
+`;
+
+export const UPDATE_SECTION = gql`
+  mutation UpdateSection($id: ID!, $input: UpdateSectionInput!) {
+    updateSection(id: $id, input: $input) {
+      id
+      title
+    }
+  }
+`;
+
+export const DELETE_SECTION = gql`
+  mutation DeleteSection($id: ID!) {
+    deleteSection(id: $id) {
+      id
+    }
+  }
+`;

package/src/modules/VoApi/mutations/settings.ts

@@ -1,11 +1,19 @@
-import { gql } from '@apollo/client';
+import { gql } from "@apollo/client";
 
 export const UPDATE_SETTINGS = gql`
-  mutation UpdateQueue($settings: [UpdateSettingInput]!) {
+  mutation UpdateSettings($settings: [UpdateSettingInput]!) {
     updateSettings(settings: $settings) {
       name
       category
       value
+      file {
+        id
+        title
+        filename
+        filesize
+        filetype
+        url
+      }
     }
   }
-`;
+`;

package/src/modules/VoApi/mutations/users.ts

@@ -1,12 +1,12 @@
-import { gql } from '@apollo/client';
+import { gql } from "@apollo/client";
 
 export const CREATE_USER = gql`
   mutation CreateUser($input: UpdateUserInput!) {
     createUser(input: $input) {
       id
       name
-      email,
-      firstname,
+      email
+      firstname
       lastname
     }
   }
@@ -17,9 +17,17 @@ export const UPDATE_USER = gql`
     updateUser(id: $id, input: $input) {
       id
       name
-      email,
-      firstname,
-      lastname,
+      email
+      firstname
+      lastname
+      images {
+        id
+        title
+        filename
+        filesize
+        filetype
+        url
+      }
       updated_at
       created_at
       groups {
@@ -32,6 +40,11 @@ export const UPDATE_USER = gql`
         label
         type
       }
+      groupRoles {
+        id
+        label
+        type
+      }
     }
   }
 `;
@@ -43,6 +56,3 @@ export const DELETE_USER = gql`
     }
   }
 `;
-
-
-

package/src/modules/VoApi/mutations/vodocs.ts

@@ -5,6 +5,7 @@ export const CREATE_PORTFOLIO = gql`
     createPortfolio(input: $input) {
       id
       disk
+      status
       name
       disk
       title
@@ -20,6 +21,7 @@ export const UPDATE_PORTFOLIO = gql`
     updatePortfolio(id: $id, input: $input) {
       id
       disk
+      status
       name
       disk
       title
@@ -87,6 +89,7 @@ export const CREATE_FILE = gql`
       filename
       filesize
       filetype
+      url
       created_at
       updated_at
     }
@@ -106,6 +109,7 @@ export const UPDATE_FILE = gql`
       filename
       filesize
       filetype
+      url
       created_at
       updated_at
     }