Merge pull request #8119 from coronasafe/log-update-v2

Migrate rescript components to typescript; uninstall ReScript
ohcnetwork · Aug 14, 2024 · 13bee7e · 13bee7e
2 parents e118453 + cede549
commit 13bee7e
Show file tree

Hide file tree

Showing 235 changed files with 5,194 additions and 13,033 deletions.
diff --git a/.eslintrc.json b/.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",

diff --git a/bsconfig.json b/bsconfig.json
diff --git a/cypress/e2e/patient_spec/patient_logupdate.cy.ts b/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();

diff --git a/cypress/pageobject/Patient/PatientCreation.ts b/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() {