nalalangan/grocery-app
1
0
Fork 0
Code Issues Pull Requests 3 Actions Packages Projects Releases Wiki Activity

Add store location map manager #20

Open
nalalangan wants to merge 206 commits from feature/location-map-manager into feature/store-selector-modal
pull from: feature/location-map-manager
merge into: nalalangan:feature/store-selector-modal
Conversation 0 Commits 206 Files Changed 47 +48 -33
2 changed files with 48 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f25307cb47 - Show all commits

42
frontend/src/hooks/useLocationMapDraftState.js
View File

@ -1,20 +1,8 @@
import { useCallback, useEffect, useRef, useState } from "react"; import { useCallback, useEffect, useRef, useState } from "react";
import { getLocationMap } from "../api/locationMaps"; import { getLocationMap } from "../api/locationMaps";
import getApiErrorMessage from "../lib/getApiErrorMessage"; import getApiErrorMessage from "../lib/getApiErrorMessage";
import { import { getDefaultMapDraft, getMapDraftSnapshot } from "../lib/locationMapDraftStateUtils";
DEFAULT_MAP_FILTERS, import { DEFAULT_MAP_FILTERS } from "../lib/locationMapUtils";
DEFAULT_MAP_SIZE,
getObjectKey,
mapForMode,
normalizeMapObject,
objectsForMode,
} from "../lib/locationMapUtils";
const DEFAULT_DRAFT_MAP = {
name: "Store Map",
width: DEFAULT_MAP_SIZE.width,
height: DEFAULT_MAP_SIZE.height,
};
export default function useLocationMapDraftState({ export default function useLocationMapDraftState({
activeHousehold, activeHousehold,
@ -31,7 +19,7 @@ export default function useLocationMapDraftState({
const [mode, setMode] = useState("setup"); const [mode, setMode] = useState("setup");
const [editorTool, setEditorTool] = useState("pan"); const [editorTool, setEditorTool] = useState("pan");
const [previewDraft, setPreviewDraft] = useState(false); const [previewDraft, setPreviewDraft] = useState(false);
const [mapDraft, setMapDraft] = useState(DEFAULT_DRAFT_MAP); const [mapDraft, setMapDraft] = useState(getDefaultMapDraft);
const [objects, setObjects] = useState([]); const [objects, setObjects] = useState([]);
const [selectedObjectKey, setSelectedObjectKey] = useState(null); const [selectedObjectKey, setSelectedObjectKey] = useState(null);
const [filters, setFilters] = useState(DEFAULT_MAP_FILTERS); const [filters, setFilters] = useState(DEFAULT_MAP_FILTERS);
@ -50,28 +38,16 @@ export default function useLocationMapDraftState({
setHistory([]); setHistory([]);
setFuture([]); setFuture([]);
setHasUnsavedChanges(false); setHasUnsavedChanges(false);
setMapDraft(DEFAULT_DRAFT_MAP); setMapDraft(getDefaultMapDraft());
}, []); }, []);
const syncMapDraftFromState = useCallback((nextState, nextMode, nextPreviewDraft, options = {}) => { const syncMapDraftFromState = useCallback((nextState, nextMode, nextPreviewDraft, options = {}) => {
const nextMap = mapForMode(nextState, nextMode, nextPreviewDraft); const snapshot = getMapDraftSnapshot(nextState, nextMode, nextPreviewDraft, options);
const nextObjects = objectsForMode(nextState, nextMode, nextPreviewDraft); if (!snapshot) return;
if (!nextMap) return;
const normalizedObjects = nextObjects.map(normalizeMapObject);
const preserveSelectedIndex = Number.isInteger(options.preserveSelectedIndex)
? options.preserveSelectedIndex
: -1;
const preservedSelectedObject = preserveSelectedIndex >= 0
? normalizedObjects[preserveSelectedIndex]
: null;
setMapDraft({ setMapDraft(snapshot.mapDraft);
name: nextMap.name || "Store Map", setObjects(snapshot.objects);
width: nextMap.width || DEFAULT_MAP_SIZE.width, setSelectedObjectKey(snapshot.selectedObjectKey);
height: nextMap.height || DEFAULT_MAP_SIZE.height,
});
setObjects(normalizedObjects);
setSelectedObjectKey(preservedSelectedObject ? getObjectKey(preservedSelectedObject) : null);
setHistory([]); setHistory([]);
setFuture([]); setFuture([]);
setHasUnsavedChanges(false); setHasUnsavedChanges(false);

39
frontend/src/lib/locationMapDraftStateUtils.js Normal file
View File

@ -0,0 +1,39 @@
import {
DEFAULT_MAP_SIZE,
getObjectKey,
mapForMode,
normalizeMapObject,
objectsForMode,
} from "./locationMapUtils";
export function getDefaultMapDraft() {
return {
name: "Store Map",
width: DEFAULT_MAP_SIZE.width,
height: DEFAULT_MAP_SIZE.height,
};
}
export function getMapDraftSnapshot(nextState, nextMode, nextPreviewDraft, options = {}) {
const nextMap = mapForMode(nextState, nextMode, nextPreviewDraft);
const nextObjects = objectsForMode(nextState, nextMode, nextPreviewDraft);
if (!nextMap) return null;
const normalizedObjects = nextObjects.map(normalizeMapObject);
const preserveSelectedIndex = Number.isInteger(options.preserveSelectedIndex)
? options.preserveSelectedIndex
: -1;
const preservedSelectedObject = preserveSelectedIndex >= 0
? normalizedObjects[preserveSelectedIndex]
: null;
return {
mapDraft: {
name: nextMap.name || "Store Map",
width: nextMap.width || DEFAULT_MAP_SIZE.width,
height: nextMap.height || DEFAULT_MAP_SIZE.height,
},
objects: normalizedObjects,
selectedObjectKey: preservedSelectedObject ? getObjectKey(preservedSelectedObject) : null,
};
}