Merge 25.7 to 25.9

Author: labkey-teamcity

CageUI/resources/schemas/dbscripts/postgresql/cageui-25.001-25.002.sql

@@ -0,0 +1,23 @@
+/*
+ *
+ *  * Copyright (c) 2025 Board of Regents of the University of Wisconsin System
+ *  *
+ *  * Licensed under the Apache License, Version 2.0 (the "License");
+ *  * you may not use this file except in compliance with the License.
+ *  * You may obtain a copy of the License at
+ *  *
+ *  *     http://www.apache.org/licenses/LICENSE-2.0
+ *  *
+ *  * Unless required by applicable law or agreed to in writing, software
+ *  * distributed under the License is distributed on an "AS IS" BASIS,
+ *  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  * See the License for the specific language governing permissions and
+ *  * limitations under the License.
+ *
+ */
+
+insert into ehr_lookups.lookups (set_name,container,value, category, title)
+select setname, container, 105 as value, 'Room Object' as category, 'Top' as title from ehr_lookups.lookup_sets where setname='cageui_item_types';
+
+insert into ehr_lookups.lookups (set_name,container,value, category, title)
+select setname, container, 106 as value, 'Room Object' as category, 'Bottom' as title from ehr_lookups.lookup_sets where setname='cageui_item_types';

CageUI/resources/web/CageUI/static/bottom.svg

@@ -216,7 +216,7 @@ const Editor: FC<EditorProps> = ({roomSize}) => {
                 textElement.setAttribute('contentEditable', 'true');
                 (textElement.children[0] as SVGTSpanElement).style.cursor = "pointer";
                 (textElement.children[0] as SVGTSpanElement).style.pointerEvents = "auto";
-                const cageGroupElement = textElement.closest(`[id^=${roomItemToString(updateItemType)}]`) as SVGGElement;
+                const cageGroupElement = textElement.closest(`[id=${roomItemToString(updateItemType)}]`) as SVGGElement;
                 setupEditCageEvent(cageGroupElement, setSelectedObj, contextMenuRef,setCtxMenuStyle, roomItemToString(updateItemType) as RackStringType);
             });
         }else{
@@ -810,6 +810,18 @@ const Editor: FC<EditorProps> = ({roomSize}) => {
         <div className={"layout-editor"}>
             <div ref={utilsRef} id="utils" className={"room-utils"}>
                 <div className={'room-objects'}>
+                    <LayoutTooltip text={"Top"}>
+                        <RoomItemTemplate
+                            fileName={"top"}
+                            className={"draggable"}
+                        />
+                    </LayoutTooltip>
+                    <LayoutTooltip text={"Bottom"}>
+                        <RoomItemTemplate
+                            fileName={"bottom"}
+                            className={"draggable"}
+                        />
+                    </LayoutTooltip>
                     <LayoutTooltip text={"Door"}>
                         <RoomItemTemplate
                             fileName={"door"}

CageUI/resources/web/CageUI/static/top.svg

@@ -52,6 +52,8 @@ export enum RoomObjectTypes {
     Door = 102,
     GateClosed = 103,
     GateOpen = 104,
+    Top = 104,
+    Bottom = 104,
 }
 
 // value in the cage modifications table in EHR

CageUI/src/client/components/layoutEditor/Editor.tsx

@@ -458,10 +458,10 @@ export async function mergeRacks(props: MergeProps) {
     }
     if (action !== 'cancel') {
         let targetRackShape: d3.Selection<SVGGElement, {}, HTMLElement, any>
-            = layoutSvg.select(`[id^=${targetRack.itemId}]`);
+            = layoutSvg.select(`[id=${targetRack.itemId}]`);
 
         let draggedRackShape: d3.Selection<SVGGElement, {}, HTMLElement, any>
-            = layoutSvg.select(`[id^=${draggedRack.itemId}]`);
+            = layoutSvg.select(`[id=${draggedRack.itemId}]`);
 
         let newGroup: d3.Selection<SVGGElement, {}, HTMLElement, any>;
 

CageUI/src/client/types/typings.ts

@@ -60,7 +60,7 @@ public String getName()
     @Override
     public @Nullable Double getSchemaVersion()
     {
-        return 25.001;
+        return 25.002;
     }
 
     @Override

CageUI/src/client/utils/LayoutEditorHelpers.ts

@@ -61,6 +61,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
 
 public class WNPRC_EHRCustomizer extends AbstractTableCustomizer
 {
@@ -189,13 +190,23 @@ public Object getDisplayValue(RenderContext ctx)
             {
                 updateTitleCol.setDisplayColumnFactory(colInfo -> new DataColumn(colInfo)
                 {
+                    @Override
+                    public void addQueryFieldKeys(Set<FieldKey> keys)
+                    {
+                        super.addQueryFieldKeys(keys);
+                        keys.add(new FieldKey(getBoundColumn().getFieldKey().getParent(), "updateTitle"));
+                        keys.add(new FieldKey(getBoundColumn().getFieldKey().getParent(), "taskid"));
+                        keys.add(new FieldKey(getBoundColumn().getFieldKey().getParent(), "formtype"));
+                        keys.add(FieldKey.fromParts("qcstate","label"));
+                    }
+
                     @Override
                     public void renderGridCellContents(RenderContext ctx, HtmlWriter out)
                     {
                         String updateTitle = (String) ctx.get(new FieldKey(getBoundColumn().getFieldKey().getParent(), "updateTitle"));
                         String taskId = (String) ctx.get(new FieldKey(getBoundColumn().getFieldKey().getParent(), "taskid"));
                         String formType = (String) ctx.get(new FieldKey(getBoundColumn().getFieldKey().getParent(), "formtype"));
-                        String qcState = (String) ctx.get(new FieldKey(getBoundColumn().getFieldKey().getParent(), "QCState$Label"));
+                        String qcState = (String) ctx.get(FieldKey.fromParts("taskid","qcstate","label"));
 
                         if (formType != null && isExt4Form("form", formType))
                         {