[bot] Merge 26.7 to develop#7826
Merged
Merged
Conversation
## Rationale Support indexing wikis ## Related Pull Requests ## Changes - <!-- list of descriptions of changes that are worth noting (replace this comment) --> <!-- list of standard tasks (remove this comment to enable) ## Tasks 📍 - [ ] Claude Code Review - [ ] Manual Testing - [ ] Test Automation - [ ] Verify Fix --> --------- Co-authored-by: Adam Rauch <adam@labkey.com>
#### Rationale null check #### Related Pull Requests * LabKey/premiumModules#596 * #7727 * LabKey/testAutomation#3085 #### Changes - <!-- list of descriptions of changes that are worth noting (replace this comment) --> <!-- list of standard tasks (remove this comment to enable) #### Tasks 📍 - [ ] Claude Code Review - [ ] Manual Testing - [ ] Test Automation - [ ] Verify Fix --> --------- Co-authored-by: labkey-tchad <tchad@labkey.com>
## Rationale Routine dependency upgrade per the JAR dependency upgrade schedule, picking up the latest ActiveMQ 5.19.x security-hardening release. ## Related Pull Requests - LabKey/premiumModules#647 (Snowflake JDBC 4.3.1) - LabKey/testAutomation#3087 (Selenium 4.45.0, Jetty 12.1.10) ## Changes - Bump `activemqVersion` from 5.19.7 to 5.19.8 in `pipeline/gradle.properties`
## Rationale There has been a long running issue where some operators in THEN/ELSE expressions have unexpectedly required parentheses. ## Related Pull Requests - <!-- list of links to related pull requests (replace this comment) --> ## Changes - <!-- list of descriptions of changes that are worth noting (replace this comment) --> <!-- list of standard tasks (remove this comment to enable) ## Tasks 📍 - [ ] Claude Code Review - [ ] Manual Testing - [ ] Test Automation - [ ] Verify Fix -->
…ibility (#7798) - Added portable LabKey SQL support for isnumeric() across SQL Server and PostgreSQL. - Moved right() into the shared LabKey SQL method registry so it can be used on PostgreSQL
## Rationale Make ModuleEditorService.getUpdatableResourcesRoot() return the path used to resolve module resources. getModuleRoot() returns the module source root (potentially parent of getUpdatableResourcesRoot()) ## Related Pull Requests - <!-- list of links to related pull requests (replace this comment) --> ## Changes - <!-- list of descriptions of changes that are worth noting (replace this comment) --> <!-- list of standard tasks (remove this comment to enable) ## Tasks 📍 - [ ] Claude Code Review - [ ] Manual Testing - [ ] Test Automation - [ ] Verify Fix --> ## Related Pull Requests - <!-- list of links to related pull requests (replace this comment) --> ## Changes - <!-- list of descriptions of changes that are worth noting (replace this comment) --> <!-- list of standard tasks (remove this comment to enable) ## Tasks 📍 - [ ] Claude Code Review - [ ] Manual Testing - [ ] Test Automation - [ ] Verify Fix -->
## Rationale Add support for restricting an API key to a specific role such as Reader or Editor. LabKey/kanban#1846
…7819) ## Rationale Toggling "Edit" on the Data Views webpart before its grid finishes its async configuration load throws `TypeError: can't access property "show", this._getEditColumn() is undefined`, because `onEnableEditMode`/`onDisableEditMode` call `.show()`/`.hide()` on the edit column before it exists. This happens in practice when a page (e.g. `project-begin.view`) calls `enableEdit()` from an `Ext.onReady` handler, which reliably wins the race against the panel's own config request. Prompted by this error on TeamCity: ``` TypeError: can't access property "show", this._getEditColumn() is undefined onEnableEditMode (http://localhost:8111/labkey/dataview/DataViewsPanel.js:1053:14) fire (http://localhost:8111/labkey/ext-4.2.1/ext-all-sandbox-debug.js:9824:49) continueFireEvent (http://localhost:8111/labkey/ext-4.2.1/ext-all-sandbox-debug.js:11215:47) fireEventArgs (http://localhost:8111/labkey/ext-4.2.1/ext-all-sandbox-debug.js:11193:26) monitor/prototype.fireEventArgs (http://localhost:8111/labkey/ext-4.2.1/ext-all-sandbox-debug.js:41550:37) fireEvent (http://localhost:8111/labkey/ext-4.2.1/ext-all-sandbox-debug.js:11179:25) edit (http://localhost:8111/labkey/dataview/DataViewsPanel.js:1047:18) enableEdit (http://localhost:8111/labkey/StudyVerifyProject/My%20Study%20Data%20Views/project-begin.view:470:32) createSingle/< (http://localhost:8111/labkey/ext-4.2.1/ext-all-sandbox-debug.js:9869:28) fire (http://localhost:8111/labkey/ext-4.2.1/ext-all-sandbox-debug.js:9824:49) Ext.EventManager</readyEvent.fire (http://localhost:8111/labkey/ext-4.2.1/ext-all-sandbox-debug.js:10058:52) fireReadyEvent (http://localhost:8111/labkey/ext-4.2.1/ext-all-sandbox-debug.js:10136:28) onDocumentReady (http://localhost:8111/labkey/ext-4.2.1/ext-all-sandbox-debug.js:10154:34) fn (http://localhost:8111/labkey/ext-4.2.1/ext-all-sandbox-debug.js:6664:25) onReady (http://localhost:8111/labkey/ext-4.2.1/ext-all-sandbox-debug.js:6669:20) Ext.EventManager</Ext.onReady (http://localhost:8111/labkey/ext-4.2.1/ext-all-sandbox-debug.js:10934:20) editDataViews (http://localhost:8111/labkey/StudyVerifyProject/My%20Study%20Data%20Views/project-begin.view:473:14) h10 (http://localhost:8111/labkey/StudyVerifyProject/My%20Study%20Data%20Views/project-begin.view:1268:14) ``` ## Related Pull Requests None. ## Changes - Null-guard the edit column lookup in `onEnableEditMode`/`onDisableEditMode` before calling `.show()`/`.hide()`. - Source the edit column's initial `hidden` state from `this.editMode` instead of the constructor-time `this.manageView` snapshot, so the column renders with the correct visibility once it's created after a mode toggle occurred first.
cnathe
approved these changes
Jul 8, 2026
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
9 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.
Generated automatically.
Merging changes from: 7d8a2af
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=fb_bot_merge_26.7