Merge remote-tracking branch 'origin/develop' into fb_gradle_9.0.0

Author: labkey-susanh

CageUI/resources/web/CageUI/static/RoomBorder.svg

@@ -295,8 +295,9 @@ const Editor: FC<EditorProps> = ({roomSize}) => {
         const updateItemType: RoomItemType = stringToRoomItem(parseWrapperId(draggedNodeId));
 
         if (targetRect) {
-            const cellX = Math.max(0,targetRect.x);
-            const cellY = Math.max(0,targetRect.y);
+            // update the found x and y coords with new cell coords if the object was outside the available layout range.
+            const cellX = targetRect.x < SVG_WIDTH && targetRect.x > 0 ? targetRect.x : 0;
+            const cellY = targetRect.y < SVG_HEIGHT && targetRect.y > 0 ? targetRect.y : 0;
 
             let newId: string;
 

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

@@ -19,8 +19,8 @@
 import { Modification, ModLocations, ModRecord, ModTypes } from '../types/typings';
 
 export const CELL_SIZE = 30; // number of pixels of a cell for length/width
-export const SVG_WIDTH = 1290; // width of the layout svg
-export const SVG_HEIGHT = 810; // height of the layout svg
+export const SVG_WIDTH = 810; // width of the layout svg
+export const SVG_HEIGHT = 1290; // height of the layout svg
 
 //TODO finish styles
 export const Modifications: ModRecord = {

CageUI/src/client/utils/constants.ts

@@ -197,7 +197,7 @@ public void addQueryFieldKeys(Set<FieldKey> 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"));
+                        keys.add(FieldKey.fromParts("taskid","qcstate","label"));
                     }
 
                     @Override