Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions apps/frontend/app/api/v1/osograph/schema/resolvers/dataset.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import {
UpdateDatasetSchema,
MaterializationWhereSchema,
validateInput,
DataConnectionWhereSchema,
DataConnectionAsTableWhereSchema,
} from "@/app/api/v1/osograph/utils/validation";
import {
DatasetErrors,
Expand Down Expand Up @@ -305,7 +305,7 @@ export const datasetResolvers: GraphQLResolverModule<GraphQLContext> = {
case "DATA_CONNECTION": {
const result = (await queryWithPagination(args, context, {
tableName: "data_connection_as_table",
whereSchema: DataConnectionWhereSchema,
whereSchema: DataConnectionAsTableWhereSchema,
requireAuth: false,
filterByUserOrgs: false,
parentOrgIds: parent.org_id,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,17 @@ import {
RunWhereSchema,
StaticModelWhereSchema,
MaterializationWhereSchema,
DataConnectionAsTableWhereSchema,
} from "@/app/api/v1/osograph/utils/validation";
import type { FilterableConnectionArgs } from "@/app/api/v1/osograph/utils/pagination";
import { GraphQLResolverModule } from "@/app/api/v1/osograph/types/utils";
import { queryWithPagination } from "@/app/api/v1/osograph/utils/query-helpers";
import { assertNever } from "@opensource-observer/utils";
import { DataIngestionAsTableRow, DatasetsRow } from "@/lib/types/schema-types";
import {
DataConnectionAsTableRow,
DataIngestionAsTableRow,
DatasetsRow,
} from "@/lib/types/schema-types";
import { Connection } from "@/app/api/v1/osograph/utils/connection";
import { getMaterializations } from "@/app/api/v1/osograph/utils/resolver-helpers";
import { generateTableId } from "@/app/api/v1/osograph/utils/model";
Expand Down Expand Up @@ -180,19 +185,36 @@ export const datasetTypeResolvers: GraphQLResolverModule<GraphQLContext> = {
})),
};
}
case "DATA_CONNECTION":
// Table metadata is not available until after the ingestion job completes
// Tables are created dynamically during ingestion
return {
edges: [],
pageInfo: {
hasNextPage: false,
hasPreviousPage: false,
startCursor: null,
endCursor: null,
case "DATA_CONNECTION": {
const { client } = await getOrgResourceClient(
context,
"dataset",
parent.id,
"read",
);

const result = (await queryWithPagination(args, context, {
client,
orgIds: parent.org_id,
tableName: "data_connection_as_table",
whereSchema: DataConnectionAsTableWhereSchema,
basePredicate: {
eq: [{ key: "dataset_id", value: parent.id }],
},
totalCount: 0,
})) as Connection<DataConnectionAsTableRow>;

return {
...result,
edges: result.edges.map((edge) => ({
node: {
id: edge.node.table_id,
name: edge.node.table_name,
datasetId: edge.node.dataset_id,
},
cursor: edge.cursor,
})),
};
}
default:
assertNever(
parent.dataset_type,
Expand Down
3 changes: 3 additions & 0 deletions apps/frontend/app/api/v1/osograph/utils/validation.ts
Original file line number Diff line number Diff line change
Expand Up @@ -486,6 +486,9 @@ export const StepWhereSchema = createWhereSchema("step");
export const MaterializationWhereSchema = createWhereSchema("materialization");
export const DataConnectionWhereSchema =
createWhereSchema("dynamic_connectors");
export const DataConnectionAsTableWhereSchema = createWhereSchema(
"data_connection_as_table",
);

export function validateInput<T>(
schema: z.ZodType<T, any, any>,
Expand Down
Loading