Skip to content

Commit 0d83153

Browse files
Joey Marshment-HowellSofiiaZaitseva
Joey Marshment-Howell
authored andcommitted
🪟 🐛 Fix custom connection creation endpoint (#19702)
Closes #19637 PR that introduced this bug was a precision revert of another issue: #19627 This PR removes the createSourceDefinition() and createDestinationDefinition() methods in favor of the new createCustomSourceDefinition() and createCustomDestinationDefinition() methods. createSourceDefinition() and createDestinationDefinition() are to be deprecated. This PR does not address updating custom connectors. There is a backend issue for fixing this behavior here: #19669
1 parent 833a039 commit 0d83153

File tree

5 files changed

+16
-12
lines changed

5 files changed

+16
-12
lines changed

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { AirbyteRequestService } from "core/request/AirbyteRequestService";
22

33
import {
4-
createDestinationDefinition,
5-
DestinationDefinitionCreate,
4+
createCustomDestinationDefinition,
5+
CustomDestinationDefinitionCreate,
66
DestinationDefinitionIdWithWorkspaceId,
77
DestinationDefinitionUpdate,
88
getDestinationDefinitionForWorkspace,
@@ -28,7 +28,7 @@ export class DestinationDefinitionService extends AirbyteRequestService {
2828
return updateDestinationDefinition(body, this.requestOptions);
2929
}
3030

31-
public create(body: DestinationDefinitionCreate) {
32-
return createDestinationDefinition(body, this.requestOptions);
31+
public createCustom(body: CustomDestinationDefinitionCreate) {
32+
return createCustomDestinationDefinition(body, this.requestOptions);
3333
}
3434
}

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import {
77
SourceDefinitionIdWithWorkspaceId,
88
updateSourceDefinition,
99
SourceDefinitionUpdate,
10-
createSourceDefinition,
11-
SourceDefinitionCreate,
10+
CustomSourceDefinitionCreate,
11+
createCustomSourceDefinition,
1212
} from "../../request/AirbyteClient";
1313

1414
export class SourceDefinitionService extends AirbyteRequestService {
@@ -28,7 +28,7 @@ export class SourceDefinitionService extends AirbyteRequestService {
2828
return updateSourceDefinition(body, this.requestOptions);
2929
}
3030

31-
public create(body: SourceDefinitionCreate) {
32-
return createSourceDefinition(body, this.requestOptions);
31+
public createCustom(body: CustomSourceDefinitionCreate) {
32+
return createCustomSourceDefinition(body, this.requestOptions);
3333
}
3434
}

airbyte-webapp/src/pages/SettingsPage/pages/ConnectorsPage/components/CreateConnector.tsx

+4-2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import { Button } from "components/ui/Button";
99
import { RoutePaths, DestinationPaths } from "pages/routePaths";
1010
import { useCreateDestinationDefinition } from "services/connector/DestinationDefinitionService";
1111
import { useCreateSourceDefinition } from "services/connector/SourceDefinitionService";
12+
import { useCurrentWorkspaceId } from "services/workspaces/WorkspacesService";
1213

1314
import CreateConnectorModal from "./CreateConnectorModal";
1415

@@ -25,6 +26,7 @@ interface ICreateProps {
2526

2627
const CreateConnector: React.FC<IProps> = ({ type }) => {
2728
const navigate = useNavigate();
29+
const workspaceId = useCurrentWorkspaceId();
2830
const [isModalOpen, setIsModalOpen] = useState(false);
2931
const [errorMessage, setErrorMessage] = useState("");
3032
const onChangeModalState = () => {
@@ -45,7 +47,7 @@ const CreateConnector: React.FC<IProps> = ({ type }) => {
4547

4648
navigate(
4749
{
48-
pathname: `${RoutePaths.Source}${RoutePaths.SourceNew}`,
50+
pathname: `/${RoutePaths.Workspaces}/${workspaceId}/${RoutePaths.Source}/${RoutePaths.SourceNew}`,
4951
},
5052
{ state: { sourceDefinitionId: result.sourceDefinitionId } }
5153
);
@@ -61,7 +63,7 @@ const CreateConnector: React.FC<IProps> = ({ type }) => {
6163

6264
navigate(
6365
{
64-
pathname: `${RoutePaths.Destination}${DestinationPaths.NewDestination}`,
66+
pathname: `/${RoutePaths.Workspaces}/${workspaceId}/${RoutePaths.Destination}/${DestinationPaths.NewDestination}`,
6567
},
6668
{ state: { destinationDefinitionId: result.destinationDefinitionId } }
6769
);

airbyte-webapp/src/services/connector/DestinationDefinitionService.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,10 @@ const useDestinationDefinition = <T extends string | undefined>(
7676
const useCreateDestinationDefinition = () => {
7777
const service = useGetDestinationDefinitionService();
7878
const queryClient = useQueryClient();
79+
const workspaceId = useCurrentWorkspaceId();
7980

8081
return useMutation<DestinationDefinitionRead, Error, DestinationDefinitionCreate>(
81-
(destinationDefinition) => service.create(destinationDefinition),
82+
(destinationDefinition) => service.createCustom({ workspaceId, destinationDefinition }),
8283
{
8384
onSuccess: (data) => {
8485
queryClient.setQueryData(

airbyte-webapp/src/services/connector/SourceDefinitionService.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,10 @@ const useSourceDefinition = <T extends string | undefined>(
7474
const useCreateSourceDefinition = () => {
7575
const service = useGetSourceDefinitionService();
7676
const queryClient = useQueryClient();
77+
const workspaceId = useCurrentWorkspaceId();
7778

7879
return useMutation<SourceDefinitionRead, Error, SourceDefinitionCreate>(
79-
(sourceDefinition) => service.create(sourceDefinition),
80+
(sourceDefinition) => service.createCustom({ workspaceId, sourceDefinition }),
8081
{
8182
onSuccess: (data) => {
8283
queryClient.setQueryData(

0 commit comments

Comments
 (0)