Merge pull request #10436 from ohcnetwork/develop

Merge Develop To Staging v3.1.0

.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,5 +24,6 @@ jobs:
           wait_ms: 15000
           detect_merge_changes: false
           conflict_comment: |
-            :wave: Hi, @${author},
-            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

@@ -4,7 +4,6 @@ on:
   pull_request:
     branches:
       - develop
-      - master
   merge_group:
 
 jobs:
@@ -22,10 +21,13 @@ jobs:
       - name: Set up Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: "20"
+          node-version: "22"
 
       - name: Install dependencies
         run: npm ci
 
       - name: Run lint
         run: npm run lint -- --quiet
+
+      - name: Run unimported
+        run: npm run unimported

.github/workflows/ossar-analysis.yml

@@ -30,7 +30,7 @@ jobs:
 
       # Run open source static analysis tools
       - name: Run OSSAR
-        uses: github/ossar-action@fae13e456b9973657a670eef6bccc3a4c2b5153d
+        uses: github/ossar-action@v1
         id: ossar
 
         # Upload results to the Security tab

.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,