diff --git a/client/e2eTests/protoFleet/helpers/buildingsTestSetup.ts b/client/e2eTests/protoFleet/helpers/buildingsTestSetup.ts
index a3d6619fb1..549a9345b8 100644
--- a/client/e2eTests/protoFleet/helpers/buildingsTestSetup.ts
+++ b/client/e2eTests/protoFleet/helpers/buildingsTestSetup.ts
@@ -144,13 +144,13 @@ export async function createRackWithAssignedMiners(
await racksPage.enableCustomRackLayout();
await racksPage.inputColumns(RACK_COLUMNS);
await racksPage.inputRows(RACK_ROWS);
- await racksPage.clickContinueFromRackSettings();
+ await racksPage.clickCreateRackFromSettings();
const selectedMinerIps = (await addSelectableMinersToSlots(racksPage, 2, [1, 2])).map((miner) => miner.ipAddress);
test.expect(selectedMinerIps).toHaveLength(2);
- await racksPage.clickSaveRack();
- await racksPage.validateRackToast(rackLabel);
+ await racksPage.clickSaveMinerPositions();
+ await racksPage.validateMinerPositionsToast(rackLabel);
await racksPage.clickViewList();
await racksPage.waitForRackListToLoad({ allowEmpty: false });
diff --git a/client/e2eTests/protoFleet/helpers/racksHelpers.ts b/client/e2eTests/protoFleet/helpers/racksHelpers.ts
index d3ca1e293d..2e3b8b4e53 100644
--- a/client/e2eTests/protoFleet/helpers/racksHelpers.ts
+++ b/client/e2eTests/protoFleet/helpers/racksHelpers.ts
@@ -23,7 +23,7 @@ export async function addSelectableMinersToSlots(
const selectableMinerIndexes = await racksPage.getSelectableMinerIndexes(minerCount);
const selectedMiners = await racksPage.getMinersFromSelector(selectableMinerIndexes);
await racksPage.selectMinersInSelectorByIndex(selectableMinerIndexes);
- await racksPage.clickContinueInMinerSelector();
+ await racksPage.clickSaveInMinerSelector();
for (let i = 0; i < selectedMiners.length; i++) {
await racksPage.selectRackMiner(selectedMiners[i].ipAddress);
@@ -48,7 +48,7 @@ export async function addSelectableRigMinersToSlots(
const selectableMinerIndexes = await racksPage.getSelectableMinerIndexes(minerCount);
const selectedMiners = await racksPage.getMinersFromSelector(selectableMinerIndexes);
await racksPage.selectMinersInSelectorByIndex(selectableMinerIndexes);
- await racksPage.clickContinueInMinerSelector();
+ await racksPage.clickSaveInMinerSelector();
for (let i = 0; i < selectedMiners.length; i++) {
await racksPage.selectRackMiner(selectedMiners[i].ipAddress);
diff --git a/client/e2eTests/protoFleet/helpers/rbacTestSetup.ts b/client/e2eTests/protoFleet/helpers/rbacTestSetup.ts
index 17c27ac5c8..141769ca3b 100644
--- a/client/e2eTests/protoFleet/helpers/rbacTestSetup.ts
+++ b/client/e2eTests/protoFleet/helpers/rbacTestSetup.ts
@@ -287,9 +287,9 @@ export async function createRack(racksPage: RacksPage, rackLabel: string) {
await racksPage.enableCustomRackLayout();
await racksPage.inputColumns(2);
await racksPage.inputRows(2);
- await racksPage.clickContinueFromRackSettings();
- await racksPage.clickSaveRack();
+ await racksPage.clickCreateRackFromSettings();
await racksPage.validateRackToast(rackLabel);
+ await racksPage.clickDismissManageRack();
await racksPage.clickViewList();
await racksPage.waitForRackListToLoad({ allowEmpty: false });
await racksPage.validateRackRow(rackLabel, RBAC_RACK_ZONE, 0);
diff --git a/client/e2eTests/protoFleet/pages/racks.ts b/client/e2eTests/protoFleet/pages/racks.ts
index 9659b0e417..353d0dabb7 100644
--- a/client/e2eTests/protoFleet/pages/racks.ts
+++ b/client/e2eTests/protoFleet/pages/racks.ts
@@ -59,8 +59,15 @@ export class RacksPage extends BasePage {
.trim();
}
- async clickContinueFromRackSettings() {
- await this.clickIn("Continue", "modal");
+ // The Rack settings CTA creates the rack, so a new rack reads "Create rack"
+ // and lands on the manage-rack modal with the rack already persisted.
+ async clickCreateRackFromSettings() {
+ await this.clickIn("Create rack", "modal");
+ }
+
+ // Reopened on an existing rack, the same CTA updates the rack's own fields.
+ async clickSaveRackSettings() {
+ await this.clickIn("Save", "modal");
}
async validateRackSettingsFieldError(
@@ -176,8 +183,9 @@ export class RacksPage extends BasePage {
await this.modalMinerList.selectRowByCellText("ipAddress", ipAddress);
}
- async clickContinueInMinerSelector() {
- await this.clickIn("Continue", "modal");
+ // The miner picker commits the rack's membership itself, hence "Save".
+ async clickSaveInMinerSelector() {
+ await this.clickIn("Save", "modal");
}
async validateMinerSelectorOverflowError(selectedCount: number, maxSlots: number) {
@@ -303,10 +311,20 @@ export class RacksPage extends BasePage {
await this.page.getByRole("button", { name: "Clear", exact: true }).click();
}
- async clickSaveRack() {
+ // The manage-rack modal's Save persists slot placement only, and is disabled
+ // until a miner's slot actually changes.
+ async clickSaveMinerPositions() {
await this.clickButton("Save");
}
+ async clickDismissManageRack() {
+ await this.page.getByRole("button", { name: "Close dialog", exact: true }).click();
+ }
+
+ async validateSaveMinerPositionsDisabled() {
+ await expect(this.page.getByRole("button", { name: "Save", exact: true })).toBeDisabled();
+ }
+
async clickViewMiners() {
const directButton = this.page.getByTestId("rack-page-view-miners");
if (await directButton.isVisible().catch(() => false)) {
@@ -331,15 +349,21 @@ export class RacksPage extends BasePage {
await this.validateTitleInModal("Rack settings");
}
- async changeOrderIndexAndContinue(orderIndexLabel: string) {
+ // Reached through Edit Rack Settings, so the rack already exists and the CTA
+ // persists the change straight away.
+ async changeOrderIndexAndSaveSettings(orderIndexLabel: string) {
await this.selectOption("order-index-select", orderIndexLabel);
- await this.clickContinueFromRackSettings();
+ await this.clickSaveRackSettings();
}
- async validateRackToast(label: string, action: "created" | "updated" = "created") {
+ async validateRackToast(label: string, action: "created" | "saved" = "created") {
await this.validateTextInToast(`Rack "${label}" ${action}`);
}
+ async validateMinerPositionsToast(label: string) {
+ await this.validateTextInToast(`Miner positions saved for "${label}"`);
+ }
+
async validateRackCardVisible(label: string, zone: string) {
await expect(this.getRackCard(label, zone)).toBeVisible();
}
diff --git a/client/e2eTests/protoFleet/spec/racksCreation.spec.ts b/client/e2eTests/protoFleet/spec/racksCreation.spec.ts
index d3cdde405d..0aefc0d975 100644
--- a/client/e2eTests/protoFleet/spec/racksCreation.spec.ts
+++ b/client/e2eTests/protoFleet/spec/racksCreation.spec.ts
@@ -31,7 +31,7 @@ test.describe("Racks - creation", () => {
await racksPage.inputRows(RACK_ROWS);
orderIndexValue = await racksPage.getOrderIndexValue();
- await racksPage.clickContinueFromRackSettings();
+ await racksPage.clickCreateRackFromSettings();
});
await test.step("Validate empty rack assignment state", async () => {
@@ -46,7 +46,7 @@ test.describe("Racks - creation", () => {
selectedMiners = await racksPage.getMinersFromSelector([0, 1]);
test.expect(selectedMiners).toHaveLength(2);
await racksPage.selectMinersInSelectorByIndex([0, 1]);
- await racksPage.clickContinueInMinerSelector();
+ await racksPage.clickSaveInMinerSelector();
});
await test.step("Assign miners by name and validate positions", async () => {
@@ -55,8 +55,8 @@ test.describe("Racks - creation", () => {
});
await test.step("Save rack and validate rack grid card", async () => {
- await racksPage.clickSaveRack();
- await racksPage.validateRackToast(rackLabel);
+ await racksPage.clickSaveMinerPositions();
+ await racksPage.validateMinerPositionsToast(rackLabel);
await racksPage.clickViewGrid();
await racksPage.validateRackCardVisible(rackLabel, AUTOMATION_ZONE);
await racksPage.validateRackCardGrid(rackLabel, AUTOMATION_ZONE, RACK_COLUMNS, RACK_ROWS);
@@ -79,7 +79,7 @@ test.describe("Racks - creation", () => {
await racksPage.enableCustomRackLayout();
await racksPage.inputColumns(RACK_COLUMNS);
await racksPage.inputRows(RACK_ROWS);
- await racksPage.clickContinueFromRackSettings();
+ await racksPage.clickCreateRackFromSettings();
});
await test.step("Add four miners", async () => {
@@ -89,7 +89,7 @@ test.describe("Racks - creation", () => {
selectedMiners = await racksPage.getMinersFromSelector([0, 1, 2, 3]);
test.expect(selectedMiners).toHaveLength(4);
await racksPage.selectMinersInSelectorByIndex([0, 1, 2, 3]);
- await racksPage.clickContinueInMinerSelector();
+ await racksPage.clickSaveInMinerSelector();
});
await test.step("Assign miners manually in DOM order and validate default numbering", async () => {
@@ -103,7 +103,8 @@ test.describe("Racks - creation", () => {
for (const scenario of ORDER_INDEX_SCENARIOS.slice(1)) {
await test.step(`Change order index to ${scenario.label}`, async () => {
await racksPage.clickEditRackSettings();
- await racksPage.changeOrderIndexAndContinue(scenario.label);
+ await racksPage.changeOrderIndexAndSaveSettings(scenario.label);
+ await racksPage.validateRackToast(RACK_LABEL, "saved");
await racksPage.validateRackConfiguration(RACK_COLUMNS, RACK_ROWS, scenario.label);
await racksPage.validateRackSlotNumbersInDomOrder(scenario.expectedNumbers);
await racksPage.validateMinerPositions(selectedMiners, scenario.expectedNumbers);
@@ -121,7 +122,7 @@ test.describe("Racks - creation", () => {
await racksPage.enableCustomRackLayout();
await racksPage.inputColumns(NETWORK_RACK_COLUMNS);
await racksPage.inputRows(NETWORK_RACK_ROWS);
- await racksPage.clickContinueFromRackSettings();
+ await racksPage.clickCreateRackFromSettings();
await racksPage.clickAddMiners();
await racksPage.waitForMinerSelectorListToLoad();
@@ -129,7 +130,7 @@ test.describe("Racks - creation", () => {
test.expect(allVisibleMiners.length).toBeGreaterThan(0);
test.expect(allVisibleMiners.length).toBeLessThanOrEqual(NETWORK_RACK_COLUMNS * NETWORK_RACK_ROWS);
await racksPage.clickSelectAllMinersInSelector();
- await racksPage.clickContinueInMinerSelector();
+ await racksPage.clickSaveInMinerSelector();
});
await test.step("Assign all miners by network and validate positions by IP and name", async () => {
diff --git a/client/e2eTests/protoFleet/spec/racksManagement.spec.ts b/client/e2eTests/protoFleet/spec/racksManagement.spec.ts
index 522fad8050..929ad14f21 100644
--- a/client/e2eTests/protoFleet/spec/racksManagement.spec.ts
+++ b/client/e2eTests/protoFleet/spec/racksManagement.spec.ts
@@ -29,10 +29,11 @@ test.describe("Racks - management", () => {
await racksPage.enableCustomRackLayout();
await racksPage.inputColumns(RACK_COLUMNS);
await racksPage.inputRows(RACK_ROWS);
- await racksPage.clickContinueFromRackSettings();
- await addSelectableMinersToSlots(racksPage, 3, [1, 2, 3]);
- await racksPage.clickSaveRack();
+ await racksPage.clickCreateRackFromSettings();
await racksPage.validateRackToast("A-01");
+ await addSelectableMinersToSlots(racksPage, 3, [1, 2, 3]);
+ await racksPage.clickSaveMinerPositions();
+ await racksPage.validateMinerPositionsToast("A-01");
await racksPage.clickViewGrid();
await racksPage.validateRackCardVisible("A-01", zoneA);
createdRackLabels.push("A-01");
@@ -42,10 +43,11 @@ test.describe("Racks - management", () => {
await racksPage.clickAddRackButton();
await racksPage.inputZone(zoneA);
await racksPage.inputRackLabel("A-02");
- await racksPage.clickContinueFromRackSettings();
- await addSelectableMinersToSlots(racksPage, 2, [1, 2]);
- await racksPage.clickSaveRack();
+ await racksPage.clickCreateRackFromSettings();
await racksPage.validateRackToast("A-02");
+ await addSelectableMinersToSlots(racksPage, 2, [1, 2]);
+ await racksPage.clickSaveMinerPositions();
+ await racksPage.validateMinerPositionsToast("A-02");
await racksPage.clickViewGrid();
await racksPage.validateRackCardVisible("A-02", zoneA);
createdRackLabels.push("A-02");
@@ -55,10 +57,11 @@ test.describe("Racks - management", () => {
await racksPage.clickAddRackButton();
await racksPage.inputZone(zoneB);
await racksPage.inputRackLabel("B-01");
- await racksPage.clickContinueFromRackSettings();
- await addSelectableMinersToSlots(racksPage, 1, [1]);
- await racksPage.clickSaveRack();
+ await racksPage.clickCreateRackFromSettings();
await racksPage.validateRackToast("B-01");
+ await addSelectableMinersToSlots(racksPage, 1, [1]);
+ await racksPage.clickSaveMinerPositions();
+ await racksPage.validateMinerPositionsToast("B-01");
await racksPage.clickViewGrid();
await racksPage.validateRackCardVisible("B-01", zoneB);
createdRackLabels.push("B-01");
@@ -107,7 +110,8 @@ test.describe("Racks - management", () => {
await test.step("Validate required label and invalid dimensions", async () => {
// Zone is optional now; the label is required and empty by default, so
- // continuing without typing one surfaces the label error.
+ // submitting without typing one surfaces the label error instead of
+ // creating the rack.
await racksPage.clickAddRackButton();
await racksPage.inputZone(validationZone);
generatedRackLabel = "A-01";
@@ -115,7 +119,7 @@ test.describe("Racks - management", () => {
await racksPage.enableCustomRackLayout();
await racksPage.inputColumns(0);
await racksPage.inputRows(13);
- await racksPage.clickContinueFromRackSettings();
+ await racksPage.clickCreateRackFromSettings();
await racksPage.validateRackSettingsFieldError("rack-label", "A label is required");
await racksPage.validateRackSettingsFieldError("rack-columns", "Columns must be a whole number between 1 and 12");
@@ -123,11 +127,12 @@ test.describe("Racks - management", () => {
await racksPage.validateTitleInModal("Rack settings");
});
- await test.step("Correct rack settings and continue", async () => {
+ await test.step("Correct rack settings and create the rack", async () => {
await racksPage.inputRackLabel(generatedRackLabel);
await racksPage.inputColumns(VALIDATION_RACK_COLUMNS);
await racksPage.inputRows(VALIDATION_RACK_ROWS);
- await racksPage.clickContinueFromRackSettings();
+ await racksPage.clickCreateRackFromSettings();
+ await racksPage.validateRackToast(generatedRackLabel);
await racksPage.validateRackConfiguration(VALIDATION_RACK_COLUMNS, VALIDATION_RACK_ROWS, "Bottom left");
await racksPage.validateAssignedMinersCount(0, 1);
@@ -140,18 +145,18 @@ test.describe("Racks - management", () => {
const selectableMinerIndexes = await racksPage.getSelectableMinerIndexes(2);
selectedMiners = await racksPage.getMinersFromSelector(selectableMinerIndexes);
await racksPage.selectMinersInSelectorByIndex(selectableMinerIndexes);
- await racksPage.clickContinueInMinerSelector();
+ await racksPage.clickSaveInMinerSelector();
await racksPage.validateMinerSelectorOverflowError(2, 1);
await racksPage.toggleMinerInSelectorByIpAddress(selectedMiners[1].ipAddress);
- await racksPage.clickContinueInMinerSelector();
+ await racksPage.clickSaveInMinerSelector();
});
await test.step("Assign remaining miner and save the rack", async () => {
await racksPage.clickAssignByNetwork();
await racksPage.validateMinersAssignedByNetwork([selectedMiners[0]]);
- await racksPage.clickSaveRack();
- await racksPage.validateRackToast(generatedRackLabel);
+ await racksPage.clickSaveMinerPositions();
+ await racksPage.validateMinerPositionsToast(generatedRackLabel);
await racksPage.validateRackCardVisible(generatedRackLabel, validationZone);
await racksPage.validateRackCardGrid(
generatedRackLabel,
diff --git a/client/e2eTests/protoFleet/spec/racksManualAssignment.spec.ts b/client/e2eTests/protoFleet/spec/racksManualAssignment.spec.ts
index 3b0578ef6a..0ba7db0554 100644
--- a/client/e2eTests/protoFleet/spec/racksManualAssignment.spec.ts
+++ b/client/e2eTests/protoFleet/spec/racksManualAssignment.spec.ts
@@ -28,7 +28,7 @@ test.describe("Racks - manual assignment", () => {
await racksPage.enableCustomRackLayout();
await racksPage.inputColumns(LARGE_RACK_COLUMNS);
await racksPage.inputRows(LARGE_RACK_ROWS);
- await racksPage.clickContinueFromRackSettings();
+ await racksPage.clickCreateRackFromSettings();
});
await test.step("Manage miners and add the first miner to the rack list", async () => {
@@ -39,7 +39,7 @@ test.describe("Racks - manual assignment", () => {
selectedMiners = await racksPage.getMinersFromSelector(selectableMinerIndexes);
test.expect(selectedMiners).toHaveLength(2);
await racksPage.selectMinersInSelectorByIndex([selectableMinerIndexes[0]]);
- await racksPage.clickContinueInMinerSelector();
+ await racksPage.clickSaveInMinerSelector();
});
await test.step("Search and assign the second miner to slot 04", async () => {
@@ -102,8 +102,8 @@ test.describe("Racks - manual assignment", () => {
await racksPage.validateMinerRowPosition(selectedMiners[1].ipAddress, 9);
await racksPage.validateRackSlotsHighlighted([1, 9]);
- await racksPage.clickSaveRack();
- await racksPage.validateRackToast(rackLabel);
+ await racksPage.clickSaveMinerPositions();
+ await racksPage.validateMinerPositionsToast(rackLabel);
});
await test.step("Open the created rack and validate saved slots", async () => {
@@ -130,9 +130,10 @@ test.describe("Racks - manual assignment", () => {
await racksPage.enableCustomRackLayout();
await racksPage.inputColumns(OVERVIEW_RACK_COLUMNS);
await racksPage.inputRows(OVERVIEW_RACK_ROWS);
- await racksPage.clickContinueFromRackSettings();
- await racksPage.clickSaveRack();
+ await racksPage.clickCreateRackFromSettings();
await racksPage.validateRackToast(rackLabel);
+ // No miner has a slot yet, so there is no placement to save.
+ await racksPage.validateSaveMinerPositionsDisabled();
});
await test.step("Open the created rack and assign the first miner to slot 02", async () => {
@@ -182,10 +183,10 @@ test.describe("Racks - manual assignment", () => {
await racksPage.waitForMinerSelectorListToLoad();
await racksPage.toggleMinerInSelectorByIpAddress(selectedMiners[0].ipAddress);
await racksPage.toggleMinerInSelectorByIpAddress(selectedMiners[1].ipAddress);
- await racksPage.clickContinueInMinerSelector();
+ await racksPage.clickSaveInMinerSelector();
await racksPage.validateTextIsVisible("No miners added to this rack yet.");
- await racksPage.clickSaveRack();
- await racksPage.validateRackToast(rackLabel, "updated");
+ await racksPage.clickSaveMinerPositions();
+ await racksPage.validateMinerPositionsToast(rackLabel);
});
await test.step("Validate rack overview is empty after saving", async () => {
diff --git a/client/e2eTests/protoFleet/spec/racksOverviewActions.spec.ts b/client/e2eTests/protoFleet/spec/racksOverviewActions.spec.ts
index bd0df1f3af..bcc91a5147 100644
--- a/client/e2eTests/protoFleet/spec/racksOverviewActions.spec.ts
+++ b/client/e2eTests/protoFleet/spec/racksOverviewActions.spec.ts
@@ -25,7 +25,9 @@ test.describe("Racks - overview actions", () => {
let rackDeviceIdentifiers: string[] = [];
await test.step("Create and save a new rack with two rig miners", async () => {
- const saveRackRequestPromise = page.waitForRequest(/SaveRack/);
+ // The miner picker commits membership itself, so the rack's members
+ // arrive on the first AssignDevicesToRack call, not on a SaveRack.
+ const assignRequestPromise = page.waitForRequest(/AssignDevicesToRack/);
await racksPage.clickAddRackButton();
await racksPage.inputZone(AUTOMATION_ZONE);
@@ -36,19 +38,18 @@ test.describe("Racks - overview actions", () => {
await racksPage.enableCustomRackLayout();
await racksPage.inputColumns(RACK_COLUMNS);
await racksPage.inputRows(RACK_ROWS);
- await racksPage.clickContinueFromRackSettings();
+ await racksPage.clickCreateRackFromSettings();
selectedMiners = await addSelectableRigMinersToSlots(racksPage, 2, [1, 2]);
test.expect(selectedMiners).toHaveLength(2);
test.expect(selectedMiners.every((miner) => miner.model === PROTO_RIG_MODEL)).toBe(true);
- await racksPage.clickSaveRack();
+ await racksPage.clickSaveMinerPositions();
- const saveRackRequest = await saveRackRequestPromise;
- const saveRackRequestBody = saveRackRequest.postDataJSON();
- rackDeviceIdentifiers = saveRackRequestBody.deviceSelector.deviceList.deviceIdentifiers;
+ const assignRequest = await assignRequestPromise;
+ rackDeviceIdentifiers = assignRequest.postDataJSON().deviceIdentifiers;
- await racksPage.validateRackToast(rackLabel);
+ await racksPage.validateMinerPositionsToast(rackLabel);
test.expect(rackDeviceIdentifiers).toHaveLength(2);
});
@@ -109,7 +110,9 @@ test.describe("Racks - overview actions", () => {
try {
await test.step("Create a rack with two assigned Proto rigs", async () => {
- const saveRackRequestPromise = page.waitForRequest(/SaveRack/);
+ // The miner picker commits membership itself, so the rack's members
+ // arrive on the first AssignDevicesToRack call, not on a SaveRack.
+ const assignRequestPromise = page.waitForRequest(/AssignDevicesToRack/);
await racksPage.clickAddRackButton();
await racksPage.inputZone(AUTOMATION_ZONE);
@@ -118,15 +121,14 @@ test.describe("Racks - overview actions", () => {
await racksPage.enableCustomRackLayout();
await racksPage.inputColumns(OVERVIEW_RACK_COLUMNS);
await racksPage.inputRows(OVERVIEW_RACK_ROWS);
- await racksPage.clickContinueFromRackSettings();
+ await racksPage.clickCreateRackFromSettings();
await addSelectableRigMinersToSlots(racksPage, 2, [1, 2]);
- await racksPage.clickSaveRack();
+ await racksPage.clickSaveMinerPositions();
- const saveRackRequest = await saveRackRequestPromise;
- const saveRackRequestBody = saveRackRequest.postDataJSON();
- rackDeviceIdentifiers = saveRackRequestBody.deviceSelector.deviceList.deviceIdentifiers;
+ const assignRequest = await assignRequestPromise;
+ rackDeviceIdentifiers = assignRequest.postDataJSON().deviceIdentifiers;
- await racksPage.validateRackToast(rackLabel);
+ await racksPage.validateMinerPositionsToast(rackLabel);
test.expect(rackDeviceIdentifiers).toHaveLength(2);
});
@@ -191,11 +193,11 @@ test.describe("Racks - overview actions", () => {
await racksPage.enableCustomRackLayout();
await racksPage.inputColumns(OVERVIEW_RACK_COLUMNS);
await racksPage.inputRows(OVERVIEW_RACK_ROWS);
- await racksPage.clickContinueFromRackSettings();
+ await racksPage.clickCreateRackFromSettings();
await addSelectableRigMinersToSlots(racksPage, 2, [1, 2]);
- await racksPage.clickSaveRack();
+ await racksPage.clickSaveMinerPositions();
- await racksPage.validateRackToast(rackLabel);
+ await racksPage.validateMinerPositionsToast(rackLabel);
await racksPage.clickViewGrid();
await racksPage.openRackCard(rackLabel, AUTOMATION_ZONE);
await racksPage.openRackOverviewActionsMenu();
diff --git a/client/src/protoFleet/api/generated/device_set/v1/device_set_pb.ts b/client/src/protoFleet/api/generated/device_set/v1/device_set_pb.ts
index 77b4c66727..70a7cdf97a 100644
--- a/client/src/protoFleet/api/generated/device_set/v1/device_set_pb.ts
+++ b/client/src/protoFleet/api/generated/device_set/v1/device_set_pb.ts
@@ -27,7 +27,7 @@ import type { Message } from "@bufbuild/protobuf";
export const file_device_set_v1_device_set: GenFile =
/*@__PURE__*/
fileDesc(
- "Ch5kZXZpY2Vfc2V0L3YxL2RldmljZV9zZXQucHJvdG8SDWRldmljZV9zZXQudjEi+AIKCURldmljZVNldBIKCgJpZBgBIAEoAxIqCgR0eXBlGAIgASgOMhwuZGV2aWNlX3NldC52MS5EZXZpY2VTZXRUeXBlEg0KBWxhYmVsGAMgASgJEhMKC2Rlc2NyaXB0aW9uGAQgASgJEhQKDGRldmljZV9jb3VudBgFIAEoBRIuCgpjcmVhdGVkX2F0GAYgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcBIuCgp1cGRhdGVkX2F0GAcgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcBIsCglyYWNrX2luZm8YCCABKAsyFy5kZXZpY2Vfc2V0LnYxLlJhY2tJbmZvSAASLgoKZ3JvdXBfaW5mbxgJIAEoCzIYLmRldmljZV9zZXQudjEuR3JvdXBJbmZvSAASKwoJcGxhY2VtZW50GAogASgLMhguY29tbW9uLnYxLlBsYWNlbWVudFJlZnNCDgoMdHlwZV9kZXRhaWxzIogCCghSYWNrSW5mbxIVCgRyb3dzGAEgASgFQge6SAQaAiAAEhgKB2NvbHVtbnMYAiABKAVCB7pIBBoCIAASFQoEem9uZRgDIAEoCUIHukgEcgIYZBIyCgtvcmRlcl9pbmRleBgEIAEoDjIdLmRldmljZV9zZXQudjEuUmFja09yZGVySW5kZXgSNAoMY29vbGluZ190eXBlGAUgASgOMh4uZGV2aWNlX3NldC52MS5SYWNrQ29vbGluZ1R5cGUSFAoHc2l0ZV9pZBgGIAEoA0gAiAEBEhgKC2J1aWxkaW5nX2lkGAcgASgDSAGIAQFCCgoIX3NpdGVfaWRCDgoMX2J1aWxkaW5nX2lkIgsKCUdyb3VwSW5mbyKeAQoPRGV2aWNlU2V0TWVtYmVyEhkKEWRldmljZV9pZGVudGlmaWVyGAEgASgJEiwKCGFkZGVkX2F0GAIgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcBIwCgRyYWNrGAMgASgLMiAuZGV2aWNlX3NldC52MS5SYWNrTWVtYmVyRGV0YWlsc0gAQhAKDm1lbWJlcl9kZXRhaWxzIksKEVJhY2tNZW1iZXJEZXRhaWxzEjYKDXNsb3RfcG9zaXRpb24YASABKAsyHy5kZXZpY2Vfc2V0LnYxLlJhY2tTbG90UG9zaXRpb24iQQoQUmFja1Nsb3RQb3NpdGlvbhIUCgNyb3cYASABKAVCB7pIBBoCKAASFwoGY29sdW1uGAIgASgFQge6SAQaAigAIscCChZDcmVhdGVEZXZpY2VTZXRSZXF1ZXN0EjYKBHR5cGUYASABKA4yHC5kZXZpY2Vfc2V0LnYxLkRldmljZVNldFR5cGVCCrpIB4IBBBABIAASGwoFbGFiZWwYAiABKAlCDLpICcgBAXIEEAEYZBIdCgtkZXNjcmlwdGlvbhgDIAEoCUIIukgFcgMY9AMSLAoJcmFja19pbmZvGAQgASgLMhcuZGV2aWNlX3NldC52MS5SYWNrSW5mb0gAEi4KCmdyb3VwX2luZm8YBSABKAsyGC5kZXZpY2Vfc2V0LnYxLkdyb3VwSW5mb0gAEjcKD2RldmljZV9zZWxlY3RvchgGIAEoCzIZLmNvbW1vbi52MS5EZXZpY2VTZWxlY3RvckgBiAEBQg4KDHR5cGVfZGV0YWlsc0ISChBfZGV2aWNlX3NlbGVjdG9yIlwKF0NyZWF0ZURldmljZVNldFJlc3BvbnNlEiwKCmRldmljZV9zZXQYASABKAsyGC5kZXZpY2Vfc2V0LnYxLkRldmljZVNldBITCgthZGRlZF9jb3VudBgCIAEoBSI1ChNHZXREZXZpY2VTZXRSZXF1ZXN0Eh4KDWRldmljZV9zZXRfaWQYASABKANCB7pIBCICIAAiRAoUR2V0RGV2aWNlU2V0UmVzcG9uc2USLAoKZGV2aWNlX3NldBgBIAEoCzIYLmRldmljZV9zZXQudjEuRGV2aWNlU2V0IrcCChZVcGRhdGVEZXZpY2VTZXRSZXF1ZXN0Eh4KDWRldmljZV9zZXRfaWQYASABKANCB7pIBCICIAASHQoFbGFiZWwYAiABKAlCCbpIBnIEEAEYZEgBiAEBEiIKC2Rlc2NyaXB0aW9uGAMgASgJQgi6SAVyAxj0A0gCiAEBEiwKCXJhY2tfaW5mbxgEIAEoCzIXLmRldmljZV9zZXQudjEuUmFja0luZm9IABIuCgpncm91cF9pbmZvGAUgASgLMhguZGV2aWNlX3NldC52MS5Hcm91cEluZm9IABIyCg9kZXZpY2Vfc2VsZWN0b3IYBiABKAsyGS5jb21tb24udjEuRGV2aWNlU2VsZWN0b3JCDgoMdHlwZV9kZXRhaWxzQggKBl9sYWJlbEIOCgxfZGVzY3JpcHRpb24iRwoXVXBkYXRlRGV2aWNlU2V0UmVzcG9uc2USLAoKZGV2aWNlX3NldBgBIAEoCzIYLmRldmljZV9zZXQudjEuRGV2aWNlU2V0IjgKFkRlbGV0ZURldmljZVNldFJlcXVlc3QSHgoNZGV2aWNlX3NldF9pZBgBIAEoA0IHukgEIgIgACIZChdEZWxldGVEZXZpY2VTZXRSZXNwb25zZSLLAwoVTGlzdERldmljZVNldHNSZXF1ZXN0EjQKBHR5cGUYASABKA4yHC5kZXZpY2Vfc2V0LnYxLkRldmljZVNldFR5cGVCCLpIBYIBAhABEhoKCXBhZ2Vfc2l6ZRgCIAEoBUIHukgEGgIoABISCgpwYWdlX3Rva2VuGAMgASgJEiMKBHNvcnQYBCABKAsyFS5jb21tb24udjEuU29ydENvbmZpZxI3ChVlcnJvcl9jb21wb25lbnRfdHlwZXMYBSADKA4yGC5lcnJvcnMudjEuQ29tcG9uZW50VHlwZRIRCgV6b25lcxgGIAMoCUICGAESFAoMYnVpbGRpbmdfaWRzGAcgAygDEhsKE2luY2x1ZGVfbm9fYnVpbGRpbmcYCCABKAgSJQoJem9uZV9rZXlzGAkgAygLMhIuY29tbW9uLnYxLlpvbmVLZXkSIQoIc2l0ZV9pZHMYCiADKANCD7pIDJIBCRCACCIEIgIgABIaChJpbmNsdWRlX3VuYXNzaWduZWQYCyABKAgSQgoQdGVsZW1ldHJ5X3JhbmdlcxgMIAMoCzIoLmNvbW1vbi52MS5GbGVldExpc3RUZWxlbWV0cnlSYW5nZUZpbHRlciJ1ChZMaXN0RGV2aWNlU2V0c1Jlc3BvbnNlEi0KC2RldmljZV9zZXRzGAEgAygLMhguZGV2aWNlX3NldC52MS5EZXZpY2VTZXQSFwoPbmV4dF9wYWdlX3Rva2VuGAIgASgJEhMKC3RvdGFsX2NvdW50GAMgASgFIngKGEFkZERldmljZXNUb0dyb3VwUmVxdWVzdBIgCg90YXJnZXRfZ3JvdXBfaWQYASABKANCB7pIBCICIAASOgoPZGV2aWNlX3NlbGVjdG9yGAIgASgLMhkuY29tbW9uLnYxLkRldmljZVNlbGVjdG9yQga6SAPIAQEiMAoZQWRkRGV2aWNlc1RvR3JvdXBSZXNwb25zZRITCgthZGRlZF9jb3VudBgBIAEoAyJ9Ch1SZW1vdmVEZXZpY2VzRnJvbUdyb3VwUmVxdWVzdBIgCg90YXJnZXRfZ3JvdXBfaWQYASABKANCB7pIBCICIAASOgoPZGV2aWNlX3NlbGVjdG9yGAIgASgLMhkuY29tbW9uLnYxLkRldmljZVNlbGVjdG9yQga6SAPIAQEiNwoeUmVtb3ZlRGV2aWNlc0Zyb21Hcm91cFJlc3BvbnNlEhUKDXJlbW92ZWRfY291bnQYASABKAMirAEKG0xpc3REZXZpY2VTZXRNZW1iZXJzUmVxdWVzdBIeCg1kZXZpY2Vfc2V0X2lkGAEgASgDQge6SAQiAiAAEhoKCXBhZ2Vfc2l6ZRgCIAEoBUIHukgEGgIoABISCgpwYWdlX3Rva2VuGAMgASgJEiEKCHNpdGVfaWRzGAQgAygDQg+6SAySAQkQgAgiBCICIAASGgoSaW5jbHVkZV91bmFzc2lnbmVkGAUgASgIImgKHExpc3REZXZpY2VTZXRNZW1iZXJzUmVzcG9uc2USLwoHbWVtYmVycxgBIAMoCzIeLmRldmljZV9zZXQudjEuRGV2aWNlU2V0TWVtYmVyEhcKD25leHRfcGFnZV90b2tlbhgCIAEoCSJsChpHZXREZXZpY2VEZXZpY2VTZXRzUmVxdWVzdBIiChFkZXZpY2VfaWRlbnRpZmllchgBIAEoCUIHukgEcgIQARIqCgR0eXBlGAIgASgOMhwuZGV2aWNlX3NldC52MS5EZXZpY2VTZXRUeXBlIkwKG0dldERldmljZURldmljZVNldHNSZXNwb25zZRItCgtkZXZpY2Vfc2V0cxgBIAMoCzIYLmRldmljZV9zZXQudjEuRGV2aWNlU2V0IpsBChpTZXRSYWNrU2xvdFBvc2l0aW9uUmVxdWVzdBIeCg1kZXZpY2Vfc2V0X2lkGAEgASgDQge6SAQiAiAAEiIKEWRldmljZV9pZGVudGlmaWVyGAIgASgJQge6SARyAhABEjkKCHBvc2l0aW9uGAMgASgLMh8uZGV2aWNlX3NldC52MS5SYWNrU2xvdFBvc2l0aW9uQga6SAPIAQEiWwobU2V0UmFja1Nsb3RQb3NpdGlvblJlc3BvbnNlEhUKDWRldmljZV9zZXRfaWQYASABKAMSJQoEc2xvdBgCIAEoCzIXLmRldmljZV9zZXQudjEuUmFja1Nsb3QiYgocQ2xlYXJSYWNrU2xvdFBvc2l0aW9uUmVxdWVzdBIeCg1kZXZpY2Vfc2V0X2lkGAEgASgDQge6SAQiAiAAEiIKEWRldmljZV9pZGVudGlmaWVyGAIgASgJQge6SARyAhABIh8KHUNsZWFyUmFja1Nsb3RQb3NpdGlvblJlc3BvbnNlIjUKE0dldFJhY2tTbG90c1JlcXVlc3QSHgoNZGV2aWNlX3NldF9pZBgBIAEoA0IHukgEIgIgACJYCghSYWNrU2xvdBIZChFkZXZpY2VfaWRlbnRpZmllchgBIAEoCRIxCghwb3NpdGlvbhgCIAEoCzIfLmRldmljZV9zZXQudjEuUmFja1Nsb3RQb3NpdGlvbiI+ChRHZXRSYWNrU2xvdHNSZXNwb25zZRImCgVzbG90cxgBIAMoCzIXLmRldmljZV9zZXQudjEuUmFja1Nsb3Qi7QQKDkRldmljZVNldFN0YXRzEhUKDWRldmljZV9zZXRfaWQYASABKAMSFAoMZGV2aWNlX2NvdW50GAIgASgFEhcKD3JlcG9ydGluZ19jb3VudBgDIAEoBRIaChJ0b3RhbF9oYXNocmF0ZV90aHMYBCABKAESGgoSYXZnX2VmZmljaWVuY3lfanRoGAUgASgBEhYKDnRvdGFsX3Bvd2VyX2t3GAYgASgBEhkKEW1pbl90ZW1wZXJhdHVyZV9jGAcgASgBEhkKEW1heF90ZW1wZXJhdHVyZV9jGAggASgBEhUKDWhhc2hpbmdfY291bnQYCSABKAUSFAoMYnJva2VuX2NvdW50GAogASgFEhUKDW9mZmxpbmVfY291bnQYCyABKAUSFgoOc2xlZXBpbmdfY291bnQYDCABKAUSIAoYaGFzaHJhdGVfcmVwb3J0aW5nX2NvdW50GA0gASgFEiIKGmVmZmljaWVuY3lfcmVwb3J0aW5nX2NvdW50GA4gASgFEh0KFXBvd2VyX3JlcG9ydGluZ19jb3VudBgPIAEoBRIjCht0ZW1wZXJhdHVyZV9yZXBvcnRpbmdfY291bnQYECABKAUSIQoZY29udHJvbF9ib2FyZF9pc3N1ZV9jb3VudBgRIAEoBRIXCg9mYW5faXNzdWVfY291bnQYEiABKAUSHgoWaGFzaF9ib2FyZF9pc3N1ZV9jb3VudBgTIAEoBRIXCg9wc3VfaXNzdWVfY291bnQYFCABKAUSNAoNc2xvdF9zdGF0dXNlcxgVIAMoCzIdLmRldmljZV9zZXQudjEuUmFja1Nsb3RTdGF0dXMiMgoYR2V0RGV2aWNlU2V0U3RhdHNSZXF1ZXN0EhYKDmRldmljZV9zZXRfaWRzGAEgAygDIkkKGUdldERldmljZVNldFN0YXRzUmVzcG9uc2USLAoFc3RhdHMYASADKAsyHS5kZXZpY2Vfc2V0LnYxLkRldmljZVNldFN0YXRzIl4KDlJhY2tTbG90U3RhdHVzEgsKA3JvdxgBIAEoBRIOCgZjb2x1bW4YAiABKAUSLwoGc3RhdHVzGAMgASgOMh8uZGV2aWNlX3NldC52MS5TbG90RGV2aWNlU3RhdHVzIhYKFExpc3RSYWNrWm9uZXNSZXF1ZXN0IiYKFUxpc3RSYWNrWm9uZXNSZXNwb25zZRINCgV6b25lcxgBIAMoCSIZChdMaXN0UmFja1pvbmVSZWZzUmVxdWVzdCI9ChhMaXN0UmFja1pvbmVSZWZzUmVzcG9uc2USIQoFem9uZXMYASADKAsyEi5jb21tb24udjEuWm9uZVJlZiIWChRMaXN0UmFja1R5cGVzUmVxdWVzdCI9CghSYWNrVHlwZRIMCgRyb3dzGAEgASgFEg8KB2NvbHVtbnMYAiABKAUSEgoKcmFja19jb3VudBgDIAEoBSJEChVMaXN0UmFja1R5cGVzUmVzcG9uc2USKwoKcmFja190eXBlcxgBIAMoCzIXLmRldmljZV9zZXQudjEuUmFja1R5cGUi1AIKD1NhdmVSYWNrUmVxdWVzdBIjCg1kZXZpY2Vfc2V0X2lkGAEgASgDQge6SAQiAiAASACIAQESGwoFbGFiZWwYAiABKAlCDLpICcgBAXIEEAEYZBIyCglyYWNrX2luZm8YAyABKAsyFy5kZXZpY2Vfc2V0LnYxLlJhY2tJbmZvQga6SAPIAQESOgoPZGV2aWNlX3NlbGVjdG9yGAQgASgLMhkuY29tbW9uLnYxLkRldmljZVNlbGVjdG9yQga6SAPIAQESMQoQc2xvdF9hc3NpZ25tZW50cxgFIAMoCzIXLmRldmljZV9zZXQudjEuUmFja1Nsb3QSKQocZm9yY2VfY2xlYXJfY29uZmxpY3Rpbmdfc2l0ZRgGIAEoCEgBiAEBQhAKDl9kZXZpY2Vfc2V0X2lkQh8KHV9mb3JjZV9jbGVhcl9jb25mbGljdGluZ19zaXRlIrABChBTYXZlUmFja1Jlc3BvbnNlEiwKCmRldmljZV9zZXQYASABKAsyGC5kZXZpY2Vfc2V0LnYxLkRldmljZVNldBIWCg5hc3NpZ25lZF9jb3VudBgCIAEoBRIdChVzaXRlX3JlYXNzaWduZWRfY291bnQYAyABKAUSNwoJY29uZmxpY3RzGAQgAygLMiQuZGV2aWNlX3NldC52MS5QZXJEZXZpY2VSYWNrQ29uZmxpY3Qi3QEKGkFzc2lnbkRldmljZXNUb1JhY2tSZXF1ZXN0EiQKDnRhcmdldF9yYWNrX2lkGAEgASgDQge6SAQiAiAASACIAQESOgoPZGV2aWNlX3NlbGVjdG9yGAIgASgLMhkuY29tbW9uLnYxLkRldmljZVNlbGVjdG9yQga6SAPIAQESKQocZm9yY2VfY2xlYXJfY29uZmxpY3Rpbmdfc2l0ZRgDIAEoCEgBiAEBQhEKD190YXJnZXRfcmFja19pZEIfCh1fZm9yY2VfY2xlYXJfY29uZmxpY3Rpbmdfc2l0ZSKkAQobQXNzaWduRGV2aWNlc1RvUmFja1Jlc3BvbnNlEhYKDmFzc2lnbmVkX2NvdW50GAEgASgDEh0KFXNpdGVfcmVhc3NpZ25lZF9jb3VudBgCIAEoAxIVCg1yZW1vdmVkX2NvdW50GAMgASgDEjcKCWNvbmZsaWN0cxgEIAMoCzIkLmRldmljZV9zZXQudjEuUGVyRGV2aWNlUmFja0NvbmZsaWN0Im4KFVBlckRldmljZVJhY2tDb25mbGljdBIZChFkZXZpY2VfaWRlbnRpZmllchgBIAEoCRI6CgZyZWFzb24YAiABKA4yKi5kZXZpY2Vfc2V0LnYxLlBlckRldmljZVJhY2tDb25mbGljdFJlYXNvbiplCg1EZXZpY2VTZXRUeXBlEh8KG0RFVklDRV9TRVRfVFlQRV9VTlNQRUNJRklFRBAAEhkKFURFVklDRV9TRVRfVFlQRV9HUk9VUBABEhgKFERFVklDRV9TRVRfVFlQRV9SQUNLEAIqtgEKDlJhY2tPcmRlckluZGV4EiAKHFJBQ0tfT1JERVJfSU5ERVhfVU5TUEVDSUZJRUQQABIgChxSQUNLX09SREVSX0lOREVYX0JPVFRPTV9MRUZUEAESHQoZUkFDS19PUkRFUl9JTkRFWF9UT1BfTEVGVBACEiEKHVJBQ0tfT1JERVJfSU5ERVhfQk9UVE9NX1JJR0hUEAMSHgoaUkFDS19PUkRFUl9JTkRFWF9UT1BfUklHSFQQBCpwCg9SYWNrQ29vbGluZ1R5cGUSIQodUkFDS19DT09MSU5HX1RZUEVfVU5TUEVDSUZJRUQQABIZChVSQUNLX0NPT0xJTkdfVFlQRV9BSVIQARIfChtSQUNLX0NPT0xJTkdfVFlQRV9JTU1FUlNJT04QAirdAQoQU2xvdERldmljZVN0YXR1cxIiCh5TTE9UX0RFVklDRV9TVEFUVVNfVU5TUEVDSUZJRUQQABIcChhTTE9UX0RFVklDRV9TVEFUVVNfRU1QVFkQARIeChpTTE9UX0RFVklDRV9TVEFUVVNfSEVBTFRIWRACEiYKIlNMT1RfREVWSUNFX1NUQVRVU19ORUVEU19BVFRFTlRJT04QAxIeChpTTE9UX0RFVklDRV9TVEFUVVNfT0ZGTElORRAEEh8KG1NMT1RfREVWSUNFX1NUQVRVU19TTEVFUElORxAFKoUBChtQZXJEZXZpY2VSYWNrQ29uZmxpY3RSZWFzb24SLworUEVSX0RFVklDRV9SQUNLX0NPTkZMSUNUX1JFQVNPTl9VTlNQRUNJRklFRBAAEjUKMVBFUl9ERVZJQ0VfUkFDS19DT05GTElDVF9SRUFTT05fREVWSUNFX0xPU0VTX1NJVEUQATKpDgoQRGV2aWNlU2V0U2VydmljZRJgCg9DcmVhdGVEZXZpY2VTZXQSJS5kZXZpY2Vfc2V0LnYxLkNyZWF0ZURldmljZVNldFJlcXVlc3QaJi5kZXZpY2Vfc2V0LnYxLkNyZWF0ZURldmljZVNldFJlc3BvbnNlElcKDEdldERldmljZVNldBIiLmRldmljZV9zZXQudjEuR2V0RGV2aWNlU2V0UmVxdWVzdBojLmRldmljZV9zZXQudjEuR2V0RGV2aWNlU2V0UmVzcG9uc2USYAoPVXBkYXRlRGV2aWNlU2V0EiUuZGV2aWNlX3NldC52MS5VcGRhdGVEZXZpY2VTZXRSZXF1ZXN0GiYuZGV2aWNlX3NldC52MS5VcGRhdGVEZXZpY2VTZXRSZXNwb25zZRJgCg9EZWxldGVEZXZpY2VTZXQSJS5kZXZpY2Vfc2V0LnYxLkRlbGV0ZURldmljZVNldFJlcXVlc3QaJi5kZXZpY2Vfc2V0LnYxLkRlbGV0ZURldmljZVNldFJlc3BvbnNlEl0KDkxpc3REZXZpY2VTZXRzEiQuZGV2aWNlX3NldC52MS5MaXN0RGV2aWNlU2V0c1JlcXVlc3QaJS5kZXZpY2Vfc2V0LnYxLkxpc3REZXZpY2VTZXRzUmVzcG9uc2USZgoRQWRkRGV2aWNlc1RvR3JvdXASJy5kZXZpY2Vfc2V0LnYxLkFkZERldmljZXNUb0dyb3VwUmVxdWVzdBooLmRldmljZV9zZXQudjEuQWRkRGV2aWNlc1RvR3JvdXBSZXNwb25zZRJ1ChZSZW1vdmVEZXZpY2VzRnJvbUdyb3VwEiwuZGV2aWNlX3NldC52MS5SZW1vdmVEZXZpY2VzRnJvbUdyb3VwUmVxdWVzdBotLmRldmljZV9zZXQudjEuUmVtb3ZlRGV2aWNlc0Zyb21Hcm91cFJlc3BvbnNlEm8KFExpc3REZXZpY2VTZXRNZW1iZXJzEiouZGV2aWNlX3NldC52MS5MaXN0RGV2aWNlU2V0TWVtYmVyc1JlcXVlc3QaKy5kZXZpY2Vfc2V0LnYxLkxpc3REZXZpY2VTZXRNZW1iZXJzUmVzcG9uc2USbAoTR2V0RGV2aWNlRGV2aWNlU2V0cxIpLmRldmljZV9zZXQudjEuR2V0RGV2aWNlRGV2aWNlU2V0c1JlcXVlc3QaKi5kZXZpY2Vfc2V0LnYxLkdldERldmljZURldmljZVNldHNSZXNwb25zZRJsChNTZXRSYWNrU2xvdFBvc2l0aW9uEikuZGV2aWNlX3NldC52MS5TZXRSYWNrU2xvdFBvc2l0aW9uUmVxdWVzdBoqLmRldmljZV9zZXQudjEuU2V0UmFja1Nsb3RQb3NpdGlvblJlc3BvbnNlEnIKFUNsZWFyUmFja1Nsb3RQb3NpdGlvbhIrLmRldmljZV9zZXQudjEuQ2xlYXJSYWNrU2xvdFBvc2l0aW9uUmVxdWVzdBosLmRldmljZV9zZXQudjEuQ2xlYXJSYWNrU2xvdFBvc2l0aW9uUmVzcG9uc2USVwoMR2V0UmFja1Nsb3RzEiIuZGV2aWNlX3NldC52MS5HZXRSYWNrU2xvdHNSZXF1ZXN0GiMuZGV2aWNlX3NldC52MS5HZXRSYWNrU2xvdHNSZXNwb25zZRJmChFHZXREZXZpY2VTZXRTdGF0cxInLmRldmljZV9zZXQudjEuR2V0RGV2aWNlU2V0U3RhdHNSZXF1ZXN0GiguZGV2aWNlX3NldC52MS5HZXREZXZpY2VTZXRTdGF0c1Jlc3BvbnNlEloKDUxpc3RSYWNrWm9uZXMSIy5kZXZpY2Vfc2V0LnYxLkxpc3RSYWNrWm9uZXNSZXF1ZXN0GiQuZGV2aWNlX3NldC52MS5MaXN0UmFja1pvbmVzUmVzcG9uc2USYwoQTGlzdFJhY2tab25lUmVmcxImLmRldmljZV9zZXQudjEuTGlzdFJhY2tab25lUmVmc1JlcXVlc3QaJy5kZXZpY2Vfc2V0LnYxLkxpc3RSYWNrWm9uZVJlZnNSZXNwb25zZRJaCg1MaXN0UmFja1R5cGVzEiMuZGV2aWNlX3NldC52MS5MaXN0UmFja1R5cGVzUmVxdWVzdBokLmRldmljZV9zZXQudjEuTGlzdFJhY2tUeXBlc1Jlc3BvbnNlEksKCFNhdmVSYWNrEh4uZGV2aWNlX3NldC52MS5TYXZlUmFja1JlcXVlc3QaHy5kZXZpY2Vfc2V0LnYxLlNhdmVSYWNrUmVzcG9uc2USbAoTQXNzaWduRGV2aWNlc1RvUmFjaxIpLmRldmljZV9zZXQudjEuQXNzaWduRGV2aWNlc1RvUmFja1JlcXVlc3QaKi5kZXZpY2Vfc2V0LnYxLkFzc2lnbkRldmljZXNUb1JhY2tSZXNwb25zZULDAQoRY29tLmRldmljZV9zZXQudjFCDkRldmljZVNldFByb3RvUAFaTWdpdGh1Yi5jb20vYmxvY2svcHJvdG8tZmxlZXQvc2VydmVyL2dlbmVyYXRlZC9ncnBjL2RldmljZV9zZXQvdjE7ZGV2aWNlX3NldHYxogIDRFhYqgIMRGV2aWNlU2V0LlYxygIMRGV2aWNlU2V0XFYx4gIYRGV2aWNlU2V0XFYxXEdQQk1ldGFkYXRh6gINRGV2aWNlU2V0OjpWMWIGcHJvdG8z",
+ "Ch5kZXZpY2Vfc2V0L3YxL2RldmljZV9zZXQucHJvdG8SDWRldmljZV9zZXQudjEi+AIKCURldmljZVNldBIKCgJpZBgBIAEoAxIqCgR0eXBlGAIgASgOMhwuZGV2aWNlX3NldC52MS5EZXZpY2VTZXRUeXBlEg0KBWxhYmVsGAMgASgJEhMKC2Rlc2NyaXB0aW9uGAQgASgJEhQKDGRldmljZV9jb3VudBgFIAEoBRIuCgpjcmVhdGVkX2F0GAYgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcBIuCgp1cGRhdGVkX2F0GAcgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcBIsCglyYWNrX2luZm8YCCABKAsyFy5kZXZpY2Vfc2V0LnYxLlJhY2tJbmZvSAASLgoKZ3JvdXBfaW5mbxgJIAEoCzIYLmRldmljZV9zZXQudjEuR3JvdXBJbmZvSAASKwoJcGxhY2VtZW50GAogASgLMhguY29tbW9uLnYxLlBsYWNlbWVudFJlZnNCDgoMdHlwZV9kZXRhaWxzIogCCghSYWNrSW5mbxIVCgRyb3dzGAEgASgFQge6SAQaAiAAEhgKB2NvbHVtbnMYAiABKAVCB7pIBBoCIAASFQoEem9uZRgDIAEoCUIHukgEcgIYZBIyCgtvcmRlcl9pbmRleBgEIAEoDjIdLmRldmljZV9zZXQudjEuUmFja09yZGVySW5kZXgSNAoMY29vbGluZ190eXBlGAUgASgOMh4uZGV2aWNlX3NldC52MS5SYWNrQ29vbGluZ1R5cGUSFAoHc2l0ZV9pZBgGIAEoA0gAiAEBEhgKC2J1aWxkaW5nX2lkGAcgASgDSAGIAQFCCgoIX3NpdGVfaWRCDgoMX2J1aWxkaW5nX2lkIgsKCUdyb3VwSW5mbyKeAQoPRGV2aWNlU2V0TWVtYmVyEhkKEWRldmljZV9pZGVudGlmaWVyGAEgASgJEiwKCGFkZGVkX2F0GAIgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcBIwCgRyYWNrGAMgASgLMiAuZGV2aWNlX3NldC52MS5SYWNrTWVtYmVyRGV0YWlsc0gAQhAKDm1lbWJlcl9kZXRhaWxzIksKEVJhY2tNZW1iZXJEZXRhaWxzEjYKDXNsb3RfcG9zaXRpb24YASABKAsyHy5kZXZpY2Vfc2V0LnYxLlJhY2tTbG90UG9zaXRpb24iQQoQUmFja1Nsb3RQb3NpdGlvbhIUCgNyb3cYASABKAVCB7pIBBoCKAASFwoGY29sdW1uGAIgASgFQge6SAQaAigAIscCChZDcmVhdGVEZXZpY2VTZXRSZXF1ZXN0EjYKBHR5cGUYASABKA4yHC5kZXZpY2Vfc2V0LnYxLkRldmljZVNldFR5cGVCCrpIB4IBBBABIAASGwoFbGFiZWwYAiABKAlCDLpICcgBAXIEEAEYZBIdCgtkZXNjcmlwdGlvbhgDIAEoCUIIukgFcgMY9AMSLAoJcmFja19pbmZvGAQgASgLMhcuZGV2aWNlX3NldC52MS5SYWNrSW5mb0gAEi4KCmdyb3VwX2luZm8YBSABKAsyGC5kZXZpY2Vfc2V0LnYxLkdyb3VwSW5mb0gAEjcKD2RldmljZV9zZWxlY3RvchgGIAEoCzIZLmNvbW1vbi52MS5EZXZpY2VTZWxlY3RvckgBiAEBQg4KDHR5cGVfZGV0YWlsc0ISChBfZGV2aWNlX3NlbGVjdG9yIlwKF0NyZWF0ZURldmljZVNldFJlc3BvbnNlEiwKCmRldmljZV9zZXQYASABKAsyGC5kZXZpY2Vfc2V0LnYxLkRldmljZVNldBITCgthZGRlZF9jb3VudBgCIAEoBSI1ChNHZXREZXZpY2VTZXRSZXF1ZXN0Eh4KDWRldmljZV9zZXRfaWQYASABKANCB7pIBCICIAAiRAoUR2V0RGV2aWNlU2V0UmVzcG9uc2USLAoKZGV2aWNlX3NldBgBIAEoCzIYLmRldmljZV9zZXQudjEuRGV2aWNlU2V0IrcCChZVcGRhdGVEZXZpY2VTZXRSZXF1ZXN0Eh4KDWRldmljZV9zZXRfaWQYASABKANCB7pIBCICIAASHQoFbGFiZWwYAiABKAlCCbpIBnIEEAEYZEgBiAEBEiIKC2Rlc2NyaXB0aW9uGAMgASgJQgi6SAVyAxj0A0gCiAEBEiwKCXJhY2tfaW5mbxgEIAEoCzIXLmRldmljZV9zZXQudjEuUmFja0luZm9IABIuCgpncm91cF9pbmZvGAUgASgLMhguZGV2aWNlX3NldC52MS5Hcm91cEluZm9IABIyCg9kZXZpY2Vfc2VsZWN0b3IYBiABKAsyGS5jb21tb24udjEuRGV2aWNlU2VsZWN0b3JCDgoMdHlwZV9kZXRhaWxzQggKBl9sYWJlbEIOCgxfZGVzY3JpcHRpb24iRwoXVXBkYXRlRGV2aWNlU2V0UmVzcG9uc2USLAoKZGV2aWNlX3NldBgBIAEoCzIYLmRldmljZV9zZXQudjEuRGV2aWNlU2V0IjgKFkRlbGV0ZURldmljZVNldFJlcXVlc3QSHgoNZGV2aWNlX3NldF9pZBgBIAEoA0IHukgEIgIgACIZChdEZWxldGVEZXZpY2VTZXRSZXNwb25zZSLLAwoVTGlzdERldmljZVNldHNSZXF1ZXN0EjQKBHR5cGUYASABKA4yHC5kZXZpY2Vfc2V0LnYxLkRldmljZVNldFR5cGVCCLpIBYIBAhABEhoKCXBhZ2Vfc2l6ZRgCIAEoBUIHukgEGgIoABISCgpwYWdlX3Rva2VuGAMgASgJEiMKBHNvcnQYBCABKAsyFS5jb21tb24udjEuU29ydENvbmZpZxI3ChVlcnJvcl9jb21wb25lbnRfdHlwZXMYBSADKA4yGC5lcnJvcnMudjEuQ29tcG9uZW50VHlwZRIRCgV6b25lcxgGIAMoCUICGAESFAoMYnVpbGRpbmdfaWRzGAcgAygDEhsKE2luY2x1ZGVfbm9fYnVpbGRpbmcYCCABKAgSJQoJem9uZV9rZXlzGAkgAygLMhIuY29tbW9uLnYxLlpvbmVLZXkSIQoIc2l0ZV9pZHMYCiADKANCD7pIDJIBCRCACCIEIgIgABIaChJpbmNsdWRlX3VuYXNzaWduZWQYCyABKAgSQgoQdGVsZW1ldHJ5X3JhbmdlcxgMIAMoCzIoLmNvbW1vbi52MS5GbGVldExpc3RUZWxlbWV0cnlSYW5nZUZpbHRlciJ1ChZMaXN0RGV2aWNlU2V0c1Jlc3BvbnNlEi0KC2RldmljZV9zZXRzGAEgAygLMhguZGV2aWNlX3NldC52MS5EZXZpY2VTZXQSFwoPbmV4dF9wYWdlX3Rva2VuGAIgASgJEhMKC3RvdGFsX2NvdW50GAMgASgFIngKGEFkZERldmljZXNUb0dyb3VwUmVxdWVzdBIgCg90YXJnZXRfZ3JvdXBfaWQYASABKANCB7pIBCICIAASOgoPZGV2aWNlX3NlbGVjdG9yGAIgASgLMhkuY29tbW9uLnYxLkRldmljZVNlbGVjdG9yQga6SAPIAQEiMAoZQWRkRGV2aWNlc1RvR3JvdXBSZXNwb25zZRITCgthZGRlZF9jb3VudBgBIAEoAyJ9Ch1SZW1vdmVEZXZpY2VzRnJvbUdyb3VwUmVxdWVzdBIgCg90YXJnZXRfZ3JvdXBfaWQYASABKANCB7pIBCICIAASOgoPZGV2aWNlX3NlbGVjdG9yGAIgASgLMhkuY29tbW9uLnYxLkRldmljZVNlbGVjdG9yQga6SAPIAQEiNwoeUmVtb3ZlRGV2aWNlc0Zyb21Hcm91cFJlc3BvbnNlEhUKDXJlbW92ZWRfY291bnQYASABKAMirAEKG0xpc3REZXZpY2VTZXRNZW1iZXJzUmVxdWVzdBIeCg1kZXZpY2Vfc2V0X2lkGAEgASgDQge6SAQiAiAAEhoKCXBhZ2Vfc2l6ZRgCIAEoBUIHukgEGgIoABISCgpwYWdlX3Rva2VuGAMgASgJEiEKCHNpdGVfaWRzGAQgAygDQg+6SAySAQkQgAgiBCICIAASGgoSaW5jbHVkZV91bmFzc2lnbmVkGAUgASgIImgKHExpc3REZXZpY2VTZXRNZW1iZXJzUmVzcG9uc2USLwoHbWVtYmVycxgBIAMoCzIeLmRldmljZV9zZXQudjEuRGV2aWNlU2V0TWVtYmVyEhcKD25leHRfcGFnZV90b2tlbhgCIAEoCSJsChpHZXREZXZpY2VEZXZpY2VTZXRzUmVxdWVzdBIiChFkZXZpY2VfaWRlbnRpZmllchgBIAEoCUIHukgEcgIQARIqCgR0eXBlGAIgASgOMhwuZGV2aWNlX3NldC52MS5EZXZpY2VTZXRUeXBlIkwKG0dldERldmljZURldmljZVNldHNSZXNwb25zZRItCgtkZXZpY2Vfc2V0cxgBIAMoCzIYLmRldmljZV9zZXQudjEuRGV2aWNlU2V0IpsBChpTZXRSYWNrU2xvdFBvc2l0aW9uUmVxdWVzdBIeCg1kZXZpY2Vfc2V0X2lkGAEgASgDQge6SAQiAiAAEiIKEWRldmljZV9pZGVudGlmaWVyGAIgASgJQge6SARyAhABEjkKCHBvc2l0aW9uGAMgASgLMh8uZGV2aWNlX3NldC52MS5SYWNrU2xvdFBvc2l0aW9uQga6SAPIAQEiWwobU2V0UmFja1Nsb3RQb3NpdGlvblJlc3BvbnNlEhUKDWRldmljZV9zZXRfaWQYASABKAMSJQoEc2xvdBgCIAEoCzIXLmRldmljZV9zZXQudjEuUmFja1Nsb3QiYgocQ2xlYXJSYWNrU2xvdFBvc2l0aW9uUmVxdWVzdBIeCg1kZXZpY2Vfc2V0X2lkGAEgASgDQge6SAQiAiAAEiIKEWRldmljZV9pZGVudGlmaWVyGAIgASgJQge6SARyAhABIh8KHUNsZWFyUmFja1Nsb3RQb3NpdGlvblJlc3BvbnNlIjUKE0dldFJhY2tTbG90c1JlcXVlc3QSHgoNZGV2aWNlX3NldF9pZBgBIAEoA0IHukgEIgIgACJYCghSYWNrU2xvdBIZChFkZXZpY2VfaWRlbnRpZmllchgBIAEoCRIxCghwb3NpdGlvbhgCIAEoCzIfLmRldmljZV9zZXQudjEuUmFja1Nsb3RQb3NpdGlvbiI+ChRHZXRSYWNrU2xvdHNSZXNwb25zZRImCgVzbG90cxgBIAMoCzIXLmRldmljZV9zZXQudjEuUmFja1Nsb3Qi7QQKDkRldmljZVNldFN0YXRzEhUKDWRldmljZV9zZXRfaWQYASABKAMSFAoMZGV2aWNlX2NvdW50GAIgASgFEhcKD3JlcG9ydGluZ19jb3VudBgDIAEoBRIaChJ0b3RhbF9oYXNocmF0ZV90aHMYBCABKAESGgoSYXZnX2VmZmljaWVuY3lfanRoGAUgASgBEhYKDnRvdGFsX3Bvd2VyX2t3GAYgASgBEhkKEW1pbl90ZW1wZXJhdHVyZV9jGAcgASgBEhkKEW1heF90ZW1wZXJhdHVyZV9jGAggASgBEhUKDWhhc2hpbmdfY291bnQYCSABKAUSFAoMYnJva2VuX2NvdW50GAogASgFEhUKDW9mZmxpbmVfY291bnQYCyABKAUSFgoOc2xlZXBpbmdfY291bnQYDCABKAUSIAoYaGFzaHJhdGVfcmVwb3J0aW5nX2NvdW50GA0gASgFEiIKGmVmZmljaWVuY3lfcmVwb3J0aW5nX2NvdW50GA4gASgFEh0KFXBvd2VyX3JlcG9ydGluZ19jb3VudBgPIAEoBRIjCht0ZW1wZXJhdHVyZV9yZXBvcnRpbmdfY291bnQYECABKAUSIQoZY29udHJvbF9ib2FyZF9pc3N1ZV9jb3VudBgRIAEoBRIXCg9mYW5faXNzdWVfY291bnQYEiABKAUSHgoWaGFzaF9ib2FyZF9pc3N1ZV9jb3VudBgTIAEoBRIXCg9wc3VfaXNzdWVfY291bnQYFCABKAUSNAoNc2xvdF9zdGF0dXNlcxgVIAMoCzIdLmRldmljZV9zZXQudjEuUmFja1Nsb3RTdGF0dXMiMgoYR2V0RGV2aWNlU2V0U3RhdHNSZXF1ZXN0EhYKDmRldmljZV9zZXRfaWRzGAEgAygDIkkKGUdldERldmljZVNldFN0YXRzUmVzcG9uc2USLAoFc3RhdHMYASADKAsyHS5kZXZpY2Vfc2V0LnYxLkRldmljZVNldFN0YXRzIl4KDlJhY2tTbG90U3RhdHVzEgsKA3JvdxgBIAEoBRIOCgZjb2x1bW4YAiABKAUSLwoGc3RhdHVzGAMgASgOMh8uZGV2aWNlX3NldC52MS5TbG90RGV2aWNlU3RhdHVzIhYKFExpc3RSYWNrWm9uZXNSZXF1ZXN0IiYKFUxpc3RSYWNrWm9uZXNSZXNwb25zZRINCgV6b25lcxgBIAMoCSIZChdMaXN0UmFja1pvbmVSZWZzUmVxdWVzdCI9ChhMaXN0UmFja1pvbmVSZWZzUmVzcG9uc2USIQoFem9uZXMYASADKAsyEi5jb21tb24udjEuWm9uZVJlZiIWChRMaXN0UmFja1R5cGVzUmVxdWVzdCI9CghSYWNrVHlwZRIMCgRyb3dzGAEgASgFEg8KB2NvbHVtbnMYAiABKAUSEgoKcmFja19jb3VudBgDIAEoBSJEChVMaXN0UmFja1R5cGVzUmVzcG9uc2USKwoKcmFja190eXBlcxgBIAMoCzIXLmRldmljZV9zZXQudjEuUmFja1R5cGUi1AIKD1NhdmVSYWNrUmVxdWVzdBIjCg1kZXZpY2Vfc2V0X2lkGAEgASgDQge6SAQiAiAASACIAQESGwoFbGFiZWwYAiABKAlCDLpICcgBAXIEEAEYZBIyCglyYWNrX2luZm8YAyABKAsyFy5kZXZpY2Vfc2V0LnYxLlJhY2tJbmZvQga6SAPIAQESOgoPZGV2aWNlX3NlbGVjdG9yGAQgASgLMhkuY29tbW9uLnYxLkRldmljZVNlbGVjdG9yQga6SAPIAQESMQoQc2xvdF9hc3NpZ25tZW50cxgFIAMoCzIXLmRldmljZV9zZXQudjEuUmFja1Nsb3QSKQocZm9yY2VfY2xlYXJfY29uZmxpY3Rpbmdfc2l0ZRgGIAEoCEgBiAEBQhAKDl9kZXZpY2Vfc2V0X2lkQh8KHV9mb3JjZV9jbGVhcl9jb25mbGljdGluZ19zaXRlIrABChBTYXZlUmFja1Jlc3BvbnNlEiwKCmRldmljZV9zZXQYASABKAsyGC5kZXZpY2Vfc2V0LnYxLkRldmljZVNldBIWCg5hc3NpZ25lZF9jb3VudBgCIAEoBRIdChVzaXRlX3JlYXNzaWduZWRfY291bnQYAyABKAUSNwoJY29uZmxpY3RzGAQgAygLMiQuZGV2aWNlX3NldC52MS5QZXJEZXZpY2VSYWNrQ29uZmxpY3QimwIKGkFzc2lnbkRldmljZXNUb1JhY2tSZXF1ZXN0EiQKDnRhcmdldF9yYWNrX2lkGAEgASgDQge6SAQiAiAASACIAQESOgoPZGV2aWNlX3NlbGVjdG9yGAIgASgLMhkuY29tbW9uLnYxLkRldmljZVNlbGVjdG9yQga6SAPIAQESKQocZm9yY2VfY2xlYXJfY29uZmxpY3Rpbmdfc2l0ZRgDIAEoCEgBiAEBEjwKEHNsb3RfYXNzaWdubWVudHMYBCADKAsyFy5kZXZpY2Vfc2V0LnYxLlJhY2tTbG90Qgm6SAaSAQMQkE5CEQoPX3RhcmdldF9yYWNrX2lkQh8KHV9mb3JjZV9jbGVhcl9jb25mbGljdGluZ19zaXRlIqQBChtBc3NpZ25EZXZpY2VzVG9SYWNrUmVzcG9uc2USFgoOYXNzaWduZWRfY291bnQYASABKAMSHQoVc2l0ZV9yZWFzc2lnbmVkX2NvdW50GAIgASgDEhUKDXJlbW92ZWRfY291bnQYAyABKAMSNwoJY29uZmxpY3RzGAQgAygLMiQuZGV2aWNlX3NldC52MS5QZXJEZXZpY2VSYWNrQ29uZmxpY3QibgoVUGVyRGV2aWNlUmFja0NvbmZsaWN0EhkKEWRldmljZV9pZGVudGlmaWVyGAEgASgJEjoKBnJlYXNvbhgCIAEoDjIqLmRldmljZV9zZXQudjEuUGVyRGV2aWNlUmFja0NvbmZsaWN0UmVhc29uKmUKDURldmljZVNldFR5cGUSHwobREVWSUNFX1NFVF9UWVBFX1VOU1BFQ0lGSUVEEAASGQoVREVWSUNFX1NFVF9UWVBFX0dST1VQEAESGAoUREVWSUNFX1NFVF9UWVBFX1JBQ0sQAiq2AQoOUmFja09yZGVySW5kZXgSIAocUkFDS19PUkRFUl9JTkRFWF9VTlNQRUNJRklFRBAAEiAKHFJBQ0tfT1JERVJfSU5ERVhfQk9UVE9NX0xFRlQQARIdChlSQUNLX09SREVSX0lOREVYX1RPUF9MRUZUEAISIQodUkFDS19PUkRFUl9JTkRFWF9CT1RUT01fUklHSFQQAxIeChpSQUNLX09SREVSX0lOREVYX1RPUF9SSUdIVBAEKnAKD1JhY2tDb29saW5nVHlwZRIhCh1SQUNLX0NPT0xJTkdfVFlQRV9VTlNQRUNJRklFRBAAEhkKFVJBQ0tfQ09PTElOR19UWVBFX0FJUhABEh8KG1JBQ0tfQ09PTElOR19UWVBFX0lNTUVSU0lPThACKt0BChBTbG90RGV2aWNlU3RhdHVzEiIKHlNMT1RfREVWSUNFX1NUQVRVU19VTlNQRUNJRklFRBAAEhwKGFNMT1RfREVWSUNFX1NUQVRVU19FTVBUWRABEh4KGlNMT1RfREVWSUNFX1NUQVRVU19IRUFMVEhZEAISJgoiU0xPVF9ERVZJQ0VfU1RBVFVTX05FRURTX0FUVEVOVElPThADEh4KGlNMT1RfREVWSUNFX1NUQVRVU19PRkZMSU5FEAQSHwobU0xPVF9ERVZJQ0VfU1RBVFVTX1NMRUVQSU5HEAUqhQEKG1BlckRldmljZVJhY2tDb25mbGljdFJlYXNvbhIvCitQRVJfREVWSUNFX1JBQ0tfQ09ORkxJQ1RfUkVBU09OX1VOU1BFQ0lGSUVEEAASNQoxUEVSX0RFVklDRV9SQUNLX0NPTkZMSUNUX1JFQVNPTl9ERVZJQ0VfTE9TRVNfU0lURRABMqkOChBEZXZpY2VTZXRTZXJ2aWNlEmAKD0NyZWF0ZURldmljZVNldBIlLmRldmljZV9zZXQudjEuQ3JlYXRlRGV2aWNlU2V0UmVxdWVzdBomLmRldmljZV9zZXQudjEuQ3JlYXRlRGV2aWNlU2V0UmVzcG9uc2USVwoMR2V0RGV2aWNlU2V0EiIuZGV2aWNlX3NldC52MS5HZXREZXZpY2VTZXRSZXF1ZXN0GiMuZGV2aWNlX3NldC52MS5HZXREZXZpY2VTZXRSZXNwb25zZRJgCg9VcGRhdGVEZXZpY2VTZXQSJS5kZXZpY2Vfc2V0LnYxLlVwZGF0ZURldmljZVNldFJlcXVlc3QaJi5kZXZpY2Vfc2V0LnYxLlVwZGF0ZURldmljZVNldFJlc3BvbnNlEmAKD0RlbGV0ZURldmljZVNldBIlLmRldmljZV9zZXQudjEuRGVsZXRlRGV2aWNlU2V0UmVxdWVzdBomLmRldmljZV9zZXQudjEuRGVsZXRlRGV2aWNlU2V0UmVzcG9uc2USXQoOTGlzdERldmljZVNldHMSJC5kZXZpY2Vfc2V0LnYxLkxpc3REZXZpY2VTZXRzUmVxdWVzdBolLmRldmljZV9zZXQudjEuTGlzdERldmljZVNldHNSZXNwb25zZRJmChFBZGREZXZpY2VzVG9Hcm91cBInLmRldmljZV9zZXQudjEuQWRkRGV2aWNlc1RvR3JvdXBSZXF1ZXN0GiguZGV2aWNlX3NldC52MS5BZGREZXZpY2VzVG9Hcm91cFJlc3BvbnNlEnUKFlJlbW92ZURldmljZXNGcm9tR3JvdXASLC5kZXZpY2Vfc2V0LnYxLlJlbW92ZURldmljZXNGcm9tR3JvdXBSZXF1ZXN0Gi0uZGV2aWNlX3NldC52MS5SZW1vdmVEZXZpY2VzRnJvbUdyb3VwUmVzcG9uc2USbwoUTGlzdERldmljZVNldE1lbWJlcnMSKi5kZXZpY2Vfc2V0LnYxLkxpc3REZXZpY2VTZXRNZW1iZXJzUmVxdWVzdBorLmRldmljZV9zZXQudjEuTGlzdERldmljZVNldE1lbWJlcnNSZXNwb25zZRJsChNHZXREZXZpY2VEZXZpY2VTZXRzEikuZGV2aWNlX3NldC52MS5HZXREZXZpY2VEZXZpY2VTZXRzUmVxdWVzdBoqLmRldmljZV9zZXQudjEuR2V0RGV2aWNlRGV2aWNlU2V0c1Jlc3BvbnNlEmwKE1NldFJhY2tTbG90UG9zaXRpb24SKS5kZXZpY2Vfc2V0LnYxLlNldFJhY2tTbG90UG9zaXRpb25SZXF1ZXN0GiouZGV2aWNlX3NldC52MS5TZXRSYWNrU2xvdFBvc2l0aW9uUmVzcG9uc2UScgoVQ2xlYXJSYWNrU2xvdFBvc2l0aW9uEisuZGV2aWNlX3NldC52MS5DbGVhclJhY2tTbG90UG9zaXRpb25SZXF1ZXN0GiwuZGV2aWNlX3NldC52MS5DbGVhclJhY2tTbG90UG9zaXRpb25SZXNwb25zZRJXCgxHZXRSYWNrU2xvdHMSIi5kZXZpY2Vfc2V0LnYxLkdldFJhY2tTbG90c1JlcXVlc3QaIy5kZXZpY2Vfc2V0LnYxLkdldFJhY2tTbG90c1Jlc3BvbnNlEmYKEUdldERldmljZVNldFN0YXRzEicuZGV2aWNlX3NldC52MS5HZXREZXZpY2VTZXRTdGF0c1JlcXVlc3QaKC5kZXZpY2Vfc2V0LnYxLkdldERldmljZVNldFN0YXRzUmVzcG9uc2USWgoNTGlzdFJhY2tab25lcxIjLmRldmljZV9zZXQudjEuTGlzdFJhY2tab25lc1JlcXVlc3QaJC5kZXZpY2Vfc2V0LnYxLkxpc3RSYWNrWm9uZXNSZXNwb25zZRJjChBMaXN0UmFja1pvbmVSZWZzEiYuZGV2aWNlX3NldC52MS5MaXN0UmFja1pvbmVSZWZzUmVxdWVzdBonLmRldmljZV9zZXQudjEuTGlzdFJhY2tab25lUmVmc1Jlc3BvbnNlEloKDUxpc3RSYWNrVHlwZXMSIy5kZXZpY2Vfc2V0LnYxLkxpc3RSYWNrVHlwZXNSZXF1ZXN0GiQuZGV2aWNlX3NldC52MS5MaXN0UmFja1R5cGVzUmVzcG9uc2USSwoIU2F2ZVJhY2sSHi5kZXZpY2Vfc2V0LnYxLlNhdmVSYWNrUmVxdWVzdBofLmRldmljZV9zZXQudjEuU2F2ZVJhY2tSZXNwb25zZRJsChNBc3NpZ25EZXZpY2VzVG9SYWNrEikuZGV2aWNlX3NldC52MS5Bc3NpZ25EZXZpY2VzVG9SYWNrUmVxdWVzdBoqLmRldmljZV9zZXQudjEuQXNzaWduRGV2aWNlc1RvUmFja1Jlc3BvbnNlQsMBChFjb20uZGV2aWNlX3NldC52MUIORGV2aWNlU2V0UHJvdG9QAVpNZ2l0aHViLmNvbS9ibG9jay9wcm90by1mbGVldC9zZXJ2ZXIvZ2VuZXJhdGVkL2dycGMvZGV2aWNlX3NldC92MTtkZXZpY2Vfc2V0djGiAgNEWFiqAgxEZXZpY2VTZXQuVjHKAgxEZXZpY2VTZXRcVjHiAhhEZXZpY2VTZXRcVjFcR1BCTWV0YWRhdGHqAg1EZXZpY2VTZXQ6OlYxYgZwcm90bzM",
[
file_google_protobuf_timestamp,
file_buf_validate_validate,
@@ -1698,6 +1698,33 @@ export type AssignDevicesToRackRequest = Message<"device_set.v1.AssignDevicesToR
* @generated from field: optional bool force_clear_conflicting_site = 3;
*/
forceClearConflictingSite?: boolean | undefined;
+
+ /**
+ * Slot placements for the devices being assigned. The rack-level
+ * analogue of buildings.v1.RackPlacement's optional aisle_index /
+ * position_in_aisle: the batch names only the devices it is changing,
+ * and each named device ends up either placed or explicitly unplaced.
+ *
+ * Per entry: `position` set places the device there, `position` unset
+ * CLEARS its slot. A device not named here is untouched, so one call
+ * can mix placed, unplaced and left-alone miners. Every named device
+ * is cleared before any position is written, which is what lets a
+ * relayout swap two occupied cells without tripping
+ * uk_rack_slot_position mid-batch.
+ *
+ * Empty (the default): no slot is written at all. A device already in
+ * the target rack keeps its slot; a device arriving from another rack
+ * starts unplaced, because its old slot died with its old membership.
+ *
+ * Every entry must name a device present in device_selector — a slot
+ * needs a membership row to hang off — and no two entries may share a
+ * device or a position. Positions are bounds checked against the
+ * target rack's rows/columns. Requires target_rack_id: an unassign has
+ * no rack to place into.
+ *
+ * @generated from field: repeated device_set.v1.RackSlot slot_assignments = 4;
+ */
+ slotAssignments: RackSlot[];
};
/**
@@ -2155,6 +2182,15 @@ export const DeviceSetService: GenService<{
* is rejected with InvalidArgument because moving every paired
* device into a single rack is never the intended operation.
*
+ * slot_assignments optionally carries each moved device's slot inside
+ * the target rack, so membership and placement land in the same
+ * transaction. This is the rack-level counterpart to
+ * buildings.v1.AssignRacksToBuilding: a delta that names only the
+ * children it changes, with placement optional per child. Prefer it
+ * over SaveRack for every edit — SaveRack replaces the rack's whole
+ * member set, so a stale client snapshot silently drops members
+ * added concurrently.
+ *
* @generated from rpc device_set.v1.DeviceSetService.AssignDevicesToRack
*/
assignDevicesToRack: {
diff --git a/client/src/protoFleet/api/useDeviceSets.ts b/client/src/protoFleet/api/useDeviceSets.ts
index 49514e20f3..033633cdd2 100644
--- a/client/src/protoFleet/api/useDeviceSets.ts
+++ b/client/src/protoFleet/api/useDeviceSets.ts
@@ -196,6 +196,13 @@ interface AssignDevicesToRackProps {
// miners' site. Default false: the server returns conflicts (surfaced
// via onConflicts) and writes nothing.
forceClearConflictingSite?: boolean;
+ // Optional slot placements, applied in the same transaction. One entry
+ // per miner whose placement changes: `position` set lands it there,
+ // `position` omitted clears its slot (in the rack, off the grid). A
+ // miner not named here keeps whatever slot it had, which is what makes
+ // this safe where saveRack was not. Every entry must name a miner in
+ // deviceIdentifiers; no two may share a miner or a cell.
+ slotAssignments?: RackSlot[];
signal?: AbortSignal;
onSuccess?: (assignedCount: bigint, siteReassignedCount: bigint, removedCount: bigint) => void;
// Fires when the server returns site-strip conflicts (no write
@@ -731,11 +738,18 @@ const useDeviceSets = () => {
// server error / network blip between the two calls can't orphan
// miners from rack assignment (issue #420). Pass targetRackId
// unset to clear rack membership without re-assigning.
+ //
+ // Prefer this over saveRack for every edit to an existing rack. This is
+ // a delta — it names only the miners it changes — whereas saveRack
+ // replaces the rack's entire member set, so a stale local snapshot
+ // silently drops miners another session added while the modal was open.
+ // Pass slotAssignments to move membership and placement in one call.
const assignDevicesToRack = useCallback(
async ({
targetRackId,
deviceIdentifiers,
forceClearConflictingSite,
+ slotAssignments,
signal,
onSuccess,
onConflicts,
@@ -763,6 +777,7 @@ const useDeviceSets = () => {
targetRackId,
deviceSelector,
forceClearConflictingSite,
+ slotAssignments,
},
{ signal },
);
diff --git a/client/src/protoFleet/features/buildings/components/BuildingSettingsModal/BuildingSettingsModal.test.tsx b/client/src/protoFleet/features/buildings/components/BuildingSettingsModal/BuildingSettingsModal.test.tsx
index 89e0acaf07..74cef28ac7 100644
--- a/client/src/protoFleet/features/buildings/components/BuildingSettingsModal/BuildingSettingsModal.test.tsx
+++ b/client/src/protoFleet/features/buildings/components/BuildingSettingsModal/BuildingSettingsModal.test.tsx
@@ -215,6 +215,42 @@ describe("BuildingSettingsModal — edit mode", () => {
);
});
+ it("disables Save until a field actually changes", () => {
+ const initial: BuildingFormValues = {
+ ...emptyBuildingFormValues(),
+ name: "Existing",
+ powerCapacityMw: 5,
+ aisles: 3,
+ racksPerAisle: 4,
+ };
+ render(
+ ,
+ );
+
+ const save = screen.getByTestId("building-settings-modal-save");
+ // Save fires UpdateBuilding; with no edit there's nothing to write.
+ expect(save).toBeDisabled();
+
+ // Re-typing the same value in a different format is not a change — the
+ // gate compares the parsed form, not the raw text.
+ fireEvent.change(screen.getByTestId("building-settings-power-input"), { target: { value: "5.0" } });
+ expect(save).toBeDisabled();
+
+ fireEvent.change(screen.getByTestId("building-settings-aisles-input"), { target: { value: "6" } });
+ expect(save).not.toBeDisabled();
+
+ // Back to the original → clean again, not latched dirty.
+ fireEvent.change(screen.getByTestId("building-settings-aisles-input"), { target: { value: "3" } });
+ expect(save).toBeDisabled();
+ });
+
it("Delete button fires onDeleteRequested", () => {
const onDeleteRequested = vi.fn();
render(
diff --git a/client/src/protoFleet/features/buildings/components/BuildingSettingsModal/BuildingSettingsModal.tsx b/client/src/protoFleet/features/buildings/components/BuildingSettingsModal/BuildingSettingsModal.tsx
index 5d2ca3d7d8..e48f1f2414 100644
--- a/client/src/protoFleet/features/buildings/components/BuildingSettingsModal/BuildingSettingsModal.tsx
+++ b/client/src/protoFleet/features/buildings/components/BuildingSettingsModal/BuildingSettingsModal.tsx
@@ -210,7 +210,23 @@ const BuildingSettingsModal = (props: BuildingSettingsModalProps) => {
// can't pick another site and needs the page to be reloaded.
const siteStale = isCreate && siteIdText !== "" && !siteInOptions;
const siteError = siteStale ? "Selected site is no longer available. Refresh and try again." : undefined;
- const primaryDisabled = !nameValid || !siteValid || saving;
+
+ // Edit-mode dirty gate. Compared against the same normalized shape
+ // buildValues produces, so trailing whitespace or a capacity retyped as
+ // "12.50" doesn't read as an edit. buildValues sets the *Error states as a
+ // side effect, so this parses independently rather than calling it.
+ const isDirty = useMemo(
+ () =>
+ name.trim() !== initialValues.name ||
+ parseNonNegative(powerText) !== initialValues.powerCapacityMw ||
+ parseNonNegative(overheadText) !== initialValues.overheadKw ||
+ parseNonNegativeInt(aislesText) !== initialValues.aisles ||
+ parseNonNegativeInt(racksPerAisleText) !== initialValues.racksPerAisle,
+ [name, powerText, overheadText, aislesText, racksPerAisleText, initialValues],
+ );
+
+ // Create has no baseline to diff against, so it gates on validation only.
+ const primaryDisabled = !nameValid || !siteValid || saving || (props.mode === "edit" && !isDirty);
const buttons =
props.mode === "create"
@@ -223,7 +239,9 @@ const BuildingSettingsModal = (props: BuildingSettingsModalProps) => {
testId: "building-settings-modal-cancel",
},
{
- text: saving ? "Saving…" : "Save",
+ // Named for the write it performs (CreateBuilding) rather than a
+ // generic "Save" — the building exists once this lands.
+ text: saving ? "Creating…" : "Create building",
variant: variants.primary,
onClick: handlePrimary,
disabled: primaryDisabled,
diff --git a/client/src/protoFleet/features/buildings/components/ManageBuildingModal/ManageBuildingModal.test.tsx b/client/src/protoFleet/features/buildings/components/ManageBuildingModal/ManageBuildingModal.test.tsx
index 65558f266a..f58c980c70 100644
--- a/client/src/protoFleet/features/buildings/components/ManageBuildingModal/ManageBuildingModal.test.tsx
+++ b/client/src/protoFleet/features/buildings/components/ManageBuildingModal/ManageBuildingModal.test.tsx
@@ -7,10 +7,10 @@ import ManageBuildingModal from "./ManageBuildingModal";
import { BuildingSchema } from "@/protoFleet/api/generated/buildings/v1/buildings_pb";
import { DeviceSetSchema, RackInfoSchema } from "@/protoFleet/api/generated/device_set/v1/device_set_pb";
-// Reparent racks STAGE on confirm (parity with the miner-side promptReparent →
-// setRackMiners): accepting the reparent warning folds the rack into the working
-// set but writes nothing until the outer Save, which persists it via a
-// member-only AssignRacksToBuilding. These tests drive that flow end to end.
+// The rack picker owns building membership, so accepting the reparent warning
+// commits the move immediately via a member-only AssignRacksToBuilding.
+// Placement is the only thing that stays staged for the outer Save. These tests
+// drive that flow end to end.
const mockApi = vi.hoisted(() => ({
listBuildingsBySite: vi.fn(),
listBuildings: vi.fn(),
@@ -65,7 +65,7 @@ const openPickerAndPickBeta = async () => {
await screen.findByText("Move this rack?");
};
-describe("ManageBuildingModal reparent commit-on-Continue", () => {
+describe("ManageBuildingModal reparent commit-on-confirm", () => {
beforeEach(() => {
mockApi.listBuildingsBySite.mockReset();
mockApi.listBuildings.mockReset();
@@ -82,24 +82,26 @@ describe("ManageBuildingModal reparent commit-on-Continue", () => {
);
});
- it("stages the reparent on Move without any RPC until Save", async () => {
+ it("commits the reparent on Move via a member-only assign", async () => {
renderModal();
await openPickerAndPickBeta();
- // Neither picking nor confirming the warning writes anything.
+ // Picking alone writes nothing — the warning has to be accepted first.
expect(mockApi.assignRacksToBuilding).not.toHaveBeenCalled();
await userEvent.click(screen.getByRole("button", { name: "Move" }));
- expect(mockApi.assignRacksToBuilding).not.toHaveBeenCalled();
- // The staged rack persists on the outer Save via a member-only assign into
- // this building (targetBuildingId → the rack moves out of its old building).
- await userEvent.click(screen.getByTestId("manage-building-save"));
+ // Accepting commits membership: a member-only assign into this building
+ // (targetBuildingId → the rack moves out of its old building). No cell is
+ // chosen yet; placement is the operator's next step, on the outer Save.
await waitFor(() => expect(mockApi.assignRacksToBuilding).toHaveBeenCalled());
const movedThisBuilding = mockApi.assignRacksToBuilding.mock.calls
.map((c) => c[0])
.find((arg) => arg.targetBuildingId === 20n && arg.racks.some((r: { rackId: bigint }) => r.rackId === 2n));
expect(movedThisBuilding).toBeTruthy();
- expect(movedThisBuilding.racks).toContainEqual({ rackId: 2n }); // member-only; no cell chosen
+ expect(movedThisBuilding.racks).toContainEqual({ rackId: 2n });
+
+ // Membership is committed, so the placement Save has nothing left to write.
+ await waitFor(() => expect(screen.getByTestId("manage-building-save")).toBeDisabled());
});
it("leaves the working set untouched and writes nothing when the warning is cancelled", async () => {
@@ -114,16 +116,18 @@ describe("ManageBuildingModal reparent commit-on-Continue", () => {
expect(screen.getByTestId("manage-racks-modal-confirm")).toBeInTheDocument();
});
- it("does not refresh the host on dismiss after staging a reparent (nothing committed until Save)", async () => {
- // Staging writes nothing server-side, so a plain dismiss must not fire the
- // host refresh — there is no server change to reconcile.
+ it("refreshes the host as soon as the reparent commits, not on dismiss", async () => {
+ // The membership write changes the host's rack counts, so onSaved fires
+ // with the commit rather than waiting for a Save that may never come.
const onSaved = vi.fn();
renderModal(onSaved);
await openPickerAndPickBeta();
await userEvent.click(screen.getByRole("button", { name: "Move" }));
+ await waitFor(() => expect(onSaved).toHaveBeenCalled());
+ onSaved.mockClear();
await userEvent.click(screen.getByLabelText("Close dialog"));
- expect(mockApi.assignRacksToBuilding).not.toHaveBeenCalled();
+ // Nothing left staged, so the dismiss itself has nothing to reconcile.
expect(onSaved).not.toHaveBeenCalled();
});
@@ -136,3 +140,62 @@ describe("ManageBuildingModal reparent commit-on-Continue", () => {
expect(onSaved).not.toHaveBeenCalled();
});
});
+
+describe("ManageBuildingModal Save dirty gate", () => {
+ beforeEach(() => {
+ mockApi.listBuildingsBySite.mockReset();
+ mockApi.listBuildings.mockReset();
+ mockApi.listBuildingRacks.mockReset();
+ mockApi.assignRacksToBuilding.mockReset();
+ mockListRacks.mockReset();
+ // Alpha loads already placed at aisle 0, position 0 — so the working set
+ // starts clean against the snapshot.
+ mockApi.listBuildingRacks.mockImplementation(({ onSuccess }) =>
+ onSuccess?.([{ rackId: 1n, rackLabel: "Alpha", aisleIndex: 0, positionInAisle: 0 }]),
+ );
+ mockApi.listBuildingsBySite.mockImplementation(({ onSuccess }) => onSuccess?.([]));
+ mockApi.listBuildings.mockImplementation(({ onSuccess }) => onSuccess?.([]));
+ mockApi.assignRacksToBuilding.mockImplementation(({ onSuccess }) => onSuccess?.(0n));
+ mockListRacks.mockImplementation(({ onSuccess }) => onSuccess?.([createRack(1n, "Alpha", 20n, 7n)]));
+ });
+
+ it("row-level Remove rack unassigns immediately", async () => {
+ renderModal();
+ await screen.findByTestId("manage-building-assigned-rack-1");
+
+ await userEvent.click(screen.getByTestId("manage-building-remove-rack-1"));
+
+ // Unassign = a member-only assign with no target building.
+ await waitFor(() => expect(mockApi.assignRacksToBuilding).toHaveBeenCalled());
+ const call = mockApi.assignRacksToBuilding.mock.calls[0][0];
+ expect(call.targetBuildingId).toBeUndefined();
+ expect(call.racks).toEqual([{ rackId: 1n }]);
+ // The row drops once the write lands, and Save has nothing left to do.
+ await waitFor(() => expect(screen.queryByTestId("manage-building-assigned-rack-1")).not.toBeInTheDocument());
+ expect(screen.getByTestId("manage-building-save")).toBeDisabled();
+ });
+
+ it("keeps the row when the unassign fails", async () => {
+ mockApi.assignRacksToBuilding.mockImplementation(({ onError }) => onError?.("network down"));
+ renderModal();
+ await screen.findByTestId("manage-building-assigned-rack-1");
+
+ await userEvent.click(screen.getByTestId("manage-building-remove-rack-1"));
+
+ await waitFor(() => expect(screen.getByText(/Failed to update racks/)).toBeInTheDocument());
+ expect(screen.getByTestId("manage-building-assigned-rack-1")).toBeInTheDocument();
+ });
+
+ it("disables Save until a placement actually changes", async () => {
+ renderModal();
+ // Loaded and clean — nothing to commit, so Save must not offer a no-op
+ // write (which previously toasted a save that dispatched no RPCs).
+ await waitFor(() => expect(screen.getByTestId("manage-building-save")).toBeDisabled());
+
+ // Move Alpha to a different cell: select the row, then click a free cell.
+ await userEvent.click(screen.getByTestId("manage-building-assigned-rack-1"));
+ await userEvent.click(screen.getByTestId("manage-building-grid-cell-1-1"));
+
+ await waitFor(() => expect(screen.getByTestId("manage-building-save")).not.toBeDisabled());
+ });
+});
diff --git a/client/src/protoFleet/features/buildings/components/ManageBuildingModal/ManageBuildingModal.tsx b/client/src/protoFleet/features/buildings/components/ManageBuildingModal/ManageBuildingModal.tsx
index c4a61d0111..6ee96c36eb 100644
--- a/client/src/protoFleet/features/buildings/components/ManageBuildingModal/ManageBuildingModal.tsx
+++ b/client/src/protoFleet/features/buildings/components/ManageBuildingModal/ManageBuildingModal.tsx
@@ -3,7 +3,13 @@ import { useCallback, useEffect, useMemo, useRef, useState } from "react";
import ManageRacksModal from "../ManageRacksModal";
import { type RackSelectionDelta } from "../ManageRacksModal/rackSelectionDelta";
import SearchRacksModal from "../SearchRacksModal";
-import { type AssignmentEntry, buildByNameAssignments, buildManualAssignments } from "./assignmentMath";
+import {
+ type AssignmentEntry,
+ buildByNameAssignments,
+ buildManualAssignments,
+ buildPlacementDelta,
+ isPlacementDeltaEmpty,
+} from "./assignmentMath";
import BuildingGridPane from "./BuildingGridPane";
import { assignedRackScope, buildingRackScope } from "./buildingRackScope";
import BuildingRacksPane, { type AssignedRackRow } from "./BuildingRacksPane";
@@ -124,7 +130,9 @@ const ManageBuildingModal = ({
// Snapshot of the server's positions at load time so Save only fires
// assignRacksToBuilding for racks whose position actually changed. Keyed
// by rackId → "aisle:position" (or "unplaced") so we can string-compare.
- const initialPlacementRef = useRef>(new Map());
+ // State rather than a ref because the Save CTA's dirty gate is derived
+ // from it — a ref wouldn't re-derive when the load resolves.
+ const [initialPlacement, setInitialPlacement] = useState>(new Map());
// Synchronous in-flight guard for Save dispatches. setState batching
// means the `isSaving` prop driving the button's `disabled` lags one
@@ -163,7 +171,7 @@ const ManageBuildingModal = ({
: "unplaced",
);
}
- initialPlacementRef.current = snapshot;
+ setInitialPlacement(snapshot);
setIsLoading(false);
},
onError: (msg) => {
@@ -212,6 +220,16 @@ const ManageBuildingModal = ({
return m;
}, [activeAssignments]);
+ // The exact batches Save would dispatch. Derived here (not inside
+ // handleSave) so the Save CTA's dirty gate and the dispatch read the same
+ // diff — a gate computed separately could drift and either block a real
+ // change or let a no-op write through.
+ const placementDelta = useMemo(
+ () => buildPlacementDelta(entries, rackToCell, initialPlacement),
+ [entries, rackToCell, initialPlacement],
+ );
+ const isDirty = !isPlacementDeltaEmpty(placementDelta);
+
// Assigned-racks list shown in the left pane. positionLabel is derived
// from the activeAssignments so byName mode shows the auto-placement.
const assignedRacks: AssignedRackRow[] = useMemo(
@@ -318,16 +336,14 @@ const ManageBuildingModal = ({
setShowSearchRacks(true);
}, []);
- // Gate a reparent behind the warning dialog, then STAGE it on confirm — the
- // rack joins the working set but nothing is written until the outer Save.
- // Parity with the miner side (promptReparent → setRackMiners): a reparent is
- // staged, and the actual move rides handleSave's member-only
- // AssignRacksToBuilding (targetBuildingId → the rack moves out of its old
- // building, cascading its miners) exactly like any newly-added rack. A staged
- // rack is seeded into the picker, so buildRackPickerItem shows it as
- // "in this building" on reopen — never a reassignment row that a later
- // toggle-off / Select all / deselect could silently drop. Cancelling leaves
- // the working set untouched and the picker open.
+ // Gate a reparent behind the warning dialog; confirming runs the caller's
+ // membership commit, which moves the rack into this building via a
+ // member-only AssignRacksToBuilding (targetBuildingId → the rack leaves its
+ // old building, cascading its miners) exactly like any newly-added rack.
+ // Once committed the rack is seeded into the picker, so buildRackPickerItem
+ // shows it as "in this building" on reopen — never a reassignment row that a
+ // later toggle-off / Select all / deselect could silently drop. Cancelling
+ // writes nothing and leaves the picker open.
const promptReparent = useCallback((racks: ReparentedRack[], apply: () => void) => {
setReparentConfirm({
racks,
@@ -338,10 +354,101 @@ const ManageBuildingModal = ({
});
}, []);
- // SearchRacksModal confirm — add the rack to the working set if missing
- // and assign to the cell that was selected when the popover opened. When the
- // rack is currently placed elsewhere, commit the move behind the reparent
- // confirm (its miners move with it) before staging the cell.
+ // Chunked AssignRacksToBuilding dispatcher shared by the membership commits
+ // and the placement Save. Buildings can be 100×100 = 10,000 cells and this
+ // modal loads every page, so a large batch would otherwise blow past the
+ // proto's 1000-rack request cap. Chunks run sequentially so a mid-chain
+ // failure stops the chain; onChunkCommitted lets the caller tell "nothing
+ // landed" from "partial commit".
+ const dispatchAssign = useCallback(
+ async (racks: RackPlacementInput[], targetBuildingId?: bigint, onChunkCommitted?: () => void) => {
+ if (racks.length === 0) return;
+ for (let i = 0; i < racks.length; i += RACKS_PER_RPC) {
+ const chunk = racks.slice(i, i + RACKS_PER_RPC);
+ await new Promise((resolve, reject) => {
+ void assignRacksToBuilding({
+ racks: chunk,
+ targetBuildingId,
+ onSuccess: () => resolve(),
+ onError: (msg) => reject(new Error(msg)),
+ });
+ });
+ onChunkCommitted?.();
+ }
+ },
+ [assignRacksToBuilding],
+ );
+
+ // Membership commit. The rack pickers own building membership, so a confirmed
+ // selection is written straight away and only placement stays staged for
+ // Save. Newcomers go in as member-only assigns (no cell) and land in the
+ // load-time snapshot as "unplaced", so freshly-committed membership doesn't
+ // read as pending placement dirt on the Save gate.
+ //
+ // The caller owns the working-set update — each entry point merges rows
+ // differently — and should skip it when this returns false.
+ const commitMembership = useCallback(
+ async (added: AssignmentEntry[], removed: bigint[]): Promise => {
+ if (savingRef.current) return false;
+ const currentIds = new Set(entries.map((e) => e.rackId.toString()));
+ const newcomers = added.filter((a) => !currentIds.has(a.rackId.toString()));
+ // Nothing to write. The caller may still have a placement change to
+ // stage (e.g. re-placing a rack that's already a member).
+ if (newcomers.length === 0 && removed.length === 0) return true;
+
+ // Capacity guard — mirrors handleSave's and the server's
+ // AssignRacksToBuilding cap. Skipped when the grid is unconfigured
+ // (capacity 0): racks can join before a layout is set.
+ const capacity = aislesNum * racksPerAisleNum;
+ const nextCount = entries.length + newcomers.length - removed.length;
+ if (capacity > 0 && nextCount > capacity) {
+ setErrorMsg(
+ `This building has ${capacity} rack positions (${aislesNum} aisles × ${racksPerAisleNum} per aisle), ` +
+ `but the change would assign ${nextCount} racks. Remove some racks or increase the layout.`,
+ );
+ return false;
+ }
+
+ savingRef.current = true;
+ setErrorMsg("");
+ setIsSaving(true);
+ try {
+ // Removals first: they free their cells before any newcomer lands.
+ await dispatchAssign(
+ removed.map((rackId) => ({ rackId })),
+ undefined,
+ );
+ await dispatchAssign(
+ newcomers.map((a) => ({ rackId: a.rackId })),
+ building.id,
+ );
+ } catch (err) {
+ const detail = err instanceof Error ? err.message : "Failed to update racks";
+ setErrorMsg(`Failed to update racks: ${detail}.`);
+ return false;
+ } finally {
+ savingRef.current = false;
+ setIsSaving(false);
+ }
+
+ const removedSet = new Set(removed.map((id) => id.toString()));
+ setInitialPlacement((prev) => {
+ const next = new Map(prev);
+ for (const id of removedSet) next.delete(id);
+ for (const a of newcomers) next.set(a.rackId.toString(), "unplaced");
+ return next;
+ });
+ // Rack counts changed on the host's building cache.
+ onSaved?.(building);
+ return true;
+ },
+ [entries, aislesNum, racksPerAisleNum, dispatchAssign, building, onSaved],
+ );
+
+ // SearchRacksModal confirm — commit the rack into this building if it isn't
+ // a member yet, then stage it at the cell that was selected when the popover
+ // opened. A rack currently placed elsewhere goes behind the reparent confirm
+ // (its miners move with it) before either happens.
const handleSearchRackConfirm = useCallback(
(rackId: bigint, label: string, reparent?: ReparentedRack) => {
const targetKey = selectedCellKey;
@@ -349,7 +456,9 @@ const ManageBuildingModal = ({
setShowSearchRacks(false);
return;
}
- const apply = () => {
+ const apply = async () => {
+ const ok = await commitMembership([{ rackId, label }], []);
+ if (!ok) return;
const { aisle, position } = parseCellKey(targetKey);
setEntries((prev) => {
const idStr = rackId.toString();
@@ -371,73 +480,72 @@ const ManageBuildingModal = ({
setShowSearchRacks(false);
};
if (reparent) {
- promptReparent([reparent], apply);
+ promptReparent([reparent], () => void apply());
} else {
- apply();
+ void apply();
}
},
- [selectedCellKey, promptReparent],
+ [selectedCellKey, promptReparent, commitMembership],
);
- const handleRemoveRack = useCallback((rackId: bigint) => {
- setEntries((prev) => prev.filter((e) => e.rackId !== rackId));
- setSelectedRackId((prev) => (prev === rackId ? null : prev));
- }, []);
+ // Row-level "Remove rack" — an immediate unassign (the rack moves out of the
+ // building; it is not deleted). The row drops only once the write lands.
+ const handleRemoveRack = useCallback(
+ async (rackId: bigint) => {
+ const ok = await commitMembership([], [rackId]);
+ if (!ok) return;
+ setEntries((prev) => prev.filter((e) => e.rackId !== rackId));
+ setSelectedRackId((prev) => (prev === rackId ? null : prev));
+ },
+ [commitMembership],
+ );
const currentRackIds = useMemo(() => entries.map((e) => e.rackId), [entries]);
- // ManageRacksModal confirm — apply the delta against the working
- // set. `added` joins entries (unplaced) without disturbing existing
- // positions; `removed` drops only those entries. Racks not in either
- // list are untouched, so a seeded rack that didn't appear in the
- // picker's listRacks response (race / paging gap) is preserved.
- // `delta.reassigned` (racks currently placed elsewhere) commits the move
- // behind the reparent confirm — their miners move with them — before the
- // working-set change lands.
+ // ManageRacksModal Save — the picker owns building membership, so the delta is
+ // written here rather than staged. `added` joins entries unplaced (placement
+ // is still the operator's to set, on this modal's Save); `removed` drops only
+ // those entries. Racks in neither list are untouched, so a seeded rack the
+ // picker's listRacks response omitted (race / paging gap) is preserved.
+ // `delta.reassigned` (racks currently in another building) goes behind the
+ // reparent confirm — their miners move with them.
const handleManageRacksConfirm = useCallback(
(delta: RackSelectionDelta) => {
- const apply = () => {
+ const apply = async () => {
const removedSet = new Set(delta.removed.map((id) => id.toString()));
- setEntries((prev) => {
- const kept = prev.filter((e) => !removedSet.has(e.rackId.toString()));
- const knownIds = new Set(kept.map((e) => e.rackId.toString()));
- const newcomers: AssignmentEntry[] = [];
- for (const a of delta.added) {
- if (knownIds.has(a.rackId.toString())) continue;
- newcomers.push({ rackId: a.rackId, label: a.label });
- }
- return [...kept, ...newcomers];
- });
+ const kept = entries.filter((e) => !removedSet.has(e.rackId.toString()));
+ const knownIds = new Set(kept.map((e) => e.rackId.toString()));
+ const newcomers: AssignmentEntry[] = [];
+ for (const a of delta.added) {
+ if (knownIds.has(a.rackId.toString())) continue;
+ newcomers.push({ rackId: a.rackId, label: a.label });
+ }
+ // Failure leaves the picker open with the selection intact to retry.
+ const ok = await commitMembership(newcomers, delta.removed);
+ if (!ok) return;
+ setEntries([...kept, ...newcomers]);
setSelectedRackId(null);
setSelectedCellKey(null);
setShowManageRacks(false);
};
if (delta.reassigned.length > 0) {
- promptReparent(delta.reassigned, apply);
+ promptReparent(delta.reassigned, () => void apply());
} else {
- apply();
+ void apply();
}
},
- [promptReparent],
+ [entries, promptReparent, commitMembership],
);
- // Save: walk activeAssignments, diff against the load-time snapshot, and
- // fire AssignRacksToBuilding once per target building bucket.
- //
- // All racks staying in this building (placements, unplacements,
- // swaps, "move into occupied cell") ship as a single mixed batch.
- // The server's AssignRacksToBuilding transaction now runs a two-pass
- // write internally — pass 1 clears every requested rack's cell, then
- // pass 2 writes the new (aisle, position) values — so the partial
- // unique index uk_device_set_rack_building_position can't collide
- // mid-batch. That removes the old client-side vacate-then-place
- // split (and its "retry to finish saving" partial-failure path).
- //
- // Racks removed from this building go in a second call with
- // targetBuildingId=undefined since they need a different building
- // bucket. Layout writes live in BuildingSettingsModal.
+ // Save owns rack placement only — membership commits in the pickers and
+ // layout lives in BuildingSettingsModal. Dispatches placementDelta's buckets
+ // as AssignRacksToBuilding calls against building.id.
const handleSave = useCallback(async () => {
if (savingRef.current) return;
+ // Defensive: the CTA is dirty-gated, so a clean save shouldn't be
+ // reachable. Bail rather than fall through to the success toast, which
+ // would report a save that dispatched nothing.
+ if (isPlacementDeltaEmpty(placementDelta)) return;
// Capacity guard — mirrors ManageRackModal's slot check and the
// server's AssignRacksToBuilding cap. A building holds at most
@@ -459,140 +567,35 @@ const ManageBuildingModal = ({
setErrorMsg("");
setIsSaving(true);
try {
- const initial = initialPlacementRef.current;
- const currentIds = new Set(entries.map((e) => e.rackId.toString()));
-
- const inBuilding: RackPlacementInput[] = [];
- const unassign: RackPlacementInput[] = [];
-
- for (const entry of entries) {
- const idStr = entry.rackId.toString();
- const placedKey = rackToCell.get(idStr);
- const next = placedKey
- ? (() => {
- const { aisle, position } = parseCellKey(placedKey);
- return `${aisle}:${position}`;
- })()
- : "unplaced";
- const prior = initial.get(idStr) ?? "missing";
- if (prior === next) continue;
-
- // Single mixed batch.
- // - placedKey present → place at the new (aisle, position).
- // Covers both first-time placement and moves; the server's
- // pass-1 clear handles any prior occupant inside the batch.
- // - placedKey absent + prior previously placed → send a
- // member-only entry. The server NULLs the rack's cell in
- // pass 1 (no pass-2 write because no position is supplied).
- // - placedKey absent + prior === "missing" → rack is new to
- // the working set with no chosen cell yet. Send a member-
- // only assign so the BE links the rack to this building
- // even without a position. Without this branch, racks
- // added via Manage racks but never dragged to a cell
- // silently drop on save.
- if (placedKey) {
- const { aisle, position } = parseCellKey(placedKey);
- inBuilding.push({
- rackId: entry.rackId,
- aisleIndex: aisle,
- positionInAisle: position,
- });
- } else {
- inBuilding.push({ rackId: entry.rackId });
- }
- }
+ const { unassign, inBuildingVacate, inBuildingPlace } = placementDelta;
- // Racks removed from this building (in snapshot, not in entries)
- // need an explicit unassign — different target building bucket so
- // they can't ride the in-building batch.
- for (const idStr of initial.keys()) {
- if (currentIds.has(idStr)) continue;
- unassign.push({ rackId: BigInt(idStr) });
- }
-
- // Buildings can be 100×100 = 10,000 cells, and this modal loads
- // every page, so a large floor-plan save with >1000 changed/
- // removed racks would otherwise hit request validation. Chunk
- // each phase into RPC-sized batches (RACKS_PER_RPC), dispatched
- // sequentially so a mid-chain failure stops the chain (handled by
- // the catch blocks below). Vacate-before-place is enforced across
- // chunks by the two-pass dispatch below — the server only orders
- // clear-then-place within a single RPC, so unassigns and cell-
- // clears must all complete before any place runs.
// Tracks whether any chunk has committed so the catch below can
- // distinguish "nothing landed" from "partial commit" — operator
+ // distinguish "nothing landed" from "partial commit" — the operator
// needs to know to refresh before retrying when chunks N..M ran
// before chunk N+1 failed.
let savedAtLeastOne = false;
- const dispatch = async (racks: RackPlacementInput[], targetBuildingId?: bigint) => {
- if (racks.length === 0) return;
- for (let i = 0; i < racks.length; i += RACKS_PER_RPC) {
- const chunk = racks.slice(i, i + RACKS_PER_RPC);
- await new Promise((resolve, reject) => {
- void assignRacksToBuilding({
- racks: chunk,
- targetBuildingId,
- onSuccess: () => resolve(),
- onError: (msg) => reject(new Error(msg)),
- });
- });
- savedAtLeastOne = true;
- }
+ const onChunk = () => {
+ savedAtLeastOne = true;
};
- // Two-pass shape across chunks: vacate ALL cells before placing
- // ANY rack at a new cell. The server's clear-then-place ordering
- // only applies within a single AssignRacksToBuilding tx, so a
- // >1000-rack save where chunk 2 still owns the cell chunk 1 is
- // trying to claim would trip uk_device_set_rack_building_position.
- //
- // Partition the in-building bucket so the vacate pass also clears
- // the OLD cell of every mover — a rack with both a snapshot
- // position and a new place entry. Otherwise a cross-chunk swap
- // (rack A's new cell is rack B's old cell, A lands in chunk 1, B
- // in chunk 2) would still trip the partial unique index because
- // B's old cell wouldn't vacate until chunk 2 runs.
- // - vacate entries (no aisle/position) — racks staying in the
- // building but clearing their cell. Includes:
- // * explicit cell-clear entries built above,
- // * a synthetic pre-place vacate for every mover, dedup'd by
- // rackId so we never send two clears for the same rack.
- // - place entries (with aisle/position) — racks landing at a
- // specific cell. These can only run after every vacate above
- // (plus the unassign bucket) has committed.
- const inBuildingVacate: RackPlacementInput[] = [];
- const inBuildingPlace: RackPlacementInput[] = [];
- const seenVacate = new Set();
- for (const entry of inBuilding) {
- const idStr = entry.rackId.toString();
- const prior = initial.get(idStr) ?? "missing";
- const wasPlaced = prior !== "unplaced" && prior !== "missing";
-
- if (entry.aisleIndex !== undefined && entry.positionInAisle !== undefined) {
- // Mover (had a prior cell) → schedule a pre-place vacate so
- // its old cell is free before any placement chunk runs.
- if (wasPlaced && !seenVacate.has(idStr)) {
- inBuildingVacate.push({ rackId: entry.rackId });
- seenVacate.add(idStr);
- }
- inBuildingPlace.push(entry);
- } else if (!seenVacate.has(idStr)) {
- // Already a cell-clear-in-place entry.
- inBuildingVacate.push({ rackId: entry.rackId });
- seenVacate.add(idStr);
- }
- }
-
try {
- // Pass 1: all vacates (unassign bucket + in-building cell-
- // clears). dispatch short-circuits when the list is empty.
- await dispatch(unassign, undefined);
- await dispatch(inBuildingVacate, building.id);
+ // Two-pass shape across chunks: vacate ALL cells (buildPlacementDelta
+ // already folded each mover's old cell into inBuildingVacate) before
+ // placing ANY rack at a new cell. The server's clear-then-place
+ // ordering only applies within a single AssignRacksToBuilding tx, so
+ // a >1000-rack save where chunk 2 still owns the cell chunk 1 is
+ // trying to claim would trip uk_device_set_rack_building_position.
+ //
+ // Pass 1: all vacates. The unassign bucket is normally empty now that
+ // removals commit in the pickers — it stays wired as a reconcile path
+ // for any entry that leaves the list without a write.
+ await dispatchAssign(unassign, undefined, onChunk);
+ await dispatchAssign(inBuildingVacate, building.id, onChunk);
// Pass 2: all places. By now every cell that will be reused
// has been vacated, so no two writes collide on the partial
// unique index — even across >1000-rack chunked saves.
- await dispatch(inBuildingPlace, building.id);
+ await dispatchAssign(inBuildingPlace, building.id, onChunk);
} catch (err) {
const detail = err instanceof Error ? err.message : "Failed to save rack positions";
if (savedAtLeastOne) {
@@ -605,14 +608,14 @@ const ManageBuildingModal = ({
return;
}
- pushToast({ message: `Building "${building.name}" saved`, status: STATUSES.success });
+ pushToast({ message: `Rack positions saved`, status: STATUSES.success });
onSaved?.(building);
onDismiss();
} finally {
savingRef.current = false;
setIsSaving(false);
}
- }, [building, rackToCell, entries, aislesNum, racksPerAisleNum, assignRacksToBuilding, onSaved, onDismiss]);
+ }, [building, placementDelta, entries, aislesNum, racksPerAisleNum, dispatchAssign, onSaved, onDismiss]);
if (!open) return null;
@@ -627,9 +630,9 @@ const ManageBuildingModal = ({
setShowManageRacks(false)}
onConfirm={handleManageRacksConfirm}
+ saving={isSaving}
/>
) : null}
@@ -763,8 +771,8 @@ const ManageBuildingModal = ({
setReparentConfirm(null)}
onConfirm={reparentConfirm.onConfirm}
/>
diff --git a/client/src/protoFleet/features/buildings/components/ManageBuildingModal/assignmentMath.test.ts b/client/src/protoFleet/features/buildings/components/ManageBuildingModal/assignmentMath.test.ts
index 79b20d3925..92cd9451ed 100644
--- a/client/src/protoFleet/features/buildings/components/ManageBuildingModal/assignmentMath.test.ts
+++ b/client/src/protoFleet/features/buildings/components/ManageBuildingModal/assignmentMath.test.ts
@@ -1,7 +1,13 @@
import { describe, expect, it } from "vitest";
-import { type AssignmentEntry, buildByNameAssignments, buildManualAssignments } from "./assignmentMath";
-import { cellKey } from "./types";
+import {
+ type AssignmentEntry,
+ buildByNameAssignments,
+ buildManualAssignments,
+ buildPlacementDelta,
+ isPlacementDeltaEmpty,
+} from "./assignmentMath";
+import { cellKey, type GridCellKey } from "./types";
const entry = (id: bigint, label: string, aisle?: number, position?: number): AssignmentEntry => ({
rackId: id,
@@ -84,3 +90,83 @@ describe("buildManualAssignments", () => {
expect(buildManualAssignments([entry(1n, "A", 0, 0)], 3, 0)).toEqual({});
});
});
+
+describe("buildPlacementDelta", () => {
+ const cells = (pairs: [bigint, number, number][]): Map =>
+ new Map(pairs.map(([id, aisle, position]) => [id.toString(), cellKey(aisle, position)]));
+
+ it("is empty when the working set matches the snapshot", () => {
+ const delta = buildPlacementDelta(
+ [entry(1n, "A", 0, 0), entry(2n, "B")],
+ cells([[1n, 0, 0]]),
+ new Map([
+ ["1", "0:0"],
+ ["2", "unplaced"],
+ ]),
+ );
+ expect(delta).toEqual({ unassign: [], inBuildingVacate: [], inBuildingPlace: [] });
+ expect(isPlacementDeltaEmpty(delta)).toBe(true);
+ });
+
+ it("sends a member-only assign for a rack added but never placed", () => {
+ // Racks added via Manage racks and never dragged to a cell must still
+ // link to the building, or they silently drop on save.
+ const delta = buildPlacementDelta([entry(9n, "New")], cells([]), new Map());
+ expect(delta.inBuildingVacate).toEqual([{ rackId: 9n }]);
+ expect(delta.inBuildingPlace).toEqual([]);
+ expect(isPlacementDeltaEmpty(delta)).toBe(false);
+ });
+
+ it("splits a mover into a pre-place vacate plus a place", () => {
+ const delta = buildPlacementDelta([entry(1n, "A", 1, 2)], cells([[1n, 1, 2]]), new Map([["1", "0:0"]]));
+ expect(delta.inBuildingVacate).toEqual([{ rackId: 1n }]);
+ expect(delta.inBuildingPlace).toEqual([{ rackId: 1n, aisleIndex: 1, positionInAisle: 2 }]);
+ });
+
+ it("emits no pre-place vacate for a first-time placement", () => {
+ const delta = buildPlacementDelta([entry(1n, "A", 0, 1)], cells([[1n, 0, 1]]), new Map([["1", "unplaced"]]));
+ expect(delta.inBuildingVacate).toEqual([]);
+ expect(delta.inBuildingPlace).toEqual([{ rackId: 1n, aisleIndex: 0, positionInAisle: 1 }]);
+ });
+
+ it("vacates in place when a placed rack loses its cell", () => {
+ const delta = buildPlacementDelta([entry(1n, "A")], cells([]), new Map([["1", "0:0"]]));
+ expect(delta.inBuildingVacate).toEqual([{ rackId: 1n }]);
+ expect(delta.inBuildingPlace).toEqual([]);
+ });
+
+ it("unassigns racks dropped from the working set", () => {
+ const delta = buildPlacementDelta(
+ [entry(1n, "A", 0, 0)],
+ cells([[1n, 0, 0]]),
+ new Map([
+ ["1", "0:0"],
+ ["2", "0:1"],
+ ]),
+ );
+ expect(delta.unassign).toEqual([{ rackId: 2n }]);
+ expect(delta.inBuildingVacate).toEqual([]);
+ expect(delta.inBuildingPlace).toEqual([]);
+ });
+
+ it("orders a swap so both old cells vacate before either place", () => {
+ // A and B trade cells — the partial unique index would collide if a
+ // place ran before the counterpart's old cell was cleared.
+ const delta = buildPlacementDelta(
+ [entry(1n, "A", 0, 1), entry(2n, "B", 0, 0)],
+ cells([
+ [1n, 0, 1],
+ [2n, 0, 0],
+ ]),
+ new Map([
+ ["1", "0:0"],
+ ["2", "0:1"],
+ ]),
+ );
+ expect(delta.inBuildingVacate).toEqual([{ rackId: 1n }, { rackId: 2n }]);
+ expect(delta.inBuildingPlace).toEqual([
+ { rackId: 1n, aisleIndex: 0, positionInAisle: 1 },
+ { rackId: 2n, aisleIndex: 0, positionInAisle: 0 },
+ ]);
+ });
+});
diff --git a/client/src/protoFleet/features/buildings/components/ManageBuildingModal/assignmentMath.ts b/client/src/protoFleet/features/buildings/components/ManageBuildingModal/assignmentMath.ts
index da603fff0d..e760fec148 100644
--- a/client/src/protoFleet/features/buildings/components/ManageBuildingModal/assignmentMath.ts
+++ b/client/src/protoFleet/features/buildings/components/ManageBuildingModal/assignmentMath.ts
@@ -2,7 +2,8 @@
// the bounds-drop and alphabetical-fill logic can be unit-tested
// without standing up the full modal.
-import { cellKey, type GridCellKey } from "./types";
+import { cellKey, type GridCellKey, parseCellKey } from "./types";
+import { type RackPlacementInput } from "@/protoFleet/api/buildings";
export interface AssignmentEntry {
rackId: bigint;
@@ -54,3 +55,80 @@ export const buildManualAssignments = (
}
return out;
};
+
+// The AssignRacksToBuilding batches a Save would dispatch, diffed from the
+// load-time snapshot. Empty across all three buckets means the working set
+// matches the server — the Save CTA is gated on that so a clean modal can't
+// fire a no-op write (or toast a save that never happened).
+export interface PlacementDelta {
+ // Racks that left this building — dispatched with targetBuildingId
+ // undefined, so they can't ride the in-building batch.
+ unassign: RackPlacementInput[];
+ // Racks staying in the building whose cell must be cleared. Includes both
+ // explicit unplacements and a synthetic pre-place vacate for every mover,
+ // so pass 1 frees every cell pass 2 will claim.
+ inBuildingVacate: RackPlacementInput[];
+ // Racks landing at a specific (aisle, position). Must run after every
+ // vacate above, or a cross-chunk swap trips
+ // uk_device_set_rack_building_position.
+ inBuildingPlace: RackPlacementInput[];
+}
+
+export const isPlacementDeltaEmpty = (delta: PlacementDelta): boolean =>
+ delta.unassign.length === 0 && delta.inBuildingVacate.length === 0 && delta.inBuildingPlace.length === 0;
+
+// Diff the working set against the load-time snapshot (rackId →
+// "aisle:position" | "unplaced") and bucket the result into the two-pass
+// dispatch shape handleSave sends.
+export const buildPlacementDelta = (
+ entries: AssignmentEntry[],
+ rackToCell: Map,
+ initial: Map,
+): PlacementDelta => {
+ const unassign: RackPlacementInput[] = [];
+ const inBuildingVacate: RackPlacementInput[] = [];
+ const inBuildingPlace: RackPlacementInput[] = [];
+ const seenVacate = new Set();
+
+ for (const entry of entries) {
+ const idStr = entry.rackId.toString();
+ const placedKey = rackToCell.get(idStr);
+ const next = placedKey
+ ? (() => {
+ const { aisle, position } = parseCellKey(placedKey);
+ return `${aisle}:${position}`;
+ })()
+ : "unplaced";
+ const prior = initial.get(idStr) ?? "missing";
+ if (prior === next) continue;
+
+ if (placedKey) {
+ // Placement or move. A mover's old cell needs a pre-place vacate so
+ // it's free before any placement chunk runs.
+ const wasPlaced = prior !== "unplaced" && prior !== "missing";
+ if (wasPlaced && !seenVacate.has(idStr)) {
+ inBuildingVacate.push({ rackId: entry.rackId });
+ seenVacate.add(idStr);
+ }
+ const { aisle, position } = parseCellKey(placedKey);
+ inBuildingPlace.push({ rackId: entry.rackId, aisleIndex: aisle, positionInAisle: position });
+ } else if (!seenVacate.has(idStr)) {
+ // No cell chosen. Either a cell-clear (prior was placed) or a rack
+ // newly added to the working set that was never dragged to a cell —
+ // both ship as a member-only assign so the BE links/keeps the rack in
+ // this building. Without the latter, racks added via Manage racks but
+ // never placed would silently drop on save.
+ inBuildingVacate.push({ rackId: entry.rackId });
+ seenVacate.add(idStr);
+ }
+ }
+
+ // Racks in the snapshot but no longer in the working set.
+ const currentIds = new Set(entries.map((e) => e.rackId.toString()));
+ for (const idStr of initial.keys()) {
+ if (currentIds.has(idStr)) continue;
+ unassign.push({ rackId: BigInt(idStr) });
+ }
+
+ return { unassign, inBuildingVacate, inBuildingPlace };
+};
diff --git a/client/src/protoFleet/features/buildings/components/ManageRacksModal/ManageRacksModal.test.tsx b/client/src/protoFleet/features/buildings/components/ManageRacksModal/ManageRacksModal.test.tsx
index 527f7c7811..ba844b4793 100644
--- a/client/src/protoFleet/features/buildings/components/ManageRacksModal/ManageRacksModal.test.tsx
+++ b/client/src/protoFleet/features/buildings/components/ManageRacksModal/ManageRacksModal.test.tsx
@@ -233,12 +233,14 @@ describe("ManageRacksModal show-assigned toggle (server-side)", () => {
await waitFor(() => expect(screen.getByText("Beta")).toBeInTheDocument());
await userEvent.click(rowCheckbox(1)); // reparent pick (Beta)
+ await waitFor(() => expect(screen.getByTestId("manage-racks-modal-confirm")).toBeEnabled());
await userEvent.click(screen.getByLabelText("Show assigned racks")); // toggle off
- await userEvent.click(screen.getByTestId("manage-racks-modal-confirm"));
- const delta = onConfirm.mock.calls[0][0];
- expect(delta.reassigned).toEqual([]);
- expect(delta.added.map((a: { rackId: bigint }) => a.rackId)).not.toContain(2n);
+ // Dropping Beta empties the delta, so Save closes back up — there's nothing
+ // left to write. Clicking it is a no-op.
+ await waitFor(() => expect(screen.getByTestId("manage-racks-modal-confirm")).toBeDisabled());
+ await userEvent.click(screen.getByTestId("manage-racks-modal-confirm"));
+ expect(onConfirm).not.toHaveBeenCalled();
});
it("allows an explicit single per-row reparent pick through the delta", async () => {
@@ -281,14 +283,30 @@ describe("ManageRacksModal show-assigned toggle (server-side)", () => {
it("never reports a seeded rack absent from the fetch as removed", async () => {
// A seeded rack (id 3) that the eligibility-pinned fetch doesn't return
// (paging gap / soft-delete window) must be left alone, not unassigned.
+ // Gamma (no building) gives the save something real to write, so the delta
+ // is reachable through the dirty gate.
+ setupListRacks([createRack(1n, "Alpha", 7n, 42n), createRack(4n, "Gamma", 0n)]);
const onConfirm = vi.fn();
renderModal({ initialSelectedRackIds: [1n, 3n], onConfirm });
- await waitFor(() => expect(screen.getByText("Alpha")).toBeInTheDocument());
+ await waitFor(() => expect(screen.getByText("Gamma")).toBeInTheDocument());
+
+ await userEvent.click(rowCheckbox(1)); // Gamma
await userEvent.click(screen.getByTestId("manage-racks-modal-confirm"));
const delta = onConfirm.mock.calls[0][0];
+ expect(delta.added.map((a: { rackId: bigint }) => a.rackId)).toEqual([4n]);
expect(delta.removed).toEqual([]);
- expect(delta.added).toEqual([]);
+ });
+
+ it("keeps Save disabled when nothing was touched", async () => {
+ // A loaded, untouched picker has no membership change to write.
+ const onConfirm = vi.fn();
+ renderModal({ initialSelectedRackIds: [1n], onConfirm });
+ await waitFor(() => expect(screen.getByText("Alpha")).toBeInTheDocument());
+
+ await waitFor(() => expect(screen.getByTestId("manage-racks-modal-confirm")).toBeDisabled());
+ await userEvent.click(screen.getByTestId("manage-racks-modal-confirm"));
+ expect(onConfirm).not.toHaveBeenCalled();
});
});
@@ -602,7 +620,10 @@ describe("ManageRacksModal review fixes (#789)", () => {
req.onFinally?.();
});
const onConfirm = vi.fn();
- renderModal({ onConfirm });
+ // Seeded with Alpha so Select none leaves a real change (removed: [1n]) —
+ // otherwise the dirty gate would hold Save shut and mask whether the
+ // select-all guard released it.
+ renderModal({ initialSelectedRackIds: [1n], onConfirm });
await waitFor(() => expect(screen.getByText("Alpha")).toBeInTheDocument());
await userEvent.click(screen.getByRole("button", { name: "Select all" }));
@@ -614,6 +635,7 @@ describe("ManageRacksModal review fixes (#789)", () => {
await userEvent.click(screen.getByTestId("manage-racks-modal-confirm"));
expect(onConfirm.mock.calls[0][0].added).toEqual([]);
+ expect(onConfirm.mock.calls[0][0].removed).toEqual([1n]);
});
it("disables pagination while a page is loading (no stale-token double advance)", async () => {
diff --git a/client/src/protoFleet/features/buildings/components/ManageRacksModal/ManageRacksModal.tsx b/client/src/protoFleet/features/buildings/components/ManageRacksModal/ManageRacksModal.tsx
index b71592fc8c..7b0537fdb9 100644
--- a/client/src/protoFleet/features/buildings/components/ManageRacksModal/ManageRacksModal.tsx
+++ b/client/src/protoFleet/features/buildings/components/ManageRacksModal/ManageRacksModal.tsx
@@ -40,16 +40,20 @@ interface ManageRacksModalProps {
// `showSiteFilter: !scope`.
allSites: boolean;
buildingName: string;
- // Rack IDs currently in the building's working set. The modal seeds its
- // selection with these so the operator sees the current state and can
- // add / remove in one flow.
+ // Rack IDs currently assigned to the building. The modal seeds its selection
+ // with these so the operator sees the current state and can add / remove in
+ // one flow, and diffs against them to gate Save.
initialSelectedRackIds: bigint[];
onDismiss: () => void;
- // Returns the delta against initialSelectedRackIds. `delta.reassigned` reports
- // the added racks that are being reparented so the host can gate the reparent
- // confirm before committing. Computed against the items-by-id accumulator
- // (every rack seen across pages / select-all), NOT just the current page.
+ // Save. Returns the delta against initialSelectedRackIds. `delta.reassigned`
+ // reports the added racks that are being reparented so the host can gate the
+ // reparent confirm before committing. Computed against the items-by-id
+ // accumulator (every rack seen across pages / select-all), NOT just the
+ // current page. This modal owns building membership, so the host persists the
+ // delta here rather than staging it for a later save.
onConfirm: (delta: RackSelectionDelta) => void;
+ // In-flight signal from the host's write, mirrored into the CTA.
+ saving?: boolean;
}
const PAGE_SIZE = 50;
@@ -88,6 +92,7 @@ const ManageRacksModal = ({
initialSelectedRackIds,
onDismiss,
onConfirm,
+ saving = false,
}: ManageRacksModalProps) => {
const { listRacks } = useDeviceSets();
const { listBuildingsBySite, listBuildings } = useBuildings();
@@ -562,18 +567,33 @@ const ManageRacksModal = ({
};
}, [showAssigned]);
+ // The exact membership change Save would write. Derived here so the CTA's
+ // dirty gate and the write read the same delta — note it isn't a plain
+ // set-difference (seeded ids the response omitted are excluded on purpose;
+ // see computeRackSelectionDelta), so comparing selections directly would
+ // read dirty with nothing to send.
+ //
+ // null while the delta isn't computable: during a footer "Select all" fetch
+ // the selection/accumulator aren't final, so committing would drop the
+ // pending additions. A placement-facet conflict is a *loaded* empty view (no
+ // fetch runs, so pageItems stays undefined) — Save must still work there so
+ // Select-none-then-Save can clear the current racks; the accumulator holds
+ // the seeds + preserved selections the delta needs.
+ //
+ // accumulatorRef mutates in step with pageItems / selectedItems (page loads
+ // update the former, select-all the latter), so these deps keep it fresh.
+ const delta = useMemo(() => {
+ if (selectingAll) return null;
+ if (pageItems === undefined && !placementFacetConflict) return null;
+ return computeRackSelectionDelta([...accumulatorRef.current.values()], initialSelectedRackIds, selectedItems);
+ }, [pageItems, placementFacetConflict, selectingAll, selectedItems, initialSelectedRackIds]);
+
+ const isDirty = !!delta && (delta.added.length > 0 || delta.removed.length > 0);
+
const handleConfirm = useCallback(() => {
- // Guard against confirming mid-load: while a footer "Select all" fetch is in
- // flight the selection/accumulator aren't final, so committing would drop the
- // pending additions (Continue is also disabled then). A placement-facet
- // conflict is a *loaded* empty view (no fetch runs, so pageItems stays
- // undefined) — Continue must still work there so Select-none-then-Continue
- // can clear the current racks; the accumulator holds the seeds + preserved
- // selections needed for the delta.
- if (selectingAll) return;
- if (pageItems === undefined && !placementFacetConflict) return;
- onConfirm(computeRackSelectionDelta([...accumulatorRef.current.values()], initialSelectedRackIds, selectedItems));
- }, [pageItems, placementFacetConflict, selectingAll, selectedItems, initialSelectedRackIds, onConfirm]);
+ if (!delta) return;
+ onConfirm(delta);
+ }, [delta, onConfirm]);
// Footer "Select all" (offered only with the toggle off — see below) selects
// every ELIGIBLE rack across all pages, not just the visible page. Server
@@ -654,15 +674,19 @@ const ManageRacksModal = ({
size="large"
className="flex !h-[calc(100dvh-(--spacing(32)))] max-h-[calc(100dvh-(--spacing(32)))] flex-col !overflow-hidden"
bodyClassName="flex flex-1 min-h-0 flex-col"
- onDismiss={onDismiss}
+ onDismiss={saving ? undefined : onDismiss}
divider={false}
testId="manage-racks-modal"
buttons={[
{
- text: "Continue",
+ // "Save" because this is where membership is written
+ // (AssignRacksToBuilding), not a step on the way to a later commit.
+ text: saving ? "Saving…" : "Save",
variant: "primary",
onClick: handleConfirm,
- disabled: selectingAll,
+ // Dirty-gated. Also covers the not-computable cases (select-all in
+ // flight, list not loaded) where `delta` is null.
+ disabled: saving || !isDirty,
dismissModalOnClick: false,
testId: "manage-racks-modal-confirm",
},
diff --git a/client/src/protoFleet/features/fleetManagement/components/FleetCreateFlow/FleetCreateFlowProvider.tsx b/client/src/protoFleet/features/fleetManagement/components/FleetCreateFlow/FleetCreateFlowProvider.tsx
index a85a054f4c..16993a2dfe 100644
--- a/client/src/protoFleet/features/fleetManagement/components/FleetCreateFlow/FleetCreateFlowProvider.tsx
+++ b/client/src/protoFleet/features/fleetManagement/components/FleetCreateFlow/FleetCreateFlowProvider.tsx
@@ -16,7 +16,9 @@ import BuildingModals from "@/protoFleet/features/buildings/components/BuildingM
import BuildingSettingsModal from "@/protoFleet/features/buildings/components/BuildingSettingsModal";
import { useBuildingModals } from "@/protoFleet/features/buildings/hooks/useBuildingModals";
import { ManageRackModal, type RackFormData } from "@/protoFleet/features/fleetManagement/components/ManageRackModal";
+import ReparentWarningDialog from "@/protoFleet/features/fleetManagement/components/ManageRackModal/ReparentWarningDialog";
import RackSettingsModal from "@/protoFleet/features/fleetManagement/components/RackSettingsModal";
+import { useCreateRack } from "@/protoFleet/features/fleetManagement/hooks/useCreateRack";
import SiteModals from "@/protoFleet/features/sites/components/SiteModals";
import SiteSettingsModal from "@/protoFleet/features/sites/components/SiteSettingsModal";
import { useSiteModals } from "@/protoFleet/features/sites/hooks/useSiteModals";
@@ -44,9 +46,10 @@ const MAX_DEVICE_BATCH = 10000;
// with the operator's current miner selection, which in all-selection mode
// resolves to the full fleet (capped only at MAX_DEVICE_BATCH). Without a
// gate here, an oversized seed renders one MinersPane row per miner and
-// freezes the browser long before the save-time capacity guard fires. Cap
-// at the absolute max before ManageRackModal mounts — the exact
-// chosen-capacity check still runs at save once rows×columns are picked.
+// freezes the browser long before anything else fires. Cap at the absolute
+// max before the operator even reaches Rack Settings — the exact
+// chosen-capacity check runs server-side on the create, once rows×columns
+// are picked.
const MAX_RACK_CAPACITY = 12 * 12;
// A seed that moves racked miners into a new building/site sends
@@ -110,12 +113,14 @@ const FleetCreateFlowProvider = ({
const activeSite = useFleetStore((state) => state.ui.activeSite);
const scopedSiteId = useMemo(() => (activeSite.kind === "site" ? BigInt(activeSite.id) : undefined), [activeSite]);
- // Rack create flow. rackSettings drives RackSettingsModal; once the
- // operator continues, rackFormData opens ManageRackModal seeded with the
- // selected miners. rackSeed survives the settings step so the miners reach
- // the manage modal.
+ // Rack create flow. RackSettingsModal's "Create rack" creates the rack with
+ // the seeded miners already in it — one atomic SaveRack, so a failed seed
+ // can't leave an empty rack behind — then ManageRackModal opens on the real
+ // rack for positioning. rackSeed survives the settings step so the miners
+ // reach the create call.
const [rackSettingsOpen, setRackSettingsOpen] = useState(false);
const [rackFormData, setRackFormData] = useState(null);
+ const [rackId, setRackId] = useState(null);
const [rackSeed, setRackSeed] = useState(null);
// Holds a seed whose miners have a placement the new rack would clear,
// until the operator confirms; null when no confirmation is pending.
@@ -124,6 +129,7 @@ const FleetCreateFlowProvider = ({
const openRackSettings = useCallback((seed: RackCreateSeed) => {
setRackSeed(seed);
setRackFormData(null);
+ setRackId(null);
setRackSettingsOpen(true);
}, []);
@@ -153,13 +159,35 @@ const FleetCreateFlowProvider = ({
const closeRackFlow = useCallback(() => {
setRackSettingsOpen(false);
setRackFormData(null);
+ setRackId(null);
setRackSeed(null);
}, []);
- const handleRackSettingsContinue = useCallback((formData: RackFormData) => {
- setRackSettingsOpen(false);
- setRackFormData(formData);
- }, []);
+ const {
+ createRack,
+ creating: creatingRack,
+ conflict: rackCreateConflict,
+ confirmConflict: confirmRackCreateConflict,
+ cancelConflict: cancelRackCreateConflict,
+ } = useCreateRack({
+ onCreated: (createdId, formData) => {
+ // The rack and its seeded miners are live. Pulse the lists now — the
+ // operator may well dismiss the manage step without positioning anything,
+ // and the rack still exists.
+ bumpEntities();
+ setRackSettingsOpen(false);
+ setRackSeed(null);
+ setRackFormData(formData);
+ setRackId(createdId);
+ },
+ });
+
+ // The seed's miners ride on the create itself, so membership and the rack
+ // land in one transaction.
+ const handleRackSettingsSubmit = useCallback(
+ (formData: RackFormData) => createRack(formData, rackSeed?.minerIds),
+ [createRack, rackSeed],
+ );
const handleRackSaved = useCallback(() => {
bumpEntities();
@@ -380,18 +408,30 @@ const FleetCreateFlowProvider = ({
existingRacks={[]}
defaultSiteId={scopedSiteId}
onDismiss={closeRackFlow}
- onContinue={handleRackSettingsContinue}
+ onSubmit={handleRackSettingsSubmit}
+ saving={creatingRack}
/>
) : null}
- {rackFormData ? (
+ {rackFormData && rackId !== null ? (
+ ) : null}
+ {rackCreateConflict ? (
+
) : null}
{rackConflictSeed ? (
diff --git a/client/src/protoFleet/features/fleetManagement/components/ManageRackModal/ManageMinersModal.test.tsx b/client/src/protoFleet/features/fleetManagement/components/ManageRackModal/ManageMinersModal.test.tsx
index 8d08ef7571..969a871a59 100644
--- a/client/src/protoFleet/features/fleetManagement/components/ManageRackModal/ManageMinersModal.test.tsx
+++ b/client/src/protoFleet/features/fleetManagement/components/ManageRackModal/ManageMinersModal.test.tsx
@@ -20,6 +20,10 @@ vi.mock("@/protoFleet/components/MinerSelectionList", () => ({
useEffect(() => {
propsRef.current = props;
latestProps.current = props;
+ // The real list pushes its selection up on mount and on every change,
+ // which is what feeds the Save dirty gate.
+ const { selectedItems, allSelected, totalMiners } = mockGetSelection();
+ props.onSelectionChange?.({ selectedItems, allSelected, totalMiners });
});
useImperativeHandle(ref, () => ({
getSelection: mockGetSelection,
@@ -34,7 +38,7 @@ vi.mock("@/shared/components/Modal", () => ({
- {errorMsg ? } title={errorMsg} /> : null}
-
Promise;
+ creating: boolean;
+ /**
+ * Non-null while a site-strip confirmation is pending, carrying what the
+ * warning dialog needs: how many seeded miners would be displaced, and the
+ * label of the rack they'd move into.
+ */
+ conflict: { count: number; rackLabel: string } | null;
+ confirmConflict: () => void;
+ cancelConflict: () => void;
+}
+
+export function useCreateRack({
+ // Receives the submitted form data alongside the new id: the caller opens
+ // ManageRackModal on it, and the forced-retry path fires this from the
+ // confirmation dialog, where the form data is no longer in scope.
+ onCreated,
+}: {
+ onCreated: (rackId: bigint, formData: RackFormData) => void;
+}): UseCreateRackResult {
+ const { saveRack } = useDeviceSets();
+ const [creating, setCreating] = useState(false);
+ // The `creating` state lags a render behind the click, so the ref is what
+ // actually blocks a double-click from dispatching two creates.
+ const creatingRef = useRef(false);
+ const [conflict, setConflict] = useState<{ count: number; rackLabel: string } | null>(null);
+ // Holds the inputs for the forced retry while the confirmation is showing.
+ const pendingRef = useRef<{ formData: RackFormData; seededMinerIds: string[] } | null>(null);
+
+ const dispatch = useCallback(
+ (formData: RackFormData, seededMinerIds: string[], force: boolean): Promise => {
+ if (creatingRef.current) return Promise.resolve(undefined);
+ creatingRef.current = true;
+ setCreating(true);
+ return new Promise((resolve) => {
+ saveRack({
+ label: formData.label,
+ zone: formData.zone,
+ rows: formData.rows,
+ columns: formData.columns,
+ orderIndex: formData.orderIndex,
+ coolingType: formData.coolingType,
+ deviceIdentifiers: seededMinerIds,
+ // Slots are the operator's next step, in the manage modal. Seeded
+ // miners land as members without a position.
+ slotAssignments: [],
+ // A new rack has no prior placement to preserve, so send the chosen
+ // one explicitly — including "unassigned", which the form encodes as
+ // undefined and the wire as 0.
+ siteId: formData.siteId ?? 0n,
+ buildingId: formData.buildingId ?? 0n,
+ forceClearConflictingSite: force,
+ onSuccess: (deviceSet) => {
+ pushToast({ message: `Rack "${formData.label}" created`, status: STATUSES.success });
+ setConflict(null);
+ pendingRef.current = null;
+ onCreated(deviceSet.id, formData);
+ resolve(deviceSet.id);
+ },
+ // Seeded miners that currently have a site/building the new rack
+ // lacks would be stripped. The server wrote nothing; hold the inputs
+ // so the caller's confirmation can retry with force.
+ onConflicts: (conflicts: PerDeviceRackConflict[]) => {
+ pendingRef.current = { formData, seededMinerIds };
+ setConflict({ count: conflicts.length, rackLabel: formData.label });
+ resolve(undefined);
+ },
+ onError: (message) => {
+ pushToast({ message: message || "Failed to create rack. Please try again.", status: STATUSES.error });
+ resolve(undefined);
+ },
+ onFinally: () => {
+ creatingRef.current = false;
+ setCreating(false);
+ },
+ });
+ });
+ },
+ [saveRack, onCreated],
+ );
+
+ const createRack = useCallback(
+ (formData: RackFormData, seededMinerIds?: string[]) => dispatch(formData, seededMinerIds ?? [], false),
+ [dispatch],
+ );
+
+ const confirmConflict = useCallback(() => {
+ const pending = pendingRef.current;
+ if (!pending) return;
+ setConflict(null);
+ void dispatch(pending.formData, pending.seededMinerIds, true);
+ }, [dispatch]);
+
+ const cancelConflict = useCallback(() => {
+ pendingRef.current = null;
+ setConflict(null);
+ }, []);
+
+ return { createRack, creating, conflict, confirmConflict, cancelConflict };
+}
diff --git a/client/src/protoFleet/features/fleetManagement/pages/RackOverviewPage.tsx b/client/src/protoFleet/features/fleetManagement/pages/RackOverviewPage.tsx
index 960f825718..3ed7897642 100644
--- a/client/src/protoFleet/features/fleetManagement/pages/RackOverviewPage.tsx
+++ b/client/src/protoFleet/features/fleetManagement/pages/RackOverviewPage.tsx
@@ -579,9 +579,9 @@ const RackOverviewPage = () => {
resolveRack(rack.id);
void refetchStats();
}}
- // Settings "Continue" persists before the final Save; refresh the
- // overview in the background (modal stays open) so a later dismiss
- // can't leave stale label/placement on screen.
+ // The Rack settings Save and the miner pickers each persist on their
+ // own; refresh the overview in the background (modal stays open) so a
+ // later dismiss can't leave stale label/placement/members on screen.
onSettingsPersisted={() => {
resolveRack(rack.id);
void refetchStats();
diff --git a/client/src/protoFleet/features/fleetManagement/pages/RacksPage.tsx b/client/src/protoFleet/features/fleetManagement/pages/RacksPage.tsx
index 2be4287c45..7efdb1d88d 100644
--- a/client/src/protoFleet/features/fleetManagement/pages/RacksPage.tsx
+++ b/client/src/protoFleet/features/fleetManagement/pages/RacksPage.tsx
@@ -31,8 +31,10 @@ import FleetGroupActionsMenu from "@/protoFleet/features/fleetManagement/compone
import FleetGroupListActionBar from "@/protoFleet/features/fleetManagement/components/FleetGroupActionsMenu/FleetGroupListActionBar";
import { useOptionalFleetOutletContext } from "@/protoFleet/features/fleetManagement/components/FleetLayout";
import { ManageRackModal, type RackFormData } from "@/protoFleet/features/fleetManagement/components/ManageRackModal";
+import ReparentWarningDialog from "@/protoFleet/features/fleetManagement/components/ManageRackModal/ReparentWarningDialog";
import { RackCard } from "@/protoFleet/features/fleetManagement/components/RackCard";
import RackSettingsModal from "@/protoFleet/features/fleetManagement/components/RackSettingsModal";
+import { useCreateRack } from "@/protoFleet/features/fleetManagement/hooks/useCreateRack";
import { BUILDING_URL_PARAM } from "@/protoFleet/features/fleetManagement/utils/buildingFilterUrl";
import {
FILTER_URL_PARAM_KEYS,
@@ -874,12 +876,6 @@ const RacksPage = () => {
return ;
}, [hasActiveFilters, isLoading, totalCount, handleClearFilters]);
- const handleRackSettingsContinue = useCallback((formData: RackFormData) => {
- setShowRackSettingsModal(false);
- setManageRackFormData(formData);
- setManageRackId(undefined);
- }, []);
-
const handleManageRackDismiss = useCallback(() => {
setManageRackFormData(null);
setManageRackId(undefined);
@@ -891,14 +887,33 @@ const RacksPage = () => {
resetAndFetch();
fetchZones();
}, [resetAndFetch, fetchZones]);
- // Rack Settings "Continue" persists an existing rack's settings before the
- // final miner Save, so refresh the list in the background (without closing
- // the modal) to keep it consistent if the operator then dismisses.
+ // Rack Settings "Save" persists an existing rack's settings before the final
+ // miner Save, so refresh the list in the background (without closing the
+ // modal) to keep it consistent if the operator then dismisses.
const handleRackSettingsPersisted = useCallback(() => {
resetAndFetch();
fetchZones();
}, [resetAndFetch, fetchZones]);
+ // "Create rack" in Rack Settings creates it for real, then hands off to
+ // ManageRackModal for miners and placement. The rack exists from here on, so
+ // the list refreshes immediately rather than waiting for a later Save.
+ const {
+ createRack,
+ creating: creatingRack,
+ conflict: rackCreateConflict,
+ confirmConflict,
+ cancelConflict,
+ } = useCreateRack({
+ onCreated: (rackId, formData) => {
+ setShowRackSettingsModal(false);
+ setManageRackFormData(formData);
+ setManageRackId(rackId);
+ resetAndFetch();
+ fetchZones();
+ },
+ });
+
const handleDeleteRack = useCallback(() => {
if (!manageRackId) return Promise.resolve();
return new Promise((resolve, reject) => {
@@ -1134,12 +1149,13 @@ const RacksPage = () => {
existingRacks={racks}
defaultSiteId={scopedSiteId}
onDismiss={() => setShowRackSettingsModal(false)}
- onContinue={handleRackSettingsContinue}
+ onSubmit={createRack}
+ saving={creatingRack}
/>
) : null}
- {manageRackFormData ? (
+ {manageRackFormData && manageRackId !== undefined ? (
{
onDismiss={handleManageRackDismiss}
onSave={handleManageRackSave}
onSettingsPersisted={handleRackSettingsPersisted}
- onDelete={manageRackId ? handleDeleteRack : undefined}
+ onDelete={handleDeleteRack}
+ />
+ ) : null}
+ {rackCreateConflict ? (
+
) : null}
@@ -1461,12 +1485,13 @@ const RacksPage = () => {
existingRacks={racks}
defaultSiteId={scopedSiteId}
onDismiss={() => setShowRackSettingsModal(false)}
- onContinue={handleRackSettingsContinue}
+ onSubmit={createRack}
+ saving={creatingRack}
/>
) : null}
- {manageRackFormData ? (
+ {manageRackFormData && manageRackId !== undefined ? (
{
onSettingsPersisted={handleRackSettingsPersisted}
/>
) : null}
+ {rackCreateConflict ? (
+
+ ) : null}
{reparentTarget ? (
({
+ listAllBuildingsMock: vi.fn(),
+ listSitesMock: vi.fn(),
+}));
+
+vi.mock("@/protoFleet/api/buildings", () => ({
+ useBuildings: () => ({ listAllBuildings: listAllBuildingsMock }),
+}));
+
+vi.mock("@/protoFleet/api/sites", () => ({
+ useSites: () => ({ listSites: listSitesMock }),
+}));
+
+// The picker self-fetches the org-wide building list plus the site catalog for
+// its Site column; both mocks resolve synchronously through onSuccess.
+const seed = (rows: { id: bigint; name: string; siteId: bigint }[]) => {
+ listAllBuildingsMock.mockImplementation((args?: { onSuccess?: (rows: unknown[]) => void }) => {
+ args?.onSuccess?.(
+ rows.map((r) =>
+ create(BuildingWithCountsSchema, {
+ building: create(BuildingSchema, { id: r.id, name: r.name, siteId: r.siteId }),
+ rackCount: 0n,
+ }),
+ ),
+ );
+ return Promise.resolve(undefined);
+ });
+ listSitesMock.mockImplementation((args?: { onSuccess?: (rows: unknown[]) => void }) => {
+ args?.onSuccess?.([create(SiteWithCountsSchema, { site: create(SiteSchema, { id: 7n, name: "East DC" }) })]);
+ return Promise.resolve(undefined);
+ });
+};
+
+const baseProps = {
+ open: true as const,
+ siteId: 7n,
+ initialSelectedBuildingIds: [] as bigint[],
+ onDismiss: () => undefined,
+};
+
+describe("ManageBuildingsModal — New building hand-off", () => {
+ beforeEach(() => {
+ listAllBuildingsMock.mockReset();
+ listSitesMock.mockReset();
+ });
+
+ it("omits the New building button when no launch handler is supplied", async () => {
+ seed([{ id: 1n, name: "Building A", siteId: 0n }]);
+ render();
+
+ await waitFor(() => expect(screen.getByTestId("manage-buildings-modal-confirm")).toBeInTheDocument());
+ expect(screen.queryByTestId("manage-buildings-modal-create-new")).not.toBeInTheDocument();
+ });
+
+ it("abandons the pending selection when launching create — Save is what commits", async () => {
+ seed([{ id: 1n, name: "Building A", siteId: 0n }]);
+ const onConfirm = vi.fn();
+ const onCreateNewLaunch = vi.fn();
+ render();
+
+ await waitFor(() => expect(screen.getByTestId("manage-buildings-modal-create-new")).toBeEnabled());
+
+ // Check the unassigned building, then hand off to the create flow without
+ // pressing Save.
+ fireEvent.click(screen.getAllByRole("checkbox")[0]);
+ fireEvent.click(screen.getByTestId("manage-buildings-modal-create-new"));
+
+ // Nothing is written — leaving without Save means the selection never
+ // landed, which is what makes the abandon safe to reason about.
+ expect(onConfirm).not.toHaveBeenCalled();
+ expect(onCreateNewLaunch).toHaveBeenCalled();
+ });
+});
+
+describe("ManageBuildingsModal — Save gate", () => {
+ beforeEach(() => {
+ listAllBuildingsMock.mockReset();
+ listSitesMock.mockReset();
+ });
+
+ it("disables Save until the selection differs from the site's current membership", async () => {
+ seed([{ id: 1n, name: "Building A", siteId: 0n }]);
+ const onConfirm = vi.fn();
+ render();
+
+ const save = await screen.findByTestId("manage-buildings-modal-confirm");
+ // Loaded with nothing checked and nothing seeded — no membership change to
+ // write, so Save must not fire an AssignBuildingsToSite no-op.
+ await waitFor(() => expect(save).toBeDisabled());
+
+ fireEvent.click(screen.getAllByRole("checkbox")[0]);
+ await waitFor(() => expect(save).toBeEnabled());
+
+ fireEvent.click(save);
+ expect(onConfirm).toHaveBeenCalledWith({
+ added: [{ buildingId: 1n, label: "Building A" }],
+ removed: [],
+ });
+ });
+
+ it("keeps Save disabled while the building list is still loading", () => {
+ // No onSuccess → items stays undefined, so the delta can't be computed.
+ listAllBuildingsMock.mockReturnValue(Promise.resolve(undefined));
+ listSitesMock.mockReturnValue(Promise.resolve(undefined));
+ render();
+
+ expect(screen.getByTestId("manage-buildings-modal-confirm")).toBeDisabled();
+ });
+
+ it("re-checking a seeded building leaves Save disabled", async () => {
+ // Uncheck then re-check: the delta returns to empty, so the gate closes
+ // again rather than latching open on "the operator touched something".
+ seed([{ id: 1n, name: "Building A", siteId: 7n }]);
+ render();
+
+ const save = await screen.findByTestId("manage-buildings-modal-confirm");
+ await waitFor(() => expect(save).toBeDisabled());
+
+ const checkbox = screen.getAllByRole("checkbox")[0];
+ fireEvent.click(checkbox);
+ await waitFor(() => expect(save).toBeEnabled());
+ fireEvent.click(checkbox);
+ await waitFor(() => expect(save).toBeDisabled());
+ });
+});
diff --git a/client/src/protoFleet/features/sites/components/ManageBuildingsModal/ManageBuildingsModal.tsx b/client/src/protoFleet/features/sites/components/ManageBuildingsModal/ManageBuildingsModal.tsx
index f49fb4469a..2b54a92259 100644
--- a/client/src/protoFleet/features/sites/components/ManageBuildingsModal/ManageBuildingsModal.tsx
+++ b/client/src/protoFleet/features/sites/components/ManageBuildingsModal/ManageBuildingsModal.tsx
@@ -4,7 +4,7 @@ import { buildBuildingPickerItem, type BuildingPickerItem } from "./buildingPick
import { computeBuildingSelectionDelta } from "./buildingSelectionDelta";
import { useBuildings } from "@/protoFleet/api/buildings";
import { useSites } from "@/protoFleet/api/sites";
-import { ChevronDown } from "@/shared/assets/icons";
+import { ChevronDown, Plus } from "@/shared/assets/icons";
import Button, { sizes, variants } from "@/shared/components/Button";
import List from "@/shared/components/List";
import type { ColConfig, ColTitles } from "@/shared/components/List/types";
@@ -17,16 +17,26 @@ interface ManageBuildingsModalProps {
open: boolean;
// Parent site context drives the eligibility split.
siteId: bigint;
- // Building IDs currently in the site's working set. The modal seeds its
- // selection with these so the operator sees current state and can add /
- // remove in one flow.
+ // Building IDs currently assigned to the site. The modal seeds its selection
+ // with these so the operator sees current state and can add / remove in one
+ // flow, and diffs against them to gate Save.
initialSelectedBuildingIds: bigint[];
onDismiss: () => void;
- // Returns the delta against initialSelectedBuildingIds: `added` is the
+ // Save. Receives the delta against initialSelectedBuildingIds: `added` is the
// newly-checked buildings (id + label so the caller can render without a
// separate lookup); `removed` is the seeded ids the operator unchecked.
// Untouched buildings are in neither list — the caller leaves them as-is.
- onConfirm: (delta: { added: { buildingId: bigint; label: string }[]; removed: bigint[] }) => void;
+ // This modal owns site membership, so the caller persists the delta here
+ // rather than staging it for a later save.
+ onConfirm: (delta: { added: { buildingId: bigint; label: string }[]; removed: bigint[] }) => Promise | void;
+ // In-flight signal from the caller's write, mirrored into the CTA.
+ saving?: boolean;
+ // Renders a "New building" button beside Save that hands off to the full
+ // building-create flow instead of picking an existing building — mirroring
+ // ParentPickerModal's createNewLaunch affordance ("New rack"). Leaving this
+ // way abandons the pending selection: Save is what commits it, so nothing
+ // was written. Omitted = no create affordance.
+ onCreateNewLaunch?: () => void;
}
const PAGE_SIZE = 25;
@@ -60,6 +70,8 @@ const ManageBuildingsModal = ({
initialSelectedBuildingIds,
onDismiss,
onConfirm,
+ saving = false,
+ onCreateNewLaunch,
}: ManageBuildingsModalProps) => {
const { listAllBuildings } = useBuildings();
const { listSites } = useSites();
@@ -139,10 +151,22 @@ const ManageBuildingsModal = ({
const hasPreviousPage = page > 0;
const hasNextPage = page < totalPages - 1;
+ // The exact membership change Save would write. Derived here so the CTA's
+ // dirty gate and the write read the same delta — note it isn't a plain
+ // set-difference: seeded ids the picker's response omitted, and rows that
+ // became ineligible, are excluded on purpose (see computeBuildingSelectionDelta),
+ // so a raw selection comparison would call the modal dirty when there's
+ // nothing to send.
+ const delta = useMemo(
+ () => (items ? computeBuildingSelectionDelta(items, initialSelectedBuildingIds, selectedItems) : null),
+ [items, initialSelectedBuildingIds, selectedItems],
+ );
+ const isDirty = !!delta && (delta.added.length > 0 || delta.removed.length > 0);
+
const handleConfirm = useCallback(() => {
- if (!items) return;
- onConfirm(computeBuildingSelectionDelta(items, initialSelectedBuildingIds, selectedItems));
- }, [items, selectedItems, initialSelectedBuildingIds, onConfirm]);
+ if (!delta) return;
+ void onConfirm(delta);
+ }, [delta, onConfirm]);
const handleSelectAll = useCallback(() => {
if (!items) return;
@@ -159,14 +183,35 @@ const ManageBuildingsModal = ({
size="large"
className="flex !h-[calc(100dvh-(--spacing(32)))] max-h-[calc(100dvh-(--spacing(32)))] flex-col !overflow-hidden"
bodyClassName="flex flex-1 min-h-0 flex-col"
- onDismiss={onDismiss}
+ onDismiss={saving ? undefined : onDismiss}
divider={false}
testId="manage-buildings-modal"
buttons={[
+ // ButtonGroup sorts the primary button last, so this lands to the left
+ // of Save.
+ ...(onCreateNewLaunch
+ ? [
+ {
+ text: "New building",
+ variant: variants.secondary,
+ prefixIcon: ,
+ onClick: onCreateNewLaunch,
+ disabled: saving,
+ dismissModalOnClick: false,
+ testId: "manage-buildings-modal-create-new",
+ },
+ ]
+ : []),
{
- text: "Continue",
+ // "Save" because this is where membership is written
+ // (AssignBuildingsToSite), not a step on the way to a later commit.
+ text: saving ? "Saving…" : "Save",
variant: "primary",
onClick: handleConfirm,
+ // Dirty-gated, and blocked while `items` is undefined — the delta
+ // can't be computed without the list, so every selection would read
+ // clean for the wrong reason.
+ disabled: saving || !isDirty,
dismissModalOnClick: false,
testId: "manage-buildings-modal-confirm",
},
diff --git a/client/src/protoFleet/features/sites/components/ManageSiteModal/ManageSiteModal.test.tsx b/client/src/protoFleet/features/sites/components/ManageSiteModal/ManageSiteModal.test.tsx
index 341dfa9750..33d9b6977c 100644
--- a/client/src/protoFleet/features/sites/components/ManageSiteModal/ManageSiteModal.test.tsx
+++ b/client/src/protoFleet/features/sites/components/ManageSiteModal/ManageSiteModal.test.tsx
@@ -11,7 +11,10 @@ import { emptySiteFormValues, type SiteFormValues } from "@/protoFleet/api/sites
// caller's onSuccess synchronously with whatever rows the test queued.
const { listBuildingsBySiteMock } = vi.hoisted(() => ({ listBuildingsBySiteMock: vi.fn() }));
-vi.mock("@/protoFleet/api/buildings", () => ({
+// Keep the module's real helpers (emptyBuildingFormValues is used by both this
+// modal and the BuildingSettingsModal it renders) and override only the hook.
+vi.mock("@/protoFleet/api/buildings", async (importActual) => ({
+ ...(await importActual()),
useBuildings: () => ({
listBuildingsBySite: listBuildingsBySiteMock,
listAllBuildings: vi.fn(),
@@ -19,6 +22,17 @@ vi.mock("@/protoFleet/api/buildings", () => ({
}),
}));
+// Stub the building picker: the real one self-fetches the org-wide building
+// list and site catalog, which this suite doesn't wire up. All we need from it
+// here is the "New building" hand-off that reaches the inline create flow.
+vi.mock("../ManageBuildingsModal", () => ({
+ default: ({ onCreateNewLaunch }: { onCreateNewLaunch?: () => void }) => (
+
+ ),
+}));
+
const seedBuildings = (rows: { id: bigint; name: string; siteId: bigint; rackCount: bigint }[]) => {
listBuildingsBySiteMock.mockImplementation((args?: { onSuccess?: (rows: unknown[]) => void }) => {
args?.onSuccess?.(
@@ -39,113 +53,108 @@ const draft = (overrides: Partial = {}): SiteFormValues => ({
...overrides,
});
+const site7 = create(SiteSchema, { id: 7n, name: "East DC" });
+
const noop = () => undefined;
+// Common props — the site is always persisted by the time the modal opens.
+const baseProps = {
+ open: true as const,
+ site: site7,
+ draft: draft({ name: "East DC" }),
+ onAssignBuildings: vi.fn().mockResolvedValue(true),
+ onRemoveBuilding: vi.fn().mockResolvedValue(true),
+ onCreateBuilding: vi.fn().mockResolvedValue(null),
+ onEditDetails: noop,
+ onDeleteRequested: noop,
+ onDismiss: noop,
+};
+
describe("ManageSiteModal", () => {
beforeEach(() => listBuildingsBySiteMock.mockReset());
- it("invokes onSave and closes when the save reports closeOnSuccess", async () => {
- const onSave = vi.fn().mockResolvedValue({ closeOnSuccess: true });
+ it("Save writes nothing and just closes (placement has no backend yet)", async () => {
+ seedBuildings([]);
+ const onAssignBuildings = vi.fn();
const onDismiss = vi.fn();
- render(
- ,
- );
+ render();
fireEvent.click(screen.getByTestId("manage-site-modal-save"));
- await waitFor(() => expect(onSave).toHaveBeenCalled());
await waitFor(() => expect(onDismiss).toHaveBeenCalled());
+ // Membership commits in the picker, so this CTA has nothing to persist.
+ expect(onAssignBuildings).not.toHaveBeenCalled();
});
- it("disables Save in edit mode until the building list has loaded", () => {
- // No seed → listBuildingsBySite never calls onSuccess, so the working
- // set stays in the loading (undefined) state.
- const site = create(SiteSchema, { id: 7n, name: "East DC" });
- render(
- ,
- );
+ it("disables Save until the building list has loaded", () => {
+ // No seed → listBuildingsBySite never calls onSuccess, so the list stays
+ // in the loading (undefined) state.
+ render();
expect(screen.getByTestId("manage-site-modal-save")).toBeDisabled();
});
it("Site settings fires the parent callback", () => {
+ seedBuildings([]);
const onEditDetails = vi.fn();
- render(
- Promise.resolve(null)}
- onEditDetails={onEditDetails}
- onDeleteRequested={noop}
- onDismiss={noop}
- />,
- );
+ render();
fireEvent.click(screen.getAllByTestId("manage-site-modal-edit-details")[0]);
expect(onEditDetails).toHaveBeenCalled();
});
it("Delete site fires onDeleteRequested", () => {
+ seedBuildings([]);
const onDeleteRequested = vi.fn();
- render(
- Promise.resolve(null)}
- onEditDetails={noop}
- onDeleteRequested={onDeleteRequested}
- onDismiss={noop}
- />,
- );
+ render();
fireEvent.click(screen.getAllByTestId("manage-site-modal-delete")[0]);
expect(onDeleteRequested).toHaveBeenCalled();
});
- it("create mode lets buildings be staged before the site is saved", () => {
- render(
- Promise.resolve(null)}
- onEditDetails={noop}
- onDeleteRequested={noop}
- onDismiss={noop}
- />,
- );
+ it("creates a building inline via the picker hand-off and injects it into the working set", async () => {
+ seedBuildings([]);
+ const created = create(BuildingSchema, { id: 5n, name: "New Bldg", siteId: 7n });
+ const onCreateBuilding = vi.fn().mockResolvedValue(created);
+ render();
- // No "save first" gate — the empty working set renders the same
- // add-buildings affordance as edit mode, and Manage buildings is enabled.
- expect(screen.queryByText("Save the site first to add buildings.")).not.toBeInTheDocument();
+ // Create is reached through the picker's "New building" hand-off, not a
+ // dedicated button on this modal.
+ expect(screen.getByText("No buildings added to this site")).toBeInTheDocument();
+ expect(screen.queryByTestId("manage-site-modal-create-building")).not.toBeInTheDocument();
+ fireEvent.click(screen.getAllByTestId("manage-site-modal-manage-buildings")[0]);
+ fireEvent.click(screen.getByTestId("stub-picker-create-new"));
+ expect(screen.getByTestId("building-settings-modal")).toBeInTheDocument();
+
+ // Name the building and save.
+ fireEvent.change(screen.getByTestId("building-settings-name-input"), { target: { value: "New Bldg" } });
+ fireEvent.click(screen.getByTestId("building-settings-modal-save"));
+
+ await waitFor(() => expect(onCreateBuilding).toHaveBeenCalled());
+ // The created building is injected and the create modal closes.
+ await waitFor(() => expect(screen.getByTestId("manage-site-modal-building-row-5")).toBeInTheDocument());
+ expect(screen.queryByTestId("building-settings-modal")).not.toBeInTheDocument();
+ });
+
+ it("keeps the create modal open and injects nothing when create fails", async () => {
+ seedBuildings([]);
+ const onCreateBuilding = vi.fn().mockResolvedValue(null);
+ render();
+
+ fireEvent.click(screen.getAllByTestId("manage-site-modal-manage-buildings")[0]);
+ fireEvent.click(screen.getByTestId("stub-picker-create-new"));
+ fireEvent.change(screen.getByTestId("building-settings-name-input"), { target: { value: "Nope" } });
+ fireEvent.click(screen.getByTestId("building-settings-modal-save"));
+
+ await waitFor(() => expect(onCreateBuilding).toHaveBeenCalled());
+ // Modal stays open; no row was added.
+ expect(screen.getByTestId("building-settings-modal")).toBeInTheDocument();
expect(screen.getByText("No buildings added to this site")).toBeInTheDocument();
- expect(screen.getAllByTestId("manage-site-modal-manage-buildings")[0]).toBeEnabled();
- expect(screen.getAllByTestId("manage-site-modal-empty-state-add")[0]).toBeEnabled();
- // Save is allowed immediately (creates the site with an empty building set).
- expect(screen.getByTestId("manage-site-modal-save")).toBeEnabled();
});
it("shows comma-separated meta on each corner of the preview", () => {
+ seedBuildings([]);
const site = create(SiteSchema, {
id: 7n,
name: "East DC",
@@ -155,8 +164,7 @@ describe("ManageSiteModal", () => {
});
render(
{
locationState: "MA",
powerCapacityMw: 5,
})}
- onSave={() => Promise.resolve(null)}
- onEditDetails={noop}
- onDeleteRequested={noop}
- onDismiss={noop}
/>,
);
expect(screen.getByText("East DC, Boston, MA")).toBeInTheDocument();
expect(screen.getByText("5 MW, 0 buildings")).toBeInTheDocument();
});
- it("renders rack count as a subtitle and kebab-removes a building from the working set", () => {
+ it("renders rack count as a subtitle and kebab-remove unassigns immediately", async () => {
seedBuildings([{ id: 1n, name: "Building A", siteId: 7n, rackCount: 3n }]);
- const site = create(SiteSchema, { id: 7n, name: "East DC" });
- render(
- Promise.resolve(null)}
- onEditDetails={noop}
- onDeleteRequested={noop}
- onDismiss={noop}
- />,
- );
+ const onRemoveBuilding = vi.fn().mockResolvedValue(true);
+ render();
// Rack count renders as the row subtitle (not a trailing column).
expect(screen.getByTestId("manage-site-modal-building-row-1")).toBeInTheDocument();
expect(screen.getByText("3 racks")).toBeInTheDocument();
- // Open the kebab and remove — the row drops from the list locally.
fireEvent.click(screen.getByTestId("manage-site-modal-building-menu-1"));
fireEvent.click(screen.getByTestId("manage-site-modal-remove-building-1"));
- expect(screen.queryByTestId("manage-site-modal-building-row-1")).not.toBeInTheDocument();
+
+ await waitFor(() => expect(onRemoveBuilding).toHaveBeenCalledWith(1n, "Building A"));
+ await waitFor(() => expect(screen.queryByTestId("manage-site-modal-building-row-1")).not.toBeInTheDocument());
// Empty state takes over once the last building is removed.
expect(screen.getByText("No buildings added to this site")).toBeInTheDocument();
});
+
+ it("keeps the row when the unassign fails", async () => {
+ seedBuildings([{ id: 1n, name: "Building A", siteId: 7n, rackCount: 3n }]);
+ const onRemoveBuilding = vi.fn().mockResolvedValue(false);
+ render();
+
+ fireEvent.click(screen.getByTestId("manage-site-modal-building-menu-1"));
+ fireEvent.click(screen.getByTestId("manage-site-modal-remove-building-1"));
+
+ await waitFor(() => expect(onRemoveBuilding).toHaveBeenCalled());
+ expect(screen.getByTestId("manage-site-modal-building-row-1")).toBeInTheDocument();
+ });
});
diff --git a/client/src/protoFleet/features/sites/components/ManageSiteModal/ManageSiteModal.tsx b/client/src/protoFleet/features/sites/components/ManageSiteModal/ManageSiteModal.tsx
index bb2b956f13..1ae17c65de 100644
--- a/client/src/protoFleet/features/sites/components/ManageSiteModal/ManageSiteModal.tsx
+++ b/client/src/protoFleet/features/sites/components/ManageSiteModal/ManageSiteModal.tsx
@@ -1,11 +1,13 @@
import { useCallback, useEffect, useMemo, useRef, useState } from "react";
+import { create } from "@bufbuild/protobuf";
import ManageBuildingsModal from "../ManageBuildingsModal";
-import { useBuildings } from "@/protoFleet/api/buildings";
-import { type BuildingWithCounts } from "@/protoFleet/api/generated/buildings/v1/buildings_pb";
-import { type Site } from "@/protoFleet/api/generated/sites/v1/sites_pb";
+import { type BuildingFormValues, emptyBuildingFormValues, useBuildings } from "@/protoFleet/api/buildings";
+import { type Building, type BuildingWithCounts } from "@/protoFleet/api/generated/buildings/v1/buildings_pb";
+import { type Site, SiteWithCountsSchema } from "@/protoFleet/api/generated/sites/v1/sites_pb";
import { type SiteFormValues } from "@/protoFleet/api/sites";
import FullScreenTwoPaneModal from "@/protoFleet/components/FullScreenTwoPaneModal";
+import BuildingSettingsModal from "@/protoFleet/features/buildings/components/BuildingSettingsModal";
import { formatSiteAddress } from "@/protoFleet/features/sites/formatAddress";
import { Ellipsis } from "@/shared/assets/icons";
import Button, { sizes, variants } from "@/shared/components/Button";
@@ -13,36 +15,32 @@ import Header from "@/shared/components/Header";
import PlaceholderBlock from "@/shared/components/PlaceholderBlock";
import { useEscapeDismiss } from "@/shared/hooks/useEscapeDismiss";
-export type ManageSiteModalMode = "create" | "edit";
-
-// One building in the modal's working set. Seeded from the server fetch and
-// mutated locally by the Manage buildings picker; persisted on Save.
+// One building shown in the modal's list. Seeded from the server fetch and
+// re-synced after each membership write (the picker's Save and the row-level
+// Remove both commit immediately, so this list mirrors the server rather than
+// staging a pending edit).
interface BuildingEntry {
buildingId: bigint;
label: string;
rackCount: bigint;
}
-// Net membership change between the load-time snapshot and the working set,
-// computed on Save and applied by the host via AssignBuildingsToSite.
-export interface BuildingMembershipDelta {
- added: bigint[];
- removed: bigint[];
-}
-
interface ManageSiteModalProps {
open: boolean;
- mode: ManageSiteModalMode;
draft: SiteFormValues;
- // In edit mode the parent has a Site row to drive the right-pane preview
- // header off; in create mode there is no row yet so the preview uses the
- // draft values directly.
- site?: Site;
- // Persisted at save time. In edit mode the delta is applied via
- // AssignBuildingsToSite; in create mode the host first creates the site
- // (the delta is empty since building management is gated until the site
- // exists). Returns whether the modal should close on success.
- onSave: (delta: BuildingMembershipDelta) => Promise<{ closeOnSuccess: boolean } | null>;
+ // The site is always persisted by the time this modal opens (the create
+ // flow's Continue creates it up front), so it drives the right-pane preview
+ // header and the site_id for building writes.
+ site: Site;
+ // Applies the buildings picker's membership delta via AssignBuildingsToSite.
+ // Resolves true on success; a false result leaves the picker open to retry.
+ onAssignBuildings: (delta: { added: bigint[]; removed: bigint[] }) => Promise;
+ // Row-level "Remove building" — unassigns it from this site immediately.
+ onRemoveBuilding: (buildingId: bigint, label: string) => Promise;
+ // Creates a new building against this site and returns the created row (or
+ // null on failure). The building is associated to the site atomically, so
+ // the modal injects the returned row into its working set without a refetch.
+ onCreateBuilding: (values: BuildingFormValues) => Promise;
// Opens SiteSettingsModal stacked on top to edit name / address / etc.
onEditDetails: () => void;
// Opens the cascade delete dialog (edit) or discards the pending create.
@@ -77,15 +75,15 @@ const BuildingRow = ({
label: string;
rackCount: bigint;
saving: boolean;
- onRemove: (buildingId: bigint) => void;
+ onRemove: (buildingId: bigint, label: string) => void;
}) => {
const [showMenu, setShowMenu] = useState(false);
const menuRef = useRef(null);
const handleRemove = useCallback(() => {
setShowMenu(false);
- onRemove(buildingId);
- }, [buildingId, onRemove]);
+ onRemove(buildingId, label);
+ }, [buildingId, label, onRemove]);
useEscapeDismiss(showMenu ? () => setShowMenu(false) : undefined);
@@ -146,10 +144,11 @@ const BuildingRow = ({
const ManageSiteModal = ({
open,
- mode,
draft,
site,
- onSave,
+ onAssignBuildings,
+ onRemoveBuilding,
+ onCreateBuilding,
onEditDetails,
onDeleteRequested,
onDismiss,
@@ -159,22 +158,16 @@ const ManageSiteModal = ({
unassignedMinerCount,
}: ManageSiteModalProps) => {
const { listBuildingsBySite } = useBuildings();
- // undefined = loading; [] = loaded-empty. Working set the operator edits
- // via the picker before Save.
+ // undefined = loading; [] = loaded-empty. Mirrors the site's committed
+ // membership — every mutation in this modal writes before updating it.
const [entries, setEntries] = useState(undefined);
const [showManageBuildings, setShowManageBuildings] = useState(false);
+ const [showCreateBuilding, setShowCreateBuilding] = useState(false);
- // Snapshot of the building ids present at load time so Save can diff the
- // working set into add / remove buckets for AssignBuildingsToSite.
- const initialIdsRef = useRef>(new Set());
-
- // Only fetch when edit mode has a persisted site; create mode renders an
- // empty working set until the first Save lands a row. Skipping the effect
- // for the no-fetch branches keeps the setState-in-effect lint clean.
- const shouldFetchBuildings = open && mode === "edit" && site !== undefined;
- const fetchSiteId = shouldFetchBuildings ? site.id : undefined;
+ const shouldFetchBuildings = open;
+ const fetchSiteId = site.id;
useEffect(() => {
- if (!shouldFetchBuildings || fetchSiteId === undefined) return;
+ if (!shouldFetchBuildings) return;
const controller = new AbortController();
void listBuildingsBySite({
siteId: fetchSiteId,
@@ -188,45 +181,41 @@ const ManageSiteModal = ({
rackCount: r.rackCount,
}));
setEntries(seeded);
- initialIdsRef.current = new Set(seeded.map((e) => e.buildingId.toString()));
},
onError: () => {
setEntries([]);
- initialIdsRef.current = new Set();
},
});
return () => controller.abort();
}, [shouldFetchBuildings, fetchSiteId, listBuildingsBySite, buildingsRefreshKey]);
- // Create mode never fetches (there's no persisted site yet) but still keeps
- // a working set: buildings the operator stages via the picker before the
- // first Save, which the host then assigns to the freshly-created site.
- // `entries` starts undefined there, so fall back to an empty (loaded, not
- // loading) list rather than the edit-mode loading skeleton.
- const displayEntries: BuildingEntry[] | undefined = useMemo(
- () => (shouldFetchBuildings ? entries : (entries ?? [])),
- [shouldFetchBuildings, entries],
- );
const sortedEntries = useMemo(
- () => (displayEntries ? [...displayEntries].sort((a, b) => a.label.localeCompare(b.label)) : undefined),
- [displayEntries],
+ () => (entries ? [...entries].sort((a, b) => a.label.localeCompare(b.label)) : undefined),
+ [entries],
);
- const previewTitle = (site?.name || draft.name || "Untitled site").trim();
+ const previewTitle = (site.name || draft.name || "Untitled site").trim();
const previewLocation = useMemo(() => formatSiteAddress(draft) || "—", [draft]);
const previewCapacity = draft.powerCapacityMw > 0 ? `${draft.powerCapacityMw} MW` : "—";
const buildingCount = sortedEntries?.length ?? 0;
- const currentBuildingIds = useMemo(() => (displayEntries ?? []).map((e) => e.buildingId), [displayEntries]);
+ const currentBuildingIds = useMemo(() => (entries ?? []).map((e) => e.buildingId), [entries]);
+ // The inline building-create dropdown is always locked to this site, so a
+ // one-element list built from `site` is all BuildingSettingsModal needs — and
+ // it sidesteps the brief window right after create-on-Continue where the
+ // page's site catalog hasn't refetched the new row yet.
+ const buildingCreateSites = useMemo(() => [create(SiteWithCountsSchema, { site })], [site]);
- // Picker confirm — apply the delta against the working set. `added` joins
- // entries without disturbing existing rows; `removed` drops only those
- // entries. Buildings in neither list are untouched, so a seeded building
- // the picker's listBuildings response omitted (race / paging gap) is
- // preserved. Mirrors ManageBuildingModal.handleManageRacksConfirm.
- const handleManageBuildingsConfirm = (delta: {
+ // Picker Save — the write already happened by the time this resolves, so
+ // mirror it into the list. `added` joins without disturbing existing rows;
+ // `removed` drops only those entries. Buildings in neither list are
+ // untouched, so a member the picker's listBuildings response omitted (race /
+ // paging gap) is preserved. A failed write leaves the picker open to retry.
+ const handleManageBuildingsConfirm = async (delta: {
added: { buildingId: bigint; label: string }[];
removed: bigint[];
}) => {
+ const ok = await onAssignBuildings({ added: delta.added.map((a) => a.buildingId), removed: delta.removed });
+ if (!ok) return;
const removedSet = new Set(delta.removed.map((id) => id.toString()));
setEntries((prev) => {
const kept = (prev ?? []).filter((e) => !removedSet.has(e.buildingId.toString()));
@@ -241,21 +230,31 @@ const ManageSiteModal = ({
setShowManageBuildings(false);
};
- // Kebab "Remove building" — drop it from the working set. Persisted on
- // Save as a `removed` delta entry, which moves the building to
- // "Unassigned" (the building itself is not deleted).
- const handleRemoveBuilding = useCallback((buildingId: bigint) => {
- setEntries((prev) => (prev ?? []).filter((e) => e.buildingId !== buildingId));
- }, []);
+ // Kebab "Remove building" — unassigns immediately (moves the building to
+ // "Unassigned"; the building itself is not deleted). Drop the row only once
+ // the write lands so a failure leaves the list truthful.
+ const handleRemoveBuilding = useCallback(
+ async (buildingId: bigint, label: string) => {
+ const ok = await onRemoveBuilding(buildingId, label);
+ if (!ok) return;
+ setEntries((prev) => (prev ?? []).filter((e) => e.buildingId !== buildingId));
+ },
+ [onRemoveBuilding],
+ );
- const handleSave = async () => {
- const initial = initialIdsRef.current;
- const current = new Set((displayEntries ?? []).map((e) => e.buildingId.toString()));
- const added = [...current].filter((id) => !initial.has(id)).map((id) => BigInt(id));
- const removed = [...initial].filter((id) => !current.has(id)).map((id) => BigInt(id));
- const result = await onSave({ added, removed });
- if (!result) return;
- if (result.closeOnSuccess) onDismiss();
+ // Inline building-create confirm. CreateBuilding already associated the new
+ // building to this site, so inject it into the list rather than refetching.
+ // A failed create returns null (toast shown by the host) and leaves the
+ // create modal open.
+ const handleCreateBuildingSave = async (values: BuildingFormValues) => {
+ const created = await onCreateBuilding(values);
+ if (!created) return;
+ setEntries((prev) => {
+ const next = prev ?? [];
+ if (next.some((e) => e.buildingId === created.id)) return next;
+ return [...next, { buildingId: created.id, label: created.name, rackCount: 0n }];
+ });
+ setShowCreateBuilding(false);
};
const buildingsBusy = saving || sortedEntries === undefined;
@@ -286,20 +285,21 @@ const ManageSiteModal = ({
text: "Manage buildings",
variant: variants.secondary,
onClick: () => setShowManageBuildings(true),
- // Enabled in both modes — create stages buildings into the working
- // set and assigns them on the first Save. Only blocked while the
- // edit-mode list is still loading (sortedEntries undefined).
+ // Only blocked while the building list is still loading
+ // (sortedEntries undefined).
disabled: saving || sortedEntries === undefined,
testId: "manage-site-modal-manage-buildings",
},
{
- text: saving ? "Saving…" : "Save",
+ // Placeholder. Building membership now commits in the picker (and
+ // row-level Remove commits on click), so this modal owns only
+ // building placement within the site — which has no backend yet and
+ // is not tracked by an issue. Until then Save writes nothing and
+ // just closes; deliberately no success toast, since there's nothing
+ // to report.
+ text: "Save",
variant: variants.primary,
- onClick: handleSave,
- // Block Save until the edit-mode building list has loaded.
- // handleSave diffs the working set against initialIdsRef; firing
- // it while entries are still undefined would diff against an empty
- // (or stale) working set and unassign buildings on save.
+ onClick: onDismiss,
disabled: buildingsBusy,
testId: "manage-site-modal-save",
},
@@ -316,6 +316,8 @@ const ManageSiteModal = ({
) : sortedEntries.length === 0 ? (
No buildings added to this site
+ {/* Single affordance — the picker itself carries the
+ "New building" hand-off for creating one from scratch. */}
) : sortedEntries.length === 0 ? (
-
+
) : (
sortedEntries.map((b) => (
@@ -390,15 +389,39 @@ const ManageSiteModal = ({
/>
{showManageBuildings ? (
- // siteId 0n in create mode (no persisted site yet): the picker treats
- // every unassigned building as eligible and disables buildings already
- // in another site, which is exactly the create-time rule.
setShowManageBuildings(false)}
onConfirm={handleManageBuildingsConfirm}
+ saving={saving}
+ // "New building" swaps the picker for the create modal, abandoning
+ // any unsaved checkbox changes — the picker's Save is what commits
+ // membership, so leaving without it writes nothing.
+ onCreateNewLaunch={() => {
+ setShowManageBuildings(false);
+ setShowCreateBuilding(true);
+ }}
+ />
+ ) : null}
+
+ {showCreateBuilding ? (
+ // Create a building already attached to this site. The Site dropdown is
+ // locked to `site` (initialSiteId set), matching the site-scoped
+ // building-create entry point elsewhere.
+ {
+ await handleCreateBuildingSave(values);
+ }}
+ onDismiss={() => setShowCreateBuilding(false)}
+ saving={saving}
/>
) : null}
diff --git a/client/src/protoFleet/features/sites/components/ManageSiteModal/index.ts b/client/src/protoFleet/features/sites/components/ManageSiteModal/index.ts
index fca68b5374..323aea2679 100644
--- a/client/src/protoFleet/features/sites/components/ManageSiteModal/index.ts
+++ b/client/src/protoFleet/features/sites/components/ManageSiteModal/index.ts
@@ -1,4 +1,3 @@
import ManageSiteModal from "./ManageSiteModal";
-export type { ManageSiteModalMode } from "./ManageSiteModal";
export default ManageSiteModal;
diff --git a/client/src/protoFleet/features/sites/components/SiteModals/SiteModals.test.tsx b/client/src/protoFleet/features/sites/components/SiteModals/SiteModals.test.tsx
index d816827003..1a9704b951 100644
--- a/client/src/protoFleet/features/sites/components/SiteModals/SiteModals.test.tsx
+++ b/client/src/protoFleet/features/sites/components/SiteModals/SiteModals.test.tsx
@@ -22,17 +22,19 @@ const makeModals = (overrides: Partial = {}): SiteModalsApi => ({
openManageEdit: vi.fn(),
requestDeleteCurrent: vi.fn(),
dismiss: vi.fn(),
- cancelAll: vi.fn(),
dismissDeleteConfirm: vi.fn(),
detailsContinueCreate: vi.fn(),
detailsSaveEdit: vi.fn(),
manageEditDetails: vi.fn(),
- manageSave: vi.fn().mockResolvedValue(null),
+ manageCreateBuilding: vi.fn().mockResolvedValue(null),
+ manageAssignBuildings: vi.fn().mockResolvedValue(true),
+ manageRemoveBuilding: vi.fn().mockResolvedValue(true),
deleteConfirm: vi.fn().mockResolvedValue(undefined),
...overrides,
});
-vi.mock("@/protoFleet/api/buildings", () => ({
+vi.mock("@/protoFleet/api/buildings", async (importActual) => ({
+ ...(await importActual()),
useBuildings: () => ({
listBuildingsBySite: vi.fn().mockResolvedValue(undefined),
listAllBuildings: vi.fn(),
@@ -85,19 +87,6 @@ describe("SiteModals", () => {
expect(screen.getByText(/Delete site "North DC"\?/)).toBeInTheDocument();
});
- it("Delete in manageCreateEditingDetails calls cancelAll (no cascade dialog)", () => {
- const modals = makeModals({
- state: { kind: "manageCreateEditingDetails", draft: { ...emptySiteFormValues(), name: "Pending" } },
- });
-
- render();
-
- fireEvent.click(screen.getByTestId("site-settings-modal-delete"));
-
- expect(modals.cancelAll).toHaveBeenCalled();
- expect(modals.requestDeleteCurrent).not.toHaveBeenCalled();
- });
-
it("Cancelling the cascade dialog dismisses only the dialog, leaving the underlying modals", () => {
const site = create(SiteSchema, { id: 42n, name: "North DC" });
const siteWithCounts = create(SiteWithCountsSchema, {
diff --git a/client/src/protoFleet/features/sites/components/SiteModals/SiteModals.tsx b/client/src/protoFleet/features/sites/components/SiteModals/SiteModals.tsx
index c0af2f9358..63c3b9500b 100644
--- a/client/src/protoFleet/features/sites/components/SiteModals/SiteModals.tsx
+++ b/client/src/protoFleet/features/sites/components/SiteModals/SiteModals.tsx
@@ -17,44 +17,33 @@ interface SiteModalsProps {
const SiteModals = ({ modals, sites, buildingsRefreshKey }: SiteModalsProps) => {
const { state, deleteTarget } = modals;
- const showManage =
- state.kind === "manageCreate" ||
- state.kind === "manageEdit" ||
- state.kind === "manageCreateEditingDetails" ||
- state.kind === "manageEditEditingDetails";
+ const showManage = state.kind === "manageEdit" || state.kind === "manageEditEditingDetails";
- // Delete in the create flow (whether or not details is stacked) discards
- // the pending create; edit-flow routes through requestDeleteCurrent which
- // opens the cascade dialog from the page-level cache.
- const handleDelete = () => {
- if (state.kind === "manageCreate" || state.kind === "manageCreateEditingDetails") {
- modals.cancelAll();
- return;
- }
- modals.requestDeleteCurrent(sites);
- };
+ // The manage modal is always backed by a persisted site (Continue creates it
+ // up front), so Delete always opens the cascade dialog from the page-level
+ // cache rather than discarding a pending create.
+ const handleDelete = () => modals.requestDeleteCurrent(sites);
- const manageDraft = showManage ? state.draft : undefined;
- const manageSite = state.kind === "manageEdit" || state.kind === "manageEditEditingDetails" ? state.site : undefined;
- const manageMode = state.kind === "manageEdit" || state.kind === "manageEditEditingDetails" ? "edit" : "create";
+ const manageSite = showManage ? state.site : undefined;
return (
<>
{/* Render ManageSiteModal first so SiteSettingsModal's portal lands
later in the DOM and naturally stacks on top at the same z-50. */}
- {showManage && manageDraft ? (
+ {showManage && manageSite ? (
saving={modals.saving}
/>
) : null}
- {state.kind === "manageCreateEditingDetails" ? (
-
- ) : null}
{state.kind === "manageEditEditingDetails" ? (
{
expect((screen.getByTestId("site-settings-capacity-input") as HTMLInputElement).value).toBe("8");
});
- it("Save calls onSave with the typed values", () => {
- const onSave = vi.fn();
+ it("disables Save until a field actually changes", () => {
render(
undefined}
onDeleteRequested={() => undefined}
onDismiss={() => undefined}
/>,
);
+ const save = screen.getByTestId("site-settings-modal-save");
+ // Save fires UpdateSite; with no edit there's nothing to write.
+ expect(save).toBeDisabled();
+
fireEvent.change(screen.getByTestId("site-settings-name-input"), { target: { value: "East DC 2" } });
- fireEvent.click(screen.getByTestId("site-settings-modal-save"));
+ expect(save).not.toBeDisabled();
- expect(onSave).toHaveBeenCalledWith(expect.objectContaining({ name: "East DC 2", powerCapacityMw: 0 }));
+ // Back to the original value → clean again, not latched dirty.
+ fireEvent.change(screen.getByTestId("site-settings-name-input"), { target: { value: "East DC" } });
+ expect(save).toBeDisabled();
});
- it("Delete triggers onDeleteRequested", () => {
- const onDeleteRequested = vi.fn();
+ it("ignores whitespace-only and capacity re-formatting as edits", () => {
render(
undefined}
- onDeleteRequested={onDeleteRequested}
- onDismiss={() => undefined}
- />,
- );
-
- fireEvent.click(screen.getByTestId("site-settings-modal-delete"));
- expect(onDeleteRequested).toHaveBeenCalled();
- });
-});
-
-describe("SiteSettingsModal — createReturn mode", () => {
- it("renders Delete + Save instead of Cancel + Continue", () => {
- render(
- undefined}
onDeleteRequested={() => undefined}
onDismiss={() => undefined}
/>,
);
- expect(screen.queryByTestId("site-settings-modal-continue")).toBeNull();
- expect(screen.queryByTestId("site-settings-modal-cancel")).toBeNull();
- expect(screen.getByTestId("site-settings-modal-delete")).toBeInTheDocument();
- expect(screen.getByTestId("site-settings-modal-save")).toBeInTheDocument();
+ const save = screen.getByTestId("site-settings-modal-save");
+ // The gate compares the same normalized shape buildValues produces, so
+ // neither of these is a real change.
+ fireEvent.change(screen.getByTestId("site-settings-name-input"), { target: { value: "East DC " } });
+ expect(save).toBeDisabled();
+ fireEvent.change(screen.getByTestId("site-settings-capacity-input"), { target: { value: "8.0" } });
+ expect(save).toBeDisabled();
});
- it("Save invokes onContinue with the current values", () => {
- const onContinue = vi.fn();
+ it("Save calls onSave with the typed values", () => {
+ const onSave = vi.fn();
render(
undefined}
onDismiss={() => undefined}
/>,
);
- fireEvent.change(screen.getByTestId("site-settings-name-input"), { target: { value: "North DC 2" } });
+ fireEvent.change(screen.getByTestId("site-settings-name-input"), { target: { value: "East DC 2" } });
fireEvent.click(screen.getByTestId("site-settings-modal-save"));
- expect(onContinue).toHaveBeenCalledWith(expect.objectContaining({ name: "North DC 2" }));
+ expect(onSave).toHaveBeenCalledWith(expect.objectContaining({ name: "East DC 2", powerCapacityMw: 0 }));
});
- it("Delete invokes onDeleteRequested (discard pending create)", () => {
+ it("Delete triggers onDeleteRequested", () => {
const onDeleteRequested = vi.fn();
render(
undefined}
+ mode="edit"
+ initialValues={baseValues({ name: "East DC" })}
+ onSave={() => undefined}
onDeleteRequested={onDeleteRequested}
onDismiss={() => undefined}
/>,
diff --git a/client/src/protoFleet/features/sites/components/SiteSettingsModal/SiteSettingsModal.tsx b/client/src/protoFleet/features/sites/components/SiteSettingsModal/SiteSettingsModal.tsx
index aa6918e9fa..9d238c9a79 100644
--- a/client/src/protoFleet/features/sites/components/SiteSettingsModal/SiteSettingsModal.tsx
+++ b/client/src/protoFleet/features/sites/components/SiteSettingsModal/SiteSettingsModal.tsx
@@ -1,4 +1,4 @@
-import { useCallback, useState } from "react";
+import { useCallback, useMemo, useState } from "react";
import { type SiteFormValues } from "@/protoFleet/api/sites";
import {
@@ -14,11 +14,10 @@ import Modal from "@/shared/components/Modal";
import Select from "@/shared/components/Select";
import Textarea from "@/shared/components/Textarea";
-// "createReturn" is the state when the operator clicks "Edit details" from
-// ManageSiteModal during the create flow — they're already mid-create, so the
-// CTAs read Delete (discard pending site) + Save (apply changes and return to
-// the manage view) instead of Cancel + Continue.
-export type SiteSettingsModalMode = "create" | "createReturn" | "edit";
+// "create" is the initial site-details step. Continue persists the site
+// (CreateSite) and hands off to ManageSiteModal in edit mode; once the site
+// exists, "Edit details" reopens this modal in "edit" mode (UpdateSite).
+export type SiteSettingsModalMode = "create" | "edit";
interface SiteSettingsModalCommonProps {
open: boolean;
@@ -29,12 +28,7 @@ interface SiteSettingsModalCommonProps {
export type SiteSettingsModalProps = SiteSettingsModalCommonProps &
(
- | { mode: "create"; onContinue: (values: SiteFormValues) => void }
- | {
- mode: "createReturn";
- onContinue: (values: SiteFormValues) => void;
- onDeleteRequested: () => void;
- }
+ | { mode: "create"; onContinue: (values: SiteFormValues) => Promise | void }
| {
mode: "edit";
onSave: (values: SiteFormValues) => Promise | void;
@@ -92,12 +86,33 @@ const SiteSettingsModal = (props: SiteSettingsModalProps) => {
if (props.mode === "edit") {
await props.onSave(values);
} else {
- props.onContinue(values);
+ await props.onContinue(values);
}
}, [buildValues, props]);
const nameValid = name.trim().length > 0;
- const primaryDisabled = !nameValid || saving;
+
+ // Edit-mode dirty gate. Compared against the same normalized shape
+ // buildValues produces, so trailing whitespace or a capacity retyped as
+ // "12.50" doesn't read as an edit. buildValues sets capacityError as a side
+ // effect, so the comparison uses its own parse instead of calling it here.
+ const isDirty = useMemo(() => {
+ const capacity = parseCapacity(capacityText);
+ return (
+ name.trim() !== initialValues.name ||
+ address.trim() !== initialValues.address ||
+ city.trim() !== initialValues.locationCity ||
+ state.trim() !== initialValues.locationState ||
+ postalCode.trim() !== initialValues.postalCode ||
+ (country || "US") !== (initialValues.country || "US") ||
+ timezone !== initialValues.timezone ||
+ capacity !== initialValues.powerCapacityMw ||
+ notes !== initialValues.notes
+ );
+ }, [name, address, city, state, postalCode, country, timezone, capacityText, notes, initialValues]);
+
+ // Create has no baseline to diff against, so it gates on validation only.
+ const primaryDisabled = !nameValid || saving || (props.mode === "edit" && !isDirty);
const buttons =
props.mode === "create"
@@ -106,10 +121,14 @@ const SiteSettingsModal = (props: SiteSettingsModalProps) => {
text: "Cancel",
variant: variants.secondary,
onClick: onDismiss,
+ disabled: saving,
testId: "site-settings-modal-cancel",
},
{
- text: "Continue",
+ // Named for the write it performs (CreateSite) rather than "Continue"
+ // — the site exists once this lands, even if the operator bails out
+ // of the manage step that follows.
+ text: saving ? "Creating…" : "Create site",
variant: variants.primary,
onClick: handlePrimary,
disabled: primaryDisabled,
diff --git a/client/src/protoFleet/features/sites/hooks/useSiteModals.test.ts b/client/src/protoFleet/features/sites/hooks/useSiteModals.test.ts
index 3c447c3451..3941303b0c 100644
--- a/client/src/protoFleet/features/sites/hooks/useSiteModals.test.ts
+++ b/client/src/protoFleet/features/sites/hooks/useSiteModals.test.ts
@@ -5,7 +5,8 @@ import { beforeEach, describe, expect, it, vi } from "vitest";
import { create } from "@bufbuild/protobuf";
import { useSiteModals } from "./useSiteModals";
-import { sitesClient } from "@/protoFleet/api/clients";
+import { buildingsClient, sitesClient } from "@/protoFleet/api/clients";
+import { BuildingSchema, CreateBuildingResponseSchema } from "@/protoFleet/api/generated/buildings/v1/buildings_pb";
import {
AssignBuildingsToSiteResponseSchema,
type CreateSiteResponse,
@@ -29,6 +30,9 @@ vi.mock("@/protoFleet/api/clients", () => ({
assignDevicesToSite: vi.fn(),
assignBuildingsToSite: vi.fn(),
},
+ buildingsClient: {
+ createBuilding: vi.fn(),
+ },
}));
vi.mock("@/protoFleet/store", async () => {
@@ -87,49 +91,42 @@ describe("useSiteModals", () => {
});
});
- it("detailsContinueCreate round-trips manageCreate ↔ details preserving edited fields", () => {
- const { result } = renderHook(() => useSiteModals({ refetchSites: vi.fn() }), { wrapper });
+ it("detailsContinueCreate persists the site and opens manageEdit against the new row", async () => {
+ const { create: createResp } = makeSiteResponse(7n, "North DC", "10.0.0.0/24");
+ vi.mocked(sitesClient.createSite).mockResolvedValue(createResp);
+ const refetchSites = vi.fn();
+ const { result } = renderHook(() => useSiteModals({ refetchSites }), { wrapper });
act(() => result.current.openCreate());
- act(() =>
- result.current.detailsContinueCreate({
+
+ await act(async () => {
+ await result.current.detailsContinueCreate({
...emptySiteFormValues(),
name: "North DC",
- locationCity: "Chicago",
- locationState: "IL",
- powerCapacityMw: 5,
- }),
- );
- act(() => result.current.manageEditDetails());
- expect(result.current.state.kind).toBe("manageCreateEditingDetails");
- act(() =>
- result.current.detailsContinueCreate({
- ...emptySiteFormValues(),
- name: "North DC 2",
- locationCity: "Chicago",
- locationState: "IL",
- powerCapacityMw: 5,
- }),
- );
- expect(result.current.state.kind).toBe("manageCreate");
- if (result.current.state.kind === "manageCreate") {
- expect(result.current.state.draft.name).toBe("North DC 2");
- expect(result.current.state.draft.powerCapacityMw).toBe(5);
+ networkConfig: "10.0.0.0/24",
+ });
+ });
+
+ expect(sitesClient.createSite).toHaveBeenCalledTimes(1);
+ expect(refetchSites).toHaveBeenCalled();
+ // The manage modal now runs in edit mode against the freshly-created site.
+ expect(result.current.state.kind).toBe("manageEdit");
+ if (result.current.state.kind === "manageEdit") {
+ expect(result.current.state.site.id).toBe(7n);
+ expect(result.current.state.draft.name).toBe("North DC");
}
});
- it("dismiss from manageCreateEditingDetails returns to manageCreate", () => {
+ it("detailsContinueCreate stays on details when CreateSite fails", async () => {
+ vi.mocked(sitesClient.createSite).mockRejectedValue(new Error("boom"));
const { result } = renderHook(() => useSiteModals({ refetchSites: vi.fn() }), { wrapper });
act(() => result.current.openCreate());
- act(() =>
- result.current.detailsContinueCreate({
- ...emptySiteFormValues(),
- name: "X",
- }),
- );
- act(() => result.current.manageEditDetails());
- expect(result.current.state.kind).toBe("manageCreateEditingDetails");
- act(() => result.current.dismiss());
- expect(result.current.state.kind).toBe("manageCreate");
+
+ await act(async () => {
+ await result.current.detailsContinueCreate({ ...emptySiteFormValues(), name: "North DC" });
+ });
+
+ // No transition — the operator can fix the input and retry.
+ expect(result.current.state.kind).toBe("detailsCreate");
});
it("manageEditDetails on manageEdit stacks to manageEditEditingDetails; dismiss drops back to manageEdit", () => {
@@ -142,63 +139,48 @@ describe("useSiteModals", () => {
expect(result.current.state.kind).toBe("manageEdit");
});
- it("manageSave on manageCreate runs CreateSite and reports closeOnSuccess", async () => {
- const { create: createResp } = makeSiteResponse(7n, "North DC", "10.0.0.0/24");
- vi.mocked(sitesClient.createSite).mockResolvedValue(createResp);
- const refetchSites = vi.fn();
- const { result } = renderHook(() => useSiteModals({ refetchSites }), { wrapper });
- act(() => result.current.openCreate());
- act(() =>
- result.current.detailsContinueCreate({
- ...emptySiteFormValues(),
- name: "North DC",
- networkConfig: "10.0.0.0/24",
+ it("manageCreateBuilding creates a building against the managed site and returns it", async () => {
+ vi.mocked(buildingsClient.createBuilding).mockResolvedValue(
+ create(CreateBuildingResponseSchema, {
+ building: create(BuildingSchema, { id: 42n, name: "Bldg A", siteId: 3n }),
+ assignedRackCount: 0n,
+ reassignedDeviceCount: 0n,
+ conflicts: [],
}),
);
-
- let saveResult: { closeOnSuccess: boolean } | null | undefined;
- await act(async () => {
- saveResult = await result.current.manageSave({ added: [], removed: [] });
- });
-
- await waitFor(() => {
- expect(sitesClient.createSite).toHaveBeenCalledTimes(1);
- });
- // With no staged buildings the create skips the buildings RPC entirely.
- expect(sitesClient.assignBuildingsToSite).not.toHaveBeenCalled();
- expect(saveResult?.closeOnSuccess).toBe(true);
- expect(refetchSites).toHaveBeenCalled();
- });
-
- it("manageSave on manageCreate assigns staged buildings to the new site", async () => {
- const { create: createResp } = makeSiteResponse(7n, "North DC");
- vi.mocked(sitesClient.createSite).mockResolvedValue(createResp);
- vi.mocked(sitesClient.assignBuildingsToSite).mockResolvedValue(
- create(AssignBuildingsToSiteResponseSchema, { reassignedRackCount: 0n, reassignedDeviceCount: 0n }),
- );
const refetchSites = vi.fn();
+ const site = create(SiteSchema, { id: 3n, name: "North DC" });
const { result } = renderHook(() => useSiteModals({ refetchSites }), { wrapper });
- act(() => result.current.openCreate());
- act(() => result.current.detailsContinueCreate({ ...emptySiteFormValues(), name: "North DC" }));
+ act(() => result.current.openManageEdit(site));
- let saveResult: { closeOnSuccess: boolean } | null | undefined;
+ let created: Awaited> | undefined;
await act(async () => {
- saveResult = await result.current.manageSave({ added: [11n, 12n], removed: [] });
+ created = await result.current.manageCreateBuilding({
+ name: "Bldg A",
+ description: "",
+ powerCapacityMw: 0,
+ overheadKw: 0,
+ aisles: 0,
+ racksPerAisle: 0,
+ physicalRackCount: 0,
+ defaultRackRows: 0,
+ defaultRackColumns: 0,
+ defaultRackOrderIndex: 0,
+ });
});
- await waitFor(() => {
- expect(sitesClient.createSite).toHaveBeenCalledTimes(1);
- });
- // Staged buildings are assigned to the freshly-created site (id 7).
- expect(sitesClient.assignBuildingsToSite).toHaveBeenCalledWith(
- { buildingIds: [11n, 12n], targetSiteId: 7n },
+ // Created against the currently-managed site (id 3).
+ expect(buildingsClient.createBuilding).toHaveBeenCalledWith(
+ expect.objectContaining({ siteId: 3n, name: "Bldg A" }),
expect.anything(),
);
- expect(saveResult?.closeOnSuccess).toBe(true);
+ expect(created?.id).toBe(42n);
+ // Site catalog is refreshed for the building count; the modal injects the
+ // row itself, so the building list is deliberately not refetched here.
expect(refetchSites).toHaveBeenCalled();
});
- it("manageSave on manageEdit applies the building delta via AssignBuildingsToSite", async () => {
+ it("manageAssignBuildings applies the picker delta via AssignBuildingsToSite", async () => {
vi.mocked(sitesClient.assignBuildingsToSite).mockResolvedValue(
create(AssignBuildingsToSiteResponseSchema, { reassignedRackCount: 0n, reassignedDeviceCount: 0n }),
);
@@ -208,9 +190,9 @@ describe("useSiteModals", () => {
const { result } = renderHook(() => useSiteModals({ refetchSites, refetchBuildings }), { wrapper });
act(() => result.current.openManageEdit(site));
- let saveResult: { closeOnSuccess: boolean } | null | undefined;
+ let ok: boolean | undefined;
await act(async () => {
- saveResult = await result.current.manageSave({ added: [10n], removed: [20n] });
+ ok = await result.current.manageAssignBuildings({ added: [10n], removed: [20n] });
});
// Two calls: removed → "Unassigned" (no target), added → this site.
@@ -225,23 +207,44 @@ describe("useSiteModals", () => {
{ buildingIds: [10n], targetSiteId: 3n },
expect.anything(),
);
- expect(saveResult?.closeOnSuccess).toBe(true);
+ expect(ok).toBe(true);
expect(refetchSites).toHaveBeenCalled();
// Membership changed building rows, so the building table refresh fires too.
expect(refetchBuildings).toHaveBeenCalled();
});
- it("manageSave on manageEdit with an empty delta closes without an RPC", async () => {
+ it("manageAssignBuildings with an empty delta fires no RPC", async () => {
const { result } = renderHook(() => useSiteModals({ refetchSites: vi.fn() }), { wrapper });
act(() => result.current.openManageEdit(create(SiteSchema, { id: 3n, name: "North DC" })));
- let saveResult: { closeOnSuccess: boolean } | null | undefined;
+ let ok: boolean | undefined;
await act(async () => {
- saveResult = await result.current.manageSave({ added: [], removed: [] });
+ ok = await result.current.manageAssignBuildings({ added: [], removed: [] });
});
expect(sitesClient.assignBuildingsToSite).not.toHaveBeenCalled();
- expect(saveResult?.closeOnSuccess).toBe(true);
+ expect(ok).toBe(true);
+ });
+
+ it("manageRemoveBuilding unassigns the building immediately", async () => {
+ vi.mocked(sitesClient.assignBuildingsToSite).mockResolvedValue(
+ create(AssignBuildingsToSiteResponseSchema, { reassignedRackCount: 0n, reassignedDeviceCount: 0n }),
+ );
+ const refetchSites = vi.fn();
+ const { result } = renderHook(() => useSiteModals({ refetchSites }), { wrapper });
+ act(() => result.current.openManageEdit(create(SiteSchema, { id: 3n, name: "North DC" })));
+
+ let ok: boolean | undefined;
+ await act(async () => {
+ ok = await result.current.manageRemoveBuilding(20n, "Building A");
+ });
+
+ expect(sitesClient.assignBuildingsToSite).toHaveBeenCalledWith(
+ { buildingIds: [20n], targetSiteId: undefined },
+ expect.anything(),
+ );
+ expect(ok).toBe(true);
+ expect(refetchSites).toHaveBeenCalled();
});
it("detailsSaveEdit refreshes manage with server-canonical site on success", async () => {
@@ -368,18 +371,4 @@ describe("useSiteModals", () => {
expect(useFleetStore.getState().ui.activeSite).toEqual({ kind: "site", id: "11", slug: "active" });
});
-
- it("cancelAll closes every modal and clears deleteTarget", () => {
- const site = create(SiteSchema, { id: 5n, name: "T" });
- const { result } = renderHook(() => useSiteModals({ refetchSites: vi.fn() }), { wrapper });
- act(() => result.current.openManageEdit(site));
- act(() =>
- result.current.requestDeleteCurrent([
- create(SiteWithCountsSchema, { site, deviceCount: 0n, rackCount: 0n, buildingCount: 0n }),
- ]),
- );
- act(() => result.current.cancelAll());
- expect(result.current.state.kind).toBe("none");
- expect(result.current.deleteTarget).toBeNull();
- });
});
diff --git a/client/src/protoFleet/features/sites/hooks/useSiteModals.ts b/client/src/protoFleet/features/sites/hooks/useSiteModals.ts
index f820898f02..c95839fb13 100644
--- a/client/src/protoFleet/features/sites/hooks/useSiteModals.ts
+++ b/client/src/protoFleet/features/sites/hooks/useSiteModals.ts
@@ -1,6 +1,8 @@
import { useCallback, useEffect, useRef, useState } from "react";
import { useLocation, useNavigate } from "react-router-dom";
+import { type BuildingFormValues, useBuildings } from "@/protoFleet/api/buildings";
+import { type Building } from "@/protoFleet/api/generated/buildings/v1/buildings_pb";
import { type Site, type SiteWithCounts } from "@/protoFleet/api/generated/sites/v1/sites_pb";
import { emptySiteFormValues, type SiteFormValues, siteFormValuesFromSite, useSites } from "@/protoFleet/api/sites";
import { scopeCurrentOrDashboardPath, useRouteSiteScope } from "@/protoFleet/routing/siteScope";
@@ -15,15 +17,16 @@ import { pushToast, STATUSES } from "@/shared/features/toaster";
// modal they came from.
export type SiteModalState =
| { kind: "none" }
+ // Initial create step. "Continue" now persists the site (CreateSite) and
+ // transitions straight to manageEdit against the real row, so the manage
+ // surface always has a site id — inline building-create and
+ // AssignBuildingsToSite both need one. Mirrors the seeded "New site" flow in
+ // FleetCreateFlowProvider, which already creates-then-openManageEdit.
| { kind: "detailsCreate"; draft: SiteFormValues }
- | { kind: "manageCreate"; draft: SiteFormValues }
- // Stacked: ManageSiteModal stays open while SiteSettingsModal renders on
- // top. CTAs in details read Delete (discard pending create) + Save (apply
- // changes and return to manage).
- | { kind: "manageCreateEditingDetails"; draft: SiteFormValues }
| { kind: "manageEdit"; site: Site; draft: SiteFormValues }
- // Stacked edit-flow counterpart. Save calls UpdateSite directly; on
- // success details closes and manage stays open with refreshed draft.
+ // Stacked: ManageSiteModal stays open while SiteSettingsModal renders on top.
+ // Save calls UpdateSite directly; on success details closes and manage stays
+ // open with refreshed draft.
| { kind: "manageEditEditingDetails"; site: Site; draft: SiteFormValues };
interface UseSiteModalsOptions {
@@ -56,22 +59,28 @@ export interface SiteModalsApi {
// Closes the topmost modal: drops details if details is stacked on
// manage, otherwise closes everything to none.
dismiss: () => void;
- // Closes every modal regardless of stack — used when the operator
- // discards a pending create from the SiteSettingsModal Delete button.
- cancelAll: () => void;
// SiteDeleteDialog onDismiss — closes only the cascade dialog.
dismissDeleteConfirm: () => void;
- // SiteSettingsModal handlers
- detailsContinueCreate: (values: SiteFormValues) => void;
+ // SiteSettingsModal handlers. Continue persists the site (CreateSite) and,
+ // on success, opens ManageSiteModal in edit mode against the new row.
+ detailsContinueCreate: (values: SiteFormValues) => Promise;
detailsSaveEdit: (values: SiteFormValues) => Promise;
// ManageSiteModal handlers
manageEditDetails: () => void;
- // Persists building-membership changes accumulated in the manage modal.
- // In create mode this runs CreateSite, then assigns any buildings the
- // operator staged (the delta's `added`) to the new site. In edit mode it
- // applies the delta via AssignBuildingsToSite. Returns whether the modal
- // should close on success, or null if the save failed.
- manageSave: (delta: { added: bigint[]; removed: bigint[] }) => Promise<{ closeOnSuccess: boolean } | null>;
+ // Inline building-create from ManageSiteModal. Creates the building against
+ // the currently-managed site via the transactional CreateBuilding RPC and
+ // returns the created row so the modal can inject it into its working set.
+ // Returns null on failure (a toast is shown); a duplicate name surfaces as
+ // a server error and creates nothing.
+ manageCreateBuilding: (values: BuildingFormValues) => Promise;
+ // Commit-per-modal: the buildings picker owns site membership, so its Save
+ // applies the delta via AssignBuildingsToSite right away rather than staging
+ // it into ManageSiteModal. `added` moves buildings into this site; `removed`
+ // moves them to "Unassigned". Resolves true on success.
+ manageAssignBuildings: (delta: { added: bigint[]; removed: bigint[] }) => Promise;
+ // Kebab "Remove building" — an immediate unassign (targetSiteId unset), so
+ // the row action means what it says instead of queueing behind a Save.
+ manageRemoveBuilding: (buildingId: bigint, label: string) => Promise;
// SiteDeleteDialog handlers
deleteConfirm: () => Promise;
}
@@ -101,6 +110,7 @@ const useSiteModals = ({ refetchSites, refetchBuildings }: UseSiteModalsOptions)
}, [state]);
const { createSite, updateSite, deleteSite, assignBuildingsToSite } = useSites();
+ const { createBuilding } = useBuildings();
const setActiveSite = useFleetStore((store) => store.ui.setActiveSite);
const activeSite = useFleetStore((store) => store.ui.activeSite);
// Signals the PageHeader's SitePicker (which fetches sites once on mount and
@@ -146,10 +156,9 @@ const useSiteModals = ({ refetchSites, refetchBuildings }: UseSiteModalsOptions)
}, []);
const dismiss = useCallback(() => {
- // Stacked states drop just the top (details) and return to the underlying
- // manage state. Everything else closes to none.
+ // The stacked edit-details state drops just the top (details) and returns
+ // to the underlying manage state. Everything else closes to none.
setState((prev) => {
- if (prev.kind === "manageCreateEditingDetails") return { kind: "manageCreate", draft: prev.draft };
if (prev.kind === "manageEditEditingDetails") {
return { kind: "manageEdit", site: prev.site, draft: prev.draft };
}
@@ -157,26 +166,57 @@ const useSiteModals = ({ refetchSites, refetchBuildings }: UseSiteModalsOptions)
});
}, []);
- const cancelAll = useCallback(() => {
- setState({ kind: "none" });
- setDeleteTarget(null);
- }, []);
-
const dismissDeleteConfirm = useCallback(() => {
setDeleteTarget(null);
}, []);
- const detailsContinueCreate = useCallback((values: SiteFormValues) => {
- // Carry the existing networkConfig draft through; SiteSettingsModal only
- // owns the descriptive fields, so the value typed in ManageSiteModal
- // survives bouncing between the two surfaces.
- setState((prev) => {
- if (prev.kind === "detailsCreate" || prev.kind === "manageCreateEditingDetails") {
- return { kind: "manageCreate", draft: { ...values, networkConfig: prev.draft.networkConfig } };
+ // Continue on the create-details modal persists the site immediately, then
+ // opens ManageSiteModal in edit mode against the new row. Creating the site
+ // up front (rather than deferring to the manage modal's Save) gives inline
+ // building-create a real site_id to attach to. On failure the details modal
+ // stays open so the operator can fix the input and retry (e.g. a duplicate
+ // name). Guarded so a double-click can't fire two CreateSite calls.
+ const detailsContinueCreate = useCallback(
+ async (values: SiteFormValues) => {
+ if (savingRef.current) return;
+ const current = stateRef.current;
+ if (current.kind !== "detailsCreate") return;
+ // Carry the existing networkConfig draft through; SiteSettingsModal only
+ // owns the descriptive fields, so the value typed elsewhere survives.
+ const draft: SiteFormValues = { ...values, networkConfig: current.draft.networkConfig };
+ savingRef.current = true;
+ setSaving(true);
+ try {
+ await new Promise((resolve) => {
+ void createSite({
+ values: draft,
+ onSuccess: ({ site, networkConfigWarnings }) => {
+ pushToast({
+ message:
+ networkConfigWarnings.length > 0
+ ? `Site "${site.name}" created with warnings`
+ : `Site "${site.name}" created`,
+ status: STATUSES.success,
+ });
+ refetchSites();
+ refetchBuildings?.();
+ bumpSitesRevision();
+ setState({ kind: "manageEdit", site, draft: siteFormValuesFromSite(site) });
+ resolve();
+ },
+ onError: (msg) => {
+ pushToast({ message: `Failed to create site: ${msg}`, status: STATUSES.error });
+ resolve();
+ },
+ });
+ });
+ } finally {
+ savingRef.current = false;
+ setSaving(false);
}
- return prev;
- });
- }, []);
+ },
+ [createSite, refetchSites, refetchBuildings, bumpSitesRevision],
+ );
const detailsSaveEdit = useCallback(
async (values: SiteFormValues) => {
@@ -256,7 +296,6 @@ const useSiteModals = ({ refetchSites, refetchBuildings }: UseSiteModalsOptions)
setState((prev) => {
// Stack details on top of manage. Manage stays in the underlying state
// so it remains visible behind SiteSettingsModal.
- if (prev.kind === "manageCreate") return { kind: "manageCreateEditingDetails", draft: prev.draft };
if (prev.kind === "manageEdit") {
return { kind: "manageEditEditingDetails", site: prev.site, draft: prev.draft };
}
@@ -264,135 +303,126 @@ const useSiteModals = ({ refetchSites, refetchBuildings }: UseSiteModalsOptions)
});
}, []);
- const manageSave = useCallback(
- async (delta: { added: bigint[]; removed: bigint[] }) => {
+ // Inline building-create from the manage modal. The building is created and
+ // associated to the current site in one transactional RPC (#821), so it
+ // needs no follow-up AssignBuildingsToSite. Returns the created row to the
+ // modal, which injects it into its local working set (rather than triggering
+ // a list refetch) so any buildings staged via the picker are preserved.
+ const manageCreateBuilding = useCallback(
+ async (values: BuildingFormValues): Promise => {
if (savingRef.current) return null;
+ const current = stateRef.current;
+ if (current.kind !== "manageEdit" && current.kind !== "manageEditEditingDetails") return null;
+ const siteId = current.site.id;
+ savingRef.current = true;
+ setSaving(true);
+ return await new Promise((resolve) => {
+ void createBuilding({
+ values,
+ siteId,
+ onSuccess: ({ building }) => {
+ pushToast({ message: `Building "${building.name}" created`, status: STATUSES.success });
+ // Refresh the site catalog (building counts) but deliberately NOT
+ // the modal's building list — the modal injects the new row
+ // locally so unsaved picker selections survive.
+ refetchSites();
+ resolve(building);
+ },
+ onError: (msg) => {
+ pushToast({ message: `Failed to create building: ${msg}`, status: STATUSES.error });
+ resolve(null);
+ },
+ onFinally: () => {
+ savingRef.current = false;
+ setSaving(false);
+ },
+ });
+ });
+ },
+ [createBuilding, refetchSites],
+ );
- // Create flow: persist the site, then assign any buildings the operator
- // staged in the manage modal before the site existed. `added` carries
- // those buildings (the working set started empty, so there's never a
- // `removed`); they're assigned to the freshly-created site's id. The two
- // steps are sequenced explicitly (rather than chained through
- // createSite's onFinally) so the saving guard stays held across both —
- // an async onSuccess would otherwise release it the moment the building
- // assign awaited.
- if (state.kind === "manageCreate") {
- const draft = state.draft;
- savingRef.current = true;
- setSaving(true);
- try {
- const created = await new Promise<{ site: Site; warnings: string[] } | null>((resolve) => {
- void createSite({
- values: draft,
- onSuccess: ({ site, networkConfigWarnings }) => resolve({ site, warnings: networkConfigWarnings }),
- onError: (msg) => {
- pushToast({ message: `Failed to create site: ${msg}`, status: STATUSES.error });
- resolve(null);
- },
- });
- });
- if (!created) return null;
-
- // The site is committed past this point. A subsequent
- // AssignBuildingsToSite failure must not read as a failed create —
- // surface a partial-success warning and still close, matching the
- // bulk "New site" seeded flow in FleetCreateFlowProvider.
- let buildingsFailed: string | null = null;
- if (delta.added.length > 0) {
- await new Promise((resolve) => {
- void assignBuildingsToSite({
- buildingIds: delta.added,
- targetSiteId: created.site.id,
- onSuccess: () => resolve(),
- onError: (msg) => {
- buildingsFailed = msg;
- resolve();
- },
- });
- });
- }
-
- pushToast(
- buildingsFailed
- ? {
- message: `Site "${created.site.name}" created, but adding buildings failed: ${buildingsFailed}`,
- status: STATUSES.error,
- }
- : {
- message:
- created.warnings.length > 0
- ? `Site "${created.site.name}" created with warnings`
- : `Site "${created.site.name}" created`,
- status: STATUSES.success,
- },
- );
- refetchSites();
- refetchBuildings?.();
- bumpSitesRevision();
- return { closeOnSuccess: true };
- } finally {
- savingRef.current = false;
- setSaving(false);
+ // Shared AssignBuildingsToSite dispatcher. `targetSiteId` unset moves the
+ // buildings to "Unassigned"; either way the server cascades site_id down to
+ // racks + devices.
+ const dispatchAssign = useCallback(
+ (buildingIds: bigint[], targetSiteId?: bigint) =>
+ new Promise((resolve, reject) => {
+ if (buildingIds.length === 0) {
+ resolve();
+ return;
}
- }
+ void assignBuildingsToSite({
+ buildingIds,
+ targetSiteId,
+ onSuccess: () => resolve(),
+ onError: (msg) => reject(new Error(msg)),
+ });
+ }),
+ [assignBuildingsToSite],
+ );
- // Edit flow: site details are owned by SiteSettingsModal, so the
- // manage modal's Save only persists building membership. A no-op
- // delta (operator opened Save without changes) closes silently.
- if (state.kind === "manageEdit") {
- if (delta.added.length === 0 && delta.removed.length === 0) {
- return { closeOnSuccess: true };
- }
- const id = state.site.id;
- const name = state.site.name;
- savingRef.current = true;
- setSaving(true);
- try {
- // `added` moves buildings into this site; `removed` moves them to
- // "Unassigned" (targetSiteId unset). Both cascade site_id down to
- // racks + devices server-side. Run sequentially so a mid-chain
- // failure surfaces without a half-applied toast.
- const dispatch = (buildingIds: bigint[], targetSiteId?: bigint) =>
- new Promise((resolve, reject) => {
- if (buildingIds.length === 0) {
- resolve();
- return;
- }
- void assignBuildingsToSite({
- buildingIds,
- targetSiteId,
- onSuccess: () => resolve(),
- onError: (msg) => reject(new Error(msg)),
- });
- });
- try {
- await dispatch(delta.removed, undefined);
- await dispatch(delta.added, id);
- } catch (err) {
- const detail = err instanceof Error ? err.message : "Failed to save buildings";
- pushToast({ message: `Failed to save site: ${detail}`, status: STATUSES.error });
- // The two AssignBuildingsToSite calls aren't atomic across each
- // other: the `removed` batch may have already cascaded buildings
- // out of the site before the `added` batch failed. Refresh so the
- // counts + building table reflect what actually committed rather
- // than the now-stale pre-save view.
- refetchSites();
- refetchBuildings?.();
- return null;
- }
- pushToast({ message: `Site "${name}" saved`, status: STATUSES.success });
- refetchSites();
- refetchBuildings?.();
- return { closeOnSuccess: true };
- } finally {
- savingRef.current = false;
- setSaving(false);
- }
+ const manageAssignBuildings = useCallback(
+ async (delta: { added: bigint[]; removed: bigint[] }): Promise => {
+ if (savingRef.current) return false;
+ const current = stateRef.current;
+ if (current.kind !== "manageEdit" && current.kind !== "manageEditEditingDetails") return false;
+ if (delta.added.length === 0 && delta.removed.length === 0) return true;
+ const id = current.site.id;
+ savingRef.current = true;
+ setSaving(true);
+ try {
+ // Sequential so a mid-chain failure surfaces without a half-applied
+ // success toast.
+ await dispatchAssign(delta.removed, undefined);
+ await dispatchAssign(delta.added, id);
+ } catch (err) {
+ const detail = err instanceof Error ? err.message : "Failed to assign buildings";
+ pushToast({ message: `Failed to update buildings: ${detail}`, status: STATUSES.error });
+ // The two calls aren't atomic across each other: the `removed` batch
+ // may have already cascaded buildings out of the site before `added`
+ // failed. Refresh so the counts + building table reflect what actually
+ // committed rather than the now-stale pre-save view.
+ refetchSites();
+ refetchBuildings?.();
+ return false;
+ } finally {
+ savingRef.current = false;
+ setSaving(false);
}
+ const count = delta.added.length + delta.removed.length;
+ pushToast({
+ message: `${count} ${count === 1 ? "building" : "buildings"} updated`,
+ status: STATUSES.success,
+ });
+ refetchSites();
+ refetchBuildings?.();
+ return true;
+ },
+ [dispatchAssign, refetchSites, refetchBuildings],
+ );
- return null;
+ const manageRemoveBuilding = useCallback(
+ async (buildingId: bigint, label: string): Promise => {
+ if (savingRef.current) return false;
+ savingRef.current = true;
+ setSaving(true);
+ try {
+ await dispatchAssign([buildingId], undefined);
+ } catch (err) {
+ const detail = err instanceof Error ? err.message : "Failed to remove building";
+ pushToast({ message: `Failed to remove "${label}": ${detail}`, status: STATUSES.error });
+ return false;
+ } finally {
+ savingRef.current = false;
+ setSaving(false);
+ }
+ pushToast({ message: `"${label}" removed from this site`, status: STATUSES.success });
+ refetchSites();
+ refetchBuildings?.();
+ return true;
},
- [state, createSite, assignBuildingsToSite, refetchSites, refetchBuildings, bumpSitesRevision],
+ [dispatchAssign, refetchSites, refetchBuildings],
);
const deleteConfirm = useCallback(async () => {
@@ -442,12 +472,13 @@ const useSiteModals = ({ refetchSites, refetchBuildings }: UseSiteModalsOptions)
openManageEdit,
requestDeleteCurrent,
dismiss,
- cancelAll,
dismissDeleteConfirm,
detailsContinueCreate,
detailsSaveEdit,
manageEditDetails,
- manageSave,
+ manageCreateBuilding,
+ manageAssignBuildings,
+ manageRemoveBuilding,
deleteConfirm,
};
};
diff --git a/proto/device_set/v1/device_set.proto b/proto/device_set/v1/device_set.proto
index 5961da405b..fb4eeea389 100644
--- a/proto/device_set/v1/device_set.proto
+++ b/proto/device_set/v1/device_set.proto
@@ -90,6 +90,15 @@ service DeviceSetService {
// device_selector accepts only the device_list variant. all_devices
// is rejected with InvalidArgument because moving every paired
// device into a single rack is never the intended operation.
+ //
+ // slot_assignments optionally carries each moved device's slot inside
+ // the target rack, so membership and placement land in the same
+ // transaction. This is the rack-level counterpart to
+ // buildings.v1.AssignRacksToBuilding: a delta that names only the
+ // children it changes, with placement optional per child. Prefer it
+ // over SaveRack for every edit — SaveRack replaces the rack's whole
+ // member set, so a stale client snapshot silently drops members
+ // added concurrently.
rpc AssignDevicesToRack(AssignDevicesToRackRequest) returns (AssignDevicesToRackResponse);
}
@@ -729,6 +738,29 @@ message AssignDevicesToRackRequest {
// `conflicts` and writes nothing. Set true to proceed and clear the
// conflicting miners' site (and building) as part of the move.
optional bool force_clear_conflicting_site = 3;
+
+ // Slot placements for the devices being assigned. The rack-level
+ // analogue of buildings.v1.RackPlacement's optional aisle_index /
+ // position_in_aisle: the batch names only the devices it is changing,
+ // and each named device ends up either placed or explicitly unplaced.
+ //
+ // Per entry: `position` set places the device there, `position` unset
+ // CLEARS its slot. A device not named here is untouched, so one call
+ // can mix placed, unplaced and left-alone miners. Every named device
+ // is cleared before any position is written, which is what lets a
+ // relayout swap two occupied cells without tripping
+ // uk_rack_slot_position mid-batch.
+ //
+ // Empty (the default): no slot is written at all. A device already in
+ // the target rack keeps its slot; a device arriving from another rack
+ // starts unplaced, because its old slot died with its old membership.
+ //
+ // Every entry must name a device present in device_selector — a slot
+ // needs a membership row to hang off — and no two entries may share a
+ // device or a position. Positions are bounds checked against the
+ // target rack's rows/columns. Requires target_rack_id: an unassign has
+ // no rack to place into.
+ repeated RackSlot slot_assignments = 4 [(buf.validate.field).repeated.max_items = 10000];
}
message AssignDevicesToRackResponse {
diff --git a/server/generated/grpc/device_set/v1/device_set.pb.go b/server/generated/grpc/device_set/v1/device_set.pb.go
index 6b9c85b0f5..dad3beb3bb 100644
--- a/server/generated/grpc/device_set/v1/device_set.pb.go
+++ b/server/generated/grpc/device_set/v1/device_set.pb.go
@@ -3251,8 +3251,30 @@ type AssignDevicesToRackRequest struct {
// `conflicts` and writes nothing. Set true to proceed and clear the
// conflicting miners' site (and building) as part of the move.
ForceClearConflictingSite *bool `protobuf:"varint,3,opt,name=force_clear_conflicting_site,json=forceClearConflictingSite,proto3,oneof" json:"force_clear_conflicting_site,omitempty"`
- unknownFields protoimpl.UnknownFields
- sizeCache protoimpl.SizeCache
+ // Slot placements for the devices being assigned. The rack-level
+ // analogue of buildings.v1.RackPlacement's optional aisle_index /
+ // position_in_aisle: the batch names only the devices it is changing,
+ // and each named device ends up either placed or explicitly unplaced.
+ //
+ // Per entry: `position` set places the device there, `position` unset
+ // CLEARS its slot. A device not named here is untouched, so one call
+ // can mix placed, unplaced and left-alone miners. Every named device
+ // is cleared before any position is written, which is what lets a
+ // relayout swap two occupied cells without tripping
+ // uk_rack_slot_position mid-batch.
+ //
+ // Empty (the default): no slot is written at all. A device already in
+ // the target rack keeps its slot; a device arriving from another rack
+ // starts unplaced, because its old slot died with its old membership.
+ //
+ // Every entry must name a device present in device_selector — a slot
+ // needs a membership row to hang off — and no two entries may share a
+ // device or a position. Positions are bounds checked against the
+ // target rack's rows/columns. Requires target_rack_id: an unassign has
+ // no rack to place into.
+ SlotAssignments []*RackSlot `protobuf:"bytes,4,rep,name=slot_assignments,json=slotAssignments,proto3" json:"slot_assignments,omitempty"`
+ unknownFields protoimpl.UnknownFields
+ sizeCache protoimpl.SizeCache
}
func (x *AssignDevicesToRackRequest) Reset() {
@@ -3306,6 +3328,13 @@ func (x *AssignDevicesToRackRequest) GetForceClearConflictingSite() bool {
return false
}
+func (x *AssignDevicesToRackRequest) GetSlotAssignments() []*RackSlot {
+ if x != nil {
+ return x.SlotAssignments
+ }
+ return nil
+}
+
type AssignDevicesToRackResponse struct {
state protoimpl.MessageState `protogen:"open.v1"`
// Number of devices whose rack membership now points at
@@ -3912,7 +3941,7 @@ var file_device_set_v1_device_set_proto_rawDesc = string([]byte{
0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x5f,
0x73, 0x65, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x50, 0x65, 0x72, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65,
0x52, 0x61, 0x63, 0x6b, 0x43, 0x6f, 0x6e, 0x66, 0x6c, 0x69, 0x63, 0x74, 0x52, 0x09, 0x63, 0x6f,
- 0x6e, 0x66, 0x6c, 0x69, 0x63, 0x74, 0x73, 0x22, 0x96, 0x02, 0x0a, 0x1a, 0x41, 0x73, 0x73, 0x69,
+ 0x6e, 0x66, 0x6c, 0x69, 0x63, 0x74, 0x73, 0x22, 0xe5, 0x02, 0x0a, 0x1a, 0x41, 0x73, 0x73, 0x69,
0x67, 0x6e, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x73, 0x54, 0x6f, 0x52, 0x61, 0x63, 0x6b, 0x52,
0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x32, 0x0a, 0x0e, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74,
0x5f, 0x72, 0x61, 0x63, 0x6b, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x42, 0x07,
@@ -3926,209 +3955,214 @@ var file_device_set_v1_device_set_proto_rawDesc = string([]byte{
0x63, 0x6c, 0x65, 0x61, 0x72, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x6c, 0x69, 0x63, 0x74, 0x69, 0x6e,
0x67, 0x5f, 0x73, 0x69, 0x74, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x48, 0x01, 0x52, 0x19,
0x66, 0x6f, 0x72, 0x63, 0x65, 0x43, 0x6c, 0x65, 0x61, 0x72, 0x43, 0x6f, 0x6e, 0x66, 0x6c, 0x69,
- 0x63, 0x74, 0x69, 0x6e, 0x67, 0x53, 0x69, 0x74, 0x65, 0x88, 0x01, 0x01, 0x42, 0x11, 0x0a, 0x0f,
- 0x5f, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x5f, 0x72, 0x61, 0x63, 0x6b, 0x5f, 0x69, 0x64, 0x42,
- 0x1f, 0x0a, 0x1d, 0x5f, 0x66, 0x6f, 0x72, 0x63, 0x65, 0x5f, 0x63, 0x6c, 0x65, 0x61, 0x72, 0x5f,
- 0x63, 0x6f, 0x6e, 0x66, 0x6c, 0x69, 0x63, 0x74, 0x69, 0x6e, 0x67, 0x5f, 0x73, 0x69, 0x74, 0x65,
- 0x22, 0xe1, 0x01, 0x0a, 0x1b, 0x41, 0x73, 0x73, 0x69, 0x67, 0x6e, 0x44, 0x65, 0x76, 0x69, 0x63,
- 0x65, 0x73, 0x54, 0x6f, 0x52, 0x61, 0x63, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
- 0x12, 0x25, 0x0a, 0x0e, 0x61, 0x73, 0x73, 0x69, 0x67, 0x6e, 0x65, 0x64, 0x5f, 0x63, 0x6f, 0x75,
- 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0d, 0x61, 0x73, 0x73, 0x69, 0x67, 0x6e,
- 0x65, 0x64, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x32, 0x0a, 0x15, 0x73, 0x69, 0x74, 0x65, 0x5f,
- 0x72, 0x65, 0x61, 0x73, 0x73, 0x69, 0x67, 0x6e, 0x65, 0x64, 0x5f, 0x63, 0x6f, 0x75, 0x6e, 0x74,
- 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x13, 0x73, 0x69, 0x74, 0x65, 0x52, 0x65, 0x61, 0x73,
- 0x73, 0x69, 0x67, 0x6e, 0x65, 0x64, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x23, 0x0a, 0x0d, 0x72,
- 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x64, 0x5f, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01,
- 0x28, 0x03, 0x52, 0x0c, 0x72, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x64, 0x43, 0x6f, 0x75, 0x6e, 0x74,
- 0x12, 0x42, 0x0a, 0x09, 0x63, 0x6f, 0x6e, 0x66, 0x6c, 0x69, 0x63, 0x74, 0x73, 0x18, 0x04, 0x20,
- 0x03, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x73, 0x65, 0x74,
- 0x2e, 0x76, 0x31, 0x2e, 0x50, 0x65, 0x72, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x52, 0x61, 0x63,
- 0x6b, 0x43, 0x6f, 0x6e, 0x66, 0x6c, 0x69, 0x63, 0x74, 0x52, 0x09, 0x63, 0x6f, 0x6e, 0x66, 0x6c,
- 0x69, 0x63, 0x74, 0x73, 0x22, 0x88, 0x01, 0x0a, 0x15, 0x50, 0x65, 0x72, 0x44, 0x65, 0x76, 0x69,
- 0x63, 0x65, 0x52, 0x61, 0x63, 0x6b, 0x43, 0x6f, 0x6e, 0x66, 0x6c, 0x69, 0x63, 0x74, 0x12, 0x2b,
- 0x0a, 0x11, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x66,
- 0x69, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, 0x64, 0x65, 0x76, 0x69, 0x63,
- 0x65, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x66, 0x69, 0x65, 0x72, 0x12, 0x42, 0x0a, 0x06, 0x72,
- 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x2a, 0x2e, 0x64, 0x65,
- 0x76, 0x69, 0x63, 0x65, 0x5f, 0x73, 0x65, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x50, 0x65, 0x72, 0x44,
- 0x65, 0x76, 0x69, 0x63, 0x65, 0x52, 0x61, 0x63, 0x6b, 0x43, 0x6f, 0x6e, 0x66, 0x6c, 0x69, 0x63,
- 0x74, 0x52, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x52, 0x06, 0x72, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x2a,
- 0x65, 0x0a, 0x0d, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x53, 0x65, 0x74, 0x54, 0x79, 0x70, 0x65,
- 0x12, 0x1f, 0x0a, 0x1b, 0x44, 0x45, 0x56, 0x49, 0x43, 0x45, 0x5f, 0x53, 0x45, 0x54, 0x5f, 0x54,
- 0x59, 0x50, 0x45, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10,
- 0x00, 0x12, 0x19, 0x0a, 0x15, 0x44, 0x45, 0x56, 0x49, 0x43, 0x45, 0x5f, 0x53, 0x45, 0x54, 0x5f,
- 0x54, 0x59, 0x50, 0x45, 0x5f, 0x47, 0x52, 0x4f, 0x55, 0x50, 0x10, 0x01, 0x12, 0x18, 0x0a, 0x14,
- 0x44, 0x45, 0x56, 0x49, 0x43, 0x45, 0x5f, 0x53, 0x45, 0x54, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f,
- 0x52, 0x41, 0x43, 0x4b, 0x10, 0x02, 0x2a, 0xb6, 0x01, 0x0a, 0x0e, 0x52, 0x61, 0x63, 0x6b, 0x4f,
- 0x72, 0x64, 0x65, 0x72, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x20, 0x0a, 0x1c, 0x52, 0x41, 0x43,
- 0x4b, 0x5f, 0x4f, 0x52, 0x44, 0x45, 0x52, 0x5f, 0x49, 0x4e, 0x44, 0x45, 0x58, 0x5f, 0x55, 0x4e,
- 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x20, 0x0a, 0x1c, 0x52,
- 0x41, 0x43, 0x4b, 0x5f, 0x4f, 0x52, 0x44, 0x45, 0x52, 0x5f, 0x49, 0x4e, 0x44, 0x45, 0x58, 0x5f,
- 0x42, 0x4f, 0x54, 0x54, 0x4f, 0x4d, 0x5f, 0x4c, 0x45, 0x46, 0x54, 0x10, 0x01, 0x12, 0x1d, 0x0a,
- 0x19, 0x52, 0x41, 0x43, 0x4b, 0x5f, 0x4f, 0x52, 0x44, 0x45, 0x52, 0x5f, 0x49, 0x4e, 0x44, 0x45,
- 0x58, 0x5f, 0x54, 0x4f, 0x50, 0x5f, 0x4c, 0x45, 0x46, 0x54, 0x10, 0x02, 0x12, 0x21, 0x0a, 0x1d,
+ 0x63, 0x74, 0x69, 0x6e, 0x67, 0x53, 0x69, 0x74, 0x65, 0x88, 0x01, 0x01, 0x12, 0x4d, 0x0a, 0x10,
+ 0x73, 0x6c, 0x6f, 0x74, 0x5f, 0x61, 0x73, 0x73, 0x69, 0x67, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x73,
+ 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x5f,
+ 0x73, 0x65, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x61, 0x63, 0x6b, 0x53, 0x6c, 0x6f, 0x74, 0x42,
+ 0x09, 0xba, 0x48, 0x06, 0x92, 0x01, 0x03, 0x10, 0x90, 0x4e, 0x52, 0x0f, 0x73, 0x6c, 0x6f, 0x74,
+ 0x41, 0x73, 0x73, 0x69, 0x67, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x42, 0x11, 0x0a, 0x0f, 0x5f,
+ 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x5f, 0x72, 0x61, 0x63, 0x6b, 0x5f, 0x69, 0x64, 0x42, 0x1f,
+ 0x0a, 0x1d, 0x5f, 0x66, 0x6f, 0x72, 0x63, 0x65, 0x5f, 0x63, 0x6c, 0x65, 0x61, 0x72, 0x5f, 0x63,
+ 0x6f, 0x6e, 0x66, 0x6c, 0x69, 0x63, 0x74, 0x69, 0x6e, 0x67, 0x5f, 0x73, 0x69, 0x74, 0x65, 0x22,
+ 0xe1, 0x01, 0x0a, 0x1b, 0x41, 0x73, 0x73, 0x69, 0x67, 0x6e, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65,
+ 0x73, 0x54, 0x6f, 0x52, 0x61, 0x63, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12,
+ 0x25, 0x0a, 0x0e, 0x61, 0x73, 0x73, 0x69, 0x67, 0x6e, 0x65, 0x64, 0x5f, 0x63, 0x6f, 0x75, 0x6e,
+ 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0d, 0x61, 0x73, 0x73, 0x69, 0x67, 0x6e, 0x65,
+ 0x64, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x32, 0x0a, 0x15, 0x73, 0x69, 0x74, 0x65, 0x5f, 0x72,
+ 0x65, 0x61, 0x73, 0x73, 0x69, 0x67, 0x6e, 0x65, 0x64, 0x5f, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18,
+ 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x13, 0x73, 0x69, 0x74, 0x65, 0x52, 0x65, 0x61, 0x73, 0x73,
+ 0x69, 0x67, 0x6e, 0x65, 0x64, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x23, 0x0a, 0x0d, 0x72, 0x65,
+ 0x6d, 0x6f, 0x76, 0x65, 0x64, 0x5f, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28,
+ 0x03, 0x52, 0x0c, 0x72, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x64, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12,
+ 0x42, 0x0a, 0x09, 0x63, 0x6f, 0x6e, 0x66, 0x6c, 0x69, 0x63, 0x74, 0x73, 0x18, 0x04, 0x20, 0x03,
+ 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x73, 0x65, 0x74, 0x2e,
+ 0x76, 0x31, 0x2e, 0x50, 0x65, 0x72, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x52, 0x61, 0x63, 0x6b,
+ 0x43, 0x6f, 0x6e, 0x66, 0x6c, 0x69, 0x63, 0x74, 0x52, 0x09, 0x63, 0x6f, 0x6e, 0x66, 0x6c, 0x69,
+ 0x63, 0x74, 0x73, 0x22, 0x88, 0x01, 0x0a, 0x15, 0x50, 0x65, 0x72, 0x44, 0x65, 0x76, 0x69, 0x63,
+ 0x65, 0x52, 0x61, 0x63, 0x6b, 0x43, 0x6f, 0x6e, 0x66, 0x6c, 0x69, 0x63, 0x74, 0x12, 0x2b, 0x0a,
+ 0x11, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x66, 0x69,
+ 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65,
+ 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x66, 0x69, 0x65, 0x72, 0x12, 0x42, 0x0a, 0x06, 0x72, 0x65,
+ 0x61, 0x73, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x2a, 0x2e, 0x64, 0x65, 0x76,
+ 0x69, 0x63, 0x65, 0x5f, 0x73, 0x65, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x50, 0x65, 0x72, 0x44, 0x65,
+ 0x76, 0x69, 0x63, 0x65, 0x52, 0x61, 0x63, 0x6b, 0x43, 0x6f, 0x6e, 0x66, 0x6c, 0x69, 0x63, 0x74,
+ 0x52, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x52, 0x06, 0x72, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x2a, 0x65,
+ 0x0a, 0x0d, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x53, 0x65, 0x74, 0x54, 0x79, 0x70, 0x65, 0x12,
+ 0x1f, 0x0a, 0x1b, 0x44, 0x45, 0x56, 0x49, 0x43, 0x45, 0x5f, 0x53, 0x45, 0x54, 0x5f, 0x54, 0x59,
+ 0x50, 0x45, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00,
+ 0x12, 0x19, 0x0a, 0x15, 0x44, 0x45, 0x56, 0x49, 0x43, 0x45, 0x5f, 0x53, 0x45, 0x54, 0x5f, 0x54,
+ 0x59, 0x50, 0x45, 0x5f, 0x47, 0x52, 0x4f, 0x55, 0x50, 0x10, 0x01, 0x12, 0x18, 0x0a, 0x14, 0x44,
+ 0x45, 0x56, 0x49, 0x43, 0x45, 0x5f, 0x53, 0x45, 0x54, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x52,
+ 0x41, 0x43, 0x4b, 0x10, 0x02, 0x2a, 0xb6, 0x01, 0x0a, 0x0e, 0x52, 0x61, 0x63, 0x6b, 0x4f, 0x72,
+ 0x64, 0x65, 0x72, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x20, 0x0a, 0x1c, 0x52, 0x41, 0x43, 0x4b,
+ 0x5f, 0x4f, 0x52, 0x44, 0x45, 0x52, 0x5f, 0x49, 0x4e, 0x44, 0x45, 0x58, 0x5f, 0x55, 0x4e, 0x53,
+ 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x20, 0x0a, 0x1c, 0x52, 0x41,
+ 0x43, 0x4b, 0x5f, 0x4f, 0x52, 0x44, 0x45, 0x52, 0x5f, 0x49, 0x4e, 0x44, 0x45, 0x58, 0x5f, 0x42,
+ 0x4f, 0x54, 0x54, 0x4f, 0x4d, 0x5f, 0x4c, 0x45, 0x46, 0x54, 0x10, 0x01, 0x12, 0x1d, 0x0a, 0x19,
0x52, 0x41, 0x43, 0x4b, 0x5f, 0x4f, 0x52, 0x44, 0x45, 0x52, 0x5f, 0x49, 0x4e, 0x44, 0x45, 0x58,
- 0x5f, 0x42, 0x4f, 0x54, 0x54, 0x4f, 0x4d, 0x5f, 0x52, 0x49, 0x47, 0x48, 0x54, 0x10, 0x03, 0x12,
- 0x1e, 0x0a, 0x1a, 0x52, 0x41, 0x43, 0x4b, 0x5f, 0x4f, 0x52, 0x44, 0x45, 0x52, 0x5f, 0x49, 0x4e,
- 0x44, 0x45, 0x58, 0x5f, 0x54, 0x4f, 0x50, 0x5f, 0x52, 0x49, 0x47, 0x48, 0x54, 0x10, 0x04, 0x2a,
- 0x70, 0x0a, 0x0f, 0x52, 0x61, 0x63, 0x6b, 0x43, 0x6f, 0x6f, 0x6c, 0x69, 0x6e, 0x67, 0x54, 0x79,
- 0x70, 0x65, 0x12, 0x21, 0x0a, 0x1d, 0x52, 0x41, 0x43, 0x4b, 0x5f, 0x43, 0x4f, 0x4f, 0x4c, 0x49,
- 0x4e, 0x47, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46,
- 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x19, 0x0a, 0x15, 0x52, 0x41, 0x43, 0x4b, 0x5f, 0x43, 0x4f,
- 0x4f, 0x4c, 0x49, 0x4e, 0x47, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x41, 0x49, 0x52, 0x10, 0x01,
- 0x12, 0x1f, 0x0a, 0x1b, 0x52, 0x41, 0x43, 0x4b, 0x5f, 0x43, 0x4f, 0x4f, 0x4c, 0x49, 0x4e, 0x47,
- 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x49, 0x4d, 0x4d, 0x45, 0x52, 0x53, 0x49, 0x4f, 0x4e, 0x10,
- 0x02, 0x2a, 0xdd, 0x01, 0x0a, 0x10, 0x53, 0x6c, 0x6f, 0x74, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65,
- 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x22, 0x0a, 0x1e, 0x53, 0x4c, 0x4f, 0x54, 0x5f, 0x44,
- 0x45, 0x56, 0x49, 0x43, 0x45, 0x5f, 0x53, 0x54, 0x41, 0x54, 0x55, 0x53, 0x5f, 0x55, 0x4e, 0x53,
- 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x1c, 0x0a, 0x18, 0x53, 0x4c,
- 0x4f, 0x54, 0x5f, 0x44, 0x45, 0x56, 0x49, 0x43, 0x45, 0x5f, 0x53, 0x54, 0x41, 0x54, 0x55, 0x53,
- 0x5f, 0x45, 0x4d, 0x50, 0x54, 0x59, 0x10, 0x01, 0x12, 0x1e, 0x0a, 0x1a, 0x53, 0x4c, 0x4f, 0x54,
- 0x5f, 0x44, 0x45, 0x56, 0x49, 0x43, 0x45, 0x5f, 0x53, 0x54, 0x41, 0x54, 0x55, 0x53, 0x5f, 0x48,
- 0x45, 0x41, 0x4c, 0x54, 0x48, 0x59, 0x10, 0x02, 0x12, 0x26, 0x0a, 0x22, 0x53, 0x4c, 0x4f, 0x54,
- 0x5f, 0x44, 0x45, 0x56, 0x49, 0x43, 0x45, 0x5f, 0x53, 0x54, 0x41, 0x54, 0x55, 0x53, 0x5f, 0x4e,
- 0x45, 0x45, 0x44, 0x53, 0x5f, 0x41, 0x54, 0x54, 0x45, 0x4e, 0x54, 0x49, 0x4f, 0x4e, 0x10, 0x03,
- 0x12, 0x1e, 0x0a, 0x1a, 0x53, 0x4c, 0x4f, 0x54, 0x5f, 0x44, 0x45, 0x56, 0x49, 0x43, 0x45, 0x5f,
- 0x53, 0x54, 0x41, 0x54, 0x55, 0x53, 0x5f, 0x4f, 0x46, 0x46, 0x4c, 0x49, 0x4e, 0x45, 0x10, 0x04,
- 0x12, 0x1f, 0x0a, 0x1b, 0x53, 0x4c, 0x4f, 0x54, 0x5f, 0x44, 0x45, 0x56, 0x49, 0x43, 0x45, 0x5f,
- 0x53, 0x54, 0x41, 0x54, 0x55, 0x53, 0x5f, 0x53, 0x4c, 0x45, 0x45, 0x50, 0x49, 0x4e, 0x47, 0x10,
- 0x05, 0x2a, 0x85, 0x01, 0x0a, 0x1b, 0x50, 0x65, 0x72, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x52,
- 0x61, 0x63, 0x6b, 0x43, 0x6f, 0x6e, 0x66, 0x6c, 0x69, 0x63, 0x74, 0x52, 0x65, 0x61, 0x73, 0x6f,
- 0x6e, 0x12, 0x2f, 0x0a, 0x2b, 0x50, 0x45, 0x52, 0x5f, 0x44, 0x45, 0x56, 0x49, 0x43, 0x45, 0x5f,
+ 0x5f, 0x54, 0x4f, 0x50, 0x5f, 0x4c, 0x45, 0x46, 0x54, 0x10, 0x02, 0x12, 0x21, 0x0a, 0x1d, 0x52,
+ 0x41, 0x43, 0x4b, 0x5f, 0x4f, 0x52, 0x44, 0x45, 0x52, 0x5f, 0x49, 0x4e, 0x44, 0x45, 0x58, 0x5f,
+ 0x42, 0x4f, 0x54, 0x54, 0x4f, 0x4d, 0x5f, 0x52, 0x49, 0x47, 0x48, 0x54, 0x10, 0x03, 0x12, 0x1e,
+ 0x0a, 0x1a, 0x52, 0x41, 0x43, 0x4b, 0x5f, 0x4f, 0x52, 0x44, 0x45, 0x52, 0x5f, 0x49, 0x4e, 0x44,
+ 0x45, 0x58, 0x5f, 0x54, 0x4f, 0x50, 0x5f, 0x52, 0x49, 0x47, 0x48, 0x54, 0x10, 0x04, 0x2a, 0x70,
+ 0x0a, 0x0f, 0x52, 0x61, 0x63, 0x6b, 0x43, 0x6f, 0x6f, 0x6c, 0x69, 0x6e, 0x67, 0x54, 0x79, 0x70,
+ 0x65, 0x12, 0x21, 0x0a, 0x1d, 0x52, 0x41, 0x43, 0x4b, 0x5f, 0x43, 0x4f, 0x4f, 0x4c, 0x49, 0x4e,
+ 0x47, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49,
+ 0x45, 0x44, 0x10, 0x00, 0x12, 0x19, 0x0a, 0x15, 0x52, 0x41, 0x43, 0x4b, 0x5f, 0x43, 0x4f, 0x4f,
+ 0x4c, 0x49, 0x4e, 0x47, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x41, 0x49, 0x52, 0x10, 0x01, 0x12,
+ 0x1f, 0x0a, 0x1b, 0x52, 0x41, 0x43, 0x4b, 0x5f, 0x43, 0x4f, 0x4f, 0x4c, 0x49, 0x4e, 0x47, 0x5f,
+ 0x54, 0x59, 0x50, 0x45, 0x5f, 0x49, 0x4d, 0x4d, 0x45, 0x52, 0x53, 0x49, 0x4f, 0x4e, 0x10, 0x02,
+ 0x2a, 0xdd, 0x01, 0x0a, 0x10, 0x53, 0x6c, 0x6f, 0x74, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x53,
+ 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x22, 0x0a, 0x1e, 0x53, 0x4c, 0x4f, 0x54, 0x5f, 0x44, 0x45,
+ 0x56, 0x49, 0x43, 0x45, 0x5f, 0x53, 0x54, 0x41, 0x54, 0x55, 0x53, 0x5f, 0x55, 0x4e, 0x53, 0x50,
+ 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x1c, 0x0a, 0x18, 0x53, 0x4c, 0x4f,
+ 0x54, 0x5f, 0x44, 0x45, 0x56, 0x49, 0x43, 0x45, 0x5f, 0x53, 0x54, 0x41, 0x54, 0x55, 0x53, 0x5f,
+ 0x45, 0x4d, 0x50, 0x54, 0x59, 0x10, 0x01, 0x12, 0x1e, 0x0a, 0x1a, 0x53, 0x4c, 0x4f, 0x54, 0x5f,
+ 0x44, 0x45, 0x56, 0x49, 0x43, 0x45, 0x5f, 0x53, 0x54, 0x41, 0x54, 0x55, 0x53, 0x5f, 0x48, 0x45,
+ 0x41, 0x4c, 0x54, 0x48, 0x59, 0x10, 0x02, 0x12, 0x26, 0x0a, 0x22, 0x53, 0x4c, 0x4f, 0x54, 0x5f,
+ 0x44, 0x45, 0x56, 0x49, 0x43, 0x45, 0x5f, 0x53, 0x54, 0x41, 0x54, 0x55, 0x53, 0x5f, 0x4e, 0x45,
+ 0x45, 0x44, 0x53, 0x5f, 0x41, 0x54, 0x54, 0x45, 0x4e, 0x54, 0x49, 0x4f, 0x4e, 0x10, 0x03, 0x12,
+ 0x1e, 0x0a, 0x1a, 0x53, 0x4c, 0x4f, 0x54, 0x5f, 0x44, 0x45, 0x56, 0x49, 0x43, 0x45, 0x5f, 0x53,
+ 0x54, 0x41, 0x54, 0x55, 0x53, 0x5f, 0x4f, 0x46, 0x46, 0x4c, 0x49, 0x4e, 0x45, 0x10, 0x04, 0x12,
+ 0x1f, 0x0a, 0x1b, 0x53, 0x4c, 0x4f, 0x54, 0x5f, 0x44, 0x45, 0x56, 0x49, 0x43, 0x45, 0x5f, 0x53,
+ 0x54, 0x41, 0x54, 0x55, 0x53, 0x5f, 0x53, 0x4c, 0x45, 0x45, 0x50, 0x49, 0x4e, 0x47, 0x10, 0x05,
+ 0x2a, 0x85, 0x01, 0x0a, 0x1b, 0x50, 0x65, 0x72, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x52, 0x61,
+ 0x63, 0x6b, 0x43, 0x6f, 0x6e, 0x66, 0x6c, 0x69, 0x63, 0x74, 0x52, 0x65, 0x61, 0x73, 0x6f, 0x6e,
+ 0x12, 0x2f, 0x0a, 0x2b, 0x50, 0x45, 0x52, 0x5f, 0x44, 0x45, 0x56, 0x49, 0x43, 0x45, 0x5f, 0x52,
+ 0x41, 0x43, 0x4b, 0x5f, 0x43, 0x4f, 0x4e, 0x46, 0x4c, 0x49, 0x43, 0x54, 0x5f, 0x52, 0x45, 0x41,
+ 0x53, 0x4f, 0x4e, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10,
+ 0x00, 0x12, 0x35, 0x0a, 0x31, 0x50, 0x45, 0x52, 0x5f, 0x44, 0x45, 0x56, 0x49, 0x43, 0x45, 0x5f,
0x52, 0x41, 0x43, 0x4b, 0x5f, 0x43, 0x4f, 0x4e, 0x46, 0x4c, 0x49, 0x43, 0x54, 0x5f, 0x52, 0x45,
- 0x41, 0x53, 0x4f, 0x4e, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44,
- 0x10, 0x00, 0x12, 0x35, 0x0a, 0x31, 0x50, 0x45, 0x52, 0x5f, 0x44, 0x45, 0x56, 0x49, 0x43, 0x45,
- 0x5f, 0x52, 0x41, 0x43, 0x4b, 0x5f, 0x43, 0x4f, 0x4e, 0x46, 0x4c, 0x49, 0x43, 0x54, 0x5f, 0x52,
- 0x45, 0x41, 0x53, 0x4f, 0x4e, 0x5f, 0x44, 0x45, 0x56, 0x49, 0x43, 0x45, 0x5f, 0x4c, 0x4f, 0x53,
- 0x45, 0x53, 0x5f, 0x53, 0x49, 0x54, 0x45, 0x10, 0x01, 0x32, 0xa9, 0x0e, 0x0a, 0x10, 0x44, 0x65,
- 0x76, 0x69, 0x63, 0x65, 0x53, 0x65, 0x74, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x60,
- 0x0a, 0x0f, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x53, 0x65,
- 0x74, 0x12, 0x25, 0x2e, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x73, 0x65, 0x74, 0x2e, 0x76,
- 0x31, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x53, 0x65,
- 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x26, 0x2e, 0x64, 0x65, 0x76, 0x69, 0x63,
- 0x65, 0x5f, 0x73, 0x65, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x44,
- 0x65, 0x76, 0x69, 0x63, 0x65, 0x53, 0x65, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
- 0x12, 0x57, 0x0a, 0x0c, 0x47, 0x65, 0x74, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x53, 0x65, 0x74,
- 0x12, 0x22, 0x2e, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x73, 0x65, 0x74, 0x2e, 0x76, 0x31,
- 0x2e, 0x47, 0x65, 0x74, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x53, 0x65, 0x74, 0x52, 0x65, 0x71,
- 0x75, 0x65, 0x73, 0x74, 0x1a, 0x23, 0x2e, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x73, 0x65,
- 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x53, 0x65,
- 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x60, 0x0a, 0x0f, 0x55, 0x70, 0x64,
- 0x61, 0x74, 0x65, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x53, 0x65, 0x74, 0x12, 0x25, 0x2e, 0x64,
- 0x65, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x73, 0x65, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x70, 0x64,
- 0x61, 0x74, 0x65, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x53, 0x65, 0x74, 0x52, 0x65, 0x71, 0x75,
- 0x65, 0x73, 0x74, 0x1a, 0x26, 0x2e, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x73, 0x65, 0x74,
- 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65,
- 0x53, 0x65, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x60, 0x0a, 0x0f, 0x44,
- 0x65, 0x6c, 0x65, 0x74, 0x65, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x53, 0x65, 0x74, 0x12, 0x25,
- 0x2e, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x73, 0x65, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x44,
- 0x65, 0x6c, 0x65, 0x74, 0x65, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x53, 0x65, 0x74, 0x52, 0x65,
- 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x26, 0x2e, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x73,
- 0x65, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x44, 0x65, 0x76, 0x69,
- 0x63, 0x65, 0x53, 0x65, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x5d, 0x0a,
- 0x0e, 0x4c, 0x69, 0x73, 0x74, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x53, 0x65, 0x74, 0x73, 0x12,
- 0x24, 0x2e, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x73, 0x65, 0x74, 0x2e, 0x76, 0x31, 0x2e,
- 0x4c, 0x69, 0x73, 0x74, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x53, 0x65, 0x74, 0x73, 0x52, 0x65,
- 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x25, 0x2e, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x73,
- 0x65, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65,
- 0x53, 0x65, 0x74, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x66, 0x0a, 0x11,
- 0x41, 0x64, 0x64, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x73, 0x54, 0x6f, 0x47, 0x72, 0x6f, 0x75,
- 0x70, 0x12, 0x27, 0x2e, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x73, 0x65, 0x74, 0x2e, 0x76,
- 0x31, 0x2e, 0x41, 0x64, 0x64, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x73, 0x54, 0x6f, 0x47, 0x72,
- 0x6f, 0x75, 0x70, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x28, 0x2e, 0x64, 0x65, 0x76,
- 0x69, 0x63, 0x65, 0x5f, 0x73, 0x65, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x41, 0x64, 0x64, 0x44, 0x65,
- 0x76, 0x69, 0x63, 0x65, 0x73, 0x54, 0x6f, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x52, 0x65, 0x73, 0x70,
- 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x75, 0x0a, 0x16, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x44, 0x65,
- 0x76, 0x69, 0x63, 0x65, 0x73, 0x46, 0x72, 0x6f, 0x6d, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x2c,
- 0x2e, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x73, 0x65, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x52,
- 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x73, 0x46, 0x72, 0x6f, 0x6d,
- 0x47, 0x72, 0x6f, 0x75, 0x70, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2d, 0x2e, 0x64,
- 0x65, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x73, 0x65, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x65, 0x6d,
- 0x6f, 0x76, 0x65, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x73, 0x46, 0x72, 0x6f, 0x6d, 0x47, 0x72,
- 0x6f, 0x75, 0x70, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x6f, 0x0a, 0x14, 0x4c,
+ 0x41, 0x53, 0x4f, 0x4e, 0x5f, 0x44, 0x45, 0x56, 0x49, 0x43, 0x45, 0x5f, 0x4c, 0x4f, 0x53, 0x45,
+ 0x53, 0x5f, 0x53, 0x49, 0x54, 0x45, 0x10, 0x01, 0x32, 0xa9, 0x0e, 0x0a, 0x10, 0x44, 0x65, 0x76,
+ 0x69, 0x63, 0x65, 0x53, 0x65, 0x74, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x60, 0x0a,
+ 0x0f, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x53, 0x65, 0x74,
+ 0x12, 0x25, 0x2e, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x73, 0x65, 0x74, 0x2e, 0x76, 0x31,
+ 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x53, 0x65, 0x74,
+ 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x26, 0x2e, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65,
+ 0x5f, 0x73, 0x65, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x44, 0x65,
+ 0x76, 0x69, 0x63, 0x65, 0x53, 0x65, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12,
+ 0x57, 0x0a, 0x0c, 0x47, 0x65, 0x74, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x53, 0x65, 0x74, 0x12,
+ 0x22, 0x2e, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x73, 0x65, 0x74, 0x2e, 0x76, 0x31, 0x2e,
+ 0x47, 0x65, 0x74, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x53, 0x65, 0x74, 0x52, 0x65, 0x71, 0x75,
+ 0x65, 0x73, 0x74, 0x1a, 0x23, 0x2e, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x73, 0x65, 0x74,
+ 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x53, 0x65, 0x74,
+ 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x60, 0x0a, 0x0f, 0x55, 0x70, 0x64, 0x61,
+ 0x74, 0x65, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x53, 0x65, 0x74, 0x12, 0x25, 0x2e, 0x64, 0x65,
+ 0x76, 0x69, 0x63, 0x65, 0x5f, 0x73, 0x65, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x70, 0x64, 0x61,
+ 0x74, 0x65, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x53, 0x65, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65,
+ 0x73, 0x74, 0x1a, 0x26, 0x2e, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x73, 0x65, 0x74, 0x2e,
+ 0x76, 0x31, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x53,
+ 0x65, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x60, 0x0a, 0x0f, 0x44, 0x65,
+ 0x6c, 0x65, 0x74, 0x65, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x53, 0x65, 0x74, 0x12, 0x25, 0x2e,
+ 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x73, 0x65, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x44, 0x65,
+ 0x6c, 0x65, 0x74, 0x65, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x53, 0x65, 0x74, 0x52, 0x65, 0x71,
+ 0x75, 0x65, 0x73, 0x74, 0x1a, 0x26, 0x2e, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x73, 0x65,
+ 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x44, 0x65, 0x76, 0x69, 0x63,
+ 0x65, 0x53, 0x65, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x5d, 0x0a, 0x0e,
+ 0x4c, 0x69, 0x73, 0x74, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x53, 0x65, 0x74, 0x73, 0x12, 0x24,
+ 0x2e, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x73, 0x65, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x4c,
+ 0x69, 0x73, 0x74, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x53, 0x65, 0x74, 0x73, 0x52, 0x65, 0x71,
+ 0x75, 0x65, 0x73, 0x74, 0x1a, 0x25, 0x2e, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x73, 0x65,
+ 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x53,
+ 0x65, 0x74, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x66, 0x0a, 0x11, 0x41,
+ 0x64, 0x64, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x73, 0x54, 0x6f, 0x47, 0x72, 0x6f, 0x75, 0x70,
+ 0x12, 0x27, 0x2e, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x73, 0x65, 0x74, 0x2e, 0x76, 0x31,
+ 0x2e, 0x41, 0x64, 0x64, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x73, 0x54, 0x6f, 0x47, 0x72, 0x6f,
+ 0x75, 0x70, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x28, 0x2e, 0x64, 0x65, 0x76, 0x69,
+ 0x63, 0x65, 0x5f, 0x73, 0x65, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x41, 0x64, 0x64, 0x44, 0x65, 0x76,
+ 0x69, 0x63, 0x65, 0x73, 0x54, 0x6f, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x52, 0x65, 0x73, 0x70, 0x6f,
+ 0x6e, 0x73, 0x65, 0x12, 0x75, 0x0a, 0x16, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x44, 0x65, 0x76,
+ 0x69, 0x63, 0x65, 0x73, 0x46, 0x72, 0x6f, 0x6d, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x2c, 0x2e,
+ 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x73, 0x65, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x65,
+ 0x6d, 0x6f, 0x76, 0x65, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x73, 0x46, 0x72, 0x6f, 0x6d, 0x47,
+ 0x72, 0x6f, 0x75, 0x70, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2d, 0x2e, 0x64, 0x65,
+ 0x76, 0x69, 0x63, 0x65, 0x5f, 0x73, 0x65, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x65, 0x6d, 0x6f,
+ 0x76, 0x65, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x73, 0x46, 0x72, 0x6f, 0x6d, 0x47, 0x72, 0x6f,
+ 0x75, 0x70, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x6f, 0x0a, 0x14, 0x4c, 0x69,
+ 0x73, 0x74, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x53, 0x65, 0x74, 0x4d, 0x65, 0x6d, 0x62, 0x65,
+ 0x72, 0x73, 0x12, 0x2a, 0x2e, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x73, 0x65, 0x74, 0x2e,
+ 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x53, 0x65, 0x74,
+ 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2b,
+ 0x2e, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x73, 0x65, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x4c,
0x69, 0x73, 0x74, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x53, 0x65, 0x74, 0x4d, 0x65, 0x6d, 0x62,
- 0x65, 0x72, 0x73, 0x12, 0x2a, 0x2e, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x73, 0x65, 0x74,
- 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x53, 0x65,
- 0x74, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a,
- 0x2b, 0x2e, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x73, 0x65, 0x74, 0x2e, 0x76, 0x31, 0x2e,
- 0x4c, 0x69, 0x73, 0x74, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x53, 0x65, 0x74, 0x4d, 0x65, 0x6d,
- 0x62, 0x65, 0x72, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x6c, 0x0a, 0x13,
- 0x47, 0x65, 0x74, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x53,
- 0x65, 0x74, 0x73, 0x12, 0x29, 0x2e, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x73, 0x65, 0x74,
- 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x44, 0x65, 0x76,
- 0x69, 0x63, 0x65, 0x53, 0x65, 0x74, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2a,
- 0x2e, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x73, 0x65, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x47,
+ 0x65, 0x72, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x6c, 0x0a, 0x13, 0x47,
0x65, 0x74, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x53, 0x65,
- 0x74, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x6c, 0x0a, 0x13, 0x53, 0x65,
- 0x74, 0x52, 0x61, 0x63, 0x6b, 0x53, 0x6c, 0x6f, 0x74, 0x50, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f,
- 0x6e, 0x12, 0x29, 0x2e, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x73, 0x65, 0x74, 0x2e, 0x76,
- 0x31, 0x2e, 0x53, 0x65, 0x74, 0x52, 0x61, 0x63, 0x6b, 0x53, 0x6c, 0x6f, 0x74, 0x50, 0x6f, 0x73,
- 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2a, 0x2e, 0x64,
- 0x65, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x73, 0x65, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x53, 0x65, 0x74,
+ 0x74, 0x73, 0x12, 0x29, 0x2e, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x73, 0x65, 0x74, 0x2e,
+ 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x44, 0x65, 0x76, 0x69,
+ 0x63, 0x65, 0x53, 0x65, 0x74, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2a, 0x2e,
+ 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x73, 0x65, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65,
+ 0x74, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x53, 0x65, 0x74,
+ 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x6c, 0x0a, 0x13, 0x53, 0x65, 0x74,
0x52, 0x61, 0x63, 0x6b, 0x53, 0x6c, 0x6f, 0x74, 0x50, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e,
- 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x72, 0x0a, 0x15, 0x43, 0x6c, 0x65, 0x61,
- 0x72, 0x52, 0x61, 0x63, 0x6b, 0x53, 0x6c, 0x6f, 0x74, 0x50, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f,
- 0x6e, 0x12, 0x2b, 0x2e, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x73, 0x65, 0x74, 0x2e, 0x76,
- 0x31, 0x2e, 0x43, 0x6c, 0x65, 0x61, 0x72, 0x52, 0x61, 0x63, 0x6b, 0x53, 0x6c, 0x6f, 0x74, 0x50,
- 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2c,
- 0x2e, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x73, 0x65, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x43,
- 0x6c, 0x65, 0x61, 0x72, 0x52, 0x61, 0x63, 0x6b, 0x53, 0x6c, 0x6f, 0x74, 0x50, 0x6f, 0x73, 0x69,
- 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x57, 0x0a, 0x0c,
- 0x47, 0x65, 0x74, 0x52, 0x61, 0x63, 0x6b, 0x53, 0x6c, 0x6f, 0x74, 0x73, 0x12, 0x22, 0x2e, 0x64,
- 0x65, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x73, 0x65, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74,
- 0x52, 0x61, 0x63, 0x6b, 0x53, 0x6c, 0x6f, 0x74, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
- 0x1a, 0x23, 0x2e, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x73, 0x65, 0x74, 0x2e, 0x76, 0x31,
- 0x2e, 0x47, 0x65, 0x74, 0x52, 0x61, 0x63, 0x6b, 0x53, 0x6c, 0x6f, 0x74, 0x73, 0x52, 0x65, 0x73,
- 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x66, 0x0a, 0x11, 0x47, 0x65, 0x74, 0x44, 0x65, 0x76, 0x69,
- 0x63, 0x65, 0x53, 0x65, 0x74, 0x53, 0x74, 0x61, 0x74, 0x73, 0x12, 0x27, 0x2e, 0x64, 0x65, 0x76,
- 0x69, 0x63, 0x65, 0x5f, 0x73, 0x65, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x44, 0x65,
- 0x76, 0x69, 0x63, 0x65, 0x53, 0x65, 0x74, 0x53, 0x74, 0x61, 0x74, 0x73, 0x52, 0x65, 0x71, 0x75,
- 0x65, 0x73, 0x74, 0x1a, 0x28, 0x2e, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x73, 0x65, 0x74,
- 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x53, 0x65, 0x74,
- 0x53, 0x74, 0x61, 0x74, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x5a, 0x0a,
- 0x0d, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x61, 0x63, 0x6b, 0x5a, 0x6f, 0x6e, 0x65, 0x73, 0x12, 0x23,
+ 0x12, 0x29, 0x2e, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x73, 0x65, 0x74, 0x2e, 0x76, 0x31,
+ 0x2e, 0x53, 0x65, 0x74, 0x52, 0x61, 0x63, 0x6b, 0x53, 0x6c, 0x6f, 0x74, 0x50, 0x6f, 0x73, 0x69,
+ 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2a, 0x2e, 0x64, 0x65,
+ 0x76, 0x69, 0x63, 0x65, 0x5f, 0x73, 0x65, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x53, 0x65, 0x74, 0x52,
+ 0x61, 0x63, 0x6b, 0x53, 0x6c, 0x6f, 0x74, 0x50, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x52,
+ 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x72, 0x0a, 0x15, 0x43, 0x6c, 0x65, 0x61, 0x72,
+ 0x52, 0x61, 0x63, 0x6b, 0x53, 0x6c, 0x6f, 0x74, 0x50, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e,
+ 0x12, 0x2b, 0x2e, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x73, 0x65, 0x74, 0x2e, 0x76, 0x31,
+ 0x2e, 0x43, 0x6c, 0x65, 0x61, 0x72, 0x52, 0x61, 0x63, 0x6b, 0x53, 0x6c, 0x6f, 0x74, 0x50, 0x6f,
+ 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2c, 0x2e,
+ 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x73, 0x65, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x6c,
+ 0x65, 0x61, 0x72, 0x52, 0x61, 0x63, 0x6b, 0x53, 0x6c, 0x6f, 0x74, 0x50, 0x6f, 0x73, 0x69, 0x74,
+ 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x57, 0x0a, 0x0c, 0x47,
+ 0x65, 0x74, 0x52, 0x61, 0x63, 0x6b, 0x53, 0x6c, 0x6f, 0x74, 0x73, 0x12, 0x22, 0x2e, 0x64, 0x65,
+ 0x76, 0x69, 0x63, 0x65, 0x5f, 0x73, 0x65, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x52,
+ 0x61, 0x63, 0x6b, 0x53, 0x6c, 0x6f, 0x74, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a,
+ 0x23, 0x2e, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x73, 0x65, 0x74, 0x2e, 0x76, 0x31, 0x2e,
+ 0x47, 0x65, 0x74, 0x52, 0x61, 0x63, 0x6b, 0x53, 0x6c, 0x6f, 0x74, 0x73, 0x52, 0x65, 0x73, 0x70,
+ 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x66, 0x0a, 0x11, 0x47, 0x65, 0x74, 0x44, 0x65, 0x76, 0x69, 0x63,
+ 0x65, 0x53, 0x65, 0x74, 0x53, 0x74, 0x61, 0x74, 0x73, 0x12, 0x27, 0x2e, 0x64, 0x65, 0x76, 0x69,
+ 0x63, 0x65, 0x5f, 0x73, 0x65, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x44, 0x65, 0x76,
+ 0x69, 0x63, 0x65, 0x53, 0x65, 0x74, 0x53, 0x74, 0x61, 0x74, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65,
+ 0x73, 0x74, 0x1a, 0x28, 0x2e, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x73, 0x65, 0x74, 0x2e,
+ 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x53, 0x65, 0x74, 0x53,
+ 0x74, 0x61, 0x74, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x5a, 0x0a, 0x0d,
+ 0x4c, 0x69, 0x73, 0x74, 0x52, 0x61, 0x63, 0x6b, 0x5a, 0x6f, 0x6e, 0x65, 0x73, 0x12, 0x23, 0x2e,
+ 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x73, 0x65, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69,
+ 0x73, 0x74, 0x52, 0x61, 0x63, 0x6b, 0x5a, 0x6f, 0x6e, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65,
+ 0x73, 0x74, 0x1a, 0x24, 0x2e, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x73, 0x65, 0x74, 0x2e,
+ 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x61, 0x63, 0x6b, 0x5a, 0x6f, 0x6e, 0x65, 0x73,
+ 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x63, 0x0a, 0x10, 0x4c, 0x69, 0x73, 0x74,
+ 0x52, 0x61, 0x63, 0x6b, 0x5a, 0x6f, 0x6e, 0x65, 0x52, 0x65, 0x66, 0x73, 0x12, 0x26, 0x2e, 0x64,
+ 0x65, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x73, 0x65, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73,
+ 0x74, 0x52, 0x61, 0x63, 0x6b, 0x5a, 0x6f, 0x6e, 0x65, 0x52, 0x65, 0x66, 0x73, 0x52, 0x65, 0x71,
+ 0x75, 0x65, 0x73, 0x74, 0x1a, 0x27, 0x2e, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x73, 0x65,
+ 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x61, 0x63, 0x6b, 0x5a, 0x6f, 0x6e,
+ 0x65, 0x52, 0x65, 0x66, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x5a, 0x0a,
+ 0x0d, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x61, 0x63, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x73, 0x12, 0x23,
0x2e, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x73, 0x65, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x4c,
- 0x69, 0x73, 0x74, 0x52, 0x61, 0x63, 0x6b, 0x5a, 0x6f, 0x6e, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75,
+ 0x69, 0x73, 0x74, 0x52, 0x61, 0x63, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75,
0x65, 0x73, 0x74, 0x1a, 0x24, 0x2e, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x73, 0x65, 0x74,
- 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x61, 0x63, 0x6b, 0x5a, 0x6f, 0x6e, 0x65,
- 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x63, 0x0a, 0x10, 0x4c, 0x69, 0x73,
- 0x74, 0x52, 0x61, 0x63, 0x6b, 0x5a, 0x6f, 0x6e, 0x65, 0x52, 0x65, 0x66, 0x73, 0x12, 0x26, 0x2e,
- 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x73, 0x65, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69,
- 0x73, 0x74, 0x52, 0x61, 0x63, 0x6b, 0x5a, 0x6f, 0x6e, 0x65, 0x52, 0x65, 0x66, 0x73, 0x52, 0x65,
- 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x27, 0x2e, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x73,
- 0x65, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x61, 0x63, 0x6b, 0x5a, 0x6f,
- 0x6e, 0x65, 0x52, 0x65, 0x66, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x5a,
- 0x0a, 0x0d, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x61, 0x63, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x73, 0x12,
- 0x23, 0x2e, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x73, 0x65, 0x74, 0x2e, 0x76, 0x31, 0x2e,
- 0x4c, 0x69, 0x73, 0x74, 0x52, 0x61, 0x63, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x73, 0x52, 0x65, 0x71,
- 0x75, 0x65, 0x73, 0x74, 0x1a, 0x24, 0x2e, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x73, 0x65,
- 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x61, 0x63, 0x6b, 0x54, 0x79, 0x70,
- 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x4b, 0x0a, 0x08, 0x53, 0x61,
- 0x76, 0x65, 0x52, 0x61, 0x63, 0x6b, 0x12, 0x1e, 0x2e, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x5f,
- 0x73, 0x65, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x53, 0x61, 0x76, 0x65, 0x52, 0x61, 0x63, 0x6b, 0x52,
- 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1f, 0x2e, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x5f,
- 0x73, 0x65, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x53, 0x61, 0x76, 0x65, 0x52, 0x61, 0x63, 0x6b, 0x52,
- 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x6c, 0x0a, 0x13, 0x41, 0x73, 0x73, 0x69, 0x67,
- 0x6e, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x73, 0x54, 0x6f, 0x52, 0x61, 0x63, 0x6b, 0x12, 0x29,
- 0x2e, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x73, 0x65, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x41,
- 0x73, 0x73, 0x69, 0x67, 0x6e, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x73, 0x54, 0x6f, 0x52, 0x61,
- 0x63, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2a, 0x2e, 0x64, 0x65, 0x76, 0x69,
- 0x63, 0x65, 0x5f, 0x73, 0x65, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x41, 0x73, 0x73, 0x69, 0x67, 0x6e,
- 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x73, 0x54, 0x6f, 0x52, 0x61, 0x63, 0x6b, 0x52, 0x65, 0x73,
- 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x42, 0xc3, 0x01, 0x0a, 0x11, 0x63, 0x6f, 0x6d, 0x2e, 0x64, 0x65,
- 0x76, 0x69, 0x63, 0x65, 0x5f, 0x73, 0x65, 0x74, 0x2e, 0x76, 0x31, 0x42, 0x0e, 0x44, 0x65, 0x76,
- 0x69, 0x63, 0x65, 0x53, 0x65, 0x74, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x4d, 0x67,
- 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x2f,
- 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2d, 0x66, 0x6c, 0x65, 0x65, 0x74, 0x2f, 0x73, 0x65, 0x72, 0x76,
- 0x65, 0x72, 0x2f, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x64, 0x2f, 0x67, 0x72, 0x70,
- 0x63, 0x2f, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x73, 0x65, 0x74, 0x2f, 0x76, 0x31, 0x3b,
- 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x73, 0x65, 0x74, 0x76, 0x31, 0xa2, 0x02, 0x03, 0x44,
- 0x58, 0x58, 0xaa, 0x02, 0x0c, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x53, 0x65, 0x74, 0x2e, 0x56,
- 0x31, 0xca, 0x02, 0x0c, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x53, 0x65, 0x74, 0x5c, 0x56, 0x31,
- 0xe2, 0x02, 0x18, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x53, 0x65, 0x74, 0x5c, 0x56, 0x31, 0x5c,
- 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x0d, 0x44, 0x65,
- 0x76, 0x69, 0x63, 0x65, 0x53, 0x65, 0x74, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f,
- 0x74, 0x6f, 0x33,
+ 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x61, 0x63, 0x6b, 0x54, 0x79, 0x70, 0x65,
+ 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x4b, 0x0a, 0x08, 0x53, 0x61, 0x76,
+ 0x65, 0x52, 0x61, 0x63, 0x6b, 0x12, 0x1e, 0x2e, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x73,
+ 0x65, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x53, 0x61, 0x76, 0x65, 0x52, 0x61, 0x63, 0x6b, 0x52, 0x65,
+ 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1f, 0x2e, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x73,
+ 0x65, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x53, 0x61, 0x76, 0x65, 0x52, 0x61, 0x63, 0x6b, 0x52, 0x65,
+ 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x6c, 0x0a, 0x13, 0x41, 0x73, 0x73, 0x69, 0x67, 0x6e,
+ 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x73, 0x54, 0x6f, 0x52, 0x61, 0x63, 0x6b, 0x12, 0x29, 0x2e,
+ 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x73, 0x65, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x41, 0x73,
+ 0x73, 0x69, 0x67, 0x6e, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x73, 0x54, 0x6f, 0x52, 0x61, 0x63,
+ 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2a, 0x2e, 0x64, 0x65, 0x76, 0x69, 0x63,
+ 0x65, 0x5f, 0x73, 0x65, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x41, 0x73, 0x73, 0x69, 0x67, 0x6e, 0x44,
+ 0x65, 0x76, 0x69, 0x63, 0x65, 0x73, 0x54, 0x6f, 0x52, 0x61, 0x63, 0x6b, 0x52, 0x65, 0x73, 0x70,
+ 0x6f, 0x6e, 0x73, 0x65, 0x42, 0xc3, 0x01, 0x0a, 0x11, 0x63, 0x6f, 0x6d, 0x2e, 0x64, 0x65, 0x76,
+ 0x69, 0x63, 0x65, 0x5f, 0x73, 0x65, 0x74, 0x2e, 0x76, 0x31, 0x42, 0x0e, 0x44, 0x65, 0x76, 0x69,
+ 0x63, 0x65, 0x53, 0x65, 0x74, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x4d, 0x67, 0x69,
+ 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x2f, 0x70,
+ 0x72, 0x6f, 0x74, 0x6f, 0x2d, 0x66, 0x6c, 0x65, 0x65, 0x74, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x65,
+ 0x72, 0x2f, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x64, 0x2f, 0x67, 0x72, 0x70, 0x63,
+ 0x2f, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x73, 0x65, 0x74, 0x2f, 0x76, 0x31, 0x3b, 0x64,
+ 0x65, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x73, 0x65, 0x74, 0x76, 0x31, 0xa2, 0x02, 0x03, 0x44, 0x58,
+ 0x58, 0xaa, 0x02, 0x0c, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x53, 0x65, 0x74, 0x2e, 0x56, 0x31,
+ 0xca, 0x02, 0x0c, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x53, 0x65, 0x74, 0x5c, 0x56, 0x31, 0xe2,
+ 0x02, 0x18, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x53, 0x65, 0x74, 0x5c, 0x56, 0x31, 0x5c, 0x47,
+ 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x0d, 0x44, 0x65, 0x76,
+ 0x69, 0x63, 0x65, 0x53, 0x65, 0x74, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
+ 0x6f, 0x33,
})
var (
@@ -4255,49 +4289,50 @@ var file_device_set_v1_device_set_proto_depIdxs = []int32{
5, // 44: device_set.v1.SaveRackResponse.device_set:type_name -> device_set.v1.DeviceSet
51, // 45: device_set.v1.SaveRackResponse.conflicts:type_name -> device_set.v1.PerDeviceRackConflict
54, // 46: device_set.v1.AssignDevicesToRackRequest.device_selector:type_name -> common.v1.DeviceSelector
- 51, // 47: device_set.v1.AssignDevicesToRackResponse.conflicts:type_name -> device_set.v1.PerDeviceRackConflict
- 4, // 48: device_set.v1.PerDeviceRackConflict.reason:type_name -> device_set.v1.PerDeviceRackConflictReason
- 11, // 49: device_set.v1.DeviceSetService.CreateDeviceSet:input_type -> device_set.v1.CreateDeviceSetRequest
- 13, // 50: device_set.v1.DeviceSetService.GetDeviceSet:input_type -> device_set.v1.GetDeviceSetRequest
- 15, // 51: device_set.v1.DeviceSetService.UpdateDeviceSet:input_type -> device_set.v1.UpdateDeviceSetRequest
- 17, // 52: device_set.v1.DeviceSetService.DeleteDeviceSet:input_type -> device_set.v1.DeleteDeviceSetRequest
- 19, // 53: device_set.v1.DeviceSetService.ListDeviceSets:input_type -> device_set.v1.ListDeviceSetsRequest
- 21, // 54: device_set.v1.DeviceSetService.AddDevicesToGroup:input_type -> device_set.v1.AddDevicesToGroupRequest
- 23, // 55: device_set.v1.DeviceSetService.RemoveDevicesFromGroup:input_type -> device_set.v1.RemoveDevicesFromGroupRequest
- 25, // 56: device_set.v1.DeviceSetService.ListDeviceSetMembers:input_type -> device_set.v1.ListDeviceSetMembersRequest
- 27, // 57: device_set.v1.DeviceSetService.GetDeviceDeviceSets:input_type -> device_set.v1.GetDeviceDeviceSetsRequest
- 29, // 58: device_set.v1.DeviceSetService.SetRackSlotPosition:input_type -> device_set.v1.SetRackSlotPositionRequest
- 31, // 59: device_set.v1.DeviceSetService.ClearRackSlotPosition:input_type -> device_set.v1.ClearRackSlotPositionRequest
- 33, // 60: device_set.v1.DeviceSetService.GetRackSlots:input_type -> device_set.v1.GetRackSlotsRequest
- 37, // 61: device_set.v1.DeviceSetService.GetDeviceSetStats:input_type -> device_set.v1.GetDeviceSetStatsRequest
- 40, // 62: device_set.v1.DeviceSetService.ListRackZones:input_type -> device_set.v1.ListRackZonesRequest
- 42, // 63: device_set.v1.DeviceSetService.ListRackZoneRefs:input_type -> device_set.v1.ListRackZoneRefsRequest
- 44, // 64: device_set.v1.DeviceSetService.ListRackTypes:input_type -> device_set.v1.ListRackTypesRequest
- 47, // 65: device_set.v1.DeviceSetService.SaveRack:input_type -> device_set.v1.SaveRackRequest
- 49, // 66: device_set.v1.DeviceSetService.AssignDevicesToRack:input_type -> device_set.v1.AssignDevicesToRackRequest
- 12, // 67: device_set.v1.DeviceSetService.CreateDeviceSet:output_type -> device_set.v1.CreateDeviceSetResponse
- 14, // 68: device_set.v1.DeviceSetService.GetDeviceSet:output_type -> device_set.v1.GetDeviceSetResponse
- 16, // 69: device_set.v1.DeviceSetService.UpdateDeviceSet:output_type -> device_set.v1.UpdateDeviceSetResponse
- 18, // 70: device_set.v1.DeviceSetService.DeleteDeviceSet:output_type -> device_set.v1.DeleteDeviceSetResponse
- 20, // 71: device_set.v1.DeviceSetService.ListDeviceSets:output_type -> device_set.v1.ListDeviceSetsResponse
- 22, // 72: device_set.v1.DeviceSetService.AddDevicesToGroup:output_type -> device_set.v1.AddDevicesToGroupResponse
- 24, // 73: device_set.v1.DeviceSetService.RemoveDevicesFromGroup:output_type -> device_set.v1.RemoveDevicesFromGroupResponse
- 26, // 74: device_set.v1.DeviceSetService.ListDeviceSetMembers:output_type -> device_set.v1.ListDeviceSetMembersResponse
- 28, // 75: device_set.v1.DeviceSetService.GetDeviceDeviceSets:output_type -> device_set.v1.GetDeviceDeviceSetsResponse
- 30, // 76: device_set.v1.DeviceSetService.SetRackSlotPosition:output_type -> device_set.v1.SetRackSlotPositionResponse
- 32, // 77: device_set.v1.DeviceSetService.ClearRackSlotPosition:output_type -> device_set.v1.ClearRackSlotPositionResponse
- 35, // 78: device_set.v1.DeviceSetService.GetRackSlots:output_type -> device_set.v1.GetRackSlotsResponse
- 38, // 79: device_set.v1.DeviceSetService.GetDeviceSetStats:output_type -> device_set.v1.GetDeviceSetStatsResponse
- 41, // 80: device_set.v1.DeviceSetService.ListRackZones:output_type -> device_set.v1.ListRackZonesResponse
- 43, // 81: device_set.v1.DeviceSetService.ListRackZoneRefs:output_type -> device_set.v1.ListRackZoneRefsResponse
- 46, // 82: device_set.v1.DeviceSetService.ListRackTypes:output_type -> device_set.v1.ListRackTypesResponse
- 48, // 83: device_set.v1.DeviceSetService.SaveRack:output_type -> device_set.v1.SaveRackResponse
- 50, // 84: device_set.v1.DeviceSetService.AssignDevicesToRack:output_type -> device_set.v1.AssignDevicesToRackResponse
- 67, // [67:85] is the sub-list for method output_type
- 49, // [49:67] is the sub-list for method input_type
- 49, // [49:49] is the sub-list for extension type_name
- 49, // [49:49] is the sub-list for extension extendee
- 0, // [0:49] is the sub-list for field type_name
+ 34, // 47: device_set.v1.AssignDevicesToRackRequest.slot_assignments:type_name -> device_set.v1.RackSlot
+ 51, // 48: device_set.v1.AssignDevicesToRackResponse.conflicts:type_name -> device_set.v1.PerDeviceRackConflict
+ 4, // 49: device_set.v1.PerDeviceRackConflict.reason:type_name -> device_set.v1.PerDeviceRackConflictReason
+ 11, // 50: device_set.v1.DeviceSetService.CreateDeviceSet:input_type -> device_set.v1.CreateDeviceSetRequest
+ 13, // 51: device_set.v1.DeviceSetService.GetDeviceSet:input_type -> device_set.v1.GetDeviceSetRequest
+ 15, // 52: device_set.v1.DeviceSetService.UpdateDeviceSet:input_type -> device_set.v1.UpdateDeviceSetRequest
+ 17, // 53: device_set.v1.DeviceSetService.DeleteDeviceSet:input_type -> device_set.v1.DeleteDeviceSetRequest
+ 19, // 54: device_set.v1.DeviceSetService.ListDeviceSets:input_type -> device_set.v1.ListDeviceSetsRequest
+ 21, // 55: device_set.v1.DeviceSetService.AddDevicesToGroup:input_type -> device_set.v1.AddDevicesToGroupRequest
+ 23, // 56: device_set.v1.DeviceSetService.RemoveDevicesFromGroup:input_type -> device_set.v1.RemoveDevicesFromGroupRequest
+ 25, // 57: device_set.v1.DeviceSetService.ListDeviceSetMembers:input_type -> device_set.v1.ListDeviceSetMembersRequest
+ 27, // 58: device_set.v1.DeviceSetService.GetDeviceDeviceSets:input_type -> device_set.v1.GetDeviceDeviceSetsRequest
+ 29, // 59: device_set.v1.DeviceSetService.SetRackSlotPosition:input_type -> device_set.v1.SetRackSlotPositionRequest
+ 31, // 60: device_set.v1.DeviceSetService.ClearRackSlotPosition:input_type -> device_set.v1.ClearRackSlotPositionRequest
+ 33, // 61: device_set.v1.DeviceSetService.GetRackSlots:input_type -> device_set.v1.GetRackSlotsRequest
+ 37, // 62: device_set.v1.DeviceSetService.GetDeviceSetStats:input_type -> device_set.v1.GetDeviceSetStatsRequest
+ 40, // 63: device_set.v1.DeviceSetService.ListRackZones:input_type -> device_set.v1.ListRackZonesRequest
+ 42, // 64: device_set.v1.DeviceSetService.ListRackZoneRefs:input_type -> device_set.v1.ListRackZoneRefsRequest
+ 44, // 65: device_set.v1.DeviceSetService.ListRackTypes:input_type -> device_set.v1.ListRackTypesRequest
+ 47, // 66: device_set.v1.DeviceSetService.SaveRack:input_type -> device_set.v1.SaveRackRequest
+ 49, // 67: device_set.v1.DeviceSetService.AssignDevicesToRack:input_type -> device_set.v1.AssignDevicesToRackRequest
+ 12, // 68: device_set.v1.DeviceSetService.CreateDeviceSet:output_type -> device_set.v1.CreateDeviceSetResponse
+ 14, // 69: device_set.v1.DeviceSetService.GetDeviceSet:output_type -> device_set.v1.GetDeviceSetResponse
+ 16, // 70: device_set.v1.DeviceSetService.UpdateDeviceSet:output_type -> device_set.v1.UpdateDeviceSetResponse
+ 18, // 71: device_set.v1.DeviceSetService.DeleteDeviceSet:output_type -> device_set.v1.DeleteDeviceSetResponse
+ 20, // 72: device_set.v1.DeviceSetService.ListDeviceSets:output_type -> device_set.v1.ListDeviceSetsResponse
+ 22, // 73: device_set.v1.DeviceSetService.AddDevicesToGroup:output_type -> device_set.v1.AddDevicesToGroupResponse
+ 24, // 74: device_set.v1.DeviceSetService.RemoveDevicesFromGroup:output_type -> device_set.v1.RemoveDevicesFromGroupResponse
+ 26, // 75: device_set.v1.DeviceSetService.ListDeviceSetMembers:output_type -> device_set.v1.ListDeviceSetMembersResponse
+ 28, // 76: device_set.v1.DeviceSetService.GetDeviceDeviceSets:output_type -> device_set.v1.GetDeviceDeviceSetsResponse
+ 30, // 77: device_set.v1.DeviceSetService.SetRackSlotPosition:output_type -> device_set.v1.SetRackSlotPositionResponse
+ 32, // 78: device_set.v1.DeviceSetService.ClearRackSlotPosition:output_type -> device_set.v1.ClearRackSlotPositionResponse
+ 35, // 79: device_set.v1.DeviceSetService.GetRackSlots:output_type -> device_set.v1.GetRackSlotsResponse
+ 38, // 80: device_set.v1.DeviceSetService.GetDeviceSetStats:output_type -> device_set.v1.GetDeviceSetStatsResponse
+ 41, // 81: device_set.v1.DeviceSetService.ListRackZones:output_type -> device_set.v1.ListRackZonesResponse
+ 43, // 82: device_set.v1.DeviceSetService.ListRackZoneRefs:output_type -> device_set.v1.ListRackZoneRefsResponse
+ 46, // 83: device_set.v1.DeviceSetService.ListRackTypes:output_type -> device_set.v1.ListRackTypesResponse
+ 48, // 84: device_set.v1.DeviceSetService.SaveRack:output_type -> device_set.v1.SaveRackResponse
+ 50, // 85: device_set.v1.DeviceSetService.AssignDevicesToRack:output_type -> device_set.v1.AssignDevicesToRackResponse
+ 68, // [68:86] is the sub-list for method output_type
+ 50, // [50:68] is the sub-list for method input_type
+ 50, // [50:50] is the sub-list for extension type_name
+ 50, // [50:50] is the sub-list for extension extendee
+ 0, // [0:50] is the sub-list for field type_name
}
func init() { file_device_set_v1_device_set_proto_init() }
diff --git a/server/generated/grpc/device_set/v1/device_setv1connect/device_set.connect.go b/server/generated/grpc/device_set/v1/device_setv1connect/device_set.connect.go
index ff1c76bb7c..b4dcdc0e7a 100644
--- a/server/generated/grpc/device_set/v1/device_setv1connect/device_set.connect.go
+++ b/server/generated/grpc/device_set/v1/device_setv1connect/device_set.connect.go
@@ -151,6 +151,15 @@ type DeviceSetServiceClient interface {
// device_selector accepts only the device_list variant. all_devices
// is rejected with InvalidArgument because moving every paired
// device into a single rack is never the intended operation.
+ //
+ // slot_assignments optionally carries each moved device's slot inside
+ // the target rack, so membership and placement land in the same
+ // transaction. This is the rack-level counterpart to
+ // buildings.v1.AssignRacksToBuilding: a delta that names only the
+ // children it changes, with placement optional per child. Prefer it
+ // over SaveRack for every edit — SaveRack replaces the rack's whole
+ // member set, so a stale client snapshot silently drops members
+ // added concurrently.
AssignDevicesToRack(context.Context, *connect.Request[v1.AssignDevicesToRackRequest]) (*connect.Response[v1.AssignDevicesToRackResponse], error)
}
@@ -430,6 +439,15 @@ type DeviceSetServiceHandler interface {
// device_selector accepts only the device_list variant. all_devices
// is rejected with InvalidArgument because moving every paired
// device into a single rack is never the intended operation.
+ //
+ // slot_assignments optionally carries each moved device's slot inside
+ // the target rack, so membership and placement land in the same
+ // transaction. This is the rack-level counterpart to
+ // buildings.v1.AssignRacksToBuilding: a delta that names only the
+ // children it changes, with placement optional per child. Prefer it
+ // over SaveRack for every edit — SaveRack replaces the rack's whole
+ // member set, so a stale client snapshot silently drops members
+ // added concurrently.
AssignDevicesToRack(context.Context, *connect.Request[v1.AssignDevicesToRackRequest]) (*connect.Response[v1.AssignDevicesToRackResponse], error)
}
diff --git a/server/internal/domain/collection/service.go b/server/internal/domain/collection/service.go
index 725301d803..09b314e5b4 100644
--- a/server/internal/domain/collection/service.go
+++ b/server/internal/domain/collection/service.go
@@ -1093,6 +1093,98 @@ type AssignDevicesToRackParams struct {
// site, stripping their site/building to match the rack. When false
// (default) such an add returns Conflicts and writes nothing.
ForceClearConflictingSite bool
+ // SlotAssignments optionally places the assigned devices inside the
+ // target rack's grid, so membership and placement land in the same
+ // transaction. One entry per device whose placement changes: Position
+ // set places it there, Position nil clears its slot. A device not
+ // named here keeps whatever slot it had. Empty writes no slot at all.
+ // Requires TargetRackID. See validateAssignRackSlots.
+ SlotAssignments []*pb.RackSlot
+}
+
+// validateAssignRackSlots enforces the SlotAssignments contract that needs
+// no DB read: a target rack to place into, entries confined to the devices
+// being assigned, and no two entries claiming the same device or the same
+// cell. A nil Position is legal and means "clear this device's slot", the
+// counterpart of buildings.v1.RackPlacement's unset aisle/position. Grid
+// bounds are checked separately, in-tx, once the rack's dimensions are
+// known.
+//
+// The duplicate-position check is the friendly form of
+// uk_rack_slot_position: two entries on one cell would otherwise surface
+// as an opaque constraint violation.
+func validateAssignRackSlots(params AssignDevicesToRackParams) error {
+ if len(params.SlotAssignments) == 0 {
+ return nil
+ }
+ if params.TargetRackID == nil {
+ return fleeterror.NewInvalidArgumentError("slot_assignments requires target_rack_id; an unassign has no rack to place into")
+ }
+ assigned := make(map[string]struct{}, len(params.DeviceIdentifiers))
+ for _, id := range params.DeviceIdentifiers {
+ assigned[id] = struct{}{}
+ }
+ seenDevices := make(map[string]struct{}, len(params.SlotAssignments))
+ seenPositions := make(map[[2]int32]struct{}, len(params.SlotAssignments))
+ for _, slot := range params.SlotAssignments {
+ if slot == nil {
+ return fleeterror.NewInvalidArgumentError("slot assignment must not be empty")
+ }
+ if _, ok := assigned[slot.DeviceIdentifier]; !ok {
+ return fleeterror.NewInvalidArgumentErrorf("slot assignment references device %q which is not in the device selector", slot.DeviceIdentifier)
+ }
+ if _, dup := seenDevices[slot.DeviceIdentifier]; dup {
+ return fleeterror.NewInvalidArgumentErrorf("device %q appears in slot_assignments more than once", slot.DeviceIdentifier)
+ }
+ seenDevices[slot.DeviceIdentifier] = struct{}{}
+ // Unset position = clear the slot; nothing left to bounds check.
+ if slot.Position == nil {
+ continue
+ }
+ if slot.Position.Row < 0 || slot.Position.Column < 0 {
+ return fleeterror.NewInvalidArgumentError("slot position row and column must not be negative")
+ }
+ cell := [2]int32{slot.Position.Row, slot.Position.Column}
+ if _, dup := seenPositions[cell]; dup {
+ return fleeterror.NewInvalidArgumentErrorf("two devices are assigned to slot (%d, %d)", cell[0], cell[1])
+ }
+ seenPositions[cell] = struct{}{}
+ }
+ return nil
+}
+
+// applyRackSlotDelta persists the slot half of an AssignDevicesToRack
+// batch. Only the devices slotAssignments names are touched, so a miner
+// nobody mentioned keeps its slot. That scoping is the whole point of the
+// delta: SaveRack's replace-all shape cannot express "move this one miner"
+// without re-asserting every member.
+//
+// Empty slotAssignments is a no-op, which keeps every pre-existing caller
+// (the importer, the CLI, the overview page's assign-then-place pair)
+// behaving exactly as before: a device already in the target rack retains
+// its slot, and an arriving device is unplaced because its old slot died
+// with its old membership.
+//
+// Otherwise every named device is cleared first, then the entries carrying
+// a position are set. Clearing the whole batch up front is what lets one
+// call swap two occupied cells without tripping uk_rack_slot_position
+// mid-batch, and it is also how an entry with no position expresses
+// "unplace this miner but leave it in the rack".
+func (s *Service) applyRackSlotDelta(ctx context.Context, orgID, rackID int64, slotAssignments []*pb.RackSlot) error {
+ for _, slot := range slotAssignments {
+ if err := s.collectionStore.ClearRackSlotPosition(ctx, rackID, slot.DeviceIdentifier, orgID); err != nil {
+ return err
+ }
+ }
+ for _, slot := range slotAssignments {
+ if slot.Position == nil {
+ continue
+ }
+ if err := s.collectionStore.SetRackSlotPosition(ctx, rackID, slot.DeviceIdentifier, slot.Position.Row, slot.Position.Column, orgID); err != nil {
+ return err
+ }
+ }
+ return nil
}
// PerDeviceRackConflictReason enumerates why a device blocked an
@@ -1147,10 +1239,21 @@ type AssignDevicesToRackResult struct {
//
// Empty DeviceIdentifiers rejects with InvalidArgument so the caller
// learns up-front instead of getting a 0-row response.
+//
+// SlotAssignments, when supplied, places the same devices in the target
+// rack's grid inside this transaction — the rack-level counterpart of
+// AssignRacksToBuilding's optional per-rack aisle/position. That is what
+// lets a client persist a placement edit without re-asserting the rack's
+// whole member set the way SaveRack does.
func (s *Service) AssignDevicesToRack(ctx context.Context, params AssignDevicesToRackParams) (*AssignDevicesToRackResult, error) {
if len(params.DeviceIdentifiers) == 0 {
return nil, fleeterror.NewInvalidArgumentError("device_identifiers must not be empty")
}
+ // Shape checks that need no DB read run before the tx opens; the
+ // grid-bounds check needs the rack's dimensions and runs inside.
+ if err := validateAssignRackSlots(params); err != nil {
+ return nil, err
+ }
type txOut struct {
assigned int64
@@ -1165,9 +1268,11 @@ func (s *Service) AssignDevicesToRack(ctx context.Context, params AssignDevicesT
}
result, err := s.transactor.RunInTxWithResult(ctx, func(ctx context.Context) (any, error) {
var (
- targetSiteID *int64
- targetBuildingID *int64
- targetLabel string
+ targetSiteID *int64
+ targetBuildingID *int64
+ targetLabel string
+ targetRows, targetColumns int32
+ targetPriorCount int32
)
// Canonical lock order: lock every rack involved in the
// reparent -- sources + target -- together in ascending
@@ -1216,6 +1321,36 @@ func (s *Service) AssignDevicesToRack(ctx context.Context, params AssignDevicesT
targetSiteID = placement.SiteID
targetBuildingID = placement.BuildingID
targetLabel = coll.Label
+ // Pre-add member count, read under the rack lock. Paired with
+ // AddDevicesToCollection's newly-inserted count below it gives
+ // the exact resulting size without a second membership read —
+ // RemoveDevicesFromAnyRack excludes the target rack, so nothing
+ // between here and the insert can change this number.
+ targetPriorCount = coll.DeviceCount
+
+ // Read the grid once under the rack lock; it bounds both the
+ // slot positions below and the post-insert capacity check. A
+ // rack with no device_set_rack row yields nil — leave both
+ // guards off rather than inventing dimensions for it.
+ rackInfo, err := s.collectionStore.GetRackInfo(ctx, *params.TargetRackID, params.OrgID)
+ if err != nil {
+ return nil, err
+ }
+ if rackInfo != nil {
+ targetRows, targetColumns = rackInfo.Rows, rackInfo.Columns
+ for _, slot := range params.SlotAssignments {
+ // Unset position = clear; no cell to bounds check.
+ if slot.Position == nil {
+ continue
+ }
+ if slot.Position.Row >= targetRows {
+ return nil, fleeterror.NewInvalidArgumentErrorf("slot row %d is out of bounds (rack has %d rows)", slot.Position.Row, targetRows)
+ }
+ if slot.Position.Column >= targetColumns {
+ return nil, fleeterror.NewInvalidArgumentErrorf("slot column %d is out of bounds (rack has %d columns)", slot.Position.Column, targetColumns)
+ }
+ }
+ }
}
// Placement-consistency guard for a site-less (fully-unassigned)
@@ -1277,6 +1412,25 @@ func (s *Service) AssignDevicesToRack(ctx context.Context, params AssignDevicesT
return nil, err
}
newlyAssigned = added
+
+ // Capacity guard. A rack has no "floating" members — every
+ // miner is expected to occupy a slot — so membership is bounded
+ // by rows×columns, the same invariant SaveRack enforces on its
+ // replace path. Without it a delta could push a rack past its
+ // grid and leave miners at positions the grid can never
+ // address.
+ //
+ // prior + newly-inserted is exact: `added` counts only rows the
+ // ON CONFLICT DO NOTHING insert actually created, so devices
+ // already in this rack are not double-counted. Returning an
+ // error rolls the whole tx back, so nothing persists.
+ if capacity := int64(targetRows) * int64(targetColumns); capacity > 0 {
+ if resulting := int64(targetPriorCount) + added; resulting > capacity {
+ return nil, fleeterror.NewInvalidArgumentErrorf(
+ "cannot assign %d miner(s) to rack %q: it would hold %d miner(s) but has only %d slot(s) (%d×%d)",
+ len(uniqueIdentifiers(params.DeviceIdentifiers)), targetLabel, resulting, capacity, targetRows, targetColumns)
+ }
+ }
assigned = int64(len(uniqueIdentifiers(params.DeviceIdentifiers)))
// Site cascade fires when the rack has a site OR a building.
// A rack in a building inherits that building's site (NULL
@@ -1328,6 +1482,12 @@ func (s *Service) AssignDevicesToRack(ctx context.Context, params AssignDevicesT
}
siteReassigned = stripped
}
+
+ // Placement, last: membership must exist before a slot can
+ // reference it (both slot queries join device_set_membership).
+ if err := s.applyRackSlotDelta(ctx, params.OrgID, *params.TargetRackID, params.SlotAssignments); err != nil {
+ return nil, err
+ }
}
return &txOut{
diff --git a/server/internal/domain/collection/service_test.go b/server/internal/domain/collection/service_test.go
index dbbe9d3e64..a2924232ef 100644
--- a/server/internal/domain/collection/service_test.go
+++ b/server/internal/domain/collection/service_test.go
@@ -2,6 +2,7 @@ package collection
import (
"context"
+ "fmt"
"testing"
pb "github.com/block/proto-fleet/server/generated/grpc/collection/v1"
@@ -2611,6 +2612,8 @@ func TestService_AssignDevicesToRack_atomicReassign(t *testing.T) {
Return(interfaces.RackPlacement{SiteID: &rackSite}, nil),
mockStore.EXPECT().GetCollection(gomock.Any(), testOrgID, targetRackID).
Return(&pb.DeviceCollection{Id: targetRackID, Label: "Rack-B", Type: pb.CollectionType_COLLECTION_TYPE_RACK}, nil),
+ mockStore.EXPECT().GetRackInfo(gomock.Any(), targetRackID, testOrgID).
+ Return(&pb.RackInfo{Rows: 10, Columns: 10}, nil),
mockStore.EXPECT().RemoveDevicesFromAnyRack(gomock.Any(), testOrgID, deviceIDs, targetRackID).Return(int64(2), nil),
mockStore.EXPECT().AddDevicesToCollection(gomock.Any(), testOrgID, targetRackID, deviceIDs).Return(int64(2), nil),
mockStore.EXPECT().GetDeviceSiteIDsByMembership(gomock.Any(), targetRackID, testOrgID).
@@ -2698,6 +2701,8 @@ func TestService_AssignDevicesToRack_acquiresSourceRackLocksBeforeWrites(t *test
Return(interfaces.RackPlacement{}, nil),
mockStore.EXPECT().GetCollection(gomock.Any(), testOrgID, targetRackID).
Return(&pb.DeviceCollection{Id: targetRackID, Label: "Rack-B", Type: pb.CollectionType_COLLECTION_TYPE_RACK}, nil),
+ mockStore.EXPECT().GetRackInfo(gomock.Any(), targetRackID, testOrgID).
+ Return(&pb.RackInfo{Rows: 10, Columns: 10}, nil),
mockStore.EXPECT().FindDevicesWithSiteOrBuilding(gomock.Any(), testOrgID, deviceIDs).Return(nil, nil),
mockStore.EXPECT().RemoveDevicesFromAnyRack(gomock.Any(), testOrgID, deviceIDs, targetRackID).Return(int64(2), nil),
mockStore.EXPECT().AddDevicesToCollection(gomock.Any(), testOrgID, targetRackID, deviceIDs).Return(int64(2), nil),
@@ -2761,6 +2766,8 @@ func TestService_AssignDevicesToRack_locksIncludeTargetRack(t *testing.T) {
Return(interfaces.RackPlacement{}, nil)
mockStore.EXPECT().GetCollection(gomock.Any(), testOrgID, targetRackID).
Return(&pb.DeviceCollection{Id: targetRackID, Label: "Rack-Target", Type: pb.CollectionType_COLLECTION_TYPE_RACK}, nil)
+ mockStore.EXPECT().GetRackInfo(gomock.Any(), targetRackID, testOrgID).
+ Return(&pb.RackInfo{Rows: 10, Columns: 10}, nil)
// Site-less target rack → site-consistency pre-check + post-add strip.
mockStore.EXPECT().FindDevicesWithSiteOrBuilding(gomock.Any(), testOrgID, deviceIDs).Return(nil, nil)
mockStore.EXPECT().RemoveDevicesFromAnyRack(gomock.Any(), testOrgID, deviceIDs, targetRackID).Return(int64(0), nil)
@@ -2791,6 +2798,8 @@ func TestService_AssignDevicesToRack_siteLessRackConflictNoForce(t *testing.T) {
mockStore.EXPECT().LockRackPlacementForWrite(gomock.Any(), targetRackID, testOrgID).Return(interfaces.RackPlacement{}, nil)
mockStore.EXPECT().GetCollection(gomock.Any(), testOrgID, targetRackID).
Return(&pb.DeviceCollection{Id: targetRackID, Label: "Rack-Target", Type: pb.CollectionType_COLLECTION_TYPE_RACK}, nil)
+ mockStore.EXPECT().GetRackInfo(gomock.Any(), targetRackID, testOrgID).
+ Return(&pb.RackInfo{Rows: 10, Columns: 10}, nil)
// d1 currently has a site → would be stripped. No force → reject,
// no RemoveDevicesFromAnyRack / AddDevicesToCollection.
mockStore.EXPECT().FindDevicesWithSiteOrBuilding(gomock.Any(), testOrgID, deviceIDs).Return([]string{"d1"}, nil)
@@ -2822,6 +2831,8 @@ func TestService_AssignDevicesToRack_siteLessRackForceStrips(t *testing.T) {
mockStore.EXPECT().LockRackPlacementForWrite(gomock.Any(), targetRackID, testOrgID).Return(interfaces.RackPlacement{}, nil),
mockStore.EXPECT().GetCollection(gomock.Any(), testOrgID, targetRackID).
Return(&pb.DeviceCollection{Id: targetRackID, Label: "Rack-Target", Type: pb.CollectionType_COLLECTION_TYPE_RACK}, nil),
+ mockStore.EXPECT().GetRackInfo(gomock.Any(), targetRackID, testOrgID).
+ Return(&pb.RackInfo{Rows: 10, Columns: 10}, nil),
mockStore.EXPECT().FindDevicesWithSiteOrBuilding(gomock.Any(), testOrgID, deviceIDs).Return([]string{"d1"}, nil),
mockStore.EXPECT().RemoveDevicesFromAnyRack(gomock.Any(), testOrgID, deviceIDs, targetRackID).Return(int64(0), nil),
mockStore.EXPECT().AddDevicesToCollection(gomock.Any(), testOrgID, targetRackID, deviceIDs).Return(int64(1), nil),
@@ -2855,6 +2866,336 @@ func TestService_AssignDevicesToRack_emptyDevicesRejected(t *testing.T) {
require.Error(t, err)
}
+// rackSlot is a terse constructor for the slot-delta tests below.
+func rackSlot(deviceIdentifier string, row, column int32) *pb.RackSlot {
+ return &pb.RackSlot{
+ DeviceIdentifier: deviceIdentifier,
+ Position: &pb.RackSlotPosition{Row: row, Column: column},
+ }
+}
+
+// expectAssignToRackPreamble sets up the locks + reads every rack-target
+// assign performs before it writes, so the slot tests can assert only on
+// the slot half. Placement is a plain site so the site-strip pre-check
+// doesn't fire.
+func expectAssignToRackPreamble(mockStore *mocks.MockCollectionStore, rackID int64, deviceIDs []string, rows, columns int32) {
+ site := int64(7)
+ mockStore.EXPECT().LockRacksForReparent(gomock.Any(), testOrgID, deviceIDs, rackID).Return(nil, nil)
+ mockStore.EXPECT().LockRackPlacementForWrite(gomock.Any(), rackID, testOrgID).
+ Return(interfaces.RackPlacement{SiteID: &site}, nil)
+ mockStore.EXPECT().GetCollection(gomock.Any(), testOrgID, rackID).
+ Return(&pb.DeviceCollection{Id: rackID, Label: "Rack-A", Type: pb.CollectionType_COLLECTION_TYPE_RACK}, nil)
+ mockStore.EXPECT().GetRackInfo(gomock.Any(), rackID, testOrgID).
+ Return(&pb.RackInfo{Rows: rows, Columns: columns}, nil)
+ mockStore.EXPECT().RemoveDevicesFromAnyRack(gomock.Any(), testOrgID, deviceIDs, rackID).Return(int64(0), nil)
+ mockStore.EXPECT().AddDevicesToCollection(gomock.Any(), testOrgID, rackID, deviceIDs).Return(int64(len(deviceIDs)), nil)
+ mockStore.EXPECT().GetDeviceSiteIDsByMembership(gomock.Any(), rackID, testOrgID).Return(nil, nil)
+ mockStore.EXPECT().CascadeAddedDeviceSites(gomock.Any(), testOrgID, rackID, deviceIDs).Return(int64(0), nil)
+ mockStore.EXPECT().CascadeAddedDeviceBuildings(gomock.Any(), testOrgID, rackID, deviceIDs).Return(int64(0), nil)
+}
+
+// TestService_AssignDevicesToRack_slotDeltaClearsThenSets pins the core of
+// the placement delta: every named device is cleared before any position
+// is written. Without that ordering a relayout that swaps two occupied
+// cells trips uk_rack_slot_position mid-batch.
+func TestService_AssignDevicesToRack_slotDeltaClearsThenSets(t *testing.T) {
+ svc, mockStore, _ := newTestServiceWithSites(t, nil)
+ ctx := testCtx(t)
+
+ rackID := int64(42)
+ deviceIDs := []string{"d1", "d2"}
+ expectAssignToRackPreamble(mockStore, rackID, deviceIDs, 10, 10)
+
+ // Both clears must precede both sets. gomock.InOrder can't express
+ // "any order within a group", so assert the boundary directly: record
+ // the call sequence and check no clear follows a set.
+ var calls []string
+ mockStore.EXPECT().ClearRackSlotPosition(gomock.Any(), rackID, gomock.Any(), testOrgID).Times(2).
+ DoAndReturn(func(_ context.Context, _ int64, id string, _ int64) error {
+ calls = append(calls, "clear:"+id)
+ return nil
+ })
+ mockStore.EXPECT().SetRackSlotPosition(gomock.Any(), rackID, gomock.Any(), gomock.Any(), gomock.Any(), testOrgID).Times(2).
+ DoAndReturn(func(_ context.Context, _ int64, id string, row, column int32, _ int64) error {
+ calls = append(calls, fmt.Sprintf("set:%s@%d,%d", id, row, column))
+ return nil
+ })
+
+ // d1 and d2 swap cells.
+ _, err := svc.AssignDevicesToRack(ctx, AssignDevicesToRackParams{
+ OrgID: testOrgID,
+ TargetRackID: &rackID,
+ DeviceIdentifiers: deviceIDs,
+ SlotAssignments: []*pb.RackSlot{rackSlot("d1", 0, 1), rackSlot("d2", 0, 0)},
+ })
+ require.NoError(t, err)
+
+ require.Len(t, calls, 4)
+ assert.ElementsMatch(t, []string{"clear:d1", "clear:d2"}, calls[:2], "both clears must land first")
+ assert.ElementsMatch(t, []string{"set:d1@0,1", "set:d2@0,0"}, calls[2:])
+}
+
+// TestService_AssignDevicesToRack_slotDeltaUnplacesOnNilPosition pins the
+// mixed placed+unplaced case that makes this a delta rather than a
+// replace: an entry with no position clears that device's slot — the
+// counterpart of RackPlacement's unset aisle/position — which is how a
+// caller says "pull this miner off the grid but leave it in the rack".
+func TestService_AssignDevicesToRack_slotDeltaUnplacesOnNilPosition(t *testing.T) {
+ svc, mockStore, _ := newTestServiceWithSites(t, nil)
+ ctx := testCtx(t)
+
+ rackID := int64(42)
+ deviceIDs := []string{"d1", "d2"}
+ expectAssignToRackPreamble(mockStore, rackID, deviceIDs, 10, 10)
+
+ mockStore.EXPECT().ClearRackSlotPosition(gomock.Any(), rackID, "d1", testOrgID).Return(nil)
+ mockStore.EXPECT().ClearRackSlotPosition(gomock.Any(), rackID, "d2", testOrgID).Return(nil)
+ // Only d1 carries a position; d2's nil-position entry leaves it cleared.
+ mockStore.EXPECT().SetRackSlotPosition(gomock.Any(), rackID, "d1", int32(2), int32(3), testOrgID).Return(nil)
+
+ _, err := svc.AssignDevicesToRack(ctx, AssignDevicesToRackParams{
+ OrgID: testOrgID,
+ TargetRackID: &rackID,
+ DeviceIdentifiers: deviceIDs,
+ SlotAssignments: []*pb.RackSlot{rackSlot("d1", 2, 3), {DeviceIdentifier: "d2"}},
+ })
+ require.NoError(t, err)
+}
+
+// TestService_AssignDevicesToRack_slotDeltaPureUnplace covers the case an
+// "empty list means clear the selector" rule could not express at all: the
+// operator pulls every miner they touched off the grid. Each is named with
+// no position, so the batch is non-empty and the clears actually land.
+func TestService_AssignDevicesToRack_slotDeltaPureUnplace(t *testing.T) {
+ svc, mockStore, _ := newTestServiceWithSites(t, nil)
+ ctx := testCtx(t)
+
+ rackID := int64(42)
+ deviceIDs := []string{"d1", "d2"}
+ expectAssignToRackPreamble(mockStore, rackID, deviceIDs, 10, 10)
+
+ mockStore.EXPECT().ClearRackSlotPosition(gomock.Any(), rackID, "d1", testOrgID).Return(nil)
+ mockStore.EXPECT().ClearRackSlotPosition(gomock.Any(), rackID, "d2", testOrgID).Return(nil)
+ // No SetRackSlotPosition expectation: the strict mock fails if one fires.
+
+ _, err := svc.AssignDevicesToRack(ctx, AssignDevicesToRackParams{
+ OrgID: testOrgID,
+ TargetRackID: &rackID,
+ DeviceIdentifiers: deviceIDs,
+ SlotAssignments: []*pb.RackSlot{{DeviceIdentifier: "d1"}, {DeviceIdentifier: "d2"}},
+ })
+ require.NoError(t, err)
+}
+
+// TestService_AssignDevicesToRack_slotDeltaLeavesUnnamedDeviceAlone is the
+// invariant that makes this safe where SaveRack was not: a miner the batch
+// never mentions keeps its slot, even though it is a member of the same
+// rack. SaveRack could only express this by re-asserting the entire member
+// set from the client's (possibly stale) snapshot.
+func TestService_AssignDevicesToRack_slotDeltaLeavesUnnamedDeviceAlone(t *testing.T) {
+ svc, mockStore, _ := newTestServiceWithSites(t, nil)
+ ctx := testCtx(t)
+
+ rackID := int64(42)
+ // d2 is in the selector but absent from slot_assignments.
+ deviceIDs := []string{"d1", "d2"}
+ expectAssignToRackPreamble(mockStore, rackID, deviceIDs, 10, 10)
+
+ // Only d1 is cleared and re-placed. A Clear on d2 fails the strict mock.
+ mockStore.EXPECT().ClearRackSlotPosition(gomock.Any(), rackID, "d1", testOrgID).Return(nil)
+ mockStore.EXPECT().SetRackSlotPosition(gomock.Any(), rackID, "d1", int32(0), int32(0), testOrgID).Return(nil)
+
+ _, err := svc.AssignDevicesToRack(ctx, AssignDevicesToRackParams{
+ OrgID: testOrgID,
+ TargetRackID: &rackID,
+ DeviceIdentifiers: deviceIDs,
+ SlotAssignments: []*pb.RackSlot{rackSlot("d1", 0, 0)},
+ })
+ require.NoError(t, err)
+}
+
+// TestService_AssignDevicesToRack_noSlotsLeavesPlacementUntouched pins the
+// backward-compatible default every pre-existing caller relies on (the
+// importer, the CLI, the overview page's assign-then-place pair): an empty
+// SlotAssignments touches no slot row at all, so a device already in the
+// target rack keeps the slot it had.
+func TestService_AssignDevicesToRack_noSlotsLeavesPlacementUntouched(t *testing.T) {
+ svc, mockStore, _ := newTestServiceWithSites(t, nil)
+ ctx := testCtx(t)
+
+ rackID := int64(42)
+ deviceIDs := []string{"d1"}
+ expectAssignToRackPreamble(mockStore, rackID, deviceIDs, 10, 10)
+ // No ClearRackSlotPosition / SetRackSlotPosition expectations: the
+ // strict mock fails the test if either fires.
+
+ _, err := svc.AssignDevicesToRack(ctx, AssignDevicesToRackParams{
+ OrgID: testOrgID,
+ TargetRackID: &rackID,
+ DeviceIdentifiers: deviceIDs,
+ })
+ require.NoError(t, err)
+}
+
+// TestService_AssignDevicesToRack_slotDeltaRejectsBadInput covers the
+// shape contract. Each case must reject BEFORE any store call, so these
+// run against a mock with zero expectations — a write slipping through
+// would fail on the unexpected call rather than pass silently.
+func TestService_AssignDevicesToRack_slotDeltaRejectsBadInput(t *testing.T) {
+ rackID := int64(42)
+ cases := []struct {
+ name string
+ params AssignDevicesToRackParams
+ }{
+ {
+ // A device the caller never asked to assign has no membership
+ // row for the slot to hang off, so placing it is meaningless.
+ name: "slot for a device outside the selector",
+ params: AssignDevicesToRackParams{
+ TargetRackID: &rackID,
+ DeviceIdentifiers: []string{"d1"},
+ SlotAssignments: []*pb.RackSlot{rackSlot("stranger", 0, 0)},
+ },
+ },
+ {
+ // Would trip uk_rack_slot_position; reject with a readable
+ // message instead of an opaque constraint violation.
+ name: "two devices on one cell",
+ params: AssignDevicesToRackParams{
+ TargetRackID: &rackID,
+ DeviceIdentifiers: []string{"d1", "d2"},
+ SlotAssignments: []*pb.RackSlot{rackSlot("d1", 1, 1), rackSlot("d2", 1, 1)},
+ },
+ },
+ {
+ // Ambiguous: the last entry would silently win.
+ name: "one device in two cells",
+ params: AssignDevicesToRackParams{
+ TargetRackID: &rackID,
+ DeviceIdentifiers: []string{"d1"},
+ SlotAssignments: []*pb.RackSlot{rackSlot("d1", 0, 0), rackSlot("d1", 1, 1)},
+ },
+ },
+ {
+ // An unassign has no rack to place into.
+ name: "slots without a target rack",
+ params: AssignDevicesToRackParams{
+ DeviceIdentifiers: []string{"d1"},
+ SlotAssignments: []*pb.RackSlot{rackSlot("d1", 0, 0)},
+ },
+ },
+ }
+ for _, tc := range cases {
+ t.Run(tc.name, func(t *testing.T) {
+ svc, _, _ := newTestServiceWithSites(t, nil)
+ tc.params.OrgID = testOrgID
+ _, err := svc.AssignDevicesToRack(testCtx(t), tc.params)
+ require.Error(t, err)
+ })
+ }
+}
+
+// TestService_AssignDevicesToRack_slotOutOfGridRejected pins the bounds
+// check that needs the rack's dimensions, so it runs in-tx after the grid
+// read rather than in the pre-tx shape validation.
+func TestService_AssignDevicesToRack_slotOutOfGridRejected(t *testing.T) {
+ svc, mockStore, _ := newTestServiceWithSites(t, nil)
+ ctx := testCtx(t)
+
+ rackID := int64(42)
+ deviceIDs := []string{"d1"}
+ site := int64(7)
+ // Only the reads up to the grid read: the rejection must land before
+ // any write, so no Remove/Add expectations are declared.
+ mockStore.EXPECT().LockRacksForReparent(gomock.Any(), testOrgID, deviceIDs, rackID).Return(nil, nil)
+ mockStore.EXPECT().LockRackPlacementForWrite(gomock.Any(), rackID, testOrgID).
+ Return(interfaces.RackPlacement{SiteID: &site}, nil)
+ mockStore.EXPECT().GetCollection(gomock.Any(), testOrgID, rackID).
+ Return(&pb.DeviceCollection{Id: rackID, Label: "Rack-A", Type: pb.CollectionType_COLLECTION_TYPE_RACK}, nil)
+ mockStore.EXPECT().GetRackInfo(gomock.Any(), rackID, testOrgID).
+ Return(&pb.RackInfo{Rows: 2, Columns: 2}, nil)
+
+ _, err := svc.AssignDevicesToRack(ctx, AssignDevicesToRackParams{
+ OrgID: testOrgID,
+ TargetRackID: &rackID,
+ DeviceIdentifiers: deviceIDs,
+ SlotAssignments: []*pb.RackSlot{rackSlot("d1", 0, 5)},
+ })
+ require.Error(t, err)
+ assert.Contains(t, err.Error(), "out of bounds")
+}
+
+// TestService_AssignDevicesToRack_overCapacityRejected pins the capacity
+// invariant SaveRack already enforces on its replace path. A rack has no
+// floating members, so a delta must not push membership past rows×columns
+// and leave miners at positions the grid can never address.
+func TestService_AssignDevicesToRack_overCapacityRejected(t *testing.T) {
+ svc, mockStore, _ := newTestServiceWithSites(t, nil)
+ ctx := testCtx(t)
+
+ rackID := int64(42)
+ deviceIDs := []string{"d3", "d4"}
+ site := int64(7)
+ mockStore.EXPECT().LockRacksForReparent(gomock.Any(), testOrgID, deviceIDs, rackID).Return(nil, nil)
+ mockStore.EXPECT().LockRackPlacementForWrite(gomock.Any(), rackID, testOrgID).
+ Return(interfaces.RackPlacement{SiteID: &site}, nil)
+ // 1×3 grid already holding 2 miners.
+ mockStore.EXPECT().GetCollection(gomock.Any(), testOrgID, rackID).
+ Return(&pb.DeviceCollection{Id: rackID, Label: "Rack-A", Type: pb.CollectionType_COLLECTION_TYPE_RACK, DeviceCount: 2}, nil)
+ mockStore.EXPECT().GetRackInfo(gomock.Any(), rackID, testOrgID).
+ Return(&pb.RackInfo{Rows: 1, Columns: 3}, nil)
+ mockStore.EXPECT().RemoveDevicesFromAnyRack(gomock.Any(), testOrgID, deviceIDs, rackID).Return(int64(0), nil)
+ // Both inserts are new → 2 + 2 = 4 in a 3-slot rack.
+ mockStore.EXPECT().AddDevicesToCollection(gomock.Any(), testOrgID, rackID, deviceIDs).Return(int64(2), nil)
+
+ _, err := svc.AssignDevicesToRack(ctx, AssignDevicesToRackParams{
+ OrgID: testOrgID,
+ TargetRackID: &rackID,
+ DeviceIdentifiers: deviceIDs,
+ })
+ require.Error(t, err)
+ assert.Contains(t, err.Error(), "slot(s)")
+}
+
+// TestService_AssignDevicesToRack_reAssertingMembersIsNotOverCapacity
+// guards the counting rule: capacity uses the newly-INSERTED count, not
+// the requested count, so re-asserting devices already in a full rack (as
+// a pure placement edit does) must not read as an overflow.
+func TestService_AssignDevicesToRack_reAssertingMembersIsNotOverCapacity(t *testing.T) {
+ svc, mockStore, _ := newTestServiceWithSites(t, nil)
+ ctx := testCtx(t)
+
+ rackID := int64(42)
+ deviceIDs := []string{"d1", "d2"}
+ site := int64(7)
+ mockStore.EXPECT().LockRacksForReparent(gomock.Any(), testOrgID, deviceIDs, rackID).Return(nil, nil)
+ mockStore.EXPECT().LockRackPlacementForWrite(gomock.Any(), rackID, testOrgID).
+ Return(interfaces.RackPlacement{SiteID: &site}, nil)
+ // 1×2 grid, already exactly full with these same two miners.
+ mockStore.EXPECT().GetCollection(gomock.Any(), testOrgID, rackID).
+ Return(&pb.DeviceCollection{Id: rackID, Label: "Rack-A", Type: pb.CollectionType_COLLECTION_TYPE_RACK, DeviceCount: 2}, nil)
+ mockStore.EXPECT().GetRackInfo(gomock.Any(), rackID, testOrgID).
+ Return(&pb.RackInfo{Rows: 1, Columns: 2}, nil)
+ mockStore.EXPECT().RemoveDevicesFromAnyRack(gomock.Any(), testOrgID, deviceIDs, rackID).Return(int64(0), nil)
+ // Already members → ON CONFLICT DO NOTHING inserts nothing.
+ mockStore.EXPECT().AddDevicesToCollection(gomock.Any(), testOrgID, rackID, deviceIDs).Return(int64(0), nil)
+ mockStore.EXPECT().GetDeviceSiteIDsByMembership(gomock.Any(), rackID, testOrgID).Return(nil, nil)
+ mockStore.EXPECT().CascadeAddedDeviceSites(gomock.Any(), testOrgID, rackID, deviceIDs).Return(int64(0), nil)
+ mockStore.EXPECT().CascadeAddedDeviceBuildings(gomock.Any(), testOrgID, rackID, deviceIDs).Return(int64(0), nil)
+ mockStore.EXPECT().ClearRackSlotPosition(gomock.Any(), rackID, "d1", testOrgID).Return(nil)
+ mockStore.EXPECT().ClearRackSlotPosition(gomock.Any(), rackID, "d2", testOrgID).Return(nil)
+ mockStore.EXPECT().SetRackSlotPosition(gomock.Any(), rackID, "d1", int32(0), int32(1), testOrgID).Return(nil)
+ mockStore.EXPECT().SetRackSlotPosition(gomock.Any(), rackID, "d2", int32(0), int32(0), testOrgID).Return(nil)
+
+ _, err := svc.AssignDevicesToRack(ctx, AssignDevicesToRackParams{
+ OrgID: testOrgID,
+ TargetRackID: &rackID,
+ DeviceIdentifiers: deviceIDs,
+ SlotAssignments: []*pb.RackSlot{rackSlot("d1", 0, 1), rackSlot("d2", 0, 0)},
+ })
+ require.NoError(t, err)
+}
+
// TestService_AssignDevicesToRack_crossSiteEmitsCascadeMetadata asserts
// that when the target rack lives at a different site than (some of) the
// devices, the activity event carries SiteID + cascade Metadata mirroring
@@ -2877,6 +3218,8 @@ func TestService_AssignDevicesToRack_crossSiteEmitsCascadeMetadata(t *testing.T)
Return(interfaces.RackPlacement{SiteID: &rackSite}, nil),
mockStore.EXPECT().GetCollection(gomock.Any(), testOrgID, targetRackID).
Return(&pb.DeviceCollection{Id: targetRackID, Label: "Rack-B", Type: pb.CollectionType_COLLECTION_TYPE_RACK}, nil),
+ mockStore.EXPECT().GetRackInfo(gomock.Any(), targetRackID, testOrgID).
+ Return(&pb.RackInfo{Rows: 10, Columns: 10}, nil),
mockStore.EXPECT().RemoveDevicesFromAnyRack(gomock.Any(), testOrgID, deviceIDs, targetRackID).Return(int64(1), nil),
mockStore.EXPECT().AddDevicesToCollection(gomock.Any(), testOrgID, targetRackID, deviceIDs).Return(int64(1), nil),
mockStore.EXPECT().GetDeviceSiteIDsByMembership(gomock.Any(), targetRackID, testOrgID).
@@ -2931,6 +3274,8 @@ func TestService_AssignDevicesToRack_sameSiteSkipsCascadeMetadata(t *testing.T)
Return(interfaces.RackPlacement{SiteID: &rackSite}, nil),
mockStore.EXPECT().GetCollection(gomock.Any(), testOrgID, targetRackID).
Return(&pb.DeviceCollection{Id: targetRackID, Label: "Rack-B", Type: pb.CollectionType_COLLECTION_TYPE_RACK}, nil),
+ mockStore.EXPECT().GetRackInfo(gomock.Any(), targetRackID, testOrgID).
+ Return(&pb.RackInfo{Rows: 10, Columns: 10}, nil),
mockStore.EXPECT().RemoveDevicesFromAnyRack(gomock.Any(), testOrgID, deviceIDs, targetRackID).Return(int64(0), nil),
mockStore.EXPECT().AddDevicesToCollection(gomock.Any(), testOrgID, targetRackID, deviceIDs).Return(int64(1), nil),
mockStore.EXPECT().GetDeviceSiteIDsByMembership(gomock.Any(), targetRackID, testOrgID).
@@ -2980,6 +3325,8 @@ func TestService_AssignDevicesToRack_siteLessBuildingClearsDeviceSite(t *testing
Return(interfaces.RackPlacement{SiteID: nil, BuildingID: &rackBuilding}, nil),
mockStore.EXPECT().GetCollection(gomock.Any(), testOrgID, targetRackID).
Return(&pb.DeviceCollection{Id: targetRackID, Label: "Rack-B", Type: pb.CollectionType_COLLECTION_TYPE_RACK}, nil),
+ mockStore.EXPECT().GetRackInfo(gomock.Any(), targetRackID, testOrgID).
+ Return(&pb.RackInfo{Rows: 10, Columns: 10}, nil),
mockStore.EXPECT().RemoveDevicesFromAnyRack(gomock.Any(), testOrgID, deviceIDs, targetRackID).Return(int64(1), nil),
mockStore.EXPECT().AddDevicesToCollection(gomock.Any(), testOrgID, targetRackID, deviceIDs).Return(int64(1), nil),
// Site cascade now fires even though targetSiteID is nil, because
diff --git a/server/internal/handlers/deviceset/handler_test.go b/server/internal/handlers/deviceset/handler_test.go
index 7808561e7c..5546a783e3 100644
--- a/server/internal/handlers/deviceset/handler_test.go
+++ b/server/internal/handlers/deviceset/handler_test.go
@@ -893,6 +893,9 @@ func TestAssignDevicesToRack_HappyPathAssigns(t *testing.T) {
h.collectionStore.EXPECT().
GetCollection(gomock.Any(), testOrgID, targetRackID).
Return(&collectionpb.DeviceCollection{Id: targetRackID, Label: "Rack-B", Type: collectionpb.CollectionType_COLLECTION_TYPE_RACK}, nil),
+ h.collectionStore.EXPECT().
+ GetRackInfo(gomock.Any(), targetRackID, testOrgID).
+ Return(&collectionpb.RackInfo{Rows: 10, Columns: 10}, nil),
h.collectionStore.EXPECT().
RemoveDevicesFromAnyRack(gomock.Any(), testOrgID, deviceIDs, targetRackID).
Return(int64(2), nil),
@@ -949,6 +952,87 @@ func TestAssignDevicesToRack_UnassignBranch(t *testing.T) {
assert.Equal(t, int64(0), resp.Msg.SiteReassignedCount)
}
+// TestAssignDevicesToRack_CarriesSlotAssignments pins the wire→domain
+// mapping for the placement half of the delta: slot_assignments must reach
+// the store as real slot writes in the same call that moves membership.
+// That is what lets the rack modals persist a placement edit without
+// SaveRack's replace-all member set.
+func TestAssignDevicesToRack_CarriesSlotAssignments(t *testing.T) {
+ h := newTestHandler(t)
+
+ targetRackID := int64(42)
+ rackSite := int64(7)
+ deviceIDs := []string{"d1", "d2"}
+
+ h.collectionStore.EXPECT().
+ LockRacksForReparent(gomock.Any(), testOrgID, deviceIDs, targetRackID).
+ Return([]int64{targetRackID}, nil)
+ h.collectionStore.EXPECT().
+ LockRackPlacementForWrite(gomock.Any(), targetRackID, testOrgID).
+ Return(interfaces.RackPlacement{SiteID: &rackSite}, nil)
+ h.collectionStore.EXPECT().
+ GetCollection(gomock.Any(), testOrgID, targetRackID).
+ Return(&collectionpb.DeviceCollection{Id: targetRackID, Label: "Rack-B", Type: collectionpb.CollectionType_COLLECTION_TYPE_RACK}, nil)
+ h.collectionStore.EXPECT().
+ GetRackInfo(gomock.Any(), targetRackID, testOrgID).
+ Return(&collectionpb.RackInfo{Rows: 4, Columns: 4}, nil)
+ h.collectionStore.EXPECT().
+ RemoveDevicesFromAnyRack(gomock.Any(), testOrgID, deviceIDs, targetRackID).
+ Return(int64(0), nil)
+ h.collectionStore.EXPECT().
+ AddDevicesToCollection(gomock.Any(), testOrgID, targetRackID, deviceIDs).
+ Return(int64(2), nil)
+ h.collectionStore.EXPECT().
+ GetDeviceSiteIDsByMembership(gomock.Any(), targetRackID, testOrgID).
+ Return(nil, nil)
+ h.collectionStore.EXPECT().
+ CascadeAddedDeviceSites(gomock.Any(), testOrgID, targetRackID, deviceIDs).
+ Return(int64(0), nil)
+ h.collectionStore.EXPECT().
+ CascadeAddedDeviceBuildings(gomock.Any(), testOrgID, targetRackID, deviceIDs).
+ Return(int64(0), nil)
+ // d1 is placed at (1,2). d2 is named with no position, so it is cleared
+ // and left off the grid — the wire form of "in the rack, unplaced".
+ h.collectionStore.EXPECT().ClearRackSlotPosition(gomock.Any(), targetRackID, "d1", testOrgID).Return(nil)
+ h.collectionStore.EXPECT().ClearRackSlotPosition(gomock.Any(), targetRackID, "d2", testOrgID).Return(nil)
+ h.collectionStore.EXPECT().
+ SetRackSlotPosition(gomock.Any(), targetRackID, "d1", int32(1), int32(2), testOrgID).
+ Return(nil)
+
+ resp, err := h.handler.AssignDevicesToRack(testCtx(t), connect.NewRequest(&dspb.AssignDevicesToRackRequest{
+ TargetRackId: &targetRackID,
+ DeviceSelector: deviceListSelector(deviceIDs...),
+ SlotAssignments: []*dspb.RackSlot{
+ {DeviceIdentifier: "d1", Position: &dspb.RackSlotPosition{Row: 1, Column: 2}},
+ {DeviceIdentifier: "d2"},
+ },
+ }))
+ require.NoError(t, err)
+ assert.Equal(t, int64(2), resp.Msg.AssignedCount)
+}
+
+// TestAssignDevicesToRack_RejectsSlotOutsideSelector confirms the handler
+// forwards enough for the domain to reject a slot naming a device the
+// caller never asked to assign — it would have no membership row to hang
+// off. Rejected before any store call.
+func TestAssignDevicesToRack_RejectsSlotOutsideSelector(t *testing.T) {
+ h := newTestHandler(t)
+
+ resp, err := h.handler.AssignDevicesToRack(testCtx(t), connect.NewRequest(&dspb.AssignDevicesToRackRequest{
+ TargetRackId: ptrInt64Local(42),
+ DeviceSelector: deviceListSelector("d1"),
+ SlotAssignments: []*dspb.RackSlot{{
+ DeviceIdentifier: "stranger",
+ Position: &dspb.RackSlotPosition{Row: 0, Column: 0},
+ }},
+ }))
+ require.Error(t, err)
+ require.Nil(t, resp)
+ var fe fleeterror.FleetError
+ require.ErrorAs(t, err, &fe)
+ assert.Equal(t, connect.CodeInvalidArgument, fe.GRPCCode)
+}
+
// TestAssignDevicesToRack_RejectsAllDevicesSelector confirms that the
// all_devices selector variant is rejected with InvalidArgument at the
// handler boundary, before any store call fires. Moving every paired
diff --git a/server/internal/handlers/deviceset/translate.go b/server/internal/handlers/deviceset/translate.go
index 816fed69b0..45bc04151c 100644
--- a/server/internal/handlers/deviceset/translate.go
+++ b/server/internal/handlers/deviceset/translate.go
@@ -27,12 +27,16 @@ func toAssignDevicesToRackParams(req *dspb.AssignDevicesToRackRequest, orgID int
if err != nil {
return collection.AssignDevicesToRackParams{}, err
}
- return collection.AssignDevicesToRackParams{
+ params := collection.AssignDevicesToRackParams{
OrgID: orgID,
TargetRackID: targetRackID,
DeviceIdentifiers: identifiers,
ForceClearConflictingSite: req.GetForceClearConflictingSite(),
- }, nil
+ }
+ for _, sa := range req.GetSlotAssignments() {
+ params.SlotAssignments = append(params.SlotAssignments, toCollectionRackSlot(sa))
+ }
+ return params, nil
}
// toProtoRackConflicts maps domain add-to-rack conflicts onto the proto