Merge branch 'develop' into issues/9053/prevent-negative-quantity-and…

…-empty-description

cypress/e2e/assets_spec/AssetHomepage.cy.ts

@@ -1,10 +1,11 @@
-import { AssetSearchPage } from "../../pageobject/Asset/AssetSearch";
-import { AssetQRScanPage } from "../../pageobject/Asset/AssetQRScan";
-import { AssetPagination } from "../../pageobject/Asset/AssetPagination";
-import { AssetFilters } from "../../pageobject/Asset/AssetFilters";
+import { v4 as uuidv4 } from "uuid";
+
 import { AssetPage } from "../../pageobject/Asset/AssetCreation";
+import { AssetFilters } from "../../pageobject/Asset/AssetFilters";
+import { AssetPagination } from "../../pageobject/Asset/AssetPagination";
+import { AssetQRScanPage } from "../../pageobject/Asset/AssetQRScan";
+import { AssetSearchPage } from "../../pageobject/Asset/AssetSearch";
 import LoginPage from "../../pageobject/Login/LoginPage";
-import { v4 as uuidv4 } from "uuid";
 
 describe("Asset Tab", () => {
   const assetSearchPage = new AssetSearchPage();

cypress/e2e/assets_spec/AssetsCreation.cy.ts

@@ -1,7 +1,8 @@
-import { AssetPage } from "../../pageobject/Asset/AssetCreation";
 import { v4 as uuidv4 } from "uuid";
-import LoginPage from "../../pageobject/Login/LoginPage";
+
+import { AssetPage } from "../../pageobject/Asset/AssetCreation";
 import { AssetSearchPage } from "../../pageobject/Asset/AssetSearch";
+import LoginPage from "../../pageobject/Login/LoginPage";
 
 describe("Asset", () => {
   const assetPage = new AssetPage();

cypress/e2e/assets_spec/AssetsManage.cy.ts

@@ -1,8 +1,8 @@
 import { AssetPage } from "../../pageobject/Asset/AssetCreation";
-import LoginPage from "../../pageobject/Login/LoginPage";
+import { AssetFilters } from "../../pageobject/Asset/AssetFilters";
 import { AssetSearchPage } from "../../pageobject/Asset/AssetSearch";
 import FacilityPage from "../../pageobject/Facility/FacilityCreation";
-import { AssetFilters } from "../../pageobject/Asset/AssetFilters";
+import LoginPage from "../../pageobject/Login/LoginPage";
 
 function addDaysToDate(numberOfDays: number) {
   const inputDate = new Date();

cypress/e2e/facility_spec/FacilityCreation.cy.ts

@@ -1,6 +1,6 @@
 import FacilityPage from "../../pageobject/Facility/FacilityCreation";
-import LoginPage from "../../pageobject/Login/LoginPage";
 import FacilityHome from "../../pageobject/Facility/FacilityHome";
+import LoginPage from "../../pageobject/Login/LoginPage";
 import ManageUserPage from "../../pageobject/Users/ManageUserPage";
 import { UserCreationPage } from "../../pageobject/Users/UserCreation";
 

cypress/e2e/facility_spec/FacilityHomepage.cy.ts

@@ -1,11 +1,10 @@
 // FacilityCreation
-
-import LoginPage from "../../pageobject/Login/LoginPage";
+import { AssetPagination } from "../../pageobject/Asset/AssetPagination";
+import FacilityPage from "../../pageobject/Facility/FacilityCreation";
 import FacilityHome from "../../pageobject/Facility/FacilityHome";
+import LoginPage from "../../pageobject/Login/LoginPage";
 import ManageUserPage from "../../pageobject/Users/ManageUserPage";
-import FacilityPage from "../../pageobject/Facility/FacilityCreation";
 import { UserPage } from "../../pageobject/Users/UserSearch";
-import { AssetPagination } from "../../pageobject/Asset/AssetPagination";
 
 describe("Facility Homepage Function", () => {
   const loginPage = new LoginPage();

cypress/e2e/facility_spec/FacilityInventory.cy.ts

@@ -1,6 +1,6 @@
 import FacilityPage from "../../pageobject/Facility/FacilityCreation";
-import LoginPage from "../../pageobject/Login/LoginPage";
 import FacilityHome from "../../pageobject/Facility/FacilityHome";
+import LoginPage from "../../pageobject/Login/LoginPage";
 
 describe("Inventory Management Section", () => {
   const facilityPage = new FacilityPage();

cypress/e2e/facility_spec/FacilityLocation.cy.ts

@@ -1,10 +1,11 @@
+import { v4 as uuidv4 } from "uuid";
+
 import { AssetPage } from "../../pageobject/Asset/AssetCreation";
-import { UserCreationPage } from "../../pageobject/Users/UserCreation";
-import FacilityPage from "../../pageobject/Facility/FacilityCreation";
-import FacilityLocation from "../../pageobject/Facility/FacilityLocation";
 import { AssetPagination } from "../../pageobject/Asset/AssetPagination";
+import FacilityPage from "../../pageobject/Facility/FacilityCreation";
 import FacilityHome from "../../pageobject/Facility/FacilityHome";
-import { v4 as uuidv4 } from "uuid";
+import FacilityLocation from "../../pageobject/Facility/FacilityLocation";
+import { UserCreationPage } from "../../pageobject/Users/UserCreation";
 
 describe("Location Management Section", () => {
   const assetPage = new AssetPage();

cypress/e2e/facility_spec/FacilityManage.cy.ts

@@ -1,8 +1,9 @@
-import LoginPage from "../../pageobject/Login/LoginPage";
-import FacilityManage from "../../pageobject/Facility/FacilityManage";
-import FacilityPage from "../../pageobject/Facility/FacilityCreation";
 import { v4 as uuidv4 } from "uuid";
 
+import FacilityPage from "../../pageobject/Facility/FacilityCreation";
+import FacilityManage from "../../pageobject/Facility/FacilityManage";
+import LoginPage from "../../pageobject/Login/LoginPage";
+
 describe("Facility Manage Functions", () => {
   const loginPage = new LoginPage();
   const facilityManage = new FacilityManage();

cypress/e2e/patient_spec/PatientBedManagement.cy.ts

@@ -1,7 +1,7 @@
 import LoginPage from "../../pageobject/Login/LoginPage";
+import { PatientConsultationPage } from "../../pageobject/Patient/PatientConsultation";
 import { PatientPage } from "../../pageobject/Patient/PatientCreation";
 import PatientLogupdate from "../../pageobject/Patient/PatientLogupdate";
-import { PatientConsultationPage } from "../../pageobject/Patient/PatientConsultation";
 
 describe("Patient swtich bed functionality", () => {
   const loginPage = new LoginPage();

cypress/e2e/patient_spec/PatientConsultationCreation.cy.ts

@@ -1,12 +1,12 @@
 import LoginPage from "../../pageobject/Login/LoginPage";
-import { PatientPage } from "../../pageobject/Patient/PatientCreation";
 import { PatientConsultationPage } from "../../pageobject/Patient/PatientConsultation";
-import PatientPredefined from "../../pageobject/Patient/PatientPredefined";
-import ShiftCreation from "../../pageobject/Shift/ShiftCreation";
-import PatientInvestigation from "../../pageobject/Patient/PatientInvestigation";
-import PatientTreatmentPlan from "../../pageobject/Patient/PatientTreatmentPlan";
+import { PatientPage } from "../../pageobject/Patient/PatientCreation";
 import PatientDeathReport from "../../pageobject/Patient/PatientDeathReport";
+import PatientInvestigation from "../../pageobject/Patient/PatientInvestigation";
+import PatientPredefined from "../../pageobject/Patient/PatientPredefined";
 import PatientPrescription from "../../pageobject/Patient/PatientPrescription";
+import PatientTreatmentPlan from "../../pageobject/Patient/PatientTreatmentPlan";
+import ShiftCreation from "../../pageobject/Shift/ShiftCreation";
 
 describe("Patient Consultation in multiple combination", () => {
   const patientConsultationPage = new PatientConsultationPage();

cypress/e2e/patient_spec/PatientDoctorConnect.cy.ts

@@ -1,4 +1,5 @@
 import { DoctorConnect } from "pageobject/Patient/PatientDoctorConnect";
+
 import LoginPage from "../../pageobject/Login/LoginPage";
 import { PatientPage } from "../../pageobject/Patient/PatientCreation";
 

cypress/e2e/patient_spec/PatientFileUpload.ts

@@ -1,6 +1,7 @@
 import LoginPage from "../../pageobject/Login/LoginPage";
 import { PatientPage } from "../../pageobject/Patient/PatientCreation";
 import { PatientFileUpload } from "../../pageobject/Patient/PatientFileupload";
+
 const loginPage = new LoginPage();
 const patientPage = new PatientPage();
 const patientFileUpload = new PatientFileUpload();

cypress/e2e/patient_spec/PatientLogUpdate.cy.ts

@@ -1,8 +1,8 @@
 import LoginPage from "../../pageobject/Login/LoginPage";
 import { PatientConsultationPage } from "../../pageobject/Patient/PatientConsultation";
 import { PatientPage } from "../../pageobject/Patient/PatientCreation";
-import PatientLogupdate from "../../pageobject/Patient/PatientLogupdate";
 import PatientInvestigation from "../../pageobject/Patient/PatientInvestigation";
+import PatientLogupdate from "../../pageobject/Patient/PatientLogupdate";
 import PatientPrescription from "../../pageobject/Patient/PatientPrescription";
 
 describe("Patient Log Update in Normal, Critical and TeleIcu", () => {

cypress/e2e/patient_spec/PatientPrescription.cy.ts

@@ -1,6 +1,6 @@
-import PatientPrescription from "../../pageobject/Patient/PatientPrescription";
 import LoginPage from "../../pageobject/Login/LoginPage";
 import { PatientPage } from "../../pageobject/Patient/PatientCreation";
+import PatientPrescription from "../../pageobject/Patient/PatientPrescription";
 
 const patientPrescription = new PatientPrescription();
 const loginPage = new LoginPage();

cypress/e2e/patient_spec/PatientRegistration.cy.ts

@@ -1,10 +1,10 @@
+import FacilityPage from "../../pageobject/Facility/FacilityCreation";
 import LoginPage from "../../pageobject/Login/LoginPage";
 import { PatientPage } from "../../pageobject/Patient/PatientCreation";
-import FacilityPage from "../../pageobject/Facility/FacilityCreation";
-import { generatePhoneNumber } from "../../pageobject/utils/constants";
-import PatientTransfer from "../../pageobject/Patient/PatientTransfer";
 import PatientInsurance from "../../pageobject/Patient/PatientInsurance";
 import PatientMedicalHistory from "../../pageobject/Patient/PatientMedicalHistory";
+import PatientTransfer from "../../pageobject/Patient/PatientTransfer";
+import { generatePhoneNumber } from "../../pageobject/utils/constants";
 
 const yearOfBirth = "2001";
 const isHCXEnabled = Cypress.env("ENABLE_HCX");

cypress/e2e/users_spec/UsersCreation.cy.ts

@@ -1,11 +1,11 @@
-import LoginPage from "../../pageobject/Login/LoginPage";
 import { AssetSearchPage } from "../../pageobject/Asset/AssetSearch";
 import FacilityPage from "../../pageobject/Facility/FacilityCreation";
-import { UserPage } from "../../pageobject/Users/UserSearch";
+import LoginPage from "../../pageobject/Login/LoginPage";
 import { UserCreationPage } from "../../pageobject/Users/UserCreation";
+import { UserPage } from "../../pageobject/Users/UserSearch";
 import {
-  generatePhoneNumber,
   generateEmergencyPhoneNumber,
+  generatePhoneNumber,
 } from "../../pageobject/utils/constants";
 
 describe("User Creation", () => {

cypress/e2e/users_spec/UsersManage.cy.ts

@@ -1,7 +1,7 @@
 import LoginPage from "../../pageobject/Login/LoginPage";
-import { UserPage } from "../../pageobject/Users/UserSearch";
 import ManageUserPage from "../../pageobject/Users/ManageUserPage";
 import { UserCreationPage } from "../../pageobject/Users/UserCreation";
+import { UserPage } from "../../pageobject/Users/UserSearch";
 
 describe("Manage User", () => {
   const loginPage = new LoginPage();

cypress/e2e/users_spec/UsersProfile.cy.ts

@@ -1,6 +1,6 @@
 import LoginPage from "../../pageobject/Login/LoginPage";
-import UserProfilePage from "../../pageobject/Users/UserProfilePage";
 import ManageUserPage from "../../pageobject/Users/ManageUserPage";
+import UserProfilePage from "../../pageobject/Users/UserProfilePage";
 
 describe("Manage User Profile", () => {
   const loginPage = new LoginPage();

cypress/pageobject/Patient/PatientPredefined.ts

@@ -1,11 +1,10 @@
 // PatientPredefined.js
-
-import { PatientPage } from "../../pageobject/Patient/PatientCreation";
 import FacilityPage from "../../pageobject/Facility/FacilityCreation";
+import { PatientPage } from "../../pageobject/Patient/PatientCreation";
 import PatientMedicalHistory from "../../pageobject/Patient/PatientMedicalHistory";
 import {
-  generatePhoneNumber,
   generateEmergencyPhoneNumber,
+  generatePhoneNumber,
 } from "../utils/constants";
 
 class PatientPredefined {

cypress/tsconfig.json

@@ -2,9 +2,18 @@
   "compilerOptions": {
     "baseUrl": "./",
     "target": "es5",
-    "lib": ["es5", "dom", "es2015", "es2016", "es2017", "es2018", "es2019", "es2020"],
+    "lib": [
+      "es5",
+      "dom",
+      "es2015",
+      "es2016",
+      "es2017",
+      "es2018",
+      "es2019",
+      "es2020"
+    ],
     "typeRoots": ["./support"],
     "resolveJsonModule": true
   },
-  "include": ["**/*.cy.ts", "support/commands.ts","**/*.ts"],
-}
+  "include": ["**/*.cy.ts", "support/commands.ts", "**/*.ts"]
+}

package.json

@@ -47,7 +47,7 @@
     "prepare": "husky",
     "lint": "eslint ./src",
     "lint-fix": "eslint ./src --fix",
-    "format": "prettier ./src --write",
+    "format": "prettier ./src ./cypress --write",
     "sort-locales": "node ./scripts/sort-locales.js"
   },
   "dependencies": {
@@ -166,12 +166,12 @@
       "eslint --fix",
       "git update-index --again"
     ],
-    "src/Locale/*.json": [
+    "public/locale/*.json": [
       "npm run sort-locales"
     ]
   },
   "engines": {
     "node": ">=22.11.0"
   },
   "packageManager": "[email protected]"
-}
+}

scripts/sort-locales.js

@@ -1,7 +1,7 @@
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const fs = require("fs");
 
-const file = "src/Locale/en.json";
+const file = "public/locale/en.json";
 
 const data = JSON.parse(fs.readFileSync(file, "utf8"));
 

src/components/Common/UserAutocompleteFormField.tsx

@@ -19,6 +19,8 @@ import {
   mergeQueryOptions,
 } from "@/Utils/utils";
 
+import { Avatar } from "./Avatar";
+
 type BaseProps = FormFieldBaseProps<UserBareMinimum> & {
   placeholder?: string;
   userType?: UserRole;
@@ -67,6 +69,16 @@ export default function UserAutocomplete(props: UserSearchProps) {
     }
   }, [loading, field.required, data?.results, props.noResultsError]);
 
+  const getAvatar = (option: UserBareMinimum) => {
+    return (
+      <Avatar
+        className="h-11 w-11 rounded-full"
+        name={formatName(option)}
+        imageUrl={option.read_profile_picture_url}
+      />
+    );
+  };
+
   return (
     <FormField field={field}>
       <Autocomplete
@@ -83,6 +95,7 @@ export default function UserAutocomplete(props: UserSearchProps) {
         )}
         optionLabel={formatName}
         optionIcon={userOnlineDot}
+        optionImage={getAvatar}
         optionDescription={(option) =>
           `${option.user_type} - ${option.username}`
         }