Merge branch 'develop' into issues/7771/drop-support-for-copy-from-pr…

…evious-round
coronasafe · May 15, 2024 · 25bba2d · 25bba2d
2 parents 76ae5d3 + 245c811
commit 25bba2d
Show file tree

Hide file tree

Showing 38 changed files with 3,274 additions and 2,021 deletions.
diff --git a/.npmrc b/.npmrc
diff --git a/Dockerfile b/Dockerfile
@@ -9,7 +9,7 @@ RUN if [ "$(uname -m)" = "aarch64" ] || [ "$(uname -m)" = "arm64" ]; then apt-ge
 
 COPY package.json package-lock.json ./
 
-RUN npm install --legacy-peer-deps
+RUN npm install
 
 COPY . .
 

diff --git a/README.md b/README.md
@@ -34,7 +34,7 @@
 #### Install the required dependencies
 
 ```sh
-npm install --legacy-peer-deps
+npm install
 ```
 
 #### 🏃 Run the app in development mode

diff --git a/cypress/e2e/facility_spec/facility_manage.cy.ts b/cypress/e2e/facility_spec/facility_manage.cy.ts
@@ -110,26 +110,26 @@ describe("Facility Manage Functions", () => {
   it("Modify doctor capacity in Facility detail page", () => {
     // Add a doctor capacity
     facilityManage.clickFacilityAddDoctorTypeButton();
-    facilityPage.selectAreaOfSpecialization("General Medicine");
+    facilityPage.selectAreaOfSpecialization("Pulmonology");
     facilityPage.fillDoctorCount(doctorCapacity);
     facilityPage.saveAndExitDoctorForm();
     facilityManage.verifySuccessMessageVisibilityAndContent(
-      "Doctor count added successfully",
+      "Staff count added successfully",
     );
     facilityManage.verifyTotalDoctorCapacity(doctorCapacity);
     // edit a existing doctor
     facilityManage.clickEditFacilityDoctorCapacity();
     facilityPage.fillDoctorCount(doctorModifiedCapacity);
     facilityPage.clickdoctorcapacityaddmore();
     facilityManage.verifySuccessMessageVisibilityAndContent(
-      "Doctor count updated successfully",
+      "Staff count updated successfully",
     );
     facilityManage.verifyTotalDoctorCapacity(doctorModifiedCapacity);
     // delete a bed
     facilityManage.clickDeleteFacilityDoctorCapacity();
     facilityManage.clickButtonWithText("Delete");
     facilityManage.verifySuccessMessageVisibilityAndContent(
-      "Doctor specialization type deleted successfully",
+      "Staff specialization type deleted successfully",
     );
   });
 

diff --git a/cypress/e2e/resource_spec/resources.cy.ts b/cypress/e2e/resource_spec/resources.cy.ts
@@ -53,11 +53,11 @@ describe("Resource Page", () => {
       "Dummy",
       "Test title",
       "10",
-      "Test description"
+      "Test description",
     );
     facilityPage.clickSubmitRequestButton();
     facilityPage.verifySuccessNotification(
-      "Resource request created successfully"
+      "Resource request created successfully",
     );
     facilityPage.verifyresourcenewurl();
     cy.url().then((url) => {
@@ -71,7 +71,7 @@ describe("Resource Page", () => {
     resourcePage.updateStatus("APPROVED");
     resourcePage.clickSubmitButton();
     resourcePage.verifySuccessNotification(
-      "Resource request updated successfully"
+      "Resource request updated successfully",
     );
   });