Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed facility selection issue in UserAddEditForm #9503

Merged
merged 9 commits into from
Dec 20, 2024
Merged

Fixed facility selection issue in UserAddEditForm #9503

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ac2793f
fixed facility selection issue in UserAddEditForm
khavinshankar Dec 20, 2024
488afc3
restructure the code lines and define viewport
nihal467 Dec 20, 2024
cdbca47
added timeout for handling consultation page flaky test
nihal467 Dec 20, 2024
16c1253
added timeout for element visibility
nihal467 Dec 20, 2024
2556f39
add a check to make sure the id doesn't have hidden class
nihal467 Dec 20, 2024
a8e9f79
removed unwanted check
nihal467 Dec 20, 2024
48c33e0
fixed cypress fails
khavinshankar Dec 20, 2024
8c2d1f0
update the manage patient dropdown id's
nihal467 Dec 20, 2024
ac57899
removed notification verification for recovered patient
nihal467 Dec 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions cypress/e2e/patient_spec/PatientConsultationDischarge.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ describe("Patient Discharge based on multiple reason", () => {
});

beforeEach(() => {
cy.viewport(1280, 720);
cy.restoreLocalStorage();
cy.clearLocalStorage(/filters--.+/);
cy.awaitUrl("/patients");
Expand Down Expand Up @@ -116,8 +117,6 @@ describe("Patient Discharge based on multiple reason", () => {
patientDischarge.interceptDischargePatient();
cy.clickSubmitButton("Acknowledge & Submit");
patientDischarge.verifyDischargePatient();
cy.verifyNotification("Patient Discharged Successfully");
cy.closeNotification();
// Verify the consultation dashboard reflection
cy.verifyContentPresence("#consultation-buttons", ["Recovered"]);
// Verify the dashboard and discharge information
Expand Down
7 changes: 1 addition & 6 deletions cypress/pageobject/Patient/PatientConsultation.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,12 +103,7 @@ export class PatientConsultationPage {
}

clickEditConsultationButton() {
cy.get("#consultation-buttons").scrollIntoView();
cy.get("button").contains("Manage Patient").click();
cy.verifyAndClickElement(
"#consultation-buttons",
"Edit Consultation Details",
);
cy.clickAndSelectOption("#show-more", "Edit Consultation Details", true);
}

interceptConsultation() {
Expand Down
4 changes: 2 additions & 2 deletions cypress/pageobject/Patient/PatientCreation.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ export class PatientPage {
cy.intercept("GET", "**/api/v1/consultation/**").as("getPatient");
cy.get("#patient-name-list").contains(patientName).click();
cy.wait("@getPatient").its("response.statusCode").should("eq", 200);
cy.get("#patient-name-consultation")
.should("be.visible")
cy.get("#patient-name-consultation", { timeout: 15000 })
.should("not.have.class", "hidden")
.contains(patientName);
}

Expand Down
2 changes: 1 addition & 1 deletion src/components/Patient/PatientInfoCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -662,7 +662,7 @@ export default function PatientInfoCard(props: PatientInfoCardProps) {
].map(
(action: any, i) =>
action[3] && (
<div key={i}>
<div key={i} role="option">
<Link
key={i}
className="dropdown-item-primary pointer-events-auto m-2 flex cursor-pointer items-center justify-start gap-2 rounded border-0 p-2 text-sm font-normal transition-all duration-200 ease-in-out"
Expand Down
6 changes: 4 additions & 2 deletions src/components/Users/UserAddEditForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ const UserAddEditForm = (props: UserProps) => {
...fieldMappings,
user_type: formData.user_type,
password: formData.password,
facilities: formData.facilities ? formData.facilities : undefined,
facilities: formData.facilities ?? undefined,
home_facility: formData.home_facility ?? undefined,
username: formData.username,
state: formData.state,
Expand Down Expand Up @@ -1265,7 +1265,9 @@ const UserAddEditForm = (props: UserProps) => {
defaults={userData ? state.form : initForm}
validate={validateForm}
onCancel={editUser ? handleCancel : () => goBack()}
onSubmit={editUser ? handleEditSubmit : handleSubmit}
onSubmit={() =>
editUser ? handleEditSubmit(state.form) : handleSubmit(state.form)
}
onDraftRestore={(newState) => {
dispatch({ type: "set_state", state: newState });
}}
Expand Down
Loading