Skip to content
This repository was archived by the owner on Feb 16, 2023. It is now read-only.

Commit 41f3a92

Browse files
git-phuJordan Scott
authored andcommitted
use /list instead of /list_for_workspace (airbytehq#13341)
/list_for_workspace is still wip, part of airbytehq#9652
1 parent 5868aff commit 41f3a92

File tree

4 files changed

+8
-18
lines changed

4 files changed

+8
-18
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import {
55
DestinationDefinitionCreate,
66
DestinationDefinitionUpdate,
77
getDestinationDefinition,
8-
listDestinationDefinitionsForWorkspace,
8+
listDestinationDefinitions,
99
listLatestDestinationDefinitions,
1010
updateDestinationDefinition,
1111
} from "../../request/AirbyteClient";
@@ -15,8 +15,8 @@ export class DestinationDefinitionService extends AirbyteRequestService {
1515
return getDestinationDefinition({ destinationDefinitionId }, this.requestOptions);
1616
}
1717

18-
public list(workspaceId: string) {
19-
return listDestinationDefinitionsForWorkspace({ workspaceId }, this.requestOptions);
18+
public list() {
19+
return listDestinationDefinitions(this.requestOptions);
2020
}
2121

2222
public listLatest() {

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import {
44
createSourceDefinition,
55
getSourceDefinition,
66
listLatestSourceDefinitions,
7-
listSourceDefinitionsForWorkspace,
7+
listSourceDefinitions,
88
SourceDefinitionCreate,
99
SourceDefinitionUpdate,
1010
updateSourceDefinition,
@@ -15,8 +15,8 @@ export class SourceDefinitionService extends AirbyteRequestService {
1515
return getSourceDefinition({ sourceDefinitionId }, this.requestOptions);
1616
}
1717

18-
public list(workspaceId: string) {
19-
return listSourceDefinitionsForWorkspace({ workspaceId }, this.requestOptions);
18+
public list() {
19+
return listSourceDefinitions(this.requestOptions);
2020
}
2121

2222
public listLatest() {

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

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import { useConfig } from "config";
44
import { DestinationDefinitionService } from "core/domain/connector/DestinationDefinitionService";
55
import { useDefaultRequestMiddlewares } from "services/useDefaultRequestMiddlewares";
66
import { useInitService } from "services/useInitService";
7-
import { useCurrentWorkspace } from "services/workspaces/WorkspacesService";
87
import { isDefined } from "utils/common";
98

109
import { DestinationDefinitionCreate, DestinationDefinitionRead } from "../../core/request/AirbyteClient";
@@ -36,13 +35,9 @@ const useDestinationDefinitionList = (): {
3635
destinationDefinitions: DestinationDefinitionReadWithLatestTag[];
3736
} => {
3837
const service = useGetDestinationDefinitionService();
39-
const workspace = useCurrentWorkspace();
4038

4139
return useSuspenseQuery(destinationDefinitionKeys.lists(), async () => {
42-
const [definition, latestDefinition] = await Promise.all([
43-
service.list(workspace.workspaceId),
44-
service.listLatest(),
45-
]);
40+
const [definition, latestDefinition] = await Promise.all([service.list(), service.listLatest()]);
4641

4742
const destinationDefinitions: DestinationDefinitionRead[] = definition.destinationDefinitions.map(
4843
(destination: DestinationDefinitionRead) => {

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

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import { useConfig } from "config";
44
import { SourceDefinitionService } from "core/domain/connector/SourceDefinitionService";
55
import { useDefaultRequestMiddlewares } from "services/useDefaultRequestMiddlewares";
66
import { useInitService } from "services/useInitService";
7-
import { useCurrentWorkspace } from "services/workspaces/WorkspacesService";
87
import { isDefined } from "utils/common";
98

109
import { SourceDefinitionCreate, SourceDefinitionRead } from "../../core/request/AirbyteClient";
@@ -36,13 +35,9 @@ const useSourceDefinitionList = (): {
3635
sourceDefinitions: SourceDefinitionReadWithLatestTag[];
3736
} => {
3837
const service = useGetSourceDefinitionService();
39-
const workspace = useCurrentWorkspace();
4038

4139
return useSuspenseQuery(sourceDefinitionKeys.lists(), async () => {
42-
const [definition, latestDefinition] = await Promise.all([
43-
service.list(workspace.workspaceId),
44-
service.listLatest(),
45-
]);
40+
const [definition, latestDefinition] = await Promise.all([service.list(), service.listLatest()]);
4641

4742
const sourceDefinitions = definition.sourceDefinitions.map((source) => {
4843
const withLatest = latestDefinition.sourceDefinitions.find(

0 commit comments

Comments
 (0)