Fix build issues in connect-react

packages/connect-react/src/components/ComponentForm.tsx

@@ -1,7 +1,7 @@
 import {
-  DynamicProps,
   FormContextProvider, type FormContext,
 } from "../hooks/form-context";
+import { DynamicProps } from "../types";
 import type {
   ConfigurableProps,
   ConfiguredProps,
@@ -25,9 +25,9 @@ export type ComponentFormProps<T extends ConfigurableProps, U = ConfiguredProps<
   propNames?: string[]; // TODO PropNames<T>
   onSubmit?: (ctx: FormContext<T>) => void | Promise<void>; // if passed, we include button
   onUpdateConfiguredProps?: (v: U) => void; // XXX onChange?
-  onUpdateDynamicProps?: (dp: DynamicProps<T>) => void;
+  onUpdateDynamicProps?: (dp: DynamicProps) => void;
   hideOptionalProps?: boolean;
-  sdkResponse?: unknown | undefined;
+  sdkResponse?: U;
   enableDebugging?: boolean;
   /**
    * OAuth app ID configuration for specific apps.
@@ -36,9 +36,9 @@ export type ComponentFormProps<T extends ConfigurableProps, U = ConfiguredProps<
    */
   oauthAppConfig?: Record<string, string>;
 } & (
-  | { externalUserId: string; userId?: never }
-  | { userId: string; externalUserId?: never }
-);
+    | { externalUserId: string; userId?: never }
+    | { userId: string; externalUserId?: never }
+  );
 
 export function ComponentForm<T extends ConfigurableProps>(props: ComponentFormProps<T>) {
   return (

packages/connect-react/src/components/ComponentFormContainer.tsx

@@ -9,7 +9,11 @@ import {
 // load a component and pass it down
 type ComponentFormContainerProps<T extends ConfigurableProps> = Omit<ComponentFormProps<T>, "component"> & {
   componentKey: string;
-};
+} & (
+    // Either externalUserId or userId must be provided
+    | { externalUserId: string; userId?: never }
+    | { userId: string; externalUserId?: never }
+  );
 
 export function ComponentFormContainer<T extends ConfigurableProps>(props: ComponentFormContainerProps<T>) {
   const {

packages/connect-react/src/components/Control.tsx

@@ -13,6 +13,8 @@ import { ControlObject } from "./ControlObject";
 import { ControlSelect } from "./ControlSelect";
 import { ControlSql } from "./ControlSql";
 import { RemoteOptionsContainer } from "./RemoteOptionsContainer";
+import { sanitizeOption } from "../utils/type-guards";
+import { LabelValueOption } from "../types";
 
 export type ControlProps<T extends ConfigurableProps, U extends ConfigurableProp> = {
   field: FormFieldContext<U>;
@@ -37,16 +39,10 @@ export function Control<T extends ConfigurableProps, U extends ConfigurableProp>
   }
 
   if ("options" in prop && prop.options) {
-    let options = prop.options;
-    if (typeof options[0] !== "object") {
-      options = options.map((o: unknown) => ({
-        label: o,
-        value: o,
-      }));
-    }
+    const options: LabelValueOption<any>[] = prop.options.map(sanitizeOption);
     return <ControlSelect options={options} components={{
       IndicatorSeparator: () => null,
-    }} />; // TODO fix typing issue here!
+    }} />;
   }
 
   // TODO just look at registry component repo and look for what we should make sure we support

packages/connect-react/src/components/ControlApp.tsx

@@ -9,10 +9,12 @@ import { useMemo } from "react";
 import type { CSSProperties } from "react";
 import type { OptionProps } from "react-select";
 import type {
-  AppResponse, ConfigurablePropApp,
-} from "@pipedream/sdk";
+  Account,
+  App,
+  ConfigurablePropApp,
+} from "@pipedream/sdk/browser";
 
-const BaseOption = (props: OptionProps<AppResponse>) => {
+const BaseOption = (props: OptionProps<SelectValue>) => {
   // const imgSrc =
   //   props.data.img_src ?? `https://pipedream.com/s.v0/${props.data.id}/logo/48`
   return (
@@ -23,8 +25,14 @@ const BaseOption = (props: OptionProps<AppResponse>) => {
   );
 };
 
+type AccountPlaceholder = {
+  id: "_new";
+  name: string;
+}
+type SelectValue = Account | AccountPlaceholder;
+
 type ControlAppProps = {
-  app: AppResponse;
+  app: App;
 };
 
 export function ControlApp({ app }: ControlAppProps) {
@@ -55,7 +63,7 @@ export function ControlApp({ app }: ControlAppProps) {
     gridArea: "control",
   };
 
-  const baseSelectProps: BaseReactSelectProps = {
+  const baseSelectProps: BaseReactSelectProps<SelectValue> = {
     components: {
       Option: BaseOption,
     },
@@ -67,7 +75,7 @@ export function ControlApp({ app }: ControlAppProps) {
       }),
     },
   };
-  const selectProps =  select.getProps("controlAppSelect", baseSelectProps);
+  const selectProps = select.getProps("controlAppSelect", baseSelectProps);
 
   const oauthAppId = oauthAppConfig?.[app.name_slug];
   const {
@@ -77,13 +85,16 @@ export function ControlApp({ app }: ControlAppProps) {
     refetch: refetchAccounts,
   } = useAccounts(
     {
-      externalUserId,
+      external_user_id: externalUserId,
       app: app.name_slug,
       oauth_app_id: oauthAppId,
     },
     {
       useQueryOpts: {
         enabled: !!app,
+
+        // this seems to work (this overrides enabled so don't just set to true)
+        // @ts-ignore
         suspense: !!app,
       },
     },
@@ -105,17 +116,26 @@ export function ControlApp({ app }: ControlAppProps) {
     });
   };
 
-  const selectValue = useMemo(() => {
-    let ret = value;
-    if (ret != null) {
+  const newAccountPlaceholder: AccountPlaceholder = {
+    id: "_new",
+    name: `Connect new ${app.name} account...`,
+  };
+
+  const selectOptions = useMemo<SelectValue[]>(() => [
+    ...accounts,
+    newAccountPlaceholder,
+  ], [accounts]);
+
+  const selectValue = useMemo<SelectValue>(() => {
+    if (value?.authProvisionId) {
       for (const item of accounts) {
-        if (ret.authProvisionId === item.id) {
-          ret = item;
-          break;
+        if (value.authProvisionId === item.id) {
+          return item;
         }
       }
     }
-    return ret;
+
+    return newAccountPlaceholder;
   }, [
     accounts,
     value,
@@ -133,13 +153,7 @@ export function ControlApp({ app }: ControlAppProps) {
           <Select
             instanceId={id}
             value={selectValue}
-            options={[
-              ...accounts,
-              {
-                id: "_new",
-                name: `Connect new ${app.name} account...`,
-              },
-            ]}
+            options={selectOptions}
             {...selectProps}
             required={true}
             placeholder={`Select ${app.name} account...`}
@@ -151,8 +165,8 @@ export function ControlApp({ app }: ControlAppProps) {
             onChange={(a) => {
               if (a) {
                 if (a.id === "_new") {
-                // start connect account and then select it, etc.
-                // TODO unset / put in loading state
+                  // start connect account and then select it, etc.
+                  // TODO unset / put in loading state
                   startConnectAccount();
                 } else {
                   onChange({
@@ -169,7 +183,7 @@ export function ControlApp({ app }: ControlAppProps) {
             app,
             ...formFieldCtx,
           })} onClick={() => startConnectAccount()}>
-          Connect {app.name}
+            Connect {app.name}
           </button>
       }
     </div>