diff --git a/CageUI/src/client/pages/layoutEditor/LayoutEditor.tsx b/CageUI/src/client/pages/layoutEditor/LayoutEditor.tsx
index be97c5556..fd0de7825 100644
--- a/CageUI/src/client/pages/layoutEditor/LayoutEditor.tsx
+++ b/CageUI/src/client/pages/layoutEditor/LayoutEditor.tsx
@@ -27,13 +27,13 @@ import Editor from '../../components/layoutEditor/Editor';
import { labkeyGetUserPermissions } from '../../api/labkeyActions';
import { RoomSizeSelector, SelectorOptions } from '../../components/layoutEditor/RoomSizeSelector';
import { ConfirmationPopup } from '../../components/ConfirmationPopup';
-import { isRoomCreator, isTemplateCreator } from '../../utils/LayoutEditorHelpers';
+import { isRoomCreator, isRoomModifier, isTemplateCreator } from '../../utils/helpers';
import { GetUserPermissionsResponse } from '@labkey/api/dist/labkey/security/Permission';
import { roomSizeOptions } from '../../utils/constants';
import { buildNewLocalRoom, fetchRoomData } from '../../utils/helpers';
export const LayoutEditor: FC
= () => {
- const roomName = ActionURL.getParameter('room');
+ const roomName: string = ActionURL.getParameter('room');
const [prevRoomData, setPrevRoomData] = useState({
name: null,
cagingData: [],
@@ -62,7 +62,10 @@ export const LayoutEditor: FC = () => {
// if the user is a template creator grant access
if (isTemplateCreator(profile) || (isRoomCreator(profile))) {
setAccess(true);
- }else{
+ }else if(isRoomModifier(profile) && roomName && !roomName.includes("template")){ // ensure room modifiers are editing a real room
+ setAccess(true);
+ }
+ else{
setAccess(false);
}
}
@@ -145,7 +148,10 @@ export const LayoutEditor: FC = () => {
}
}, [prevRoomData]);
- return (!isLoading && userProfile && access) ? (
+ return (isLoading) ?
+
+
Page is loading, please wait.
+ : (!isLoading && userProfile && access) ? (
= () => {
}
/>
- ) :
-
Error loading page. This could be due to a number of issues
-
- - Insufficient permissions
- - Slow load times
- - New bugs on our end. If you believe this might be the issue please submit a ticket.
-
-
;
+ ) : (!isLoading && !access) ?
+ (
+
+
Error loading page. You do not have sufficient permissions. Please open a ticket if you believe this is a mistake.
+
+ ) : (
+
+
Error loading page. Please submit a ticket.
+
+ );
};
\ No newline at end of file
diff --git a/CageUI/src/client/types/homeNavigationContextTypes.ts b/CageUI/src/client/types/homeNavigationContextTypes.ts
index a2c067177..816a746b8 100644
--- a/CageUI/src/client/types/homeNavigationContextTypes.ts
+++ b/CageUI/src/client/types/homeNavigationContextTypes.ts
@@ -20,15 +20,19 @@ import { SelectedPage } from './homeTypes';
import { Cage, Rack, RackGroup, Room, RoomMods } from './typings';
import { SetStateAction } from 'react';
import { GetUserPermissionsResponse } from '@labkey/api/dist/labkey/security/Permission';
+import * as React from 'react';
export interface HomeNavigationContextType {
selectedPage: SelectedPage;
selectedRoom: Room;
- setSelectedRoom: React.Dispatch
>;
+ selectedLocalRoom: Room;
+ setSelectedLocalRoom: React.Dispatch>;
selectedRoomMods: RoomMods;
selectedRackGroup: RackGroup;
selectedRack: Rack;
selectedCage: Cage;
navigateTo: (page: SelectedPage) => void;
userProfile: GetUserPermissionsResponse;
+ setIsNavLoading: React.Dispatch>;
+ isNavLoading: boolean;
}
\ No newline at end of file
diff --git a/CageUI/src/client/types/homeTypes.ts b/CageUI/src/client/types/homeTypes.ts
index 4b35b0db2..87be7b577 100644
--- a/CageUI/src/client/types/homeTypes.ts
+++ b/CageUI/src/client/types/homeTypes.ts
@@ -33,7 +33,7 @@ import { Option } from '@labkey/components';
export type SelectedViews = 'Home' | 'Room' | 'Rack' | 'Cage';
-export type ConnectedModType = Partial> & { modId: ModIdKey, parentModId?: ModIdKey };
+export type ConnectedModType = Partial & { modId: ModIdKey, parentModId?: ModIdKey };
export type ExpandedRooms = {
[key: string]: boolean;
diff --git a/CageUI/src/client/types/layoutEditorContextTypes.ts b/CageUI/src/client/types/layoutEditorContextTypes.ts
index 74661d169..7fb6a245e 100644
--- a/CageUI/src/client/types/layoutEditorContextTypes.ts
+++ b/CageUI/src/client/types/layoutEditorContextTypes.ts
@@ -70,4 +70,5 @@ export interface LayoutContextType {
getAdjCages: (cage: Cage, cageLoc: LocationCoords) => LocationCoords[];
reloadRoom: Room,
setReloadRoom: React.Dispatch>,
+ unmergeRacks: (rackGroup: RackGroup, selectedRack: Rack) => void;
}
\ No newline at end of file
diff --git a/CageUI/src/client/types/roomContextTypes.ts b/CageUI/src/client/types/roomContextTypes.ts
index 9e744d284..e2b5f6b92 100644
--- a/CageUI/src/client/types/roomContextTypes.ts
+++ b/CageUI/src/client/types/roomContextTypes.ts
@@ -16,12 +16,14 @@
*
*/
-import { Cage, CurrCageMods, Rack, RackConditionOption } from './typings';
+import { Cage, CurrCageMods, Rack, RackConditionOption, RoomObject } from './typings';
import { ModificationSaveResult, RackSwitchOption } from './homeTypes';
import { LayoutSaveResult, RackChangeSaveResult } from './layoutEditorTypes';
export interface RoomContextType {
saveCageMods: (currCage: Cage, currCageMods: CurrCageMods) => ModificationSaveResult;
submitLayoutMods: () => Promise;
- submitRackChange: (newRack: RackSwitchOption, prevRack: Rack, prevRackCondition: RackConditionOption) => Promise
+ submitRackChange: (newRack: RackSwitchOption, prevRack: Rack, prevRackCondition: RackConditionOption) => Promise;
+ saveRoomObj: (itemId: string, newObj: RoomObject) => void;
+
}
\ No newline at end of file
diff --git a/CageUI/src/client/types/typings.ts b/CageUI/src/client/types/typings.ts
index de5bd92df..18076e486 100644
--- a/CageUI/src/client/types/typings.ts
+++ b/CageUI/src/client/types/typings.ts
@@ -17,7 +17,7 @@
*/
import { GateContext } from './layoutEditorTypes';
-import { ConnectedCages, ConnectedModType, ConnectedRacks } from './homeTypes';
+import { ConnectedCages, ConnectedModType, ConnectedRacks, EHRCageMods } from './homeTypes';
import { Option } from '@labkey/components';
import { SelectorOptions } from '../components/layoutEditor/RoomSizeSelector';
@@ -69,10 +69,13 @@ export enum ModTypes {
PCDivider = 'pcd', // protected contact
VCDivider = 'vcd', // visual contact
PrivacyDivider = 'pd',
+ LockedDivider = 'ld',
NoDivider = 'nd',
CTunnel = 'ct',
Extension = 'ex',
- SPDivider = 'spd' // Social Panel
+ SPDivider = 'spd', // Social Panel
+ Restraint = 'res',
+ Blind = 'bld'
}
export enum ModDirections {
@@ -114,6 +117,8 @@ export enum ModSvgLocId {
Top = 'ceiling',
Bottom = 'floor',
Extension = 'extension',
+ Restraint = 'restraint',
+ Blind = 'blind',
CTunnelCircle = 'cTunnel-circle',
CTunnelLeft = 'cTunnel-left',
CTunnelRight = 'cTunnel-right',
@@ -125,7 +130,6 @@ export enum ModSvgLocId {
export enum RackConditions {
Operational,
Damaged,
- Repairing,
}
export type RackStringType = string & { __brand: 'RackStringType' };
@@ -181,6 +185,9 @@ export type Modification = {
export type ModRecord = Record;
+export interface LoadedSvgs {
+ [key: RoomItemStringType]: SVGElement;
+}
export interface FetchRoomData {
selectedSize: SelectorOptions;
@@ -210,7 +217,7 @@ export interface CageDimensions {
}
export interface RoomMods {
- [key: ModIdKey]: Option;
+ [key: ModIdKey]: EHRCageMods;
}
export interface CurrCageMods {
@@ -426,4 +433,26 @@ export interface RackChangeOption {
export interface RackConditionOption {
value: RackConditions;
label: string;
+}
+
+/*
+ In order to fit the wnprc.session_log format and work around the fact that the cageui submits data to many different
+ tables for each room update, schemaName and queryName denote the following submissions. It should be noted that even
+ though these are the schema/query displayed in the session log, that each submission usually submits to all of the tables
+ listed below to build a complete room history.
+
+ Layout editor submission:
+ SchemaName: cageui, QueryName: layout_history
+ Cage modification submission:
+ SchemaName: cageui, QueryName: cage_modifications_history
+ Rack change submission:
+ schemaName: cageui, QueryName: rack_history
+
+
+ */
+export interface SessionLog {
+ startTime: string;
+ userAgent: string;
+ schemaName: string;
+ queryName: string;
}
\ No newline at end of file
diff --git a/CageUI/src/client/utils/LayoutEditorHelpers.ts b/CageUI/src/client/utils/LayoutEditorHelpers.ts
index 82bb7b32f..0f8e4fa85 100644
--- a/CageUI/src/client/utils/LayoutEditorHelpers.ts
+++ b/CageUI/src/client/utils/LayoutEditorHelpers.ts
@@ -23,7 +23,7 @@ import {
generateUUID,
getAdjLocation,
getDefaultMod,
- getTypeClassFromElement,
+ getTypeClassFromElement, isRoomCreator, isRoomModifier, isTemplateCreator,
parseRoomItemType,
roomItemToString
} from './helpers';
@@ -33,7 +33,6 @@ import {
CageDirection,
CageHistoryData,
CageMods,
- CageNumber,
CageSvgId,
DefaultRackTypes,
FullObjectHistoryData,
@@ -50,6 +49,7 @@ import {
RoomItemClass,
RoomItemStringType,
RoomItemType,
+ RoomObjectTypes,
UnitLocations
} from '../types/typings';
import {
@@ -69,21 +69,65 @@ import { fetchCage, fetchCageHistory, fetchRack } from '../api/popularQueries';
import { ConnectedCage, ConnectedRack } from '../types/homeTypes';
-export const isTemplateCreator = (user: GetUserPermissionsResponse) => {
- return Security.hasEffectivePermission(user.container.effectivePermissions, 'org.labkey.cageui.security.permissions.CageUITemplateCreatorPermission');
-};
-export const isRoomCreator = (user: GetUserPermissionsResponse) => {
- return Security.hasEffectivePermission(user.container.effectivePermissions, 'org.labkey.cageui.security.permissions.CageUIRoomCreatorPermission');
-};
-export const isRoomModifier = (user: GetUserPermissionsResponse) => {
- return Security.hasEffectivePermission(user.container.effectivePermissions, 'org.labkey.cageui.security.permissions.CageUIRoomModifierPermission');
-};
+export const isTouchEvent = (event)=> {
+ return event.type.startsWith('touch');
+}
+
+// removes the wrapper for the id portion of room objects to properly move the object.
+export const extractRoomObjId = (id: string) => {
+ return id.replace(/-wrapper$/, '');
+}
+
+// Determines if the user has access to dragging the item
+export const isDraggable = (user: GetUserPermissionsResponse, itemType: RoomItemType) => {
+ if(isRoomCreator(user) || isTemplateCreator(user)) {
+ return true;
+ }
+ if(isRoomModifier(user)){
+ if (RoomObjectTypes.RoomDivider === itemType){
+ return true;
+ }
+ if (RoomObjectTypes.GateOpen === itemType || RoomObjectTypes.GateClosed === itemType){
+ return true;
+ }
+ }
+ return false;
+}
+
+// Determines if the user can open the items context menu
+export const canOpenContextMenu = (user: GetUserPermissionsResponse, itemType: RoomItemType) => {
+ if(isRoomCreator(user) || isTemplateCreator(user)) {
+ return true;
+ }
+ if(isRoomModifier(user)){
+ if (RoomObjectTypes.RoomDivider === itemType){
+ return true;
+ }
+ if (RoomObjectTypes.GateOpen === itemType || RoomObjectTypes.GateClosed === itemType){
+ return true;
+ }
+ }
+ return false;
+}
+
+export const canPlaceObject = (user: GetUserPermissionsResponse, itemType: RoomItemType) => {
+ if(isRoomCreator(user) || isTemplateCreator(user)) {
+ return true;
+ }
+ if(isRoomModifier(user)){
+ if (RoomObjectTypes.RoomDivider === itemType){
+ return true;
+ }
+ if (RoomObjectTypes.GateOpen === itemType || RoomObjectTypes.GateClosed === itemType){
+ return true;
+ }
+ }
+ return false;
+}
+
-export const isCageModifier = (user: GetUserPermissionsResponse) => {
- return Security.hasEffectivePermission(user.container.effectivePermissions, 'org.labkey.cageui.security.permissions.CageUIModificationEditorPermission');
-};
export const processRealLayoutHistory = async (data: LayoutHistoryData[]): Promise<{
fulfilled: FullObjectHistoryData[];
@@ -367,39 +411,113 @@ export function setupEditCageEvent(
cageGroupElement: SVGGElement,
setSelectedObj: React.Dispatch>,
localRoomRef: MutableRefObject,
- eventType: 'view' | 'edit',
+ eventType: "edit" | "view",
setCtxMenuStyle?: React.Dispatch>,
): () => void {
- const handleContextMenu = (event: MouseEvent) => {
- event.preventDefault();
- const localRoom = localRoomRef.current;
+
+ // Main context menu handler
+ const handleContextMenu = (event: MouseEvent | CustomEvent) => {
+ // Only block native menu if we're using a custom one
+ if (setCtxMenuStyle && event.defaultPrevented === false) {
+ event.preventDefault();
+ }
+
+ const element = event.target as SVGGElement;
let tempObj: SelectedObj;
- const element = event.currentTarget as SVGGElement;
- //set selected object to either room object or cage
- if (d3.select(element).classed('room-obj')) {
- tempObj = localRoom.objects.find((obj) => obj.itemId === element.id);
+ if (d3.select(element.parentElement).classed('room-obj')) {
+ tempObj = localRoomRef.current.objects.find(obj => obj.itemId === element.id);
} else {
const cageGroupElement = element.closest(`[id^="cageSVG_"]`) as SVGGElement | null;
- const cageObj = localRoom.rackGroups.flatMap(g => g.racks).flatMap(r => r.cages).find(c => c.svgId === cageGroupElement.id);
+ const cageObj = localRoomRef.current.rackGroups
+ .flatMap(g => g.racks)
+ .flatMap(r => r.cages)
+ .find(c => c.svgId === cageGroupElement?.id);
tempObj = cageObj;
}
+
+ if (!tempObj) return; // safety
+
setSelectedObj(tempObj);
+
if (setCtxMenuStyle) {
- setCtxMenuStyle((prevState) => ({
- ...prevState,
+ const clientX = (event as MouseEvent).clientX;
+ const clientY = (event as MouseEvent).clientY;
+
+ setCtxMenuStyle({
display: 'block',
- left: `${event.clientX}px`,
- top: `${event.clientY - 5}px`,
- }));
+ left: `${clientX}px`,
+ top: `${clientY - 5}px`,
+ });
+ }
+ };
+
+ // Touch gesture handlers
+ let touchStartTime = 0;
+ let touchStartX = 0;
+ let touchStartY = 0;
+ let touchTimer: number | null = null;
+ let isDragging = false;
+
+ const handleTouchStart = (event: TouchEvent) => {
+ if (event.touches.length !== 1) return;
+
+ const touch = event.touches[0];
+ touchStartTime = Date.now();
+ touchStartX = touch.clientX;
+ touchStartY = touch.clientY;
+ isDragging = false;
+
+ if (touchTimer) clearTimeout(touchTimer);
+
+ // ⚠️ DO NOT preventDefault() here — let long-press begin!
+ touchTimer = window.setTimeout(() => {
+ if (!isDragging) {
+ event.preventDefault();
+ // Create a trusted synthetic contextmenu event for iOS
+ const contextMenuEvent = new MouseEvent('contextmenu', {
+ bubbles: true,
+ cancelable: true,
+ clientX: touch.clientX,
+ clientY: touch.clientY,
+ }) as MouseEvent;
+
+ // Dispatch directly on the element
+ cageGroupElement.dispatchEvent(contextMenuEvent);
+ }
+ }, 500); // iOS default long-press is ~500ms
+ };
+
+ const handleTouchMove = (event: TouchEvent) => {
+ if (event.touches.length !== 1) return;
+
+ const touch = event.touches[0];
+ const dx = Math.abs(touch.clientX - touchStartX);
+ const dy = Math.abs(touch.clientY - touchStartY);
+
+ if (dx > 10 || dy > 10) {
+ isDragging = true;
+ if (touchTimer) {
+ clearTimeout(touchTimer);
+ touchTimer = null;
+ }
}
+ };
+ const handleTouchEnd = (event: TouchEvent) => {
+ if (touchTimer) {
+ clearTimeout(touchTimer);
+ touchTimer = null;
+ }
};
- // Attach context menu to the lowest level group for that cage.
- cageGroupElement.style.pointerEvents = 'bounding-box';
+
+
if (eventType === 'edit') {
cageGroupElement.addEventListener('contextmenu', handleContextMenu);
+ cageGroupElement.addEventListener('touchstart', handleTouchStart);
+ cageGroupElement.addEventListener('touchmove', handleTouchMove);
+ cageGroupElement.addEventListener('touchend', handleTouchEnd);
} else {
cageGroupElement.addEventListener('click', handleContextMenu);
}
@@ -407,12 +525,16 @@ export function setupEditCageEvent(
return () => {
if (eventType === 'edit') {
cageGroupElement.removeEventListener('contextmenu', handleContextMenu);
+ cageGroupElement.removeEventListener('touchstart', handleTouchStart);
+ cageGroupElement.removeEventListener('touchmove', handleTouchMove);
+ cageGroupElement.removeEventListener('touchend', handleTouchEnd);
} else {
cageGroupElement.removeEventListener('click', handleContextMenu);
}
};
}
+
/*
Helper function to either connect racks or merge cages
@@ -449,7 +571,7 @@ export async function mergeRacks(props: MergeProps) {
element.setAttribute('class', `grouped-${shapeType}`);
element.setAttribute('style', '');
}
- setupEditCageEvent(element, cageActionProps.setSelectedObj, contextMenuRef, 'edit', cageActionProps.setCtxMenuStyle);
+ setupEditCageEvent(element, cageActionProps.setSelectedObj, contextMenuRef, "edit", cageActionProps.setCtxMenuStyle);
}
// add starting x and y for each group to then increment its local subgroup coords by.
@@ -708,7 +830,7 @@ export function checkAdjacent(targetCage: LocationCoords, draggedCage: LocationC
}
}
- return {isAdjacent: false, direction: '0'};
+ return {isAdjacent: false, direction: null};
}
//Offset for the top left corner of the layout, without doing this objects will randomly jump when dragging and placing
@@ -776,7 +898,13 @@ export function createDragInLayout() {
const element = d3.select(this);
const transform = d3.zoomTransform(layoutSvg.node());
const scale = transform.k;
- const [newX, newY] = d3.pointer(event.sourceEvent, this.parentNode);
+ let [newX, newY] = [0,0];
+ if(isTouchEvent(event.sourceEvent)){
+ [newX, newY] = d3.pointer(event.sourceEvent.touches[0], this.parentNode);
+
+ }else{
+ [newX, newY] = d3.pointer(event.sourceEvent, this.parentNode);
+ }
element.attr('transform', `translate(${newX},${newY}) scale(${scale})`);
}
@@ -795,7 +923,13 @@ export function createEndDragInLayout(props: LayoutDragProps) {
const layoutSvg: d3.Selection = d3.select('[id=layout-svg]');
const transform = d3.zoomTransform(layoutSvg.node());
- const [pointerX, pointerY] = d3.pointer(event, layoutSvg.node()); // mouse position with respect to layout svg
+ let [pointerX, pointerY] = [0,0];
+ if(isTouchEvent(event.sourceEvent)){
+ [pointerX, pointerY] = d3.pointer(event.sourceEvent.changedTouches[0], layoutSvg.node()); // mouse position with respect to layout svg
+
+ }else{
+ [pointerX, pointerY] = d3.pointer(event, layoutSvg.node()); // mouse position with respect to layout svg
+ }
const {x, y} = getLayoutOffset({
clientX: pointerX,
clientY: pointerY,
diff --git a/CageUI/src/client/utils/constants.ts b/CageUI/src/client/utils/constants.ts
index 108ed7a29..b28eef1e5 100644
--- a/CageUI/src/client/utils/constants.ts
+++ b/CageUI/src/client/utils/constants.ts
@@ -214,6 +214,20 @@ export const Modifications: ModRecord = {
value: '4'
}]
},
+ [ModTypes.LockedDivider]: {
+ name: 'Locked Divider',
+ svgIds: {
+ [ModLocations.Left]: LocationWithRotationMap[ModLocations.Left],
+ [ModLocations.Right]: LocationWithRotationMap[ModLocations.Right],
+ },
+ styles: [{
+ property: 'stroke',
+ value: '#ed1c24'
+ }, {
+ property: 'stroke-width',
+ value: '2'
+ }]
+ },
[ModTypes.NoDivider]: {
name: 'No Divider',
svgIds: {
@@ -282,5 +296,41 @@ export const Modifications: ModRecord = {
property: 'fill',
value: '#FCB017'
}]
+ },
+ [ModTypes.Restraint]: {
+ name: 'Restraint',
+ svgIds: {
+ [ModLocations.Direct]: {
+ [GroupRotation.Origin]: [ModSvgLocId.Restraint],
+ [GroupRotation.Quarter]: [ModSvgLocId.Restraint],
+ [GroupRotation.Half]: [ModSvgLocId.Restraint],
+ [GroupRotation.ThreeQuarter]: [ModSvgLocId.Restraint]
+ },
+ },
+ styles: [{
+ property: 'stroke',
+ value: 'black'
+ }, {
+ property: 'stroke-width',
+ value: '1px'
+ }, {
+ property: 'fill',
+ value: '#FF0000'
+ }]
+ },
+ [ModTypes.Blind]: {
+ name: 'Window Blind',
+ svgIds: {
+ [ModLocations.Direct]: {
+ [GroupRotation.Origin]: [ModSvgLocId.Blind],
+ [GroupRotation.Quarter]: [ModSvgLocId.Blind],
+ [GroupRotation.Half]: [ModSvgLocId.Blind],
+ [GroupRotation.ThreeQuarter]: [ModSvgLocId.Blind]
+ },
+ },
+ styles: [{
+ property: 'opacity',
+ value: '100'
+ }]
}
};
\ No newline at end of file
diff --git a/CageUI/src/client/utils/helpers.ts b/CageUI/src/client/utils/helpers.ts
index 1ce43272a..fff87219e 100644
--- a/CageUI/src/client/utils/helpers.ts
+++ b/CageUI/src/client/utils/helpers.ts
@@ -19,6 +19,7 @@
import {
AllHistoryData,
Cage,
+ CageDirection,
CageModification,
CageModificationsType,
CageMods,
@@ -32,7 +33,7 @@ import {
GroupId,
GroupRotation,
LayoutData,
- LayoutHistoryData,
+ LayoutHistoryData, LoadedSvgs,
ModData,
ModLocations,
ModTypes,
@@ -51,6 +52,7 @@ import {
RoomObject,
RoomObjectStringType,
RoomObjectTypes,
+ SessionLog,
TemplateHistoryData,
UnitLocations,
UnitType
@@ -58,12 +60,14 @@ import {
import * as d3 from 'd3';
import { zoomTransform } from 'd3';
import { MutableRefObject } from 'react';
-import { ActionURL, Filter, Utils } from '@labkey/api';
+import { ActionURL, Filter, Security, Utils } from '@labkey/api';
import {
addModEntries,
areAllRacksNonDefault,
+ canOpenContextMenu,
createEmptyUnitLoc,
findCageInGroup,
+ isDraggable,
isRackEnum,
isRoomHomogeneousDefault,
placeAndScaleGroup,
@@ -71,13 +75,39 @@ import {
setupEditCageEvent
} from './LayoutEditorHelpers';
import { SelectDistinctOptions } from '@labkey/api/dist/labkey/query/SelectDistinctRows';
-import { selectDistinctRows } from '@labkey/components';
+import { selectDistinctRows, selectRows } from '@labkey/components';
import { CELL_SIZE, Modifications, roomSizeOptions, SVG_HEIGHT, SVG_WIDTH } from './constants';
import { ExtraContext, LayoutSaveResult } from '../types/layoutEditorTypes';
import { SelectRowsOptions } from '@labkey/api/dist/labkey/query/SelectRows';
import { labkeyActionSelectWithPromise, saveRoomLayout } from '../api/labkeyActions';
import { cageModLookup } from '../api/popularQueries';
import { ConnectedCages, ConnectedRacks } from '../types/homeTypes';
+import { GetUserPermissionsResponse } from '@labkey/api/dist/labkey/security/Permission';
+
+
+export const isTemplateCreator = (user: GetUserPermissionsResponse) => {
+ return Security.hasEffectivePermission(user.container.effectivePermissions, 'org.labkey.cageui.security.permissions.CageUITemplateCreatorPermission');
+};
+
+export const isRoomCreator = (user: GetUserPermissionsResponse) => {
+ return Security.hasEffectivePermission(user.container.effectivePermissions, 'org.labkey.cageui.security.permissions.CageUIRoomCreatorPermission');
+};
+
+export const isRoomModifier = (user: GetUserPermissionsResponse) => {
+ return Security.hasEffectivePermission(user.container.effectivePermissions, 'org.labkey.cageui.security.permissions.CageUIRoomModifierPermission');
+};
+
+export const isCageModifier = (user: GetUserPermissionsResponse) => {
+ return Security.hasEffectivePermission(user.container.effectivePermissions, 'org.labkey.cageui.security.permissions.CageUIModificationEditorPermission');
+};
+
+
+// Converts JS date object to labkey java friendly date object so it can be mapped properly from JS -> Java
+export const toLabKeyDate = (date: Date): string => {
+ const pad = (n: number, cnt: number) => n.toString().padStart(cnt, '0');
+ return `${date.getFullYear()}-${pad(date.getMonth() + 1,2)}-${pad(date.getDate(), 2)} ` +
+ `${pad(date.getHours(),2)}:${pad(date.getMinutes(),2)}:${pad(date.getSeconds(),2)}.${pad(date.getMilliseconds(),3)}`;
+}
export const generateCageId = (objectId: string): CageSvgId => {
@@ -180,6 +210,29 @@ export const parseLongId = (input: string) => {
return;
};
+export const formatRoomObj = (input: string): string => {
+ // Handle the special cases with any digit after hyphen
+ if (input.startsWith("gateClosed-") || input.startsWith("gateOpen-")) {
+ return "Gate";
+}
+ // Remove the "-{digit}" suffix if present
+ let cleanString = input.replace(/-\d+$/, '');
+
+ // Handle empty string
+ if (!cleanString) return '';
+
+ // Split on uppercase letters and hyphens, then filter out empty strings
+ const parts = cleanString.split(/(?=[A-Z])|[-_]/).filter(part => part.length > 0);
+
+ // Capitalize first letter of each part and make the rest lowercase
+ return parts
+ .map(part => {
+ if (part.length === 0) return '';
+ return part.charAt(0).toUpperCase() + part.slice(1).toLowerCase();
+ })
+ .join(' ');
+}
+
export const formatCageNum = (str: string) => {
// Split the string by hyphens
try {// if the rack is default split and correctly display it
@@ -409,7 +462,6 @@ export const fetchRoomData = async (roomName: string, abortSignal?: AbortSignal)
}));
const layoutHistoryResults = await processRealLayoutHistory(layoutHistoryData);
- console.log('Layout history results', layoutHistoryResults);
if (layoutHistoryResults.rejected.length > 0) {
throw new Error(`Error processing layout history for ${roomName}: \n ${layoutHistoryResults.rejected.join(`\n`)}`);
@@ -444,11 +496,45 @@ export const fetchRoomData = async (roomName: string, abortSignal?: AbortSignal)
return prevRoomData;
};
+const loadSvgs = async (): Promise => {
+ const loadedSvgs: LoadedSvgs = {};
+
+ const config: SelectRowsOptions = {
+ schemaName: "ehr_lookups",
+ queryName: "cageui_svg_urls",
+ columns: ["value", "title"]
+ }
+
+ const res = await labkeyActionSelectWithPromise(config);
+ if(res.rowCount > 0){
+
+ // Create all promises first
+ const promises = res.rows.map(row => {
+ return d3.svg(`${ActionURL.getContextPath()}${row.title}`).then((d) => {
+ if(!loadedSvgs[row.value]){ // cage templates
+ loadedSvgs[row.value] = d.querySelector(`svg[id*=template]`);
+ }
+ if(!loadedSvgs[row.value]){ // room objects
+ loadedSvgs[row.value] = d.querySelector('svg');
+ }
+ });
+ });
+
+ // Wait for all promises to complete
+ await Promise.all(promises);
+ }else{
+ console.error("Error finding cageUI Svgs")
+ }
+
+ return loadedSvgs;
+}
+
// Adds the svgs from the saved layouts to the DOM. Mode edit is version displayed in the layout editor and view is the one in the home views.
// roomForMods is passed if the unitsToRender is not room but needs access to the room object. This is for loading mods.
-export const addPrevRoomSvgs = (mode: 'edit' | 'view', unitsToRender: Room | RackGroup | Rack | Cage, layoutSvg: d3.Selection, currRoom?: Room, modsToLoad?: RoomMods, setSelectedObj?, contextMenuRef?: MutableRefObject, setCtxMenuStyle?, closeMenuThenDrag?) => {
+export const addPrevRoomSvgs = async (user: GetUserPermissionsResponse, mode: 'edit' | 'view', unitsToRender: Room | RackGroup | Rack | Cage, layoutSvg: d3.Selection, currRoom?: Room, modsToLoad?: RoomMods, setSelectedObj?, contextMenuRef?: MutableRefObject, setCtxMenuStyle?, closeMenuThenDrag?) => {
let renderType: 'room' | 'group' | 'rack' | 'cage';
+ const loadedSvgs: LoadedSvgs = await loadSvgs();
if ((unitsToRender as Room)?.rackGroups) {
renderType = 'room';
@@ -502,33 +588,20 @@ export const addPrevRoomSvgs = (mode: 'edit' | 'view', unitsToRender: Room | Rac
.style('pointer-events', 'bounding-box');
// This is where the cage svg group is created.
- rack.cages.forEach(async (cage) => {
+ rack.cages.forEach((cage) => {
const cageGroup = rackGroup.append('g')
.attr('id', cage.svgId)
.attr('name', cage.cageNum)
.attr('transform', `translate(${cage.x},${cage.y})`);
- let unitSvg: SVGElement;
- // If we are editing we can simply copy the svg from the ones displayed.
- // If we are in view mode they aren't on the page so we must fetch and load them in
- if (mode === 'edit') {
- unitSvg = (d3.select(`[id=${rackTypeString}_template_wrapper]`) as d3.Selection)
- .node().cloneNode(true) as SVGElement;
- } else if (mode === 'view') {
- await d3.svg(`${ActionURL.getContextPath()}/cageui/static/${rackTypeString}.svg`).then((d) => {
- unitSvg = d.querySelector(`svg[id*=template]`);
- });
- }
-
+ const unitSvg: SVGElement = loadedSvgs[rackTypeString].cloneNode(true) as SVGElement;
// Only needed for layout editor to attach context menus
const shape = d3.select(unitSvg);
shape.classed('draggable', false);
shape.style('pointer-events', 'none');
- const cageGroupContext = shape.select(`#${rackTypeString}`).node() as SVGGElement;
// in order to set the event pass in the context menu ref and styles to show/hide it
- setupEditCageEvent(cageGroupContext, setSelectedObj, contextMenuRef, mode, setCtxMenuStyle);
(shape.select('tspan').node() as SVGTSpanElement).textContent = `${parseRoomItemNum(cage.cageNum)}`;
if (mode === 'view') {
@@ -536,6 +609,10 @@ export const addPrevRoomSvgs = (mode: 'edit' | 'view', unitsToRender: Room | Rac
}
cageGroup.append(() => shape.node());
+ // attach context menu if user has permissions for cages
+ if(canOpenContextMenu(user, rack.type.type)){
+ setupEditCageEvent(cageGroup.node(), setSelectedObj, contextMenuRef, mode, setCtxMenuStyle);
+ }
});
@@ -553,42 +630,40 @@ export const addPrevRoomSvgs = (mode: 'edit' | 'view', unitsToRender: Room | Rac
.attr('id', group.groupId)
.attr('class', 'draggable rack-group');
- group.racks.forEach(async rack => {
+ group.racks.forEach( rack => {
// Use parent group as rackGroup if only 1 rack, otherwise create a new rack group
- await createRackGroup(parentGroup, rack, isSingleRack, group.rotation);
+ createRackGroup(parentGroup, rack, isSingleRack, group.rotation);
});
let groupX = renderType === 'room' ? group.x : group.racks[0].x;
let groupY = renderType === 'room' ? group.y : group.racks[0].y;
placeAndScaleGroup(parentGroup, groupX, groupY, zoomTransform(layoutSvg.node()));
if (mode === 'edit') {
- parentGroup.call(closeMenuThenDrag);
+ if(isDraggable(user, group.racks[0].type.type)){
+ parentGroup.call(closeMenuThenDrag);
+ }
}
};
// We are loading an entire room into the svg
if (renderType === 'room') {
+ // Render rack groups, racks, and cages
(unitsToRender as Room).rackGroups.forEach((group) => {
createGroup(group);
});
- (unitsToRender as Room).objects.forEach(async (roomObj) => {
- const roomObjGroup = layoutSvg.append('g')
- .data([{x: roomObj.x, y: roomObj.y}])
- .attr('id', roomObj.itemId)
+ // Render room objects
+ (unitsToRender as Room).objects.forEach( (roomObj) => {
+ const wrapperGroup = layoutSvg.append('g')
+ .attr('id', roomObj.itemId + '-wrapper')
.attr('class', 'draggable room-obj')
.attr('transform', `translate(${roomObj.x}, ${roomObj.y}) scale(${mode === 'edit' ? roomObj.scale : 1})`)
.style('pointer-events', 'bounding-box');
- let objSvg: SVGElement;
+ const roomObjGroup = wrapperGroup.append('g')
+ .attr('id', roomObj.itemId)
+ .attr('transform', `translate(0,0)`)
- if (mode === 'edit') {
- objSvg = (d3.select(`[id=${roomItemToString(roomObj.type)}_template_wrapper]`) as d3.Selection).node().cloneNode(true) as SVGElement;
- } else if (mode === 'view') {
- await d3.svg(`${ActionURL.getContextPath()}/cageui/static/${roomItemToString(roomObj.type)}.svg`).then((d) => {
- (roomObjGroup.node() as SVGElement).appendChild(d.documentElement);
- });
- return;
- }
+ const objSvg: SVGElement = loadedSvgs[roomItemToString(roomObj.type)].cloneNode(true) as SVGElement;
const shape = d3.select(objSvg)
.classed('draggable', false)
@@ -596,9 +671,17 @@ export const addPrevRoomSvgs = (mode: 'edit' | 'view', unitsToRender: Room | Rac
roomObjGroup.append(() => shape.node());
- placeAndScaleGroup(roomObjGroup, roomObj.x, roomObj.y, zoomTransform(layoutSvg.node()));
- setupEditCageEvent(roomObjGroup.node() as SVGGElement, setSelectedObj, contextMenuRef, setCtxMenuStyle);
- roomObjGroup.call(closeMenuThenDrag);
+ placeAndScaleGroup(wrapperGroup, roomObj.x, roomObj.y, zoomTransform(layoutSvg.node()));
+ // Attach context menu if user has permissions for room objects
+ if(canOpenContextMenu(user, roomObj.type)){
+ setupEditCageEvent(roomObjGroup.node(), setSelectedObj, contextMenuRef, mode, setCtxMenuStyle);
+ }
+ if(mode === 'edit'){
+ // Attach drag functionality if user has permissions
+ if(isDraggable(user, roomObj.type)){
+ wrapperGroup.call(closeMenuThenDrag);
+ }
+ }
});
} else if (renderType === 'group') { // we are rendering a single rack group
createGroup(unitsToRender as RackGroup);
@@ -610,18 +693,15 @@ export const addPrevRoomSvgs = (mode: 'edit' | 'view', unitsToRender: Room | Rac
const cageGroup = layoutSvg.append('g')
.attr('id', cage.cageNum)
.attr('transform', `translate(0,0)`);
- let unitSvg: SVGElement;
+ const unitSvg: SVGElement = loadedSvgs[parseRoomItemType((unitsToRender as Cage).cageNum)].cloneNode(true) as SVGElement;
- d3.svg(`${ActionURL.getContextPath()}/cageui/static/${parseRoomItemType((unitsToRender as Cage).cageNum)}.svg`).then((d) => {
- unitSvg = d.querySelector(`svg[id*=template]`);
- const shape = d3.select(unitSvg);
- (shape.select('tspan').node() as SVGTSpanElement).textContent = `${parseRoomItemNum((unitsToRender as Cage).cageNum)}`;
+ const shape = d3.select(unitSvg);
+ (shape.select('tspan').node() as SVGTSpanElement).textContent = `${parseRoomItemNum((unitsToRender as Cage).cageNum)}`;
- if (mode === 'view') {
- loadCageMods(cage, shape, rackGroup.rotation);
- }
- cageGroup.append(() => shape.node());
- });
+ if (mode === 'view') {
+ loadCageMods(cage, shape, rackGroup.rotation);
+ }
+ cageGroup.append(() => shape.node());
}
};
@@ -774,8 +854,7 @@ export const buildNewLocalRoom = async (prevRoom: PrevRoom): Promise<[Room, Unit
[ModLocations.Direct]: []
};
- const modReturnData = await cageModLookup([], []);
- const availMods = modReturnData.map(row => ({value: row.value, label: row.title}));
+ const availMods = await cageModLookup([], []);
const prevMods = prevRoom.modData.filter((mod) => mod.cage === cageData.objectId);
prevMods.forEach((mod) => {
@@ -812,7 +891,7 @@ export const buildNewLocalRoom = async (prevRoom: PrevRoom): Promise<[Room, Unit
x: rackItem.xCoord - rack.x - group.x, // get cage coords by subtracting from both rack and group
y: rackItem.yCoord - rack.y - group.y,
size: svgSize,
- mods: cageMods
+ mods: cageMods,
};
newUnitLocs[cageNumType].push({
@@ -828,6 +907,7 @@ export const buildNewLocalRoom = async (prevRoom: PrevRoom): Promise<[Room, Unit
const rackGroup: RackGroup = findOrAddGroup(rackItem);
const rack: Rack = await findOrAddRack(rackGroup, rackItem);
await addCageToRack(rack, rackItem, rackGroup);
+
};
// generates room object state for room objects from layout history data
@@ -875,6 +955,55 @@ export const getAdjLocation = (loc: ModLocations): ModLocations => {
}
};
+export const cageDirectionToModLocation = (loc: CageDirection, rotation: GroupRotation): ModLocations => {
+ if(rotation === GroupRotation.Origin){ // 0
+ switch (loc) {
+ case CageDirection.Left:
+ return ModLocations.Left;
+ case CageDirection.Right:
+ return ModLocations.Right;
+ case CageDirection.Top:
+ return ModLocations.Top;
+ case CageDirection.Bottom:
+ return ModLocations.Bottom;
+ }
+ }else if(rotation === GroupRotation.Quarter){ // 90
+ switch (loc) {
+ case CageDirection.Left:
+ return ModLocations.Bottom;
+ case CageDirection.Right:
+ return ModLocations.Top;
+ case CageDirection.Top:
+ return ModLocations.Right;
+ case CageDirection.Bottom:
+ return ModLocations.Left;
+ }
+ }else if(rotation === GroupRotation.Half){ // 180
+ switch (loc) {
+ case CageDirection.Left:
+ return ModLocations.Right;
+ case CageDirection.Right:
+ return ModLocations.Left;
+ case CageDirection.Top:
+ return ModLocations.Bottom;
+ case CageDirection.Bottom:
+ return ModLocations.Top;
+ }
+ }else if(rotation === GroupRotation.ThreeQuarter){ // 270
+ switch (loc) {
+ case CageDirection.Left:
+ return ModLocations.Top;
+ case CageDirection.Right:
+ return ModLocations.Bottom;
+ case CageDirection.Top:
+ return ModLocations.Left;
+ case CageDirection.Bottom:
+ return ModLocations.Right;
+ }
+ }
+
+};
+
export const getDefaultMod = (loc: ModLocations): ModTypes | null => {
if (loc === ModLocations.Top || loc === ModLocations.Bottom) {
return ModTypes.StandardFloor;
@@ -1230,7 +1359,7 @@ export const findConnectedRacks = (group: RackGroup, currRack: Rack, cage?: Cage
return connections;
};
-export const saveRoomHelper = async (room: Room, oldTemplateName?: string, prevRackCondition?: RackConditionOption): Promise => {
+export const saveRoomHelper = async (room: Room, sessionLog: SessionLog, oldTemplateName?: string, prevRackCondition?: RackConditionOption): Promise => {
const newModData: CageMods[] = [];
const roomName = room.name;
@@ -1251,43 +1380,66 @@ export const saveRoomHelper = async (room: Room, oldTemplateName?: string, prevR
// Create default mods for new rooms.
if (isRoomNonDefault) {
-
const usedMap = new Map();
room.rackGroups.forEach((group) => {
group.racks.forEach((r) => {
r.cages.forEach((c) => {
- if (c.mods === undefined || c.mods === null) {
- const connectedCages = findConnectedCages(r, group.rotation, c);
- Object.entries(connectedCages).forEach(([direction, connections]) => {
- if (connections.length === 0) {
- return;
+ const connectedCages = findConnectedCages(r, group.rotation, c);
+ const connectedRacks = findConnectedRacks(group, r, c);
+
+ // Combine all potential connection directions from both adjacent cages and racks
+ const allDirections = new Set([
+ ...Object.keys(connectedCages),
+ ...Object.keys(connectedRacks)
+ ]);
+
+ allDirections.forEach((direction) => {
+ const locDir = parseInt(direction) as ModLocations;
+ const cageConnections = connectedCages[locDir] || [];
+ const rackConnections = connectedRacks[locDir] || [];
+
+ // Only proceed if there is a connection in this direction
+ if (cageConnections.length > 0 || rackConnections.length > 0) {
+ if (c.mods && c.mods[locDir] && c.mods[locDir].length > 0) {
+ // If existing mods exist for this direction, add them
+ c.mods[locDir].forEach(section => {
+ section.modKeys.forEach(key => {
+ newModData.push({
+ cage: c.objectId,
+ location: locDir,
+ modId: key.modId,
+ modification: room.mods[key.modId].value,
+ parentModId: key.parentModId,
+ rack: r.objectId,
+ subId: section.subId,
+ });
+ });
+ });
+ } else {
+ // If no mods exist for this connection, add default ones
+ if (cageConnections.length > 0) {
+ addModEntries(cageConnections, locDir, r, false, newModData, usedMap);
+ }
+ if (rackConnections.length > 0) {
+ addModEntries(rackConnections, locDir, r, true, newModData, usedMap);
+ }
}
- const locDir = parseInt(direction) as ModLocations;
- addModEntries(connections, locDir, r, false, newModData, usedMap);
- });
+ }
+ });
- const connectedRacks = findConnectedRacks(group, r, c);
- Object.entries(connectedRacks).forEach(([direction, connections]) => {
- if (connections.length === 0) {
- return;
- }
- const locDir = parseInt(direction) as ModLocations;
- addModEntries(connections, locDir, r, true, newModData, usedMap);
- });
- } else {
- Object.entries(c.mods).forEach(([direction, modSubsections]: [string, CageModification[]]) => {
- modSubsections.forEach(section => {
- section.modKeys.forEach(key => {
- newModData.push({
- cage: c.objectId,
- location: parseInt(direction),
- modId: key.modId,
- modification: room.mods[key.modId].value,
- parentModId: key.parentModId,
- rack: r.objectId,
- subId: section.subId,
- });
+ // Handle Direct location mods (not used in connections)
+ if (c.mods && c.mods[ModLocations.Direct] && c.mods[ModLocations.Direct].length > 0) {
+ c.mods[ModLocations.Direct].forEach(section => {
+ section.modKeys.forEach(key => {
+ newModData.push({
+ cage: c.objectId,
+ location: ModLocations.Direct,
+ modId: key.modId,
+ modification: room.mods[key.modId].value,
+ parentModId: key.parentModId,
+ rack: r.objectId,
+ subId: section.subId,
});
});
});
@@ -1300,7 +1452,7 @@ export const saveRoomHelper = async (room: Room, oldTemplateName?: string, prevR
let result: LayoutSaveResult;
try {
- const layoutSave = await saveRoomLayout(room, newModData, oldRoomName, prevRackCondition);
+ const layoutSave = await saveRoomLayout(room, newModData, oldRoomName,sessionLog, prevRackCondition);
let errors;
if (layoutSave.success === false) {
errors = Array.isArray(layoutSave.errors) ? layoutSave.errors : [layoutSave.errors];
diff --git a/CageUI/src/client/utils/homeHelpers.ts b/CageUI/src/client/utils/homeHelpers.ts
index d029f307c..573abfeab 100644
--- a/CageUI/src/client/utils/homeHelpers.ts
+++ b/CageUI/src/client/utils/homeHelpers.ts
@@ -18,18 +18,33 @@
import {
Cage,
- CageDirection,
+ CageDirection, CageModification, CageModificationsType,
CageNumber,
CurrCageMods,
ModDirections,
ModLocations,
- ModTypes,
+ ModTypes, Room,
RoomMods
} from '../types/typings';
-import { Option } from '@labkey/components';
-import { cageModLookup } from '../api/popularQueries';
-import { parseRoomItemNum, parseRoomItemType } from './helpers';
+import {
+ getAdjLocation,
+ isRoomCreator,
+ isRoomModifier,
+ isTemplateCreator,
+ parseRoomItemNum,
+ parseRoomItemType
+} from './helpers';
+import { GetUserPermissionsResponse } from '@labkey/api/dist/labkey/security/Permission';
+import { ConnectedModType } from '../types/homeTypes';
+
+// Determines if the user has access to editing the layout
+export const canEditLayout = (user: GetUserPermissionsResponse) => {
+ if(isRoomCreator(user) || isTemplateCreator(user) || isRoomModifier(user)) {
+ return true;
+ }
+ return false;
+}
// takes a cage number and returns it in a display friendly format, ex: cage-1 -> Cage 1
export const getCageNumDisplay = (cageNum: CageNumber) => {
@@ -113,4 +128,163 @@ export const findDetails = (clickedCage, cageDetails, rack) => {
}
}
});
-};
\ No newline at end of file
+};
+
+
+interface BuildResult {
+ cageModsByCage: { [key: string]: CageModificationsType };
+ newRoomMods: RoomMods;
+}
+
+/*
+ * Builds updated cage modifications and room mods based on current changes,
+ * without modifying React state.
+ */
+export const buildUpdatedCageAndRoomMods = (
+ selectedLocalRoom: Room,
+ currCage: Cage,
+ currCageMods: CurrCageMods
+): BuildResult => {
+ const cageModsByCage: { [key: string]: CageModificationsType } = {};
+ const idsToRemove = new Set();
+ const newRoomMods: RoomMods = { ...selectedLocalRoom.mods }; // shallow copy of current room mods
+
+ // --- 1. Process adjacent cages ---
+ Object.entries(currCageMods.adjCages).forEach(([dirKey, allDirMods]) => {
+ allDirMods.forEach((modSubsection) => {
+ const { currMods = [], adjMods = [], currCage: adjCurrCage, adjCage: adjAdjCage } = modSubsection;
+
+ const currCageId = adjCurrCage.objectId;
+ const adjCageId = adjAdjCage.objectId;
+
+ // Initialize cage modifications if missing (deep copy the existing mods)
+ if (!cageModsByCage[currCageId]) {
+ cageModsByCage[currCageId] = deepCopyCageMods(adjCurrCage.mods);
+ }
+ if (!cageModsByCage[adjCageId]) {
+ cageModsByCage[adjCageId] = deepCopyCageMods(adjAdjCage.mods);
+ }
+
+ // Step A: Add new mods to room-wide mods registry
+ [...currMods, ...adjMods].forEach(mod => {
+ newRoomMods[mod.modId] = {direction: mod.direction, rowid: mod.rowid, title: mod.title, type: mod.type, value: mod.value};
+ });
+
+ // Step B: Collect mod IDs to remove (from old modKeys in same dir/subId)
+ const oldModIds = [
+ // From current cage's mods in this direction + subId
+ ...(cageModsByCage[currCageId][dirKey] ?? [])
+ .filter(cm => cm.subId === modSubsection.currSubId)
+ .flatMap(cm => cm.modKeys.map(m => m.modId)),
+ // From adjacent cage's mods in *reverse* direction + same subId
+ ...(cageModsByCage[adjCageId][getAdjLocation(parseInt(dirKey)) as ModLocations] ?? [])
+ .filter(cm => cm.subId === modSubsection.adjSubId)
+ .flatMap(cm => cm.modKeys.map(m => m.modId)),
+ ];
+
+ oldModIds.forEach(id => idsToRemove.add(id));
+
+ // Step C: Update modKeys for current cage
+ cageModsByCage[currCageId][dirKey] = (
+ cageModsByCage[currCageId][dirKey] || []
+ ).map((cm: CageModification) => {
+ if (cm.subId === modSubsection.currSubId) {
+ const updatedModKeys = currMods.map(m => ({
+ modId: m.modId,
+ parentModId: m.parentModId ?? null,
+ }));
+
+ // De-duplicate removals: if new mod has same ID as an old one we're removing, don't remove it
+ updatedModKeys.forEach(m => idsToRemove.delete(m.modId));
+
+ return {
+ ...cm,
+ modKeys: updatedModKeys,
+ };
+ }
+ return cm;
+ });
+
+ // Step D: Update modKeys for adjacent cage
+ const reverseDir = getAdjLocation(parseInt(dirKey)) as ModLocations;
+ cageModsByCage[adjCageId][reverseDir] = (
+ cageModsByCage[adjCageId][reverseDir] || []
+ ).map((cm: CageModification) => {
+ if (cm.subId === modSubsection.adjSubId) {
+ const updatedModKeys = adjMods.map(m => ({
+ modId: m.modId,
+ parentModId: m.parentModId ?? null,
+ }));
+
+ updatedModKeys.forEach(m => idsToRemove.delete(m.modId));
+
+ return {
+ ...cm,
+ modKeys: updatedModKeys,
+ };
+ }
+ return cm;
+ });
+ });
+ });
+
+ // --- 2. Process current (direct) cage mods ---
+ const directKey = ModLocations.Direct;
+
+ // Remove old direct mod keys
+ const currDirectMods = currCage.mods?.[directKey] ?? [];
+ if (currDirectMods.length > 0) {
+ currDirectMods[0].modKeys.forEach(m => idsToRemove.add(m.modId));
+ }
+
+ // Add new direct mods
+ const newDirectMods = currCageMods.currCage.map(mod => {
+ newRoomMods[mod.modId] = {direction: mod.direction, rowid: mod.rowid, title: mod.title, type: mod.type, value: mod.value};
+ idsToRemove.delete(mod.modId); // prevent removal if re-saved unchanged
+ return {
+ modId: mod.modId,
+ parentModId: mod.parentModId ?? null,
+ };
+ });
+
+ // Update direct cage mods (only first subId = 1 is used)
+ const currCageId = currCage.objectId;
+ if (!cageModsByCage[currCageId]) {
+ cageModsByCage[currCageId] = deepCopyCageMods(currCage.mods);
+ }
+ cageModsByCage[currCageId][directKey] = newDirectMods.length
+ ? [{ subId: 1, modKeys: newDirectMods }]
+ : [];
+
+ // Apply removals (already tracked in Set → delete from newRoomMods)
+ idsToRemove.forEach(modId => {
+ delete newRoomMods[modId];
+ });
+
+ return { cageModsByCage, newRoomMods };
+};
+
+/*
+ * Helper to deep-clone cage mods safely (avoids mutating original)
+ */
+const deepCopyCageMods = (mods?: CageModificationsType): CageModificationsType => {
+ if (!mods) return initialCageMods(); // assuming you have a fallback
+ return Object.fromEntries(
+ Object.entries(mods).map(([dir, cMods]) => [
+ dir,
+ cMods.map(cm => ({
+ ...cm,
+ modKeys: [...cm.modKeys],
+ })),
+ ])
+ ) as CageModificationsType;
+};
+
+// You’ll need this fallback somewhere — e.g., for empty cages
+const initialCageMods = (): CageModificationsType => ({
+ [ModLocations.Top]: [],
+ [ModLocations.Bottom]: [],
+ [ModLocations.Left]: [],
+ [ModLocations.Right]: [],
+ [ModLocations.Direct]: [],
+});
diff --git a/CageUI/src/org/labkey/cageui/CageUIController.java b/CageUI/src/org/labkey/cageui/CageUIController.java
index b95e69a09..7aba3f1e5 100644
--- a/CageUI/src/org/labkey/cageui/CageUIController.java
+++ b/CageUI/src/org/labkey/cageui/CageUIController.java
@@ -68,6 +68,7 @@
import org.labkey.cageui.model.RackSwitchOption;
import org.labkey.cageui.model.RackTypes;
import org.labkey.cageui.model.Room;
+import org.labkey.cageui.model.SessionLog;
import org.labkey.cageui.security.permissions.CageUILayoutEditorAccessPermission;
import org.labkey.cageui.security.permissions.CageUIModificationEditorPermission;
import org.labkey.cageui.security.permissions.CageUIRoomCreatorPermission;
@@ -378,6 +379,7 @@ public static class SaveLayoutHistoryAction extends MutatingApiAction _roomDefaultMods;
+ private SessionLog _sessionLog;
public Room getRoom()
{
@@ -399,6 +401,16 @@ public void setRoomDefaultMods(ArrayList roomDefaultMods)
_roomDefaultMods = roomDefaultMods;
}
+ public SessionLog getSessionLog()
+ {
+ return _sessionLog;
+ }
+
+ public void setSessionLog(SessionLog sessionLog)
+ {
+ _sessionLog = sessionLog;
+ }
+
//todo add room name validation to prevent template saving without template in the name
// todo add validation to prevent room from being save with default cages, and templates being saved with real cages.
@Override
@@ -412,10 +424,9 @@ public void validateForm(SimpleApiJsonForm form, Errors errors)
}
JSONObject jsonRoom = json.getJSONObject("room");
JSONArray jsonModsArray = json.getJSONArray("mods");
+ JSONObject jsonSessionLog = json.getJSONObject("sessionLog");
String prevRoomName = json.get("prevRoomName").toString();
-
-
ObjectMapper mapper = JsonUtil.createDefaultMapper();
mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
try {
@@ -467,6 +478,21 @@ public void validateForm(SimpleApiJsonForm form, Errors errors)
errors.reject(ERROR_MSG, e.getMessage());
}
+ try
+ {
+ SessionLog sessionLog = mapper.readValue(jsonSessionLog.toString(), mapper.getTypeFactory().constructType(SessionLog.class));
+ if (sessionLog != null)
+ {
+ setSessionLog(sessionLog);
+ }else {
+ errors.reject(ERROR_MSG, "Session log is corrupt");
+ }
+ }
+ catch (JsonProcessingException e)
+ {
+ errors.reject(ERROR_MSG, e.getMessage());
+ }
+
}
@Override
@@ -502,8 +528,19 @@ public Object execute(SimpleApiJsonForm form, BindException errors) throws Excep
);
BundledForms newSubmissionForms = submissionService.submitRoom();
+
+ ApiSimpleResponse res = CageUIManager.get().submitLayoutHistory(newSubmissionForms, getUser(), getContainer());
+ if(res.get("success").equals(true)){
+ CageUIManager.finalizeSessionLog(getSessionLog(), true, newSubmissionForms.getNewAllHistoryForm().getHistoryId());
+
+ CageUIManager.finalizeSessionLog(getSessionLog(), false);
+ }else{
+ CageUIManager.finalizeSessionLog(getSessionLog(), false);
+ }
+ CageUIManager.get().submitSessionLog(getSessionLog(), getUser(), getContainer());
//return new ApiSimpleResponse();
- return CageUIManager.get().submitLayoutHistory(newSubmissionForms, getUser(), getContainer());
+ return res;
}
+
}
}
diff --git a/CageUI/src/org/labkey/cageui/CageUIManager.java b/CageUI/src/org/labkey/cageui/CageUIManager.java
index 9a975e84d..c01e49eb8 100644
--- a/CageUI/src/org/labkey/cageui/CageUIManager.java
+++ b/CageUI/src/org/labkey/cageui/CageUIManager.java
@@ -21,6 +21,7 @@
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.PropertyNamingStrategy;
import org.jetbrains.annotations.NotNull;
import org.labkey.api.action.ApiSimpleResponse;
import org.labkey.api.cache.Cache;
@@ -65,6 +66,7 @@
import org.labkey.cageui.model.RackGroup;
import org.labkey.cageui.model.Room;
import org.labkey.cageui.model.RoomObject;
+import org.labkey.cageui.model.SessionLog;
import java.sql.SQLException;
import java.util.ArrayList;
@@ -141,6 +143,20 @@ public List> convertToMapList(ArrayList objects)
}
}
+ // Function to finalize the session log, errors occured is true
+ public static SessionLog finalizeSessionLog(SessionLog oldSessionLog, Boolean errorsOccurred){
+ oldSessionLog.setEndTime(new Date());
+ oldSessionLog.setErrorsOccurred(errorsOccurred);
+ return oldSessionLog;
+ }
+ // Function to finalize the session log, errors occured is false
+ public static SessionLog finalizeSessionLog(SessionLog oldSessionLog, Boolean errorsOccurred, String historyId){
+ oldSessionLog.setEndTime(new Date());
+ oldSessionLog.setErrorsOccurred(errorsOccurred);
+ oldSessionLog.setTaskId(historyId);
+ return oldSessionLog;
+ }
+
// Helper function to wrap class object to labkeys List> for data submission
public List> convertToMapList(E object)
{
@@ -163,6 +179,46 @@ public List> convertToMapList(E object)
}
}
+ /*
+ Helper function to submit the session log
+ */
+ public ApiSimpleResponse submitSessionLog(SessionLog sessionLog, User user, Container container) throws Exception {
+ BatchValidationException batchErrors = new BatchValidationException();
+ ApiSimpleResponse response = new ApiSimpleResponse();
+ UserSchema wnprcSchema = QueryService.get().getUserSchema(user, container, "wnprc");
+
+ TableInfo table = wnprcSchema.getTable("session_log");
+ QueryUpdateService qus = table.getUpdateService();
+ if (qus == null)
+ {
+ throw new IllegalStateException(table.getName() + " query update service");
+ }
+
+ try (DbScope.Transaction tx = CageUISchema.getInstance().getSchema().getScope().ensureTransaction())
+ {
+
+ if (sessionLog != null)
+ {
+ qus.insertRows(user, container, convertToMapList(sessionLog), batchErrors, null, null);
+ }
+
+ if (batchErrors.hasErrors())
+ {
+ response.put("success", false);
+ response.put("errors", batchErrors);
+ return response;
+ }
+ tx.commit();
+ response.put("success", true);
+ }
+ catch (QueryUpdateServiceException | BatchValidationException | DuplicateKeyException | RuntimeException |
+ SQLException e)
+ {
+ throw new ValidationException(e.getMessage());
+ }
+ return response;
+ }
+
/*
Helper function that takes the bundled forms and submits them to the appropriate tables
@@ -909,17 +965,12 @@ private void submitTemplateLayout(Room room, String historyId, BundledForms bund
ArrayList templateForms = new ArrayList<>();
// Process rack groups
- int rackGroupIndex = 0;
for (RackGroup rackGroup : room.getRackGroups())
{
- rackGroupIndex++;
// Process racks in this group
- int rackIndex = 0;
for (Rack rack : rackGroup.getRacks())
{
- rackIndex++;
-
// Process cages in this rack
if (rack.getCages() != null)
{
@@ -927,9 +978,9 @@ private void submitTemplateLayout(Room room, String historyId, BundledForms bund
{
TemplateLayoutHistoryForm form = new TemplateLayoutHistoryForm();
form.setHistoryId(historyId);
- form.setRackGroup(rackGroupIndex);
+ form.setRackGroup(findLastNumberAfterDash(rackGroup.getGroupId()));
form.setGroupRotation(rackGroup.getRotation());
- form.setRack(rackIndex);
+ form.setRack(rack.getItemId());
form.setCage(findLastNumberAfterDash(cage.getCageNum()));
form.setObjectType(rack.getType().getEffectiveRackType().getNumericValue());
form.setExtraContext(cage.getExtraContext() != null ?
diff --git a/CageUI/src/org/labkey/cageui/CageUIModule.java b/CageUI/src/org/labkey/cageui/CageUIModule.java
index 6bde122a0..0ccbe402a 100644
--- a/CageUI/src/org/labkey/cageui/CageUIModule.java
+++ b/CageUI/src/org/labkey/cageui/CageUIModule.java
@@ -59,7 +59,7 @@ public String getName()
@Override
public @Nullable Double getSchemaVersion()
{
- return 25.003;
+ return 26.001;
}
@Override
diff --git a/CageUI/src/org/labkey/cageui/model/ModTypes.java b/CageUI/src/org/labkey/cageui/model/ModTypes.java
index 280751f14..6eb02f82a 100644
--- a/CageUI/src/org/labkey/cageui/model/ModTypes.java
+++ b/CageUI/src/org/labkey/cageui/model/ModTypes.java
@@ -31,10 +31,13 @@ public enum ModTypes
PCDivider("pcd"),
VCDivider("vcd"),
PrivacyDivider("pd"),
+ LockedDivider("ld"),
NoDivider("nd"),
CTunnel("ct"),
Extension("ex"),
- SPDivider("spd");
+ SPDivider("spd"),
+ Restraint("res"),
+ Blind("bld");
private final String value;
diff --git a/CageUI/src/org/labkey/cageui/model/SessionLog.java b/CageUI/src/org/labkey/cageui/model/SessionLog.java
new file mode 100644
index 000000000..089f01ee9
--- /dev/null
+++ b/CageUI/src/org/labkey/cageui/model/SessionLog.java
@@ -0,0 +1,127 @@
+/*
+ *
+ * * Copyright (c) 2026 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.
+ *
+ */
+
+package org.labkey.cageui.model;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import java.util.Date;
+
+public class SessionLog
+{
+ @JsonProperty("start_time")
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm")
+ private Date _startTime;
+ @JsonProperty("end_time")
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm")
+ private Date _endTime;
+ @JsonProperty("user_agent")
+ private String _userAgent;
+ @JsonProperty("schema_name")
+ private String _schemaName;
+ @JsonProperty("query_name")
+ private String _queryName;
+ @JsonProperty("task_id")
+ private String _taskId;
+ @JsonProperty("number_of_records")
+ private Integer _numberOfRecords;
+ @JsonProperty("errors_occurred")
+ private Boolean _errorsOccurred;
+
+
+ public Date getStartTime()
+ {
+ return _startTime;
+ }
+
+ public void setStartTime(Date startTime)
+ {
+ _startTime = startTime;
+ }
+
+ public Date getEndTime()
+ {
+ return _endTime;
+ }
+
+ public void setEndTime(Date endTime)
+ {
+ _endTime = endTime;
+ }
+
+ public String getUserAgent()
+ {
+ return _userAgent;
+ }
+
+ public void setUserAgent(String userAgent)
+ {
+ _userAgent = userAgent;
+ }
+
+ public String getSchemaName()
+ {
+ return _schemaName;
+ }
+
+ public void setSchemaName(String schemaName)
+ {
+ _schemaName = schemaName;
+ }
+
+ public String getQueryName()
+ {
+ return _queryName;
+ }
+
+ public void setQueryName(String queryName)
+ {
+ _queryName = queryName;
+ }
+
+ public String getTaskId()
+ {
+ return _taskId;
+ }
+
+ public void setTaskId(String taskId)
+ {
+ _taskId = taskId;
+ }
+
+ public Integer getNumberOfRecords()
+ {
+ return _numberOfRecords;
+ }
+
+ public void setNumberOfRecords(Integer numberOfRecords)
+ {
+ _numberOfRecords = numberOfRecords;
+ }
+
+ public Boolean isErrorsOccurred()
+ {
+ return _errorsOccurred;
+ }
+
+ public void setErrorsOccurred(Boolean errorsOccurred)
+ {
+ _errorsOccurred = errorsOccurred;
+ }
+}
diff --git a/CageUI/src/org/labkey/cageui/query/AllHistoryTable.java b/CageUI/src/org/labkey/cageui/query/AllHistoryTable.java
index b8c9007a0..47ba2c50d 100644
--- a/CageUI/src/org/labkey/cageui/query/AllHistoryTable.java
+++ b/CageUI/src/org/labkey/cageui/query/AllHistoryTable.java
@@ -72,7 +72,9 @@ public boolean hasPermission(@NotNull UserPrincipal user, Class> getRows(User user, Container container, List> insertRows(User user, Container container, List> rows, BatchValidationException errors, @Nullable Map configParameters, @Nullable Map extraScriptContext) throws DuplicateKeyException, QueryUpdateServiceException, SQLException
{
List> result = null;
- if (super.hasPermission(user, CageUILayoutEditorAccessPermission.class) || super.hasPermission(user, CageUIModificationEditorPermission.class) || super.hasPermission(user, CageUIAnimalEditorPermission.class))
+ if (super.hasPermission(user, InsertPermission.class))
{
result = super._insertRowsUsingDIB(user, container, rows, getDataIteratorContext(errors, InsertOption.INSERT, configParameters), extraScriptContext);
}
@@ -102,7 +104,7 @@ public List> updateRows(User user, Container container, List
throws InvalidKeyException, BatchValidationException, QueryUpdateServiceException, SQLException
{
List> result = null;
- if (super.hasPermission(user, CageUILayoutEditorAccessPermission.class) || super.hasPermission(user, CageUIModificationEditorPermission.class) || super.hasPermission(user, CageUIAnimalEditorPermission.class))
+ if (super.hasPermission(user, UpdatePermission.class))
{
result = super.updateRows(user, container, rows, oldKeys, errors, configParameters, extraScriptContext);
}
@@ -114,7 +116,7 @@ public List> updateRows(User user, Container container, List
public List> deleteRows(User user, Container container, List> keys, @Nullable Map configParameters, @Nullable Map extraScriptContext)
throws SQLException, BatchValidationException, QueryUpdateServiceException, InvalidKeyException
{
- if (super.hasPermission(user, CageUILayoutEditorAccessPermission.class) || super.hasPermission(user, CageUIModificationEditorPermission.class) || super.hasPermission(user, CageUIAnimalEditorPermission.class))
+ if (super.hasPermission(user, DeletePermission.class))
{
return super.deleteRows(user, container, keys, configParameters, extraScriptContext);
}
diff --git a/CageUI/src/org/labkey/cageui/query/CageHistoryTable.java b/CageUI/src/org/labkey/cageui/query/CageHistoryTable.java
index dece13225..fdb883628 100644
--- a/CageUI/src/org/labkey/cageui/query/CageHistoryTable.java
+++ b/CageUI/src/org/labkey/cageui/query/CageHistoryTable.java
@@ -35,6 +35,8 @@
import org.labkey.api.security.permissions.InsertPermission;
import org.labkey.api.security.permissions.Permission;
import org.labkey.api.security.permissions.UpdatePermission;
+import org.labkey.cageui.security.permissions.CageUIAnimalEditorPermission;
+import org.labkey.cageui.security.permissions.CageUILayoutEditorAccessPermission;
import org.labkey.cageui.security.permissions.CageUIModificationEditorPermission;
import java.sql.SQLException;
@@ -69,7 +71,9 @@ public boolean hasPermission(@NotNull UserPrincipal user, Class> insertRows(User user, Container container, List> rows, BatchValidationException errors, @Nullable Map configParameters, @Nullable Map extraScriptContext) throws DuplicateKeyException, QueryUpdateServiceException, SQLException
{
List> result = null;
- if (hasPermission(user, CageUIModificationEditorPermission.class))
+ if (hasPermission(user, InsertPermission.class))
{
result = super._insertRowsUsingDIB(user, container, rows, getDataIteratorContext(errors, InsertOption.INSERT, configParameters), extraScriptContext);
}
@@ -93,7 +97,7 @@ public List> updateRows(User user, Container container, List
throws InvalidKeyException, BatchValidationException, QueryUpdateServiceException, SQLException
{
List> result = null;
- if (hasPermission(user, CageUIModificationEditorPermission.class))
+ if (hasPermission(user, UpdatePermission.class))
{
result = super.updateRows(user, container, rows, oldKeys, errors, configParameters, extraScriptContext);
}
@@ -105,7 +109,7 @@ public List> updateRows(User user, Container container, List
public List> deleteRows(User user, Container container, List> keys, @Nullable Map configParameters, @Nullable Map extraScriptContext)
throws SQLException, BatchValidationException, QueryUpdateServiceException, InvalidKeyException
{
- if (hasPermission(user, CageUIModificationEditorPermission.class))
+ if (hasPermission(user, DeletePermission.class))
{
return super.deleteRows(user, container, keys, configParameters, extraScriptContext);
}
diff --git a/CageUI/src/org/labkey/cageui/query/CageModificationsHistoryTable.java b/CageUI/src/org/labkey/cageui/query/CageModificationsHistoryTable.java
index e2efd23b7..aea44c043 100644
--- a/CageUI/src/org/labkey/cageui/query/CageModificationsHistoryTable.java
+++ b/CageUI/src/org/labkey/cageui/query/CageModificationsHistoryTable.java
@@ -35,6 +35,8 @@
import org.labkey.api.security.permissions.InsertPermission;
import org.labkey.api.security.permissions.Permission;
import org.labkey.api.security.permissions.UpdatePermission;
+import org.labkey.cageui.security.permissions.CageUIAnimalEditorPermission;
+import org.labkey.cageui.security.permissions.CageUILayoutEditorAccessPermission;
import org.labkey.cageui.security.permissions.CageUIModificationEditorPermission;
import java.sql.SQLException;
@@ -69,7 +71,9 @@ public boolean hasPermission(@NotNull UserPrincipal user, Class> insertRows(User user, Container container, List> rows, BatchValidationException errors, @Nullable Map configParameters, @Nullable Map extraScriptContext) throws DuplicateKeyException, QueryUpdateServiceException, SQLException
{
List> result = null;
- if (hasPermission(user, CageUIModificationEditorPermission.class))
+ if (hasPermission(user, InsertPermission.class))
{
result = super._insertRowsUsingDIB(user, container, rows, getDataIteratorContext(errors, InsertOption.INSERT, configParameters), extraScriptContext);
}
@@ -93,7 +97,7 @@ public List> updateRows(User user, Container container, List
throws InvalidKeyException, BatchValidationException, QueryUpdateServiceException, SQLException
{
List> result = null;
- if (hasPermission(user, CageUIModificationEditorPermission.class))
+ if (hasPermission(user, UpdatePermission.class))
{
result = super.updateRows(user, container, rows, oldKeys, errors, configParameters, extraScriptContext);
}
@@ -105,7 +109,7 @@ public List> updateRows(User user, Container container, List
public List> deleteRows(User user, Container container, List> keys, @Nullable Map configParameters, @Nullable Map extraScriptContext)
throws SQLException, BatchValidationException, QueryUpdateServiceException, InvalidKeyException
{
- if (hasPermission(user, CageUIModificationEditorPermission.class))
+ if (hasPermission(user, DeletePermission.class))
{
return super.deleteRows(user, container, keys, configParameters, extraScriptContext);
}
diff --git a/CageUI/src/org/labkey/cageui/query/CageModificationsTable.java b/CageUI/src/org/labkey/cageui/query/CageModificationsTable.java
index 634cfca0a..138559701 100644
--- a/CageUI/src/org/labkey/cageui/query/CageModificationsTable.java
+++ b/CageUI/src/org/labkey/cageui/query/CageModificationsTable.java
@@ -81,7 +81,7 @@ public boolean hasPermission(@NotNull UserPrincipal user, Class> insertRows(User user, Container container, List> rows, BatchValidationException errors, @Nullable Map configParameters, @Nullable Map extraScriptContext) throws DuplicateKeyException, QueryUpdateServiceException, SQLException
{
List> result = null;
- if (hasPermission(user, CageUIRoomCreatorPermission.class))
+ if (hasPermission(user, InsertPermission.class))
{
result = super._insertRowsUsingDIB(user, container, rows, getDataIteratorContext(errors, InsertOption.INSERT, configParameters), extraScriptContext);
}
@@ -95,7 +95,7 @@ public List> updateRows(User user, Container container, List
throws InvalidKeyException, BatchValidationException, QueryUpdateServiceException, SQLException
{
List> result = null;
- if (hasPermission(user, CageUIRoomCreatorPermission.class))
+ if (hasPermission(user, UpdatePermission.class))
{
result = super.updateRows(user, container, rows, oldKeys, errors, configParameters, extraScriptContext);
}
@@ -107,7 +107,7 @@ public List> updateRows(User user, Container container, List
public List> deleteRows(User user, Container container, List> keys, @Nullable Map configParameters, @Nullable Map extraScriptContext)
throws SQLException, BatchValidationException, QueryUpdateServiceException, InvalidKeyException
{
- if (hasPermission(user, CageUIRoomCreatorPermission.class))
+ if (hasPermission(user, DeletePermission.class))
{
return super.deleteRows(user, container, keys, configParameters, extraScriptContext);
}
diff --git a/CageUI/src/org/labkey/cageui/query/CagesTable.java b/CageUI/src/org/labkey/cageui/query/CagesTable.java
index f299a23a8..728677675 100644
--- a/CageUI/src/org/labkey/cageui/query/CagesTable.java
+++ b/CageUI/src/org/labkey/cageui/query/CagesTable.java
@@ -36,6 +36,9 @@
import org.labkey.api.security.permissions.InsertPermission;
import org.labkey.api.security.permissions.Permission;
import org.labkey.api.security.permissions.UpdatePermission;
+import org.labkey.cageui.security.permissions.CageUIAnimalEditorPermission;
+import org.labkey.cageui.security.permissions.CageUILayoutEditorAccessPermission;
+import org.labkey.cageui.security.permissions.CageUIModificationEditorPermission;
import org.labkey.cageui.security.permissions.CageUIRoomCreatorPermission;
import java.sql.SQLException;
@@ -68,10 +71,11 @@ public boolean hasPermission(@NotNull UserPrincipal user, Class> insertRows(User user, Container container, List> rows, BatchValidationException errors, @Nullable Map configParameters, @Nullable Map extraScriptContext) throws DuplicateKeyException, QueryUpdateServiceException, SQLException
{
List> result = null;
- if (hasPermission(user, CageUIRoomCreatorPermission.class))
+ if (hasPermission(user, InsertPermission.class))
{
result = super._insertRowsUsingDIB(user, container, rows, getDataIteratorContext(errors, InsertOption.INSERT, configParameters), extraScriptContext);
}
@@ -95,7 +99,7 @@ public List> updateRows(User user, Container container, List
throws InvalidKeyException, BatchValidationException, QueryUpdateServiceException, SQLException
{
List> result = null;
- if (hasPermission(user, CageUIRoomCreatorPermission.class))
+ if (hasPermission(user, UpdatePermission.class))
{
result = super.updateRows(user, container, rows, oldKeys, errors, configParameters, extraScriptContext);
}
@@ -107,7 +111,7 @@ public List> updateRows(User user, Container container, List
public List> deleteRows(User user, Container container, List> keys, @Nullable Map configParameters, @Nullable Map extraScriptContext)
throws SQLException, BatchValidationException, QueryUpdateServiceException, InvalidKeyException
{
- if (hasPermission(user, CageUIRoomCreatorPermission.class))
+ if (hasPermission(user, DeletePermission.class))
{
return super.deleteRows(user, container, keys, configParameters, extraScriptContext);
}
diff --git a/CageUI/src/org/labkey/cageui/query/LayoutHistoryTable.java b/CageUI/src/org/labkey/cageui/query/LayoutHistoryTable.java
index 0bfe318fb..cc8aa4253 100644
--- a/CageUI/src/org/labkey/cageui/query/LayoutHistoryTable.java
+++ b/CageUI/src/org/labkey/cageui/query/LayoutHistoryTable.java
@@ -36,7 +36,9 @@
import org.labkey.api.security.permissions.InsertPermission;
import org.labkey.api.security.permissions.Permission;
import org.labkey.api.security.permissions.UpdatePermission;
+import org.labkey.cageui.security.permissions.CageUIAnimalEditorPermission;
import org.labkey.cageui.security.permissions.CageUILayoutEditorAccessPermission;
+import org.labkey.cageui.security.permissions.CageUIModificationEditorPermission;
import org.labkey.cageui.security.permissions.CageUIRoomCreatorPermission;
import org.labkey.cageui.security.permissions.CageUITemplateCreatorPermission;
@@ -72,9 +74,9 @@ public boolean hasPermission(@NotNull UserPrincipal user, @NotNull Class> insertRows(User user, Container container, List> rows, BatchValidationException errors, @Nullable Map configParameters, @Nullable Map extraScriptContext) throws DuplicateKeyException, QueryUpdateServiceException, SQLException
{
List> result = null;
- if (hasPermission(user, CageUITemplateCreatorPermission.class) || hasPermission(user, CageUIRoomCreatorPermission.class))
+ if (hasPermission(user, InsertPermission.class))
{
result = super._insertRowsUsingDIB(user, container, rows, getDataIteratorContext(errors, InsertOption.INSERT, configParameters), extraScriptContext);
}
@@ -98,7 +100,7 @@ public List> updateRows(User user, Container container, List
throws InvalidKeyException, BatchValidationException, QueryUpdateServiceException, SQLException
{
List> result = null;
- if (hasPermission(user, CageUILayoutEditorAccessPermission.class))
+ if (hasPermission(user, UpdatePermission.class))
{
result = super.updateRows(user, container, rows, oldKeys, errors, configParameters, extraScriptContext);
}
@@ -110,7 +112,7 @@ public List> updateRows(User user, Container container, List
public List> deleteRows(User user, Container container, List> keys, @Nullable Map configParameters, @Nullable Map extraScriptContext)
throws SQLException, BatchValidationException, QueryUpdateServiceException, InvalidKeyException
{
- if (hasPermission(user, CageUITemplateCreatorPermission.class))
+ if (hasPermission(user, DeletePermission.class))
{
return super.deleteRows(user, container, keys, configParameters, extraScriptContext);
}
diff --git a/CageUI/src/org/labkey/cageui/query/RackTypesTable.java b/CageUI/src/org/labkey/cageui/query/RackTypesTable.java
index 0a7a6323d..d043c11aa 100644
--- a/CageUI/src/org/labkey/cageui/query/RackTypesTable.java
+++ b/CageUI/src/org/labkey/cageui/query/RackTypesTable.java
@@ -36,6 +36,10 @@
import org.labkey.api.security.permissions.InsertPermission;
import org.labkey.api.security.permissions.Permission;
import org.labkey.api.security.permissions.UpdatePermission;
+import org.labkey.cageui.security.permissions.CageUIAnimalEditorPermission;
+import org.labkey.cageui.security.permissions.CageUILayoutEditorAccessPermission;
+import org.labkey.cageui.security.permissions.CageUIModificationEditorPermission;
+import org.labkey.cageui.security.permissions.CageUIRoomCreatorPermission;
import org.labkey.cageui.security.permissions.CageUITemplateCreatorPermission;
import java.sql.SQLException;
@@ -68,10 +72,9 @@ public boolean hasPermission(@NotNull UserPrincipal user, @NotNull Class> insertRows(User user, Container container, List> rows, BatchValidationException errors, @Nullable Map configParameters, @Nullable Map extraScriptContext) throws DuplicateKeyException, QueryUpdateServiceException, SQLException
{
List> result = null;
- if (hasPermission(user, CageUITemplateCreatorPermission.class))
+ if (hasPermission(user, InsertPermission.class))
{
result = super._insertRowsUsingDIB(user, container, rows, getDataIteratorContext(errors, InsertOption.INSERT, configParameters), extraScriptContext);
}
@@ -95,7 +98,7 @@ public List> updateRows(User user, Container container, List
throws InvalidKeyException, BatchValidationException, QueryUpdateServiceException, SQLException
{
List> result = null;
- if (hasPermission(user, CageUITemplateCreatorPermission.class))
+ if (hasPermission(user, UpdatePermission.class))
{
result = super.updateRows(user, container, rows, oldKeys, errors, configParameters, extraScriptContext);
}
@@ -107,7 +110,7 @@ public List> updateRows(User user, Container container, List
public List> deleteRows(User user, Container container, List> keys, @Nullable Map configParameters, @Nullable Map extraScriptContext)
throws SQLException, BatchValidationException, QueryUpdateServiceException, InvalidKeyException
{
- if (hasPermission(user, CageUITemplateCreatorPermission.class))
+ if (hasPermission(user, DeletePermission.class))
{
return super.deleteRows(user, container, keys, configParameters, extraScriptContext);
}
diff --git a/CageUI/src/org/labkey/cageui/query/RacksTable.java b/CageUI/src/org/labkey/cageui/query/RacksTable.java
index 0ded25056..47b5aa951 100644
--- a/CageUI/src/org/labkey/cageui/query/RacksTable.java
+++ b/CageUI/src/org/labkey/cageui/query/RacksTable.java
@@ -36,6 +36,9 @@
import org.labkey.api.security.permissions.InsertPermission;
import org.labkey.api.security.permissions.Permission;
import org.labkey.api.security.permissions.UpdatePermission;
+import org.labkey.cageui.security.permissions.CageUIAnimalEditorPermission;
+import org.labkey.cageui.security.permissions.CageUILayoutEditorAccessPermission;
+import org.labkey.cageui.security.permissions.CageUIModificationEditorPermission;
import org.labkey.cageui.security.permissions.CageUITemplateCreatorPermission;
import java.sql.SQLException;
@@ -68,10 +71,11 @@ public boolean hasPermission(@NotNull UserPrincipal user, @NotNull Class> insertRows(User user, Container container, List