From b5c6f9caca6ca0c6a5000aa25882fbc9ef9e1183 Mon Sep 17 00:00:00 2001
From: Araozu <faraoz@unsa.edu.pe>
Date: Wed, 4 Oct 2023 07:29:36 -0500
Subject: [PATCH] [FE] Fix error display for person search

---
 backend/src/model/person.rs            | 11 -----------
 frontend/src/OnlineClassroom/index.tsx |  6 ++++--
 frontend/src/certs/Search/index.tsx    | 23 +++++++++++++----------
 3 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/backend/src/model/person.rs b/backend/src/model/person.rs
index bd8afba..9629054 100644
--- a/backend/src/model/person.rs
+++ b/backend/src/model/person.rs
@@ -27,17 +27,6 @@ pub struct Person {
 }
 
 impl Person {
-    pub fn default() -> Person {
-        Person {
-            person_id: -1,
-            person_dni: "".to_string(),
-            person_names: "".to_string(),
-            person_paternal_surname: "".to_string(),
-            person_maternal_surname: "".to_string(),
-            person_classroom_id: None,
-        }
-    }
-
     pub async fn get_by_dni(dni: i32) -> Result<Person, sqlx::Error> {
         let db = db();
 
diff --git a/frontend/src/OnlineClassroom/index.tsx b/frontend/src/OnlineClassroom/index.tsx
index fe78d12..fd2e97d 100644
--- a/frontend/src/OnlineClassroom/index.tsx
+++ b/frontend/src/OnlineClassroom/index.tsx
@@ -22,7 +22,9 @@ export function OnlineClassroom() {
                     />
                 </Show>
                 <Show when={person() !== null && person()!.person_classroom_id !== null}>
-                    <p>Person has classroom_id</p>
+                    <p>
+                        Esta persona tiene un usuario en el aula virtual.
+                    </p>
                 </Show>
 
             </div>
@@ -71,7 +73,7 @@ function ClassroomTabs(props: {active: TabType, setActive: (v: TabType) => void}
                 class={`py-2 border-b-4 ${presetsClasses()}`}
                 onclick={() => props.setActive("Vinculate")}
             >
-                Vincular
+                Buscar
             </button>
             <button
                 class={`py-2 border-b-4 ${manualClasses()}`}
diff --git a/frontend/src/certs/Search/index.tsx b/frontend/src/certs/Search/index.tsx
index abe4314..fd5050e 100644
--- a/frontend/src/certs/Search/index.tsx
+++ b/frontend/src/certs/Search/index.tsx
@@ -9,6 +9,7 @@ import { PersonRegister } from "./PersonRegister";
 import { backend, wait } from "../../utils/functions";
 import { JsonResult } from "../../types/JsonResult";
 import { LoadingIcon } from "../../icons/LoadingIcon";
+import { AxiosError } from "axios";
 
 type HTMLButtonEvent = JSX.EventHandlerUnion<HTMLButtonElement, MouseEvent>;
 
@@ -50,6 +51,7 @@ export function Search(props: {setPerson: (p: Person | null) => void}) {
     const search = async() => {
         setLoading(true);
         setError("");
+        setManualCreate(false);
 
         if (import.meta.env.DEV) await wait(1500);
 
@@ -58,21 +60,22 @@ export function Search(props: {setPerson: (p: Person | null) => void}) {
                 if (response.status === 200) {
                     setPerson(response.data.Ok);
                     props.setPerson(response.data.Ok);
-                    setManualCreate(false);
-                } else if (response.status === 404) {
-                    console.error(response.data);
-
-                    setError("No encontrado. Ingresar datos manualmente.");
-                    setManualCreate(true);
-                    props.setPerson(null);
                 } else {
                     setError(response.data.Err.reason);
                     setManualCreate(false);
                 }
             })
-            .catch((err) => {
-                setError(`Error fatal: ${err.message}`);
-                console.error(err);
+            .catch((err: AxiosError<JsonResult<Person>>) => {
+                if (err.response?.status === 404) {
+                    console.error(err.response.data);
+
+                    setError("No encontrado. Ingresar datos manualmente.");
+                    setManualCreate(true);
+                    props.setPerson(null);
+                } else {
+                    setError(`Error fatal: ${err.message}`);
+                    console.error(err.response?.status);
+                }
             })
             .finally(() => {
                 setLoading(false);