From 9debdc422f7ec676c382aa69b48cdeeb18cfbe5c Mon Sep 17 00:00:00 2001
From: mbecker20 <becker.maxh@gmail.com>
Date: Thu, 31 Mar 2022 02:45:24 -0700
Subject: [PATCH] build, deploy, add server working

---
 core/src/config.ts                            |  2 +-
 core/src/messages/builds/index.ts             | 10 +++++---
 frontend/src/components/builds/Actions.tsx    | 23 +++++++++++++------
 .../components/server/tabs/config/Address.tsx |  2 +-
 frontend/src/state/actions.ts                 |  4 ++--
 5 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/core/src/config.ts b/core/src/config.ts
index ca24ac5ea..6c6e38c77 100644
--- a/core/src/config.ts
+++ b/core/src/config.ts
@@ -11,7 +11,7 @@ export const CORE_SERVER_NAME = getStringFromEnv(
   "Monitor Core"
 );
 export const SECRETS = readJSONFile("/secrets/secrets.json") as CoreSecrets;
-export const LOGGER = getBooleanFromEnv("LOGGER", true);
+export const LOGGER = getBooleanFromEnv("LOGGER", false);
 export const PORT = getNumberFromEnv("PORT", 9000);
 export const HOST = getStringFromEnv("HOST", "http://localhost:" + PORT);
 export const MONGO_URL = getStringFromEnv(
diff --git a/core/src/messages/builds/index.ts b/core/src/messages/builds/index.ts
index 6bfaa0544..b8723c9ae 100644
--- a/core/src/messages/builds/index.ts
+++ b/core/src/messages/builds/index.ts
@@ -10,6 +10,7 @@ import {
 import { FastifyInstance } from "fastify";
 import { remove } from "fs-extra";
 import { WebSocket } from "ws";
+import { join } from "path";
 import { BUILD_REPO_PATH } from "../../config";
 import { sendAlert } from "../../util/helpers";
 import build from "./build";
@@ -61,10 +62,13 @@ async function buildMessages(
           sendAlert(client, "bad", "could not find build");
           return true;
         }
-        await remove(BUILD_REPO_PATH + build.pullName).catch();
+        await remove(join(BUILD_REPO_PATH, build.pullName!)).catch();
         if (build.repo) {
-          app.broadcast(CLONE_BUILD_REPO, { buildID: message.buildID, complete: false });
-          app.buildActionStates.set(message.buildID, "cloning", true)
+          app.broadcast(CLONE_BUILD_REPO, {
+            buildID: message.buildID,
+            complete: false,
+          });
+          app.buildActionStates.set(message.buildID, "cloning", true);
           await cloneRepo(app, user, build);
           app.buildActionStates.set(message.buildID, "cloning", false);
           app.broadcast(CLONE_BUILD_REPO, {
diff --git a/frontend/src/components/builds/Actions.tsx b/frontend/src/components/builds/Actions.tsx
index 255c24e31..811f1df68 100644
--- a/frontend/src/components/builds/Actions.tsx
+++ b/frontend/src/components/builds/Actions.tsx
@@ -64,14 +64,23 @@ const Actions: Component<{}> = (p) => {
         </Flex>
         <Flex class={combineClasses(s.Action, "shadow")}>
           clone{" "}
-          <ConfirmButton
-            color="orange"
-            onConfirm={() => {
-              ws.send(CLONE_BUILD_REPO, { buildID: selected.id() });
-            }}
+          <Show
+            when={!actions.cloning}
+            fallback={
+              <button class="orange">
+                <Loading type="spinner" />
+              </button>
+            }
           >
-            <Icon type="arrow-down" />
-          </ConfirmButton>
+            <ConfirmButton
+              color="orange"
+              onConfirm={() => {
+                ws.send(CLONE_BUILD_REPO, { buildID: selected.id() });
+              }}
+            >
+              <Icon type="arrow-down" />
+            </ConfirmButton>
+          </Show>
         </Flex>
       </Grid>
     </Show>
diff --git a/frontend/src/components/server/tabs/config/Address.tsx b/frontend/src/components/server/tabs/config/Address.tsx
index 173f72efd..a1fb87633 100644
--- a/frontend/src/components/server/tabs/config/Address.tsx
+++ b/frontend/src/components/server/tabs/config/Address.tsx
@@ -16,7 +16,7 @@ const Address: Component<{}> = (p) => {
       <Input
         value={server.address}
         placeholder="address"
-        onConfirm={(value) => setServer("address", value)}
+        onEdit={(value) => setServer("address", value)}
 				style={{ width: "13rem" }}
       />
     </Flex>
diff --git a/frontend/src/state/actions.ts b/frontend/src/state/actions.ts
index bb605beb3..091d9ac85 100644
--- a/frontend/src/state/actions.ts
+++ b/frontend/src/state/actions.ts
@@ -4,7 +4,7 @@ export const DELETE_BUILD = "DELETE_BUILD";
 export const UPDATE_BUILD = "UPDATE_BUILD";
 export const PULL = "PULL";
 export const BUILD = "BUILD";
-export const CLONE_BUILD_REPO = "CLONE_REPO";
+export const CLONE_BUILD_REPO = "CLONE_BUILD_REPO";
 
 /* DEPLOY */
 export const CREATE_DEPLOYMENT = "CREATE_DEPLOYMENT";
@@ -16,7 +16,7 @@ export const STOP_CONTAINER = "STOP_CONTAINER";
 export const DELETE_CONTAINER = "DELETE_CONTAINER";
 export const REFRESH_CONTAINER_STATUS = "REFRESH_CONTAINER_STATUS";
 export const COPY_ENV = "COPY_ENV";
-export const CLONE_DEPLOYMENT_REPO = "CLONE_REPO";
+export const CLONE_DEPLOYMENT_REPO = "CLONE_DEPLOYMENT_REPO";
 
 /* SERVER */
 export const ADD_SERVER = "ADD_SERVER";