From 6eff067c987b9544d4aa54875d4814b71d17caf1 Mon Sep 17 00:00:00 2001 From: Tim Asp <707699+timothyasp@users.noreply.github.com> Date: Mon, 12 Jun 2023 21:46:36 -0700 Subject: [PATCH] Fix small react and JS errors (#40) * Fix react html console errors * Fix bug where clicking expand on empty directory throws error --- frontend/src/components/Modals/Keys.jsx | 34 +++++++++---------- .../Modals/MangeWorkspace/index.jsx | 9 ++--- 2 files changed, 22 insertions(+), 21 deletions(-) diff --git a/frontend/src/components/Modals/Keys.jsx b/frontend/src/components/Modals/Keys.jsx index cffd40a8..c4c8a519 100644 --- a/frontend/src/components/Modals/Keys.jsx +++ b/frontend/src/components/Modals/Keys.jsx @@ -17,27 +17,27 @@ export default function KeysModal({ hideModal = noop }) { }, []); return ( -
+
-
-
-
-

+
+
+
+

Your System Settings

-
+
{loading ? (

@@ -100,11 +100,11 @@ export default function KeysModal({ hideModal = noop }) {

)}
-
+
@@ -120,8 +120,8 @@ function ShowKey({ name, value, valid }) { return (
@@ -129,11 +129,11 @@ function ShowKey({ name, value, valid }) { type="text" id="error" disabled={true} - class="bg-red-50 border border-red-500 text-red-900 placeholder-red-700 text-sm rounded-lg focus:ring-red-500 dark:bg-gray-700 focus:border-red-500 block w-full p-2.5 dark:text-red-500 dark:placeholder-red-500 dark:border-red-500" + className="bg-red-50 border border-red-500 text-red-900 placeholder-red-700 text-sm rounded-lg focus:ring-red-500 dark:bg-gray-700 focus:border-red-500 block w-full p-2.5 dark:text-red-500 dark:placeholder-red-500 dark:border-red-500" placeholder={name} defaultValue={value} /> -

+

Need setup in .env file.

@@ -141,10 +141,10 @@ function ShowKey({ name, value, valid }) { } return ( -
+
@@ -152,7 +152,7 @@ function ShowKey({ name, value, valid }) { type="text" id="success" disabled={true} - class="border border-white text-green-900 dark:text-green-400 placeholder-green-700 dark:placeholder-green-500 text-sm rounded-lg focus:ring-green-500 focus:border-green-500 block w-full p-2.5 dark:bg-gray-700 dark:border-green-500" + className="border border-white text-green-900 dark:text-green-400 placeholder-green-700 dark:placeholder-green-500 text-sm rounded-lg focus:ring-green-500 focus:border-green-500 block w-full p-2.5 dark:bg-gray-700 dark:border-green-500" defaultValue={value} />
diff --git a/frontend/src/components/Modals/MangeWorkspace/index.jsx b/frontend/src/components/Modals/MangeWorkspace/index.jsx index 675e622e..39f93c0e 100644 --- a/frontend/src/components/Modals/MangeWorkspace/index.jsx +++ b/frontend/src/components/Modals/MangeWorkspace/index.jsx @@ -119,10 +119,11 @@ export default function ManageWorkspace({ hideModal = noop, workspace }) { setSelectFiles([...new Set(updatedDocs)]); } else { var newDocs = []; - if (isFolder) { - const folderItems = directories.items.find( - (item) => item.name === parent - ).items; + var parentDirs = directories.items.find( + (item) => item.name === parent + ) + if (isFolder && parentDirs) { + const folderItems = parentDirs.items; newDocs = folderItems.map((item) => parent + "/" + item.name); } else { newDocs = [filepath];