Skip to content

Bug fix for creating new racks on top of previous real racks #1001

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
LeviCameron1 wants to merge 1 commit into
base: release26.3-SNAPSHOT
Choose a base branch
from
+75 −61
Open

Bug fix for creating new racks on top of previous real racks #1001

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
136 changes: 75 additions & 61 deletions CageUI/src/client/context/LayoutEditorContextManager.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1017,7 +1017,9 @@ export const LayoutEditorContextProvider: FC<LayoutContextProps> = ({children, p
};

const changeRack = async (newType: RackChangeOption): Promise<string | null> => {
let {value: rackChangeValue, label: rackLabel} = newType;
const { value: rackChangeValue } = newType;
const originalSelectedCage = selectedObj as Cage;
const selectedCagePositionId = originalSelectedCage.positionId;

let prevCages: CageData[] = [];
if (!rackChangeValue.isNew) {
Expand All @@ -1029,72 +1031,84 @@ export const LayoutEditorContextProvider: FC<LayoutContextProps> = ({children, p
]
};
const cageDataRes = await labkeyActionSelectWithPromise(cagesInRackConfig);
prevCages = cageDataRes.rows.map(r => ({
...r,
positionId: r.positionid,
objectId: r.objectid,
}));
if(cageDataRes.rowCount !== 0){
prevCages = cageDataRes.rows.map(r => ({
...r,
positionId: r.positionid,
objectId: r.objectid,
}));
}
}

setLocalRoom(prevRoom => {
const {
rackGroup,
rack,
cage
} = findCageInGroup((selectedObj as Cage).svgId as CageSvgId, prevRoom.rackGroups);
const roomToUpdate: Room = {
...prevRoom,
rackGroups: prevRoom.rackGroups.map(group =>
group.groupId === rackGroup.groupId
? {
...group,
racks: group.racks.map((r) => r.objectId === rack.objectId ? {
...r,
itemId: rackChangeValue.rackId,
objectId: rackChangeValue.rackObjectId,
svgId: `rack_${rackChangeValue.rackObjectId}`,
isNew: rackChangeValue.isNew,
type: {
...r.type,
rowid: rackChangeValue.rackType.rowid,
displayName: rackChangeValue.rackType.displayName,
type: rackChangeValue.rackType.type,
isDefault: rackChangeValue.rackType.isDefault
},
cages: prevCages.length > 0 ? r.cages.map((c) => {
const prevCage = prevCages.find(pc => pc.positionId === c.positionId);
const key = roomItemToString(rackChangeValue.rackType.type);
const newSvgId = `cageSVG_${prevCage.objectId}`;
setUnitLocs((prevState) => ({
...prevState,
[key]: prevState[key].map((loc) => {
if (loc.cageId === c.svgId) {
return {
...loc,
cageId: newSvgId
};
}
return loc;
})
}));
return {
...c,
objectId: prevCage.objectId,
svgId: newSvgId,
positionId: prevCage.positionId,
};
}) : r.cages
} as Rack : r)
}
: group
)
};
setReloadRoom(roomToUpdate);
return roomToUpdate;
const { rackGroup, rack } = findCageInGroup(originalSelectedCage.svgId, localRoom.rackGroups);
const newUnitLocs = { ...unitLocs };
let newSelectedCage: Cage | undefined;

const updatedCages = rack.cages.map(c => {
const key = roomItemToString(rackChangeValue.rackType.type);
let newCageData: { objectId: string, svgId: CageSvgId };

if (rackChangeValue.isNew) {
const newObjId = generateUUID();
newCageData = { objectId: newObjId, svgId: `cageSVG_${newObjId}` as CageSvgId };
} else {
const prevCage = prevCages.find(pc => pc.positionId === c.positionId);
newCageData = { objectId: prevCage.objectId, svgId: `cageSVG_${prevCage.objectId}` as CageSvgId };
}

const locIndex = newUnitLocs[key]?.findIndex(loc => loc.cageId === c.svgId);
if (locIndex > -1) {
newUnitLocs[key][locIndex] = { ...newUnitLocs[key][locIndex], cageId: newCageData.svgId };
}

const newCage: Cage = { ...c, ...newCageData };
if (c.positionId === selectedCagePositionId) {
newSelectedCage = newCage;
}
return newCage;
});

const roomToUpdate: Room = {
...localRoom,
rackGroups: localRoom.rackGroups.map(group =>
group.groupId === rackGroup.groupId
? {
...group,
racks: group.racks.map(r =>
r.objectId === rack.objectId
? {
...r,
itemId: rackChangeValue.rackId,
objectId: rackChangeValue.rackObjectId,
svgId: `rack_${rackChangeValue.rackObjectId}`,
isNew: rackChangeValue.isNew,
type: {
...r.type,
rowid: rackChangeValue.rackType.rowid,
displayName: rackChangeValue.rackType.displayName,
type: rackChangeValue.rackType.type,
isDefault: rackChangeValue.rackType.isDefault,
},
cages: updatedCages,
}
: r
),
}
: group
),
};

setUnitLocs(newUnitLocs);
setLocalRoom(roomToUpdate);
if (newSelectedCage) {
setSelectedObj(newSelectedCage);
}
setReloadRoom(roomToUpdate);

return `rack_${rackChangeValue.rackObjectId}`;
};


const changeCageNum = (numBefore: number, numAfter: number) => {
const selectedCage = (selectedObj as Cage);

Expand Down