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

Syncing client-registry branch with main #1282

Closed
wants to merge 92 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
92 commits
Select commit Hold shift + click to select a range
99c4564
(fix) O3-2998: Fix previous date being selected on monthly calendar v…
usamaidrsk Jun 12, 2024
1893e29
(fix) O3-2878: Appointment Scheduler Allows Creation of Duplicate App…
mogoodrich Jun 12, 2024
cdcae15
O3-3210 ward app - configuration system for ward patient cards (#1184)
chibongho Jun 12, 2024
3d4f728
(fix) O3-2878: Appointment Scheduler Allows Creation of Duplicate App…
mogoodrich Jun 12, 2024
77cda1d
Fix service queues workspace names (#1189)
brandones Jun 13, 2024
8926ff8
(docs) Update testing guidance in README (#1190)
kb019 Jun 13, 2024
511ea44
(feat)O3-3409:Align service queue serve patient column to display nec…
makombe Jun 13, 2024
5ed79a4
(fix) O3-3199: Service Queues - queue table not updated after transit…
brandones Jun 17, 2024
df34338
(fix) O3-3301 register bedmanagement-module feature flag and relax ba…
chibongho Jun 17, 2024
116a3c1
(fix) Fixup registration form submit button loading state
denniskigen Jun 17, 2024
85fc5c9
(feat) O3-3080: Improvements to the location dropdown in the service …
vasharma05 Jun 18, 2024
f1b313c
(feat) O3-3215 - ward app - add patient card element to display obs f…
chibongho Jun 20, 2024
3483af3
(fix) for O3-2827: Appointments: Refactor (Part I ?) (#1199)
mogoodrich Jun 21, 2024
7636c70
(chore) Update translations from Transifex (#1097)
github-actions[bot] Jun 21, 2024
1a8a555
(refactor) Refactor modals to match naming conventions (#1198)
denniskigen Jun 21, 2024
3ed6166
(fix) Light theme for estimated DOB fields in the patient registratio…
vasharma05 Jun 24, 2024
f6694c3
(fix) Remove implementation-specific default identifier types (#1200)
denniskigen Jun 24, 2024
7d121c7
(fix): Update date picker props and add mock for date picker (#1212)
NethmiRodrigo Jun 26, 2024
881c31e
O3-3475 - ward app - update to use latest backend bed-management modu…
chibongho Jun 26, 2024
10951b2
(feat) - O3-3222 - ward app - add patient card element to include ris…
chibongho Jun 26, 2024
9e979f5
(fix): Update onChange function in obs date field (#1214)
NethmiRodrigo Jun 26, 2024
fb9d9e8
(fix) Improvements to workspace system styling (supports O3-3246) (#1…
brandones Jun 27, 2024
fbd1534
(fix) Replace deprecated displayName with getPatientName (#1215)
denniskigen Jun 27, 2024
09a8237
(feat) O3-3122: Improve UI for Queue by status view in the service qu…
vasharma05 Jun 27, 2024
966501b
(feat) O3-3097: Add status filter and replace queue filter with servi…
vasharma05 Jun 27, 2024
16e1202
(feat) O3-3224:Ward App - add button, workspace, and configurable car…
kb019 Jun 27, 2024
e16c885
fix date value processing issue (#1216)
kajambiya Jun 28, 2024
4d9bf46
(feat) O3-3502 - ward app - add REST calls and datatypes for inpatien…
chibongho Jun 28, 2024
96e8ff7
(chore) Bump turbo
denniskigen Jun 30, 2024
02ad417
(fix) O3-2120: Move `OpenMRS ID` patient search identifier to `defaul…
usamaidrsk Jul 1, 2024
2bbc81e
(fix) O3-3519: Identifier source should be mapped to the defined iden…
vasharma05 Jul 1, 2024
e6a9ec0
(fix) O3-3418 service queues fails to re-fetch after delete ops (#1210)
PiusKariuki Jul 1, 2024
d35231c
(chore) Update translations from Transifex (#1201)
github-actions[bot] Jul 1, 2024
3661456
(chore) Add remote caching to E2E workflow using turborepo-gh-artifac…
denniskigen Jul 2, 2024
2e52cb1
(fix) O3-3533 & O3-3535: Improvements to previous implementation for …
vasharma05 Jul 3, 2024
3fd771f
(fix) - O3-3222 - make coded obs not appear duplicated. (#1221)
chibongho Jul 3, 2024
80d388a
(fix) O3-3524: Add wrapping functions to write value in session stora…
vasharma05 Jul 4, 2024
357b084
(fix) O3-3523: Refetch queue entry data when the search criteria chan…
vasharma05 Jul 4, 2024
f590e9f
(test) Add testing-related plugins to ESLint config (#1227)
denniskigen Jul 6, 2024
199906e
(fix) Additional test fixes
denniskigen Jul 6, 2024
20499f9
(feat) O3-3246 - Ward App - open patient record in workspace (#1226)
brandones Jul 9, 2024
83ff7c4
(fix):O3-3611-Disable automatic selection of upcoming appointment (#1…
makombe Jul 16, 2024
5de94c1
(fix) O3-3273: Scheduled appointments card always shows "Not arrived'…
mccarthyaaron Jul 17, 2024
4594375
(feat) O3-3613: Add Ward App to Left Hand Nav
mogoodrich Jul 17, 2024
1eef07c
(feat) O3-3613: Add Ward App to Left Hand Nav
mogoodrich Jul 17, 2024
664edfa
(feat) O3-3613: Add Ward App to Left Hand Nav
mogoodrich Jul 17, 2024
fbbaa35
O3-3212: Ward App - add configurable extension to include address com…
mogoodrich Jul 18, 2024
7e0ee5f
(chore) Release v7.1.0 (#1239)
denniskigen Jul 18, 2024
ef06777
(feat) O3-3125: Ward App - show patient cards for patients admitted b…
mogoodrich Jul 23, 2024
4d15398
(fix)O3-3590: Unable to change Provider and appointment duration when…
Faithaigo Jul 23, 2024
6bc6d55
(feat) O3-3192: Harvest bed administration functionality from ugandae…
brandones Jul 23, 2024
30642d6
(fix) O3-3192: Add i18n config for esm-bed-management-app (#1243)
brandones Jul 23, 2024
58949bb
(chore) Bump Playwright to 1.45.2 (#1242)
kdaud Jul 23, 2024
38d34e1
(feat) O3-3018: Adding metric tiles to the refApp homepage. (#1075)
arodidev Jul 24, 2024
f5d0aec
(fix) O3-3644: Ward App - use /inpatient/request EMRAPI endpoint inst…
brandones Jul 24, 2024
2de75c3
(fix) guard clause in case priorities is null (#1208)
PiusKariuki Jul 24, 2024
7f7fe3c
(fix) O3-3240: Fix appearance of card rows in admission request cards…
brandones Jul 24, 2024
80ef84c
(feat) O3-3243: Ward App - add configurable extension to include pati…
kb019 Jul 24, 2024
2686c0a
(fix) Fix some tests that were broken by f5d0aec #1247 (#1249)
brandones Jul 25, 2024
ab92df3
(feat) (part of) O3-3244: Improvements to the data fetching represent…
vasharma05 Jul 26, 2024
2c08c60
O3-3648: Ward App - Update Ward View after updating the Inpatient Vis…
mogoodrich Jul 26, 2024
92c84bc
(chore) O3-3069 - service queues - Tweak the queue table UI (#1256)
chibongho Jul 26, 2024
080c7ea
(chore) Update translations from Transifex (#1234)
github-actions[bot] Jul 26, 2024
40ea44c
(feat) O3-3200 - service queues - prevent setting of queue entry's st…
chibongho Jul 29, 2024
e0a71ec
(feat) O3-3244 & O3-3250: Add hook for fetching EMR Configuration (#1…
vasharma05 Jul 30, 2024
73bb46e
(test) Remove unnecessary partial mocks and improve typing (#1251)
denniskigen Jul 30, 2024
e290578
(test) Fix failing tests due to importDynamic initialization error (#…
denniskigen Aug 1, 2024
6171757
(chore): Update OpenmrsDatePicker props (#1262)
NethmiRodrigo Aug 1, 2024
da907fc
(feat) O3-3244: Assign beds to patients with admission requests (#1252)
vasharma05 Aug 2, 2024
120257c
(Fix) UI Issue with Jumbled Search Results when PatientSearchBar Comp…
amosmachora Aug 2, 2024
52605c0
(feat) O3-3642 : add service location filtering and unique service di…
donaldkibet Aug 2, 2024
020cde3
(feat) O3-3250: Add in-patient notes workspace (#1238)
usamaidrsk Aug 2, 2024
e1009ab
(fix) O3-3661: Admission Requests List should include both Admission …
mogoodrich Aug 2, 2024
6965618
(fix) O3-3661: Admission Requests List should include both Admission …
mogoodrich Aug 2, 2024
f2f22c4
Update README.md
denniskigen Aug 3, 2024
0b56d9d
(fix) Fix e2e tests that use the OpenmrsDatePicker (#1241)
NethmiRodrigo Aug 5, 2024
3c2a36d
(feat) O3-3213 - ward app - add elements to display time sin… (#1265)
chibongho Aug 5, 2024
e0288a0
BREAKING: Rework card config system (supports O3-3242) (#1263)
brandones Aug 5, 2024
ac24702
(feat) O3-3250: Display bed number and patient name in In-Patient wor…
usamaidrsk Aug 6, 2024
1c21bdd
(fix) O3-3260: When editing an appointment, changing the service prev…
mccarthyaaron Aug 7, 2024
d314437
(feat) O3-3761: Add `data-openmrs-role` data attributes to DOM elemen…
Vijaykv5 Aug 7, 2024
1bf3db0
(feat) O3-3604: Add notes history section on inpatient notes workspac…
usamaidrsk Aug 8, 2024
3d055b0
(fix) O3-3391: Appointments form should show errors if all fields wer…
senthil-athiban Aug 8, 2024
ba561a5
(feat) O3-3604 : Ward app - History section of inpatient notes form (…
mogoodrich Aug 9, 2024
2ff5ef0
Refactor ward patient card (#1273)
chibongho Aug 9, 2024
5c274b0
(feat) O3-3247: Add forms for transfer patient and swap bed (#1267)
vasharma05 Aug 12, 2024
bad87fe
(fix) Fixup IconButton usage + prettier
denniskigen Aug 12, 2024
721bb6e
(Fix) O3-3250: Fix reading from undefined `wardPatient` (#1278)
usamaidrsk Aug 12, 2024
a62f807
(chore) Update translations from Transifex (#1260)
github-actions[bot] Aug 12, 2024
b7771ab
(feat) O3-3242 - ward app - add admission request detail to admission…
chibongho Aug 13, 2024
f4d9e5d
(fix) O3-3789: Appointments data should exist before use (#1280)
jnsereko Aug 13, 2024
7f570ca
(refactor) Update Carbon styling import paths and tokens (#1281)
denniskigen Aug 13, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
53 changes: 49 additions & 4 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,14 @@
"env": {
"node": true
},
"extends": ["eslint:recommended", "plugin:@typescript-eslint/recommended"],
"extends": [
"eslint:recommended",
"plugin:@typescript-eslint/recommended",
"plugin:jest-dom/recommended",
"plugin:testing-library/react"
],
"parser": "@typescript-eslint/parser",
"plugins": ["@typescript-eslint", "react-hooks"],
"plugins": ["@typescript-eslint", "jest-dom", "react-hooks", "testing-library"],
"rules": {
"react-hooks/rules-of-hooks": "error",
// Disabling these rules for now just to keep the diff small. I'll enable them one by one as we go.
Expand All @@ -14,6 +19,11 @@
"@typescript-eslint/no-unused-vars": "off",
"@typescript-eslint/no-var-requires": "off",
"@typescript-eslint/triple-slash-reference": "off",
// The following rules need `noImplicitAny` to be set to `true` in our tsconfig. They are too restrictive for now, but should be reconsidered in future
"@typescript-eslint/no-unsafe-assignment": "off",
"@typescript-eslint/no-unsafe-call": "off",
"@typescript-eslint/no-unsafe-member-access": "off",
"@typescript-eslint/unbound-method": "off",
// Use `import type` instead of `import` for type imports https://typescript-eslint.io/blog/consistent-type-imports-and-exports-why-and-how
"@typescript-eslint/consistent-type-imports": [
"error",
Expand All @@ -22,7 +32,12 @@
}
],
"prefer-const": "off",
"no-console": ["error", { "allow": ["warn", "error"] }],
"no-console": [
"error",
{
"allow": ["warn", "error"]
}
],
"no-unsafe-optional-chaining": "off",
"no-explicit-any": "off",
"no-extra-boolean-cast": "off",
Expand Down Expand Up @@ -54,5 +69,35 @@
]
}
]
}
},
"overrides": [
{
"files": ["**/e2e/**"],
"rules": {
"testing-library/await-async-events": "off",
"testing-library/await-async-query": "off",
"testing-library/await-async-utils": "off",
"testing-library/no-await-sync-events": "off",
"testing-library/no-await-sync-queries": "off",
"testing-library/no-container": "off",
"testing-library/no-debugging-utils": "off",
"testing-library/no-dom-import": "off",
"testing-library/no-global-regexp-flag-in-query": "off",
"testing-library/no-manual-cleanup": "off",
"testing-library/no-node-access": "off",
"testing-library/no-promise-in-fire-event": "off",
"testing-library/no-render-in-lifecycle": "off",
"testing-library/no-unnecessary-act": "off",
"testing-library/no-wait-for-multiple-assertions": "off",
"testing-library/no-wait-for-side-effects": "off",
"testing-library/no-wait-for-snapshot": "off",
"testing-library/prefer-find-by": "off",
"testing-library/prefer-implicit-assert": "off",
"testing-library/prefer-presence-queries": "off",
"testing-library/prefer-query-by-disappearance": "off",
"testing-library/prefer-screen-queries": "off",
"testing-library/render-result-naming-convention": "off"
}
}
]
}
16 changes: 14 additions & 2 deletions .github/workflows/e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@ on:
branches:
- main

env:
TURBO_API: 'http://127.0.0.1:9080'
TURBO_TOKEN: ${{ secrets.TURBO_SERVER_TOKEN }}
TURBO_TEAM: ${{ github.repository_owner }}

jobs:
main:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -35,11 +40,18 @@ jobs:
if: steps.cache.outputs.cache-hit != 'true'
run: yarn install --immutable

- name: Setup local cache server for Turborepo
uses: felixmosh/turborepo-gh-artifacts@v3
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
server-token: ${{ env.TURBO_TOKEN }}


- name: Install Playwright Browsers
run: npx playwright install chromium --with-deps

- name: Build apps
run: yarn turbo run build --concurrency=5
run: yarn turbo run build --color --concurrency=5

- name: Run dev server
run: bash e2e/support/github/run-e2e-docker-env.sh
Expand All @@ -51,7 +63,7 @@ jobs:
run: yarn playwright test

- name: Stop dev server
if: "!cancelled()"
if: '!cancelled()'
run: docker stop $(docker ps -a -q)

- name: Upload Report
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,9 @@ dist
.turbo/
~

# Environment variables
.env

# Playwright and e2e tests
/test-results/
/playwright-report/
Expand Down
9 changes: 9 additions & 0 deletions .tx/config
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,15 @@ replace_edited_strings = false
keep_translations = false
resource_name = esm-appointments-app

[o:openmrs:p:openmrs-esm-patient-management:r:esm-bed-management-app]
file_filter = packages/esm-bed-management-app/translations/<lang>.json
source_file = packages/esm-bed-management-app/translations/en.json
source_lang = en
type = KEYVALUEJSON
replace_edited_strings = false
keep_translations = false
resource_name = esm-bed-management-app

[o:openmrs:p:openmrs-esm-patient-management:r:esm-patient-list-management-app]
file_filter = packages/esm-patient-list-management-app/translations/<lang>.json
source_file = packages/esm-patient-list-management-app/translations/en.json
Expand Down
19 changes: 10 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,15 @@

# OpenMRS Patient Management

This repository contains frontend modules for the OpenMRS SPA. These modules relate to registering and editing patients, searching for existing patients, creating and managing patient lists, managing patient queues in an outpatient setting and creating, editing and managing patient appointments. The modules within this repository include:
This repository contains frontend modules for O3. These modules relate to registering and editing patients, searching for existing patients, creating and managing patient lists, managing patient queues in an outpatient setting and creating, editing and managing patient appointments. The modules within this repository include:

- [Active visits app](packages/esm-active-visits-app/)
- [Appointments app](packages/esm-appointments-app/)
- [Service queues](packages/esm-service-queues-app/README.md)
- [Patient search](packages/esm-patient-search-app)
- [Patient registration](packages/esm-patient-registration-app)
- [Bed management](packages/esm-bed-management-app/)
- [Patient list management](packages/esm-patient-list-management-app)
- [Patient registration](packages/esm-patient-registration-app)
- [Patient search](packages/esm-patient-search-app)
- [Service queues](packages/esm-service-queues-app/README.md)
- [Ward](packages/esm-ward-app)

## Setup
Expand All @@ -20,7 +21,7 @@ Check out the developer documentation [here](http://o3-dev.docs.openmrs.org).

This monorepo uses [yarn](https://yarnpkg.com).

To install the dependancies, run:
To install the dependencies, run:

```bash
yarn install
Expand Down Expand Up @@ -90,7 +91,7 @@ yarn turbo run test:watch
To run tests for a specific package, pass the package name to the `--filter` flag. For example, to run tests for `esm-patient-conditions-app`, run:

```bash
yarn turbo run test --filter="esm-patient-conditions-app"
yarn turbo test --filter=@openmrs/esm-patient-conditions-app
```

To run a specific test file, run:
Expand Down Expand Up @@ -141,11 +142,11 @@ Then, in a separate terminal, run:
yarn test-e2e --headed
```

Please read [our e2e test guide](https://o3-docs.openmrs.org/docs/frontend-modules/testing#end-to-end-testing-with-playwright) for more information about E2E testing.
Please read [our E2E testing guide](https://o3-docs.openmrs.org/docs/frontend-modules/end-to-end-testing) for more information about E2E testing.

### Updating Playwright

To upgrade your Playwright version, ensure that you update both the package.json file and the [e2e/support/bamboo/playwright.Dockerfile](e2e/support/bamboo/playwright.Dockerfile).
To upgrade your Playwright version, update both the package.json file and the [e2e/support/bamboo/playwright.Dockerfile](e2e/support/bamboo/playwright.Dockerfile).

## Design patterns

Expand Down Expand Up @@ -177,7 +178,7 @@ After running it, make a PR or merge to `main` with the resulting changeset.
Once the version bump is merged, go to GitHub and
[draft a new release](https://github.com/openmrs/openmrs-esm-patient-management/releases/new).
The tag should be prefixed with `v` (e.g., `v3.2.1`), while the release title
should just be the version number (e.g., `3.2.1`). The creation of the GitHub release
should be the version number (e.g., `3.2.1`). The creation of the GitHub release
will cause GitHub Actions to publish the packages, completing the release process.

> Don't run `npm publish` or `yarn publish`. Use the above process.
6 changes: 6 additions & 0 deletions __mocks__/emr-configuration.mock.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
export const emrConfigurationMock = {
clinicianEncounterRole: { uuid: '240b26f9-dd88-4172-823d-4a8bfeb7841f' },
consultFreeTextCommentsConcept: { uuid: '162169AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' },
visitNoteEncounterType: { uuid: 'd7151f82-c1f3-4152-a605-2f9ea7414a79' },
admissionEncounterType: { uuid: 'e8151f82-c1f3-4152-a605-2f9ea7414a79' },
};
Loading