Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: uwcirg/cosri-patientsearch
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 21644d36811a185fe8e28cf22e76e49e982ae223
Choose a base ref
..
head repository: uwcirg/cosri-patientsearch
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2197ff3aaf81f8e21fe2db0f2362071dc741c9a5
Choose a head ref
Showing with 7,600 additions and 3,739 deletions.
  1. +20 −3 .github/workflows/build-deliver.yaml
  2. +3,340 −2,213 package-lock.json
  3. +22 −22 package.json
  4. +32 −0 patientsearch/config.py
  5. +1 −0 patientsearch/src/__mocks__/canvas.js
  6. +0 −10 patientsearch/src/__tests__/App.test.js
  7. +6 −0 patientsearch/src/__tests__/README.md
  8. +0 −10 patientsearch/src/__tests__/Search.test.js
  9. +16 −0 patientsearch/src/__tests__/components/Agreement.test.js
  10. +10 −0 patientsearch/src/__tests__/components/DetailPanel.test.js
  11. +10 −0 patientsearch/src/__tests__/components/DialogBox.test.js
  12. +16 −0 patientsearch/src/__tests__/components/Dropdown.test.js
  13. +10 −0 patientsearch/src/__tests__/components/Error.test.js
  14. +16 −0 patientsearch/src/__tests__/components/FilterRow.test.js
  15. +10 −0 patientsearch/src/__tests__/components/FormattedInput.test.js
  16. +13 −0 patientsearch/src/__tests__/components/Header.test.js
  17. +20 −0 patientsearch/src/__tests__/components/HistoryTable.test.js
  18. +10 −0 patientsearch/src/__tests__/components/Info.test.js
  19. +14 −0 patientsearch/src/__tests__/components/OverdueAlert.test.js
  20. +10 −0 patientsearch/src/__tests__/components/PatientListTable.test.js
  21. +17 −0 patientsearch/src/__tests__/components/SystemBanner.test.js
  22. +10 −0 patientsearch/src/__tests__/components/TimeoutModal.test.js
  23. +16 −0 patientsearch/src/__tests__/components/UrineScreen.test.js
  24. +14 −0 patientsearch/src/__tests__/components/Version.test.js
  25. +10 −0 patientsearch/src/__tests__/containers/App.test.js
  26. +246 −233 patientsearch/src/js/components/Agreement.js
  27. +3 −3 patientsearch/src/js/components/DetailPanel.js
  28. +2 −3 patientsearch/src/js/components/DialogBox.js
  29. +7 −5 patientsearch/src/js/components/Dropdown.js
  30. +137 −72 patientsearch/src/js/components/EditButtonGroup.js
  31. +154 −148 patientsearch/src/js/components/FilterRow.js
  32. +71 −50 patientsearch/src/js/components/Header.js
  33. +138 −131 patientsearch/src/js/components/HistoryTable.js
  34. +48 −38 patientsearch/src/js/components/Info.js
  35. +2 −3 patientsearch/src/js/components/LoadingModal.js
  36. +27 −30 patientsearch/src/js/components/OverdueAlert.js
  37. +373 −230 patientsearch/src/js/components/PatientListTable.js
  38. +9 −10 patientsearch/src/js/components/SiteLogo.js
  39. +11 −12 patientsearch/src/js/components/SystemBanner.js
  40. +4 −7 patientsearch/src/js/components/TimeoutModal.js
  41. +391 −376 patientsearch/src/js/components/UrineScreen.js
  42. +11 −9 patientsearch/src/js/components/Version.js
  43. +1 −0 patientsearch/src/js/constants/consts.js
  44. +19 −0 patientsearch/src/js/context/ProjectThemeProvider.js
  45. +103 −64 patientsearch/src/js/helpers/utility.js
  46. +3 −6 patientsearch/src/js/layout/Layout.js
  47. +0 −51 patientsearch/src/js/themes/theme.js
  48. +100 −0 patientsearch/src/js/themes/theme_config.js
  49. +55 −0 tests/test_columnconfig.py
  50. +2,042 −0 tests/test_columnconfig/patient_bundle.json
23 changes: 20 additions & 3 deletions .github/workflows/build-deliver.yaml
Original file line number Diff line number Diff line change
@@ -8,18 +8,35 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout commit with full git history
uses: actions/checkout@v1
uses: actions/checkout@v3
with:
fetch-depth: 0

- name: Set environment variable for version from git output
run: echo "VERSION_STRING=$(git describe --always --tags)" >> $GITHUB_ENV

- name: Publish to GitHub Container Registry
# TODO: pin to hash
uses: elgohr/Publish-Docker-Github-Action@main
with:
name: ${{ github.repository }}
registry: ghcr.io

# GitHub actor
username: ${{ github.actor }}

# GitHub access token
password: ${{ secrets.GITHUB_TOKEN }}

# create docker image tags to match git tags
tag_names: true
buildargs: VERSION_STRING

# TODO remove after every *-environments migrated to GHCR
- name: Publish to Dockerhub registry
# TODO pin to hash
uses: elgohr/Publish-Docker-Github-Action@master
uses: elgohr/Publish-Docker-Github-Action@main
with:
# https://help.github.com/en/actions/reference/context-and-expression-syntax-for-github-actions
name: ${{ github.repository }}
# configured at repo settings/secrets
username: ${{ secrets.DOCKER_USERNAME }}
Loading