Merge branch 'ohcnetwork:develop' into issue/#10071/selection-slot

.github/workflows/combine.yml

@@ -15,7 +15,7 @@ jobs:
     steps:
       - name: Combine dependencies
         id: combine-dependencies
-        uses: github/combine-prs@v5.0.0
+        uses: github/combine-prs@v5.2.0
         with:
           pr_title: Combined dependencies # The title of the pull request to create
           select_label: dependencies # The label which marks PRs that should be combined.

.github/workflows/comment-p1-issues.yml

@@ -13,7 +13,7 @@ jobs:
       issues: write
     steps:
       - name: Add comment
-        uses: actions/github-script@v6.3.3
+        uses: actions/github-script@v6.4.1
         with:
           script: |
             const body = ':warning: **Refrain from assigning this issue to yourself if you have another `P1` issue assigned that is not yet closed.**'

.github/workflows/issue-automation.yml

@@ -13,7 +13,7 @@ jobs:
     if: github.repository == 'ohcnetwork/care_fe' && github.event_name == 'issues' && github.event.action == 'opened' || github.event.action == 'reopened'
     steps:
       - name: 'Move issue to "Triage"'
-        uses: leonsteinhaeuser/project-beta-automations@v1.2.1
+        uses: leonsteinhaeuser/project-beta-automations@v1.3.0
         with:
           gh_token: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
           organization: ohcnetwork
@@ -26,7 +26,7 @@ jobs:
     if: github.repository == 'ohcnetwork/care_fe' &&  github.event_name == 'issues' && github.event.action == 'closed'
     steps:
       - name: 'Moved issue to "Done"'
-        uses: leonsteinhaeuser/project-beta-automations@v1.2.1
+        uses: leonsteinhaeuser/project-beta-automations@v1.3.0
         with:
           gh_token: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
           organization: ohcnetwork
@@ -39,7 +39,7 @@ jobs:
     if: github.repository == 'ohcnetwork/care_fe' &&  github.event_name == 'issues' && github.event.action == 'assigned'
     steps:
       - name: 'Move issue to "In Progress"'
-        uses: leonsteinhaeuser/project-beta-automations@v1.2.1
+        uses: leonsteinhaeuser/project-beta-automations@v1.3.0
         with:
           gh_token: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
           organization: ohcnetwork

.github/workflows/thank-you.yml

@@ -15,7 +15,7 @@ jobs:
       contents: write
     steps:
       - name: Add thankyou note
-        uses: actions/github-script@v6.3.3
+        uses: actions/github-script@v6.4.1
         with:
           script: |
             const thankyouNote = 'Your efforts have helped advance digital healthcare and TeleICU systems. :rocket: Thank you for taking the time out to make CARE better. We hope you continue to innovate and contribute; your impact is immense! :raised_hands:';

.prettierrc.json

@@ -3,7 +3,7 @@
   "useTabs": false,
   "tabWidth": 2,
   "semi": true,
-  "endOfLine": "lf",
+  "endOfLine": "auto",
   "jsxSingleQuote": false,
   "arrowParens": "always",
   "tailwindFunctions": ["classNames"],

care.config.ts

@@ -119,10 +119,31 @@ const careConfig = {
   },
 
   careApps: env.REACT_ENABLED_APPS
-    ? env.REACT_ENABLED_APPS.split(",").map((app) => ({
-        branch: app.split("@")[1],
-        package: app.split("@")[0],
-      }))
+    ? env.REACT_ENABLED_APPS.split(",").map((app) => {
+        const [module, cdn] = app.split("@");
+        const [org, repo] = module.split("/");
+
+        if (!org || !repo) {
+          throw new Error(
+            `Invalid plug configuration: ${module}. Expected 'org/repo@url'.`,
+          );
+        }
+
+        let url = "";
+        if (!cdn) {
+          url = `https://${org}.github.io/${repo}`;
+        }
+
+        if (!url.startsWith("http")) {
+          url = `${cdn.includes("localhost") ? "http" : "https"}://${cdn}`;
+        }
+
+        return {
+          url: new URL(url).toString(),
+          name: repo,
+          package: module,
+        };
+      })
     : [],
 
   plotsConfigUrl:

