Skip to content

Updating bioassay branch with main - #5

Merged
shanethacker merged 23 commits into
chore/HAWC-1169-merge-bioassay-branchfrom
main
Mar 6, 2026
Merged

shanethacker merged 23 commits into
chore/HAWC-1169-merge-bioassay-branchfrom
main

Conversation

@shanethacker

Copy link
Copy Markdown
Collaborator

No description provided.

shapiromatron and others added 23 commits June 9, 2025 22:46
…ry (#1190)

Bumps the pip group with 1 update in the / directory: [requests](https://github.com/psf/requests).


Updates `requests` from 2.32.3 to 2.32.4
- [Release notes](https://github.com/psf/requests/releases)
- [Changelog](https://github.com/psf/requests/blob/main/HISTORY.md)
- [Commits](psf/requests@v2.32.3...v2.32.4)

---
updated-dependencies:
- dependency-name: requests
  dependency-version: 2.32.4
  dependency-type: direct:production
  dependency-group: pip
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
(cherry picked from commit 1cd54243149599b86e84445537e72f727d59ca32)
…1192)

* Initial plan for issue

* Remove velocity-react and replace with custom VelocityComponent

Co-authored-by: shapiromatron <999952+shapiromatron@users.noreply.github.com>

* Initial analysis and plan for addressing review comments

Co-authored-by: shapiromatron <999952+shapiromatron@users.noreply.github.com>

* Convert VelocityComponent to functional component with hooks and improve tests

Co-authored-by: shapiromatron <999952+shapiromatron@users.noreply.github.com>

* Fix animation behavior by reverting to element cloning with style merging

Co-authored-by: shapiromatron <999952+shapiromatron@users.noreply.github.com>

* update configuration

* refine component

* add @testing-library/dom and @testing-library/react

* Rewrite VelocityComponent tests using @testing-library/react with runOnMount variations

Co-authored-by: shapiromatron <999952+shapiromatron@users.noreply.github.com>

* updates from review

* rename import

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: shapiromatron <999952+shapiromatron@users.noreply.github.com>
Co-authored-by: Andy Shapiro <shapiro.andy@epa.gov>
* from settings from exception report

* pluralize

* Update hawc/apps/common/exceptions.py

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* set legend location in top-left or top-right depending on increasing/decreasing data

* Update frontend/animal/DRPlot.js

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* Initial plan for issue

* Initial plan: Update React to v19.1.0 and fix backwards incompatible syntax

Co-authored-by: shapiromatron <999952+shapiromatron@users.noreply.github.com>

* Complete React 19.1.0 update with backwards compatibility fixes

Co-authored-by: shapiromatron <999952+shapiromatron@users.noreply.github.com>

* temp remove scroll to error box w/ react v19

* lint js

* Complete React 17 migration and revert React 19 changes

Co-authored-by: shapiromatron <999952+shapiromatron@users.noreply.github.com>

* Address PR review feedback: fix import formatting, remove velocity-react, restore helpers.js function

Co-authored-by: shapiromatron <999952+shapiromatron@users.noreply.github.com>

* run npm run format

* Restore original import order for files with only formatting changes

- Restored original import order in 89 JavaScript files that had only import reordering without functional changes
- Preserved functional changes in 8 files that had legitimate React lifecycle updates and helper function removals
- Fixed import order in helpers.js while preserving removal of deprecated ReactDOM usage
- All files now maintain original vendored import organization with proper blank line separation

Co-authored-by: shapiromatron <999952+shapiromatron@users.noreply.github.com>

* improve test stability

* fix scrolling

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: shapiromatron <999952+shapiromatron@users.noreply.github.com>
Co-authored-by: Andy Shapiro <shapiromatron@gmail.com>
Co-authored-by: Andy Shapiro <shapiro.andy@epa.gov>
* add setup steps

* rename

* add instructions
* Initial plan for issue

* Update MobX from v5 to v6 with decorator support

Co-authored-by: shapiromatron <999952+shapiromatron@users.noreply.github.com>

* upates from review

* fix toJS

* refactor

* Revert "refactor"

This reverts commit 371d6bd50aee6926aebc302b665a8c8f16a5baf8.

* move autorun out of base model

* update a few dependencies

* use different autorun pattern

* turn off strict mode mobx

* lint

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: shapiromatron <999952+shapiromatron@users.noreply.github.com>
Co-authored-by: Andy Shapiro <shapiro.andy@epa.gov>
Co-authored-by: Andy Shapiro <shapiromatron@gmail.com>
…ration (#1203)

* Initial plan

* Update Quill and react-quill packages to latest versions with proper API migrations

Co-authored-by: shapiromatron <999952+shapiromatron@users.noreply.github.com>

* refactoring

* fix sanitization

* write tests for clean_html

* update tests

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: shapiromatron <999952+shapiromatron@users.noreply.github.com>
Co-authored-by: Andy Shapiro <shapiromatron@gmail.com>
* Initial plan

* Update React to v18 and migrate to createRoot API

Co-authored-by: shapiromatron <999952+shapiromatron@users.noreply.github.com>

* Fix React 18 build compatibility with Vite

Co-authored-by: shapiromatron <999952+shapiromatron@users.noreply.github.com>

* increase test timeout (windows)

* remove ReactDOM import

* fix a few conversion errors

* Implement standard React 18 CommonJS resolution fix using Vite aliases

Co-authored-by: shapiromatron <999952+shapiromatron@users.noreply.github.com>

* updates to comments

* use import instead of requre

* remove the culprit import statment

* fix unrelated bug found in testing

* another format

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: shapiromatron <999952+shapiromatron@users.noreply.github.com>
Co-authored-by: Andy Shapiro <shapiro.andy@epa.gov>
* verbose tests; block network

* modify

* more allowed localhost

* Update .github/workflows/main.yml

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* make generally available

* data migrate

* round stdev when calculated from se

* update form user interface

* begin execution refactor

* Revert "begin execution refactor"

This reverts commit 17d4af94317730211b9c61c67ac4122395771ee1.

* Revert "update form user interface"

This reverts commit 5a3176f4cf78970b8b0dea041714fa100a9ca17b.

* Revert "data migrate"

This reverts commit 68fc63066143b91e76484e759b175844021ea7e2.

* update to most recent pymbds version

* only show bmd modeling for certain data types

* show traceback if staff

* for BMDS 2, treat dichotomous cancer as dichotomous
* make generally available

* data migrate

* round stdev when calculated from se

* update form user interface

* begin execution refactor

* Revert "begin execution refactor"

This reverts commit 17d4af94317730211b9c61c67ac4122395771ee1.

* Revert "update form user interface"

This reverts commit 5a3176f4cf78970b8b0dea041714fa100a9ca17b.

* Revert "data migrate"

This reverts commit 68fc63066143b91e76484e759b175844021ea7e2.

* update to most recent pymbds version

* only show bmd modeling for certain data types

* show traceback if staff

* update versions

* implement UP047
* rename bioassay

* update epi

* lint/format
* container updates

* update versions

* install latest available wheel

* fix react rendering change

* show migration fields read-only in admin

* capture content type with no manager errors

* update client release
Co-authored-by: Andy Shapiro <shapiromatron@gmail.com>
* Updated django to fix high security alert in prisma scan

* Updated version number.

* Ran across an unmigrated change
@shanethacker
shanethacker merged commit f884ced into chore/HAWC-1169-merge-bioassay-branch Mar 6, 2026
11 of 12 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants