brandxtech/frontend
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

hotix for undefined data loads on map pages

Browse source
This commit is contained in:
csawatzky 2025-10-21 10:44:46 -06:00
parent 7b78d7ba91
commit 46881f6656
5 changed files with 106 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/maps/MapBase.tsx
View file

@ -241,7 +241,7 @@ export default function MapBase(props: Props) {
homeMarkerAPI homeMarkerAPI
.listHomeMarkers(1, 0, undefined, undefined, undefined, undefined, as) .listHomeMarkers(1, 0, undefined, undefined, undefined, undefined, as)
.then(resp => { .then(resp => {
if (resp.data.homeMarker.length < 1) { if (!resp.data.homeMarker || resp.data.homeMarker.length < 1) {
setHomePin(undefined); setHomePin(undefined);
setHaveHome(false); setHaveHome(false);
setStartingView(props.currentView); setStartingView(props.currentView);
@ -271,6 +271,7 @@ export default function MapBase(props: Props) {
} }
}) })
.catch(err => { .catch(err => {
console.log(err)
openSnack("Could not load Home Pin"); openSnack("Could not load Home Pin");
}); });
}, [as, homeMarkerAPI, openSnack, props.ignoreHomeLoad, user]); // eslint-disable-line react-hooks/exhaustive-deps }, [as, homeMarkerAPI, openSnack, props.ignoreHomeLoad, user]); // eslint-disable-line react-hooks/exhaustive-deps

172
src/maps/mapObjectControllers/AgMapController.tsx
View file

@ -221,24 +221,26 @@ import { Result } from "@mapbox/mapbox-gl-geocoder";
.then(resp => { .then(resp => {
let fields: Map<string, Field> = new Map(); let fields: Map<string, Field> = new Map();
let fieldEntries: Result[] = []; let fieldEntries: Result[] = [];
resp.data.fields.forEach(f => { if(resp.data.fields){
let field = Field.any(f); resp.data.fields.forEach(f => {
fields.set(field.key(), field); let field = Field.any(f);
fieldEntries.push({ fields.set(field.key(), field);
id: field.key(), fieldEntries.push({
place_name: field.name(), id: field.key(),
place_type: ["field"], place_name: field.name(),
center: [field.center().longitude, field.center().latitude], place_type: ["field"],
address: "", center: [field.center().longitude, field.center().latitude],
type: "Feature", address: "",
text: field.name(), type: "Feature",
bbox: [0,0,0,0], text: field.name(),
geometry: {type: "Point", coordinates: [field.center().longitude, field.center().latitude]}, bbox: [0,0,0,0],
context: [], geometry: {type: "Point", coordinates: [field.center().longitude, field.center().latitude]},
properties: {}, context: [],
relevance: 0 properties: {},
relevance: 0
});
}); });
}); }
setFields(fields); setFields(fields);
setFieldSearchEntries(fieldEntries); setFieldSearchEntries(fieldEntries);
}) })
@ -314,53 +316,56 @@ import { Result } from "@mapbox/mapbox-gl-geocoder";
let bagOp: BagModel[] = []; let bagOp: BagModel[] = [];
let bagMarkerData: Map<string, MarkerData> = new Map(); let bagMarkerData: Map<string, MarkerData> = new Map();
let bagEntries: Result[] = []; let bagEntries: Result[] = [];
resp.data.grainBags.forEach(bag => { if(resp.data.grainBags){
let b = BagModel.create(bag);
bags.set(b.key(), b); resp.data.grainBags.forEach(bag => {
if (bag.settings) { let b = BagModel.create(bag);
if (!b.settings.startLocation?.longitude && !b.settings.endLocation?.longitude) { bags.set(b.key(), b);
bagOp.push(b); if (bag.settings) {
} else { if (!b.settings.startLocation?.longitude && !b.settings.endLocation?.longitude) {
//build the data for the marker bagOp.push(b);
//TODO-CS: think about making the creation of marker data a function in the object model } else {
let mData: MarkerData = { //build the data for the marker
title: b.name(), //TODO-CS: think about making the creation of marker data a function in the object model
longitude: b.centerLocation().longitude, let mData: MarkerData = {
latitude: b.centerLocation().latitude, title: b.name(),
visibleLevels: { max: 13 }, longitude: b.centerLocation().longitude,
colour: b.settings.theme?.color ?? "white", latitude: b.centerLocation().latitude,
clickFunc: (e, i, isMobile) => { visibleLevels: { max: 13 },
clickDelay(); colour: b.settings.theme?.color ?? "white",
closeDrawers(); clickFunc: (e, i, isMobile) => {
setBagDrawer(true); clickDelay();
setIgnoreFeatures(true); closeDrawers();
setObjectKey(b.key()); setBagDrawer(true);
moveMap( setIgnoreFeatures(true);
b.centerLocation().latitude, setObjectKey(b.key());
b.centerLocation().longitude, moveMap(
zoomLevels.far, b.centerLocation().latitude,
isMobile b.centerLocation().longitude,
); zoomLevels.far,
} isMobile
}; );
bagMarkerData.set(b.key(), mData); }
bagEntries.push({ };
center: [b.centerLocation().longitude, b.centerLocation().latitude], bagMarkerData.set(b.key(), mData);
id: b.key(), bagEntries.push({
place_name: b.name(), center: [b.centerLocation().longitude, b.centerLocation().latitude],
place_type: ["grainBag"], id: b.key(),
address: "", place_name: b.name(),
bbox: [0,0,0,0], place_type: ["grainBag"],
context: [], address: "",
geometry: {type: "Point", coordinates: [b.centerLocation().longitude, b.centerLocation().latitude]}, bbox: [0,0,0,0],
properties: {}, context: [],
relevance: 0, geometry: {type: "Point", coordinates: [b.centerLocation().longitude, b.centerLocation().latitude]},
text: "", properties: {},
type: "Feature" relevance: 0,
}); text: "",
type: "Feature"
});
}
} }
} });
}); }
setBagOptions(bagOp); setBagOptions(bagOp);
setGrainBags(bags); setGrainBags(bags);
grainBagsRef.current = bags; grainBagsRef.current = bags;
@ -382,19 +387,21 @@ import { Result } from "@mapbox/mapbox-gl-geocoder";
binYardAPI binYardAPI
.listBinYards(400, 0, "asc", undefined, undefined, undefined, as) .listBinYards(400, 0, "asc", undefined, undefined, undefined, as)
.then(resp => { .then(resp => {
resp.data.yard.forEach(yard => { if(resp.data.yard){
if (yard.settings) {
yardMap.set(yard.settings.key, yard.settings); resp.data.yard.forEach(yard => {
if ( if (yard.settings) {
(!yard.settings.latitude && !yard.settings.longitude) || yardMap.set(yard.settings.key, yard.settings);
(yard.settings.latitude === 0 && yard.settings.longitude === 0) if (
) { (!yard.settings.latitude && !yard.settings.longitude) ||
yardOps.push(yard.settings); (yard.settings.latitude === 0 && yard.settings.longitude === 0)
} else { ) {
let mData: MarkerData = { yardOps.push(yard.settings);
title: yard.settings.name, } else {
longitude: yard.settings.longitude, let mData: MarkerData = {
latitude: yard.settings.latitude, title: yard.settings.name,
longitude: yard.settings.longitude,
latitude: yard.settings.latitude,
colour: yard.settings.theme?.color ?? "green", colour: yard.settings.theme?.color ?? "green",
markerIcon: <BinsIcon width={50 * 0.6} height={50 * 0.6} type="light" />, markerIcon: <BinsIcon width={50 * 0.6} height={50 * 0.6} type="light" />,
visibleLevels: { max: 17 }, visibleLevels: { max: 17 },
@ -429,6 +436,7 @@ import { Result } from "@mapbox/mapbox-gl-geocoder";
} }
} }
}); });
}
setYardMarkerData(newYardMarkers); setYardMarkerData(newYardMarkers);
setYardSearchEntries(yardEntries); setYardSearchEntries(yardEntries);
setBinYards(yardMap); setBinYards(yardMap);
@ -447,6 +455,9 @@ import { Result } from "@mapbox/mapbox-gl-geocoder";
let markerData: Map<string, MarkerData> = new Map(); let markerData: Map<string, MarkerData> = new Map();
let searchEntries: Result[] = []; let searchEntries: Result[] = [];
let binOp: IBin[] = []; let binOp: IBin[] = [];
if(resp.data.bins){
resp.data.bins.forEach(bin => { resp.data.bins.forEach(bin => {
let b = IBin.create(bin); let b = IBin.create(bin);
binMap.set(b.key(), b); binMap.set(b.key(), b);
@ -495,6 +506,7 @@ import { Result } from "@mapbox/mapbox-gl-geocoder";
} }
} }
}); });
}
setBinMarkerData(markerData); setBinMarkerData(markerData);
setBinSearchEntries(searchEntries); setBinSearchEntries(searchEntries);
setBins(binMap); setBins(binMap);
@ -514,6 +526,9 @@ import { Result } from "@mapbox/mapbox-gl-geocoder";
let searchEntries: Result[] = []; let searchEntries: Result[] = [];
let options: DeviceModel[] = []; let options: DeviceModel[] = [];
if(resp.data.devices){
resp.data.devices.forEach((device, i) => { resp.data.devices.forEach((device, i) => {
//add device to the main map //add device to the main map
let d = DeviceModel.any(device); let d = DeviceModel.any(device);
@ -553,6 +568,7 @@ import { Result } from "@mapbox/mapbox-gl-geocoder";
} }
} }
}); });
}
setDevices(map); setDevices(map);
setDeviceOptions(options); setDeviceOptions(options);
setDeviceMarkerData(newDevMarkers); setDeviceMarkerData(newDevMarkers);
@ -725,6 +741,9 @@ import { Result } from "@mapbox/mapbox-gl-geocoder";
let fmMap: Map<string, FieldMarker> = new Map(); let fmMap: Map<string, FieldMarker> = new Map();
let markerData: Map<string, MarkerData> = new Map(); let markerData: Map<string, MarkerData> = new Map();
let searchEntries: Result[] = []; let searchEntries: Result[] = [];
if(resp.data.fieldMarker){
resp.data.fieldMarker.forEach(fieldMarker => { resp.data.fieldMarker.forEach(fieldMarker => {
let fm = FieldMarker.create(fieldMarker); let fm = FieldMarker.create(fieldMarker);
fmMap.set(fm.key(), fm); fmMap.set(fm.key(), fm);
@ -760,6 +779,7 @@ import { Result } from "@mapbox/mapbox-gl-geocoder";
place_type: ["fieldMarker"] place_type: ["fieldMarker"]
} as Result); } as Result);
}); });
}
setFieldMarkers(fmMap); setFieldMarkers(fmMap);
setFieldMarkerData(markerData); setFieldMarkerData(markerData);
setFieldMarkerSearchEntries(searchEntries); setFieldMarkerSearchEntries(searchEntries);

