Merge branch 'develop' into gsoc-doctor-notes

ohcnetwork · Aug 21, 2024 · 18989ea · 18989ea
2 parents 2719bca + a65681e
commit 18989ea
Show file tree

Hide file tree

Showing 21 changed files with 83 additions and 307 deletions.
diff --git a/.github/workflows/cypress.yaml b/.github/workflows/cypress.yaml
@@ -22,11 +22,21 @@ jobs:
       - name: Checkout 📥
         uses: actions/checkout@v3
 
+      - name: Set backend branch
+        id: backend-branch
+        run: |
+          if [[ '${{ github.event.pull_request.base.ref }}' == 'staging' ]]; then
+            echo "branch=staging" >> $GITHUB_OUTPUT
+          else
+            echo "branch=develop" >> $GITHUB_OUTPUT
+          fi
+
       - name: Checkout care 📥
         uses: actions/checkout@v3
         with:
           repository: coronasafe/care
           path: care
+          ref: ${{ steps.backend-branch.outputs.branch }}
 
       - name: Start care docker containers 🐳
         run: |

diff --git a/cypress/e2e/patient_spec/patient_consultation.cy.ts b/cypress/e2e/patient_spec/patient_consultation.cy.ts
@@ -95,6 +95,7 @@ describe("Patient Consultation in multiple combination", () => {
     cy.submitButton("Create Consultation");
     // the above submit should fail as IP number is missing
     patientConsultationPage.typePatientNumber(patientIpNumber);
+    patientConsultationPage.selectBed("Dummy Bed 1");
     cy.submitButton("Create Consultation");
     cy.verifyNotification("Consultation created successfully");
     // Below code for the prescription module only present while creating a new consultation

diff --git a/cypress/pageobject/Patient/PatientConsultation.ts b/cypress/pageobject/Patient/PatientConsultation.ts
@@ -28,6 +28,10 @@ export class PatientConsultationPage {
     cy.searchAndSelectOption("#referred_to", referance);
   }
 
+  selectBed(bedNo: string) {
+    cy.searchAndSelectOption("#bed", bedNo);
+  }
+
   selectPatientWard(ward: string) {
     cy.searchAndSelectOption("#transferred_from_location", ward);
   }

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -80,7 +80,6 @@
     "react-pdf": "^9.0.0",
     "react-player": "^2.16.0",
     "react-redux": "^8.1.1",
-    "react-transition-group": "^4.4.5",
     "react-webcam": "^7.2.0",
     "redux": "^4.2.1",
     "redux-thunk": "^2.4.2",
@@ -99,8 +98,6 @@
     "@tailwindcss/container-queries": "^0.1.1",
     "@tailwindcss/forms": "^0.5.7",
     "@tailwindcss/typography": "^0.5.13",
-    "@types/cypress": "^1.1.3",
-    "@types/echarts": "^4.9.22",
     "@types/google.maps": "^3.55.8",
     "@types/lodash-es": "^4.17.12",
     "@types/qrcode.react": "^1.0.5",
@@ -109,8 +106,6 @@
     "@types/react-csv": "^1.1.10",
     "@types/react-dom": "^18.3.0",
     "@types/react-google-recaptcha": "^2.1.9",
-    "@types/react-qr-reader": "^2.1.7",
-    "@types/react-transition-group": "^4.4.10",
     "@types/turndown": "^5.0.4",
     "@typescript-eslint/eslint-plugin": "^7.18.0",
     "@vitejs/plugin-react-swc": "^3.6.0",

diff --git a/src/Components/Common/BedSelect.tsx b/src/Components/Common/BedSelect.tsx
@@ -65,6 +65,7 @@ export const BedSelect = (props: BedSelectProps) => {
 
   return (
     <AutoCompleteAsync
+      id={name}
       name={name}
       multiple={multiple}
       selected={selected}

diff --git a/src/Components/Common/Transition.tsx b/src/Components/Common/Transition.tsx
diff --git a/src/Components/Common/UserAutocompleteFormField.tsx b/src/Components/Common/UserAutocompleteFormField.tsx
@@ -62,7 +62,7 @@ export default function UserAutocomplete(props: UserSearchProps) {
       setDisabled(true);
       field.handleChange(undefined as unknown as UserBareMinimum);
     }
-  }, [loading, query, field.required, data?.results, props.noResultsError]);
+  }, [loading, field.required, data?.results, props.noResultsError]);
 
   return (
     <FormField field={field}>