Merge branch 'develop' into Fix#6372-new

cypress/e2e/assets_spec/assets_manage.cy.ts

@@ -117,23 +117,6 @@ describe("Asset", () => {
     assetPage.verifyDeleteStatus();
   });
 
-  it("Verify Facility Asset Page Redirection", () => {
-    cy.visit("/facility");
-    assetSearchPage.typeSearchKeyword(fillFacilityName);
-    assetSearchPage.pressEnter();
-    facilityPage.verifyFacilityBadgeContent(fillFacilityName);
-    facilityPage.visitAlreadyCreatedFacility();
-    facilityPage.clickManageFacilityDropdown();
-    facilityPage.clickCreateAssetFacilityOption();
-    facilityPage.verifyfacilitycreateassetredirection();
-    facilityPage.verifyassetfacilitybackredirection();
-    facilityPage.clickManageFacilityDropdown();
-    facilityPage.clickviewAssetFacilityOption();
-    facilityPage.verifyfacilityviewassetredirection();
-    assetFilters.assertFacilityText(fillFacilityName);
-    facilityPage.verifyassetfacilitybackredirection();
-  });
-
   afterEach(() => {
     cy.saveLocalStorage();
   });

cypress/e2e/users_spec/user_creation.cy.ts

@@ -193,18 +193,6 @@ describe("User Creation", () => {
     userPage.verifyMultipleBadgesWithSameId(alreadylinkedusersviews);
   });
 
-  // the below commented out codes, will be used in the upcoming refactoring of this module, since it is a inter-dependent of partially converted code, currently taking it down
-
-  //   it("link facility for user", () => {
-  //     cy.contains("Linked Facilities").click();
-  //     cy.intercept(/\/api\/v1\/facility/).as("getFacilities");
-  //     cy.get("[name='facility']")
-  //       .click()
-  //       .type("Dummy Facility 1")
-  //       .wait("@getFacilities");
-  //     cy.get("li[role='option']").should("not.exist");
-  //   });
-
   afterEach(() => {
     cy.saveLocalStorage();
   });

cypress/e2e/users_spec/user_manage.cy.ts

