web: Upgrade Rest Hooks to v5

airbytehq · Feb 4, 2021 · f7eedc1 · f7eedc1
1 parent ea00397
commit f7eedc1
Show file tree

Hide file tree

Showing 8 changed files with 78 additions and 32 deletions.
diff --git a/airbyte-webapp/package-lock.json b/airbyte-webapp/package-lock.json
diff --git a/airbyte-webapp/package.json b/airbyte-webapp/package.json
@@ -18,7 +18,7 @@
     "@hot-loader/react-dom": "16.13.0",
     "@papercups-io/chat-widget": "^1.1.5",
     "@papercups-io/storytime": "^1.0.6",
-    "@rest-hooks/legacy": "^1.0.12",
+    "@rest-hooks/legacy": "^2.0.1",
     "dayjs": "^1.8.35",
     "formik": "2.1.5",
     "lodash.at": "^4.6.0",
@@ -36,7 +36,7 @@
     "react-router-dom": "^5.1.2",
     "react-table": "^7.5.0",
     "react-widgets": "^4.5.0",
-    "rest-hooks": "^4.5.9",
+    "rest-hooks": "^5.0.3",
     "sanitize-html": "^2.1.2",
     "styled-components": "^5.1.1",
     "yup": "^0.28.1"

diff --git a/airbyte-webapp/src/components/hooks/services/useDestinationHook.tsx b/airbyte-webapp/src/components/hooks/services/useDestinationHook.tsx
@@ -36,7 +36,7 @@ export const useDestinationDefinitionSpecificationLoad = (
       ? {
           destinationDefinitionId
         }
-      : undefined
+      : null
   );
 
   return { destinationDefinitionSpecification, error, isLoading };

diff --git a/airbyte-webapp/src/components/hooks/services/useSourceHook.tsx b/airbyte-webapp/src/components/hooks/services/useSourceHook.tsx
@@ -35,7 +35,7 @@ export const useSourceDefinitionSpecificationLoad = (
       ? {
           sourceDefinitionId
         }
-      : undefined
+      : null
   );
 
   return { sourceDefinitionSpecification, error, isLoading };

diff --git a/airbyte-webapp/src/core/resources/BaseResource.ts b/airbyte-webapp/src/core/resources/BaseResource.ts
@@ -1,4 +1,13 @@
-import { Method, Resource } from "rest-hooks";
+import {
+  Method,
+  MutateShape,
+  Resource,
+  AbstractInstanceType,
+  ReadShape,
+  schemas,
+  SchemaDetail,
+  SchemaList
+} from "rest-hooks";
 
 // import { authService } from "../auth/authService";
 import config from "../../config";
@@ -62,9 +71,11 @@ export default abstract class BaseResource extends Resource {
     return config.apiUrl;
   }
 
-  static listShape<T extends typeof Resource>(this: T) {
+  static listShape<T extends typeof Resource>(
+    this: T
+  ): ReadShape<SchemaList<AbstractInstanceType<T>>> {
     return {
-      ...super.listShape(),
+      ...(super.listShape() as any),
       getFetchKey: (params: any) =>
         "POST " + this.url(params) + "/list" + JSON.stringify(params),
       fetch: async (
@@ -80,9 +91,11 @@ export default abstract class BaseResource extends Resource {
     };
   }
 
-  static detailShape<T extends typeof Resource>(this: T) {
+  static detailShape<T extends typeof Resource>(
+    this: T
+  ): ReadShape<SchemaDetail<AbstractInstanceType<T>>> {
     return {
-      ...super.detailShape(),
+      ...(super.detailShape() as any),
       getFetchKey: (params: any) =>
         "POST " + this.url(params) + "/get" + JSON.stringify(params),
       fetch: async (
@@ -98,9 +111,11 @@ export default abstract class BaseResource extends Resource {
     };
   }
 
-  static createShape<T extends typeof Resource>(this: T) {
+  static createShape<T extends typeof Resource>(
+    this: T
+  ): MutateShape<SchemaDetail<AbstractInstanceType<T>>> {
     return {
-      ...super.createShape(),
+      ...(super.createShape() as any),
       getFetchKey: (params: any) =>
         "POST " + this.url(params) + "/create" + JSON.stringify(params),
       fetch: async (
@@ -117,9 +132,11 @@ export default abstract class BaseResource extends Resource {
     };
   }
 
-  static deleteShape<T extends typeof Resource>(this: T) {
+  static deleteShape<T extends typeof Resource>(
+    this: T
+  ): MutateShape<schemas.Delete<T>, Readonly<object>, unknown> {
     return {
-      ...super.deleteShape(),
+      ...(super.deleteShape() as any),
       getFetchKey: (params: any) =>
         "POST " + this.url(params) + "/delete" + JSON.stringify(params),
       fetch: async (
@@ -135,9 +152,11 @@ export default abstract class BaseResource extends Resource {
     };
   }
 
-  static partialUpdateShape<T extends typeof Resource>(this: T) {
+  static partialUpdateShape<T extends typeof Resource>(
+    this: T
+  ): MutateShape<SchemaDetail<AbstractInstanceType<T>>> {
     return {
-      ...super.partialUpdateShape(),
+      ...(super.partialUpdateShape() as any),
       getFetchKey: (params: any) =>
         "POST " + this.url(params) + "/partial-update" + JSON.stringify(params),
       fetch: async (

diff --git a/airbyte-webapp/src/core/resources/Connection.ts b/airbyte-webapp/src/core/resources/Connection.ts
@@ -44,6 +44,7 @@ export default class ConnectionResource extends BaseResource
   readonly sourceId: string = "";
   readonly destinationId: string = "";
   readonly status: string = "";
+  readonly message: string = "";
   readonly schedule: ScheduleProperties | null = null;
   readonly source: SourceInformation | undefined = undefined;
   readonly destination: DestinationInformation | undefined = undefined;

diff --git a/airbyte-webapp/src/core/resources/Deployment.ts b/airbyte-webapp/src/core/resources/Deployment.ts
@@ -35,7 +35,7 @@ export default class DeploymentResource extends BaseResource
           file
         };
       },
-      schema: {}
+      schema: { file: "" }
     };
   }
 
@@ -67,7 +67,7 @@ export default class DeploymentResource extends BaseResource
         );
         return response;
       },
-      schema: {}
+      schema: null
     };
   }
 }
diff --git a/airbyte-webapp/src/pages/ConnectionPage/pages/CreationFormPage/CreationFormPage.tsx b/airbyte-webapp/src/pages/ConnectionPage/pages/CreationFormPage/CreationFormPage.tsx
@@ -12,7 +12,7 @@ import DestinationForm from "./components/DestinationForm";
 import ConnectionBlock from "../../../../components/ConnectionBlock";
 import { Routes } from "../../../routes";
 import CreateConnectionContent from "../../../../components/CreateConnectionContent";
-import { useResource } from "rest-hooks/lib/react-integration/hooks";
+import { useResource } from "rest-hooks";
 import SourceResource from "../../../../core/resources/Source";
 import DestinationResource from "../../../../core/resources/Destination";
-Original file line number
+Diff line change
@@ Expand Up / @@ -36,7 +36,7 @@ export const useDestinationDefinitionSpecificationLoad = ( @@
           ? {
               destinationDefinitionId
             }
-          : undefined
+          : null
       );
       return { destinationDefinitionSpecification, error, isLoading };
@@ Expand Down @@