Merge pull request #48 from Selnapenek/master

feat: add wss uri

Author: Selnapenek

packages/app-provider/src/ApolloContainer.tsx

@@ -52,6 +52,7 @@ const ApolloContainer: React.ComponentType<ApolloContainerProps> = withAuth(
           onRequestError: this.props.onRequestError,
           onRequestSuccess: this.props.onRequestSuccess,
           uri: this.props.uri,
+          subscriptionUri: this.props.subscriptionUri,
           withSubscriptions,
         };
 

packages/app-provider/src/AppProvider.tsx

@@ -30,6 +30,7 @@ type PrefilledApolloContainerProps =
 /**
  * `AppProvider` universal provider which loads fragments schema and provides Apollo client with it, authentication and table schema.
  * @prop {string} [uri] - The 8base API field schema.
+ * @prop {string} [subscriptionUri] Endpoint of the GraphQl websocket server.
  * @prop {Object} [authClient] - The 8base auth client.
  * @prop {Function} [onRequestSuccess] - The callback which called when request is success.
  * @prop {Function} [onRequestError] - The callback which called when request is fail.
@@ -41,6 +42,7 @@ type PrefilledApolloContainerProps =
  */
 const AppProvider = ({
   uri,
+  subscriptionUri,
   authClient,
   onRequestSuccess,
   onRequestError,
@@ -63,6 +65,7 @@ const AppProvider = ({
     <ApolloContainer
       withSubscriptions={withSubscriptions}
       uri={uri}
+      subscriptionUri={subscriptionUri}
       extendLinks={extendLinks}
       onRequestSuccess={onRequestSuccess}
       onRequestError={onRequestError}

packages/app-provider/src/types.ts

@@ -4,6 +4,7 @@ import { IAuthState, TableSchema, Application } from '@8base/utils';
 
 export type ApolloContainerPassedProps = {
   uri: string;
+  subscriptionUri?: string;
   autoSignUp?: boolean;
   withSubscriptions?: boolean;
   authProfileId?: string;

packages/app-provider/test/__tests__/AppProvider.test.tsx

@@ -86,6 +86,7 @@ describe('AppProvider', () => {
         "onIdTokenExpired": [Function],
         "onRequestError": [MockFunction],
         "onRequestSuccess": [MockFunction],
+        "subscriptionUri": undefined,
         "uri": "http://8base.com",
         "withAuth": true,
         "withSubscriptions": false,
@@ -140,6 +141,7 @@ describe('AppProvider', () => {
         "onIdTokenExpired": [Function],
         "onRequestError": [MockFunction],
         "onRequestSuccess": [MockFunction],
+        "subscriptionUri": undefined,
         "uri": "http://8base.com",
         "withAuth": true,
         "withSubscriptions": false,
@@ -178,6 +180,7 @@ describe('AppProvider', () => {
         "extendLinks": [MockFunction],
         "onRequestError": [MockFunction],
         "onRequestSuccess": [MockFunction],
+        "subscriptionUri": undefined,
         "uri": "http://8base.com",
         "withAuth": false,
         "withSubscriptions": false,

packages/crud/src/RecordCrud.tsx

@@ -32,7 +32,7 @@ const createRecordTag = (tableSchema: TableSchema, mode: CrudModes, options: Que
     case 'delete':
       return createTableRowDeleteTag([tableSchema], tableSchema.id);
     default:
-      return null;
+      return '';
   }
 };
 

packages/permissions-provider/package.json

@@ -24,7 +24,7 @@
     "ramda": "^0.26.1"
   },
   "devDependencies": {
-    "@types/graphql": "^0.13.0",
+    "@types/graphql": "^14.2.0",
     "@types/jest": "^24.0.13",
     "@types/react-test-renderer": "^16.8.1",
     "apollo-client": "^2.6.3",