From b24097d633708390dca188ac1160e040bf9afa8b Mon Sep 17 00:00:00 2001
From: Kenneth Chen <efeichen@gmail.com>
Date: Sat, 22 Apr 2023 15:02:18 -0400
Subject: [PATCH 1/2] Simplify org menu search logic

---
 client/src/components/LoginModal/index.tsx | 26 ++++------------------
 1 file changed, 4 insertions(+), 22 deletions(-)

diff --git a/client/src/components/LoginModal/index.tsx b/client/src/components/LoginModal/index.tsx
index 6fcb096a..4476e194 100644
--- a/client/src/components/LoginModal/index.tsx
+++ b/client/src/components/LoginModal/index.tsx
@@ -21,26 +21,7 @@ const LoginModal = () => {
     })();
   }, []);
 
-  useEffect(() => {
-    console.log(selectedOrg);
-  }, [selectedOrg]);
-
-  function searchOrg(value: string) {
-    if (orgs.length > 0) {
-      const find = orgs.find((i: any) =>
-        query.localeCompare(i.name, undefined, { sensitivity: 'accent' })
-      );
-      if (find) {
-        setSelectedOrg(find.name);
-        setQuery(find.name);
-      } else {
-        setQuery(value);
-      }
-    }
-  }
-
   function onLogin() {
-    console.log(pwd);
     if (selectedOrg) {
       fetch('/api/auth/login', {
         method: 'POST',
@@ -56,6 +37,7 @@ const LoginModal = () => {
       });
     }
   }
+
   const filteredOrgs =
     query === ''
       ? orgs
@@ -72,7 +54,7 @@ const LoginModal = () => {
           className="w-[50px] my-6"
           src="/images/projectpeach.png"
           alt="Project Peach Logo"
-        ></img>
+        />
         <h1 className="text-2xl text-center mb-9">Organization Login</h1>
       </div>
       <div className="flex flex-col w-full">
@@ -86,7 +68,7 @@ const LoginModal = () => {
           </Combobox.Label>
           <div className="relative flex items-center w-full border bg-slate-50 border-slate-300 rounded-xs ">
             <Combobox.Input
-              onChange={(event) => searchOrg(event.target.value)}
+              onChange={(event) => setQuery(event.target.value)}
               placeholder="select your organization"
               className="border-0  pl-3 py-1 rounded-xs bg-transparent flex-grow focus:bg-slate-50 focus:ring-inset focus:ring-[1px] ring-offset-0 "
             />
@@ -141,7 +123,7 @@ const LoginModal = () => {
           onChange={(event) => setPwd(event.target.value)}
           className="input w-full px-4 py-2"
           placeholder="Organization password"
-        ></input>
+        />
         <button
           type="button"
           onClick={onLogin}

From 2ee0cb9be983cff9e4fe3c84dc6b529934a4e6ff Mon Sep 17 00:00:00 2001
From: Kenneth Chen <efeichen@gmail.com>
Date: Sat, 22 Apr 2023 15:51:54 -0400
Subject: [PATCH 2/2] Remove dropdown if no results is found

---
 client/src/components/LoginModal/index.tsx | 43 ++++++++++++----------
 1 file changed, 23 insertions(+), 20 deletions(-)

diff --git a/client/src/components/LoginModal/index.tsx b/client/src/components/LoginModal/index.tsx
index 4476e194..c6e1ba58 100644
--- a/client/src/components/LoginModal/index.tsx
+++ b/client/src/components/LoginModal/index.tsx
@@ -79,26 +79,29 @@ const LoginModal = () => {
             >
               <Icon type="chevron-down" size="sm" />
             </Combobox.Button>
-            <Combobox.Options className="absolute z-50 w-full p-3 mt-1 font-medium border rounded-xs top-full bg-slate-50 border-slate-300">
-              {filteredOrgs
-                .sort((a, b) => a.name.localeCompare(b.name))
-                .map((org, index) => (
-                  <Combobox.Option key={index} value={org.name} as={Fragment}>
-                    {({ active, selected }) => (
-                      <li
-                        className={`flex cursor-pointer items-center border justify-between rounded-2xs px-3 py-1 gap-x-1 ${
-                          active
-                            ? 'bg-blue-100 border-blue-200'
-                            : 'border-transparent'
-                        } ${selected ? 'text-blue-900  font-bold' : ''}`}
-                      >
-                        {org.name}
-                        {selected && <Icon type="check" size="sm" />}
-                      </li>
-                    )}
-                  </Combobox.Option>
-                ))}
-            </Combobox.Options>
+
+            {filteredOrgs.length !== 0 && (
+              <Combobox.Options className="absolute z-50 w-full p-3 mt-1 font-medium border rounded-xs top-full bg-slate-50 border-slate-300">
+                {filteredOrgs
+                  .sort((a, b) => a.name.localeCompare(b.name))
+                  .map((org, index) => (
+                    <Combobox.Option key={index} value={org.name} as={Fragment}>
+                      {({ active, selected }) => (
+                        <li
+                          className={`flex cursor-pointer items-center border justify-between rounded-2xs px-3 py-1 gap-x-1 ${
+                            active
+                              ? 'bg-blue-100 border-blue-200'
+                              : 'border-transparent'
+                          } ${selected ? 'text-blue-900  font-bold' : ''}`}
+                        >
+                          {org.name}
+                          {selected && <Icon type="check" size="sm" />}
+                        </li>
+                      )}
+                    </Combobox.Option>
+                  ))}
+              </Combobox.Options>
+            )}
           </div>
         </Combobox>