From b80779993dcc6c1408756d69ca796af7c1505933 Mon Sep 17 00:00:00 2001 From: "Thomas F. K. Jorna" Date: Wed, 24 Apr 2024 09:39:32 -0400 Subject: [PATCH] chore: fix type issues --- core/actions/http/action.ts | 4 +--- core/actions/http/run.ts | 4 +++- core/actions/types.ts | 2 +- packages/ui/src/auto-form/fields/object.tsx | 7 ++++--- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/core/actions/http/action.ts b/core/actions/http/action.ts index 400d88fff..c2be2d187 100644 --- a/core/actions/http/action.ts +++ b/core/actions/http/action.ts @@ -1,11 +1,9 @@ import * as z from "zod"; import { DependencyType } from "ui/auto-form"; -import { FileText, Globe } from "ui/icon"; +import { Globe } from "ui/icon"; -import * as corePubFields from "../corePubFields"; import { defineAction } from "../types"; -import { configOverride } from "./configOverride"; import { OutputMapFieldType } from "./outputMapFieldType"; export const action = defineAction({ diff --git a/core/actions/http/run.ts b/core/actions/http/run.ts index ba52927e0..d3fa9bc1b 100644 --- a/core/actions/http/run.ts +++ b/core/actions/http/run.ts @@ -69,7 +69,9 @@ export const run = defineRun(async ({ pub, config, runParameters const result = await res.json(); const setRunParameters = runParameters?.outputMap - ? Object.entries(runParameters.outputMap).filter(([key, val]) => Boolean(val)) + ? Object.entries(runParameters.outputMap).filter((entry): entry is [string, string] => + Boolean(entry[1]) + ) : []; if (setRunParameters.length > 0) { diff --git a/core/actions/types.ts b/core/actions/types.ts index 9fbb9cd8f..19e2c7b28 100644 --- a/core/actions/types.ts +++ b/core/actions/types.ts @@ -63,7 +63,7 @@ export type Action< | { schema: z.ZodType; fieldConfig?: { - [K in keyof F]: Omit & { + [K in keyof F]: Omit & { fieldType?: RunParameterFieldTypeOverride; }; }; diff --git a/packages/ui/src/auto-form/fields/object.tsx b/packages/ui/src/auto-form/fields/object.tsx index 471313eab..b9218c319 100644 --- a/packages/ui/src/auto-form/fields/object.tsx +++ b/packages/ui/src/auto-form/fields/object.tsx @@ -1,12 +1,14 @@ +import type { useForm } from "react-hook-form"; + import * as React from "react"; -import { useForm, useFormContext } from "react-hook-form"; +import { useFormContext } from "react-hook-form"; import * as z from "zod"; +import type { Dependency, FieldConfig, FieldConfigItem } from "../types"; import { Accordion, AccordionContent, AccordionItem, AccordionTrigger } from "../../accordion"; import { FormField } from "../../form"; import { DEFAULT_ZOD_HANDLERS, INPUT_COMPONENTS } from "../config"; import resolveDependencies from "../dependencies"; -import { Dependency, FieldConfig, FieldConfigItem } from "../types"; import { beautifyObjectName, getBaseSchema, getBaseType, zodToHtmlInputProps } from "../utils"; import AutoFormArray from "./array"; @@ -71,7 +73,6 @@ export default function AutoFormObject> return null; } - console.log(zodBaseType, fieldConfig); if (zodBaseType === "ZodObject") { return (