Update Fly.io integration authorization page to use react-form

backend/src/integrations/apps.ts

@@ -608,6 +608,12 @@ const getAppsLaravelForge = async ({
  * @returns {String} apps.name - name of Fly.io apps
  */
 const getAppsFlyio = async ({ accessToken }: { accessToken: string }) => {
+  interface FlyioApp {
+    id: string;
+    name: string;
+    hostname: string;
+  }
+  
   const query = `
     query($role: String) {
       apps(type: "container", first: 400, role: $role) {
@@ -620,7 +626,7 @@ const getAppsFlyio = async ({ accessToken }: { accessToken: string }) => {
     }
   `;
 
-  const res = (
+  const res: FlyioApp[] = (
     await standardRequest.post(
       INTEGRATION_FLYIO_API_URL,
       {
@@ -639,8 +645,9 @@ const getAppsFlyio = async ({ accessToken }: { accessToken: string }) => {
     )
   ).data.data.apps.nodes;
 
-  const apps = res.map((a: any) => ({
+  const apps = res.map((a: FlyioApp) => ({
     name: a.name,
+    appId: a.id
   }));
 
   return apps;

frontend/src/pages/integrations/flyio/authorize.tsx

@@ -1,10 +1,13 @@
 import { useState } from "react";
+import { Controller, useForm } from "react-hook-form";
 import Head from "next/head";
 import Image from "next/image";
 import Link from "next/link";
 import { useRouter } from "next/router";
 import { faArrowUpRightFromSquare, faBookOpen } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
+import { yupResolver } from "@hookform/resolvers/yup";
+import * as yup from "yup";
 
 import {
   useSaveIntegrationAccessToken
@@ -12,22 +15,34 @@ import {
 
 import { Button, Card, CardTitle, FormControl, Input } from "../../../components/v2";
 
-export default function FlyioCreateIntegrationPage() {
+const schema = yup.object({
+  accessToken: yup.string().trim().required("Fly.io Access Token is required")
+});
+
+type FormData = yup.InferType<typeof schema>;
+
+export default function FlyioAuthorizeIntegrationPage() {
   const router = useRouter();
+
+  const {
+    control,
+    handleSubmit
+  } = useForm<FormData>({
+    resolver: yupResolver(schema),
+    defaultValues: {
+      accessToken: ""
+    }
+  });
+
   const { mutateAsync } = useSaveIntegrationAccessToken();
   
-  const [accessToken, setAccessToken] = useState("");
-  const [accessTokenErrorText, setAccessTokenErrorText] = useState("");
   const [isLoading, setIsLoading] = useState(false);
   
-  const handleButtonClick = async () => {
+  const onFormSubmit = async ({
+    accessToken
+  }: FormData) => {
+    console.log("onFormSubmit accessToken: ", accessToken);
     try {
-      setAccessTokenErrorText("");
-      if (accessToken.length === 0) {
-        setAccessTokenErrorText("Access token cannot be blank");
-        return;
-      }
-
       setIsLoading(true);
       
       const integrationAuth = await mutateAsync({
@@ -37,12 +52,12 @@ export default function FlyioCreateIntegrationPage() {
       });
       
       setIsLoading(false);
-
       router.push(`/integrations/flyio/create?integrationAuthId=${integrationAuth._id}`);
     } catch (err) {
+      setIsLoading(false);
       console.error(err);
     }
-  };
+  }
 
   return (
     <div className="flex h-full w-full items-center justify-center">
@@ -76,30 +91,40 @@ export default function FlyioCreateIntegrationPage() {
             </Link>
           </div>
         </CardTitle>
+        <form
+          onSubmit={handleSubmit(onFormSubmit)}
+          className="px-6 text-right pb-8"
+        >
+          <Controller
+            control={control}
+            name="accessToken"
+            render={({ field, fieldState: { error } }) => (
               <FormControl
                 label="Fly.io Access Token"
-          errorText={accessTokenErrorText}
+                errorText={error?.message}
-          isError={accessTokenErrorText !== "" ?? false}
+                isError={Boolean(error)}
-          className="px-6"
               >
                 <Input 
+                  {...field}
                   placeholder="" 
-            value={accessToken}
-            onChange={(e) => setAccessToken(e.target.value)}
                 />
               </FormControl>
+            )}
+          />
           <Button
-          onClick={handleButtonClick}
             colorSchema="primary"
             variant="outline_bg"
-          className="mb-6 mt-2 ml-auto mr-6 w-min"
+            className="mt-2 w-min"
+            size="sm"
+            type="submit"
             isLoading={isLoading}
           >
             Connect to Fly.io
           </Button>
+        </form>
       </Card>
     </div>
   );
 }
 
-FlyioCreateIntegrationPage.requireAuth = true;
+FlyioAuthorizeIntegrationPage.requireAuth = true;

frontend/src/pages/integrations/flyio/create.tsx

@@ -28,6 +28,7 @@ import { useGetWorkspaceById } from "../../../hooks/api/workspace";
 
 export default function FlyioCreateIntegrationPage() {
   const router = useRouter();
+  
   const { mutateAsync } = useCreateIntegration();
 
   const { integrationAuthId } = queryString.parse(router.asPath.split("?")[1]);

frontend/src/pages/integrations/gitlab/create.tsx

@@ -29,7 +29,8 @@ import {
   Tab,
   TabList,
   TabPanel,
-  Tabs} from "../../../components/v2";
+  Tabs
+} from "../../../components/v2";
 import {
   useGetIntegrationAuthApps,
   useGetIntegrationAuthById,
@@ -229,7 +230,6 @@ export default function GitLabCreateIntegrationPage() {
               animate={{ opacity: 1, translateX: 0 }}
               exit={{ opacity: 0, translateX: 30 }}
             >
-              <div>
               <Controller
                 control={control}
                 name="selectedSourceEnvironment"
@@ -387,7 +387,6 @@ export default function GitLabCreateIntegrationPage() {
                       </FormControl>
                   )}
               />
-              </div>
             </motion.div>
           </TabPanel>
           <TabPanel value={TabSections.Options}>