Merge branch 'develop' into fix/fixed-add-patient-page-structure

SanitasUVG · Jun 7, 2024 · 70e4b62 · 70e4b62
2 parents 3e1aa7e + 90b97d9
commit 70e4b62
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 102 deletions.
diff --git a/sanitas_frontend/package.json b/sanitas_frontend/package.json
@@ -17,7 +17,6 @@
     "axios": "^1.7.2",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "react-icons": "^5.2.1",
     "react-router-dom": "^6.23.1",
     "zustand": "^4.5.2"
   },

diff --git a/sanitas_frontend/src/components/Input/base.jsx b/sanitas_frontend/src/components/Input/base.jsx
@@ -10,6 +10,8 @@ import React from "react";
  * @param {string} [props.placeholder] - A placeholder text shown in the input.
  * @returns {React.Element} The React Input element.
  */
-export default function BaseInput({ type, value, onChange, placeholder }) {
+function BaseInput({ type, value, onChange, placeholder }) {
   return <input type={type} value={value} onChange={onChange} placeholder={placeholder} />;
 }
+
+export default BaseInput;
diff --git a/sanitas_frontend/src/components/Input/date.jsx b/sanitas_frontend/src/components/Input/date.jsx
@@ -9,6 +9,8 @@ import React from "react";
  * @param {string} [props.placeholder] - A placeholder text shown in the date input.
  * @returns {React.Element} The React Date Input element.
  */
-export default function DateInput({ value, onChange, placeholder }) {
+function DateInput({ value, onChange, placeholder }) {
   return <input type="date" value={value} onChange={onChange} placeholder={placeholder} />;
 }
+
+export default DateInput;
diff --git a/sanitas_frontend/src/components/Input/index.jsx b/sanitas_frontend/src/components/Input/index.jsx
@@ -1,6 +1,5 @@
 import BaseInput from "./base.jsx";
 import DateInput from "./date.jsx";
 import RadioInput from "./radio.jsx";
-import SearchInput from "./search.jsx";
 
-export { BaseInput, DateInput, RadioInput, SearchInput };
+export { BaseInput, DateInput, RadioInput };
diff --git a/sanitas_frontend/src/components/Input/radio.jsx b/sanitas_frontend/src/components/Input/radio.jsx
@@ -10,11 +10,13 @@ import React from "react";
  * @param {string} props.label - The label text displayed next to the radio button.
  * @returns {React.Element} A labeled radio button element.
  */
-export default function RadioInput({ name, checked, onChange, label }) {
+function RadioInput({ name, checked, onChange, label }) {
   return (
     <label>
       <input type="radio" name={name} checked={checked} onChange={onChange} />
       {label}
     </label>
   );
 }
+
+export default RadioInput;
diff --git a/sanitas_frontend/src/components/Input/search.jsx b/sanitas_frontend/src/components/Input/search.jsx
diff --git a/sanitas_frontend/src/views/SearchPatientView/index.jsx b/sanitas_frontend/src/views/SearchPatientView/index.jsx
@@ -27,7 +27,6 @@ export default function SearchPatientView({ searchPatientsApiCall, useStore }) {
 
   const [queryReturnedEmpty, setQueryReturnedEmpty] = useState(false);
   const [error, setError] = useState("");
-  const [searchTypeWasCUI, setSearchTypeWasCUI] = useState(false);
   const navigate = useNavigate();
 
   const showErrorMessage = (message) => setError(`ERROR: ${message}`);
@@ -39,23 +38,8 @@ export default function SearchPatientView({ searchPatientsApiCall, useStore }) {
     { value: "Carnet", label: "Carnet Estudiante" },
     { value: "NumeroColaborador", label: "Código Colaborador" },
     { value: "Nombres", label: "Nombres y Apellidos" },
-    { value: "CUI", label: "CUI" },
   ];
 
-  const handleInputChange = (e) => {
-    let value = e.target.value;
-    if (type === "Nombres") {
-      value = value.replace(/\d/g, "");
-    } else if (type != "Nombres") {
-      value = value.replace(/\D/g, "");
-    }
-
-    if (type === "CUI") {
-      value = value.slice(0, 13);
-    }
-    setSearchQuery(value, type);
-  };
-
   const searchBtnClick = async () => {
     hideErrorMessage();
     if (emptyQuery) {
@@ -64,7 +48,6 @@ export default function SearchPatientView({ searchPatientsApiCall, useStore }) {
     }
 
     const result = await searchPatientsApiCall(query, type);
-    setSearchTypeWasCUI(type === "CUI");
     if (result.error) {
       const { error } = result;
       if (error.cause) {
@@ -113,26 +96,20 @@ export default function SearchPatientView({ searchPatientsApiCall, useStore }) {
         <BaseInput
           type="text"
           value={query}
-          onChange={handleInputChange}
+          onChange={(e) => setSearchQuery(e.target.value, type)}
           placeholder="Ingrese su búsqueda..."
         />
         <Button text="Buscar" onClick={searchBtnClick} disabled={emptyQuery} />
       </div>
       <p style={{ color: "red" }}>{error}</p>
       {queryReturnedEmpty
-        && (!searchTypeWasCUI
-          ? (
-            <div>
-              <p>¡Parece que el paciente no existe!</p>
-              <p>Prueba buscarlo por CUI.</p>
-            </div>
-          )
-          : (
-            <div>
-              <p>Ingresa la información del paciente aquí.</p>
-              <Button text="Puedes añadir uno nuevo aquí." onClick={onAddNewPatientClick} />
-            </div>
-          ))}
+        ? (
+          <div>
+            <p>Parece que el paciente no existe!</p>
+            <Button text="Puedes añadir uno nuevo aquí" onClick={onAddNewPatientClick} />
+          </div>
+        )
+        : null}
       <div>
         {...patients.map((p) => (
           <div key={p.id}>

diff --git a/sanitas_frontend/src/views/SearchPatientView/index.test.jsx b/sanitas_frontend/src/views/SearchPatientView/index.test.jsx
@@ -21,7 +21,7 @@ describe("Search Patient view ui tests", () => {
     expect(apiCall).toHaveBeenCalledTimes(0);
   });
 
-  test("On search calls function", async () => {
+  test("On search calls function", () => {
     const apiCall = vi.fn(() => ({
       result: [],
     }));
@@ -36,13 +36,10 @@ describe("Search Patient view ui tests", () => {
     const searchElem = dom.getByPlaceholderText("Ingrese su búsqueda...");
     const searchBtn = dom.getByText("Buscar");
 
-    fireEvent.change(searchElem, { target: { value: "3284834428" } });
+    fireEvent.change(searchElem, { target: { value: "asdflkjlk" } });
     fireEvent.click(searchBtn);
 
-    // Use waitFor to ensure the async call has time to complete
-    await waitFor(() => {
-      expect(apiCall).toHaveBeenCalledOnce();
-    });
+    expect(apiCall).toHaveBeenCalledOnce();
   });
 
   test("Display a button to see patient", async () => {
@@ -65,19 +62,16 @@ describe("Search Patient view ui tests", () => {
     const searchElem = dom.getByPlaceholderText("Ingrese su búsqueda...");
     const searchBtn = dom.getByText("Buscar");
 
-    fireEvent.change(searchElem, { target: { value: "2348234890" } });
+    fireEvent.change(searchElem, { target: { value: "asdflkj" } });
     fireEvent.click(searchBtn);
 
     expect(apiCall).toHaveBeenCalledOnce();
 
     // The function below throws if 0 or 2+ elements are found.
-    await waitFor(
-      () => {
-        expect(dom.getByText("Ver")).toBeVisible();
-      },
-      {
-        timeout: 500,
-      },
-    );
+    await waitFor(() => {
+      expect(dom.getByText("Ver")).toBeVisible();
+    }, {
+      timeout: 500,
+    });
   });
 });