Skip to content
Merged
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
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ export const dataModelResolvers = {

const { data: latestRevision } = await supabase
.from("model_revision")
.select("revision_number, hash")
.select("*")
.eq("model_id", validatedInput.dataModelId)
.order("revision_number", { ascending: false })
.limit(1)
Expand Down Expand Up @@ -152,8 +152,8 @@ export const dataModelResolvers = {
language: validatedInput.language,
code: validatedInput.code,
cron: validatedInput.cron,
start: validatedInput.start,
end: validatedInput.end,
start: validatedInput.start?.toISOString() ?? null,
end: validatedInput.end?.toISOString() ?? null,
schema: validatedInput.schema.map((col) => ({
name: col.name,
type: col.type,
Expand Down
9 changes: 7 additions & 2 deletions apps/frontend/app/api/v1/osograph/utils/resolver-helpers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,10 @@ import {
type Connection,
emptyConnection,
} from "@/app/api/v1/osograph/utils/connection";
import type { ConnectionArgs } from "@/app/api/v1/osograph/utils/pagination";
import type {
ConnectionArgs,
FilterableConnectionArgs,
} from "@/app/api/v1/osograph/utils/pagination";
import {
getFetchLimit,
getPaginationParams,
Expand Down Expand Up @@ -54,7 +57,7 @@ export async function getUserOrganizationIds(

export async function getUserOrganizationsConnection(
userId: string,
args: ConnectionArgs,
args: FilterableConnectionArgs,
additionalPredicate?: Partial<QueryPredicate<"organizations">>,
) {
const supabase = createAdminClient();
Expand Down Expand Up @@ -101,6 +104,8 @@ export async function getUserOrganizationsConnection(
supabase,
"organizations",
predicate,
undefined,
args.single,
);

if (orgError) {
Expand Down
4 changes: 2 additions & 2 deletions apps/frontend/app/api/v1/osograph/utils/validation.ts
Original file line number Diff line number Diff line change
Expand Up @@ -162,8 +162,8 @@ export const CreateDataModelRevisionSchema = z.object({
language: z.string(),
code: z.string(),
cron: z.string(),
start: z.string().datetime().optional(),
end: z.string().datetime().optional(),
start: z.date().optional(),
end: z.date().optional(),
schema: z.array(DataModelColumnSchema),
dependsOn: z.array(DataModelDependencySchema).optional(),
partitionedBy: z.array(z.string()).optional(),
Expand Down
8 changes: 6 additions & 2 deletions apps/frontend/components/widgets/form-builder.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,11 @@ const RenderField: React.FC<RenderFieldProps> = ({
<div className={cn(horizontal && "col-span-3")}>
<FormControl>
<DatePicker
value={field.value}
value={
typeof field.value === "string"
? new Date(field.value)
: field.value
}
onChange={field.onChange}
disabled={fieldSchema.disabled}
/>
Expand Down Expand Up @@ -350,7 +354,7 @@ const FormBuilder: React.FC<FormBuilderProps> = React.forwardRef(
ref,
() => ({
submit: () => {
void form.handleSubmit(onSubmit)();
onSubmit(form.getValues());
},
}),
[form.handleSubmit, onSubmit],
Expand Down
6 changes: 3 additions & 3 deletions apps/frontend/components/widgets/monaco-editor.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ const MonacoEditorMeta: CodeComponentMeta<MonacoEditorProps> = {
name: "MonacoEditor",
description: "Monaco editor",
props: {
defaultValue: {
type: "string",
},
value: {
type: "string",
editOnly: true,
displayName: "Initial value",
uncontrolledProp: "defaultValue",
},
onChange: {
type: "eventHandler",
Expand Down
9 changes: 9 additions & 0 deletions apps/frontend/lib/clients/oso-app/oso-app.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2745,6 +2745,15 @@ class OsoAppClient {
kindOptions: any;
}>,
) {
ensure(args.dataModelId, "Missing dataModelId argument");
ensure(args.name, "Missing name argument");
ensure(args.displayName, "Missing displayName argument");
ensure(args.language, "Missing language argument");
ensure(args.code, "Missing code argument");
ensure(args.cron, "Missing cron argument");
ensure(args.schema, "Missing schema argument");
ensure(args.kind, "Missing kind argument");

const CREATE_DATA_MODEL_REVISION_MUTATION = gql(`
mutation CreateDataModelRevision($input: CreateDataModelRevisionInput!) {
createDataModelRevision(input: $input) {
Expand Down
Loading