Merge pull request #8651 from ohcnetwork/develop

Merge Develop to Staging v24.40.0 | Patch

cypress/e2e/patient_spec/PatientConsultationCreation.cy.ts

@@ -35,7 +35,7 @@ describe("Patient Consultation in multiple combination", () => {
   const patientWeight = "70";
   const patientHeight = "170";
   const medicineOne = "DOLOLUP";
-  const patientIpNumber = Math.random().toString(36).substring(7);
+  const patientIpNumber = `${Math.floor(Math.random() * 90 + 10)}/${Math.floor(Math.random() * 9000 + 1000)}`;
 
   before(() => {
     loginPage.loginAsDisctrictAdmin();
@@ -94,7 +94,7 @@ describe("Patient Consultation in multiple combination", () => {
     cy.submitButton("Create Consultation");
     // the above submit should fail as IP number is missing
     patientConsultationPage.typePatientNumber(patientIpNumber);
-    patientConsultationPage.selectBed("Dummy Bed 1");
+    patientConsultationPage.selectBed("Dummy Bed 6");
     cy.submitButton("Create Consultation");
     cy.verifyNotification("Consultation created successfully");
     // Below code for the prescription module only present while creating a new consultation

cypress/e2e/patient_spec/PatientPrescription.cy.ts

@@ -5,7 +5,7 @@ import { PatientPage } from "../../pageobject/Patient/PatientCreation";
 const patientPrescription = new PatientPrescription();
 const loginPage = new LoginPage();
 const patientPage = new PatientPage();
-const medicineNameOne = "DOLO";
+const medicineNameOne = "AGCON";
 const medicineNameTwo = "FDEP PLUS";
 const medicineBaseDosage = "4";
 const medicineTargetDosage = "9";

src/Components/Facility/Consultations/BedActivityTimeline.tsx

@@ -1,3 +1,4 @@
+import { useTranslation } from "react-i18next";
 import Chip from "../../../CAREUI/display/Chip";
 import Timeline, {
   TimelineEvent,
@@ -204,6 +205,7 @@ const BedTitleSuffix = ({
   isLastNode?: boolean;
   prevBed?: CurrentBed;
 }) => {
+  const { t } = useTranslation();
   return (
     <div className="flex flex-col">
       <div className="flex gap-x-2">
@@ -215,7 +217,7 @@ const BedTitleSuffix = ({
         {bed.bed_object.id === prevBed?.bed_object.id
           ? "Asset changed in" + " "
           : "Transferred to" + " "}
-        <span className="font-semibold">{`${bed.bed_object.name} (${bed.bed_object.bed_type}) in ${bed.bed_object.location_object?.name}`}</span>
+        <span className="font-semibold">{`${bed.bed_object.name} (${t(bed.bed_object.bed_type!)}) in ${bed.bed_object.location_object?.name}`}</span>
         {bed.end_date === null && (
           <Chip
             text="In Use"

src/Components/Facility/CoverImageEditModal.tsx

@@ -13,7 +13,6 @@ import Webcam from "react-webcam";
 import { FacilityModel } from "./models";
 import useWindowDimensions from "../../Common/hooks/useWindowDimensions";
 import CareIcon from "../../CAREUI/icons/CareIcon";
-import * as Notification from "../../Utils/Notifications.js";
 import { useTranslation } from "react-i18next";
 import { LocalStorageKeys } from "../../Common/constants";
 import DialogModal from "../Common/Dialog";
@@ -130,25 +129,17 @@ const CoverImageEditModal = ({
           "Bearer " + localStorage.getItem(LocalStorageKeys.accessToken),
       },
       async (xhr: XMLHttpRequest) => {
+        setIsProcessing(false);
         if (xhr.status === 200) {
           Success({ msg: "Cover image updated." });
-          setIsProcessing(false);
           setIsCaptureImgBeingUploaded(false);
           await sleep(1000);
           onSave?.();
           closeModal();
-        } else {
-          Notification.Error({
-            msg: "Something went wrong!",
-          });
-          setIsProcessing(false);
         }
       },
       null,
       () => {
-        Notification.Error({
-          msg: "Network Failure. Please check your internet connectivity.",
-        });
         setIsProcessing(false);
       },
     );

src/Components/Files/FileUpload.tsx

@@ -195,6 +195,7 @@ export const FileUpload = (props: FileUploadProps) => {
       "ods",
       "pdf",
     ],
+    allowNameFallback: false,
     onUpload: refetchAll,
   });
 
@@ -259,7 +260,7 @@ export const FileUpload = (props: FileUploadProps) => {
                       </span>
                       <button
                         onClick={fileUpload.clearFiles}
-                        disabled={!!fileUpload.progress}
+                        disabled={fileUpload.uploading}
                         className="text-lg"
                       >
                         <CareIcon icon="l-times" />
@@ -271,8 +272,8 @@ export const FileUpload = (props: FileUploadProps) => {
                       label={t("enter_file_name")}
                       id="upload-file-name"
                       required
-                      value={fileUpload.fileNames[0]}
-                      disabled={!!fileUpload.progress}
+                      value={fileUpload.fileNames[0] || ""}
+                      disabled={fileUpload.uploading}
                       onChange={(e) => fileUpload.setFileName(e.value)}
                       error={fileUpload.error || undefined}
                     />
@@ -281,7 +282,7 @@ export const FileUpload = (props: FileUploadProps) => {
                         onClick={() =>
                           fileUpload.handleFileUpload(associatedId)
                         }
-                        loading={!!fileUpload.progress}
+                        loading={fileUpload.uploading}
                         className="w-full"
                         id="upload_file_button"
                       >
@@ -291,7 +292,7 @@ export const FileUpload = (props: FileUploadProps) => {
                       <ButtonV2
                         variant="danger"
                         onClick={fileUpload.clearFiles}
-                        disabled={!!fileUpload.progress}
+                        disabled={fileUpload.uploading}
                       >
                         <CareIcon icon="l-trash-alt" className="" />
                         {t("discard")}

src/Components/Patient/PatientConsentRecords.tsx

@@ -38,6 +38,7 @@ export default function PatientConsentRecords(props: {
   const fileUpload = useFileUpload({
     type: "CONSENT_RECORD",
     allowedExtensions: ["pdf", "jpg", "jpeg", "png"],
+    allowNameFallback: false,
   });
 
   const fileManager = useFileManager({
@@ -181,7 +182,7 @@ export default function PatientConsentRecords(props: {
           <TextFormField
             name="filename"
             label="File Name"
-            value={fileUpload.fileNames[0]}
+            value={fileUpload.fileNames[0] || ""}
             onChange={(e) => fileUpload.setFileName(e.value)}
           />
           <div className="flex gap-2">
@@ -203,7 +204,7 @@ export default function PatientConsentRecords(props: {
                       handleUpload();
                     }
                   }}
-                  loading={!!fileUpload.progress}
+                  loading={fileUpload.uploading}
                   disabled={
                     newConsent.type === 2 &&
                     newConsent.patient_code_status === 0
@@ -216,7 +217,7 @@ export default function PatientConsentRecords(props: {
                 <ButtonV2
                   variant="danger"
                   onClick={fileUpload.clearFiles}
-                  disabled={!!fileUpload.progress}
+                  disabled={fileUpload.uploading}
                 >
                   <CareIcon icon="l-trash-alt" className="" />
                 </ButtonV2>

src/Components/Users/UserAdd.tsx

@@ -325,7 +325,12 @@ export const UserAdd = (props: UserProps) => {
   }, [state.form.phone_number_is_whatsapp, state.form.phone_number]);
 
   const setFacility = (selected: FacilityModel | FacilityModel[] | null) => {
-    setSelectedFacility(selected as FacilityModel[]);
+    const newSelectedFacilities = selected
+      ? Array.isArray(selected)
+        ? selected
+        : [selected]
+      : [];
+    setSelectedFacility(newSelectedFacilities as FacilityModel[]);
     const form = { ...state.form };
     form.facilities = selected
       ? (selected as FacilityModel[]).map((i) => i.id!)

src/Locale/en/FileUpload.json

@@ -21,6 +21,7 @@
   "file_list_headings__supporting_info": "Supporting Info",
   "file_error__choose_file": "Please choose a file to upload",
   "file_error__file_name": "Please give a name for all files!",
+  "file_error__single_file_name": "Please give a name for the file",
   "change_file": "Change File",
   "file_error__file_size": "Maximum size of files is 100 MB",
   "file_error__file_type": "Invalid file type \".{{extension}}\" Allowed types: {{allowedExtensions}}",

src/Utils/request/uploadFile.ts

@@ -1,5 +1,6 @@
 import { Dispatch, SetStateAction } from "react";
 import { handleUploadPercentage } from "./utils";
+import * as Notification from "../../Utils/Notifications.js";
 
 const uploadFile = (
   url: string,
@@ -19,6 +20,16 @@ const uploadFile = (
 
   xhr.onload = () => {
     onLoad(xhr);
+    if (400 <= xhr.status && xhr.status <= 499) {
+      const error = JSON.parse(xhr.responseText);
+      if (typeof error === "object" && !Array.isArray(error)) {
+        Object.values(error).forEach((msg) => {
+          Notification.Error({ msg: msg || "Something went wrong!" });
+        });
+      } else {
+        Notification.Error({ msg: error || "Something went wrong!" });
+      }
+    }
   };
 
   if (setUploadPercent != null) {
@@ -28,6 +39,9 @@ const uploadFile = (
   }
 
   xhr.onerror = () => {
+    Notification.Error({
+      msg: "Network Failure. Please check your internet connectivity.",
+    });
     onError();
   };
   xhr.send(file);

src/Utils/useFileUpload.tsx

@@ -2,6 +2,7 @@ import {
   ChangeEvent,
   DetailedHTMLProps,
   InputHTMLAttributes,
+  useEffect,
   useState,
 } from "react";
 import {
@@ -24,6 +25,8 @@ export type FileUploadOptions = {
   type: string;
   category?: FileCategory;
   onUpload?: (file: FileUploadModel) => void;
+  // if allowed, will fallback to the name of the file if a seperate filename is not defined.
+  allowNameFallback?: boolean;
 } & (
   | {
       allowedExtensions?: string[];
@@ -54,6 +57,7 @@ export type FileUploadReturn = {
   setFileNames: (names: string[]) => void;
   removeFile: (index: number) => void;
   clearFiles: () => void;
+  uploading: boolean;
 };
 
 // Array of image extensions
@@ -71,13 +75,20 @@ const ExtImage: string[] = [
 export default function useFileUpload(
   options: FileUploadOptions,
 ): FileUploadReturn {
-  const { type, onUpload, category = "UNSPECIFIED", multiple } = options;
+  const {
+    type,
+    onUpload,
+    category = "UNSPECIFIED",
+    multiple,
+    allowNameFallback = true,
+  } = options;
 
   const [uploadFileNames, setUploadFileNames] = useState<string[]>([]);
   const [error, setError] = useState<string | null>(null);
   const [progress, setProgress] = useState<null | number>(null);
   const [cameraModalOpen, setCameraModalOpen] = useState(false);
   const [audioModalOpen, setAudioModalOpen] = useState(false);
+  const [uploading, setUploading] = useState(false);
 
   const [files, setFiles] = useState<File[]>([]);
 
@@ -104,6 +115,11 @@ export default function useFileUpload(
     });
   };
 
+  useEffect(() => {
+    const blanks = Array(files.length).fill("");
+    setUploadFileNames((names) => [...names, ...blanks].slice(0, files.length));
+  }, [files]);
+
   const validateFileUpload = () => {
     if (files.length === 0) {
       setError(t("file_error__choose_file"));
@@ -199,9 +215,14 @@ export default function useFileUpload(
 
     for (const [index, file] of files.entries()) {
       const filename =
-        uploadFileNames[index] === "" && file
+        allowNameFallback && uploadFileNames[index] === "" && file
           ? file.name
           : uploadFileNames[index];
+      if (!filename) {
+        setError(t("file_error__single_file_name"));
+        return;
+      }
+      setUploading(true);
 
       const { data } = await request(routes.createUpload, {
         body: {
@@ -220,6 +241,7 @@ export default function useFileUpload(
       }
     }
 
+    setUploading(false);
     setFiles([]);
     setUploadFileNames([]);
   };
@@ -229,17 +251,15 @@ export default function useFileUpload(
       <CameraCaptureDialog
         show={cameraModalOpen}
         onHide={() => setCameraModalOpen(false)}
-        onCapture={(file, fileName) => {
+        onCapture={(file) => {
           setFiles((prev) => [...prev, file]);
-          setUploadFileNames((prev) => [...prev, fileName]);
         }}
       />
       <AudioCaptureDialog
         show={audioModalOpen}
         onHide={() => setAudioModalOpen(false)}
-        onCapture={(file, fileName) => {
+        onCapture={(file) => {
           setFiles((prev) => [...prev, file]);
-          setUploadFileNames((prev) => [...prev, fileName]);
         }}
         autoRecord
       />
@@ -290,5 +310,6 @@ export default function useFileUpload(
       setFiles([]);
       setUploadFileNames([]);
     },
+    uploading,
   };
 }