Merge pull request #13889 from ohcnetwork/develop

Author: sainak

.example.env

@@ -79,5 +79,8 @@ REACT_APP_RESEND_OTP_TIMEOUT=
 # Maximum image upload size allowed (in megabytes)
 REACT_APP_MAX_IMAGE_UPLOAD_SIZE_MB=
 
+# Disables public patient login in Care, (default: false)
+REACT_DISABLE_PATIENT_LOGIN=false
+
 # Default payment terms for invoices
 REACT_DEFAULT_PAYMENT_TERMS=

care.config.ts

@@ -143,6 +143,11 @@ const careConfig = {
     ? parseInt(env.REACT_APP_MAX_IMAGE_UPLOAD_SIZE_MB, 10)
     : 2,
 
+  /**
+   * Disable patient login if set to "true"
+   */
+  disablePatientLogin: boolean("REACT_DISABLE_PATIENT_LOGIN", false),
+
   patientRegistration: {
     /**
      * Minimum number of geo-organization levels the user must select

cypress/pageObject/Patients/PatientDepartments.ts

@@ -225,7 +225,7 @@ export class PatientDepartments {
     return this;
   }
   clickConfirmRemove() {
-    cy.verifyAndClickElement('[data-cy="confirm-remove-user"]', "Remove");
+    cy.clickConfirmAction("Remove");
     return this;
   }
 

cypress/pageObject/Patients/PatientDetails.ts

@@ -46,10 +46,7 @@ export class PatientDetails {
   }
 
   confirmUserRemoval() {
-    cy.verifyAndClickElement(
-      '[data-cy="patient-user-remove-confirm-button"]',
-      "Remove",
-    );
+    cy.clickConfirmAction("Remove");
     return this;
   }
 

cypress/pageObject/Patients/PatientLocation.ts

@@ -42,7 +42,7 @@ export class PatientLocation {
 
   clickFirstDeleteLocationButton() {
     cy.get(this.selectors.deleteLocationButton).first().click({ force: true });
-    cy.verifyAndClickElement(this.selectors.removeLocationButton, "Remove");
+    cy.clickConfirmAction("Remove");
     return this;
   }
 

cypress/pageObject/Patients/PatientPrescription.ts

@@ -97,10 +97,7 @@ export class PatientPrescription {
       .then(($button) => {
         if (!$button.is(":disabled")) {
           cy.wrap($button).click();
-          cy.verifyAndClickElement(
-            '[data-cy="confirm-remove-medication"]',
-            "Remove",
-          );
+          cy.clickConfirmAction("Remove");
         }
       });
     return this;

cypress/pageObject/facility/FacilityDevices.ts

@@ -119,10 +119,7 @@ export class FacilityDevices {
     cy.intercept("DELETE", "/api/v1/facility/**/device/**").as("deleteDevice");
 
     cy.verifyAndClickElement('[data-cy="delete-device-button"]', "Delete");
-    cy.verifyAndClickElement(
-      '[data-cy="confirm-delete-device-button"]',
-      "Delete",
-    );
+    cy.clickConfirmAction("Delete");
 
     // Wait for the delete request to complete and verify status code is 204
     cy.wait("@deleteDevice").its("response.statusCode").should("eq", 204);

cypress/support/commands.ts

@@ -339,3 +339,11 @@ Cypress.Commands.add(
       });
   },
 );
+
+Cypress.Commands.add("clickConfirmAction", (label: string) => {
+  cy.get('div[data-slot="alert-dialog-footer"]')
+    .should("be.visible")
+    .within(() => {
+      cy.contains("button", label).click();
+    });
+});

cypress/support/index.ts

@@ -73,6 +73,7 @@ declare global {
         labelText: string,
         buttonValue: string,
       ): Chainable<Element>;
+      clickConfirmAction(label: string): Chainable<JQuery<HTMLElement>>;
     }
   }
 }

eslint.config.mjs

@@ -25,6 +25,7 @@ fs.writeFileSync(
 );
 
 const isPreCommit = process.env.PRE_COMMIT === "true";
+const isProduction = process.env.NODE_ENV === "production";
 const DEFAULT = true;
 
 const dynamicRules = (ruleset, logKey) => {
@@ -182,7 +183,7 @@ const config = [
       ],
       "i18next-no-undefined-translation-keys/no-undefined-translation-keys": [
         dynamicRules({
-          error: isPreCommit,
+          error: isPreCommit || isProduction,
           warn: DEFAULT,
         }),
         {