Skip to content

Commit

Permalink
Updating demo to display ANC Visits Count. (#1841)
Browse files Browse the repository at this point in the history
* Added auth for publish to npm (#1775)

* OHRI-2122 Add Program Management under the TPT Program (#1779)

* OHRI-2122 Add Program Management under the TPT Program

* Tab Naming

* Add default translation values

* OHRI-2117 Add TPT program menu (#1781)

* (chore) remove condition for release on master push (#1778)

* OHRI-2109  Add TB Prevention link under Tuberculosis program in the clinical per… (#1782)

* Add TB Prevention link under Tuberculosis program in the clinical perspectives

* renaming

* renaming

* OHRI-2119: Populate the Recent TPT tiles on the TPT patient summary board (#1783)

* Populate the Recent TPT tiles on the TPT patient summary board

* update

* Update patient-summary.component.tsx

* Update patient-summary.component.tsx

* small update

* OHRI-2109: Add TB Prevention link under Tuberculosis program in the clinical perspectives (#1787)

* slight modification - the TB Prevention link comes first followed by TB Treatment

* update on the translator

* Update en.json

* Update en.json

* Update en.json

* OHRI-2011: Add a table of all enrolled clients in TPT Program (#1789)

* Add TB Prevention link under Tuberculosis program in the clinical perspectives

* Add a table of all enrolled clients in TPT Program

* Add a table of all enrolled clients in TPT Program

* Add the Previous TPT Cases Table on the patient summary board (#1790)

* OHRI-2123 TPT Enrolment List (#1786)

* OHRI-2123 TPT Enrolment List

* Exclude Intents in the formList prop

* Update config-schema.ts

* OHRI-1916 : Maternal visits list should indicate HIV Test status not … (#1791)

* OHRI-1916 : Maternal visits list should indicate HIV Test status not HIV test result

* add hivTestStatus to transilation

* Fix hyperlink on empty table list (#1792)

* OHRI-2130 Patient Visits table on the TPT patient summary (#1796)

* (chore) Bump `@openmrs/openmrs-form-engine-lib` (#1797)

* (chore) bump-form-engine

* (chore) Bump `@openmrs/openmrs-form-engine-lib`

---------

Co-authored-by: GitHub Actions <[email protected]>
Co-authored-by: pirupius <[email protected]>

* (Chore) Bump FE Version (#1798)

* (Chore) Bump FE Version

* run yarn install

* OHRI-2121 (fix) Load Previous Cases on patient summary (#1799)

* Ohri 2124-Added tptTreatment tab on the program management link board. (#1801)

* visits tables

added the visits tables under tpt patient summary

* added tpt treatment tab

* committed

* OHRI-2124

Added tptTreatment tab on the program management link board.

* OHRI-2124

updated launchOptions.

* OHRI-2024:UPDATE

UPDATED LAUNCH OPTIONS.

* Restore the MNCH Module in the Clinical Views (#1805)

* Restore the MNCH Module in the Clinical Views

* change form engine to next

* OHRI-1916: Maternal visits list should indicate HIV Test status not HIV test result (#1806)

* OHRI-2144: Setup e2e Tests in OHRI (#1773)

* E2E test environment with playwright

* .env file added

* Rename ex.env to .env

* Update test and rename register.spec.ts to registration.spec.ts

* update the test

* Ignore the e2e directory containing Playwright tests

* GitHub Action to run your Playwright tests in the E2E Tests

* including the e2e

* updates

* corrected YML file

* update the yml

* yml jobs

* excluding the e2e in the jest config

* yarn test-e2e

* update the e2e test

* yml

* login.spec.ts

* updates

* (chore) remove spacing in package name (#1808)

* Fix the pmtct app on newer framework (#1810)

* (fix) rename wrongly saved components (#1811)

* encounter date proof of concept (#1812)

* encounter date proof of concept

* bump FE

* upgrade esm-patient-commons-lib, fix workspace issue (#1813)

* (feat) Upgrade patient commons lib, fix workspace isse (#1814)

* (feat)Upgrade patient commons lib, fix workspace issue (#1815)

* fix yarn lock e2e test issue

* fix FE dependencies

* Changed to  the form-engine version for form-render-app (#1818)

* Changed to  the form-engine version for form-render-app

* Standardize form-engine version in packages

---------

Co-authored-by: Amos Laboso <[email protected]>

* Dev (#1820)

* Changed to  the form-engine version for form-render-app

* Standardize form-engine version in packages

* Harmonize build cache and pre_release cache_key

---------

Co-authored-by: Amos Laboso <[email protected]>

* OHRI-2156:Remove error 400 on ohri-namibia-working (#1816)

* OHRI-2156:Remove error 400 on ohri-namibia-working

* fixed the build

* update on the build fix

* removed the unused import

---------

Co-authored-by: Amos Laboso <[email protected]>

* Dev (#1821)

* Changed to  the form-engine version for form-render-app

* Standardize form-engine version in packages

* Harmonize build cache and pre_release cache_key

* update form-engine dependencies to  for all packages and updated ci cache_dependency resolution

---------

Co-authored-by: Amos Laboso <[email protected]>

* Dev - update yarn lock file (#1822)

* Changed to  the form-engine version for form-render-app

* Standardize form-engine version in packages

* Harmonize build cache and pre_release cache_key

* update form-engine dependencies to  for all packages and updated ci cache_dependency resolution

* yarn lock file

---------

Co-authored-by: Amos Laboso <[email protected]>

* (refactor) Switch form launcher workspace to OpenMRS forms workspace (#1807)

* (refactor) Switch form launcher workspace from custom to openmrs forms workspace

* Add covis and tb form uuids in config

* Add hiv and tpt form uuids in config

* Add additional props as part of different view modes

* (fix) Fixed indefined encounter uuid when adding new encounter (#1823)

* OHRI-1350 Move custom side nav links to utilize openmrs homepage (#1751)

* (fix) Update new homepage path on playwright (#1825)

* OHRI-2078 Add unit tests for encounter list in commons lib (#1824)

* OHRI-2078 Add unit tests for encounter list in commons lib

* fixed linting issues

* code review

* opd package on the ohri clinical views (#1827)

* opd package on the ohri clinical views

* package.json

* update dependencies

* yarn lock

* remove unused transations

* opd updates (#1829)

* Update spa-build-config.json (#1830)

- use @ohri/esm-patient-chart-app 
- added @ohri/openmrs-esm-ohri-opd-app

* (fix) Fix wrong import in pmtct link (#1831)

* removed form engine dependency from the pmtct app (#1832)

* Fix empty button intents on encounter list (#1833)

* (chore) Bump `@openmrs/openmrs-form-engine-lib` (#1828)

* (chore) bump-form-engine

* (chore) Bump `@openmrs/openmrs-form-engine-lib`

---------

Co-authored-by: GitHub Actions <[email protected]>
Co-authored-by: samuelmale <[email protected]>
Co-authored-by: CynthiaKamau <[email protected]>

* Bumping form engine version (#1835)

Co-authored-by: Amos Laboso <[email protected]>

* (refactor) Add form name instead of form uuild in launch form function (#1837)

* update opd package version (#1838)

* (chore) O3-3114: Bump react form engine (#1839)

* MVP (#1826)

* OHRI-2040: Populate MNCH Summary data (#1840)

* Populate MNCH Summary data

* Enure we return the latest Mother HIV status

---------

Co-authored-by: AJAL ODORA JONATHAN <[email protected]>
Co-authored-by: Pius Rubangakene <[email protected]>
Co-authored-by: lucyjemutai <[email protected]>
Co-authored-by: Hero <[email protected]>
Co-authored-by: Lars Albino Lemos <[email protected]>
Co-authored-by: GitHub Actions <[email protected]>
Co-authored-by: pirupius <[email protected]>
Co-authored-by: kirwea <[email protected]>
Co-authored-by: Ian <[email protected]>
Co-authored-by: Jovan Ssebaggala <[email protected]>
Co-authored-by: Amos Laboso <[email protected]>
Co-authored-by: CynthiaKamau <[email protected]>
Co-authored-by: samuelmale <[email protected]>
Co-authored-by: Jamie Arodi <[email protected]>
  • Loading branch information
15 people authored May 15, 2024
1 parent ba9b2f3 commit 02c9351
Show file tree
Hide file tree
Showing 155 changed files with 4,440 additions and 878 deletions.
6 changes: 6 additions & 0 deletions .env
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# This is an environment file for configuring dynamic values.
E2E_BASE_URL=https://ohri-dev.globalhealthapp.net/openmrs
E2E_USER_ADMIN_USERNAME=admin
E2E_USER_ADMIN_PASSWORD=Admin123
E2E_LOGIN_DEFAULT_LOCATION_UUID=44c3efb0-2583-4c80-a79e-1f756a03c0a1
# The above location UUID is for the "Outpatient Clinic" location in the reference application
63 changes: 63 additions & 0 deletions .github/workflows/e2e.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
name: E2E Tests

on:
push:
branches:
- main
pull_request:
branches:
- main

jobs:
main:
runs-on: ubuntu-latest
steps:
- name: Checkout repo
uses: actions/checkout@v3

- name: Copy test environment variables
run: |
cp example.env .env
sed -i 's/8080/8180/g' .env
- name: Setup node
uses: actions/setup-node@v3
with:
node-version: 18

- name: Cache dependencies
id: cache
uses: actions/cache@v3
with:
path: '**/node_modules'
key: ${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}

- name: Install dependencies
if: steps.cache.outputs.cache-hit != 'true'
run: yarn install --immutable

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

- name: Run dev server
run: yarn start --sources 'packages/esm-*-app/' --port 8180 & # Refer to O3-1994

- name: Run E2E tests
run: yarn playwright test

- name: Upload Report
uses: actions/upload-artifact@v3
if: always()
with:
name: playwright-report
path: playwright-report/
retention-days: 30

github-action:
runs-on: ubuntu-latest
steps:
- name: Checkout repo
uses: actions/checkout@v3

- name: Run Playwright tests with GitHub Action
run: yarn playwright test
23 changes: 18 additions & 5 deletions .github/workflows/node.dev.js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
uses: actions/cache@v3
with:
path: '**/node_modules'
key: ${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}

- name: Install dependencies
if: steps.cache.outputs.cache-hit != 'true'
Expand All @@ -50,6 +50,22 @@ jobs:
path: |
packages/**/dist
run_e2e_tests:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
- name: Use Node.js
uses: actions/setup-node@v4
with:
node-version: '18'
- name: Install dependencies
run: yarn install --immutable
- name: Install Playwright Browsers
run: npx playwright install chromium --with-deps
- name: Run Playwright tests
run: yarn test-e2e

pre_release:
runs-on: ubuntu-latest

Expand All @@ -69,10 +85,7 @@ jobs:
id: cache
uses: actions/cache@v3
with:
path: |
**/node_modules
**/yarn.lock
path: '**/node_modules'
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
restore-keys: |
${{ runner.os }}-yarn-
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/node.master.js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:

needs: build

if: ${{ github.event_name == 'release' || github.ref == 'refs/heads/master' }}
if: ${{ github.event_name == 'release' }}

steps:
- uses: actions/checkout@v3
Expand Down
7 changes: 7 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -77,3 +77,10 @@ build/**

# vscode
.vscode

# Playwright and e2e tests
/test-results/
/playwright-report/
/playwright/.cache/
e2e/storageState.json
.env
Loading

0 comments on commit 02c9351

Please sign in to comment.