Merge branch 'develop' into issues/8241/edit-spelling-mistake-ventila…

…torfi02-to-ventilatorfio2

.eslintrc.json

@@ -15,7 +15,7 @@
     "plugin:@typescript-eslint/eslint-recommended",
     "plugin:@typescript-eslint/recommended",
     "plugin:i18next/recommended",
-    "plugin:tailwindcss/recommended",
+    "plugin:prettier/recommended",
     "plugin:storybook/recommended"
   ],
   "overrides": [
@@ -46,10 +46,6 @@
     "i18next"
   ],
   "rules": {
-    "quotes": [
-      "error",
-      "double"
-    ],
     "no-unused-vars": "off",
     "@typescript-eslint/no-unused-vars": [
       "error",
@@ -59,6 +55,7 @@
         "caughtErrorsIgnorePattern": "^_"
       }
     ],
+    "@typescript-eslint/no-explicit-any": "warn",
     "react/react-in-jsx-scope": "off",
     "i18next/no-literal-string": [
       "warn",
@@ -81,12 +78,7 @@
           ]
         }
       }
-    ],
-    "tailwindcss/no-custom-classname": "off",
-    "tailwindcss/migration-from-tailwind-2": "error",
-    "tailwindcss/classnames-order": "off",
-    "tailwindcss/enforces-shorthand": "off",
-    "tailwindcss/no-contradicting-classname": "error"
+    ]
   },
   "ignorePatterns": [
     "dist",

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

.github/workflows/stale.yml

@@ -13,12 +13,9 @@ jobs:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           stale-issue-label: "stale"
           stale-pr-label: "stale"
-          stale-issue-message: "Hi, @coronasafe/care-frontend-maintainers, This issue has been automatically marked as stale because it has not had any recent activity."
-          stale-pr-message: "Hi, This pr has been automatically marked as stale because it has not had any recent activity. It will be automatically closed if no further activity occurs for 7 more days. Thank you for your contributions."
-          close-pr-message: "Hi, @coronasafe/care-frontend-maintainers, This PR has been automatically closed due to inactivity. Thank you for your contributions. Feel free to re-open the PR."
           exempt-issue-labels: "blocked,waiting for related PR,waiting for back end,help wanted,work-in-progress,In Progress,wishlist,EPIC,backlog"
           exempt-pr-labels: "tested,needs testing,need Review,waiting for related PR,waiting for back end,help wanted,blocked,work-in-progress,In Progress,backlog"
           days-before-issue-stale: 14
           days-before-pr-stale: 7
           days-before-issue-close: -1
-          days-before-pr-close: 7
+          days-before-pr-close: -1

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

cypress/e2e/patient_spec/patient_logupdate.cy.ts

@@ -57,7 +57,7 @@ describe("Patient Log Update in Normal, Critical and TeleIcu", () => {
     patientLogupdate.typeSpo2(patientSpo2);
     patientLogupdate.selectRhythm(patientRhythmType);
     patientLogupdate.typeRhythm(patientRhythm);
-    cy.get("#consciousness_level-2").click();
+    cy.get("#consciousness_level-option-RESPONDS_TO_PAIN").click();
     cy.submitButton("Save");
     cy.verifyNotification("Telemedicine log created successfully");
   });
@@ -82,7 +82,7 @@ describe("Patient Log Update in Normal, Critical and TeleIcu", () => {
     patientLogupdate.typeSpo2(patientSpo2);
     patientLogupdate.selectRhythm(patientRhythmType);
     patientLogupdate.typeRhythm(patientRhythm);
-    cy.get("#consciousness_level-2").click();
+    cy.get("#consciousness_level-option-RESPONDS_TO_PAIN").click();
     cy.submitButton("Save");
     cy.verifyNotification("Brief Update log created successfully");
     cy.closeNotification();
@@ -137,7 +137,7 @@ describe("Patient Log Update in Normal, Critical and TeleIcu", () => {
     patientLogupdate.typeSpo2(patientSpo2);
     patientLogupdate.selectRhythm(patientRhythmType);
     patientLogupdate.typeRhythm(patientRhythm);
-    cy.get("#consciousness_level-2").click();
+    cy.get("#consciousness_level-option-RESPONDS_TO_PAIN").click();
     cy.submitButton("Save");
     cy.wait(2000);
     cy.verifyNotification("Brief Update log created successfully");
@@ -161,7 +161,7 @@ describe("Patient Log Update in Normal, Critical and TeleIcu", () => {
     patientLogupdate.typePulse(patientPulse);
     patientLogupdate.typeTemperature(patientTemperature);
     patientLogupdate.typeRespiratory(patientRespiratory);
-    cy.get("#consciousness_level-2").click();
+    cy.get("#consciousness_level-option-RESPONDS_TO_PAIN").click();
     cy.submitButton("Save");
     cy.verifyNotification("Brief Update log created successfully");
     cy.closeNotification();

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);
   }

cypress/pageobject/Patient/PatientCreation.ts

@@ -46,7 +46,7 @@ export class PatientPage {
   }
 
   checkPhoneNumberIsEmergencyNumber() {
-    cy.get("#emergency_contact_checkbox > div > input").click();
+    cy.get("#emergency_contact_checkbox").click();
   }
 
   typePatientDateOfBirth(dateOfBirth: string) {
@@ -93,11 +93,11 @@ export class PatientPage {
   }
 
   clickPatientAntenatalStatusYes() {
-    cy.get("#is_antenatal-0").click();
+    cy.get("#is_antenatal-option-true").click();
   }
 
   clickPatientPostPartumStatusYes() {
-    cy.get("#is_postpartum-0").click();
+    cy.get("#is_postpartum-option-true").click();
   }
 
   clickCancelButton() {