fix: hide draft maps from members

This commit is contained in:
Nico 2026-06-03 23:47:24 -07:00
parent b941d5ffed
commit 2b534eed6a
2 changed files with 63 additions and 3 deletions

View File

@ -123,6 +123,9 @@ export default function LocationMapManager() {
try { try {
const response = await getLocationMap(activeHousehold.id, locationId); const response = await getLocationMap(activeHousehold.id, locationId);
const nextState = response.data; const nextState = response.data;
const nextCanManage = Boolean(
nextState.can_manage ?? ["owner", "admin"].includes(activeHousehold?.role)
);
setMapState(nextState); setMapState(nextState);
if (!nextState.draft_map && !nextState.published_map) { if (!nextState.draft_map && !nextState.published_map) {
@ -143,10 +146,25 @@ export default function LocationMapManager() {
setMode("view"); setMode("view");
setEditorTool("pan"); setEditorTool("pan");
setPreviewDraft(false); setPreviewDraft(false);
} else if (nextState.draft_map) { } else if (nextState.draft_map && nextCanManage) {
setMode("setup"); setMode("setup");
setEditorTool("pan"); setEditorTool("pan");
setPreviewDraft(true); setPreviewDraft(true);
} else {
setMode("setup");
setEditorTool("pan");
setPreviewDraft(false);
setObjects([]);
setSelectedObjectKey(null);
setHistory([]);
setFuture([]);
setHasUnsavedChanges(false);
setMapDraft({
name: "Store Map",
width: DEFAULT_MAP_SIZE.width,
height: DEFAULT_MAP_SIZE.height,
});
return;
} }
syncMapDraftFromState( syncMapDraftFromState(
@ -161,7 +179,7 @@ export default function LocationMapManager() {
} finally { } finally {
setLoading(false); setLoading(false);
} }
}, [activeHousehold?.id, locationId, syncMapDraftFromState]); }, [activeHousehold?.id, activeHousehold?.role, locationId, syncMapDraftFromState]);
useEffect(() => { useEffect(() => {
toastRef.current = toast; toastRef.current = toast;
@ -506,6 +524,7 @@ export default function LocationMapManager() {
} }
const hasAnyMap = Boolean(mapState?.draft_map || mapState?.published_map); const hasAnyMap = Boolean(mapState?.draft_map || mapState?.published_map);
const hasVisibleOrManageableMap = Boolean(mapState?.published_map || (mapState?.draft_map && canManage));
const status = getMapStatus(mapState, { mode, previewDraft, hasUnsavedChanges }); const status = getMapStatus(mapState, { mode, previewDraft, hasUnsavedChanges });
return ( return (
@ -532,7 +551,7 @@ export default function LocationMapManager() {
{!hasAnyMap || (mode === "setup" && mapState?.draft_map && !mapState?.published_map) ? ( {!hasAnyMap || (mode === "setup" && mapState?.draft_map && !mapState?.published_map) ? (
<LocationMapSetupPanel <LocationMapSetupPanel
hasAnyMap={hasAnyMap} hasAnyMap={hasVisibleOrManageableMap}
canManage={canManage} canManage={canManage}
zoneCount={mapState?.zones?.length || 0} zoneCount={mapState?.zones?.length || 0}
saving={saving} saving={saving}

View File

@ -2106,3 +2106,44 @@ test("members see a clean empty state when no map is published", async ({ page }
await expect(page.getByRole("button", { name: "Create Blank Map" })).toHaveCount(0); await expect(page.getByRole("button", { name: "Create Blank Map" })).toHaveCount(0);
await expect(page.getByLabel("Map controls")).toHaveCount(0); await expect(page.getByLabel("Map controls")).toHaveCount(0);
}); });
test("members do not see unpublished draft maps", async ({ page }) => {
await mockMapShell(page, memberHousehold);
const mapState = draftMapState([
{
id: 1701,
location_map_id: 900,
zone_id: 501,
zone_name: "Bakery",
type: "zone",
label: "Draft Bakery",
x: 40,
y: 40,
width: 260,
height: 160,
rotation: 0,
locked: false,
visible: true,
sort_order: 1,
},
], false);
await page.route("**/households/1/locations/10/map", async (route) => {
await route.fulfill({
status: 200,
contentType: "application/json",
body: JSON.stringify(mapState),
});
});
await page.goto("/stores/100/locations/10/map");
await expect(page.getByRole("heading", { name: "No Map" })).toBeVisible();
await expect(page.getByText("A household admin has not published a map yet.")).toBeVisible();
await expect(page.getByRole("heading", { name: "Draft Map" })).toHaveCount(0);
await expect(page.getByText("A map draft exists for this location")).toHaveCount(0);
await expect(page.getByText("Draft Bakery")).toHaveCount(0);
await expect(page.getByRole("button", { name: "Continue Editing" })).toHaveCount(0);
await expect(page.getByLabel("Map controls")).toHaveCount(0);
});