Put interval and maxTimeout inside options arg

Author: ambirdsall

airbyte-webapp/src/core/request/pollUntil.test.ts

@@ -13,23 +13,23 @@ describe("pollUntil", () => {
     it("calls the provided apiFn until condition returns true and resolves to its final return value", () => {
       const pollableFn = fourZerosAndThenSeven();
 
-      return expect(pollUntil(pollableFn, truthyResponse, 1)).resolves.toBe(7);
+      return expect(pollUntil(pollableFn, truthyResponse, { interval: 1 })).resolves.toBe(7);
     });
   });
 
   describe("when condition returns true before maxTimeout is reached", () => {
     it("calls the provided apiFn until condition returns true and resolves to its final return value", () => {
       const pollableFn = fourZerosAndThenSeven();
 
-      return expect(pollUntil(pollableFn, truthyResponse, 1, 100)).resolves.toBe(7);
+      return expect(pollUntil(pollableFn, truthyResponse, { interval: 1, maxTimeout: 100 })).resolves.toBe(7);
     });
   });
 
   describe("when maxTimeout is reached before condition returns true", () => {
     it("resolves to false", () => {
       const pollableFn = fourZerosAndThenSeven();
 
-      return expect(pollUntil(pollableFn, truthyResponse, 100, 1)).resolves.toBe(false);
+      return expect(pollUntil(pollableFn, truthyResponse, { interval: 100, maxTimeout: 1 })).resolves.toBe(false);
     });
 
     // Because the timing of the polling depends on both the provided `interval` and the
@@ -46,7 +46,7 @@ describe("pollUntil", () => {
           return val;
         });
 
-      await pollUntil(pollableFn, (_) => false, 20, 78);
+      await pollUntil(pollableFn, (_) => false, { interval: 20, maxTimeout: 78 });
 
       // In theory, this is what just happened:
       // | time elapsed | value (source)  |

airbyte-webapp/src/core/request/pollUntil.ts

@@ -5,9 +5,9 @@ import { timer, delay, from, concatMap, takeWhile, last, raceWith, lastValueFrom
 export function pollUntil<ResponseType>(
   apiFn: () => Promise<ResponseType>,
   condition: (res: ResponseType) => boolean,
-  interval: number,
-  maxTimeout?: number
+  options: { interval: number; maxTimeout?: number }
 ) {
+  const { interval, maxTimeout } = options;
   const poll$ = timer(0, interval).pipe(
     concatMap((_) => from(apiFn())),
     takeWhile((result) => !condition(result), true),

airbyte-webapp/src/packages/cloud/components/experiments/FreeConnectorProgram/hooks/useFreeConnectorProgram.ts

@@ -40,8 +40,7 @@ export const useFreeConnectorProgram = () => {
       pollUntil(
         () => webBackendGetFreeConnectorProgramInfoForWorkspace({ workspaceId }, requestOptions),
         ({ hasPaymentAccountSaved }) => hasPaymentAccountSaved,
-        1000,
-        10000
+        { interval: 1000, maxTimeout: 10000 }
       ).then((maybeFcpInfo) => {
         if (maybeFcpInfo) {
           setSearchParams({}, { replace: true });