Merge branch 'develop' into ImprovingVitalsMonitor#6549

shyamprakash123 · Nov 9, 2023 · 12d7bfc · 12d7bfc
2 parents a50458f + f7ac211
commit 12d7bfc
Show file tree

Hide file tree

Showing 8 changed files with 94 additions and 22 deletions.
diff --git a/cypress/e2e/assets_spec/assets_manage.cy.ts b/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();
   });

diff --git a/cypress/e2e/users_spec/user_manage.cy.ts b/cypress/e2e/users_spec/user_manage.cy.ts
@@ -10,10 +10,13 @@ describe("Manage User", () => {
   const usernametolinkfacilitydoc1 = "dummydoctor4";
   const usernametolinkfacilitydoc2 = "dummydoctor5";
   const usernametolinkfacilitydoc3 = "dummydoctor6";
-  const usernametolinkskill = "devdistrictadmin";
+  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();
@@ -25,10 +28,50 @@ describe("Manage User", () => {
     cy.awaitUrl("/users");
   });
 
-  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
+  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();

diff --git a/cypress/pageobject/Users/ManageUserPage.ts b/cypress/pageobject/Users/ManageUserPage.ts
@@ -103,10 +103,44 @@ export class ManageUserPage {
     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);

diff --git a/src/Components/Common/SkillSelect.tsx b/src/Components/Common/SkillSelect.tsx
@@ -5,6 +5,7 @@ import AutoCompleteAsync from "../Form/AutoCompleteAsync";
 import { SkillObjectModel } from "../Users/models";
 
 interface SkillSelectProps {
+  id?: string;
   name: string;
   errors?: string | undefined;
   className?: string;
@@ -20,6 +21,7 @@ interface SkillSelectProps {
 
 export const SkillSelect = (props: SkillSelectProps) => {
   const {
+    id,
     name,
     multiple,
     selected,
@@ -64,6 +66,7 @@ export const SkillSelect = (props: SkillSelectProps) => {
 
   return (
     <AutoCompleteAsync
+      id={id}
       name={name}
       multiple={multiple}
       selected={selected}

diff --git a/src/Components/Form/AutoCompleteAsync.tsx b/src/Components/Form/AutoCompleteAsync.tsx
@@ -10,6 +10,7 @@ import {
 import { useTranslation } from "react-i18next";
 
 interface Props {
+  id?: string;
   name?: string;
   selected: any | any[];
   fetchData: (search: string) => Promise<any> | undefined;
@@ -31,6 +32,7 @@ interface Props {
 
 const AutoCompleteAsync = (props: Props) => {
   const {
+    id,
     name,
     selected,
     fetchData,
@@ -82,6 +84,7 @@ const AutoCompleteAsync = (props: Props) => {
         <div className="relative mt-1">
           <div className="flex">
             <Combobox.Input
+              id={id}
               name={name}
               className="cui-input-base truncate pr-16"
               placeholder={

diff --git a/src/Components/Users/SkillsSlideOver.tsx b/src/Components/Users/SkillsSlideOver.tsx
@@ -117,6 +117,7 @@ export default ({ show, setShow, username }: IProps) => {
             {!isLoading && (
               <div className="tooltip flex items-center gap-2">
                 <SkillSelect
+                  id="select-skill"
                   multiple={false}
                   name="skill"
                   disabled={!authorizeForAddSkill}
@@ -128,6 +129,7 @@ export default ({ show, setShow, username }: IProps) => {
                   username={username}
                 />
                 <ButtonV2
+                  id="add-skill-button"
                   disabled={!authorizeForAddSkill}
                   onClick={() => addSkill(username, selectedSkill)}
                   className="w-6rem"
@@ -146,7 +148,7 @@ export default ({ show, setShow, username }: IProps) => {
                 <CircularProgress />
               </div>
             ) : (
-              <div className="mb-2 mt-4">
+              <div className="mb-2 mt-4" id="added-user-skills">
                 {hasSkills ? (
                   <SkillsArray
                     isLoading={isLoading}

diff --git a/src/Components/Users/SkillsSlideOverComponents.tsx b/src/Components/Users/SkillsSlideOverComponents.tsx
@@ -45,6 +45,7 @@ export const SkillsArray = ({
             <div className="text-lg font-bold">{skill.skill_object.name}</div>
             <div>
               <ButtonV2
+                id="unlink-skill"
                 size="small"
                 variant="danger"
                 ghost={true}

diff --git a/src/Components/Users/UserProfile.tsx b/src/Components/Users/UserProfile.tsx
@@ -559,7 +559,10 @@ export default function UserProfile() {
                       Skills
                     </dt>
                     <dd className="mt-1 text-sm leading-5 text-gray-900">
-                      <div className="flex flex-wrap gap-2">
+                      <div
+                        className="flex flex-wrap gap-2"
+                        id="already-linked-skills"
+                      >
                         {details.skills && details.skills.length
                           ? details.skills?.map((skill: SkillObjectModel) => {
                               return (