@@ -0,0 +1,144 @@
+import { cy, describe, before, beforeEach, it, afterEach } from "local-cypress";
+import LoginPage from "../../pageobject/Login/LoginPage";
+import { UserPage } from "../../pageobject/Users/UserSearch";
+import ManageUserPage from "../../pageobject/Users/ManageUserPage";
+
+describe("Manage User", () => {
+  const loginPage = new LoginPage();
+  const userPage = new UserPage();
+  const manageUserPage = new ManageUserPage();
+  const usernametolinkfacilitydoc1 = "dummydoctor4";
+  const usernametolinkfacilitydoc2 = "dummydoctor5";
+  const usernametolinkfacilitydoc3 = "dummydoctor6";
+  const usernametolinkskill = "devdoctor";
+  const usernameforworkinghour = "devdistrictadmin";
+  const usernamerealname = "Dummy Doctor";
+  const facilitytolinkusername = "Dummy Shifting Center";
+  const facilitytolinkskill = "Dummy Facility 1";
+  const workinghour = "23";
+  const linkedskill = "General Medicine";
+
+  before(() => {
+    loginPage.loginAsDisctrictAdmin();
+    cy.saveLocalStorage();
+  });
+
+  beforeEach(() => {
+    cy.restoreLocalStorage();
+    cy.awaitUrl("/users");
+  });
+
+  it("linking skills for a  users and verify its reflection in profile", () => {
+    // select the district user and select one skill link and verify its profile reflection
+    userPage.typeInSearchInput(usernameforworkinghour);
+    userPage.checkUsernameText(usernameforworkinghour);
+    manageUserPage.clicklinkedskillbutton();
+    manageUserPage.typeSkill(linkedskill);
+    manageUserPage.selectFacilityFromDropdown(linkedskill);
+    manageUserPage.clickAddSkillButton();
+    manageUserPage.clickCloseSlideOver();
+    manageUserPage.navigateToProfile();
+    manageUserPage.assertSkillInAlreadyLinkedSkills(linkedskill);
+  });
+
+  it("linking skills for a doctor users and verify its reflection in doctor connect", () => {
+    // select a doctor user and link and unlink same skill twice and verify the badge is only shown once in doctor connect
+    userPage.typeInSearchInput(usernametolinkskill);
+    userPage.checkUsernameText(usernametolinkskill);
+    manageUserPage.clicklinkedskillbutton();
+    manageUserPage.typeSkill(linkedskill);
+    manageUserPage.selectFacilityFromDropdown(linkedskill);
+    manageUserPage.clickAddSkillButton();
+    manageUserPage.clickCloseSlideOver();
+    cy.wait(5000); // temporary hack to fix the failure
+    manageUserPage.clicklinkedskillbutton();
+    manageUserPage.assertSkillInAddedUserSkills(linkedskill);
+    manageUserPage.clickUnlinkSkill();
+    manageUserPage.clickSubmit();
+    manageUserPage.typeSkill(linkedskill);
+    manageUserPage.selectFacilityFromDropdown(linkedskill);
+    manageUserPage.clickAddSkillButton();
+    manageUserPage.clickCloseSlideOver();
+    // verifying the doctor connect
+    manageUserPage.navigateToFacility();
+    manageUserPage.typeFacilitySearch(facilitytolinkskill);
+    manageUserPage.assertFacilityInCard(facilitytolinkskill);
+    manageUserPage.clickFacilityPatients();
+    manageUserPage.clickDoctorConnectButton();
+    manageUserPage.assertSkillIndoctorconnect(linkedskill);
+  });
+
+  it("add working hour for a user and verify its reflection in card and user profile", () => {
+    // verify mandatory field error and select working hour for a user
+    userPage.typeInSearchInput(usernameforworkinghour);
+    userPage.checkUsernameText(usernameforworkinghour);
+    manageUserPage.clicksetaveragehourbutton();
+    manageUserPage.clearweeklyhourfield();
+    manageUserPage.clickSubmit();
+    manageUserPage.verifyErrorText("Value should be between 0 and 168");
+    // verify the data is reflected in user card and profile page
+    manageUserPage.typeInWeeklyWorkingHours(workinghour);
+    manageUserPage.clickSubmit();
+    manageUserPage.verifyWorkingHours(workinghour);
+    manageUserPage.navigateToProfile();
+    manageUserPage.verifyProfileWorkingHours(workinghour);
+  });
+
+  it("linking and unlinking facility for multiple users, and confirm reflection in user cards and doctor connect", () => {
+    // verify the user doesn't have any home facility
+    userPage.typeInSearchInput(usernametolinkfacilitydoc1);
+    userPage.checkUsernameText(usernametolinkfacilitydoc1);
+    manageUserPage.assertHomeFacility("No Home Facility");
+    //  Link a new facility and ensure it is under linked facility - doctor username (1)
+    manageUserPage.clickFacilitiesTab();
+    manageUserPage.typeFacilityName(facilitytolinkusername);
+    manageUserPage.selectFacilityFromDropdown(facilitytolinkusername);
+    manageUserPage.clickLinkFacility();
+    manageUserPage.assertLinkedFacility(facilitytolinkusername);
+    //  Verify in the already linked facility are not present in droplist
+    manageUserPage.assertFacilityNotInDropdown(facilitytolinkusername);
+    manageUserPage.clickCloseSlideOver();
+    //  Link a new facility and ensure it is under home facility - doctor username (2)
+    userPage.clearSearchInput();
+    userPage.typeInSearchInput(usernametolinkfacilitydoc2);
+    userPage.checkUsernameText(usernametolinkfacilitydoc2);
+    manageUserPage.clickFacilitiesTab();
+    manageUserPage.typeFacilityName(facilitytolinkusername);
+    manageUserPage.selectFacilityFromDropdown(facilitytolinkusername);
+    manageUserPage.clickLinkFacility();
+    manageUserPage.clickHomeFacilityIcon();
+    manageUserPage.assertnotLinkedFacility(facilitytolinkusername);
+    manageUserPage.assertHomeFacilitylink(facilitytolinkusername);
+    manageUserPage.clickCloseSlideOver();
+    //  verify the home facility doctor id have reflection in user card
+    userPage.clearSearchInput();
+    userPage.typeInSearchInput(usernametolinkfacilitydoc2);
+    userPage.checkUsernameText(usernametolinkfacilitydoc2);
+    manageUserPage.assertHomeFacility(facilitytolinkusername);
+    // Link a new facility and unlink the facility from the doctor username (3)
+    userPage.clearSearchInput();
+    userPage.typeInSearchInput(usernametolinkfacilitydoc3);
+    userPage.checkUsernameText(usernametolinkfacilitydoc3);
+    manageUserPage.clickFacilitiesTab();
+    manageUserPage.typeFacilityName(facilitytolinkusername);
+    manageUserPage.selectFacilityFromDropdown(facilitytolinkusername);
+    manageUserPage.clickLinkFacility();
+    manageUserPage.clickUnlinkFacilityButton();
+    manageUserPage.clickSubmit();
+    manageUserPage.assertnotLinkedFacility;
+    manageUserPage.linkedfacilitylistnotvisible();
+    manageUserPage.clickCloseSlideOver();
+    //  Go to particular facility doctor connect and all user-id are reflected based on there access
+    // Path will be facility page to patient page then doctor connect button
+    manageUserPage.navigateToFacility();
+    manageUserPage.typeFacilitySearch(facilitytolinkusername);
+    manageUserPage.assertFacilityInCard(facilitytolinkusername);
+    manageUserPage.clickFacilityPatients();
+    manageUserPage.clickDoctorConnectButton();
+    manageUserPage.assertDoctorConnectVisibility(usernamerealname);
+  });
+
+  afterEach(() => {
+    cy.saveLocalStorage();
+  });
+});

