Update Rest Hooks to latest 5; use legacy package for Resource

airbyte-webapp/package.json

@@ -20,7 +20,7 @@
     "@fullstory/browser": "^1.4.9",
     "@papercups-io/chat-widget": "^1.1.5",
     "@papercups-io/storytime": "^1.0.6",
-    "@rest-hooks/legacy": "^2.0.5",
+    "@rest-hooks/legacy": "^3.0.0",
     "@sentry/react": "^6.11.0",
     "@sentry/tracing": "^6.11.0",
     "@storybook/preset-create-react-app": "^3.2.0",
@@ -46,14 +46,14 @@
     "react-table": "^7.5.0",
     "react-use": "^15.3.8",
     "react-widgets": "^4.6.1",
-    "rest-hooks": "^5.0.20",
+    "rest-hooks": "^5.3.4",
     "sanitize-html": "^2.3.3",
     "styled-components": "^5.1.1",
     "typesafe-actions": "^5.1.0",
     "yup": "^0.32.9"
   },
   "devDependencies": {
-    "@rest-hooks/test": "^6.2.0",
+    "@rest-hooks/test": "^7.0.0",
     "@storybook/addon-essentials": "^6.3.6",
     "@storybook/preset-create-react-app": "^3.2.0",
     "@storybook/react": "^6.3.2",

airbyte-webapp/src/core/resources/BaseResource.tsx

@@ -1,13 +1,13 @@
 import {
-  AbstractInstanceType,
   Method,
   MutateShape,
   ReadShape,
   Resource,
   SchemaDetail,
   SchemaList,
-  schemas,
-} from "rest-hooks";
+  Delete,
+} from "@rest-hooks/legacy";
+import { AbstractInstanceType } from "@rest-hooks/normalizr";
 
 import { parseResponse } from "core/request/AirbyteRequestService";
 import { getService } from "core/servicesProvider";
