Merge pull request #7821 from coronasafe/develop

Merge Develop to Staging v24.21.0

Dockerfile

@@ -9,7 +9,7 @@ RUN if [ "$(uname -m)" = "aarch64" ] || [ "$(uname -m)" = "arm64" ]; then apt-ge
 
 COPY package.json package-lock.json ./
 
-RUN npm install --legacy-peer-deps
+RUN npm install
 
 COPY . .
 

README.md

@@ -34,7 +34,7 @@
 #### Install the required dependencies
 
 ```sh
-npm install --legacy-peer-deps
+npm install
 ```
 
 #### 🏃 Run the app in development mode

cypress/e2e/facility_spec/facility_manage.cy.ts

@@ -90,6 +90,7 @@ describe("Facility Manage Functions", () => {
     facilityManage.clickButtonWithText(facilityHfridUpdateButton);
     facilityManage.verifySuccessMessageVisibilityAndContent(
       facilityHfridToastNotificationText,
+      true,
     );
     // update the existing middleware
     facilityPage.clickManageFacilityDropdown();
@@ -98,6 +99,7 @@ describe("Facility Manage Functions", () => {
     facilityManage.clickButtonWithText(facilityHfridUpdateButton);
     facilityManage.verifySuccessMessageVisibilityAndContent(
       facilityHfridToastNotificationText,
+      true,
     );
     // verify its reflection
     facilityPage.clickManageFacilityDropdown();
@@ -108,26 +110,26 @@ describe("Facility Manage Functions", () => {
   it("Modify doctor capacity in Facility detail page", () => {
     // Add a doctor capacity
     facilityManage.clickFacilityAddDoctorTypeButton();
-    facilityPage.selectAreaOfSpecialization("General Medicine");
+    facilityPage.selectAreaOfSpecialization("Pulmonology");
     facilityPage.fillDoctorCount(doctorCapacity);
     facilityPage.saveAndExitDoctorForm();
     facilityManage.verifySuccessMessageVisibilityAndContent(
-      "Doctor count added successfully",
+      "Staff count added successfully",
     );
     facilityManage.verifyTotalDoctorCapacity(doctorCapacity);
     // edit a existing doctor
     facilityManage.clickEditFacilityDoctorCapacity();
     facilityPage.fillDoctorCount(doctorModifiedCapacity);
     facilityPage.clickdoctorcapacityaddmore();
     facilityManage.verifySuccessMessageVisibilityAndContent(
-      "Doctor count updated successfully",
+      "Staff count updated successfully",
     );
     facilityManage.verifyTotalDoctorCapacity(doctorModifiedCapacity);
     // delete a bed
     facilityManage.clickDeleteFacilityDoctorCapacity();
     facilityManage.clickButtonWithText("Delete");
     facilityManage.verifySuccessMessageVisibilityAndContent(
-      "Doctor specialization type deleted successfully",
+      "Staff specialization type deleted successfully",
     );
   });
 

cypress/e2e/patient_spec/patient_logupdate.cy.ts

@@ -62,19 +62,6 @@ describe("Patient Log Update in Normal, Critical and TeleIcu", () => {
     cy.verifyNotification(
       "Telemedicine Log Updates details created successfully",
     );
-    // verify the copied previous value
-    cy.closeNotification();
-    patientLogupdate.clickLogupdate();
-    patientLogupdate.clickCopyPreviousValue();
-    patientLogupdate.selectPatientCategory(patientCategory);
-    cy.submitButton("Save");
-    cy.closeNotification();
-    cy.verifyContentPresence("#physical_examination_info", [
-      physicalExamination,
-    ]);
-    cy.verifyContentPresence("#rhythm_detail", [patientRhythm]);
-    cy.submitButton("Continue");
-    cy.verifyNotification("Normal Log Updates details updated successfully");
   });
 
   it("Create a new log normal update for a domicilary care patient and edit it", () => {

cypress/e2e/patient_spec/patient_manage.cy.ts

@@ -35,7 +35,7 @@ describe("Patient", () => {
   // });
   // commented out the shifting request, as logic need to be re-visited
 
-  it("Post doctor notes for an already created patient", () => {
+  it("Post discussion notes for an already created patient", () => {
     patientPage.visitPatient("Dummy Patient 3");
     patientConsultationPage.visitDoctorNotesPage();
     patientConsultationPage.addDoctorsNotes("Test Doctor Notes");

cypress/e2e/resource_spec/resources.cy.ts

@@ -53,11 +53,11 @@ describe("Resource Page", () => {
       "Dummy",
       "Test title",
       "10",
-      "Test description"
+      "Test description",
     );
     facilityPage.clickSubmitRequestButton();
     facilityPage.verifySuccessNotification(
-      "Resource request created successfully"
+      "Resource request created successfully",
     );
     facilityPage.verifyresourcenewurl();
     cy.url().then((url) => {
@@ -71,7 +71,7 @@ describe("Resource Page", () => {
     resourcePage.updateStatus("APPROVED");
     resourcePage.clickSubmitButton();
     resourcePage.verifySuccessNotification(
-      "Resource request updated successfully"
+      "Resource request updated successfully",
     );
   });
 

cypress/pageobject/Facility/FacilityManage.ts

@@ -71,8 +71,12 @@ class FacilityManage {
     cy.get("#hf_id").click().clear().click().type(address);
   }
 
-  verifySuccessMessageVisibilityAndContent(text) {
-    cy.get(".pnotify-text").should("be.visible").contains(text);
+  verifySuccessMessageVisibilityAndContent(text, isRegex = false) {
+    if (isRegex) {
+      cy.get(".pnotify-text").should("be.visible").contains(text);
+    } else {
+      cy.get(".pnotify-text").should("be.visible").and("contain.text", text);
+    }
   }
 
   verifyMiddlewareAddressValue(expectedValue) {

cypress/pageobject/Patient/PatientLogupdate.ts

@@ -84,9 +84,5 @@ class PatientLogupdate {
     cy.get("#consultation_tab_nav").scrollIntoView();
     cy.verifyAndClickElement("#consultation_tab_nav", "Vitals");
   }
-
-  clickCopyPreviousValue() {
-    cy.get("#clone_last").click();
-  }
 }
 export default PatientLogupdate;