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.

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

Production release v3.0.2 #10800

Merged
merged 161 commits into from
Feb 24, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
161 commits
Select commit Hold shift + click to select a range
aeed2c5
Initial Commit
amjithtitus09 Jan 30, 2025
333a6ee
Quick Access changes
amjithtitus09 Jan 31, 2025
7d25197
Merge branch 'develop' of https://github.com/ohcnetwork/care_fe into …
amjithtitus09 Feb 3, 2025
f34783c
Merge branch 'develop' of https://github.com/ohcnetwork/care_fe into …
amjithtitus09 Feb 4, 2025
cf27633
Encounter design
amjithtitus09 Feb 4, 2025
79f2c86
Merge branch 'develop' of https://github.com/ohcnetwork/care_fe into …
amjithtitus09 Feb 5, 2025
eb209c5
Restore package-lock.json
amjithtitus09 Feb 5, 2025
b3ba936
Allergy & Symptom table styling
amjithtitus09 Feb 5, 2025
d4c2591
Diagnosis table styling
amjithtitus09 Feb 5, 2025
0e11304
Allergy table styling
amjithtitus09 Feb 5, 2025
957a409
Treatment summary
amjithtitus09 Feb 6, 2025
fbe023e
Merge branch 'develop' of https://github.com/ohcnetwork/care_fe into …
amjithtitus09 Feb 6, 2025
d1612c5
Remove Tags
amjithtitus09 Feb 6, 2025
27f9811
Remove treatment summary
amjithtitus09 Feb 6, 2025
bff25f4
Add dashed lines
amjithtitus09 Feb 6, 2025
ba0e66a
Restore package-lock.json
amjithtitus09 Feb 6, 2025
686e53e
aria label for icons
amjithtitus09 Feb 6, 2025
cff8dd6
Merge branch 'develop' of https://github.com/ohcnetwork/care_fe into …
amjithtitus09 Feb 6, 2025
9ba1143
Restore package-lock.json
amjithtitus09 Feb 6, 2025
12a2eb3
Restore package-lock.json
amjithtitus09 Feb 6, 2025
c7c0e50
Merge branch 'develop' of https://github.com/ohcnetwork/care_fe into …
amjithtitus09 Feb 6, 2025
a3e4b0f
Grey out error allergies, check Hospitalzation, no organizations
amjithtitus09 Feb 6, 2025
bb8a1eb
Merge branch 'develop' into encounter-overview-design
nihal467 Feb 6, 2025
bc16c0a
Merge branch 'develop' of https://github.com/ohcnetwork/care_fe into …
amjithtitus09 Feb 6, 2025
bcfd7a1
Merge branch 'encounter-overview-design' of https://github.com/ohcnet…
amjithtitus09 Feb 6, 2025
9fbafc9
Merge branch 'encounter-overview-design' of https://github.com/ohcnet…
amjithtitus09 Feb 6, 2025
bc80406
Readmission | Yes or no
amjithtitus09 Feb 6, 2025
5802a6c
Merge branch 'encounter-overview-design' of https://github.com/ohcnet…
amjithtitus09 Feb 6, 2025
bd0b5ed
Treatment summary button
amjithtitus09 Feb 6, 2025
9dc9d87
Merge branch 'develop' of https://github.com/ohcnetwork/care_fe into …
amjithtitus09 Feb 6, 2025
c1e4af0
Rearrange header items
amjithtitus09 Feb 6, 2025
8f3ff45
Fix Link colour
amjithtitus09 Feb 6, 2025
fd55783
Merge from develop
amjithtitus09 Feb 7, 2025
2791b22
Revert fields that don't even exist
amjithtitus09 Feb 7, 2025
de7a3be
Fix type, revert type modification
amjithtitus09 Feb 7, 2025
7649b45
Fix error and format name
amjithtitus09 Feb 7, 2025
da958f1
Fix : Hover color for active button (#10496)
Jeffrin2005 Feb 8, 2025
2706371
Switch to using cn and variants for AlertDialogAction (#10466) (#10499)
abdulazeespr Feb 9, 2025
f4e9416
sanitize html before rendering it unsafely (#10485)
khavinshankar Feb 10, 2025
b83e0bc
Merge branch 'develop' of https://github.com/ohcnetwork/care_fe into …
amjithtitus09 Feb 10, 2025
be85955
Minor fixes in Encounter, Medication, Administration (#10488)
amjithtitus09 Feb 10, 2025
9b68ee7
Merge branch 'develop' of https://github.com/ohcnetwork/care_fe into …
amjithtitus09 Feb 10, 2025
020261a
Adds support for usePaginatedQuery
rithviknishad Feb 10, 2025
36dd2ef
Always show See note button
amjithtitus09 Feb 10, 2025
d82f91c
Merge branch 'rithviknishad/feat/use-paginated-query' of https://gith…
amjithtitus09 Feb 10, 2025
3f0837c
Add support for enabling or disabling query
rithviknishad Feb 10, 2025
eb3ee74
Add support for enabling or disabling query
rithviknishad Feb 10, 2025
2f3baee
Merge branch 'rithviknishad/feat/use-paginated-query' of https://gith…
amjithtitus09 Feb 10, 2025
b990c81
Minor fixes in resource creation form (#10218)
Rishith25 Feb 10, 2025
547edc4
FIXED:- Improve Visibility of Status, Role, and Contact numbers on Us…
modamaan Feb 10, 2025
4940cb0
switch to `query.paginated`
rithviknishad Feb 10, 2025
b4af416
Merge branch 'rithviknishad/feat/use-paginated-query' of https://gith…
amjithtitus09 Feb 10, 2025
b38c0ce
Medication load data, other requested changes
amjithtitus09 Feb 10, 2025
ebfcd79
fix paginatedQuery not paginating
rithviknishad Feb 10, 2025
d0c0c04
Styling changes
amjithtitus09 Feb 10, 2025
55d001e
Merge branch 'rithviknishad/feat/use-paginated-query' of https://gith…
amjithtitus09 Feb 10, 2025
d0c3406
Replaced the older components with ShadCN components in the ResourceC…
NikhilA8606 Feb 10, 2025
30872e8
Merge branch 'develop' of https://github.com/ohcnetwork/care_fe into …
amjithtitus09 Feb 10, 2025
3d43aea
Use usePaginatedQuery
amjithtitus09 Feb 10, 2025
8c9875d
allow overriding filters
rithviknishad Feb 10, 2025
8c94318
Merge branch 'rithviknishad/feat/use-paginated-query' of https://gith…
amjithtitus09 Feb 10, 2025
bbdcd80
Minor Overview changes
amjithtitus09 Feb 10, 2025
a6aa5e0
File Archiving, Perms, Card Layout (#10384)
Jacobjeevan Feb 10, 2025
3cf5a5c
Remove unnecessary console log in AllergyList component (#10542)
rithviknishad Feb 10, 2025
01f37a6
Merge branch 'develop' of https://github.com/ohcnetwork/care_fe into …
amjithtitus09 Feb 10, 2025
cbcb64f
Add missing i18n translations (#10463)
rajku-dev Feb 10, 2025
97ac507
Merge branch 'develop' into treatment-summary-ui
amjithtitus09 Feb 10, 2025
5a73bf2
Added Scripts to Generate headers for CF Pages (#10535)
tellmeY18 Feb 11, 2025
ec2c49a
Merge branch 'develop' of https://github.com/ohcnetwork/care_fe into …
amjithtitus09 Feb 11, 2025
ba9f30b
Fix loading
amjithtitus09 Feb 11, 2025
01825f2
Update src/components/Patient/TreatmentSummary.tsx
amjithtitus09 Feb 11, 2025
9f223f8
Added confirmation before marking encounter as complete (#10523)
shivankacker Feb 11, 2025
23deb69
Fixes token not refreshing in background (#10556)
rithviknishad Feb 11, 2025
b379fae
Rename schedule api file to be consistent with other api file namings…
rithviknishad Feb 11, 2025
6044c46
Clean up unused encounter import
bodhish Feb 11, 2025
7f8f65a
skip unimported check in pre-commit (#10557)
rithviknishad Feb 11, 2025
af4e4c1
Location Popover & History Sheet (#10540)
amjithtitus09 Feb 11, 2025
a411570
Merge branch 'develop' of https://github.com/ohcnetwork/care_fe into …
amjithtitus09 Feb 11, 2025
30ecfd2
Merge pull request #10447 from ohcnetwork/treatment-summary-ui
amjithtitus09 Feb 11, 2025
5c72e51
Add autoComplete attribute for OTP input (#10561)
rithviknishad Feb 11, 2025
f71742f
User Form: Pass in Org to GovtSelector only if Org is Govt (#10518)
Jacobjeevan Feb 11, 2025
2151c1a
Update dependency lucide-react to ^0.475.0 (#10497)
renovate[bot] Feb 11, 2025
8699a3d
Update all dependencies (minor, patch) (#10495)
renovate[bot] Feb 11, 2025
29060ed
Improves responsiveness of Encounter Medicines tab (#10511)
Tanuj1718 Feb 11, 2025
a6cc4cf
Enhancements to Encounter Discussion/Notes | Fix Translation (#10156)
rajku-dev Feb 12, 2025
98286c6
Date handling in DOB section (#10415)
Tanuj1718 Feb 12, 2025
66ef836
Refactor Breadcrumbs: Restrict to Locations. (#10539)
DonXavierdev Feb 12, 2025
6654829
Update dependency @sentry/browser to v9 (#10544)
renovate[bot] Feb 12, 2025
b097800
Update dependency @hookform/resolvers to v4 (#10543)
renovate[bot] Feb 12, 2025
7d7cfd6
Fix: Resource filters in mobile view (#10402)
Rishith25 Feb 12, 2025
524b9e3
fix: update gender validation to include required error message (#10577)
areebahmeddd Feb 12, 2025
d9bf2c7
Add pagination for questionaires (#10575)
Mahendar0701 Feb 12, 2025
ad5cfa4
Fix `PatientUsers` card | Dialog | AddUserSheet | UserSelector Overfl…
rajku-dev Feb 13, 2025
6c5cefc
Fix Translations Not Loading for Global Zod Validators Error Messages…
rajku-dev Feb 13, 2025
2c7e95f
Fix: Redesign the Open view of Department/Teams (#10558)
abhimanyurajeesh Feb 13, 2025
16af629
Migrated Dialog and ConfirmDialog with shadCN component (#10510)
NikhilA8606 Feb 13, 2025
52efe89
Enhance LocationSearch: Use "instance" for search & Adjust Input Padd…
DonXavierdev Feb 13, 2025
0e09cfe
fix: modify UserDashboard avatar to use formatDisplayName (#10593)
areebahmeddd Feb 14, 2025
20126a4
Removed Unnecessary Tabs component (#10604)
NikhilA8606 Feb 14, 2025
f439229
updated the reCAPTCHA Key (#10596)
tellmeY18 Feb 14, 2025
d3fc34d
Combined ResourceCreate page and ResourceDetailsUpdate page (#10576)
NikhilA8606 Feb 14, 2025
d14283b
Bump package version to 3.0.0
bodhish Feb 14, 2025
c6043cb
Replaced all deprecated classNames with cn function (#10605)
NikhilA8606 Feb 15, 2025
21ecdf5
handle backend returning null for gender (#10614)
AdityaJ2305 Feb 15, 2025
166b2a2
added plug hook PatientInfoCardMarkAsComplete (#10641)
khavinshankar Feb 17, 2025
b54f10e
🧹 Remove unused configs, utilities, APIs, styles + enable React `Stri…
rithviknishad Feb 17, 2025
4ecd90a
resolved Appointments select practitioner options Bug: popover incons…
hrit2773 Feb 17, 2025
3fd6849
fix: Update breadcrumb link to use parent organization ID in path (#1…
abhimanyurajeesh Feb 17, 2025
ae6a04c
Fixes resource form unable to pre-fill facility if beyond 1st page
rithviknishad Feb 17, 2025
5a109fc
fix autocomplete options being excluded
rithviknishad Feb 17, 2025
5a2e857
chore(deps): update dependency @trivago/prettier-plugin-sort-imports …
renovate[bot] Feb 17, 2025
7f8dbc8
Merge pull request #10646 from ohcnetwork/rithviknishad/fix/autocompl…
khavinshankar Feb 17, 2025
72f0211
fixed the cypress failure
nihal467 Feb 17, 2025
1c070db
Merge pull request #10649 from ohcnetwork/fix-cypress
khavinshankar Feb 17, 2025
6cc9168
Fix: Redesign the User view of Department/Teams (#10568)
abhimanyurajeesh Feb 17, 2025
66ac16e
Fix: Facility switcher and Organization switcher edge case handled (#…
Rishith25 Feb 18, 2025
a013d6c
fixed location sheet UI bug (#10619)
hrit2773 Feb 18, 2025
d5b769a
Add phone number search for organization users (#10598)
Mahendar0701 Feb 18, 2025
fc9e022
Show hyphen when no severity in SymptomTable (#10662)
rajku-dev Feb 18, 2025
092aae6
Update all dependencies (minor, patch) (#10562)
renovate[bot] Feb 18, 2025
4bb0fb7
Discharge Summary (#10570)
amjithtitus09 Feb 18, 2025
f3359ea
Fix: Facility name update in facility switcher (#10665)
Rishith25 Feb 18, 2025
723c366
Enhance Comment Section UI with Redesigned User Icon and Styling (#10…
modamaan Feb 18, 2025
6210472
Fixed the cypress failure caused by the encounter UI modifications (#…
nihal467 Feb 18, 2025
2fd019f
Valueset UI (#10590)
amjithtitus09 Feb 18, 2025
fa57650
Prevent auto focus issue in Org. Patient Search (#10609)
rithviknishad Feb 19, 2025
1161c95
Merge pull request #10693 from ohcnetwork/develop
gigincg Feb 19, 2025
56defe9
Fixes certain users from being unable to view an encounter from organ…
rithviknishad Feb 19, 2025
d8857ae
Fixed blinking issue while lazy loading plugin components (#10702)
khavinshankar Feb 19, 2025
d837789
Update dependency jspdf to v3 (#10690)
renovate[bot] Feb 19, 2025
0d089c3
Update all dependencies (minor, patch) (#10670)
renovate[bot] Feb 19, 2025
62b251b
Add react-scan (#10710)
sainak Feb 20, 2025
4e599fa
Encounter Create - Organization required (#10691)
amjithtitus09 Feb 20, 2025
25e8186
Location Prefill with current location (#10719)
amjithtitus09 Feb 20, 2025
b6aa5d9
Refactor organization search to use query params (#10717)
abhimanyurajeesh Feb 20, 2025
073b88f
Merge pull request #10726 from ohcnetwork/develop
rithviknishad Feb 20, 2025
ac6ba9c
Add count to resource and encounter page (#10700)
Mahendar0701 Feb 20, 2025
bb382e8
Fixed Pagination in facility specific user tab (#10729)
nihal467 Feb 20, 2025
89918fe
Update dependency vite-plugin-checker to ^0.9.0 (#10730)
renovate[bot] Feb 20, 2025
39f79e2
Update all dependencies (minor, patch) (#10709)
renovate[bot] Feb 20, 2025
e250548
fix: Organization Users page needs responsiveness (#10413)
Tanuj1718 Feb 20, 2025
ba6b0fc
Redesign the Facility Details Page (#10380)
AdityaJ2305 Feb 20, 2025
213fb25
solved cover image upload type error (#10630)
Tanuj1718 Feb 20, 2025
d58936d
Fixes delete button alignment in ValueSet Form (#10737)
Agastya18 Feb 21, 2025
f89007b
Patient Tabs Fixes (#10642)
Jacobjeevan Feb 21, 2025
8f22c25
Questionnaire tags search and popover (#10703)
Jacobjeevan Feb 21, 2025
da97c2f
Questionnaire List & Edit UI Redesign (#10678)
amjithtitus09 Feb 21, 2025
f803670
Adding patient Id to props in Encounter Files (#10745)
Jacobjeevan Feb 21, 2025
8debf38
Location Availability display fix (#10749)
amjithtitus09 Feb 21, 2025
e5f90e3
Questionnaire list & create minor fixes (#10747)
amjithtitus09 Feb 21, 2025
0457cfa
Refactor padding in Page component | Resource and Prescription Previe…
Rishith25 Feb 21, 2025
69eb11c
add fallback url for goBack() (#10146)
Rishith25 Feb 21, 2025
cade03f
Generate link to the package manager in SBOM page using PURL (#10625)
rajku-dev Feb 21, 2025
bca7b81
fix(deps): update all dependencies (minor, patch) (#10750)
renovate[bot] Feb 21, 2025
dcefa36
fix(deps): update dependency sonner to v2 (#10683)
renovate[bot] Feb 21, 2025
569fecb
Re-design Encounter Card (#10579)
AdityaJ2305 Feb 21, 2025
52923a4
Fixing Valueset editor refetching bug (#10741)
hrit2773 Feb 21, 2025
57ad12d
Fix Bugs in User and Facility Avatar Upload and Deletion Workflow (#1…
rajku-dev Feb 21, 2025
327a2b8
chore(deps): update all dependencies (minor, patch) (#10757)
renovate[bot] Feb 22, 2025
7749aba
Disabled the location form dropdown for edit form (#10791)
nihal467 Feb 24, 2025
aa865ec
Merge pull request #10790 from ohcnetwork/develop
rithviknishad Feb 24, 2025
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
2 changes: 2 additions & 0 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ REACT_APP_META_DESCRIPTION="Revolutionizing EMR with AI: Open Healthcare Network
REACT_APP_COVER_IMAGE=https://cdn.ohc.network/care_logo.svg
REACT_APP_COVER_IMAGE_ALT=https://cdn.ohc.network/care_logo.svg
REACT_PUBLIC_URL=https://care.ohc.network
HEADERS="/*\n Strict-Transport-Security: max-age=63072000; includeSubDomains; preload\n X-XSS-Protection: 1; mode=block\n X-Frame-Options: SAMEORIGIN\n X-Content-Type-Options: nosniff\n Referrer-Policy: strict-origin-when-cross-origin\n Permissions-Policy: geolocation=(self), microphone=()"
REACT_RECAPTCHA_SITE_KEY=6LcedK8qAAAAAM2PpuqlqhZUxQpmIqHqluL74dDs

# Care API URL without the /api prefix
REACT_CARE_API_URL=https://careapi.ohc.network
Expand Down
10 changes: 0 additions & 10 deletions .example.env
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,6 @@ REACT_CUSTOM_DESCRIPTION=
# Google Maps API key
REACT_GMAPS_API_KEY=

# Government data API key
REACT_GOV_DATA_API_KEY=

# reCAPTCHA site key
REACT_RECAPTCHA_SITE_KEY=

Expand All @@ -47,16 +44,9 @@ REACT_SENTRY_DSN=
# Sentry environment (default: staging)
REACT_SENTRY_ENVIRONMENT=

# Camera feed, still watching idle timeout (in seconds; default: 180)
REACT_STILL_WATCHING_IDLE_TIMEOUT=

# Camera feed, still watching prompt duration (in seconds; default: 30)
REACT_STILL_WATCHING_PROMPT_DURATION=

# Feature flags
REACT_ENABLE_HCX=true
REACT_ENABLE_ABDM=true
REACT_WARTIME_SHIFTING=true

# JWT token refresh interval (in milliseconds) (default: 5 minutes)
REACT_JWT_TOKEN_REFRESH_INTERVAL=
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -67,3 +67,4 @@ src/pluginMap.ts
# Federation Temp files
/.__mf__temp
public/sbom/*
public/_headers
17 changes: 1 addition & 16 deletions care.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -58,22 +58,7 @@ const careConfig = {
gmapsApiKey:
env.REACT_GMAPS_API_KEY || "AIzaSyDsBAc3y7deI5ZO3NtK5GuzKwtUzQNJNUk",

govDataApiKey:
env.REACT_GOV_DATA_API_KEY ||
"579b464db66ec23bdd000001cdd3946e44ce4aad7209ff7b23ac571b",
reCaptchaSiteKey:
env.REACT_RECAPTCHA_SITE_KEY || "6LdvxuQUAAAAADDWVflgBqyHGfq-xmvNJaToM0pN",

wartimeShifting: boolean("REACT_WARTIME_SHIFTING"),

stillWatching: {
idleTimeout: env.REACT_STILL_WATCHING_IDLE_TIMEOUT
? parseInt(env.REACT_STILL_WATCHING_IDLE_TIMEOUT)
: 3 * 60,
promptDuration: env.REACT_STILL_WATCHING_PROMPT_DURATION
? parseInt(env.REACT_STILL_WATCHING_PROMPT_DURATION)
: 30,
},
reCaptchaSiteKey: env.REACT_RECAPTCHA_SITE_KEY,

auth: {
tokenRefreshInterval: env.REACT_JWT_TOKEN_REFRESH_INTERVAL
Expand Down
9 changes: 6 additions & 3 deletions cypress/e2e/patient_spec/patient_creation.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ const patientEncounter = new PatientEncounter();
const ENCOUNTER_TYPE = "Observation";
const ENCOUNTER_STATUS = "In Progress";
const ENCOUNTER_PRIORITY = "ASAP";
const ORGANIZATION_NAME = "Administration";

describe("Patient Management", () => {
const TEST_PHONE = "9495031234";
Expand Down Expand Up @@ -106,7 +107,7 @@ describe("Patient Management", () => {

patientTestCases.forEach(({ description, data }) => {
it(`creates a new ${description} and verifies registration`, () => {
facilityCreation.selectFacility("GHC Trikaripur");
facilityCreation.selectFacility("GHC payyanur");
patientCreation
.clickSearchPatients()
.clickCreateNewPatient()
Expand All @@ -122,6 +123,7 @@ describe("Patient Management", () => {
.selectEncounterType(ENCOUNTER_TYPE)
.selectEncounterStatus(ENCOUNTER_STATUS)
.selectEncounterPriority(ENCOUNTER_PRIORITY)
.selectOrganization(ORGANIZATION_NAME)
.clickSubmitEncounter()
.assertEncounterCreationSuccess();

Expand All @@ -134,7 +136,7 @@ describe("Patient Management", () => {
});

it("Search patient with phone number and create a new encounter", () => {
facilityCreation.selectFacility("GHC Trikaripur");
facilityCreation.selectFacility("GHC payyanur");
patientCreation
.clickSearchPatients()
.searchPatient(TEST_PHONE)
Expand All @@ -150,6 +152,7 @@ describe("Patient Management", () => {
.selectEncounterType(ENCOUNTER_TYPE)
.selectEncounterStatus(ENCOUNTER_STATUS)
.selectEncounterPriority(ENCOUNTER_PRIORITY)
.selectOrganization(ORGANIZATION_NAME)
.clickSubmitEncounter()
.assertEncounterCreationSuccess();

Expand All @@ -167,7 +170,7 @@ describe("Patient Management", () => {
address: generateAddress(true),
};

facilityCreation.selectFacility("GHC Trikaripur");
facilityCreation.selectFacility("GHC payyanur");
patientEncounter
.navigateToEncounters()
.openFirstEncounterDetails()
Expand Down
2 changes: 1 addition & 1 deletion cypress/e2e/patient_spec/patient_details.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ describe("Patient Management", () => {
it("Assign users to a patient", () => {
const userName = "nihal-nurse";
const userRole = "Nurse";
facilityCreation.selectFacility("GHC Trikaripur");
facilityCreation.selectFacility("GHC payyanur");
patientEncounter
.navigateToEncounters()
.openFirstEncounterDetails()
Expand Down
2 changes: 1 addition & 1 deletion cypress/e2e/patient_spec/patient_encounter.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ describe("Patient Encounter Questionnaire", () => {
pco2: "120",
po2: "80",
};
facilityCreation.selectFacility("GHC Trikaripur");
facilityCreation.selectFacility("GHC payyanur");

// Chain the methods instead of multiple separate calls
patientEncounter
Expand Down
9 changes: 4 additions & 5 deletions cypress/pageObject/Patients/PatientEncounter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ export class PatientEncounter {
}

clickUpdateEncounter() {
cy.verifyAndClickElement('[data-cy="update-encounter-button"]', "Update");
cy.verifyAndClickElement(
'[data-cy="update-encounter-option"]',
"Update Encounter",
Expand Down Expand Up @@ -76,10 +75,10 @@ export class PatientEncounter {
}

clickPatientDetailsButton() {
cy.verifyAndClickElement(
'[data-cy="patient-details-button"]',
"Patient Details",
);
cy.get('[data-cy="patient-details-button"]')
.filter(":visible")
.first()
.click();
return this;
}

Expand Down
5 changes: 5 additions & 0 deletions cypress/pageObject/Patients/PatientVerify.ts
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,11 @@ class PatientVerify {
return this;
}

selectOrganization(organization: string) {
cy.clickAndSelectOption('[data-cy="facility-organization"]', organization);
return this;
}

clickSubmitEncounter() {
cy.clickSubmitButton("Create Encounter");
return this;
Expand Down
2 changes: 1 addition & 1 deletion cypress/pageObject/Users/UserCreation.ts
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ export class UserCreation {
{ label: "Confirm Password", message: "Required" },
{
label: "Phone Number",
message: "Invalid input",
message: "This field is required",
},
{ label: "State", message: "Required" },
]);
Expand Down
2 changes: 1 addition & 1 deletion cypress/pageObject/facility/FacilityCreation.ts
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ export class FacilityCreation {
{ label: "Address", message: "Address is required" },
{
label: "Phone Number",
message: "Invalid input",
message: "This field is required",
},
{ label: "Pincode", message: "Invalid Pincode" },
]);
Expand Down
Loading
Loading