From 46bd70291e41b29cc693ce0ba331df3596b05e02 Mon Sep 17 00:00:00 2001
From: timothycarambat <rambat1010@gmail.com>
Date: Mon, 2 Oct 2023 12:33:02 -0700
Subject: [PATCH] modal overflow

---
 .../Sidebar/CreateOrganizationModal/index.tsx        |  4 ++--
 frontend/src/components/Sidebar/index.tsx            |  4 +++-
 frontend/src/pages/Dashboard/Connector/index.tsx     | 12 ++++++------
 .../WorkspacesList/CreateWorkspaceModal/index.tsx    |  4 ++--
 .../src/pages/WorkspaceDashboard/Connector/index.tsx |  8 ++++----
 5 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/frontend/src/components/Sidebar/CreateOrganizationModal/index.tsx b/frontend/src/components/Sidebar/CreateOrganizationModal/index.tsx
index e323de7..4ae4bdc 100644
--- a/frontend/src/components/Sidebar/CreateOrganizationModal/index.tsx
+++ b/frontend/src/components/Sidebar/CreateOrganizationModal/index.tsx
@@ -19,8 +19,8 @@ export default function CreateOrganizationModal() {
 
   return (
     <dialog id="organization-creation-modal" className="w-1/3 rounded-lg">
-      <div className="w-full rounded-sm bg-white p-[20px] dark:border-strokedark dark:bg-boxdark">
-        <div className="px-6.5 py-4 dark:border-strokedark">
+      <div className="w-full overflow-y-scroll rounded-sm bg-white p-[20px]">
+        <div className="px-6.5 py-4">
           <h3 className="font-medium text-black dark:text-white">
             Create a New Organization
           </h3>
diff --git a/frontend/src/components/Sidebar/index.tsx b/frontend/src/components/Sidebar/index.tsx
index bc27b25..de56813 100644
--- a/frontend/src/components/Sidebar/index.tsx
+++ b/frontend/src/components/Sidebar/index.tsx
@@ -329,7 +329,9 @@ export default function Sidebar({
                             to={paths.organizationSettings(organization)}
                             className={`group relative flex items-center gap-2.5 rounded-sm px-4 py-2 font-medium text-bodydark1 duration-300 ease-in-out hover:bg-graydark dark:hover:bg-meta-4 ${
                               (pathname === '/' ||
-                                pathname.includes('settings')) &&
+                                pathname.includes(
+                                  `${organization?.slug}/settings`
+                                )) &&
                               'bg-graydark dark:bg-meta-4'
                             }`}
                           >
diff --git a/frontend/src/pages/Dashboard/Connector/index.tsx b/frontend/src/pages/Dashboard/Connector/index.tsx
index c02fd56..096d8ea 100644
--- a/frontend/src/pages/Dashboard/Connector/index.tsx
+++ b/frontend/src/pages/Dashboard/Connector/index.tsx
@@ -210,8 +210,8 @@ const NewConnectorModal = ({
         event.target == event.currentTarget && event.currentTarget?.close()
       }
     >
-      <div className="rounded-sm bg-white p-[20px] dark:border-strokedark dark:bg-boxdark">
-        <div className="px-6.5 py-4 dark:border-strokedark">
+      <div className="overflow-y-scroll rounded-sm bg-white p-[20px]">
+        <div className="px-6.5 py-4">
           <h3 className="font-medium text-black dark:text-white">
             Connect to Vector Database
           </h3>
@@ -634,8 +634,8 @@ const UpdateConnectorModal = ({
         event.target == event.currentTarget && event.currentTarget?.close()
       }
     >
-      <div className="rounded-sm bg-white p-[20px] dark:border-strokedark dark:bg-boxdark">
-        <div className="px-6.5 py-4 dark:border-strokedark">
+      <div className="overflow-y-scroll rounded-sm bg-white p-[20px]">
+        <div className="px-6.5 py-4">
           <h3 className="font-medium text-black dark:text-white">
             Update Vector Database Connection
           </h3>
@@ -1044,8 +1044,8 @@ const SyncConnectorModal = ({
         event.target == event.currentTarget && event.currentTarget?.close()
       }
     >
-      <div className="rounded-sm bg-white p-[20px] dark:border-strokedark dark:bg-boxdark">
-        <div className="px-6.5 py-4 dark:border-strokedark">
+      <div className="overflow-y-scroll rounded-sm bg-white p-[20px]">
+        <div className="px-6.5 py-4">
           <h3 className="font-medium text-black dark:text-white">
             Sync Vector Database Connection
           </h3>
diff --git a/frontend/src/pages/Dashboard/WorkspacesList/CreateWorkspaceModal/index.tsx b/frontend/src/pages/Dashboard/WorkspacesList/CreateWorkspaceModal/index.tsx
index 3e342f0..ab009ba 100644
--- a/frontend/src/pages/Dashboard/WorkspacesList/CreateWorkspaceModal/index.tsx
+++ b/frontend/src/pages/Dashboard/WorkspacesList/CreateWorkspaceModal/index.tsx
@@ -181,8 +181,8 @@ export default function CreateWorkspaceModal({
 const ModalWrapper = ({ children }: { children: React.ReactElement }) => {
   return (
     <dialog id="workspace-creation-modal" className="w-1/2 rounded-lg">
-      <div className="rounded-sm bg-white p-[20px] dark:border-strokedark dark:bg-boxdark">
-        <div className="px-6.5 py-4 dark:border-strokedark">
+      <div className="overflow-y-scroll rounded-sm bg-white p-[20px]">
+        <div className="px-6.5 py-4">
           <h3 className="font-medium text-black dark:text-white">
             Create or find a new workspace
           </h3>
diff --git a/frontend/src/pages/WorkspaceDashboard/Connector/index.tsx b/frontend/src/pages/WorkspaceDashboard/Connector/index.tsx
index aa59d77..43edb86 100644
--- a/frontend/src/pages/WorkspaceDashboard/Connector/index.tsx
+++ b/frontend/src/pages/WorkspaceDashboard/Connector/index.tsx
@@ -171,8 +171,8 @@ const NewConnectorModal = ({
         event.target == event.currentTarget && event.currentTarget?.close()
       }
     >
-      <div className="rounded-sm bg-white p-[20px] dark:border-strokedark dark:bg-boxdark">
-        <div className="px-6.5 py-4 dark:border-strokedark">
+      <div className="overflow-y-scroll rounded-sm bg-white p-[20px]">
+        <div className="px-6.5 py-4">
           <h3 className="font-medium text-black dark:text-white">
             Connect to Vector Database
           </h3>
@@ -433,8 +433,8 @@ const SyncConnectorModal = ({
         event.target == event.currentTarget && event.currentTarget?.close()
       }
     >
-      <div className="rounded-sm bg-white p-[20px] dark:border-strokedark dark:bg-boxdark">
-        <div className="px-6.5 py-4 dark:border-strokedark">
+      <div className="overflow-y-scroll rounded-sm bg-white p-[20px]">
+        <div className="px-6.5 py-4">
           <h3 className="font-medium text-black dark:text-white">
             Sync Vector Database Workspace
           </h3>