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

[bot] Fast-forward for 23.11.7 #684

Merged
merged 3 commits into from
Feb 6, 2024
Merged

Conversation

github-actions[bot]
Copy link

@github-actions github-actions bot commented Feb 6, 2024

Generated automatically.
Approve all matching PRs simultaneously.
Approval will trigger automatic merge.
View all PRs: https://internal.labkey.com/Scrumtime/Backlog/harvest-gitOpenPullRequests.view?branch=23.11_ff_bot_23.11.7

labkey-martyp and others added 3 commits January 24, 2024 15:34
* Update the Drag and Drop context provider and interfaces with DraggableContainer
* Add key to ensure ReactDataGrid wrapped in DraggableContainer re-renders on state updates
* Use JSON.optString for strings with default to null
* Use JSON.isNull to check both if the property exists and if it is null. 

---------

Co-authored-by: Terry J Hawkins <[email protected]>
* - Refactor Timeline.java to include QCStateLabel values in the map and json methods so the data is included with API calls
- removed integer values from the QCStateEnum - these values are looked up from the core.DataStates table. They are added to the table by the SND module.
- refactored validator to use new enum methods
- updated schema version to 23.00
- Removed unused QcState column from snprc_scheduler.StudyDayNotes table
- Added FK metadata to QcState column in Timeline table
- Refactored client code to use QCStateLabels instead of values

* - removed extra parentheses from expression

* - Updated TimelineScript for snprc_scheduler automated tests - replaced QcState data with QcStateLabel data

* - Renamed QCStateEnum.java methods to be more descriptive
@github-actions github-actions bot merged commit 38ea77a into release23.11 Feb 6, 2024
4 of 6 checks passed
@github-actions github-actions bot deleted the 23.11_ff_bot_23.11.7 branch February 6, 2024 19:38
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.

4 participants