Merge remote-tracking branch 'upstream/develop' into remove-dnd

.example.env

@@ -47,9 +47,6 @@ REACT_SENTRY_DSN=
 # Sentry environment (default: staging)
 REACT_SENTRY_ENVIRONMENT=
 
-# Sample format file paths
-REACT_SAMPLE_FORMAT_ASSET_IMPORT=/asset-import-template.xlsx
-
 # Camera feed, still watching idle timeout (in seconds; default: 180)
 REACT_STILL_WATCHING_IDLE_TIMEOUT=
 

.github/workflows/label-merge-conflict.yml

@@ -24,6 +24,6 @@ jobs:
           wait_ms: 15000
           detect_merge_changes: false
           conflict_comment: |
-            Conflicts have been detected against the base branch. Please rebase your branch against the base branch.
+            Conflicts have been detected against the base branch. Please merge the base branch into your branch.
             cc: @${author}
             > _See: https://docs.ohc.network/docs/contributing#how-to-resolve-merge-conflicts_

.github/workflows/linter.yml

@@ -28,3 +28,6 @@ jobs:
 
       - name: Run lint
         run: npm run lint -- --quiet
+
+      - name: Run unimported
+        run: npm run unimported

.unimportedrc.json

@@ -0,0 +1,54 @@
+{
+  "ignorePatterns": [
+    "node_modules/**",
+    "**/*.d.ts"
+  ],
+  "ignoreUnimported": [
+    "src/Locale/update_locale.js",
+    "src/PluginRegistry.ts",
+    "src/pluginTypes.ts",
+    "src/service-worker.ts"
+  ],
+  "ignoreUnused": [
+    "@fontsource/figtree",
+    "@originjs/vite-plugin-federation",
+    "@vitejs/plugin-react",
+    "browserslist-useragent-regexp",
+    "cross-env",
+    "postcss-loader"
+  ],
+  "ignoreUnresolved": [
+    [
+      "./pluginMap",
+      [
+        "src/pluginTypes.ts"
+      ]
+    ],
+    [
+      "@/supportedBrowsers",
+      [
+        "src/components/ErrorPages/BrowserWarning.tsx"
+      ]
+    ],
+    [
+      "tsx/cjs",
+      [
+        "node_modules/find-cypress-specs/src/index.js"
+      ]
+    ],
+    [
+      "virtual:pwa-register",
+      [
+        "src/index.tsx"
+      ]
+    ]
+  ],
+  "respectGitignore": true,
+  "entry": [
+    "src/index.tsx",
+    "vite.config.mts",
+    "tailwind.config.js",
+    "cypress.config.ts",
+    "scripts/**"
+  ]
+}

care.config.ts

@@ -64,11 +64,6 @@ const careConfig = {
   reCaptchaSiteKey:
     env.REACT_RECAPTCHA_SITE_KEY || "6LdvxuQUAAAAADDWVflgBqyHGfq-xmvNJaToM0pN",
 
-  sampleFormats: {
-    assetImport:
-      env.REACT_SAMPLE_FORMAT_ASSET_IMPORT || "/asset-import-template.xlsx",
-  },
-
   wartimeShifting: boolean("REACT_WARTIME_SHIFTING"),
 
   stillWatching: {

cypress/e2e/patient_spec/patient_creation.cy.ts

@@ -8,7 +8,6 @@ import {
   PatientFormData,
   patientCreation,
 } from "@/pageObject/Patients/PatientCreation";
-import { patientDashboard } from "@/pageObject/Patients/PatientDashboard";
 import { PatientEncounter } from "@/pageObject/Patients/PatientEncounter";
 import { patientVerify } from "@/pageObject/Patients/PatientVerify";
 import { FacilityCreation } from "@/pageObject/facility/FacilityCreation";
@@ -126,7 +125,7 @@ describe("Patient Management", () => {
         .clickSubmitEncounter()
         .assertEncounterCreationSuccess();
 
-      patientDashboard.verifyEncounterPatientInfo([
+      patientEncounter.verifyEncounterPatientInfo([
         ENCOUNTER_TYPE,
         ENCOUNTER_STATUS,
         ENCOUNTER_PRIORITY,
@@ -154,7 +153,7 @@ describe("Patient Management", () => {
       .clickSubmitEncounter()
       .assertEncounterCreationSuccess();
 
-    patientDashboard.verifyEncounterPatientInfo([
+    patientEncounter.verifyEncounterPatientInfo([
       ENCOUNTER_TYPE,
       ENCOUNTER_STATUS,
       ENCOUNTER_PRIORITY,

cypress/e2e/patient_spec/patient_details.cy.ts

@@ -0,0 +1,35 @@
+import { PatientDetails } from "@/pageObject/Patients/PatientDetails";
+import { PatientEncounter } from "@/pageObject/Patients/PatientEncounter";
+import { FacilityCreation } from "@/pageObject/facility/FacilityCreation";
+
+const facilityCreation = new FacilityCreation();
+const patientEncounter = new PatientEncounter();
+const patientDetails = new PatientDetails();
+
+describe("Patient Management", () => {
+  beforeEach(() => {
+    cy.loginByApi("doctor");
+    cy.visit("/");
+  });
+
+  it("Assign users to a patient", () => {
+    const userName = "nihal-nurse";
+    const userRole = "Nurse";
+    facilityCreation.selectFacility("GHC Trikaripur");
+    patientEncounter
+      .navigateToEncounters()
+      .openFirstEncounterDetails()
+      .clickPatientDetailsButton();
+    patientDetails
+      .clickUsersTab()
+      .clickAssignUserButton()
+      .selectUserToAssign(userName)
+      .selectUserRole(userRole)
+      .confirmUserAssignment()
+      .verifyUserAssignmentSuccess()
+      .verifyUserContent([userName])
+      .clickRemoveUserButton()
+      .confirmUserRemoval()
+      .verifyUserRemovalSuccess();
+  });
+});

cypress/pageObject/Patients/PatientDetails.ts

@@ -0,0 +1,61 @@
+export class PatientDetails {
+  clickUsersTab() {
+    cy.verifyAndClickElement('[data-cy="tab-users"]', "Users");
+    return this;
+  }
+
+  clickAssignUserButton() {
+    cy.verifyAndClickElement('[data-cy="assign-user-button"]', "Assign User");
+    return this;
+  }
+
+  selectUserToAssign(username: string) {
+    cy.typeAndSelectOption(
+      '[data-cy="patient-user-selector-container"]',
+      username,
+      false,
+    );
+    return this;
+  }
+
+  selectUserRole(role: string) {
+    cy.clickAndSelectOption('[data-cy="patient-user-role-select"]', role);
+    return this;
+  }
+
+  confirmUserAssignment() {
+    cy.verifyAndClickElement(
+      '[data-cy="patient-user-assign-button"]',
+      "Assign to Patient",
+    );
+    return this;
+  }
+
+  verifyUserAssignmentSuccess() {
+    cy.verifyNotification("User added to patient successfully");
+    return this;
+  }
+
+  clickRemoveUserButton() {
+    cy.get('[data-cy="patient-user-remove-button"]').first().click();
+    return this;
+  }
+
+  confirmUserRemoval() {
+    cy.verifyAndClickElement(
+      '[data-cy="patient-user-remove-confirm-button"]',
+      "Remove",
+    );
+    return this;
+  }
+
+  verifyUserContent(expectedTexts: string[]) {
+    cy.verifyContentPresence('[data-cy="patient-users"]', expectedTexts);
+    return this;
+  }
+
+  verifyUserRemovalSuccess() {
+    cy.verifyNotification("User removed successfully");
+    return this;
+  }
+}

cypress/pageObject/Patients/PatientEncounter.ts

@@ -22,6 +22,11 @@ export class PatientEncounter {
     return this;
   }
 
+  verifyEncounterPatientInfo(contents: string[]) {
+    cy.verifyContentPresence("#patient-infobadges", contents);
+    return this;
+  }
+
   // Questionnaire actions
   addQuestionnaire(questionnaireName: string) {
     cy.get('[data-cy="add-questionnaire-button"]').click();