Merge branch 'develop' into fix-ohcnetwork#7333

.github/workflows/cypress.yaml

@@ -42,16 +42,21 @@ jobs:
           max_attempts: 5
           command: curl -o /dev/null -s -w "%{http_code}\n" http://localhost:9000
           on_retry_command: sleep 5
-      
+
       - name: Determine PR Origin
         id: pr_origin
         run: echo "::set-output name=is_forked::$( echo ${{ github.event.pull_request.head.repo.fork }})"
 
+      - name: Set up Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: "20"
+
       - name: Install dependencies 📦
         run: npm install
 
       - name: Build & Compile rescript files ⚙️
-        run: "npm run build"
+        run: npm run build
 
       - name: Install Specific Chrome Version
         run: |
@@ -117,4 +122,3 @@ jobs:
         with:
           name: cypress-videos
           path: cypress/videos
-

.node-version

@@ -0,0 +1 @@
+v20

Dockerfile

@@ -1,5 +1,5 @@
 #build-stage
-FROM --platform=$BUILDPLATFORM node:18-buster-slim as build-stage
+FROM --platform=$BUILDPLATFORM node:20-buster-slim as build-stage
 
 WORKDIR /app
 

cypress/e2e/patient_spec/patient_consultation.cy.ts

@@ -193,6 +193,7 @@ describe("Patient Consultation in multiple combination", () => {
     cy.verifyNotification(
       "Create Diagnoses - Atleast one diagnosis is required"
     );
+    cy.closeNotification();
     patientConsultationPage.selectPatientDiagnosis(
       diagnosis4,
       "add-icd11-diagnosis-as-confirmed"

cypress/e2e/patient_spec/patient_logupdate.cy.ts

@@ -42,6 +42,7 @@ describe("Patient Log Update in Normal, Critical and TeleIcu", () => {
     patientConsultationPage.selectPatientSuggestion("Domiciliary Care");
     cy.submitButton("Update Consultation");
     cy.verifyNotification("Consultation updated successfully");
+    cy.closeNotification();
     patientLogupdate.clickLogupdate();
     patientLogupdate.typePhysicalExamination(physicalExamination);
     patientLogupdate.typeOtherDetails(otherExamination);
@@ -79,6 +80,7 @@ describe("Patient Log Update in Normal, Critical and TeleIcu", () => {
     patientConsultationPage.selectPatientSuggestion("Domiciliary Care");
     cy.submitButton("Update Consultation");
     cy.verifyNotification("Consultation updated successfully");
+    cy.closeNotification();
     patientLogupdate.clickLogupdate();
     patientLogupdate.typePhysicalExamination(physicalExamination);
     patientLogupdate.typeOtherDetails(otherExamination);
@@ -95,6 +97,7 @@ describe("Patient Log Update in Normal, Critical and TeleIcu", () => {
     cy.get("#consciousness_level-2").click();
     cy.submitButton("Save");
     cy.verifyNotification("Consultation Updates details created successfully");
+    cy.closeNotification();
     // edit the card and verify the data.
     patientLogupdate.clickLogupdateCard("#dailyround-entry", patientCategory);
     cy.verifyContentPresence("#consultation-preview", [

cypress/e2e/users_spec/user_creation.cy.ts

@@ -37,7 +37,7 @@ describe("User Creation", () => {
     "Please select the User Type",
     "Please enter valid phone number",
     "Please enter the username",
-    "Please enter date in YYYY/MM/DD format",
+    "Please enter date in DD/MM/YYYY format",
     "Please enter the password",
     "Confirm password is required",
     "First Name is required",
@@ -52,10 +52,7 @@ describe("User Creation", () => {
   const EXPECTED_PROFILE_ERROR_MESSAGES = [
     "Field is required",
     "Field is required",
-    "This field is required",
     "Please enter valid phone number",
-    "This field is required",
-    "This field is required",
   ];
 
   before(() => {
@@ -81,7 +78,6 @@ describe("User Creation", () => {
       "District Editted"
     );
     userCreationPage.typeIntoElementByIdPostClear("lastName", "Cypress");
-    userCreationPage.typeIntoElementByIdPostClear("age", "22");
     userCreationPage.selectDropdownOption("gender", "Male");
     userCreationPage.typeIntoElementByIdPostClear(
       "phoneNumber",
@@ -93,6 +89,10 @@ describe("User Creation", () => {
     );
     userCreationPage.typeIntoElementByIdPostClear("email", "[email protected]");
     userCreationPage.typeIntoElementByIdPostClear("weekly_working_hours", "14");
+    userCreationPage.typeIntoElementByIdPostClearDob(
+      "date_of_birth",
+      "01011998"
+    );
     userCreationPage.clickElementById("submit");
     userCreationPage.verifyElementContainsText(
       "contactno-profile-details",
@@ -110,7 +110,10 @@ describe("User Creation", () => {
       "lastname-profile-details",
       "Cypress"
     );
-    userCreationPage.verifyElementContainsText("age-profile-details", "22");
+    userCreationPage.verifyElementContainsText(
+      "date_of_birth-profile-details",
+      "01/01/1998"
+    );
     userCreationPage.verifyElementContainsText(
       "emailid-profile-details",
       "[email protected]"
@@ -130,7 +133,6 @@ describe("User Creation", () => {
     userCreationPage.clickElementById("edit-cancel-profile-button");
     userCreationPage.clearIntoElementById("firstName");
     userCreationPage.clearIntoElementById("lastName");
-    userCreationPage.clearIntoElementById("age");
     userCreationPage.clearIntoElementById("phoneNumber");
     userCreationPage.clearIntoElementById("altPhoneNumber");
     userCreationPage.clearIntoElementById("weekly_working_hours");

cypress/e2e/users_spec/user_profile.cy.ts

@@ -8,7 +8,7 @@ describe("Manage User Profile", () => {
   const userProfilePage = new UserProfilePage();
   const manageUserPage = new ManageUserPage();
 
-  const age = "30";
+  const date_of_birth = "01011999";
   const gender = "Male";
   const email = "[email protected]";
   const phone = "+918899887788";
@@ -32,10 +32,10 @@ describe("Manage User Profile", () => {
     cy.awaitUrl("/user/profile");
   });
 
-  it("Set Age, Gender, Email, Phone and Working Hours for a user and verify its reflection in user profile", () => {
+  it("Set Dob, Gender, Email, Phone and Working Hours for a user and verify its reflection in user profile", () => {
     userProfilePage.clickEditProfileButton();
 
-    userProfilePage.typeAge(age);
+    userProfilePage.typedate_of_birth(date_of_birth);
     userProfilePage.selectGender(gender);
     userProfilePage.typeEmail(email);
     userProfilePage.typePhone(phone);
@@ -49,7 +49,7 @@ describe("Manage User Profile", () => {
 
     cy.verifyNotification("Details updated successfully");
 
-    userProfilePage.assertAge(age);
+    userProfilePage.assertdate_of_birth("01/01/1999");
     userProfilePage.assertGender(gender);
     userProfilePage.assertEmail(email);
     userProfilePage.assertPhone(phone);

cypress/pageobject/Users/UserCreation.ts

@@ -17,7 +17,10 @@ export class UserCreationPage {
       .click()
       .type(value);
   }
-
+  typeIntoElementByIdPostClearDob(elementId: string, value: string) {
+    cy.get("#" + elementId).click();
+    cy.get("#date-input").clear().type(value);
+  }
   clearIntoElementById(elementId: string) {
     cy.get("#" + elementId)
       .click()

cypress/pageobject/Users/UserProfilePage.ts

@@ -1,3 +1,5 @@
+import { cy } from "local-cypress";
+
 export default class UserProfilePage {
   assertVideoConnectLink(link: string) {
     cy.get("#videoconnectlink-profile-details").should("contain.text", link);
@@ -15,8 +17,10 @@ export default class UserProfilePage {
     cy.get("#submit").click();
   }
 
-  typeAge(age: string) {
-    cy.get("#age").click().clear().type(age);
+  typedate_of_birth(date_of_birth: string) {
+    //check
+    cy.get("#date_of_birth").click();
+    cy.get("#date-input").clear().type(date_of_birth);
   }
 
   selectGender(gender: string) {
@@ -55,8 +59,11 @@ export default class UserProfilePage {
       .type(medicalCouncilRegistration);
   };
 
-  assertAge(age: string) {
-    cy.get("#age-profile-details").should("contain.text", age);
+  assertdate_of_birth(date_of_birth: string) {
+    cy.get("#date_of_birth-profile-details").should(
+      "contain.text",
+      date_of_birth
+    );
   }
 
   assertGender(gender: string) {

cypress/support/commands.ts

@@ -78,8 +78,7 @@ Cypress.Commands.add(
 );
 
 Cypress.Commands.add("verifyNotification", (text) => {
-  cy.get(".pnotify-container").should("exist").contains(text);
-  return cy.get(".pnotify-container").contains(text).click({ force: true });
+  return cy.get(".pnotify-container").should("exist").contains(text);
 });
 
 Cypress.on("uncaught:exception", () => {

netlify.toml

@@ -3,7 +3,7 @@ publish = "build/"
 command = "CI='' npm run build"
 
 [build.environment]
-NODE_VERSION = "18"
+NODE_VERSION = "20.12.0"
 NPM_FLAGS = "--legacy-peer-deps"
 NODE_OPTIONS = "--max_old_space_size=4096"