From 188ace848e91172f004ee3213a2a4cf7dcd8199a Mon Sep 17 00:00:00 2001
From: Bobby <bofei@mail.com>
Date: Thu, 11 Mar 2021 16:01:31 +1100
Subject: [PATCH] make cloud run trigger url dynamic

---
 www/src/components/ProjectSettings/form.tsx   | 19 ++--------
 www/src/components/ProjectSettings/index.tsx  |  4 +--
 .../components/Table/TableHeader/Sparks.tsx   | 35 ++++++++++++-------
 3 files changed, 27 insertions(+), 31 deletions(-)

diff --git a/www/src/components/ProjectSettings/form.tsx b/www/src/components/ProjectSettings/form.tsx
index f046089c..21c6906e 100644
--- a/www/src/components/ProjectSettings/form.tsx
+++ b/www/src/components/ProjectSettings/form.tsx
@@ -5,23 +5,10 @@ import { FIELDS } from "@antlerengineering/form-builder";
 import HelperText from "../HelperText";
 
 export const settings = () => [
-  { type: FIELDS.heading, label: "Cloud build configuration" },
+  { type: FIELDS.heading, label: "Cloud Run configuration" },
   {
     type: FIELDS.text,
-    name: "cloudBuild.branch",
-    label: "FT Branch",
-    //validation: yup.string().required("Required"),
-  },
-  {
-    type: FIELDS.description,
-    description: (
-      <HelperText>Firetable branch to build cloud functions from</HelperText>
-    ),
-  },
-  {
-    type: FIELDS.text,
-    name: "cloudBuild.triggerId",
-    label: "Trigger Id",
-    //validation: yup.string().required("Required"),
+    name: "cloudrunFTUrl",
+    label: "Cloud Run trigger URL",
   },
 ];
diff --git a/www/src/components/ProjectSettings/index.tsx b/www/src/components/ProjectSettings/index.tsx
index 6b829991..26121c09 100644
--- a/www/src/components/ProjectSettings/index.tsx
+++ b/www/src/components/ProjectSettings/index.tsx
@@ -48,8 +48,8 @@ export default function SettingsDialog({
 
   useEffect(() => {
     if (!settingsDocState.loading) {
-      const cloudBuild = settingsDocState?.doc?.cloudBuild;
-      setForm(cloudBuild ? { cloudBuild } : FORM_EMPTY_STATE);
+      const cloudrunFTUrl = settingsDocState?.doc?.cloudrunFTUrl;
+      setForm({ cloudrunFTUrl });
     }
   }, [settingsDocState.doc, open]);
 
diff --git a/www/src/components/Table/TableHeader/Sparks.tsx b/www/src/components/Table/TableHeader/Sparks.tsx
index 103e6358..550b9032 100644
--- a/www/src/components/Table/TableHeader/Sparks.tsx
+++ b/www/src/components/Table/TableHeader/Sparks.tsx
@@ -4,6 +4,8 @@ import _get from "lodash/get";
 import _find from "lodash/find";
 import _sortBy from "lodash/sortBy";
 import { useConfirmation } from "components/ConfirmationDialog";
+import { useSnackContext } from "contexts/SnackContext";
+import { db } from "../../../firebase";
 
 import {
   makeStyles,
@@ -36,6 +38,7 @@ const useStyles = makeStyles(() =>
 export default function SparksEditor() {
   const classes = useStyles();
   const [open, setOpen] = useState(false);
+  const snack = useSnackContext();
 
   const { tableState, tableActions } = useFiretableContext();
   const snackContext = useContext(SnackContext);
@@ -66,22 +69,28 @@ export default function SparksEditor() {
       confirm: "Deploy",
       cancel: "later",
       handleConfirm: async () => {
+        const settingsDoc = await db.doc("/_FIRETABLE_/settings").get();
+        const cloudrunFTUrl = settingsDoc.get("cloudrunFTUrl");
+        if (!cloudrunFTUrl) {
+          snack.open({
+            message: "You need to configure cloud run FT URL.",
+            severity: "error",
+          });
+        }
+
         const userTokenInfo = await appContext?.currentUser?.getIdTokenResult();
         const userToken = userTokenInfo?.token;
         try {
-          const response = await fetch(
-            "https://helloworld-bobby-vqbitlhmnq-de.a.run.app/",
-            {
-              method: "POST",
-              headers: {
-                "Content-Type": "application/json",
-              },
-              body: JSON.stringify({
-                configPath: tableState?.config.tableConfig.path,
-                token: userToken,
-              }),
-            }
-          );
+          const response = await fetch(cloudrunFTUrl, {
+            method: "POST",
+            headers: {
+              "Content-Type": "application/json",
+            },
+            body: JSON.stringify({
+              configPath: tableState?.config.tableConfig.path,
+              token: userToken,
+            }),
+          });
           const data = await response.json();
           console.log(data);
         } catch (e) {