cypress/pageobject/Patient/PatientConsultation.ts

@@ -44,23 +44,20 @@ export class PatientConsultationPage {
     cy.get("#height").click().type(weight);
     cy.get("#patient_no").type(ipNumber);
     cy.intercept("GET", "**/icd/**").as("getIcdResults");
-    cy.get(
-      "#icd11_diagnoses_object input[placeholder='Select'][role='combobox']"
-    )
+    cy.get("#icd11-search input[role='combobox']")
       .scrollIntoView()
       .click()
       .type("1A");
-    cy.get("#icd11_diagnoses_object [role='option']")
+    cy.get("#icd11-search [role='option']")
       .contains("1A00 Cholera")
       .scrollIntoView()
       .click();
-    cy.get("label[for='icd11_diagnoses_object']").click();
+    cy.get("#condition-verification-status-menu").click();
+    cy.get("#add-icd11-diagnosis-as-confirmed").click();
     cy.wait("@getIcdResults").its("response.statusCode").should("eq", 200);
 
-    cy.get("#icd11_principal_diagnosis [role='combobox']").click().type("1A");
-    cy.get("#icd11_principal_diagnosis [role='option']")
-      .contains("1A00 Cholera")
-      .click();
+    cy.get("#principal-diagnosis-select").click();
+    cy.get("#principal-diagnosis-select [role='option']").first().click();
 
     cy.get("#consultation_notes").click().type(consulationNotes);
     cy.get("#verified_by")

cypress/pageobject/Users/ManageUserPage.ts

@@ -0,0 +1,150 @@
+export class ManageUserPage {
+  assertHomeFacility(expectedText) {
+    cy.get("#home_facility").should("contain.text", expectedText);
+  }
+
+  clickFacilitiesTab() {
+    cy.get("#facilities").click();
+  }
+
+  typeFacilityName(facilityName) {
+    cy.get("input[name='facility']").click().type(facilityName);
+  }
+
+  selectFacilityFromDropdown(facilityName) {
+    cy.get("[role='option']").contains(facilityName).click();
+  }
+
+  clickLinkFacility() {
+    cy.get("#link-facility").click();
+  }
+
+  assertLinkedFacility(facilityName) {
+    cy.get("#linked-facility-list").should("contain.text", facilityName);
+  }
+
+  assertnotLinkedFacility(facilityName) {
+    cy.get("#linked-facility-list").should("not.contain", facilityName);
+  }
+
+  linkedfacilitylistnotvisible() {
+    cy.get("#linked-facility-list").should("not.exist");
+  }
+
+  assertHomeFacilitylink(facilityName) {
+    cy.get("#home-facility").should("contain.text", facilityName);
+  }
+
+  assertFacilityNotInDropdown(facilityName) {
+    this.typeFacilityName(facilityName);
+    cy.get("[role='option']").should("not.exist");
+  }
+
+  clickCloseSlideOver() {
+    cy.get("#close-slide-over").click();
+  }
+
+  clickHomeFacilityIcon() {
+    cy.get("#home-facility-icon").click();
+  }
+
+  clickUnlinkFacilityButton() {
+    cy.get("#unlink-facility-button").click();
+  }
+
+  clickSubmit() {
+    cy.get("#submit").click();
+  }
+
+  clicksetaveragehourbutton() {
+    cy.get("#avg-workinghour").click();
+  }
+
+  clearweeklyhourfield() {
+    cy.get("#weekly_working_hours").click().clear();
+  }
+
+  verifyErrorText(expectedError: string) {
+    cy.get(".error-text").should("contain", expectedError).and("be.visible");
+  }
+
+  typeInWeeklyWorkingHours(hours: string) {
+    cy.get("#weekly_working_hours").click().type(hours);
+  }
+
+  navigateToProfile() {
+    cy.get("#profilenamelink").click();
+  }
+
+  verifyWorkingHours(expectedHours: string) {
+    cy.get("#working-hours").should("contain", `${expectedHours} hours`);
+  }
+
+  verifyProfileWorkingHours(expectedHours: string) {
+    cy.get("#averageworkinghour-profile-details").should(
+      "contain",
+      expectedHours
+    );
+  }
+
+  navigateToFacility() {
+    cy.visit("/facility");
+  }
+
+  typeFacilitySearch(facilityName) {
+    cy.get("#search").click().type(facilityName);
+  }
+
+  assertFacilityInCard(facilityName) {
+    cy.get("#facility-name-card").should("contain", facilityName);
+  }
+
+  clickFacilityPatients() {
+    cy.get("#facility-patients").click();
+  }
+
+  clicklinkedskillbutton() {
+    cy.get("#skills").click();
+  }
+
+  clickAddSkillButton() {
+    cy.intercept("GET", "**/api/v1/skill/**").as("getSkills");
+    cy.get("#add-skill-button").click();
+    cy.wait("@getSkills").its("response.statusCode").should("eq", 200);
+  }
+
+  assertSkillInAlreadyLinkedSkills(skillName) {
+    cy.get("#already-linked-skills")
+      .contains(skillName)
+      .should("have.length", 1);
+  }
+
+  assertSkillIndoctorconnect(skillName) {
+    cy.get("#doctor-connect-home-doctor")
+      .contains(skillName)
+      .should("have.length", 1);
+  }
+
+  typeSkill(skillName) {
+    cy.get("#select-skill").click().type(skillName);
+  }
+
+  clickDoctorConnectButton() {
+    cy.get("#doctor-connect-patient-button").click();
+  }
+
+  clickUnlinkSkill() {
+    cy.get("#unlink-skill").click();
+  }
+
+  assertSkillInAddedUserSkills(skillName) {
+    cy.get("#added-user-skills").should("contain", skillName);
+  }
+
+  assertDoctorConnectVisibility(realName) {
+    cy.get("#doctor-connect-home-doctor").should("contain.text", realName);
+    cy.get("#doctor-connect-remote-doctor").should("contain.text", realName);
+  }
+}
+
+export default ManageUserPage;