[bot] Merge 25.7 to 25.11 (Conflicts)#934
Merged
github-actions[bot] merged 2 commits intorelease25.11-SNAPSHOTfrom Mar 24, 2026
Merged
[bot] Merge 25.7 to 25.11 (Conflicts)#934github-actions[bot] merged 2 commits intorelease25.11-SNAPSHOTfrom
github-actions[bot] merged 2 commits intorelease25.11-SNAPSHOTfrom
Conversation
* Fixed bug relaying incorrect cage locations to the state * Fixed bug with checking already merged cages again when the rack was moved * Fixed bug with naming new cages after merging * Fixed bugs with merging two groups and renaming cage ids * Moved cage num event to helper since it needed to be used in more places * Update the method in which cages are initially numbered * Updated cage numbering and rack numbering when cages are placed to use the latest number plus 1 * Fixed bug with cage locations not being correctly numbered * Added context menu on right click for editing cages in the layout editor * Introduced checks to prevent two different "random" crashes in case of incorrect bindings * General Cleanup and fixed moveRack function to work with both cage locs and local room * Fixed bug with cage location not being right when multiple racks were in a room * Fixed bug causing merging to not be detected * Fixed bug with cage state not getting correct local coords for the rack group * Switched state management to work with four types of racks, and given them each their own numbering system * Added test data for beginning work on data storage * Switch room type to be array of room items instead of racks Room item is either a rack or room object (anything other than caging units) * Additions to switching from room represented by racks to room items * added some EHR types and switched logic of svgs to follow unique rack ids * added room type and fixed bug with dragging shapes to the layout * Fixed bugs with merging connecting and renaming * State management and adjacency checker updated for dealing with connections * Fixed bug with connecting merged cages not being reset correctly * Fixed bug with crashing when closing context menu then dragging new cage * Fixed bug with renaming cages of different types * changed rack group design to fit better with data * Basic support for loading previous data for single grouped racks and room objects, fixed grid disable/enable function * Implemented basic saving for layout * remove unused types/functions * Fixed bug with racks and grouped racks not being hard locked to the grid when dragging and zooming the grid * Added the ability to delete cages from the layout editor * Change permission classes to fit with labkey 24.11 * Fixed bug not letting merging happen after rename * Added resizeable room border and set up default room sizes * Added room selector for saving, clear messages for saving, error for incorrect room in url, and fixed loading prev room issues * Fixed issue with inconsistent grid generation * Updated layout history table columns, fixed loading in data to work with room border, and compatibility for default rack types * Fixed bugs with loading in room border and assigning new groups after load in * Added popup after submission, fixed some bugs with submission and room checks * Fixed bug causing confirmation to reset room name unexpectedly, fixed bug with dragging grouped racks * Allowed pens to be saved * Fixed issue with saving and moving pens and loading empty rooms that were cleared * Merge in docker build for 24.11 * update docker build url * Fix bug with incorrect scaling in connected rack groups * Changed redirect window from dev link to build link * undo docker build change * Fixed bug with renaming cage numbers * Fixed bug with context menu popups not closing * Switch context menu styles * Prep for moving to own module * Switched CageUI to java based module * Fixed cage ui schema not showing up properly * Allow users to change racks in the layout editor * Simplified cage object and fixed bug with connecting racks * added room templates and clear grid * Removed option to click past the popup for layout popups * Added overlay to other two layout pop ups * Fix bug with deleting multiple cages * Added option to delete entire racks * Fixed bug loading in previous rooms * Added room gate object, Room template fixes and drag off-center bug fix * Added Gate and created reusable context menu * Fixed bug causing the start drag in layout function to not be called correctly * Refactoring * More refactoring * Bug fix for redirect causing crash for template renaming * Test for checking existance of layout editor * Somehow context was renamed. This is a fix for that. * Update WNPRC_EHRTest.java Added test for cage UI layout editor * Added security and permissions * Room list in home page now fetches data * Update cageui.xml * Added extra context for tracking default racks * Added room search list to home page * Tests and some fixes for that * Added home page map for backtracking easily * Permissions and Roles added * Added ability to open and close room gates * Added sub views for room pages and loading in previous rooms * Fixed border and scaling issues with loading rooms in the view pages * Added permissions for cage ui tables and front end checks to enable/disable certain buttons/pages * Bug fix for crashing when the user drags to the layout by clicking on a certain part of the selected object * Fix deleteRows bug in table permissions * Bug fix for cage numbering on svg load for the home view * Bug fixes for loading in a room with connected and merged racks * Added modification table and cage positioning * Add group tracking and fixed bug for finding racks in the same group * Fixed layout editor bug not allowing small cages to be paired with larger cages in some locations * Added rack modification section in cage UI home * Schema and db script for cage modifications * Bug fix for fast drag end calls would produce incorrect ids for racks * Bug fix causing rename crashing * Bug fix for layout merging being detected on incorrect cage positions * Fixed adding room callbacks so errors don't crash * Bug fix for deleting racks causing incorrect state changes * Fixed bug with deleting cages not splitting groups correctly * Bug fix for loading prev room. Effect got deleted somehow, this is adding it back. * Rack modification storage * Fix bug with group ids and same rackId naming * Modification and Cage popup added, modification state, modification fetching * added dynamic cage mods for single cages * Added table customizer and modification tables * Switched modification id convention for constants * Ctunnel capabilities using new constant naming convention * Work to the modifications editing table for individual cages * Fix bugs with mod table causing left mod to be incorrect and duplicate cage svgs * bug fix for template layouts getting cleared when saving them as another room * Cleanup logs * Update package.lock * Move function to global helpers from home helpers * Modifications ID correctly and modification saving * Fixed loading after save so modifications appear when changed * Small change to how svg modifications are ID * Cage Modification table work * Merge fixes * Bug fix for cageUI not loading pens correctly * Added separate saving for cage mods (WIP) * update cage_modifications tables * Fix bug with subsections not being updated correctly * Update labkey dependencies * Add filtering to options to prevent basic incorrect layouts * Optimize imports * Fixed prevMods object reference and added beginning of final modification saving * Added social panel mod and refactored temporary mod saving * Bug fix for crashing due to incorrect id selector This one was tricky but the ^= selector was selecting the first part of rack-12 and when merging rack-1 it would find (rack-1)2 which caused a random crash. Only an issue when users would add all cages at once then merge them. * Cage modification auto submission for layout editor * Added cage modification history API for saving from the layout editor * Error handling for cage modification history api * Bug fix for room layouts causing crashing to when switching rooms * Add new cage modifications history table to java * Java API creation for cage UI layout editor submission * update local with merge * Add ehr_lookups.rooms layout data query updater * Finalize data saving for room layouts on java api * Fix sql script after merge from 25.7 * clean up and rename layout saving api * Added unique cage ids to allow for duplicate cage numbering * Bug fixes for splitting racks, cage numbering, context menus after deletion * Add validation for cage numbering and fix bug for loading in previous keys after cage ids were added * Fix error in calculating previous cage coords * Correct names so they fit sql defs * Switch css styles to better fit portrait layout * Added detailed errors list on validation and loading screen for submissions * Bug fix for incorrect rack svg ids * Added type names to errors for duplicate cage numbering * Fix bug with cage modifications not correctly copying ids * added cage modification submission workflow * Added cages table following tree like structure with rack and room * Added new tables for histories * Update sql to handle new layout_history and racks tables * Added in default room loading with new table structure * Fix position of context menu after layout switch to portrait * Started template saving for layouts * Added room history part to layout editor submission * Add cage history table * Add support for loading in real rooms * Updated history forms to work with new tables * Finished template layouts data packaging * Finish submission function to process transactions with bundled forms * Added new popup that lets users create new racks from existing rack types * Remove room requirement from racks table * Add java code for cage history table * Update tables to use objectids instead of rowids. Added real room layout saving from blank template * Fix issue with loading in real rooms after object id switch * Added default cage modifications to data submission * Work done to the server side layout submission * update context manager for home into navigation and room management. Fix bug for saving cage mods * bug fix for mod saving to be duplicated * Switch contexts for home. Update mod saving to fix bugs and work with new tables. * Bug fix for modification saving due to shared reference being duplicated across same cage with different connections * Bug fixes for loading in racks and cages for side menu The modification editor for racks updated here is still not working, will revisit later * Add cage details, fix crashing for side bar racks and cages. Add extension sqft * Bug fix for saving mods between room layouts * Bug fix for saving room mods not being correct when handling modIds * incorrect modId name * Updated mod submission to detect certain modifications and makes changes to cage dimensions * Add legend to room display * Update test to work with new cageui id naming * Remove supports tunnel from rack types table since it went unused * Intellij code cleanup * Fix enum for room object types * Fix bug causing crashing for template rooms * change rack and cage table PK to objectID * Bug fix for saving template rooms * Added group rotations to rack groups so that they can be detected from different perspectives * Updated racks and rack_types forms to include additional info. Fix bug with template saving coords * Set default rotation for groups to 90 degrees * Added trigger scripts for cage history and rack history * Add group rotations to mod loading * Fix bug with submitting layouts from racks that were pre-created * Fix context menu css annoyingly causing page to move when opened * Add new cage column and rename old column to cageOld * Separate component for cage modifications editor and cage editor popup * Update UI for cage display popup to support animal editing * Add feature that when creating racks it automatically assigns the rack to the current rack * remove console logs * Update css styles * remove console logs * Fix bug preventing templates from being saved correctly * Create instruction files * Start animal transfer client side work * Update old cage column and add new cage column * Revert "Update old cage column and add new cage column" This reverts commit 1b9f6e5. * Revert "Start animal transfer client side work" This reverts commit 3f5f5ad. * rehydrate npm packages * css updates to rack and cage details. * Add size to rack types, remove name definition from sql file, and add customizer for name field * Update rack-type name field to be auto generated, fix rack change functionality due to this change * Add cages overview for racks to display all animals within rack by cage. Update rack manufacturer structure to contain value and title * Implemented Rack Changes * Step one of switching cage home navigation to actionURL * Update action url functionality for cageUI home * Bug fix for loading in racks and cages for home from url * Reset rack mods when changing rack type, specifically if rack manufacturer and/or size changes * Force refresh of entire page when rack changes are made. * Remove unused pages * Add validation to prevent room saving of templates and rooms, if they have incorrect rack types * Auto add template- string to template renaming so users do not have to * Remove templates from room list * Add permissions to cage home * Webpack for iOS device testing through VPN * Css changes for iOS chrome * Demo on how to set page meta tags * Added ability to mark racks as damaged during the rack change process * Added entry point for form to update rack condtiions for racks that are not in rooms * Users should only be able to assign racks that aren't in a current room. * Switch privacy and visual contact dividers * Update legend svg file to switch privacy and visual dividers * Optimize Imports * Code Cleanup * Documentation updates * Fix tests and add new one for cage home * remove object id for racks test data * Update WNPRC_EHRTest.java * Remove cage column switch in housing as this shouldn't be added yet * remove cageOld from wnprcOverRides * Update copywriting * Add four new rack manufacturers to lookup * Update docs with descriptions of the tables * Introduce single point for localhost ip address for ios webpack * Update cageui-25.002-25.003.sql --------- Co-authored-by: F. Daniel Nicolalde <fdnicolalde@wisc.edu>
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
| </columns> | ||
| </customView> No newline at end of file | ||
| <div id="app"></div> | ||
| <% if (htmlWebpackPlugin.options.mode === 'dev') { %> |
Check warning
Code scanning / CodeQL
Inclusion of functionality from an untrusted source Medium
Conflicts: CageUI/src/org/labkey/cageui/CageUIController.java
labkey-tchad
force-pushed
the
25.11_fb_bot_merge_25.7
branch
from
c05daf3 to
8f72088
Compare
labkey-tchad
approved these changes
Mar 24, 2026
github-actions
bot
merged commit 8f72088
into
release25.11-SNAPSHOT
9 of 10 checks passed
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
3 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
25.7into25.11_fb_bot_merge_25.7and 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=25.11_fb_bot_merge_25.7