Add cancel check connection button (#11360)

* Implement check connection

* Add requeset cancelling

* Remove unused props

* Temporary comment analytics

* Add analytics calls

* Minor lint fixes

* fix renaming

airbyte-webapp/src/core/domain/catalog/fieldUtil.ts

@@ -1,28 +1,8 @@
 import { JSONSchema7Definition } from "json-schema";
-import Status from "core/statuses";
-import { CommonRequestError } from "core/request/CommonRequestError";
-
-import { SourceDiscoverSchemaRead } from "./api";
 import { SyncSchemaField } from "./models";
 import { ConnectionNamespaceDefinition } from "../connection";
 import { SOURCE_NAMESPACE_TAG } from "../connector/source";
 
-function toInnerModel(
-  result: SourceDiscoverSchemaRead
-): SourceDiscoverSchemaRead {
-  if (result.jobInfo?.status === Status.FAILED || !result.catalog) {
-    // @ts-ignore address this case
-    const e = new CommonRequestError(result);
-    // Generate error with failed status and received logs
-    e._status = 400;
-    // @ts-ignore address this case
-    e.response = result.jobInfo;
-    throw e;
-  }
-
-  return result;
-}
-
 const traverseSchemaToField = (
   jsonSchema: JSONSchema7Definition,
   key: string
@@ -95,4 +75,4 @@ function getDestinationNamespace(opt: NamespaceOptions): string {
   }
 }
 
-export { getDestinationNamespace, traverseSchemaToField, toInnerModel };
+export { getDestinationNamespace, traverseSchemaToField };

airbyte-webapp/src/core/domain/connector/DestinationService.ts

@@ -0,0 +1,44 @@
+import { AirbyteRequestService } from "core/request/AirbyteRequestService";
+
+import Status from "core/statuses";
+import { LogsRequestError } from "core/request/LogsRequestError";
+import { Scheduler } from "./types";
+import { ConnectionConfiguration } from "core/domain/connection";
+
+class DestinationService extends AirbyteRequestService {
+  get url(): string {
+    return "destinations";
+  }
+
+  public async check_connection(
+    params: {
+      destinationId?: string;
+      connectionConfiguration?: ConnectionConfiguration;
+    },
+    requestParams?: RequestInit
+  ): Promise<Scheduler> {
+    const url = !params.destinationId
+      ? `scheduler/${this.url}/check_connection`
+      : params.connectionConfiguration
+      ? `${this.url}/check_connection_for_update`
+      : `${this.url}/check_connection`;
+
+    // migrated from rest-hooks. Needs proper fix to `Scheduler` type
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const result = await this.fetch<any>(url, params, requestParams);
+
+    // If check connection for destination has status 'failed'
+    if (result.status === Status.FAILED) {
+      const jobInfo = {
+        ...result.jobInfo,
+        status: result.status,
+      };
+
+      throw new LogsRequestError(jobInfo, jobInfo, result.message);
+    }
+
+    return result;
+  }
+}
+
+export { DestinationService };

airbyte-webapp/src/core/domain/connector/SourceService.ts

@@ -1,9 +1,43 @@
 import { AirbyteRequestService } from "core/request/AirbyteRequestService";
+import { ConnectionConfiguration } from "../connection";
+import { Scheduler } from "./types";
+import Status from "core/statuses";
+import { LogsRequestError } from "core/request/LogsRequestError";
 
 class SourceService extends AirbyteRequestService {
   get url(): string {
     return "sources";
   }
+
+  public async check_connection(
+    params: {
+      sourceId?: string;
+      connectionConfiguration?: ConnectionConfiguration;
+    },
+    requestParams?: RequestInit
+  ): Promise<Scheduler> {
+    const url = !params.sourceId
+      ? `scheduler/${this.url}/check_connection`
+      : params.connectionConfiguration
+      ? `${this.url}/check_connection_for_update`
+      : `${this.url}/check_connection`;
+
+    // migrated from rest-hooks. Needs proper fix to `Scheduler` type
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const result = await this.fetch<any>(url, params, requestParams);
+
+    // If check connection for source has status 'failed'
+    if (result.status === Status.FAILED) {
+      const jobInfo = {
+        ...result.jobInfo,
+        status: result.status,
+      };
+
+      throw new LogsRequestError(jobInfo, jobInfo, result.message);
+    }
+
+    return result;
+  }
 }
 
 export { SourceService };

airbyte-webapp/src/core/domain/connector/connector.ts

@@ -1,5 +1,13 @@
-import { isSourceDefinition, isSourceDefinitionSpecification } from "./source";
-import { ConnectorDefinition, ConnectorDefinitionSpecification } from "./types";
+import {
+  isSource,
+  isSourceDefinition,
+  isSourceDefinitionSpecification,
+} from "./source";
+import {
+  ConnectorDefinition,
+  ConnectorDefinitionSpecification,
+  ConnectorT,
+} from "./types";
 import { DEV_IMAGE_TAG } from "./constants";
 
 export class Connector {
@@ -22,6 +30,12 @@ export class Connector {
   }
 }
 
+export class ConnectorHelper {
+  static id(connector: ConnectorT): string {
+    return isSource(connector) ? connector.sourceId : connector.destinationId;
+  }
+}
+
 export class ConnectorSpecification {
   static id(connector: ConnectorDefinitionSpecification): string {
     return isSourceDefinitionSpecification(connector)

airbyte-webapp/src/core/domain/connector/source.ts

@@ -1,10 +1,16 @@
 import {
   ConnectorDefinition,
   ConnectorDefinitionSpecification,
+  ConnectorT,
+  Source,
   SourceDefinition,
   SourceDefinitionSpecification,
 } from "./types";
 
+export function isSource(connector: ConnectorT): connector is Source {
+  return "sourceId" in connector;
+}
+
 export function isSourceDefinition(
   connector: ConnectorDefinition
 ): connector is SourceDefinition {

airbyte-webapp/src/core/domain/connector/types.ts

@@ -3,6 +3,7 @@ import {
   ConnectionSpecification,
 } from "core/domain/connection";
 import { DestinationSyncMode } from "core/domain/catalog";
+import { JobInfo } from "../job";
 
 export enum ReleaseStage {
   "ALPHA" = "alpha",
@@ -119,3 +120,11 @@ export interface Destination {
   destinationDefinitionId: string;
   connectionConfiguration: ConnectionConfiguration;
 }
+
+export type ConnectorT = Destination | Source;
+
+export interface Scheduler {
+  status: string;
+  message: string;
+  jobInfo?: JobInfo;
+}

airbyte-webapp/src/core/jsonSchema/utils.test.ts

@@ -180,7 +180,7 @@ test("apply func at", () => {
 
   const applied = applyFuncAt(schema, ["ssl", 0], (sch) => {
     if (typeof sch === "boolean") {
-      return sch as any;
+      return {};
     }
 
     sch.properties = sch.properties ?? {};

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

@@ -2,8 +2,9 @@ import { ReadShape, Resource, SchemaDetail } from "rest-hooks";
 
 import BaseResource from "./BaseResource";
 import { SourceDiscoverSchemaRead, SyncSchema } from "core/domain/catalog";
-import { toInnerModel } from "core/domain/catalog/fieldUtil";
 import { JobInfo } from "core/domain/job";
+import Status from "../statuses";
+import { CommonRequestError } from "../request/CommonRequestError";
 
 export interface Schema extends SourceDiscoverSchemaRead {
   id: string;
@@ -26,13 +27,21 @@ export default class SchemaResource extends BaseResource implements Schema {
     return {
       ...super.detailShape(),
       fetch: async (params: { sourceId: string }): Promise<Schema> => {
-        const response = await this.fetch(
+        const result = await this.fetch(
           "post",
           `${this.url(params)}/discover_schema`,
           params
         );
 
-        const result = toInnerModel(response);
+        if (result.jobInfo?.status === Status.FAILED || !result.catalog) {
+          // @ts-ignore address this case
+          const e = new CommonRequestError(result);
+          // Generate error with failed status and received logs
+          e._status = 400;
+          // @ts-ignore address this case
+          e.response = result.jobInfo;
+          throw e;
+        }
 
         return {
           catalog: result.catalog,