@@ -136,11 +136,7 @@ export default abstract class BaseResource extends Resource {
 
   static deleteShape<T extends typeof Resource>(
     this: T
-  ): MutateShape<
-    schemas.Delete<T>,
-    Readonly<Record<string, unknown>>,
-    unknown
-  > {
+  ): MutateShape<Delete<T>, Readonly<Record<string, unknown>>, unknown> {
     return {
       ...super.deleteShape(),
       getFetchKey: (params: Readonly<Record<string, unknown>>) =>

airbyte-webapp/src/core/resources/Connection.ts

@@ -1,11 +1,11 @@
 import {
-  FetchOptions,
   FetchShape,
   MutateShape,
   ReadShape,
   Resource,
   SchemaDetail,
-} from "rest-hooks";
+} from "@rest-hooks/legacy";
+import { FetchOptions } from "rest-hooks";
 
 import { SyncSchema } from "core/domain/catalog";
 import { CommonRequestError } from "core/request/CommonRequestError";

airbyte-webapp/src/core/resources/Destination.tsx

@@ -1,4 +1,9 @@
-import { MutateShape, ReadShape, Resource, SchemaDetail } from "rest-hooks";
+import {
+  MutateShape,
+  ReadShape,
+  Resource,
+  SchemaDetail,
+} from "@rest-hooks/legacy";
 
 import { ConnectionConfiguration } from "core/domain/connection";
 import BaseResource from "./BaseResource";

airbyte-webapp/src/core/resources/DestinationDefinition.ts

@@ -1,4 +1,9 @@
-import { MutateShape, ReadShape, Resource, SchemaDetail } from "rest-hooks";
+import {
+  MutateShape,
+  ReadShape,
+  Resource,
+  SchemaDetail,
+} from "@rest-hooks/legacy";
 
 import { getService } from "core/servicesProvider";
 

airbyte-webapp/src/core/resources/DestinationDefinitionSpecification.ts

@@ -1,4 +1,4 @@
-import { ReadShape, Resource, SchemaDetail } from "rest-hooks";
+import { ReadShape, Resource, SchemaDetail } from "@rest-hooks/legacy";
 import BaseResource from "./BaseResource";
 import { ConnectionSpecification } from "core/domain/connection";
 import { DestinationSyncMode } from "../domain/catalog";

airbyte-webapp/src/core/resources/Job.ts

@@ -1,10 +1,10 @@
 import {
-  FetchOptions,
   MutateShape,
   ReadShape,
   Resource,
   SchemaDetail,
-} from "rest-hooks";
+} from "@rest-hooks/legacy";
+import { FetchOptions } from "rest-hooks";
 import BaseResource from "./BaseResource";
 import Status from "../statuses";
 

airbyte-webapp/src/core/resources/Logs.ts

@@ -1,4 +1,4 @@
-import { ReadShape, Resource, SchemaDetail } from "rest-hooks";
+import { ReadShape, Resource, SchemaDetail } from "@rest-hooks/legacy";
 import BaseResource from "./BaseResource";
 
 export interface Logs {

airbyte-webapp/src/core/resources/Notifications.ts

@@ -1,4 +1,4 @@
-import { MutateShape, Resource, SchemaDetail } from "rest-hooks";
+import { MutateShape, Resource, SchemaDetail } from "@rest-hooks/legacy";
 import BaseResource from "./BaseResource";
 
 export interface Notifications {

airbyte-webapp/src/core/resources/Scheduler.ts

@@ -1,4 +1,4 @@
-import { ReadShape, Resource, SchemaDetail } from "rest-hooks";
+import { ReadShape, Resource, SchemaDetail } from "@rest-hooks/legacy";
 import BaseResource from "./BaseResource";
 import Status from "core/statuses";
 import { CommonRequestError } from "core/request/CommonRequestError";

airbyte-webapp/src/core/resources/Schema.ts

@@ -1,4 +1,4 @@
-import { ReadShape, Resource, SchemaDetail } from "rest-hooks";
+import { ReadShape, Resource, SchemaDetail } from "@rest-hooks/legacy";
 
 import BaseResource from "./BaseResource";
 import { JobInfo } from "./Scheduler";

airbyte-webapp/src/core/resources/Source.tsx

@@ -1,4 +1,4 @@
-import { ReadShape, Resource, SchemaDetail } from "rest-hooks";
+import { ReadShape, Resource, SchemaDetail } from "@rest-hooks/legacy";
 import BaseResource from "./BaseResource";
 import { ConnectionConfiguration } from "core/domain/connection";
 

airbyte-webapp/src/core/resources/SourceDefinition.ts

@@ -1,4 +1,5 @@
-import { MutateShape, ReadShape, Resource, SchemaDetail } from "rest-hooks";
+import { MutateShape, ReadShape, SchemaDetail } from "@rest-hooks/legacy";
+import { Resource } from "@rest-hooks/legacy";
 import BaseResource from "./BaseResource";
 import { getService } from "core/servicesProvider";
 import { SourceDefinitionService } from "../domain/connector/SourceDefinitionService";

airbyte-webapp/src/core/resources/SourceDefinitionSpecification.ts

@@ -1,4 +1,4 @@
-import { ReadShape, Resource, SchemaDetail } from "rest-hooks";
+import { ReadShape, Resource, SchemaDetail } from "@rest-hooks/legacy";
 import BaseResource from "./BaseResource";
 import { ConnectionSpecification } from "core/domain/connection";
 

airbyte-webapp/src/core/resources/Workspace.ts

@@ -1,4 +1,9 @@
-import { MutateShape, ReadShape, Resource, SchemaDetail } from "rest-hooks";
+import {
+  MutateShape,
+  ReadShape,
+  Resource,
+  SchemaDetail,
+} from "@rest-hooks/legacy";
 import BaseResource from "./BaseResource";
 
 export interface Notification {