From 1a54bf34ef6db8efe43b011cf1d6ae9d57ff0905 Mon Sep 17 00:00:00 2001
From: Stijn-Kuijper <s.p.kuijper@student.tue.nl>
Date: Mon, 19 Jun 2023 13:58:38 +0200
Subject: [PATCH] feat: fix getApps and create for cloudflare pages integration

---
 backend/src/integrations/apps.ts              |  7 ++--
 .../integrations/cloudflare-pages/create.tsx  | 41 ++++++++++---------
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/backend/src/integrations/apps.ts b/backend/src/integrations/apps.ts
index e359ffa2b..245fd931d 100644
--- a/backend/src/integrations/apps.ts
+++ b/backend/src/integrations/apps.ts
@@ -134,7 +134,7 @@ const getApps = async ({
     case INTEGRATION_CLOUDFLARE_PAGES:
       apps = await getAppsCloudflarePages({
         accessToken,
-        accountId: ''
+        accountId: accessId
       })
       break;
   }
@@ -670,13 +670,12 @@ const getAppsCloudflarePages = async ({
         }
     );
 
-    const apps = data.map((a: any) => {
+    const apps = data.result.map((a: any) => {
         return {
-            name: a["project_name"],
+            name: a.name,
             appId: a.id,
         };
     });
-
     return apps;
 }
 
diff --git a/frontend/src/pages/integrations/cloudflare-pages/create.tsx b/frontend/src/pages/integrations/cloudflare-pages/create.tsx
index 19d4e39b1..d3ba19e37 100644
--- a/frontend/src/pages/integrations/cloudflare-pages/create.tsx
+++ b/frontend/src/pages/integrations/cloudflare-pages/create.tsx
@@ -57,7 +57,8 @@ export default function CloudflarePagesIntegrationPage() {
                 targetServiceId: null,
                 owner: null,
                 path: null,
-                region: null
+                region: null,
+                secretPath: '/',
             });
 
             setIsLoading(false);
@@ -82,14 +83,14 @@ export default function CloudflarePagesIntegrationPage() {
                         onValueChange={(val) => setSelectedSourceEnvironment(val)}
                         className="w-full border border-mineshaft-500"
                     >
-                        {workspace?.environments.map((sourceEnvironment) => {
-                            <SelectItem
-                                value={sourceEnvironment.slug}
-                                key={`sourcce-environment-${sourceEnvironment.slug}`}
-                            >
-                                {sourceEnvironment.name}
-                            </SelectItem>
-                        })}
+                        {workspace?.environments.map((sourceEnvironment) => (
+                        <SelectItem
+                            value={sourceEnvironment.slug}
+                            key={`source-environment-${sourceEnvironment.slug}`}
+                        >
+                            {sourceEnvironment.name}
+                        </SelectItem>
+                        ))}
                     </Select>
                 </FormControl>
                 <FormControl label="Cloudflare Pages Project" className="mt-4 px-6">
@@ -100,18 +101,18 @@ export default function CloudflarePagesIntegrationPage() {
                         isDisabled={integrationAuthApps.length === 0}
                     >
                         {integrationAuthApps.length > 0 ? (
-                            integrationAuthApps.map((integrationAuthApp) => {
-                                <SelectItem
-                                    value={integrationAuthApp.name}
-                                    key={`target-app-${integrationAuthApp.name}`}
-                                >
-                                    {integrationAuthApp.name}
-                                </SelectItem>
-                            })
-                        ) : (
-                            <SelectItem value="none" key="target-app-none">
-                                No projects found
+                        integrationAuthApps.map((integrationAuthApp) => (
+                            <SelectItem
+                            value={integrationAuthApp.name}
+                            key={`target-app-${integrationAuthApp.name}`}
+                            >
+                            {integrationAuthApp.name}
                             </SelectItem>
+                        ))
+                        ) : (
+                        <SelectItem value="none" key="target-app-none">
+                            No apps found
+                        </SelectItem>
                         )}
                     </Select>
                 </FormControl>