[bot] Merge 26.3 to 26.7 (Conflicts) - #1872
Open
github-actions[bot] wants to merge 9 commits into
Open
Conversation
…#1866) ## Rationale `ONPRC_EHRTest.testSubmitButtonsDisabledDuringValidation` fails intermittently on the 26.3 ONPRC EHR suites and is blocking ONPRC work, so it is being disabled until the assertion can be reworked. The assertion is racy by construction: `Force Submit` carries `disableOn: 'SEVERE'`, so it is disabled only while validation is in flight and is re-enabled the instant validation completes. Clicking `More Actions` and waiting for the Ext menu to render costs a few seconds, which a fast validation pass beats, and the 10-second wait for the disabled menu item then can never succeed. Every failure is the same one — `ONPRC_EHRTest.java:2036` on `Force Submit` — while the sibling checks pass regardless because `Submit And Reload` and `Submit Final` stay disabled after validation whenever the form has WARN/ERROR rows. ## Changes - `@Ignore` on `testSubmitButtonsDisabledDuringValidation`, with the race recorded in the annotation message and a comment noting that it is blocking ONPRC work and should be re-enabled once the flakiness is resolved.
## Rationale Retires the mergesync and ogasync modules, which are no longer used. mergesync provided the Merge LIS integration for Clinpath requests; ogasync ran an OGA grant ETL and had no dependents. ## Changes - Deletes both modules. - Removes the Merge integration from the Clinpath labwork request form, along with its instructions panel. - Drops the Merge-derived column from the Clinpath requests view and collapses the request links that filtered on it into a single link. - Leaves the similarly named billing OGA table and ETL in place; despite the name they are unrelated to the removed module.
Modified Medication Printable online reports to now include qcstate reporting column
Modified Blood Draw input form to allow users an option to enter "Additional Services" selections
Stored procedure clean up of single use programs
## Rationale FinanceNotification.writeResultTable builds the ONPRC charge summary report by concatenating editor-entered database values (financial analyst, project, alias/account, OGA project number, category) and their derived URLs directly into HTML with no escaping. That HTML is rendered verbatim into the LDK RunNotificationAction admin preview via HtmlString.unsafe and is also sent as the HTML email body, so a stored payload in any of those project/alias fields executed in the browser of any user who previewed the notification or received the email — a stored XSS with privilege-escalation potential toward admins. This is the ONPRC counterpart to the BillingNotification fix. DCMFinanceNotification was a registered subclass that overrode writeResultTable with a near-duplicate copy of the same unescaped report; rather than carry and fix a second copy, it is removed entirely. ## Changes - FinanceNotification: wrap every editor-entered value (financial analyst, project, account, project number, category) and its derived href URL in PageFlowUtil.filter in the per-financial-analyst tables, and filter the top category summary table (url and category), which was unescaped in this copy; add the org.labkey.api.util.PageFlowUtil import. - DCMFinanceNotification: remove the class entirely and drop its NotificationService registration and import from ONPRC_BillingModule.
Added new column called "Source" to the Birth Records report on the animal history page
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Automatic merge failed! Please merge
26.3into26.7_fb_bot_merge_26.3and resolve conflicts manually.Resolve all conflicts (using IntelliJ or
git mergetool)Approve all matching PRs simultaneously.
Approval will trigger automatic merge.
Verify all PRs before approving: https://internal.labkey.com/Scrumtime/Backlog/harvest-gitOpenPullRequests.view?branch=26.7_fb_bot_merge_26.3