2
src/maps/mapObjectControllers/AviationMapController.tsx
View file

@ -175,6 +175,7 @@ export default function AviationMapController(props: Props) {
let terminalMarkers: Map<string, MarkerData> = new Map(); let terminalMarkers: Map<string, MarkerData> = new Map();
let terminalOps: Terminal[] = []; let terminalOps: Terminal[] = [];
let searchEntries: Result[] = []; let searchEntries: Result[] = [];
if(resp.data.terminals){
resp.data.terminals.forEach(term => { resp.data.terminals.forEach(term => {
let terminal = Terminal.create(term); let terminal = Terminal.create(term);
terminalMap.set(terminal.key, terminal); terminalMap.set(terminal.key, terminal);
@ -207,6 +208,7 @@ export default function AviationMapController(props: Props) {
terminalOps.push(terminal); terminalOps.push(terminal);
} }
}); });
}
setTerminals(terminalMap); setTerminals(terminalMap);
setTerminalMarkers(terminalMarkers); setTerminalMarkers(terminalMarkers);
setTerminalSearchEntries(searchEntries); setTerminalSearchEntries(searchEntries);

2
src/maps/mapObjectControllers/ConstructionMapController.tsx
View file

@ -142,6 +142,7 @@ export default function ConstructionMapController(props: Props) {
siteAPI siteAPI
.listSitesPageData(50, 0, "asc", "key", undefined, as) .listSitesPageData(50, 0, "asc", "key", undefined, as)
.then(resp => { .then(resp => {
if(resp.data.sites){
resp.data.sites.forEach(site => { resp.data.sites.forEach(site => {
if (!site) return; if (!site) return;
let newSite: Site = Site.any(site.site); let newSite: Site = Site.any(site.site);
@ -179,6 +180,7 @@ export default function ConstructionMapController(props: Props) {
place_type: ["site"] place_type: ["site"]
} as Result); } as Result);
}); });
}
setSiteMarkerData(sm); setSiteMarkerData(sm);
setSites(s); setSites(s);
setLoadingSites(false); setLoadingSites(false);

4
src/pages/Terminals.tsx
View file

@ -182,7 +182,9 @@ export default function Terminals(props: Props) {
if(loading) return if(loading) return
setLoading(true) setLoading(true)
terminalAPI.listTerminals(200, 0, "asc", "name", as).then(resp => { terminalAPI.listTerminals(200, 0, "asc", "name", as).then(resp => {
setTerminals(resp.data.terminals.map(a => Terminal.any(a))); if(resp.data.terminals){
setTerminals(resp.data.terminals.map(a => Terminal.any(a)));
}
}).catch(err => { }).catch(err => {
console.log("There was a problem loading Terminals") console.log("There was a problem loading Terminals")
}).finally(() => { }).finally(() => {