Set sourceCatalogId when creating a new connection

Author: malikdiarra

airbyte-webapp/src/components/CreateConnectionContent/CreateConnectionContent.tsx

@@ -54,6 +54,7 @@ const CreateConnectionContent: React.FC<IProps> = ({
     schema,
     isLoading,
     schemaErrorStatus,
+    catalogId,
     onDiscoverSchema,
   } = useDiscoverSchema(source.sourceId);
 
@@ -79,6 +80,7 @@ const CreateConnectionContent: React.FC<IProps> = ({
         name: destination?.name ?? "",
         destinationDefinitionId: destination?.destinationDefinitionId ?? "",
       },
+      sourceCatalogId: catalogId,
     });
 
     if (afterSubmitConnection) {

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

@@ -4,6 +4,7 @@ import { JobInfo } from "../job";
 export interface SourceDiscoverSchemaRead {
   catalog: SyncSchema;
   jobInfo?: JobInfo;
+  catalogId: string;
 }
 
 export type SchemaFields = JSONSchema7;

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

@@ -43,6 +43,7 @@ export default class ConnectionResource
   readonly syncCatalog: SyncSchema = { streams: [] };
   readonly isSyncing: boolean = false;
   readonly operationIds: string[] = [];
+  readonly sourceCatalogId: string = "";
 
   pk(): string {
     return this.connectionId?.toString();

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

@@ -13,6 +13,7 @@ export default class SchemaResource extends BaseResource implements Schema {
   readonly catalog: SyncSchema = { streams: [] };
   readonly id: string = "";
   readonly jobInfo?: JobInfo = undefined;
+  readonly catalogId = "";
 
   pk(): string {
     return this.id?.toString();
@@ -38,6 +39,7 @@ export default class SchemaResource extends BaseResource implements Schema {
           catalog: result.catalog,
           jobInfo: result.jobInfo,
           id: params.sourceId,
+          catalogId: result.catalogId,
         };
       },
       schema: this,

airbyte-webapp/src/hooks/services/useConnectionHook.tsx

@@ -42,6 +42,7 @@ type CreateConnectionProps = {
     | SourceDefinition
     | { name: string; sourceDefinitionId: string };
   destinationDefinition?: { name: string; destinationDefinitionId: string };
+  sourceCatalogId: string;
 };
 
 type UpdateConnection = {
@@ -126,6 +127,7 @@ const useConnection = (): {
     destination,
     sourceDefinition,
     destinationDefinition,
+    sourceCatalogId,
   }: CreateConnectionProps) => {
     try {
       const result = await createConnectionResource(
@@ -135,6 +137,7 @@ const useConnection = (): {
           destinationId: destination?.destinationId,
           ...values,
           status: "active",
+          sourceCatalogId: sourceCatalogId,
         },
         [
           [

airbyte-webapp/src/hooks/services/useSchemaHook.tsx

@@ -11,9 +11,11 @@ export const useDiscoverSchema = (
   isLoading: boolean;
   schema: SyncSchema;
   schemaErrorStatus: { status: number; response: JobInfo } | null;
+  catalogId: string;
   onDiscoverSchema: () => Promise<void>;
 } => {
   const [schema, setSchema] = useState<SyncSchema>({ streams: [] });
+  const [catalogId, setCatalogId] = useState("");
   const [isLoading, setIsLoading] = useState(false);
   const [schemaErrorStatus, setSchemaErrorStatus] = useState<{
     status: number;
@@ -28,6 +30,7 @@ export const useDiscoverSchema = (
     try {
       const data = await fetchDiscoverSchema({ sourceId: sourceId || "" });
       setSchema(data.catalog);
+      setCatalogId(data.catalogId);
     } catch (e) {
       setSchemaErrorStatus(e);
     } finally {
@@ -43,5 +46,5 @@ export const useDiscoverSchema = (
     })();
   }, [onDiscoverSchema, sourceId]);
 
-  return { schemaErrorStatus, isLoading, schema, onDiscoverSchema };
+  return { schemaErrorStatus, isLoading, schema, catalogId, onDiscoverSchema };
 };