cypress/e2e/patient_spec/patient_encounter.cy.ts

@@ -0,0 +1,31 @@
+import { PatientEncounter } from "pageObject/Patients/PatientEncounter";
+import { FacilityCreation } from "pageObject/facility/FacilityCreation";
+
+const facilityCreation = new FacilityCreation();
+const patientEncounter = new PatientEncounter();
+
+describe("Patient Encounter Questionnaire", () => {
+  beforeEach(() => {
+    // Login and set up any necessary test state
+    cy.visit("/login");
+  });
+
+  it("Create a new ABG questionnaire and verify the values", () => {
+    const abgValues = {
+      pco2: "120",
+      po2: "80",
+    };
+    cy.loginByApi("devnurse");
+    facilityCreation.selectFacility("GHC Trikaripur");
+
+    // Chain the methods instead of multiple separate calls
+    patientEncounter
+      .navigateToEncounters()
+      .openFirstEncounterDetails()
+      .clickUpdateEncounter()
+      .addQuestionnaire("Arterial Blood Gas")
+      .fillQuestionnaire(abgValues)
+      .submitQuestionnaire()
+      .verifyOverviewValues(Object.values(abgValues));
+  });
+});

cypress/fixtures/users.json

@@ -14,5 +14,9 @@
   "staff": {
     "username": "nihalstaff",
     "password": "Test@123"
+  },
+  "devnurse": {
+    "username": "dev-nurse",
+    "password": "Test@123"
   }
 }

cypress/pageObject/Patients/PatientEncounter.ts

@@ -0,0 +1,72 @@
+export class PatientEncounter {
+  // Navigation
+  navigateToEncounters() {
+    cy.get('[data-sidebar="content"]').contains("Encounters").click();
+    return this;
+  }
+
+  openFirstEncounterDetails() {
+    cy.get('[data-cy="encounter-list-cards"]')
+      .first()
+      .contains("View Details")
+      .click();
+    return this;
+  }
+
+  clickUpdateEncounter() {
+    cy.verifyAndClickElement('[data-cy="update-encounter-button"]', "Update");
+    cy.verifyAndClickElement(
+      '[data-cy="update-encounter-option"]',
+      "Update Encounter",
+    );
+    return this;
+  }
+
+  // Questionnaire actions
+  addQuestionnaire(questionnaireName: string) {
+    cy.get('[data-cy="add-questionnaire-button"]').click();
+    cy.get('[role="dialog"] input')
+      .should("be.visible")
+      .type(questionnaireName);
+    cy.get('[role="dialog"] button')
+      .contains(questionnaireName)
+      .should("be.visible")
+      .click();
+    return this;
+  }
+
+  fillQuestionnaire(answers: Record<string, string>) {
+    Object.entries(answers).forEach(([field, value]) => {
+      // Handle both text inputs and select dropdowns
+      cy.get(`[data-cy="question-${field}"]`).then(($el) => {
+        if ($el.is("select")) {
+          cy.wrap($el).select(value);
+        } else {
+          cy.wrap($el).type(value);
+        }
+      });
+    });
+    return this;
+  }
+
+  submitQuestionnaire() {
+    this.clickSubmitQuestionnaire();
+    this.verifyQuestionnaireSubmission();
+    return this;
+  }
+
+  clickSubmitQuestionnaire() {
+    cy.clickSubmitButton("Submit");
+    return this;
+  }
+
+  verifyQuestionnaireSubmission() {
+    cy.verifyNotification("Questionnaire submitted successfully");
+    return this;
+  }
+
+  verifyOverviewValues(expectedValues: string[]) {
+    cy.verifyContentPresence('[data-cy="encounter-overview"]', expectedValues);
+    return this;
+  }
+}