diff --git a/src/harvestPlan/HarvestPlanDisplay.tsx b/src/harvestPlan/HarvestPlanDisplay.tsx
index 6917332..5f9721b 100644
--- a/src/harvestPlan/HarvestPlanDisplay.tsx
+++ b/src/harvestPlan/HarvestPlanDisplay.tsx
@@ -151,7 +151,7 @@ export default function HarvestPlanDisplay(props: Props) {
onClose={() => setOpenNote(false)}>
Notes
-
+
);
diff --git a/src/hooks/FullScreenHandle.tsx b/src/hooks/FullScreenHandle.tsx
new file mode 100644
index 0000000..9e4323b
--- /dev/null
+++ b/src/hooks/FullScreenHandle.tsx
@@ -0,0 +1,121 @@
+import { useCallback, useEffect, useRef, useState } from "react";
+
+/**
+ * Drop-in replacement for react-full-screen's useFullScreenHandle + FullScreen component.
+ *
+ * Motivation: react-full-screen 1.1.1 doesn't debounce fullscreenchange events, so on
+ * Windows systems with DPI scaling > 100%, the resize triggered during fullscreen entry
+ * fires a fullscreenchange event that the library misinterprets as an exit, immediately
+ * popping back out of fullscreen.
+ *
+ * This hook bypasses the library entirely and calls the native Fullscreen API directly,
+ * ignoring fullscreenchange events fired within DEBOUNCE_MS of entry to absorb the
+ * DPI-scaling resize blip.
+ *
+ * Usage — replace in BinVisualizerV2.tsx:
+ *
+ * // Remove:
+ * import { FullScreen, useFullScreenHandle } from "react-full-screen";
+ * const fullScreenHandler = useFullScreenHandle();
+ * ...
+ *
+ * // Add:
+ * import { useFullScreen } from "hooks/useFullScreen";
+ * const { fullScreenHandler, FullScreenWrapper } = useFullScreen();
+ * ...
+ *
+ * // Everything else (fullScreenHandler.active, .enter(), .exit()) stays the same.
+ */
+
+const DEBOUNCE_MS = 500;
+
+export interface FullScreenHandle {
+ active: boolean;
+ enter: () => void;
+ exit: () => void;
+}
+
+export function useFullScreen(): {
+ fullScreenHandler: FullScreenHandle;
+ FullScreenWrapper: React.FC<{ children: React.ReactNode }>;
+} {
+ const [active, setActive] = useState(false);
+ const containerRef = useRef(null);
+ // Timestamp of the last enter() call — used to debounce spurious exit events
+ const enterTimeRef = useRef(0);
+
+ const enter = useCallback(() => {
+ const el = containerRef.current;
+ if (!el) return;
+ enterTimeRef.current = Date.now();
+ if (el.requestFullscreen) {
+ el.requestFullscreen().catch(() => {
+ // Some browsers (e.g. iOS Safari) reject the promise — silently ignore
+ });
+ } else if ((el as any).webkitRequestFullscreen) {
+ (el as any).webkitRequestFullscreen();
+ } else if ((el as any).mozRequestFullScreen) {
+ (el as any).mozRequestFullScreen();
+ } else if ((el as any).msRequestFullscreen) {
+ (el as any).msRequestFullscreen();
+ }
+ }, []);
+
+ const exit = useCallback(() => {
+ if (document.exitFullscreen) {
+ document.exitFullscreen().catch(() => {});
+ } else if ((document as any).webkitExitFullscreen) {
+ (document as any).webkitExitFullscreen();
+ } else if ((document as any).mozCancelFullScreen) {
+ (document as any).mozCancelFullScreen();
+ } else if ((document as any).msExitFullscreen) {
+ (document as any).msExitFullscreen();
+ }
+ }, []);
+
+ useEffect(() => {
+ const handleChange = () => {
+ const fullscreenEl =
+ document.fullscreenElement ||
+ (document as any).webkitFullscreenElement ||
+ (document as any).mozFullScreenElement ||
+ (document as any).msFullscreenElement;
+
+ const isNowFullscreen = fullscreenEl === containerRef.current;
+
+ // If we just called enter() and this event fires within DEBOUNCE_MS,
+ // and it looks like an exit, ignore it — it's the DPI-scaling resize blip
+ if (!isNowFullscreen && Date.now() - enterTimeRef.current < DEBOUNCE_MS) {
+ return;
+ }
+
+ setActive(isNowFullscreen);
+ };
+
+ document.addEventListener("fullscreenchange", handleChange);
+ document.addEventListener("webkitfullscreenchange", handleChange);
+ document.addEventListener("mozfullscreenchange", handleChange);
+ document.addEventListener("MSFullscreenChange", handleChange);
+
+ return () => {
+ document.removeEventListener("fullscreenchange", handleChange);
+ document.removeEventListener("webkitfullscreenchange", handleChange);
+ document.removeEventListener("mozfullscreenchange", handleChange);
+ document.removeEventListener("MSFullscreenChange", handleChange);
+ };
+ }, []);
+
+ const FullScreenWrapper: React.FC<{ children: React.ReactNode }> = useCallback(
+ ({ children }) => (
+
+ {children}
+
+ ),
+ []
+ );
+
+ return {
+ fullScreenHandler: { active, enter, exit },
+ FullScreenWrapper,
+ };
+}
\ No newline at end of file
diff --git a/src/hooks/index.ts b/src/hooks/index.ts
index 0bd5baf..e93b9d5 100644
--- a/src/hooks/index.ts
+++ b/src/hooks/index.ts
@@ -26,6 +26,7 @@ export {
export * from "./useDebounce";
// export * from "./useForceUpdate";
// export * from "./useInterval";
+export * from "./usePendingChanges";
export * from "./usePrevious";
export * from "./useThemeType";
export * from "./useWidth";
diff --git a/src/hooks/useDeviceStatusStreams.ts b/src/hooks/useDeviceStatusStreams.ts
index 24ca8bb..76d7c68 100644
--- a/src/hooks/useDeviceStatusStreams.ts
+++ b/src/hooks/useDeviceStatusStreams.ts
@@ -1,18 +1,9 @@
import { pond } from "protobuf-ts/pond";
-import { useEffect, useRef, useCallback, useMemo } from "react";
+import { useEffect, useRef, useMemo } from "react";
+import { getWsBaseUrl } from "utils/getWsBaseUrl";
-/**
- * Derives the WebSocket base URL from VITE_APP_API_URL.
- * Matches the logic in useWebSocket.ts.
- */
-function getWsBaseUrl(): string {
- const apiUrl = import.meta.env.VITE_APP_API_URL;
- if (apiUrl) {
- return apiUrl.replace(/^http/, "ws");
- }
- const protocol = window.location.protocol === "https:" ? "wss:" : "ws:";
- return `${protocol}//${window.location.host}`;
-}
+/** Off by default to reduce server load; set VITE_ENABLE_WEBSOCKETS=true to enable live streams. */
+const WEBSOCKETS_ENABLED = import.meta.env.VITE_ENABLE_WEBSOCKETS === "true";
export interface UseDeviceStatusStreamsOptions {
/** Device IDs to stream status for (e.g. from the visible devices list) */
@@ -21,6 +12,12 @@ export interface UseDeviceStatusStreamsOptions {
onStatusUpdate: (deviceId: string, status: pond.DeviceStatus) => void;
/** Auth token passed as ?token= query param */
token?: string;
+ /** Same as REST/listDevices (?keys=) — required when listing under a context path or group tab */
+ keys?: string[];
+ /** Same as REST (?types=) */
+ types?: string[];
+ /** View-as / impersonation (?as=), same as device list when not already team-first in URL */
+ as?: string;
/** Whether the connections should be active. Default true. */
enabled?: boolean;
}
@@ -31,7 +28,7 @@ export interface UseDeviceStatusStreamsOptions {
* Readings (plenum, sen5x, co, co2, no2, o2, etc.) stream in real time.
*/
export function useDeviceStatusStreams(options: UseDeviceStatusStreamsOptions) {
- const { deviceIds, onStatusUpdate, token, enabled = true } = options;
+ const { deviceIds, onStatusUpdate, token, keys, types, as, enabled = true } = options;
const onStatusUpdateRef = useRef(onStatusUpdate);
onStatusUpdateRef.current = onStatusUpdate;
@@ -39,25 +36,67 @@ export function useDeviceStatusStreams(options: UseDeviceStatusStreamsOptions) {
const wsMapRef = useRef>(new Map());
const retriesRef = useRef>(new Map());
const reconnectTimeoutsRef = useRef>>(new Map());
+ /** Bumps only in effect cleanup so late onclose / reconnect timers never run after unmount. */
+ const generationRef = useRef(0);
+ /** Latest ID set so a device dropped from the list does not reconnect on abnormal close. */
+ const allowedIdsRef = useRef>(new Set());
+ allowedIdsRef.current = new Set(deviceIds);
- const connect = useCallback(
- (deviceId: string) => {
+ // Normalize for stable comparison: same set of IDs = same string regardless of order
+ const deviceIdsKey = useMemo(
+ () => [...new Set(deviceIds)].sort().join(","),
+ [deviceIds.join(",")]
+ );
+
+ useEffect(() => {
+ const clearReconnect = (deviceId: string) => {
+ const t = reconnectTimeoutsRef.current.get(deviceId);
+ if (t) {
+ clearTimeout(t);
+ reconnectTimeoutsRef.current.delete(deviceId);
+ }
+ };
+
+ const shutdownAll = () => {
+ reconnectTimeoutsRef.current.forEach((t) => clearTimeout(t));
+ reconnectTimeoutsRef.current.clear();
+ wsMapRef.current.forEach((ws) => ws.close(1000, "cleanup"));
+ wsMapRef.current.clear();
+ retriesRef.current.clear();
+ };
+
+ if (!WEBSOCKETS_ENABLED || !enabled || !token || deviceIds.length === 0) {
+ shutdownAll();
+ return () => {
+ generationRef.current += 1;
+ };
+ }
+
+ const gen = generationRef.current;
+
+ const connect = (deviceId: string) => {
if (!token || !deviceId) return;
+ if (gen !== generationRef.current) return;
const params = new URLSearchParams();
params.set("token", token);
+ if (keys?.length) params.set("keys", keys.toString());
+ if (types?.length) params.set("types", types.toString());
+ if (as) params.set("as", as);
- const path = `/live/devices/${deviceId}/status`;
+ const path = `/v1/live/devices/${deviceId}/status`;
const url = `${getWsBaseUrl()}${path}?${params.toString()}`;
const ws = new WebSocket(url);
wsMapRef.current.set(deviceId, ws);
ws.onopen = () => {
+ if (gen !== generationRef.current) return;
console.debug(`[ws] connected: ${path}`);
retriesRef.current.set(deviceId, 0);
};
ws.onmessage = (event) => {
+ if (gen !== generationRef.current) return;
try {
const raw = JSON.parse(event.data);
const status = pond.DeviceStatus.fromObject(raw ?? {});
@@ -74,7 +113,15 @@ export function useDeviceStatusStreams(options: UseDeviceStatusStreamsOptions) {
ws.onclose = (event) => {
wsMapRef.current.delete(deviceId);
- // Don't reconnect on clean close or auth rejection
+ if (gen !== generationRef.current) {
+ return;
+ }
+
+ if (!allowedIdsRef.current.has(deviceId)) {
+ retriesRef.current.delete(deviceId);
+ return;
+ }
+
if (event.code === 1000 || event.code === 4001 || event.code === 4003) {
return;
}
@@ -84,55 +131,36 @@ export function useDeviceStatusStreams(options: UseDeviceStatusStreamsOptions) {
retriesRef.current.set(deviceId, retries + 1);
console.debug(`[ws] reconnecting ${path} in ${delay}ms...`);
- const timeout = setTimeout(() => connect(deviceId), delay);
+ const timeout = setTimeout(() => {
+ if (gen !== generationRef.current) return;
+ if (!allowedIdsRef.current.has(deviceId)) return;
+ reconnectTimeoutsRef.current.delete(deviceId);
+ connect(deviceId);
+ }, delay);
reconnectTimeoutsRef.current.set(deviceId, timeout);
};
- },
- [token]
- );
-
- // Normalize for stable comparison: same set of IDs = same string regardless of order
- const deviceIdsKey = useMemo(
- () => [...new Set(deviceIds)].sort().join(","),
- [deviceIds.join(",")]
- );
-
- useEffect(() => {
- if (!enabled || !token || deviceIds.length === 0) {
- wsMapRef.current.forEach((ws) => ws.close(1000, "disabled"));
- wsMapRef.current.clear();
- reconnectTimeoutsRef.current.forEach((t) => clearTimeout(t));
- reconnectTimeoutsRef.current.clear();
- return;
- }
+ };
const currentIds = new Set(deviceIds);
- // Connect to new devices
deviceIds.forEach((id) => {
if (!wsMapRef.current.has(id)) {
connect(id);
}
});
- // Disconnect from devices no longer in the list
wsMapRef.current.forEach((ws, id) => {
if (!currentIds.has(id)) {
+ clearReconnect(id);
ws.close(1000, "device removed");
wsMapRef.current.delete(id);
- const t = reconnectTimeoutsRef.current.get(id);
- if (t) {
- clearTimeout(t);
- reconnectTimeoutsRef.current.delete(id);
- }
+ retriesRef.current.delete(id);
}
});
return () => {
- wsMapRef.current.forEach((ws) => ws.close(1000, "cleanup"));
- wsMapRef.current.clear();
- reconnectTimeoutsRef.current.forEach((t) => clearTimeout(t));
- reconnectTimeoutsRef.current.clear();
+ generationRef.current += 1;
+ shutdownAll();
};
- }, [enabled, token, deviceIdsKey, deviceIds.length, connect]);
+ }, [enabled, token, deviceIdsKey, deviceIds.length, keys?.join(), types?.join(), as]);
}
diff --git a/src/hooks/usePendingChanges.ts b/src/hooks/usePendingChanges.ts
new file mode 100644
index 0000000..5852adb
--- /dev/null
+++ b/src/hooks/usePendingChanges.ts
@@ -0,0 +1,31 @@
+import { useEffect, useRef, useState } from "react";
+
+/**
+ * Tracks a synced flag and reports whether changes are pending or were
+ * accepted while mounted (a false -> true transition, e.g. from a websocket
+ * status update). Pass enabled=false until real data has loaded so the
+ * initial placeholder -> loaded flip is not mistaken for an accepted change.
+ */
+export function usePendingChanges(synced: boolean, enabled: boolean = true) {
+ const prevSynced = useRef(undefined);
+ const [accepted, setAccepted] = useState(false);
+
+ useEffect(() => {
+ if (!enabled) {
+ prevSynced.current = undefined;
+ setAccepted(false);
+ return;
+ }
+ if (prevSynced.current === false && synced) {
+ setAccepted(true);
+ } else if (!synced) {
+ setAccepted(false);
+ }
+ prevSynced.current = synced;
+ }, [synced, enabled]);
+
+ return {
+ pending: enabled && !synced,
+ accepted: enabled && synced && accepted
+ };
+}
diff --git a/src/hooks/useWebSocket.ts b/src/hooks/useWebSocket.ts
index 6a4029d..86f4056 100644
--- a/src/hooks/useWebSocket.ts
+++ b/src/hooks/useWebSocket.ts
@@ -1,21 +1,11 @@
import { useEffect, useRef, useCallback } from "react";
+import { getWsBaseUrl } from "utils/getWsBaseUrl";
-/**
- * Derives the WebSocket base URL from VITE_APP_API_URL.
- * e.g. "https://api.brandxtech.ca" -> "wss://api.brandxtech.ca"
- * Falls back to current page host for local dev.
- */
-function getWsBaseUrl(): string {
- const apiUrl = import.meta.env.VITE_APP_API_URL;
- if (apiUrl) {
- return apiUrl.replace(/^http/, "ws");
- }
- const protocol = window.location.protocol === "https:" ? "wss:" : "ws:";
- return `${protocol}//${window.location.host}`;
-}
+/** Off by default to reduce server load; set VITE_ENABLE_WEBSOCKETS=true to enable live streams. */
+const WEBSOCKETS_ENABLED = import.meta.env.VITE_ENABLE_WEBSOCKETS === "true";
interface UseWebSocketOptions {
- /** The API path, e.g. "/v1/live/devices/123/components" */
+ /** The API path including /v1, e.g. "/v1/live/devices/123/components" */
path: string;
/** Transform the raw MessageEvent into your domain type */
parse: (event: MessageEvent) => T;
@@ -25,6 +15,12 @@ interface UseWebSocketOptions {
token?: string;
/** Minimum seconds between updates, passed as ?rate= to the backend */
rate?: number;
+ /** Context keys, same as REST device APIs (?keys=) */
+ keys?: string[];
+ /** Context types, same as REST device APIs (?types=) */
+ types?: string[];
+ /** Impersonation / team view key, same as REST (?as=) */
+ as?: string;
/** Whether the connection should be active. Default true. */
enabled?: boolean;
}
@@ -41,7 +37,7 @@ interface UseWebSocketOptions {
* });
*/
export function useWebSocket(options: UseWebSocketOptions) {
- const { path, parse, onMessage, token, rate = 0, enabled = true } = options;
+ const { path, parse, onMessage, token, rate = 0, keys, types, as, enabled = true } = options;
// Keep latest callbacks in refs so reconnects don't use stale closures
const onMessageRef = useRef(onMessage);
@@ -52,13 +48,20 @@ export function useWebSocket(options: UseWebSocketOptions) {
const wsRef = useRef(null);
const reconnectTimeoutRef = useRef>();
const retriesRef = useRef(0);
+ /** Bumps on each effect cleanup so late onclose / reconnect timers never run after unmount or dependency change. */
+ const generationRef = useRef(0);
const connect = useCallback(() => {
if (!token) return;
+ const gen = generationRef.current;
+
const params = new URLSearchParams();
params.set("token", token);
if (rate > 0) params.set("rate", rate.toString());
+ if (keys?.length) params.set("keys", keys.toString());
+ if (types?.length) params.set("types", types.toString());
+ if (as) params.set("as", as);
const url = `${getWsBaseUrl()}${path}?${params.toString()}`;
const ws = new WebSocket(url);
@@ -86,6 +89,10 @@ export function useWebSocket(options: UseWebSocketOptions) {
console.debug(`[ws] closed: ${path} (code: ${event.code})`);
wsRef.current = null;
+ if (gen !== generationRef.current) {
+ return;
+ }
+
// Don't reconnect on clean close or auth rejection
if (event.code === 1000 || event.code === 4001 || event.code === 4003) {
return;
@@ -95,22 +102,33 @@ export function useWebSocket(options: UseWebSocketOptions) {
const delay = Math.min(1000 * Math.pow(2, retriesRef.current), 30000);
retriesRef.current += 1;
console.debug(`[ws] reconnecting in ${delay}ms...`);
- reconnectTimeoutRef.current = setTimeout(connect, delay);
+ reconnectTimeoutRef.current = setTimeout(() => {
+ if (gen !== generationRef.current) return;
+ connect();
+ }, delay);
};
- }, [path, token, rate]);
+ }, [path, token, rate, keys?.join(), types?.join(), as]);
useEffect(() => {
- if (!enabled || !token) {
+ if (!WEBSOCKETS_ENABLED || !enabled || !token) {
+ if (reconnectTimeoutRef.current) {
+ clearTimeout(reconnectTimeoutRef.current);
+ }
if (wsRef.current) {
wsRef.current.close(1000, "disabled");
wsRef.current = null;
}
- return;
+ retriesRef.current = 0;
+ return () => {
+ generationRef.current += 1;
+ };
}
+ retriesRef.current = 0;
connect();
return () => {
+ generationRef.current += 1;
if (reconnectTimeoutRef.current) {
clearTimeout(reconnectTimeoutRef.current);
}
diff --git a/src/interactions/InteractionSettings.tsx b/src/interactions/InteractionSettings.tsx
index 87bdf98..f1f3d8c 100644
--- a/src/interactions/InteractionSettings.tsx
+++ b/src/interactions/InteractionSettings.tsx
@@ -32,7 +32,6 @@ import moment from "moment-timezone";
import {
componentIDToString,
emptyComponentId,
- getComponentIDString,
sameComponentID,
stringToComponentId
} from "pbHelpers/Component";
@@ -130,9 +129,7 @@ export default function InteractionSettings(props: Props) {
} = props;
const theme = useTheme();
const { success, error } = useSnackbar();
- const prevInitialInteraction = usePrevious(initialInteraction);
- const prevComponents = usePrevious(components);
- const prevInitialComponent = usePrevious(initialComponent);
+ const prevIsDialogOpen = usePrevious(isDialogOpen);
const classes = useStyles();
const [{ user, as }] = useGlobalState();
const interactionsAPI = useInteractionsAPI();
@@ -166,7 +163,7 @@ export default function InteractionSettings(props: Props) {
const setDefaultState = useCallback(() => {
let interaction = getDefaultInteraction();
if (initialInteraction && mode === "update") {
- interaction = initialInteraction;
+ interaction = Interaction.clone(initialInteraction);
if (interaction.settings.subtype === 0 || interaction.settings.subtype === 1) {
setSubtypeDropdown(interaction.settings.subtype);
} else {
@@ -195,7 +192,9 @@ export default function InteractionSettings(props: Props) {
let value = describeMeasurement(
condition.measurementType,
or(initialComponent, Component.create()).settings.type,
- or(initialComponent, Component.create()).settings.subtype
+ or(initialComponent, Component.create()).settings.subtype,
+ undefined,
+ user
).toDisplay(condition.value);
rawConditionValues.push(value.toString());
});
@@ -220,7 +219,7 @@ export default function InteractionSettings(props: Props) {
setDutyCycle(interactionResult.dutyCycle.toString());
setMappedComponents(mappedComponents);
setInteraction(interaction);
- }, [components, initialComponent, initialConditions, initialInteraction, mode, /*sensor*/]);
+ }, [components, initialComponent, initialConditions, initialInteraction, mode, sensor, user]);
const availableSources = () => {
return components.filter(component => isSource(component.settings.type));
@@ -230,23 +229,12 @@ export default function InteractionSettings(props: Props) {
if (user && user.settings.timezone) {
setTimezone(user.settings.timezone);
}
- if (
- prevInitialInteraction !== initialInteraction ||
- (prevComponents && prevComponents.length !== components.length) ||
- getComponentIDString(prevInitialComponent) !== getComponentIDString(initialComponent)
- ) {
- setDefaultState();
- }
- }, [
- components.length,
- initialComponent,
- initialInteraction,
- prevComponents,
- prevInitialComponent,
- prevInitialInteraction,
- setDefaultState,
- user
- ]);
+ }, [user]);
+
+ useEffect(() => {
+ if (!isDialogOpen || prevIsDialogOpen) return;
+ setDefaultState();
+ }, [isDialogOpen, prevIsDialogOpen, setDefaultState]);
const getAvailableSinks = () => {
let type = or(interaction.settings.result, pond.InteractionResult.create()).type;
@@ -425,7 +413,7 @@ export default function InteractionSettings(props: Props) {
mappedComponents.get(componentIDToString(interaction.settings.source)),
Component.create()
);
- return describeMeasurement(measurementType, source.settings.type, source.settings.subtype);
+ return describeMeasurement(measurementType, source.settings.type, source.settings.subtype, undefined, user);
};
const describeSink = (): MeasurementDescriber => {
@@ -433,7 +421,9 @@ export default function InteractionSettings(props: Props) {
return describeMeasurement(
Measurement.boolean,
or(sink, Component.create()).settings.type,
- or(sink, Component.create()).settings.subtype
+ or(sink, Component.create()).settings.subtype,
+ undefined,
+ user
);
};
@@ -861,7 +851,7 @@ export default function InteractionSettings(props: Props) {
const conditionGroup = (index: number) => {
if (index >= numConditions) return;
let measurementType = interaction.settings.conditions[index].measurementType;
- let source = describeSource(measurementType);
+ let source = describeSource(measurementType, );
let isBoolean = isBooleanValue(index);
return (
diff --git a/src/interactions/InteractionsOverview.tsx b/src/interactions/InteractionsOverview.tsx
index 127f2a6..929a58d 100644
--- a/src/interactions/InteractionsOverview.tsx
+++ b/src/interactions/InteractionsOverview.tsx
@@ -15,6 +15,7 @@ import {
Typography
} from "@mui/material";
import { Settings } from "@mui/icons-material";
+import PendingChangesIndicator from "common/PendingChangesIndicator";
import { useInteractionsAPI, usePrevious, useSnackbar } from "hooks";
import { cloneDeep } from "lodash";
import { Component, Device, Interaction } from "models";
@@ -71,7 +72,7 @@ interface Props {
export default function InteractionsOverview(props: Props) {
const classes = useStyles();
- const [{as}] = useGlobalState();
+ const [{as, user}] = useGlobalState();
const interactionsAPI = useInteractionsAPI();
const { success, error } = useSnackbar();
const { device, component, components, permissions, refreshCallback } = props;
@@ -80,6 +81,7 @@ export default function InteractionsOverview(props: Props) {
const [interactions, setInteractions] = useState(props.interactions);
const [dirtyInteractions, setDirtyInteractions] = useState>(new Map());
const [mappedComponents, setMappedComponents] = useState>(new Map());
+ const [acceptedInteractions, setAcceptedInteractions] = useState>(new Set());
const [renderToggle, setRenderToggle] = useState(false);
const [selectedInteraction, setSelectedInteraction] = useState(
undefined
@@ -95,6 +97,19 @@ export default function InteractionsOverview(props: Props) {
}
if (props.interactions !== prevInteractions) {
+ setAcceptedInteractions(prev => {
+ const updated = new Set(prev);
+ props.interactions.forEach((interaction: Interaction) => {
+ const key = interaction.key();
+ const prevInteraction = prevInteractions?.find(p => p.key() === key);
+ if (!interaction.status.synced) {
+ updated.delete(key);
+ } else if (prevInteraction && !prevInteraction.status.synced) {
+ updated.add(key);
+ }
+ });
+ return updated;
+ });
setInteractions(cloneDeep(props.interactions));
}
}, [components, prevComponents, props.interactions, prevInteractions]);
@@ -118,12 +133,12 @@ export default function InteractionsOverview(props: Props) {
if (!conditions) return items;
conditions.forEach((condition: pond.IInteractionCondition, conditionIndex: number) => {
let measurementType = condition.measurementType;
- let measurement = describeMeasurement(condition.measurementType, sourceType, sourceSubtype);
+ let measurement = describeMeasurement(condition.measurementType, sourceType, sourceSubtype, undefined, user);
items.push(
- {interactionConditionText(source, condition, conditionIndex > 0)}
+ {interactionConditionText(source, condition, conditionIndex > 0, user)}
@@ -185,7 +200,7 @@ export default function InteractionsOverview(props: Props) {
let condition = conditions[conditionIndex];
let sourceType = source && source.settings.type;
let sourceSubtype = source && source.settings.subtype;
- let describer = describeMeasurement(condition.measurementType, sourceType, sourceSubtype);
+ let describer = describeMeasurement(condition.measurementType, sourceType, sourceSubtype, undefined, user);
condition.value = describer.toStored(value);
updatedDirtyInteractions.set(interactionIndex, true);
}
@@ -207,8 +222,23 @@ export default function InteractionsOverview(props: Props) {
let updatedDirtyInteractions = cloneDeep(dirtyInteractions);
updatedDirtyInteractions.set(index, false);
setDirtyInteractions(updatedDirtyInteractions);
+ setInteractions(prev => {
+ const updated = cloneDeep(prev);
+ if (updated[index]) {
+ updated[index].status.synced = false;
+ updated[index].status.lastUpdate = moment().toISOString();
+ }
+ return updated;
+ });
+ const interactionKey = settings.key ?? "";
+ if (interactionKey) {
+ setAcceptedInteractions(prev => {
+ const updated = new Set(prev);
+ updated.delete(interactionKey);
+ return updated;
+ });
+ }
success("Successfully updated the interaction for " + component.name());
- refreshCallback();
})
.catch((_err: any) => {
error("Error occurred while updating the interaction for " + component.name());
@@ -226,10 +256,12 @@ export default function InteractionsOverview(props: Props) {
let key = interaction.key();
let source = mappedComponents.get(componentIDToString(interaction.settings.source));
let sink = mappedComponents.get(componentIDToString(interaction.settings.sink));
- let statusText =
- !interaction.status.synced && interaction.status.lastUpdate
- ? "Pending " +
- moment(interaction.status.lastUpdate && interaction.status.lastUpdate).fromNow()
+ const isAccepted = acceptedInteractions.has(interaction.key());
+ const isPending = !interaction.status.synced;
+ let statusText = isAccepted
+ ? "Pending change accepted"
+ : isPending
+ ? "Pending " + moment(interaction.status.lastUpdate).fromNow()
: "";
let schedule = pond.InteractionSchedule.create(
interaction.settings.schedule !== null ? interaction.settings.schedule : undefined
@@ -272,7 +304,14 @@ export default function InteractionsOverview(props: Props) {
className={classes.header}
titleTypographyProps={{ variant: "subtitle2" }}
title={interactionResultText(interaction, sink)}
- subheader={statusText}
+ subheader={
+ statusText ? (
+
+ ) : ""}
subheaderTypographyProps={{ variant: "caption" }}
action={action}
/>
diff --git a/src/maps/MapBase.tsx b/src/maps/MapBase.tsx
index fa4c9c2..a5cc0c7 100644
--- a/src/maps/MapBase.tsx
+++ b/src/maps/MapBase.tsx
@@ -34,7 +34,6 @@ import { FeatureCollection, Feature } from "geojson";
import DrawController from "./mapControllers/drawController";
//import { Geometry } from "geojson";
import Map, { MapRef, Marker, MarkerDragEvent } from "react-map-gl/mapbox";
-import { getDistanceUnit } from "utils";
import { MapMouseEvent } from "mapbox-gl";
import { makeStyles } from "@mui/styles";
import { Result } from "@mapbox/mapbox-gl-geocoder";
@@ -499,7 +498,7 @@ export default function MapBase(props: Props) {
lineWidth: 5,
origin: pond.DataOrigin.DATA_ORIGIN_ADAPTIVE,
totalDist:
- getDistanceUnit() === pond.DistanceUnit.DISTANCE_UNIT_METERS
+ user.distanceUnit() === pond.DistanceUnit.DISTANCE_UNIT_METERS
? (data.totalDistanceKm * 1000).toFixed(2)
: (data.totalDistanceKm * 3280.8398950131).toFixed(2)
};
diff --git a/src/maps/mapDrawers/FieldDrawer.tsx b/src/maps/mapDrawers/FieldDrawer.tsx
index 724cf5d..07adbf9 100644
--- a/src/maps/mapDrawers/FieldDrawer.tsx
+++ b/src/maps/mapDrawers/FieldDrawer.tsx
@@ -14,7 +14,6 @@ import DisplayDrawer from "common/DisplayDrawer";
import HarvestPlanDisplay from "harvestPlan/HarvestPlanDisplay";
import { Field, fieldScope, HarvestPlan, teamScope } from "models";
import React, { useEffect, useState } from "react";
-import TaskViewer from "tasks/TaskViewer";
import Weather from "weather/weather";
import { getThemeType } from "theme";
import GrainDescriber from "grain/GrainDescriber";
@@ -24,6 +23,7 @@ import { useMobile } from "hooks";
import { useGlobalState, useHarvestPlanAPI, useUserAPI } from "providers";
import { makeStyles } from "@mui/styles";
import FieldActions from "field/FieldActions";
+import FieldTaskList from "field/FieldTaskList";
interface TabPanelProps {
children?: React.ReactNode;
@@ -218,7 +218,7 @@ export default function FieldDrawer(props: Props) {
TabIndicatorProps={{ style: { background: "rgba(255,255,0,255)" } }}>
-
+
@@ -273,7 +273,7 @@ export default function FieldDrawer(props: Props) {
-
+
);
@@ -287,7 +287,7 @@ export default function FieldDrawer(props: Props) {
onClose={() => setOpenNote(false)}>
Notes
-
+
);
diff --git a/src/models/Ambient.ts b/src/models/Ambient.ts
index 4fd906a..d2c7577 100644
--- a/src/models/Ambient.ts
+++ b/src/models/Ambient.ts
@@ -10,6 +10,7 @@ export class Ambient {
public status: pond.ComponentStatus = pond.ComponentStatus.create();
public temperature: number = -127;
public humidity: number = 200;
+ public lastReading: string = ""
public static create(comp: Component): Ambient {
let my = new Ambient();
@@ -18,6 +19,9 @@ export class Ambient {
if (comp.status.measurement.length > 0) {
comp.status.measurement.forEach(um => {
+ if (um.timestamps[0]){
+ my.lastReading = um.timestamps[0]
+ }
if (um.values[0]) {
if (um.type === quack.MeasurementType.MEASUREMENT_TYPE_TEMPERATURE) {
my.temperature = or(um.values[0].values[0], -127);
@@ -39,6 +43,7 @@ export class Ambient {
hum = humAndTemp["relativeHumidityTimes100"];
}
}
+ my.lastReading = comp.status.lastMeasurement?.timestamp ?? ""
my.temperature = or(temp, -1270) / 10;
my.humidity = or(hum, 20000) / 100;
}
diff --git a/src/models/Bin.ts b/src/models/Bin.ts
index e720fec..6f67212 100644
--- a/src/models/Bin.ts
+++ b/src/models/Bin.ts
@@ -1,8 +1,8 @@
import GrainDescriber from "grain/GrainDescriber";
import { cloneDeep } from "lodash";
import { MarkerData } from "maps/mapMarkers/Markers";
+import { User } from "models";
import { pond } from "protobuf-ts/pond";
-import { getGrainUnit } from "utils";
import { stringToMaterialColour } from "utils/strings";
import { or } from "utils/types";
@@ -52,6 +52,34 @@ export class Bin {
return this.settings.specs?.shape;
}
+ public diameter(): number {
+ return this.settings.specs?.diameterCm ?? 0;
+ }
+
+ public height(): number {
+ return this.settings.specs?.heightCm ?? 0;
+ }
+
+ public sidewallHeight(): number {
+ return this.settings.specs?.advancedDimensions?.sidewallHeight ?? 0;
+ }
+
+ public roofHeight() : number {
+ return this.settings.specs?.advancedDimensions?.topConeHeight ?? 0;
+ }
+
+ public hopperHeight() : number {
+ return this.settings.specs?.advancedDimensions?.hopperHeight ?? 0;
+ }
+
+ public roofAngle() : number {
+ return this.settings.specs?.advancedDimensions?.roofAngle ?? 0;
+ }
+
+ public hopperAngle() : number {
+ return this.settings.specs?.advancedDimensions?.hopperAngle ?? 0;
+ }
+
public key(): string {
return this.settings.key;
}
@@ -134,6 +162,11 @@ export class Bin {
return colour;
}
+ /**
+ * this function returns the number of bushels in the bin, if using the automatic lidar or libracart to control inventory it will use the bushels in status
+ * otherwise will use the bushels in the inventory found in settings
+ * @returns (number) the current bushels in the bin
+ */
public bushels(): number {
let control = this.settings.inventory?.inventoryControl;
let bushels = this.settings.inventory?.grainBushels || 0
@@ -144,6 +177,14 @@ export class Bin {
return bushels
}
+ /**
+ * this function returns the bushelCapacity in the bins specs as it is stored or 0 if the specs are undefined
+ * @returns (number) the capacity of the bin in bushels
+ */
+ public bushelCapacity(): number {
+ return this.settings.specs?.bushelCapacity ?? 0
+ }
+
public fillPercent(): number {
let fill = 0;
if (this.settings.inventory && this.settings.specs) {
@@ -162,7 +203,12 @@ export class Bin {
public grainName(): string {
if (this.grain() !== pond.Grain.GRAIN_INVALID) {
if (this.grain() === pond.Grain.GRAIN_CUSTOM) {
- return this.customType();
+ //this will prioritize the new style of custom grain types
+ let cg = this.customGrain()
+ if(cg !== undefined){
+ return cg.name
+ }
+ return this.customType(); //this is still here for bins that are using the old custom grain where it was just a string
} else {
return GrainDescriber(this.grain()).name;
}
@@ -171,6 +217,18 @@ export class Bin {
}
}
+ public grainGroup(): string {
+ if (this.grain() !== pond.Grain.GRAIN_INVALID) {
+ let cg = this.customGrain()
+ if (this.grain() === pond.Grain.GRAIN_CUSTOM && cg) {
+ return cg.group
+ } else {
+ return GrainDescriber(this.grain()).group;
+ }
+ }
+ return "None";
+ }
+
public binFillCap(): string {
let fillCap = "";
if (this.settings.specs && this.settings.inventory) {
@@ -236,16 +294,38 @@ export class Bin {
return bpt;
}
- public grainInventory(): number {
+ /**
+ * this function returns a bins stored inventory in the unit of the passed in user,
+ * it can return it in bushels, US tons, or metric Tonnes
+ * @param user the user object
+ * @returns (number) bins current stored inventory
+ */
+ public grainInventory(user: User): number {
let grain = this.bushels()
- if(getGrainUnit() === pond.GrainUnit.GRAIN_UNIT_TONNE && this.bushelsPerTonne() > 1){
+ if(user.grainUnit() === pond.GrainUnit.GRAIN_UNIT_TONNE && this.bushelsPerTonne() > 1){
grain = this.bushels() / this.bushelsPerTonne()
- }else if (getGrainUnit() === pond.GrainUnit.GRAIN_UNIT_TON && this.bushelsPerTonne() > 1){
+ }else if (user.grainUnit() === pond.GrainUnit.GRAIN_UNIT_TON && this.bushelsPerTonne() > 1){
grain = this.bushels() / (this.bushelsPerTonne() * 0.907)
}
return Math.round(grain*100)/100
}
+ /**
+ * this function returns a bins capacity in the unit of the passed in user,
+ * it can return it in bushels, US tons, or metric Tonnes
+ * @param user the user object
+ * @returns (number) bins max capacity
+ */
+ public grainCapacity(user: User): number {
+ let capacity = this.bushelCapacity()
+ if(user.grainUnit() === pond.GrainUnit.GRAIN_UNIT_TONNE && this.bushelsPerTonne() > 1){
+ capacity = capacity / this.bushelsPerTonne()
+ }else if (user.grainUnit() === pond.GrainUnit.GRAIN_UNIT_TON && this.bushelsPerTonne() > 1){
+ capacity = capacity / (this.bushelsPerTonne() * 0.907)
+ }
+ return Math.round(capacity*100)/100
+ }
+
/**
* gets the enum value for the inventory control in the bins inventory
*/
@@ -256,4 +336,17 @@ export class Bin {
}
return c;
}
+
+ //changed this to just use the target temp rather than the upper limit as we are deprecating the limits
+ public targetTemp(): number {
+ return this.settings.inventory?.targetTemperature ?? 0
+ }
+
+ public lowerTempThreshold(): number {
+ return this.settings.lowTemp
+ }
+
+ public targetMoisture(): number {
+ return this.settings.inventory?.targetMoisture ?? 0
+ }
}
diff --git a/src/models/CO2.ts b/src/models/CO2.ts
index 62e5d73..fcb1ed5 100644
--- a/src/models/CO2.ts
+++ b/src/models/CO2.ts
@@ -3,8 +3,6 @@ import { quack } from "protobuf-ts/pond";
import { or } from "utils/types";
import { clone, cloneDeep } from "lodash";
import { Component } from "models";
-import { describeMeasurement } from "pbHelpers/MeasurementDescriber";
-import { extractGrainCable } from "pbHelpers/ComponentTypes";
export class CO2 {
public settings: pond.ComponentSettings = pond.ComponentSettings.create();
diff --git a/src/models/Contract.ts b/src/models/Contract.ts
index ce55093..81bc001 100644
--- a/src/models/Contract.ts
+++ b/src/models/Contract.ts
@@ -2,8 +2,9 @@ import { Option } from "common/SearchSelect";
import { GrainOptions, ToGrainOption } from "grain";
import GrainDescriber from "grain/GrainDescriber";
import { cloneDeep } from "lodash";
+import { User } from "models";
import { pond } from "protobuf-ts/pond";
-import { getGrainUnit, stringToMaterialColour } from "utils";
+import { stringToMaterialColour } from "utils";
import { or } from "utils/types";
export class Contract {
@@ -14,26 +15,28 @@ export class Contract {
public label: string = "";
private objKey: string = "";
- public static create(pb?: pond.Contract): Contract {
+ public static create(pb?: pond.Contract, user?: User): Contract {
let my = new Contract();
if (pb) {
my.settings = pond.ContractSettings.fromObject(cloneDeep(or(pb.settings, {})));
my.title = pb.name;
my.objKey = pb.key;
- my.unit = my.measurementUnit();
+ my.unit = my.measurementUnit(user);
my.colour = my.commodityColour();
my.label = my.commodityLabel();
}
return my;
}
- private measurementUnit(): string {
+ private measurementUnit(user?: User): string {
if (this.settings.type === pond.ContractType.CONTRACT_TYPE_GRAIN) {
- if(getGrainUnit() === pond.GrainUnit.GRAIN_UNIT_TONNE && this.conversionValue() > 1){
- return "mT"
- }
- if(getGrainUnit() === pond.GrainUnit.GRAIN_UNIT_TON && this.conversionValue() > 1){
- return "t"
+ if( user ){
+ if(user.grainUnit() === pond.GrainUnit.GRAIN_UNIT_TONNE && this.conversionValue() > 1){
+ return "mT"
+ }
+ if(user.grainUnit() === pond.GrainUnit.GRAIN_UNIT_TON && this.conversionValue() > 1){
+ return "t"
+ }
}
return "bu";
}
@@ -63,21 +66,22 @@ export class Contract {
return label;
}
- public static clone(other?: Contract): Contract {
+ public static clone(other?: Contract, user?: User): Contract {
if (other) {
return Contract.create(
pond.Contract.fromObject({
title: other.title,
key: other.objKey,
settings: cloneDeep(other.settings)
- })
+ }),
+ user
);
}
- return Contract.create();
+ return Contract.create(undefined, user);
}
- public static any(data: any): Contract {
- return Contract.create(pond.Contract.fromObject(cloneDeep(data)));
+ public static any(data: any, user?: User): Contract {
+ return Contract.create(pond.Contract.fromObject(cloneDeep(data)), user);
}
public key(): string {
@@ -204,28 +208,28 @@ export class Contract {
return this.conversionValue();
}
- public sizeInPreferredUnit(): number {
+ public sizeInPreferredUnit(user: User): number {
let size = this.settings.size;
switch (this.settings.type) {
case pond.ContractType.CONTRACT_TYPE_GRAIN:
- if (getGrainUnit() === pond.GrainUnit.GRAIN_UNIT_TONNE && this.conversionValue() > 1) {
+ if (user.grainUnit() === pond.GrainUnit.GRAIN_UNIT_TONNE && this.conversionValue() > 1) {
size = size / this.conversionValue();
}
- if (getGrainUnit() === pond.GrainUnit.GRAIN_UNIT_TON && this.conversionValue() > 1){
+ if (user.grainUnit() === pond.GrainUnit.GRAIN_UNIT_TON && this.conversionValue() > 1){
size = size / (this.conversionValue() * 0.907); //the conversion for grain will be stored in metric tonnes, this will convert it to US tons
}
}
return Math.round(size * 100) / 100;
}
- public deliveredInPreferredUnit(): number {
+ public deliveredInPreferredUnit(user: User): number {
let del = this.settings.delivered;
switch (this.settings.type) {
case pond.ContractType.CONTRACT_TYPE_GRAIN:
- if (getGrainUnit() === pond.GrainUnit.GRAIN_UNIT_TONNE && this.conversionValue() > 1) {
+ if (user.grainUnit() === pond.GrainUnit.GRAIN_UNIT_TONNE && this.conversionValue() > 1) {
del = del / this.conversionValue();
}
- if (getGrainUnit() === pond.GrainUnit.GRAIN_UNIT_TON && this.conversionValue() > 1){
+ if (user.grainUnit() === pond.GrainUnit.GRAIN_UNIT_TON && this.conversionValue() > 1){
del = del / (this.conversionValue() * 0.907); //the conversion for grain will be stored in metric tonnes, this will convert it to US tons
}
}
@@ -237,14 +241,15 @@ export class Contract {
public static toStoredUnit(
secondaryUnitVal: number,
contractType: pond.ContractType,
- conversionValue: number
+ conversionValue: number,
+ user: User
): number {
let storedUnitVal = secondaryUnitVal;
switch (contractType) {
//use the value and conversion they entered directly, it is safe to assume they are both the same unit (ton vs tonne) so dont need to convert anything
//before converting to bushels
case pond.ContractType.CONTRACT_TYPE_GRAIN:
- if ((getGrainUnit() === pond.GrainUnit.GRAIN_UNIT_TONNE || getGrainUnit() === pond.GrainUnit.GRAIN_UNIT_TON) && conversionValue > 1) {
+ if ((user.grainUnit() === pond.GrainUnit.GRAIN_UNIT_TONNE || user.grainUnit() === pond.GrainUnit.GRAIN_UNIT_TON) && conversionValue > 1) {
storedUnitVal = secondaryUnitVal * conversionValue;
}
}
diff --git a/src/models/Controller.ts b/src/models/Controller.ts
index 0ee12af..4e7170c 100644
--- a/src/models/Controller.ts
+++ b/src/models/Controller.ts
@@ -9,13 +9,30 @@ export class Controller {
public settings: pond.ComponentSettings = pond.ComponentSettings.create();
public status: pond.ComponentStatus = pond.ComponentStatus.create();
public on = false;
+ public mode: quack.OutputMode | undefined
+ public lastReading: string = "";
public static create(comp: Component): Controller {
let my = new Controller();
my.settings = comp.settings;
my.status = comp.status;
+ my.mode = comp.settings.defaultOutputState
- my.on = Boolean(my.status.lastMeasurement?.measurement?.booleanOutput?.value);
+ //this is deprecated because it is our old measurement structure
+ // my.on = Boolean(my.status.lastMeasurement?.measurement?.booleanOutput?.value);
+
+ if (comp.status.lastGoodMeasurement.length > 0) {
+ comp.status.measurement.forEach(um => {
+ if (um.timestamps[0]){
+ my.lastReading = um.timestamps[0]
+ }
+ if (um.values[0]) {
+ if (um.type === quack.MeasurementType.MEASUREMENT_TYPE_BOOLEAN) {
+ my.on = Boolean(um.values[0].values[0]);
+ }
+ }
+ });
+ }
return my;
}
@@ -25,6 +42,7 @@ export class Controller {
my.settings = comp.settings ? comp.settings : pond.ComponentSettings.create();
my.status = comp.status ? comp.status : pond.ComponentStatus.create();
+
my.on = Boolean(my.status.lastMeasurement?.measurement?.booleanOutput?.value);
return my;
diff --git a/src/models/GrainCable.ts b/src/models/GrainCable.ts
index 70dc257..4de1ae4 100644
--- a/src/models/GrainCable.ts
+++ b/src/models/GrainCable.ts
@@ -132,21 +132,43 @@ export class GrainCable {
return describeMeasurement(quack.MeasurementType.MEASUREMENT_TYPE_TEMPERATURE).colour();
}
- public minTemp(unit = pond.TemperatureUnit.TEMPERATURE_UNIT_CELSIUS) {
+ public minTemp(unit = pond.TemperatureUnit.TEMPERATURE_UNIT_CELSIUS, inGrain?: boolean) {
+ if(inGrain){
+ let grainMax = Math.min(...this.filteredNodes(true).temps)
+ if (unit === pond.TemperatureUnit.TEMPERATURE_UNIT_FAHRENHEIT)
+ return this.farenheit(grainMax)
+ return grainMax
+ }
if (unit === pond.TemperatureUnit.TEMPERATURE_UNIT_FAHRENHEIT)
return this.farenheit(Math.min(...this.temperatures));
return Math.min(...this.temperatures);
}
- public minHumidity() {
+ public minHumidity(inGrain?: boolean) {
+ if(inGrain){
+ return Math.max(...this.filteredNodes(true).humids)
+ }
return Math.min(...this.humidities);
}
- public minMoisture() {
+ public minMoisture(inGrain?: boolean) {
+ if(inGrain){
+ return Math.min(...this.filteredNodes(true).moistures)
+ }
return Math.min(...this.grainMoistures);
}
- public aveTemp(unit = pond.TemperatureUnit.TEMPERATURE_UNIT_CELSIUS) {
+ /**
+ * Averages the temperatures of the grain cable, if filtered is true it will filter the excluded nodes and nodes above the top node before averaging
+ * @param unit the unit of the temperature
+ * @param inGrain whether to filter the excluded nodes and nodes above the top node before averaging
+ * @returns
+ */
+ public aveTemp(unit = pond.TemperatureUnit.TEMPERATURE_UNIT_CELSIUS, inGrain?: boolean) {
+ if(inGrain){
+ let filteredNodes = this.filteredNodes(true)
+ return filteredNodes.temps.reduce((p: any, c: any) => p + c, 0) / filteredNodes.temps.length
+ }
if (unit === pond.TemperatureUnit.TEMPERATURE_UNIT_FAHRENHEIT)
return this.farenheit(
this.temperatures.reduce((p: any, c: any) => p + c, 0) / this.temperatures.length
@@ -154,21 +176,45 @@ export class GrainCable {
return this.temperatures.reduce((p: any, c: any) => p + c, 0) / this.temperatures.length;
}
- public aveHumidity() {
+ public aveHumidity(inGrain?: boolean) {
+ if(inGrain){
+ let filteredNodes = this.filteredNodes(true)
+ return filteredNodes.humids.reduce((p: any, c: any) => p + c, 0) / filteredNodes.humids.length
+ }
return this.humidities.reduce((p: any, c: any) => p + c, 0) / this.humidities.length;
}
- public maxTemp(unit = pond.TemperatureUnit.TEMPERATURE_UNIT_CELSIUS) {
+ public aveMoisture(inGrain?: boolean) {
+ if(inGrain){
+ let filteredNodes = this.filteredNodes(true)
+ return filteredNodes.moistures.reduce((p: any, c: any) => p + c, 0) / filteredNodes.moistures.length
+ }
+ return this.grainMoistures.reduce((p: any, c: any) => p + c, 0) / this.grainMoistures.length;
+ }
+
+ public maxTemp(unit = pond.TemperatureUnit.TEMPERATURE_UNIT_CELSIUS, inGrain?: boolean) {
+ if(inGrain){
+ let grainMax = Math.max(...this.filteredNodes(true).temps)
+ if (unit === pond.TemperatureUnit.TEMPERATURE_UNIT_FAHRENHEIT)
+ return this.farenheit(grainMax)
+ return grainMax
+ }
if (unit === pond.TemperatureUnit.TEMPERATURE_UNIT_FAHRENHEIT)
return this.farenheit(Math.max(...this.temperatures));
return Math.max(...this.temperatures);
}
- public maxHumidity() {
+ public maxHumidity(inGrain?: boolean) {
+ if(inGrain){
+ return Math.max(...this.filteredNodes(true).humids)
+ }
return Math.max(...this.humidities);
}
- public maxMoisture() {
+ public maxMoisture(inGrain?: boolean) {
+ if(inGrain){
+ return Math.max(...this.filteredNodes(true).moistures)
+ }
return Math.min(...this.grainMoistures);
}
diff --git a/src/models/Headspace.ts b/src/models/Headspace.ts
index bb4342b..51bd7fa 100644
--- a/src/models/Headspace.ts
+++ b/src/models/Headspace.ts
@@ -10,6 +10,7 @@ export class Headspace {
public status: pond.ComponentStatus = pond.ComponentStatus.create();
public temperature: number = -127;
public humidity: number = 200;
+ public lastReading: string = "";
public static create(comp: Component): Headspace {
let my = new Headspace();
@@ -18,6 +19,9 @@ export class Headspace {
if (comp.status.measurement.length > 0) {
comp.status.measurement.forEach(um => {
+ if (um.timestamps[0]){
+ my.lastReading = um.timestamps[0]
+ }
if (um.values[0]) {
if (um.type === quack.MeasurementType.MEASUREMENT_TYPE_TEMPERATURE) {
my.temperature = um.values[0].values[0];
@@ -39,6 +43,7 @@ export class Headspace {
hum = humAndTemp["relativeHumidityTimes100"];
}
}
+ my.lastReading = comp.status.lastMeasurement?.timestamp ?? ""
my.temperature = or(temp, -1270) / 10;
my.humidity = or(hum, 20000) / 100;
}
diff --git a/src/models/Plenum.ts b/src/models/Plenum.ts
index 24378d3..b88b8a0 100644
--- a/src/models/Plenum.ts
+++ b/src/models/Plenum.ts
@@ -10,6 +10,7 @@ export class Plenum {
public status: pond.ComponentStatus = pond.ComponentStatus.create();
public temperature: number = -127;
public humidity: number = 200;
+ public lastReading: string = ""
public static create(comp: Component): Plenum {
let my = new Plenum();
@@ -18,6 +19,9 @@ export class Plenum {
if (comp.status.measurement.length > 0) {
comp.status.measurement.forEach(um => {
+ if (um.timestamps[0]) {
+ my.lastReading = um.timestamps[0];
+ }
if (um.values[0]) {
if (um.type === quack.MeasurementType.MEASUREMENT_TYPE_TEMPERATURE) {
my.temperature = or(um.values[0].values[0], -127);
@@ -41,6 +45,7 @@ export class Plenum {
}
my.temperature = or(temp, -1270) / 10;
my.humidity = or(hum, 20000) / 100;
+ my.lastReading = comp.status.lastMeasurement?.timestamp ?? ""
}
return my;
diff --git a/src/models/Pressure.ts b/src/models/Pressure.ts
index fc07dfe..de0b189 100644
--- a/src/models/Pressure.ts
+++ b/src/models/Pressure.ts
@@ -9,7 +9,9 @@ export class Pressure {
public settings: pond.ComponentSettings = pond.ComponentSettings.create();
public status: pond.ComponentStatus = pond.ComponentStatus.create();
public pascals: number = 0;
+ public airflow: number | undefined
public fanId: number = 0;
+ public lastReading: string = ""
public static create(comp: Component): Pressure {
let my = new Pressure();
@@ -19,19 +21,23 @@ export class Pressure {
//getting the value from the unitmeasurements in status instead of the old style measurements in the status
if (comp.status.measurement.length > 0) {
comp.status.measurement.forEach(um => {
+ if (um.timestamps[0]){
+ my.lastReading = um.timestamps[0]
+ }
if (um.values[0] && um.values[0].values.length > 0) {
if (um.type === quack.MeasurementType.MEASUREMENT_TYPE_PRESSURE) {
my.pascals = um.values[0].values[0];
}
//TODO-CS: could expand this to have the fan cfm in the pressure model as well
- // if (um.type === quack.MeasurementType.MEASUREMENT_TYPE_CFM){
- // my.fanCFM = um.values[0].values[0]
- // }
+ if (um.type === quack.MeasurementType.MEASUREMENT_TYPE_CFM){
+ my.airflow = um.values[0].values[0]
+ }
}
});
} else {
//if no unit measurements in status use the old measurements in status
let pre = comp.status?.lastMeasurement?.measurement?.pressure?.pascals;
+ my.lastReading = comp.status.lastMeasurement?.timestamp ?? ""
if (pre) {
my.pascals = pre;
}
diff --git a/src/models/UnitMeasurement.ts b/src/models/UnitMeasurement.ts
index d33c17d..9fc3a42 100644
--- a/src/models/UnitMeasurement.ts
+++ b/src/models/UnitMeasurement.ts
@@ -32,7 +32,7 @@ export class UnitMeasurement {
public static create(pb?: pond.UnitMeasurementsForComponent, user?: User): UnitMeasurement {
let my = new UnitMeasurement();
if (pb) {
- let describer = describeMeasurement(pb.type, pb.componentType);
+ let describer = describeMeasurement(pb.type, pb.componentType, undefined, undefined, user);
let values = pb.values;
if (user) {
values = unitConversion(pb.values, pb.type, user);
diff --git a/src/models/user.ts b/src/models/user.ts
index 6c46a31..22bdb26 100644
--- a/src/models/user.ts
+++ b/src/models/user.ts
@@ -101,4 +101,20 @@ export class User {
}
return this.settings.features.includes(flag);
}
+
+ public tempUnit(): pond.TemperatureUnit {
+ return this.settings.temperatureUnit
+ }
+
+ public pressureUnit(): pond.PressureUnit {
+ return this.settings.pressureUnit
+ }
+
+ public distanceUnit(): pond.DistanceUnit {
+ return this.settings.distanceUnit
+ }
+
+ public grainUnit(): pond.GrainUnit {
+ return this.settings.grainUnit
+ }
}
diff --git a/src/navigation/BottomNavigator.tsx b/src/navigation/BottomNavigator.tsx
index b03a153..60019a6 100644
--- a/src/navigation/BottomNavigator.tsx
+++ b/src/navigation/BottomNavigator.tsx
@@ -13,14 +13,14 @@ import BinsIcon from "products/Bindapt/BinsIcon";
import { useGlobalState } from "providers";
import { useCallback, useEffect, useState } from "react";
import { useNavigate, useLocation } from "react-router-dom";
-import { IsAdaptiveAgriculture, isBXT, IsMiVent, IsAdCon, IsOmniAir, IsMiPCA } from "services/whiteLabel";
+import { getFeatures, getWhitelabel } from "services/whiteLabel";
import FieldsIcon from "products/AgIcons/FieldsIcon";
import NexusSTIcon from "products/Construction/NexusSTIcon";
import OmniAirDeviceIcon from "products/AviationIcons/OmniAirDeviceIcon";
import AirportMapIcon from "products/AviationIcons/AirportMapIcon";
import PlaneIcon from "products/AviationIcons/PlaneIcon";
import JobsiteIcon from "products/Construction/JobSiteIcon";
-import { useAuth0 } from "@auth0/auth0-react";
+import { useAuthContext } from "providers/authContext";
interface Props {
sideIsOpen: boolean;
@@ -33,22 +33,19 @@ export default function BottomNavigator(props: Props) {
const navigate = useNavigate();
const location = useLocation();
const prevLocation = usePrevious(location);
- const { isAuthenticated } = useAuth0();
+ const { isAuthenticated } = useAuthContext();
const [{ user }] = useGlobalState();
const [route, setRoute] = useState(sideIsOpen ? "side" : "");
- const isAdaptive = IsAdaptiveAgriculture();
- const isMiVent = IsMiVent();
- const isAdCon = IsAdCon();
- const isOmni = IsOmniAir();
- const isMiPCA = IsMiPCA();
+ const wl = getWhitelabel();
+ const f = getFeatures();
const reRoute = useCallback(
(path: string) => {
if (path === "") {
- if (isAdaptive) {
+ if (f.bins) {
return "bins";
}
- if (isMiVent) {
+ if (f.ventilation) {
return "ventilation";
}
return "devices";
@@ -74,7 +71,7 @@ export default function BottomNavigator(props: Props) {
}
return path;
},
- [isAdaptive, isMiVent]
+ [f]
);
const autoDetectRoute = useCallback(() => {
@@ -105,27 +102,27 @@ export default function BottomNavigator(props: Props) {
const authenticatedNavigation = () => {
return (
handleRouteChange(newValue)}>
- {isAdaptive && (
+ {f.visualFarm && (
} value="visualFarm" />
)}
- {isAdaptive && (
+ {f.bins && (
} value="bins" />
)}
- {isAdCon && (
+ {f.constructionMap && (
}
value="constructionMap"
/>
)}
- {(isOmni || isMiPCA) && (
+ {f.aviationMap && (
}
value="aviationMap"
/>
)}
- {(isOmni || isMiPCA) && (
+ {f.terminals && (
}
@@ -136,11 +133,11 @@ export default function BottomNavigator(props: Props) {
- ) : isAdCon ? (
+ ) : f.constructionMap ? (
- ) : (isOmni || isMiPCA) ? (
+ ) : f.aviationMap ? (
) : (
@@ -148,22 +145,15 @@ export default function BottomNavigator(props: Props) {
}
value="devices"
/>
- {isAdCon && (
+ {f.jobsites && (
}
value="jobsites"
/>
)}
- {/* {isMiVent && (
- }
- value="ventilation"
- />
- )} */}
- {isBXT() && user.hasFeature("security") && (
+ {f.security && user.hasFeature("security") && (
} value="security" />
)}
} value="more" />
diff --git a/src/navigation/Router.tsx b/src/navigation/Router.tsx
index 94ce101..0326217 100644
--- a/src/navigation/Router.tsx
+++ b/src/navigation/Router.tsx
@@ -1,7 +1,7 @@
import { lazy, Suspense } from "react";
import LoadingScreen from "../app/LoadingScreen";
import { BrowserRouter, Navigate, Route, Routes } from "react-router-dom";
-import { useAuth0 } from "@auth0/auth0-react";
+import { useAuthContext } from "providers/authContext";
import Header from "app/Header";
import Logout from "pages/Logout";
import { ErrorBoundary } from "react-error-boundary";
@@ -20,6 +20,7 @@ const Teams = lazy(() => import("pages/Teams"));
const Users = lazy(() => import("pages/Users"));
const TeamPage = lazy(() => import("pages/Team"));
const BinPage = lazy(() => import("pages/Bin"));
+const BinPageV2 = lazy(()=> import("pages/BinV2"));
const Bins = lazy(() => import("pages/Bins"));
const Mines = lazy(() => import("pages/Mines"));
const DeviceComponent = lazy(() => import("pages/DeviceComponent"));
@@ -57,7 +58,7 @@ export const appendToUrl = (appendage: number | string) => {
export default function Router() {
- const { /*isAuthenticated, loginWithRedirect,*/ isLoading } = useAuth0();
+ const { isAuthenticated } = useAuthContext();
const whiteLabel = getWhitelabel();
const [{ user }] = useGlobalState();
@@ -139,10 +140,17 @@ export default function Router() {
path="" // "/settings/basic"
element={}
/>
+ {user.hasFeature("beta") ?
+ }
+ />
+ :
}
/>
+ }
{/* }
@@ -306,13 +314,7 @@ export default function Router() {
);
}
- if (isLoading) return null;
- // if (!isAuthenticated) {
- // loginWithRedirect()
- // return (
- // null
- // )
- // }
+ if (!isAuthenticated) return null;
function ErrorFallback({ error }: { error: Error }) {
return Something went wrong: {error.stack}
;
diff --git a/src/navigation/SideNavigator.tsx b/src/navigation/SideNavigator.tsx
index 6bab36c..d07e21b 100644
--- a/src/navigation/SideNavigator.tsx
+++ b/src/navigation/SideNavigator.tsx
@@ -1,20 +1,21 @@
-import { ChevronRight, Code, Grain, Memory, People, Person, SyncAlt, TapAndPlay } from "@mui/icons-material";
+import { ChevronRight, Code, Grain, HelpOutline, Memory, People, Person, SyncAlt, TapAndPlay } from "@mui/icons-material";
import ChevronLeft from "@mui/icons-material/ChevronLeft";
-import {
- darken,
- Divider,
- Grid2 as Grid,
- IconButton,
- lighten,
- List,
- ListItemButton,
- ListItemIcon,
- ListItemText,
- SwipeableDrawer,
- Theme,
- Toolbar,
- Tooltip,
- useTheme
+import {
+ Box,
+ darken,
+ Divider,
+ Grid2 as Grid,
+ IconButton,
+ lighten,
+ List,
+ ListItemButton,
+ ListItemIcon,
+ ListItemText,
+ SwipeableDrawer,
+ Theme,
+ Toolbar,
+ Tooltip,
+ useTheme
} from "@mui/material";
import classNames from "classnames";
import { useMobile, useWidth } from "../hooks/useWidth";
@@ -23,23 +24,15 @@ import BindaptIcon from "../products/Bindapt/BindaptIcon";
import { useLocation, useNavigate } from "react-router-dom";
import BinsIcon from "products/Bindapt/BinsIcon";
import { useGlobalState } from "providers";
-import {
- IsAdaptiveAgriculture,
- // hasTutorialPlaylist,
- IsAdCon,
- IsMiPCA,
- // isBXT,
- IsMiVent,
- IsOmniAir,
- IsStreamline,
-} from "services/whiteLabel";
+import { getFeatures } from "services/whiteLabel";
import MiningIcon from "products/ventilation/MiningIcon";
-import { useAuth0 } from "@auth0/auth0-react";
+import { useAuthContext } from "providers/authContext";
import FieldsIcon from "products/AgIcons/FieldsIcon";
import PlaneIcon from "products/AviationIcons/PlaneIcon";
import AirportMapIcon from "products/AviationIcons/AirportMapIcon";
import JobsiteIcon from "products/Construction/JobSiteIcon";
import { getThemeType } from "theme";
+import { isCrispEnabled, openCrispChat } from "chat/CrispChat";
import ObjectHeaterIcon from "products/Construction/ObjectHeaterIcon";
import TasksIcon from "products/Construction/TasksIcon";
import CableIcon from "products/Bindapt/CableIcon";
@@ -52,6 +45,7 @@ import CNHiIcon from "products/CommonIcons/cnhiIcon";
import LibraCartIcon from "products/CommonIcons/libracartIcon";
const drawerWidth = 230;
+const closedDrawerWidth = 9.25;
const useStyles = makeStyles((theme: Theme) => ({
sideMenu: {
@@ -65,6 +59,8 @@ const useStyles = makeStyles((theme: Theme) => ({
sideMenuOpened: {
zIndex: theme.zIndex.drawer + 2,
width: drawerWidth,
+ minWidth: drawerWidth,
+ maxWidth: drawerWidth,
transition: theme.transitions.create(["width"], {
easing: theme.transitions.easing.sharp,
duration: theme.transitions.duration.enteringScreen
@@ -75,12 +71,16 @@ const useStyles = makeStyles((theme: Theme) => ({
easing: theme.transitions.easing.sharp,
duration: theme.transitions.duration.leavingScreen
}),
- // overflowX: "hidden",
+ overflowX: "hidden",
width: theme.spacing(0),
+ minWidth: theme.spacing(0),
+ maxWidth: theme.spacing(0),
// zIndex: theme.zIndex.drawer,
// opacity: 0,
[theme.breakpoints.up("md")]: {
- width: theme.spacing(9.25),
+ width: theme.spacing(closedDrawerWidth),
+ minWidth: theme.spacing(closedDrawerWidth),
+ maxWidth: theme.spacing(closedDrawerWidth),
opacity: 1
}
},
@@ -97,6 +97,7 @@ const useStyles = makeStyles((theme: Theme) => ({
listItem: {
paddingLeft: theme.spacing(2),
paddingRight: theme.spacing(2),
+ maxHeight: 40,
[theme.breakpoints.up("md")]: {
paddingLeft: theme.spacing(3),
paddingRight: theme.spacing(3)
@@ -129,7 +130,7 @@ interface Props {
export default function SideNavigator(props: Props) {
const { open, onOpen, onClose } = props;
- const { isAuthenticated } = useAuth0()
+ const { isAuthenticated } = useAuthContext()
const theme = useTheme();
const width = useWidth();
const classes = useStyles();
@@ -164,15 +165,10 @@ export default function SideNavigator(props: Props) {
}
const authenticatedSideMenu = () => {
- const isMiVent = IsMiVent();
- const isAg = IsAdaptiveAgriculture()
- const isStreamline = IsStreamline()
- const isOmni = IsOmniAir()
- const isMiPCA = IsMiPCA()
- const isAdCon = IsAdCon()
+ const f = getFeatures();
return (
- {(isAg || isStreamline || user.hasFeature("admin")) && (
+ {(f.visualFarm || user.hasFeature("admin")) && (
)}
- {((isOmni || isMiPCA) || user.hasFeature("admin")) && (
+ {(f.aviationMap || user.hasFeature("admin")) && (
)}
- {(isAdCon || user.hasFeature("admin")) && (
+ {(f.constructionMap || user.hasFeature("admin")) && (
)}
- {(isAg || isStreamline || user.hasFeature("admin")) && (
+ {(f.contracts || user.hasFeature("admin")) && (
)}
- {(isAg || isStreamline || user.hasFeature("admin")) && (
+ {(f.bins || user.hasFeature("admin")) && (
)}
- {((isOmni || isMiPCA) || user.hasFeature("admin")) && (
+ {(f.terminals || user.hasFeature("admin")) && (
)}
- {(user.hasFeature("installer") && isAg || user.hasFeature("admin")) &&
+ {(f.cableEstimator && user.hasFeature("installer") || user.hasFeature("admin")) &&
}
- {(isAg || isStreamline || user.hasFeature("admin")) && (
+ {(f.transactions || user.hasFeature("admin")) && (
)}
- {(isMiVent || user.hasFeature("admin")) && (
+ {(f.mines || user.hasFeature("admin")) && (
}
- {(isAg || isStreamline || user.hasFeature("admin")) && (
+ {(f.fields || user.hasFeature("admin")) && (
)}
- {(isAg || isStreamline || user.hasFeature("admin")) && (
+ {(f.grainTypes || user.hasFeature("admin")) && (
)}
- {(isAdCon || user.hasFeature("admin")) && (
+ {(f.jobsites || user.hasFeature("admin")) && (
)}
- {(isAdCon || user.hasFeature("admin")) && (
+ {(f.heaters || user.hasFeature("admin")) && (
}
- {(isAg || isStreamline || user.hasFeature("admin")) &&
+ {(f.marketplace || user.hasFeature("admin")) &&
-
-
-
-
- {theme.direction === "rtl" ? : }
-
+
+
+
+
+
+ {open
+ ? theme.direction === "rtl" ? :
+ : theme.direction === "rtl" ? : }
+
+
-
-
-
- {/* {isAuthenticated || isOffline() ? authenticatedSideMenu() : unauthenticatedSideMenu()} */}
- {isAuthenticated && authenticatedSideMenu()}
+
+
+
+ {isAuthenticated && authenticatedSideMenu()}
+
+ {isCrispEnabled() && (<>
+
+
+
+ openCrispChat()}>
+
+
+
+ {open && }
+
+
+
+ )}
+
);
-}
\ No newline at end of file
+}
diff --git a/src/objectHeater/ObjectHeaterCharts.tsx b/src/objectHeater/ObjectHeaterCharts.tsx
index dd117e9..04e2e9a 100644
--- a/src/objectHeater/ObjectHeaterCharts.tsx
+++ b/src/objectHeater/ObjectHeaterCharts.tsx
@@ -216,12 +216,16 @@ export default function ObjectHeaterCharts(props: Props) {
let tempDescriber = describeMeasurement(
quack.MeasurementType.MEASUREMENT_TYPE_TEMPERATURE,
tempComponent.type(),
- tempComponent.subType()
+ tempComponent.subType(),
+ undefined,
+ user
);
let heaterDescriber = describeMeasurement(
quack.MeasurementType.MEASUREMENT_TYPE_BOOLEAN,
heaterComponent.type(),
- heaterComponent.subType()
+ heaterComponent.subType(),
+ undefined,
+ user
);
let tempData: LineData[] = [];
heaterTemps.forEach(ht => {
@@ -588,7 +592,9 @@ export default function ObjectHeaterCharts(props: Props) {
describer={describeMeasurement(
quack.MeasurementType.MEASUREMENT_TYPE_TEMPERATURE,
tempHum.type(),
- tempHum.subType()
+ tempHum.subType(),
+ undefined,
+ user
)}
lineData={ambientTemps}
numLines={1}
diff --git a/src/objects/ObjectDescriber.tsx b/src/objects/ObjectDescriber.tsx
index 643482a..ccd29ac 100644
--- a/src/objects/ObjectDescriber.tsx
+++ b/src/objects/ObjectDescriber.tsx
@@ -2,13 +2,11 @@ import { Column } from "common/ResponsiveTable";
import { Option } from "common/SearchSelect";
import GrainDescriber from "grain/GrainDescriber";
//import { Column } from "material-table";
-import { Bin, BinYard, Field } from "models";
+import { Bin, BinYard, Field, User } from "models";
//import { Gate } from "models/Gate";
import { GrainBag } from "models/GrainBag";
//import { ObjectHeater } from "models/ObjectHeater";
import { pond } from "protobuf-ts/pond";
-import { getDistanceUnit, getTemperatureUnit } from "utils";
-
interface Sort {
order: string; //what to send to the backend list to sort by
numerical: boolean; //whether to use a numerical or text sort
@@ -20,6 +18,8 @@ export interface ObjectExtension {
isTransactionObject: boolean;
//this will define the columns to be used for the object in a material table
tableColumns: Column[];
+ // Optional factory so columns can depend on the active user settings (units, formatting, etc.)
+ getTableColumns?: (user?: User) => Column[];
//this map will match the title of the column to what the backend needs to perform the ordering
tableSort: Map;
}
@@ -32,6 +32,202 @@ const defaultObject: ObjectExtension = {
tableSort: new Map()
};
+const binColumns = (user?: User): Column[] => {
+ const temperatureUnit =
+ user?.tempUnit() ?? pond.TemperatureUnit.TEMPERATURE_UNIT_CELSIUS;
+
+ return [
+ {
+ title: "Name",
+ cellStyle: {padding: "16px"},
+ render: row => {
+ return ({row.settings.name}
);
+ }
+ },
+ {
+ title: "Grain",
+ cellStyle: {padding: "16px"},
+ render: row => {
+ let grain = row.settings.inventory?.grainType;
+ if (grain) {
+ return GrainDescriber(grain).name;
+ }
+ }
+ },
+ {
+ title: "Bin Height",
+ cellStyle: {padding: "16px"},
+ render: row => {
+ let d = row.settings.specs?.heightCm;
+ if (d) {
+ if (
+ (user?.distanceUnit() ?? pond.DistanceUnit.DISTANCE_UNIT_FEET) ===
+ pond.DistanceUnit.DISTANCE_UNIT_METERS
+ ) {
+ return (d / 100).toFixed(2) + " m";
+ } else {
+ return (d / 30.48).toFixed(2) + " ft";
+ }
+ }
+ }
+ },
+ {
+ title: "Bin Diameter",
+ cellStyle: {padding: "16px"},
+ render: row => {
+ let d = row.settings.specs?.diameterCm;
+ if (d) {
+ if (
+ (user?.distanceUnit() ?? pond.DistanceUnit.DISTANCE_UNIT_FEET) ===
+ pond.DistanceUnit.DISTANCE_UNIT_METERS
+ ) {
+ return (d / 100).toFixed(2) + " m";
+ } else {
+ return (d / 30.48).toFixed(2) + " ft";
+ }
+ }
+ }
+ },
+ {
+ title: "Custom Grain Name",
+ cellStyle: {padding: "16px"},
+ render: row => {
+ return row.settings.inventory?.customTypeName;
+ }
+ },
+ {
+ title: "Grain Variant",
+ cellStyle: {padding: "16px"},
+ render: row => {
+ return row.settings.inventory?.grainSubtype;
+ }
+ },
+ {
+ title: "Grain Bushels",
+ cellStyle: {padding: "16px"},
+ render: row => {
+ return ({row.settings.inventory ? isNaN(row.settings.inventory.grainBushels) ? 0 : row.settings.inventory.grainBushels : 0}
);
+ }
+ },
+ {
+ title: "Grain Capacity",
+ cellStyle: {padding: "16px"},
+ render: row => {
+ return row.settings.specs?.bushelCapacity;
+ }
+ },
+ {
+ title: "High Temp Warning",
+ cellStyle: {padding: "16px"},
+ render: row => {
+ let t = row.settings.highTemp;
+ if (t) {
+ if (temperatureUnit === pond.TemperatureUnit.TEMPERATURE_UNIT_FAHRENHEIT) {
+ return (t * 1.8 + 32).toFixed(2) + " °F";
+ }
+ return t.toFixed(2) + " °C";
+ }
+ }
+ },
+ {
+ title: "Low Temp Warning",
+ cellStyle: {padding: "16px"},
+ render: row => {
+ let t = row.settings.lowTemp;
+ if (t) {
+ if (temperatureUnit === pond.TemperatureUnit.TEMPERATURE_UNIT_FAHRENHEIT) {
+ return (t * 1.8 + 32).toFixed(2) + " °F";
+ }
+ return t.toFixed(2) + " °C";
+ }
+ }
+ }
+ ] as Column[];
+};
+
+const grainBagColumns = (user?: User): Column[] => {
+ const distanceUnit =
+ user?.distanceUnit() ?? pond.DistanceUnit.DISTANCE_UNIT_FEET;
+ return [
+ {
+ title: "Name",
+ render: row => {
+ if (row.title) {
+ return ({row.title.toString()}
);
+ }
+ }
+ },
+ {
+ title: "Length",
+ render: row => {
+ if (row.settings.length) {
+ if (distanceUnit === pond.DistanceUnit.DISTANCE_UNIT_METERS) {
+ return row.settings.length.toFixed(2) + " m";
+ } else {
+ return (row.settings.length * 3.281).toFixed(2) + " ft";
+ }
+ }
+ }
+ },
+ {
+ title: "Diameter",
+ render: row => {
+ if (row.settings.diameter) {
+ if (distanceUnit === pond.DistanceUnit.DISTANCE_UNIT_METERS) {
+ return row.settings.diameter.toFixed(2) + " m";
+ } else {
+ return (row.settings.diameter * 3.281).toFixed(2) + " ft";
+ }
+ }
+ }
+ },
+ {
+ title: "Grain",
+ render: row => {
+ if (row.settings.supportedGrain) {
+ return GrainDescriber(row.settings.supportedGrain).name;
+ }
+ }
+ },
+ {
+ title: "Custom Grain",
+ render: row => {
+ return row.settings.customGrain;
+ }
+ },
+ {
+ title: "Grain Variant",
+ render: row => {
+ return row.settings.grainSubtype;
+ }
+ },
+ {
+ title: "Capacity",
+ render: row => {
+ return row.settings.bushelCapacity + " bu";
+ }
+ },
+ {
+ title: "Bushels",
+ render: row => {
+ return row.settings.currentBushels + " bu";
+ }
+ },
+ {
+ title: "Fill Date",
+ render: row => {
+ return row.settings.fillDate;
+ }
+ },
+ {
+ title: "Initial Moisture",
+ render: row => {
+ return row.settings.initialMoisture + "%";
+ }
+ }
+ ] as Column[];
+};
+
export const ObjectExtensions: Map = new Map([
[pond.ObjectType.OBJECT_TYPE_UNKNOWN, defaultObject],
[
@@ -50,109 +246,8 @@ export const ObjectExtensions: Map = new Map([
name: "Bin",
inventoryGroup: "grain",
isTransactionObject: true,
- tableColumns: [
- {
- title: "Name",
- cellStyle: {padding: "16px"},
- render: row => {
- return ({row.settings.name}
);
- }
- },
- {
- title: "Grain",
- cellStyle: {padding: "16px"},
- render: row => {
- let grain = row.settings.inventory?.grainType;
- if (grain) {
- return GrainDescriber(grain).name;
- }
- }
- },
- {
- title: "Bin Height",
- cellStyle: {padding: "16px"},
- render: row => {
- let d = row.settings.specs?.heightCm;
- if (d) {
- if (getDistanceUnit() === pond.DistanceUnit.DISTANCE_UNIT_METERS) {
- return (d / 100).toFixed(2) + " m";
- } else {
- return (d / 30.48).toFixed(2) + " ft";
- }
- }
- }
- },
- {
- title: "Bin Diameter",
- cellStyle: {padding: "16px"},
- render: row => {
- let d = row.settings.specs?.diameterCm;
- if (d) {
- if (getDistanceUnit() === pond.DistanceUnit.DISTANCE_UNIT_METERS) {
- return (d / 100).toFixed(2) + " m";
- } else {
- return (d / 30.48).toFixed(2) + " ft";
- }
- }
- }
- },
- {
- title: "Custom Grain Name",
- cellStyle: {padding: "16px"},
- render: row => {
- return row.settings.inventory?.customTypeName;
- }
- },
- {
- title: "Grain Variant",
- cellStyle: {padding: "16px"},
- render: row => {
- return row.settings.inventory?.grainSubtype;
- }
- },
- {
- title: "Grain Bushels",
- cellStyle: {padding: "16px"},
- render: row => {
- return ({row.settings.inventory ? isNaN(row.settings.inventory.grainBushels) ? 0 : row.settings.inventory.grainBushels : 0}
);
- }
- },
- {
- title: "Grain Capacity",
- cellStyle: {padding: "16px"},
- render: row => {
- return row.settings.specs?.bushelCapacity;
- }
- },
- {
- title: "High Temp Warning",
- cellStyle: {padding: "16px"},
- render: row => {
- let t = row.settings.highTemp;
- if (t) {
- if (getTemperatureUnit() === pond.TemperatureUnit.TEMPERATURE_UNIT_FAHRENHEIT) {
- return (t * 1.8 + 32).toFixed(2) + " °F";
- } else {
- return t.toFixed(2) + " °C";
- }
- }
- }
- },
- {
- title: "Low Temp Warning",
- cellStyle: {padding: "16px"},
- render: row => {
- let t = row.settings.lowTemp;
- if (t) {
- if (getTemperatureUnit() === pond.TemperatureUnit.TEMPERATURE_UNIT_FAHRENHEIT) {
- return (t * 1.8 + 32).toFixed(2) + " °F";
- } else {
- return t.toFixed(2) + " °C";
- }
- }
- }
- }
- ] as Column[],
+ tableColumns: binColumns(),
+ getTableColumns: (user?: User) => binColumns(user),
tableSort: new Map([
["Name", { order: "name", numerical: false }],
["Grain", { order: "inventory.grainType", numerical: false }],
@@ -395,84 +490,8 @@ export const ObjectExtensions: Map = new Map([
name: "Grainbag",
inventoryGroup: "grain",
isTransactionObject: true,
- tableColumns: [
- {
- title: "Name",
- render: row => {
- if (row.title) {
- return ({row.title.toString()}
);
- }
- }
- },
- {
- title: "Length",
- render: row => {
- if (row.settings.length) {
- if (getDistanceUnit() === pond.DistanceUnit.DISTANCE_UNIT_METERS) {
- return row.settings.length.toFixed(2) + " m";
- } else {
- return (row.settings.length * 3.281).toFixed(2) + " ft";
- }
- }
- }
- },
- {
- title: "Diameter",
- render: row => {
- if (row.settings.diameter) {
- if (getDistanceUnit() === pond.DistanceUnit.DISTANCE_UNIT_METERS) {
- return row.settings.diameter.toFixed(2) + " m";
- } else {
- return (row.settings.diameter * 3.281).toFixed(2) + " ft";
- }
- }
- }
- },
- {
- title: "Grain",
- render: row => {
- if (row.settings.supportedGrain) {
- return GrainDescriber(row.settings.supportedGrain).name;
- }
- }
- },
- {
- title: "Custom Grain",
- render: row => {
- return row.settings.customGrain;
- }
- },
- {
- title: "Grain Variant",
- render: row => {
- return row.settings.grainSubtype;
- }
- },
- {
- title: "Capacity",
- render: row => {
- return row.settings.bushelCapacity + " bu";
- }
- },
- {
- title: "Bushels",
- render: row => {
- return row.settings.currentBushels + " bu";
- }
- },
- {
- title: "Fill Date",
- render: row => {
- return row.settings.fillDate;
- }
- },
- {
- title: "Initial Moisture",
- render: row => {
- return row.settings.initialMoisture + "%";
- }
- }
- ] as Column[],
+ tableColumns: grainBagColumns(),
+ getTableColumns: (user?: User) => grainBagColumns(user),
tableSort: new Map([
["Name", { order: "name", numerical: false }],
["Length", { order: "length", numerical: true }],
@@ -708,8 +727,7 @@ export const ObjectExtensions: Map = new Map([
]);
export default function ObjectDescriber(type: pond.ObjectType): ObjectExtension {
- let describer = ObjectExtensions.get(type);
- return describer ? describer : defaultObject;
+ return ObjectExtensions.get(type) ?? defaultObject;
}
/**
@@ -745,7 +763,8 @@ export function SearchableObjects(): Option[] {
Object.values(pond.ObjectType).forEach(obj => {
if (typeof obj !== "string") {
let ext = ObjectDescriber(obj);
- if (ext.tableColumns.length > 0) {
+ const columns = ext.getTableColumns ? ext.getTableColumns() : ext.tableColumns;
+ if (columns.length > 0) {
options.push({
label: ext.name,
value: obj
diff --git a/src/objects/ObjectTable.tsx b/src/objects/ObjectTable.tsx
index 7a7b677..2ef6c86 100644
--- a/src/objects/ObjectTable.tsx
+++ b/src/objects/ObjectTable.tsx
@@ -1,6 +1,5 @@
import { Box, Button, Grid2 as Grid } from "@mui/material";
// import { getTableIcons } from "common/ResponsiveTable";
-import SearchBar from "common/SearchBar";
import SearchSelect, { Option } from "common/SearchSelect";
// import MaterialTable, { MTableToolbar } from "material-table";
// import { Bin, BinYard, Field } from "models";
@@ -22,9 +21,8 @@ import {
import { useCallback, useEffect, useState } from "react";
import TeamSearch from "teams/TeamSearch";
import BulkBinSettings from "./bulkEditForms/bulkBinSettings";
-import BulkGrainBagSettings from "./bulkEditForms/bulkGrainBagSettings";
import ResponsiveTable from "common/ResponsiveTable";
-import { cloneDeep, indexOf } from "lodash";
+import { cloneDeep } from "lodash";
//import BulkGateSettings from "./bulkEditForms/bulkGateSettings";
interface customButton {
@@ -61,6 +59,9 @@ export default function ObjectTable(props: Props) {
const [selectedUser, setSelectedUser] = useState(as ?? user.id());
const [selectedPageRows, setSelectedPageRows] = useState>(new Map())//key is the page value is an array of row indexes for that page
const [tableLoading, setTableLoading] = useState(false);
+
+ const objectExtension = ObjectDescriber(currentType);
+ const columns = objectExtension.getTableColumns ? objectExtension.getTableColumns(user) : objectExtension.tableColumns;
//the api's to load all the objects available to look at in this table
const binAPI = useBinAPI();
const binyardAPI = useBinYardAPI();
@@ -366,7 +367,7 @@ export default function ObjectTable(props: Props) {
{
if (by !== -1) {
- let colName = ObjectDescriber(currentType).tableColumns[by].title?.toString();
+ let colName = ObjectDescriber(currentType, user).tableColumns[by].title?.toString();
let order;
if (colName) {
- order = ObjectDescriber(currentType).tableSort.get(colName);
+ order = ObjectDescriber(currentType, user).tableSort.get(colName);
setCurrentOrder(order?.order);
setCurrentDirection(direction);
setIsNumerical(order?.numerical);
diff --git a/src/objects/bulkEditForms/bulkBinSettings.tsx b/src/objects/bulkEditForms/bulkBinSettings.tsx
index f3e01a9..f953def 100644
--- a/src/objects/bulkEditForms/bulkBinSettings.tsx
+++ b/src/objects/bulkEditForms/bulkBinSettings.tsx
@@ -4,7 +4,7 @@ import { GrainOptions } from "grain";
import { pond } from "protobuf-ts/pond";
import { useBinAPI, useGlobalState, useSnackbar } from "providers";
import React, { useState } from "react";
-import { fahrenheitToCelsius, getDistanceUnit, getTemperatureUnit } from "utils";
+import { fahrenheitToCelsius } from "utils";
interface Props {
selectedBins: pond.Bin[];
@@ -19,7 +19,7 @@ export default function BulkBinSettings(props: Props) {
const gridItemWidth = 3;
// bin settings variables
const [name, setName] = useState();
- const [{as}] = useGlobalState();
+ const [{as, user}] = useGlobalState();
const [grainType, setGrainType] = useState();
const [grainOption, setGrainOption] = useState
-
+
@@ -316,7 +316,7 @@ export default function Contract() {
Notes
-
+
diff --git a/src/pages/Contracts.tsx b/src/pages/Contracts.tsx
index e93850b..fee4834 100644
--- a/src/pages/Contracts.tsx
+++ b/src/pages/Contracts.tsx
@@ -11,7 +11,7 @@ import PageContainer from "./PageContainer";
export default function Contracts() {
const [openSettings, setOpenSettings] = useState(false);
- const [{ as }] = useGlobalState()
+ const [{ as, user }] = useGlobalState()
const contractAPI = useContractAPI();
const [contracts, setContracts] = useState
([]);
const [loading, setLoading] = useState(false);
@@ -42,7 +42,7 @@ export default function Contracts() {
let contractPermissions: Map = new Map();
if (resp.data.contracts){
resp.data.contracts.forEach(contract => {
- let c = Contract.create(contract);
+ let c = Contract.create(contract, user);
contracts.push(c);
let p = pond.EvaluatePermissionsResponse.fromObject(
resp.data.contractPermissions[c.key()]
@@ -56,7 +56,7 @@ export default function Contracts() {
})
.catch(err => {});
}
- }, [contractAPI, year, as]); // eslint-disable-line react-hooks/exhaustive-deps
+ }, [contractAPI, year, as, user]); // eslint-disable-line react-hooks/exhaustive-deps
return (
diff --git a/src/pages/Device.tsx b/src/pages/Device.tsx
index db9914e..801c1f1 100644
--- a/src/pages/Device.tsx
+++ b/src/pages/Device.tsx
@@ -3,10 +3,12 @@ import Grid from '@mui/material/Grid2';
import { Component, Device, Interaction, User } from "models";
import { getContextKeys, getContextTypes } from "pbHelpers/Context";
import { useDeviceAPI, useGlobalState, useSnackbar } from "providers";
-import { useEffect, useState } from "react";
+import { useDeviceStatusStreams } from "hooks/useDeviceStatusStreams";
+import { useCallback, useEffect, useMemo, useState } from "react";
import { useLocation, useParams } from "react-router-dom";
import PageContainer from "./PageContainer";
-import { useHTTP, useMobile } from "hooks";
+import { useMobile } from "hooks";
+import { useHTTP } from "providers/http";
import LoadingScreen from "app/LoadingScreen";
import SmartBreadcrumb from "common/SmartBreadcrumb";
import DeviceActions from "device/DeviceActions";
@@ -17,12 +19,25 @@ import { DeviceAvailabilityMap, FindAvailablePositions, OffsetAvailabilityMap }
import ComponentCard from "component/ComponentCard";
import { sameComponentID, sortComponents } from "pbHelpers/Component";
import { isController } from "pbHelpers/ComponentType";
-import { or } from "utils";
+import { getTimestampMillis, isStaleStatusUpdate, or } from "utils";
import ComponentDiagnostics from "component/ComponentDiagnostics";
import DeviceWizard from "device/DeviceWizard";
import DeviceScannedComponents from "device/autoDetect/DeviceScannedComponents";
import { useWebSocket } from "hooks/useWebSocket";
+type TimestampedReading = { timestamp?: string };
+
+function pickNewestReading(
+ current: T | null | undefined,
+ incoming: T | null | undefined
+): T | null | undefined {
+ const currentTs = getTimestampMillis(current?.timestamp);
+ const incomingTs = getTimestampMillis(incoming?.timestamp);
+ if (incomingTs === undefined) return current ?? incoming;
+ if (currentTs === undefined) return incoming ?? current;
+ return incomingTs >= currentTs ? incoming : current;
+}
+
export interface DevicePageData {
device: Device;
components: Component[];
@@ -38,7 +53,7 @@ export default function DevicePage() {
const isMobile = useMobile()
const deviceID = useParams<{ deviceID: string }>()?.deviceID ?? "";
const groupID = useParams<{ groupID: string }>()?.groupID ?? "";
- const { state } = useLocation();
+ const { state, pathname: locationPathname } = useLocation();
const [{ as, team, user }] = useGlobalState()
// console.log(state)
const [device, setDevice] = useState(state?.device ? Device.create(state.device) : Device.create())
@@ -68,6 +83,63 @@ export default function DevicePage() {
const { token } = useHTTP();
+ const liveContextKeys = useMemo(() => getContextKeys(), [locationPathname]);
+ const liveContextTypes = useMemo(() => getContextTypes(), [locationPathname]);
+ /** Matches getDevicePageData: omit ?as= when first context type is "team". */
+ const liveAs =
+ as && !(liveContextTypes.length > 0 && liveContextTypes[0] === "team")
+ ? as
+ : undefined;
+
+ const liveStatusDeviceIds = useMemo(
+ () => (deviceID ? [deviceID] : []),
+ [deviceID]
+ );
+
+ const handleLiveDeviceStatus = useCallback(
+ (streamDeviceId: string, status: pond.DeviceStatus) => {
+ setDevice((prev) => {
+ if (prev.id().toString() !== streamDeviceId) return prev;
+ const updated = Device.clone(prev);
+ const incomingStatus = pond.DeviceStatus.fromObject(status);
+ const currentStatus = prev.status ?? pond.DeviceStatus.create();
+
+ incomingStatus.plenum = pickNewestReading(currentStatus.plenum, incomingStatus.plenum);
+ incomingStatus.sen5x = pickNewestReading(currentStatus.sen5x, incomingStatus.sen5x);
+ incomingStatus.co = pickNewestReading(currentStatus.co, incomingStatus.co);
+ incomingStatus.co2 = pickNewestReading(currentStatus.co2, incomingStatus.co2);
+ incomingStatus.no2 = pickNewestReading(currentStatus.no2, incomingStatus.no2);
+ incomingStatus.o2 = pickNewestReading(currentStatus.o2, incomingStatus.o2);
+ incomingStatus.lel = pickNewestReading(currentStatus.lel, incomingStatus.lel);
+ incomingStatus.h2s = pickNewestReading(currentStatus.h2s, incomingStatus.h2s);
+
+ const currentLastActive = getTimestampMillis(currentStatus.lastActive);
+ const incomingLastActive = getTimestampMillis(incomingStatus.lastActive);
+ if (
+ currentLastActive !== undefined &&
+ incomingLastActive !== undefined &&
+ incomingLastActive < currentLastActive
+ ) {
+ incomingStatus.lastActive = currentStatus.lastActive;
+ }
+
+ updated.status = incomingStatus;
+ return updated;
+ });
+ },
+ []
+ );
+
+ useDeviceStatusStreams({
+ deviceIds: liveStatusDeviceIds,
+ onStatusUpdate: handleLiveDeviceStatus,
+ token,
+ keys: liveContextKeys,
+ types: liveContextTypes,
+ as: liveAs,
+ enabled: Boolean(deviceID && token),
+ });
+
const loadDevice = () => {
if (loading) return
if (state?.devicePageData) {
@@ -173,7 +245,7 @@ export default function DevicePage() {
// When the backend receives a new reading and updates a component,
// this fires and updates the component in state without a page refresh.
useWebSocket<{ key: string; component: Component } | null>({
- path: `/live/devices/${deviceID}/components`,
+ path: `/v1/live/devices/${deviceID}/components`,
parse: (e) => {
try {
const raw = JSON.parse(e.data);
@@ -192,37 +264,66 @@ export default function DevicePage() {
if (!data) return;
const { key, component } = data;
setComponents((prev) => {
+ const existing = prev.get(key);
+ if (existing && isStaleStatusUpdate(existing.status, component.status)) {
+ return prev;
+ }
const updated = new Map(prev);
updated.set(key, component);
return updated;
});
},
+ keys: liveContextKeys,
+ types: liveContextTypes,
+ as: liveAs,
token,
enabled: !!deviceID,
});
- // --- Real-time device updates (optional) ---
- // Updates device-level info (name, status, lastActive, etc.)
- useWebSocket({
- path: `/live/devices/${deviceID}`,
+ // --- Real-time interaction updates ---
+ // Streams interaction changes for this device, including status changes
+ // when the device accepts pending interaction updates.
+ useWebSocket<{ key: string; interaction: Interaction } | null>({
+ path: `/v1/live/devices/${deviceID}/interactions`,
parse: (e) => {
try {
const raw = JSON.parse(e.data);
- const dev = Device.any(raw);
- if (!dev?.settings) {
- console.warn("[ws] received device without settings:", raw);
+ const interaction = Interaction.any(raw);
+ if (!interaction?.settings) {
+ console.warn("[ws] received interaction without settings:", raw);
return null;
}
- return dev;
+ return { key: interaction.key(), interaction };
} catch (err) {
- console.warn("[ws] failed to parse device:", err);
+ console.warn("[ws] failed to parse interaction:", err);
return null;
}
},
- onMessage: (updatedDevice) => {
- if (!updatedDevice) return;
- setDevice(updatedDevice);
+ onMessage: (data) => {
+ if (!data) return;
+ const { key, interaction } = data;
+ console.log("[ws:interaction] received", key, {
+ synced: interaction.status.synced,
+ lastUpdate: interaction.status.lastUpdate,
+ lastSynced: interaction.status.lastSynced,
+ });
+ setInteractions((prev) => {
+ const index = prev.findIndex((existing) => existing.key() === key);
+ if (index < 0) {
+ return [...prev, interaction];
+ }
+ const existing = prev[index];
+ if (isStaleStatusUpdate(existing.status, interaction.status)) {
+ return prev;
+ }
+ const updated = [...prev];
+ updated[index] = interaction;
+ return updated;
+ });
},
+ keys: liveContextKeys,
+ types: liveContextTypes,
+ as: liveAs,
token,
enabled: !!deviceID,
});
@@ -340,7 +441,7 @@ export default function DevicePage() {
interactions={filteredInteractions}
permissions={permissions}
deviceComponentPreferences={prefsMap.get(c.key())}
- key={i}
+ key={c.key()}
refreshCallback={(updatedComponent?: Component) =>
updatedComponent ? handleComponentChanged(updatedComponent) : loadDevice()
}
@@ -357,7 +458,7 @@ export default function DevicePage() {
interactions={filteredInteractions}
permissions={permissions}
deviceComponentPreferences={prefsMap.get(c.key())}
- key={i}
+ key={c.key()}
refreshCallback={(updatedComponent?: Component) =>
updatedComponent ? handleComponentChanged(updatedComponent) : loadDevice()
}
@@ -569,4 +670,4 @@ export default function DevicePage() {
{componentCards()}
);
-}
\ No newline at end of file
+}
diff --git a/src/pages/DeviceComponent.tsx b/src/pages/DeviceComponent.tsx
index ad92c3a..e6ab9fa 100644
--- a/src/pages/DeviceComponent.tsx
+++ b/src/pages/DeviceComponent.tsx
@@ -4,7 +4,7 @@ import { NextMeasurementChip } from "common/NextMeasurementChip";
import ResponsiveTable, { Column } from "common/ResponsiveTable";
// import { getTableIcons } from "common/ResponsiveTable";
import SmartBreadcrumb from "common/SmartBreadcrumb";
-import StatusChip from "common/StatusChip";
+import PendingChangesChip from "common/PendingChangesChip";
import { GetDefaultDateRange } from "common/time/DateRange";
import ComponentActions from "component/ComponentActions";
import ComponentChart from "component/ComponentChart";
@@ -16,11 +16,14 @@ import {
useComponentAPI,
useDeviceAPI,
useGroupAPI,
+ useHTTP,
useInteractionsAPI,
+ usePendingChanges,
usePrevious,
useSnackbar,
useUserAPI
} from "hooks";
+import { useWebSocket } from "hooks/useWebSocket";
import InteractionChip from "interactions/InteractionChip";
import InteractionSettings from "interactions/InteractionSettings";
import { cloneDeep } from "lodash";
@@ -38,10 +41,12 @@ import {
} from "pbHelpers/DeviceAvailability";
import { getDefaultInteraction } from "pbHelpers/Interaction";
import { pond } from "protobuf-ts/pond";
-import { useGlobalState, useTeamAPI } from "providers";
-import { useCallback, useEffect, useRef, useState } from "react";
+import { useGlobalState } from "providers";
+import { useTeamAPI } from "providers/pond/teamAPI";
+import { useCallback, useEffect, useMemo, useRef, useState } from "react";
import { useParams } from "react-router-dom";
// import { useRouteMatch } from "react-router";
+import { isStaleStatusUpdate } from "utils/syncStatus";
import { or } from "utils/types";
const useStyles = makeStyles((theme: Theme) => {
@@ -141,6 +146,55 @@ export default function DeviceComponent() {
const [deviceComponentPrefs, setDeviceComponentPrefs] = useState<
pond.DeviceComponentPreferences
>();
+ const { token } = useHTTP();
+ const componentPending = usePendingChanges(
+ component.status.synced,
+ !loadingInitial && component.key() !== ""
+ );
+
+ const liveContextKeys = useMemo(() => getContextKeys(), []);
+ const liveContextTypes = useMemo(() => getContextTypes(), []);
+ /** Matches the REST calls: omit ?as= when first context type is "team". */
+ const liveAs =
+ as && !(liveContextTypes.length > 0 && liveContextTypes[0] === "team")
+ ? as
+ : undefined;
+
+ // --- Real-time component updates ---
+ // Streams component changes for this device, including status changes
+ // when the device accepts pending component updates.
+ useWebSocket<{ key: string; component: Component } | null>({
+ path: `/v1/live/devices/${deviceID}/components`,
+ parse: (e) => {
+ try {
+ const raw = JSON.parse(e.data);
+ const comp = Component.any(raw);
+ if (!comp?.settings) {
+ console.warn("[ws] received component without settings:", raw);
+ return null;
+ }
+ return { key: comp.key(), component: comp };
+ } catch (err) {
+ console.warn("[ws] failed to parse component:", err);
+ return null;
+ }
+ },
+ onMessage: (data) => {
+ if (!data || data.key !== componentID) return;
+ setComponent((prev) => {
+ if (prev.key() !== data.key) return prev;
+ if (isStaleStatusUpdate(prev.status, data.component.status)) {
+ return prev;
+ }
+ return data.component;
+ });
+ },
+ keys: liveContextKeys,
+ types: liveContextTypes,
+ as: liveAs,
+ token,
+ enabled: !!deviceID && componentID !== "",
+ });
const setDefaultState = () => {
setDevice(Device.create());
@@ -388,9 +442,12 @@ export default function DeviceComponent() {
alignItems="center"
wrap="nowrap"
className={classes.overviewContainer}>
- {!component.status.synced && (
+ {(componentPending.pending || componentPending.accepted) && (
-
+
)}
diff --git a/src/pages/Devices.tsx b/src/pages/Devices.tsx
index 0a6b9af..54ff584 100644
--- a/src/pages/Devices.tsx
+++ b/src/pages/Devices.tsx
@@ -5,8 +5,9 @@ import { makeStyles } from "@mui/styles";
import ResponsiveTable, { Column } from "common/ResponsiveTable";
import ProvisionDevice from "device/ProvisionDevice";
import { pond } from "protobuf-ts/pond";
-import { useDeviceAPI, useGlobalState, useGroupAPI, useTeamAPI } from "providers";
-import { useHTTP } from "hooks";
+import { useDeviceAPI, useGlobalState, useGroupAPI } from "providers";
+import { useHTTP } from "providers/http";
+import { useTeamAPI } from "providers/pond/teamAPI";
import { useDeviceStatusStreams } from "hooks/useDeviceStatusStreams";
import { useCallback, useEffect, useMemo, useState } from "react";
import PageContainer from "./PageContainer";
@@ -264,10 +265,50 @@ export default function Devices() {
)
}, [])
+ /** Same context chain as deviceAPI.list / GetContext on the backend (path + group tab + ?as=). */
+ const statusStreamKeys = useMemo(() => {
+ if (tab !== "all") {
+ const g = groups[parseInt(tab)]
+ if (g) {
+ const keys = [...getContextKeys()]
+ keys.push(g.id().toString())
+ return keys
+ }
+ }
+ return getContextKeys()
+ }, [tab, groups, location.pathname])
+
+ const statusStreamTypes = useMemo(() => {
+ if (tab !== "all") {
+ const g = groups[parseInt(tab)]
+ if (g) {
+ const types = [...getContextTypes()]
+ types.push("group")
+ return types
+ }
+ }
+ return getContextTypes()
+ }, [tab, groups, location.pathname])
+
+ /** Match Device page / getDevicePageData: omit ?as= when URL context already starts with team. */
+ const statusStreamAs = useMemo(() => {
+ const types =
+ tab !== "all" && groups[parseInt(tab)]
+ ? [...getContextTypes(), "group"]
+ : getContextTypes()
+ if (as && !(types.length > 0 && types[0] === "team")) {
+ return as
+ }
+ return undefined
+ }, [as, tab, groups, location.pathname])
+
useDeviceStatusStreams({
deviceIds,
onStatusUpdate: handleStatusUpdate,
token,
+ keys: statusStreamKeys,
+ types: statusStreamTypes,
+ as: statusStreamAs,
enabled: devices.length > 0 && !!token,
})
@@ -1164,4 +1205,4 @@ export default function Devices() {
/>
)
-}
\ No newline at end of file
+}
diff --git a/src/pages/Field.tsx b/src/pages/Field.tsx
index 15c29db..94159fc 100644
--- a/src/pages/Field.tsx
+++ b/src/pages/Field.tsx
@@ -10,12 +10,12 @@ import { Settings } from "@mui/icons-material";
import { pond } from "protobuf-ts/pond";
import FieldMinimap from "field/Fieldminimap";
import Weather from "weather/weather";
-import TaskViewer from "tasks/TaskViewer";
import HarvestPlanDisplay from "harvestPlan/HarvestPlanDisplay";
import { cloneDeep } from "lodash";
import HarvestPlanTable from "harvestPlan/HarvestPlanTable";
import { makeStyles } from "@mui/styles";
import FieldSettings from "field/FieldSettings";
+import FieldTaskList from "field/FieldTaskList";
const useStyles = makeStyles((theme: Theme) => {
return ({
@@ -185,12 +185,9 @@ export default function FieldPage() {
}
const tasks = () => {
- let taskLoadKeys: string[] = [];
- if (!planLoading) {
- field.key() !== "" && taskLoadKeys.push(field.key());
- //hPlan.key() !== "" && taskLoadKeys.push(hPlan.key());
- }
- return ()
+ return (
+
+ )
}
const desktopView = () => {
diff --git a/src/pages/Gate.tsx b/src/pages/Gate.tsx
index db876e4..c32cb84 100644
--- a/src/pages/Gate.tsx
+++ b/src/pages/Gate.tsx
@@ -3,7 +3,7 @@ import { Gate as IGate } from "models/Gate";
//import { Redirect, useHistory, useRouteMatch } from "react-router";
import React, { useCallback, useEffect, useState } from "react";
import PageContainer from "./PageContainer";
-import { useGlobalState, useGateAPI, useUserAPI } from "providers";
+import { useGlobalState, useGateAPI } from "providers";
import {
Box,
ButtonBase,
@@ -20,7 +20,7 @@ import {
} from "@mui/material";
import { pond } from "protobuf-ts/pond";
import DeviceLinkDrawer from "common/DeviceLinkDrawer";
-import { Component, Device, Scope } from "models";
+import { Component, Device } from "models";
import GateActions from "gate/GateActions";
import GateDevice from "gate/GateDevice";
import ObjectControls from "common/ObjectControls";
@@ -28,7 +28,7 @@ import { Link } from "@mui/icons-material";
import Chat from "chat/Chat";
import PlaneIcon from "products/AviationIcons/PlaneIcon";
import NotesIcon from "@mui/icons-material/Notes";
-import { useMobile, useSnackbar, useThemeType } from "hooks";
+import { useMobile, usePermissionAPI, useSnackbar, useThemeType } from "hooks";
import { clone } from "lodash";
import { useNavigate, useParams } from "react-router-dom";
import { makeStyles } from "@mui/styles";
@@ -90,7 +90,7 @@ export default function Gate(props: Props) {
const gateID = gateKey ?? useParams<{ gateKey: string }>()?.gateKey ?? "";
const classes = useStyles();
const gateAPI = useGateAPI();
- const userAPI = useUserAPI();
+ const permissionAPI = usePermissionAPI();
const [gate, setGate] = useState(IGate.create());
const [devices, setDevices] = useState>(
new Map()
@@ -115,16 +115,10 @@ export default function Gate(props: Props) {
};
useEffect(() => {
- let key = gateID;
- let kind = "gate";
- if (as) {
- key = as;
- kind = "team";
- }
- userAPI.getUser(user.id(), { key: key, kind: kind } as Scope).then(resp => {
- setPermissions(resp.permissions);
- });
- }, [as, gateID, userAPI, user]);
+ permissionAPI.getPermissions(user.id(), [gateID], ["gate"]).then(resp => {
+ setPermissions(pond.EvaluatePermissionsResponse.fromObject(resp.data).permissions)
+ })
+ }, [as, gateID, permissionAPI, user]);
const loadGate = useCallback(() => {
let id = gateID;
@@ -400,7 +394,7 @@ export default function Gate(props: Props) {
Notes
-
+
@@ -465,7 +459,7 @@ export default function Gate(props: Props) {
{/* tab for notes on mobile and the map drawer */}
-
+
{/* drawer is for displaying notes on desktop */}
diff --git a/src/pages/Heater.tsx b/src/pages/Heater.tsx
index 938ec68..582985c 100644
--- a/src/pages/Heater.tsx
+++ b/src/pages/Heater.tsx
@@ -32,7 +32,6 @@ import TemperatureIcon from "component/TemperatureIcon";
import FuelIcon from "products/CommonIcons/fuelIcon";
import moment from "moment";
import Warning from "@mui/icons-material/Warning";
-import { getTemperatureUnit } from "utils";
import ResponsiveDialog from "common/ResponsiveDialog";
import { useParams } from "react-router-dom";
@@ -286,7 +285,7 @@ export default function Heater() {
const tempUnit = () => {
let unit = "°C";
- if (getTemperatureUnit() === pond.TemperatureUnit.TEMPERATURE_UNIT_FAHRENHEIT) {
+ if (user.tempUnit() === pond.TemperatureUnit.TEMPERATURE_UNIT_FAHRENHEIT) {
unit = "°F";
}
return unit;
diff --git a/src/pages/Login.tsx b/src/pages/Login.tsx
index 3dc7d2f..ed56673 100644
--- a/src/pages/Login.tsx
+++ b/src/pages/Login.tsx
@@ -1,10 +1,11 @@
-import { RedirectLoginOptions, useAuth0 } from "@auth0/auth0-react";
+import { RedirectLoginOptions } from "@auth0/auth0-react";
// import { useAuth } from "hooks";
import queryString from "query-string";
import { useEffect } from "react";
import { useLocation } from "react-router";
// import Loading from "./Loading";
import LoadingScreen from "app/LoadingScreen";
+import { useAuthContext } from "providers/authContext";
// interface Props {
// prevPath?: string;
@@ -13,7 +14,7 @@ import LoadingScreen from "app/LoadingScreen";
export default function Login() {
// const { prevPath } = props;
const location = useLocation();
- const { loginWithRedirect } = useAuth0();
+ const { loginWithRedirect } = useAuthContext();
// const setRouteBeforeLogin = useCallback((): Promise => {
// return new Promise(function(resolve) {
diff --git a/src/pages/Logout.tsx b/src/pages/Logout.tsx
index 337c7b6..79e4538 100644
--- a/src/pages/Logout.tsx
+++ b/src/pages/Logout.tsx
@@ -1,9 +1,9 @@
-import { useAuth0 } from "@auth0/auth0-react";
+import { useAuthContext } from "providers/authContext";
import LoadingScreen from "app/LoadingScreen";
import { useEffect } from "react";
export default function Logout() {
- const { logout } = useAuth0();
+ const { logout } = useAuthContext();
useEffect(() => {
logout();
diff --git a/src/pages/PageContainer.tsx b/src/pages/PageContainer.tsx
index 3f0e605..5ff0a9d 100644
--- a/src/pages/PageContainer.tsx
+++ b/src/pages/PageContainer.tsx
@@ -1,4 +1,4 @@
-import { Container, SxProps, Theme } from "@mui/material";
+import { Container, SxProps, Theme, Typography } from "@mui/material";
import { makeStyles } from "@mui/styles";
import classNames from "classnames";
// import { useMobile } from "hooks";
@@ -47,6 +47,23 @@ const useStyles = makeStyles((theme: Theme) => ({
flexDirection: "column",
justifyContent: "center",
alignItems: "center"
+ },
+ buildInfo: {
+ position: "fixed" as const,
+ bottom: 56,
+ left: 8,
+ fontSize: 10,
+ lineHeight: 1.3,
+ opacity: 0.35,
+ color: theme.palette.text.secondary,
+ pointerEvents: "none" as const,
+ zIndex: 1,
+ [theme.breakpoints.up("sm")]: {
+ bottom: 8,
+ },
+ [theme.breakpoints.up("md")]: {
+ left: `calc(${theme.spacing(9)} + 8px)`,
+ }
}
}))
@@ -78,8 +95,13 @@ export const PageContainer: React.FunctionComponent = (props: Props) => {
}}
disableGutters
maxWidth={false}
- children={<>{children}}
- />
+ >
+ {children}
+
+ {new Date(__BUILD_DATE__).toLocaleDateString()}
+ {__GIT_HASH__}
+
+
);
};
diff --git a/src/pages/SignupCallback.tsx b/src/pages/SignupCallback.tsx
index e315eda..a8863f8 100644
--- a/src/pages/SignupCallback.tsx
+++ b/src/pages/SignupCallback.tsx
@@ -7,7 +7,7 @@ import { CheckCircleOutline } from "@mui/icons-material";
import { green } from "@mui/material/colors";
import Tour, { TourStep } from "common/Tour";
import Emoji from "react-emoji-render";
-import { getWhitelabel, IsAdaptiveAgriculture } from "services/whiteLabel";
+import { getWhitelabel, getFeatures } from "services/whiteLabel";
import { pond } from "protobuf-ts/pond";
import { User } from "models";
// import { color } from "framer-motion";
@@ -154,7 +154,7 @@ export default function SignupCallback () {
- {IsAdaptiveAgriculture() && (
+ {getFeatures().grainUnit && (
@@ -247,11 +247,12 @@ export default function TeamPage() {
closeDialogCallback={() => setUserDialog(false)}
refreshCallback={() => {}}
useImitation={false}
+ shareLabel="Add Team Member +"
/>
-
+
@@ -265,7 +266,7 @@ export default function TeamPage() {
Groups
- {((isAg || isStreamline) || user.hasFeature("admin")) &&
+ {(f.bins || user.hasFeature("admin")) &&
<>
diff --git a/src/pbHelpers/Component.ts b/src/pbHelpers/Component.ts
index e809649..b357813 100644
--- a/src/pbHelpers/Component.ts
+++ b/src/pbHelpers/Component.ts
@@ -65,10 +65,20 @@ export function stringToComponentId(componentIDString: string): quack.ComponentI
return componentID;
}
- const componentIDFragments = componentIDString.split("-", 3);
+ //first split on a colon to get the mux line seperated
+ const componentSplit = componentIDString.split(":", 2);
+ if(componentSplit[1]){
+ componentID.muxLine = Number(componentSplit[1])
+ }
+
+ const componentIDFragments = componentIDString.split("-", 4);
let type: string = quack.ComponentType[Number(componentIDFragments[0])];
let addressType: string = quack.AddressType[Number(componentIDFragments[1])];
let address: number = Number(componentIDFragments[2]);
+ if(componentIDFragments[3]){
+ componentID.expansionLine = Number(componentIDFragments[3])
+ }
+
componentID.type = quack.ComponentType[type as keyof typeof quack.ComponentType];
componentID.addressType = quack.AddressType[addressType as keyof typeof quack.AddressType];
componentID.address = address;
diff --git a/src/pbHelpers/ComponentType.tsx b/src/pbHelpers/ComponentType.tsx
index 03be638..860e2aa 100644
--- a/src/pbHelpers/ComponentType.tsx
+++ b/src/pbHelpers/ComponentType.tsx
@@ -39,7 +39,8 @@ import {
Voltage,
VPD,
Weight,
- CapacitorCable
+ CapacitorCable,
+ AnalogPressure
} from "pbHelpers/ComponentTypes";
//import { multilineGrainCableData } from "pbHelpers/ComponentTypes/GrainCable";
//import { multilineCapCableData } from "./ComponentTypes/CapacitorCable";
@@ -96,7 +97,8 @@ const COMPONENT_TYPE_MAP = new Map([
[quack.ComponentType.COMPONENT_TYPE_SEN5X, Sen5x],
[quack.ComponentType.COMPONENT_TYPE_VIBRATION_CHAIN, VibrationCable],
[quack.ComponentType.COMPONENT_TYPE_DRAGER_GAS_DONGLE, dragerGasDongle],
- [quack.ComponentType.COMPONENT_TYPE_AIRFLOW, Airflow]
+ [quack.ComponentType.COMPONENT_TYPE_AIRFLOW, Airflow],
+ [quack.ComponentType.COMPONENT_TYPE_ANALOG_PRESSURE, AnalogPressure]
]);
export interface Subtype {
@@ -236,16 +238,16 @@ export function unitMeasurementSummary(
): Summary {
let vals: string[] = [];
convertedMeasurement.values.forEach(val => {
- vals.push(val + describer.unit());
+ vals.push(val + convertedMeasurement.unit);
});
let v = vals.join(", ");
if (describer.enumerations().length > 0) {
v = describer.enumerations()[parseFloat(vals[0])];
}
return {
- colour: describer.colour(),
- label: describer.label(),
- type: describer.type(),
+ colour: convertedMeasurement.colour,
+ label: convertedMeasurement.label,
+ type: convertedMeasurement.type,
value: v,
error: convertedMeasurement.error
};
@@ -258,6 +260,8 @@ export function unitMeasurementSummaries(
): Summary[] {
let summaries: Summary[] = [];
measurements.measurementsFor.forEach(measurement => {
+ //the only reason the user doesnt need to be passed in here is because it is only used for enumerations,
+ //things like the unit and colour are in the measurement itself at this point
let describer = describeMeasurement(measurement.type, compType, subtype);
summaries.push(unitMeasurementSummary(measurement, describer));
});
@@ -530,6 +534,7 @@ export function simpleLineChartData(
}
});
}
+ // console.log(lineData)
return lineData;
}
@@ -945,6 +950,15 @@ function getOverlayAreas(
return overlayAreas;
}
+
+/**
+ * this function adds lines to victory graphs for interactions on the component
+ * DEPRECATED: we now use Recharts for our graphs
+ * @param componentType
+ * @param subtype
+ * @param interactionCondition
+ * @returns
+ */
function createInteractionLine(
componentType: quack.ComponentType,
subtype: number,
diff --git a/src/pbHelpers/ComponentTypes/AnalogPressure.ts b/src/pbHelpers/ComponentTypes/AnalogPressure.ts
new file mode 100644
index 0000000..7921b38
--- /dev/null
+++ b/src/pbHelpers/ComponentTypes/AnalogPressure.ts
@@ -0,0 +1,88 @@
+import {
+ ComponentTypeExtension,
+ Summary,
+ Subtype,
+ simpleMeasurements,
+ simpleSummaries,
+ unitMeasurementSummaries,
+ AreaChartData,
+ GraphFilters,
+ simpleAreaChartData,
+ LineChartData,
+ simpleLineChartData
+ } from "pbHelpers/ComponentType";
+ import PressureDarkIcon from "assets/components/pressureDark.png";
+ import PressureLightIcon from "assets/components/pressureLight.png";
+ import { quack } from "protobuf-ts/quack";
+ import { describeMeasurement } from "pbHelpers/MeasurementDescriber";
+ import { convertedUnitMeasurement } from "models/UnitMeasurement";
+ import { pond } from "protobuf-ts/pond";
+
+ export function AnalogPressure(subtype: number = 0): ComponentTypeExtension {
+ let pressure = describeMeasurement(
+ quack.MeasurementType.MEASUREMENT_TYPE_PRESSURE,
+ quack.ComponentType.COMPONENT_TYPE_ANALOG_PRESSURE,
+ subtype
+ );
+ let voltage = describeMeasurement(
+ quack.MeasurementType.MEASUREMENT_TYPE_VOLTAGE,
+ quack.ComponentType.COMPONENT_TYPE_ANALOG_PRESSURE,
+ subtype
+ )
+ let addressTypes = [quack.AddressType.ADDRESS_TYPE_I2C];
+ return {
+ type: quack.ComponentType.COMPONENT_TYPE_PRESSURE,
+ subtypes: [
+ {
+ key: quack.AnalogPressureSubtype.ANALOG_PRESSURE_SUBTYPE_PM1618,
+ value: "ANALOG_PRESSURE_SUBTYPE_PM1618",
+ friendlyName: "PM 1618"
+ } as Subtype
+ ],
+ friendlyName: "Analog Pressure",
+ description: "Measures the atmospheric pressure or absolute pressure",
+ isController: false,
+ isSource: true,
+ isCalibratable: true,
+ hasFan: true,
+ addressTypes: addressTypes,
+ interactionResultTypes: [],
+ states: [],
+ measurements: simpleMeasurements(pressure, voltage),
+ measurementSummary: async function(measurement: quack.Measurement): Promise> {
+ return simpleSummaries(measurement, pressure);
+ },
+ unitMeasurementSummary: (
+ measurements: convertedUnitMeasurement,
+ ): Summary[] => {
+ return unitMeasurementSummaries(
+ measurements,
+ quack.ComponentType.COMPONENT_TYPE_PRESSURE,
+ subtype,
+ );
+ },
+ areaChartData: (
+ measurement: pond.UnitMeasurementsForComponent,
+ smoothingAverages?: number,
+ filters?: GraphFilters
+ ): AreaChartData => {
+ return simpleAreaChartData(measurement, smoothingAverages, filters);
+ },
+ lineChartData: (
+ measurement: pond.UnitMeasurementsForComponent,
+ smoothingAverages?: number,
+ filters?: GraphFilters
+ ): LineChartData => {
+ return simpleLineChartData(
+ quack.ComponentType.COMPONENT_TYPE_PRESSURE,
+ measurement,
+ smoothingAverages,
+ filters
+ );
+ },
+ minMeasurementPeriodMs: 1000,
+ icon: (theme?: "light" | "dark"): string | undefined => {
+ return theme === "light" ? PressureDarkIcon : PressureLightIcon;
+ }
+ };
+ }
\ No newline at end of file
diff --git a/src/pbHelpers/ComponentTypes/index.ts b/src/pbHelpers/ComponentTypes/index.ts
index 349bbbe..39b1560 100644
--- a/src/pbHelpers/ComponentTypes/index.ts
+++ b/src/pbHelpers/ComponentTypes/index.ts
@@ -29,3 +29,4 @@ export * from "./Voltage";
export * from "./VPD";
export * from "./Weight";
export * from "./CapacitorCable";
+export * from "./AnalogPressure";
diff --git a/src/pbHelpers/DeviceAvailability.ts b/src/pbHelpers/DeviceAvailability.ts
index 972c2e2..da39022 100644
--- a/src/pbHelpers/DeviceAvailability.ts
+++ b/src/pbHelpers/DeviceAvailability.ts
@@ -64,7 +64,8 @@ const DefaultAvailability: DeviceAvailabilityMap = new Map;
const oldFirmwareIcon = ;
const currentFirmwareIcon = ;
+ const unknownFirmwareIcon = ;
let helper = {} as FirmwareVersionHelper;
if (!version || version === "") {
helper.description = "Unknown version";
helper.icon = oldFirmwareIcon;
helper.tooltip = "We don't know what version your device is, it may behave unexpectedly";
+ helper.colour = oldFirmwareColour;
+ } else if (version.startsWith("!")) {
+ const cleanVersion = version.substring(1);
+ helper.description = cleanVersion;
+ helper.icon = unknownFirmwareIcon;
+ helper.tooltip = "Firmware " + cleanVersion + " was reported by the device but is missing from the firmware list";
+ helper.colour = unknownFirmwareColour;
} else if (available !== "" && version !== available) {
helper.description = version;
helper.icon = oldFirmwareIcon;
helper.tooltip =
"A firmware upgrade is available, some features may be disabled for out-of-date devices";
+ helper.colour = oldFirmwareColour;
} else if (available === "") {
helper.description = version;
helper.icon = firmwareIcon;
helper.tooltip = "Running version " + version;
+ helper.colour = "";
} else {
helper.description = version;
helper.icon = currentFirmwareIcon;
helper.tooltip = "Your device is running the latest firmware";
+ helper.colour = currentFirmwareColour;
}
return helper;
}
diff --git a/src/pbHelpers/Interaction.ts b/src/pbHelpers/Interaction.ts
index 5b91d00..f48bd73 100644
--- a/src/pbHelpers/Interaction.ts
+++ b/src/pbHelpers/Interaction.ts
@@ -1,4 +1,4 @@
-import { Interaction, Component } from "models";
+import { Interaction, Component, User } from "models";
import { pond } from "protobuf-ts/pond";
import { quack } from "protobuf-ts/quack";
import { or, notNull } from "utils/types";
@@ -172,7 +172,8 @@ export const interactionResultText = (interaction: Interaction, sink?: Component
export const interactionConditionText = (
source: Component | undefined,
condition: pond.IInteractionCondition,
- and: boolean
+ and: boolean,
+ user?: User
) => {
let comparison = "is exactly";
switch (condition.comparison) {
@@ -189,7 +190,7 @@ export const interactionConditionText = (
if (!condition.measurementType) return "Unknown " + comparison + " " + condition.value;
let sourceType = source && source.settings.type;
let sourceSubtype = source && source.settings.subtype;
- let measurement = describeMeasurement(condition.measurementType, sourceType, sourceSubtype);
+ let measurement = describeMeasurement(condition.measurementType, sourceType, sourceSubtype, undefined, user);
return (
(and ? "and " : "") +
measurement.label() +
diff --git a/src/pbHelpers/MeasurementDescriber.ts b/src/pbHelpers/MeasurementDescriber.ts
index 67a5b38..ccc50a7 100644
--- a/src/pbHelpers/MeasurementDescriber.ts
+++ b/src/pbHelpers/MeasurementDescriber.ts
@@ -13,12 +13,13 @@ import {
yellow
} from "@mui/material/colors";
import { GraphType } from "common/Graph";
+import { User } from "models";
import { IsCardController } from "products/DeviceProduct";
import { pond } from "protobuf-ts/pond";
import { quack } from "protobuf-ts/quack";
import { getTextSecondary } from "theme/text";
// import { getTextSecondary } from "theme";
-import { getDistanceUnit, getPressureUnit, getTemperatureUnit, roundTo } from "utils";
+import { roundTo } from "utils";
import { extract } from "utils/types";
interface Enumeration {
@@ -64,7 +65,8 @@ export class MeasurementDescriber {
measurementType: quack.MeasurementType,
componentType: quack.ComponentType,
componentSubtype: number,
- product?: pond.DeviceProduct
+ product?: pond.DeviceProduct,
+ user?: User
) {
this.measurementType = measurementType;
this.details = {
@@ -87,7 +89,7 @@ export class MeasurementDescriber {
case quack.MeasurementType.MEASUREMENT_TYPE_INVALID:
break;
case quack.MeasurementType.MEASUREMENT_TYPE_TEMPERATURE:
- let temperatureUnit = getTemperatureUnit();
+ let temperatureUnit = user?.tempUnit() ?? pond.TemperatureUnit.TEMPERATURE_UNIT_CELSIUS;
let isFahrenheit = temperatureUnit === pond.TemperatureUnit.TEMPERATURE_UNIT_FAHRENHEIT;
this.details.label = "Temperature";
this.details.unit = isFahrenheit ? "°F" : "°C";
@@ -172,10 +174,9 @@ export class MeasurementDescriber {
this.details.path = "power.inputVoltageTimes10";
this.details.decimals = 1;
}
- if (componentType === quack.ComponentType.COMPONENT_TYPE_DRAGER_GAS_DONGLE) {
+ if (componentType === quack.ComponentType.COMPONENT_TYPE_DRAGER_GAS_DONGLE || componentType === quack.ComponentType.COMPONENT_TYPE_ANALOG_PRESSURE) {
this.details.unit = "mV";
this.details.graph = GraphType.MULTILINE;
- this.details.unit = "mV";
this.details.decimals = 0
// this.details.nodeDetails = {
// colours: ["white", "black", "red", "blue"],
@@ -233,7 +234,8 @@ export class MeasurementDescriber {
}
break;
case quack.MeasurementType.MEASUREMENT_TYPE_PRESSURE:
- let pressureUnit = getPressureUnit();
+ let pressureUnit =
+ user?.pressureUnit() ?? pond.PressureUnit.PRESSURE_UNIT_INCHES_OF_WATER;
let isIWG = pressureUnit === pond.PressureUnit.PRESSURE_UNIT_INCHES_OF_WATER;
this.details.label = "Pressure";
this.details.unit = isIWG ? "iwg" : "kPa";
@@ -437,7 +439,8 @@ export class MeasurementDescriber {
this.details.max = 100000;
break;
case quack.MeasurementType.MEASUREMENT_TYPE_DISTANCE_CM:
- let distanceUnit = getDistanceUnit();
+ let distanceUnit =
+ user?.distanceUnit() ?? pond.DistanceUnit.DISTANCE_UNIT_FEET;
this.details.label = "Distance";
this.details.unit = "cm";
if (distanceUnit === pond.DistanceUnit.DISTANCE_UNIT_FEET) {
@@ -451,7 +454,8 @@ export class MeasurementDescriber {
this.details.max = 100000;
break;
case quack.MeasurementType.MEASUREMENT_TYPE_SPEED:
- let speedUnit = getDistanceUnit()
+ let speedUnit =
+ user?.distanceUnit() ?? pond.DistanceUnit.DISTANCE_UNIT_FEET;
this.details.label = "Speed";
this.details.unit = speedUnit === pond.DistanceUnit.DISTANCE_UNIT_METERS ? "m/s" : "ft/m"; //yes this is meters per second and feet per minute
this.details.colour = green["500"];
@@ -689,11 +693,12 @@ export function describeMeasurement(
componentType: quack.ComponentType | null | undefined = quack.ComponentType
.COMPONENT_TYPE_INVALID,
componentSubtype: number = 0,
- product?: pond.DeviceProduct
+ product?: pond.DeviceProduct,
+ user?: User
): MeasurementDescriber {
measurementType = measurementType
? measurementType
: quack.MeasurementType.MEASUREMENT_TYPE_INVALID;
componentType = componentType ? componentType : quack.ComponentType.COMPONENT_TYPE_INVALID;
- return new MeasurementDescriber(measurementType, componentType, componentSubtype, product);
+ return new MeasurementDescriber(measurementType, componentType, componentSubtype, product, user);
}
diff --git a/src/pbHelpers/Status.tsx b/src/pbHelpers/Status.tsx
deleted file mode 100644
index 54d6f70..0000000
--- a/src/pbHelpers/Status.tsx
+++ /dev/null
@@ -1,67 +0,0 @@
-import { cyan } from "@mui/material/colors";
-import AcceptedIcon from "@mui/icons-material/CloudDone";
-import PendingIcon from "@mui/icons-material/CloudQueueTwoTone";
-import RejectedIcon from "@mui/icons-material/SmsFailed";
-
-export interface StatusHelper {
- description: string;
- icon: any;
-}
-
-const Unknown: StatusHelper = {
- description: "Status unknown",
- icon: null
-};
-
-const Pending: StatusHelper = {
- description: "Pending changes",
- icon:
-};
-
-const Stale: StatusHelper = {
- description: "Stale update",
- icon: null
-};
-
-const Accepted: StatusHelper = {
- description: "Settings synced",
- icon:
-};
-
-const Rejected: StatusHelper = {
- description: "Update failed",
- icon:
-};
-
-const Received: StatusHelper = {
- description: "Settings synced",
- icon:
-};
-
-const STATUS_MAP = new Map([
- ["pending", Pending],
- ["stale", Stale],
- ["accepted", Accepted],
- ["rejected", Rejected],
- ["received", Received]
-]);
-
-export function getStatusHelper(status: string): StatusHelper {
- const statuses = Array.from(STATUS_MAP.keys());
- for (var i = 0; i < statuses.length; i++) {
- let key = statuses[i];
- if (status === key) {
- return STATUS_MAP.get(key) as StatusHelper;
- }
- }
-
- return Unknown;
-}
-
-export function getStatusDescription(status: string): string {
- return getStatusHelper(status).description;
-}
-
-export function getStatusIcon(status: string): any {
- return getStatusHelper(status).icon;
-}
diff --git a/src/products/MiVent/MiVentAvailability.ts b/src/products/MiVent/MiVentAvailability.ts
index 0108806..87d0db2 100644
--- a/src/products/MiVent/MiVentAvailability.ts
+++ b/src/products/MiVent/MiVentAvailability.ts
@@ -10,6 +10,7 @@ const MiVentV1Pins: ConfigurablePin[] = [
{ address: 1024, label: "C2" }
];
+//no longer in development so if you are adding new component types DO NOT add the I2C address here because the firmware of the device will not support it
export const MiVentV1Availability: DeviceAvailabilityMap = new Map<
quack.AddressType,
DevicePositions
@@ -53,7 +54,8 @@ export const MiVentV2Availability: DeviceAvailabilityMap = new Map<
[quack.ComponentType.COMPONENT_TYPE_DHT, [0x40]],
[quack.ComponentType.COMPONENT_TYPE_SEN5X, [0x69]],
[quack.ComponentType.COMPONENT_TYPE_AIRFLOW, [0x6c]],
- [quack.ComponentType.COMPONENT_TYPE_DRAGER_GAS_DONGLE, [0x6d]]
+ [quack.ComponentType.COMPONENT_TYPE_DRAGER_GAS_DONGLE, [0x6d]],
+ [quack.ComponentType.COMPONENT_TYPE_ANALOG_PRESSURE, [0x6e]]
])
],
diff --git a/src/providers/LoginButton.tsx b/src/providers/LoginButton.tsx
index c8f9aac..e9e04a8 100644
--- a/src/providers/LoginButton.tsx
+++ b/src/providers/LoginButton.tsx
@@ -1,7 +1,7 @@
-import { useAuth0 } from '@auth0/auth0-react';
+import { useAuthContext } from './authContext';
const LoginButton = () => {
- const { loginWithRedirect } = useAuth0();
+ const { loginWithRedirect } = useAuthContext();
return (
-
+ {/*
setMenuAnchorEl(event.currentTarget)}>
+ */}
+
+ {
+ props.reLoad()
+ }}
+ keys={props.keys}
+ types={props.types}
+ />
- {taskActions()}
+ {/* {taskActions()} */}
);
}
diff --git a/src/tasks/TaskDrawer.tsx b/src/tasks/TaskDrawer.tsx
index 46ffd3a..0eade2d 100644
--- a/src/tasks/TaskDrawer.tsx
+++ b/src/tasks/TaskDrawer.tsx
@@ -22,17 +22,21 @@ import NotesIcon from "@mui/icons-material/Notes";
import DeleteIcon from "@mui/icons-material/Delete";
import Chat from "chat/Chat";
import { pond } from "protobuf-ts/pond";
-import { useMobile, useUserAPI } from "hooks";
+import { useMobile, usePermissionAPI, useUserAPI } from "hooks";
import { getThemeType } from "theme";
import { makeStyles } from "@mui/styles";
+import ObjectTeamsIcon from "@mui/icons-material/SupervisedUserCircle";
+import TaskActions from "./taskActions";
+import { useGlobalState } from "providers";
interface Props {
task: Task;
open: boolean;
- closeCallback: () => void;
- editTask: (task: Task) => void;
+ closeCallback: (refresh: boolean) => void;
deleteTask: (task: Task) => void;
completeTask: (task: Task) => void;
+ keys: string[]
+ types: string[]
}
// interface TabPanelProps {
@@ -103,17 +107,23 @@ export default function TaskDrawer(props: Props) {
"Nov",
"Dec"
];
- const { task, open, closeCallback, completeTask, deleteTask, editTask } = props;
+ const { task, open, closeCallback, completeTask, deleteTask } = props;
const [month, setMonth] = useState(0);
const [day, setDay] = useState(0);
- const [menuAnchorEl, setMenuAnchorEl] = useState(null);
+ const [permissions, setPermissions] = useState([])
+ const [{user}] = useGlobalState();
+ // const [menuAnchorEl, setMenuAnchorEl] = useState(null);
const [openNote, setOpenNote] = useState(false);
const isMobile = useMobile();
const classes = useStyles();
const userAPI = useUserAPI();
+ const permissionAPI = usePermissionAPI();
const [worker, setWorker] = useState();
useEffect(() => {
+ permissionAPI.getPermissions(user.id(), props.keys, props.types).then(resp => {
+ setPermissions(pond.EvaluatePermissionsResponse.fromObject(resp.data).permissions)
+ })
if (task.start()) {
let date = new Date(task.start());
setMonth(date.getUTCMonth());
@@ -122,40 +132,7 @@ export default function TaskDrawer(props: Props) {
userAPI.getProfile(task.worker()).then(resp => {
setWorker(resp);
});
- }, [task, userAPI]);
-
- const taskActions = () => {
- return (
-
- );
- };
+ }, [user, task, userAPI, permissionAPI]);
const bodyButtons = () => {
return (
@@ -175,11 +152,22 @@ export default function TaskDrawer(props: Props) {
- setMenuAnchorEl(event.currentTarget)}>
-
+ */}
+ completeTask(t)}
+ permissions={permissions}
+ task={task}
+ removeTask={deleteTask}
+ refreshCallback={() => {
+ closeCallback(true)
+ }}
+ keys={props.keys}
+ types={props.types}
+ />
@@ -194,7 +182,7 @@ export default function TaskDrawer(props: Props) {
onClose={() => setOpenNote(false)}>
Notes
-
+
);
@@ -303,7 +291,7 @@ export default function TaskDrawer(props: Props) {
{taskTime()}
{assignees()}
- {taskActions()}
+ {/* {taskActions()} */}
{noteDrawer()}
);
@@ -316,7 +304,9 @@ export default function TaskDrawer(props: Props) {
displayNext={() => {}}
displayPrev={() => {}}
drawerBody={drawerBody()}
- onClose={closeCallback}
+ onClose={() => {
+ closeCallback(false)}
+ }
open={open}
/>
);
diff --git a/src/tasks/TaskList.tsx b/src/tasks/TaskList.tsx
index 6803831..f94f838 100644
--- a/src/tasks/TaskList.tsx
+++ b/src/tasks/TaskList.tsx
@@ -12,7 +12,6 @@ import ButtonGroup from "common/ButtonGroup";
interface Props {
tasks: Task[];
- editTaskMethod: (task: Task) => void;
markComplete: (task: Task) => void;
deleteTask: (task: Task) => void;
openTask: (taskId: string) => void;
@@ -20,18 +19,21 @@ interface Props {
listHeight?: string | number;
label?: string;
dateToView?: Date;
+ keys: string[]
+ types: string[]
}
export default function TaskList(props: Props) {
const {
- editTaskMethod,
markComplete,
deleteTask,
openTask,
reLoad,
listHeight,
label,
- dateToView
+ dateToView,
+ keys,
+ types
} = props;
const [tasks, setTasks] = useState(props.tasks);
const [incomplete, setIncomplete] = useState([]);
@@ -70,64 +72,16 @@ export default function TaskList(props: Props) {
setComplete(complete);
}, [tasks, dateToView]);
- // const StyledToggleButtonGroup = withStyles(theme => ({
- // grouped: {
- // margin: theme.spacing(-0.5),
- // border: "none",
- // padding: theme.spacing(1),
- // "&:not(:first-child):not(:last-child)": {
- // borderRadius: 24,
- // marginRight: theme.spacing(0.5),
- // marginLeft: theme.spacing(0.5)
- // },
- // "&:first-child": {
- // borderRadius: 24,
- // marginLeft: theme.spacing(0.25)
- // },
- // "&:last-child": {
- // borderRadius: 24,
- // marginRight: theme.spacing(0.25)
- // }
- // },
- // root: {
- // backgroundColor: darken(
- // theme.palette.background.paper,
- // getThemeType() === "light" ? 0.05 : 0.25
- // ),
- // borderRadius: 24,
- // content: "border-box"
- // }
- // }))(ToggleButtonGroup);
-
- // const StyledToggle = withStyles({
- // root: {
- // backgroundColor: "transparent",
- // overflow: "visible",
- // content: "content-box",
- // "&$selected": {
- // backgroundColor: "gold",
- // color: "black",
- // borderRadius: 24,
- // fontWeight: "bold"
- // },
- // "&$selected:hover": {
- // backgroundColor: "rgb(255, 255, 0)",
- // color: "black",
- // borderRadius: 24
- // }
- // },
- // selected: {}
- // })(ToggleButton);
-
const incompleteTasks = incomplete.map((task, index) => (
markComplete(task)}
deleteTask={(task: Task) => deleteTask(task)}
reLoad={reLoad}
openTaskPage={(taskId: string) => openTask(taskId)}
+ keys={keys}
+ types={types}
/>
));
@@ -136,11 +90,12 @@ export default function TaskList(props: Props) {
markComplete(task)}
deleteTask={(task: Task) => deleteTask(task)}
reLoad={reLoad}
openTaskPage={(taskId: string) => openTask(taskId)}
+ keys={keys}
+ types={types}
/>
));
@@ -162,20 +117,6 @@ export default function TaskList(props: Props) {
}
]}
/>
- {/*
- setViewing("upcoming")}>
- Upcoming
-
- setViewing("complete")}
- value={"complete"}
- aria-label="complete">
- Complete
-
- */}
{location !== "/tasks" && (
diff --git a/src/tasks/TaskSettings.tsx b/src/tasks/TaskSettings.tsx
index 9f92548..c2b92ee 100644
--- a/src/tasks/TaskSettings.tsx
+++ b/src/tasks/TaskSettings.tsx
@@ -2,10 +2,12 @@ import {
Avatar,
Box,
Button,
+ Checkbox,
Dialog,
DialogActions,
DialogContent,
DialogTitle,
+ FormControlLabel,
Grid2 as Grid,
InputAdornment,
MenuItem,
@@ -15,23 +17,24 @@ import moment from "moment";
import React, { useState } from "react";
import { pond } from "protobuf-ts/pond";
import { useGlobalState, useTaskAPI } from "providers";
-import { useSnackbar, useUserAPI } from "hooks";
+import { usePermissionAPI, useSnackbar, useUserAPI } from "hooks";
import { useEffect } from "react";
-import { Task, teamScope, User } from "models";
+import { Task, teamScope, User, userScope } from "models";
import ColourPicker from "common/ColourPicker";
import ResponsiveDialog from "common/ResponsiveDialog";
interface Props {
open: boolean;
onClose: (reLoad?: boolean) => void;
- markComplete?: boolean;
startDate?: any;
task?: Task;
- objectKey?: string;
+ objectKey?: string; //deprecated, with the new permission structure keys and types will be what determine what a task is connected to
type?: string;
hasCost?: boolean;
costTitle?: string;
secondaryCostTitle?: string;
+ keys?: string[]
+ types?: string[]
}
export default function TaskSettings(props: Props) {
@@ -45,13 +48,15 @@ export default function TaskSettings(props: Props) {
const [worker, setWorker] = useState(user.id());
const [colour, setColour] = useState("");
const taskAPI = useTaskAPI();
+ const userAPI = useUserAPI();
+ const permissionAPI = usePermissionAPI();
const { openSnack } = useSnackbar();
const [cost, setCost] = useState("");
const [secondaryCost, setSecondaryCost] = useState("");
const [seedCost, setSeedCost] = useState("");
const [poundPerAcre, setPoundPerAcre] = useState(0);
- const userAPI = useUserAPI();
const [users, setUsers] = useState([]);
+ const [shareToCreator, setShareToCreator] = useState(true)
useEffect(() => {
if (props.task) {
@@ -104,7 +109,7 @@ export default function TaskSettings(props: Props) {
startTime: startTime,
end: endDate,
endTime: endTime,
- objectKey: props.objectKey ? props.objectKey : user.id(),
+ objectKey: props.objectKey ? props.objectKey : user.id(), //deprecated
description: taskDescription,
worker: worker,
complete: false,
@@ -120,8 +125,24 @@ export default function TaskSettings(props: Props) {
returnTask.settings = taskSettings;
taskAPI
- .addTask(taskSettings, as)
+ .addTask(taskSettings, as, props.keys, props.types)
.then(resp => {
+ console.log(resp)
+ if(shareToCreator && resp.data.task){
+ let parentScope = userScope(user.id())
+ if(as){
+ parentScope = teamScope(as)
+ }
+
+ permissionAPI.shareObjectByKey(
+ {key: resp.data.task, kind: "task"},
+ parentScope.key,
+ parentScope.kind,
+ [pond.Permission.PERMISSION_READ, pond.Permission.PERMISSION_WRITE, pond.Permission.PERMISSION_USERS, pond.Permission.PERMISSION_SHARE],
+ props.keys,
+ props.types
+ )
+ }
props.onClose(true);
})
.catch(err => {
@@ -318,6 +339,18 @@ export default function TaskSettings(props: Props) {
value={endTime}
onChange={e => setEndTime(e.target.value)}
/>
+ {props.keys && props.types && !props.task &&
+ setShareToCreator(e.target.checked)}
+ color="primary"
+ />
+ }
+ label={"Share task with " + (as ? "team" : "user")}
+ />
+ }
Colour
setColour(color)} />
diff --git a/src/tasks/TaskViewer.tsx b/src/tasks/TaskViewer.tsx
index 12e82d7..b283c5f 100644
--- a/src/tasks/TaskViewer.tsx
+++ b/src/tasks/TaskViewer.tsx
@@ -26,10 +26,12 @@ import moment from "moment";
import { makeStyles } from "@mui/styles";
interface ViewProps {
- objectKey?: string; //only used to save it for the object
+ // objectKey?: string; //only used to save it for the object --Deprecated with new permission structure--
+ keys?: string[]//the keys and types are used to give th object permissions to the task, that is how they will be linked now
+ types?: string[]
label?: string;
drawerView?: boolean;
- loadKeys?: string[]; //if you want to load tasks for a specific object(s)
+ // loadKeys?: string[]; //if you want to load tasks for a specific object(s) --Deprecated with new permission structure-- it should use the keys and types now
overlayButton?: boolean;
}
@@ -87,9 +89,16 @@ const useStyles = makeStyles((theme: Theme) => {
});
export default function TaskViewer(props: ViewProps) {
- const { objectKey, label, drawerView, loadKeys, overlayButton } = props;
+ const {
+ //objectKey,
+ label,
+ drawerView,
+ //loadKeys,
+ keys,
+ types,
+ overlayButton
+ } = props;
const [{ user, as }] = useGlobalState();
- //const [{ as }] = useGlobalState();
const taskAPI = useTaskAPI();
const { openSnack } = useSnackbar();
const [tasks, setTasks] = useState>(new Map([]));
@@ -137,42 +146,12 @@ export default function TaskViewer(props: ViewProps) {
}
};
- const setTaskToEdit = (task: Task) => {
- setEditTask(task);
- openDialog();
- };
-
-
- const loadMultitask = useCallback(() => {
- if (!loadKeys) return;
- if (loadKeys.length > 0) {
- let temp = new Map();
- setLoaded(false);
- taskAPI
- .getMultiTasks(loadKeys, as)
- .then(resp => {
- if(resp.data.tasks){
- resp.data.tasks.forEach(task => {
- if (task.settings) {
- temp.set(task.key, Task.any(task));
- }
- });
- }
- setTasks(temp);
- setLoaded(true);
- })
- .catch(err => {
- openSnack("Failed to load");
- });
- }
- }, [loadKeys, openSnack, taskAPI, as]);
-
//loads tasks from the backend database
const loadTasks = useCallback(() => {
if (!user.id()) return;
let temp = new Map();
taskAPI
- .listTasks(50, 0, "asc", "start", undefined, undefined, as, prevMonth, nextMonth)
+ .listTasks(50, 0, "asc", "start", undefined, undefined, as, prevMonth, nextMonth, keys, types)
.then(resp => {
if(resp.data.tasks){
resp.data.tasks.forEach(task => {
@@ -185,20 +164,20 @@ export default function TaskViewer(props: ViewProps) {
setLoaded(true);
})
.catch(err => {
- console.log(err)
openSnack("Failed to load tasks");
});
- }, [taskAPI, as, user, openSnack, nextMonth, prevMonth]);
+ }, [taskAPI, as, user, openSnack, nextMonth, prevMonth, keys, types]);
useEffect(() => {
- if (drawerView) {
- setTasks(new Map());
- setValue(1);
- loadMultitask();
- } else {
- loadTasks();
- }
- }, [loadTasks, loadMultitask, as, drawerView]);
+ // if (drawerView) {
+ // setTasks(new Map());
+ // setValue(1);
+ // loadMultitask();
+ // } else {
+ // loadTasks();
+ // }
+ loadTasks()
+ }, [loadTasks, as, drawerView]);
const markComplete = (task: Task) => {
task.settings.complete = !task.settings.complete;
@@ -314,12 +293,13 @@ export default function TaskViewer(props: ViewProps) {
loadTasks()}
dateToView={drawerView ? undefined : currentDate}
openTask={(taskId: string) => openSelectedTask(taskId)}
+ keys={[]}
+ types={[]}
/>
loadTasks()}
listHeight={"40vh"}
dateToView={currentDate}
openTask={(taskId: string) => openSelectedTask(taskId)}
+ keys={[]}
+ types={[]}
/>
@@ -423,16 +404,11 @@ export default function TaskViewer(props: ViewProps) {
{
- if (r) {
- if (drawerView) {
- loadMultitask();
- } else {
- loadTasks();
- }
- }
+ loadTasks();
setEditTask(undefined);
setNewTaskDialog(false);
}}
@@ -441,10 +417,14 @@ export default function TaskViewer(props: ViewProps) {
setOpenDrawer(false)}
+ closeCallback={() => {
+ setOpenDrawer(false)
+ loadTasks()
+ }}
completeTask={markComplete}
deleteTask={deleteTask}
- editTask={setTaskToEdit}
+ keys={keys ?? []}
+ types={types ?? []}
/>
}
diff --git a/src/tasks/taskActions.tsx b/src/tasks/taskActions.tsx
new file mode 100644
index 0000000..116cdec
--- /dev/null
+++ b/src/tasks/taskActions.tsx
@@ -0,0 +1,237 @@
+import {
+ IconButton,
+ ListItemIcon,
+ ListItemText,
+ Menu,
+ MenuItem,
+ Theme
+} from "@mui/material";
+import { blue } from "@mui/material/colors";
+import MoreIcon from "@mui/icons-material/MoreVert";
+import ObjectTeamsIcon from "@mui/icons-material/SupervisedUserCircle";
+import { pond } from "protobuf-ts/pond";
+import React, { useState } from "react";
+import { isOffline } from "utils/environment";
+import ObjectTeams from "teams/ObjectTeams";
+import { Task, taskScope } from "models";
+import { makeStyles } from "@mui/styles";
+import { Done, Edit } from "@mui/icons-material";
+import DeleteIcon from "@mui/icons-material/Delete";
+import TaskSettings from "./TaskSettings";
+
+const useStyles = makeStyles((theme: Theme) => ({
+ shareIcon: {
+ color: blue["500"],
+ "&:hover": {
+ color: blue["600"]
+ }
+ },
+ removeIcon: {
+ color: "var(--status-alert)"
+ },
+ red: {
+ color: "var(--status-alert)"
+ }
+}));
+
+interface Props {
+ task: Task;
+ permissions: pond.Permission[];
+ keys: string[]
+ types: string[]
+ refreshCallback: () => void;
+ markComplete: (task: Task) => void;
+ removeTask: (task: Task) => void;
+}
+
+interface OpenState {
+ // share: boolean;
+ // users: boolean;
+ teams: boolean;
+ settings: boolean;
+ // removeSelf: boolean;
+ delete: boolean
+}
+
+export default function TaskActions(props: Props) {
+ const classes = useStyles();
+ const { task, permissions, refreshCallback, keys, types } = props;
+ const [anchorEl, setAnchorEl] = React.useState(null);
+ const [openState, setOpenState] = useState({
+ // share: false,
+ // users: false,
+ teams: false,
+ settings: false,
+ // removeSelf: false
+ delete: false
+ });
+
+ const groupMenu = () => {
+ // const canShare = permissions.includes(pond.Permission.PERMISSION_SHARE);
+ const canEdit = permissions.includes(pond.Permission.PERMISSION_WRITE);
+ const canManageUsers = permissions.includes(pond.Permission.PERMISSION_USERS);
+ return (
+
+ );
+ };
+
+ const dialogs = () => {
+ const key = task.key;
+ // const label = task.title();
+ return (
+
+ {/* setOpenState({ ...openState, share: false })}
+ /> */}
+ {/* setOpenState({ ...openState, users: false })}
+ refreshCallback={refreshCallback}
+ /> */}
+ {/* setOpenState({ ...openState, removeSelf: false })}
+ /> */}
+ setOpenState({ ...openState, teams: false })}
+ keys={keys}
+ types={types}
+ />
+ {
+ setOpenState({ ...openState, settings: false})
+ if(r){
+ refreshCallback()
+ }
+ }}
+ />
+
+ );
+ };
+
+ return (
+
+ ) => setAnchorEl(event.currentTarget)}>
+
+
+ {groupMenu()}
+ {dialogs()}
+
+ );
+}
\ No newline at end of file
diff --git a/src/teams/ObjectTeams.tsx b/src/teams/ObjectTeams.tsx
index d327291..4221939 100644
--- a/src/teams/ObjectTeams.tsx
+++ b/src/teams/ObjectTeams.tsx
@@ -41,6 +41,8 @@ import { useNavigate } from "react-router-dom";
import { makeStyles } from "@mui/styles";
import { Share, RemoveCircle as RemoveUserIcon } from "@mui/icons-material";
import CancelSubmit from "common/CancelSubmit";
+import { permissionToString } from "pbHelpers/Permission";
+import { PermissionChanges } from "providers/pond/permissionAPI";
const useStyles = makeStyles((theme: Theme) => {
const avatarBG = theme.palette.secondary["700" as keyof PaletteColor];
@@ -100,6 +102,9 @@ interface Props {
userCallback?: (users?: User[] | Team[] | undefined) => void;
dialog?: string;
cardMode?: boolean;
+ keys?: string[];
+ types?: string[];
+ shareLabel?: string; // a custom label to pass in that will replace the share icon
}
export default function ObjectTeams(props: Props) {
@@ -108,7 +113,7 @@ export default function ObjectTeams(props: Props) {
const theme = useTheme();
const permissionAPI = usePermissionAPI();
const [{ user, as }] = useGlobalState();
- const canProvision = user.allowedTo("provision");
+ const isAdmin = user.hasAdmin();
const teamAPI = useTeamAPI();
const { error, success, warning } = useSnackbar();
const {
@@ -120,7 +125,10 @@ export default function ObjectTeams(props: Props) {
refreshCallback,
userCallback,
dialog,
- cardMode
+ cardMode,
+ keys,
+ types,
+ shareLabel
} = props;
const prevPermissions = usePrevious(permissions);
const prevIsDialogOpen = usePrevious(isDialogOpen);
@@ -146,7 +154,7 @@ export default function ObjectTeams(props: Props) {
const load = useCallback(() => {
setIsLoading(true);
teamAPI
- .listObjectTeams(scope, as)
+ .listObjectTeams(scope, as, keys, types)
.then((response: any) => {
let rTeams: Team[] = [];
or(response.data, { teams: [] }).teams.forEach((user: any) => {
@@ -184,7 +192,21 @@ export default function ObjectTeams(props: Props) {
};
const submit = () => {
- permissionAPI
+ if(keys && types){
+ let changes: PermissionChanges[] = []
+ users.forEach((user: Team) => {
+ changes.push({
+ key: user.id(),
+ permissions: user.permissions.map(permission => permissionToString(permission))
+ });
+ });
+ permissionAPI.updateObjectPermissions(scope.key, scope.kind, "team", changes, keys, types).then(resp => {
+ console.log("no error")
+ }).catch(err => {
+ console.log("error")
+ })
+ }else{
+ permissionAPI
.updatePermissions(scope, users)
.then((_response: any) => {
success("Users were sucessfully updated for " + label);
@@ -197,10 +219,13 @@ export default function ObjectTeams(props: Props) {
})
.catch((err: any) => {
err.response.data.error
- ? warning(err.response.data.error)
- : error("Error occured when updating users for " + label);
+ ? warning(err.response.data.error)
+ : error("Error occured when updating users for " + label);
close();
});
+
+ }
+
};
const changeUserPermissions = (user: pond.ITeam) => (event: any) => {
@@ -299,12 +324,18 @@ export default function ObjectTeams(props: Props) {
{canShare && (
-
-
-
+ {shareLabel ?
+
+ :
+
+
+
+ }
)}
@@ -482,7 +513,7 @@ export default function ObjectTeams(props: Props) {
) : (
canManageUsers &&
!isRemoved &&
- (!permissions.includes(pond.Permission.PERMISSION_USERS) || canProvision) && (
+ (!permissions.includes(pond.Permission.PERMISSION_USERS) || isAdmin) && (
);
diff --git a/src/teams/ShareWithTeam.tsx b/src/teams/ShareWithTeam.tsx
index 070a8c7..ffda3f0 100644
--- a/src/teams/ShareWithTeam.tsx
+++ b/src/teams/ShareWithTeam.tsx
@@ -88,6 +88,8 @@ interface Props {
permissions: pond.Permission[];
isDialogOpen: boolean;
closeDialogCallback: Function;
+ keys?: string[],
+ types?: string[]
}
export default function ShareObject(props: Props) {
@@ -96,7 +98,7 @@ export default function ShareObject(props: Props) {
const classes = useStyles();
const permissionAPI = usePermissionAPI();
const { info, success } = useSnackbar();
- const { scope, label, permissions, isDialogOpen, closeDialogCallback } = props;
+ const { scope, label, permissions, isDialogOpen, closeDialogCallback, keys, types } = props;
const [sharedPermissions, setSharedPermissions] = useState([
pond.Permission.PERMISSION_READ
]);
@@ -109,7 +111,8 @@ export default function ShareObject(props: Props) {
const [teamKey, setTeamKey] = useState("");
const share = () => {
- permissionAPI.shareObjectByKey(scope, teamKey, sharedPermissions).then(resp => {
+
+ permissionAPI.shareObjectByKey(scope, teamKey, "team", sharedPermissions, keys, types).then(resp => {
let shareBins = true;
if (resp && resp.data && resp.data.existing) {
success(label + " was shared with team");
@@ -123,7 +126,7 @@ export default function ShareObject(props: Props) {
resp.data.bins.forEach(bin => {
if (bin.settings) {
let newScope = binScope(bin.settings?.key);
- permissionAPI.shareObjectByKey(newScope, teamKey, sharedPermissions).catch(_err => {
+ permissionAPI.shareObjectByKey(newScope, teamKey, "team", sharedPermissions, keys, types).catch(_err => {
successBins = false;
});
}
@@ -143,7 +146,7 @@ export default function ShareObject(props: Props) {
resp.data.gates.forEach(gate => {
if (gate) {
let newScope = { key: gate.key, kind: "gate" } as Scope;
- permissionAPI.shareObjectByKey(newScope, teamKey, sharedPermissions).catch(_err => {
+ permissionAPI.shareObjectByKey(newScope, teamKey, "team", sharedPermissions, keys, types).catch(_err => {
successGates = false;
});
}
diff --git a/src/teams/TeamList.tsx b/src/teams/TeamList.tsx
index 7742033..f45262c 100644
--- a/src/teams/TeamList.tsx
+++ b/src/teams/TeamList.tsx
@@ -12,7 +12,8 @@ import {
Grid2,
} from "@mui/material";
import { pond } from "protobuf-ts/pond";
-import { useGlobalState, useSnackbar, useTeamAPI, useUserAPI } from "providers";
+import { useGlobalState, useSnackbar, useUserAPI } from "providers";
+import { useTeamAPI } from "providers/pond/teamAPI";
import { Team, teamScope } from "models";
import { useNavigate } from "react-router";
import { cloneDeep } from "lodash";
diff --git a/src/teams/TeamSettings.tsx b/src/teams/TeamSettings.tsx
index 8e99e7e..58f9b25 100644
--- a/src/teams/TeamSettings.tsx
+++ b/src/teams/TeamSettings.tsx
@@ -14,7 +14,8 @@ import {
import ResponsiveDialog from "common/ResponsiveDialog";
import { Team } from "models";
import { pond } from "protobuf-ts/pond";
-import { useSnackbar, useTeamAPI } from "providers";
+import { useSnackbar } from "providers";
+import { useTeamAPI } from "providers/pond/teamAPI";
import React, { useEffect, useState } from "react";
import DeleteButton from "common/DeleteButton";
import { userRoleFromPermissions } from "pbHelpers/User";
@@ -36,6 +37,7 @@ export default function TeamSettings(props: Props) {
const [loading, setLoading] = useState(false);
const [nameField, setNameField] = useState("");
const [infoField, setInfoField] = useState("");
+ const [whitelabelField, setWhitelabelField] = useState("");
const [url, setUrl] = useState("");
const snackbar = useSnackbar();
const [tab, setTab] = useState(0);
@@ -54,6 +56,7 @@ export default function TeamSettings(props: Props) {
if (team) {
setNameField(team.name());
setInfoField(team.settings.info);
+ setWhitelabelField(team.settings.whitelabel);
setUrl(team.settings.avatar);
}
}, [team]);
@@ -76,6 +79,7 @@ export default function TeamSettings(props: Props) {
let team = pond.TeamSettings.create();
team.name = nameField;
team.info = infoField;
+ team.whitelabel = whitelabelField;
setLoading(true);
teamAPI
.addTeam(team)
@@ -100,6 +104,7 @@ export default function TeamSettings(props: Props) {
let newTeam = pond.TeamSettings.create();
newTeam.name = nameField;
newTeam.info = infoField;
+ newTeam.whitelabel = whitelabelField;
newTeam.avatar = url;
if (teamKey) {
teamAPI
@@ -130,6 +135,7 @@ export default function TeamSettings(props: Props) {
const close = () => {
setNameField("");
setInfoField("");
+ setWhitelabelField("");
setUrl("");
closeTeamDialogCallback();
};
@@ -193,6 +199,15 @@ export default function TeamSettings(props: Props) {
style={{ margin: theme.spacing(1) }}
fullWidth
/>
+ setWhitelabelField(event?.target.value)}
+ variant="outlined"
+ style={{ margin: theme.spacing(1) }}
+ placeholder="e.g. mivent, adaptive-ag, intellifarms"
+ fullWidth
+ />
);
};
diff --git a/src/theme/theme.ts b/src/theme/theme.ts
index 3b2883a..ce44c5d 100644
--- a/src/theme/theme.ts
+++ b/src/theme/theme.ts
@@ -2,10 +2,21 @@
import * as Colours from "@mui/material/colors"
import { createTheme, ThemeOptions } from '@mui/material/styles';
import {
+ getHeaderColor,
getPrimaryColour,
getSecondaryColour,
} from "../services/whiteLabel";
+declare module "@mui/material/styles" {
+ interface Palette {
+ header: Palette["primary"];
+ }
+
+ interface PaletteOptions {
+ header?: PaletteOptions["primary"];
+ }
+}
+
const baseTheme: ThemeOptions = {
palette: {
mode: 'light', // default mode; will be overridden by system if needed
@@ -48,17 +59,29 @@ function makePaletteColor(name: keyof typeof Colours) {
export const getTheme = (mode: 'light' | 'dark') =>
createTheme({
+ components: {
+ MuiPaper: {
+ styleOverrides: {
+ root: {
+ backgroundImage: 'none', // disables MUI's elevation overlay in dark mode
+ },
+ },
+ },
+ },
...baseTheme,
palette: {
...baseTheme.palette,
primary: makePaletteColor(getPrimaryColour()),
secondary: makePaletteColor(getSecondaryColour()),
+ header: {
+ main: getHeaderColor(),
+ },
mode,
...(mode === 'dark'
? {
background: {
- default: '#121212',
- paper: '#1e1e1e',
+ default: '#070F17', // was #0F1923 — push it darker
+ paper: '#0D1820', // was #1A2530 — slightly darker, less grey/blue
},
}
: {
diff --git a/src/transactions/transactionDataDisplay.tsx b/src/transactions/transactionDataDisplay.tsx
index b64db64..3bd6220 100644
--- a/src/transactions/transactionDataDisplay.tsx
+++ b/src/transactions/transactionDataDisplay.tsx
@@ -2,8 +2,8 @@ import { Box, Typography } from "@mui/material";
import GrainDescriber from "grain/GrainDescriber";
import { Transaction } from "models/Transaction";
import { pond } from "protobuf-ts/pond";
+import { useGlobalState } from "providers";
import React from "react";
-import { getGrainUnit } from "utils";
interface Props {
transaction: Transaction;
@@ -11,13 +11,14 @@ interface Props {
export default function TransactionDataDisplay(props: Props) {
const { transaction } = props;
+ const [{ user }] = useGlobalState();
console.log(transaction)
const grainDisplay = (gt: pond.GrainTransaction) => {
- if(getGrainUnit() === pond.GrainUnit.GRAIN_UNIT_TONNE && gt.bushelsPerTonne > 1){
+ if(user.grainUnit() === pond.GrainUnit.GRAIN_UNIT_TONNE && gt.bushelsPerTonne > 1){
return "Weight: " + Math.round(gt.bushels / gt.bushelsPerTonne*100)/100 + " mT"
}
- if(getGrainUnit() === pond.GrainUnit.GRAIN_UNIT_TON && gt.bushelsPerTonne > 1){
+ if(user.grainUnit() === pond.GrainUnit.GRAIN_UNIT_TON && gt.bushelsPerTonne > 1){
return "Weight: " + Math.round(gt.bushels / (gt.bushelsPerTonne*0.907)*100)/100 + " t"
}
return "Bushels: " + gt.bushels
diff --git a/src/user/ObjectUsers.tsx b/src/user/ObjectUsers.tsx
index e3221c2..4facea6 100644
--- a/src/user/ObjectUsers.tsx
+++ b/src/user/ObjectUsers.tsx
@@ -108,6 +108,7 @@ interface Props {
dialog?: string;
cardMode?: boolean;
useImitation?: boolean;
+ shareLabel?: string; // s string to replace the share icon button with a labelled button
}
export default function ObjectUsers(props: Props) {
@@ -115,7 +116,7 @@ export default function ObjectUsers(props: Props) {
const theme = useTheme();
const permissionAPI = usePermissionAPI();
const [{ user, team }, dispatch] = useGlobalState();
- const canProvision = user.allowedTo("provision");
+ const isAdmin = user.hasAdmin();
const userAPI = useUserAPI();
const { error, success, warning } = useSnackbar();
const {
@@ -127,8 +128,9 @@ export default function ObjectUsers(props: Props) {
refreshCallback,
userCallback,
dialog,
- cardMode
+ cardMode,
//useImitation
+ shareLabel
} = props;
const prevPermissions = usePrevious(permissions);
const prevIsDialogOpen = usePrevious(isDialogOpen);
@@ -367,11 +369,17 @@ export default function ObjectUsers(props: Props) {
{canShare && (
-
+ {shareLabel}
+
+ :
+
-
-
+
+
+ }
)}
@@ -552,7 +560,7 @@ export default function ObjectUsers(props: Props) {
- ) : (canManageUsers || canProvision) && !isRemoved && !cardMode ? (
+ ) : (canManageUsers || isAdmin) && !isRemoved && !cardMode ? (
) : (
- (canManageUsers || canProvision) && (
+ (canManageUsers || isAdmin) && (
(false);
const [user, setUser] = useState(globalState.user);
@@ -113,7 +113,7 @@ export default function UserSettings(props: Props) {
setDistanceUnit(user.settings.distanceUnit);
setGrainUnit(user.settings.grainUnit);
})
- .catch((error: any) => {
+ .catch(() => {
error("Error occurred while updating your profile");
})
.finally(() => {
@@ -529,7 +529,7 @@ export default function UserSettings(props: Props) {
- {IsAdaptiveAgriculture() && (
+ {getFeatures().grainUnit && (
{
let list: ProductDetails[] = [];
- if (IsAdaptiveAgriculture() || user.hasFeature("admin")) {
+ if (getFeatures().marketplace || user.hasFeature("admin")) {
list = list.concat(agFeatureList);
}
- // if(IsAdCon()){
- // list = list.concat(constructionFeatureList)
- // }
- // if(IsOmniAir()){
- // list = list.concat(aviationFeatureList)
- // }
- // if(IsMiVent()){
- // list = list.concat(miningFeatureList)
- // }
- // list = list.concat(universalFeatureList)
setFeaturList(list);
}, []);
diff --git a/src/utils/auth0Config.ts b/src/utils/auth0Config.ts
new file mode 100644
index 0000000..1c5e568
--- /dev/null
+++ b/src/utils/auth0Config.ts
@@ -0,0 +1,24 @@
+import { getWhitelabel } from 'services/whiteLabel'
+
+/** True when Auth0 env + whitelabel client ID are present; avoids mounting Auth0Provider on offline / local LAN builds. */
+export function isAuth0Configured(): boolean {
+ const wl = getWhitelabel()
+ const domain = String(import.meta.env.VITE_AUTH0_CLIENT_DOMAIN ?? '').trim()
+ const clientRaw = wl.auth0ClientId ?? import.meta.env.VITE_AUTH0_CLIENT_ID
+ const clientId = String(clientRaw ?? '').trim()
+ return domain.length > 0 && clientId.length > 0
+}
+
+/**
+ * auth0-spa-js only runs in a "secure context" (HTTPS, http://localhost, http://127.0.0.1, etc.).
+ * Plain http://192.168.x.x fails — same check as `window.isSecureContext`.
+ */
+export function isAuth0SpaOriginAllowed(): boolean {
+ if (typeof window === 'undefined') return true
+ return window.isSecureContext
+}
+
+/** Mount Auth0 only when credentials exist and the browser will let the SDK run. */
+export function shouldMountAuth0Provider(): boolean {
+ return isAuth0Configured() && isAuth0SpaOriginAllowed()
+}
diff --git a/src/utils/getWsBaseUrl.ts b/src/utils/getWsBaseUrl.ts
new file mode 100644
index 0000000..331b78a
--- /dev/null
+++ b/src/utils/getWsBaseUrl.ts
@@ -0,0 +1,16 @@
+/**
+ * Origin for Pond WebSocket URLs.
+ *
+ * VITE_APP_API_URL usually ends with /v1 (same base axios uses for REST). WS paths are
+ * written as /v1/live/..., so we strip a trailing /v1 from the env URL to avoid /v1/v1/.
+ */
+export function getWsBaseUrl(): string {
+ const apiUrl = import.meta.env.VITE_APP_API_URL;
+ if (apiUrl) {
+ let ws = apiUrl.replace(/^http/, "ws");
+ ws = ws.replace(/\/v1\/?$/, "");
+ return ws.replace(/\/$/, "") || ws;
+ }
+ const protocol = window.location.protocol === "https:" ? "wss:" : "ws:";
+ return `${protocol}//${window.location.host}`;
+}
diff --git a/src/utils/index.ts b/src/utils/index.ts
index 5a5ef3f..29ff37c 100644
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -2,5 +2,6 @@ export * from "./download";
export * from "./environment";
export * from "./numbers";
export * from "./strings";
+export * from "./syncStatus";
export * from "./types";
export * from "./units";
diff --git a/src/utils/syncStatus.ts b/src/utils/syncStatus.ts
new file mode 100644
index 0000000..107c2a8
--- /dev/null
+++ b/src/utils/syncStatus.ts
@@ -0,0 +1,41 @@
+export function getTimestampMillis(timestamp?: string): number | undefined {
+ if (!timestamp) return undefined;
+ const parsed = Date.parse(timestamp);
+ return Number.isNaN(parsed) ? undefined : parsed;
+}
+
+/** The sync-tracking fields shared by ComponentStatus and InteractionStatus. */
+export interface SyncStatusLike {
+ synced: boolean;
+ lastUpdate?: string;
+ lastSynced?: string;
+}
+
+/**
+ * Decides whether an incoming websocket status message is stale and should
+ * not replace the status we already hold. A message is stale when it was
+ * generated before our latest local update, including a synced echo that
+ * predates a pending change we just submitted.
+ */
+export function isStaleStatusUpdate(existing: SyncStatusLike, incoming: SyncStatusLike): boolean {
+ const existingLastUpdate = getTimestampMillis(existing.lastUpdate);
+ const incomingLastUpdate = getTimestampMillis(incoming.lastUpdate);
+ const incomingLastSynced = getTimestampMillis(incoming.lastSynced);
+ if (
+ existingLastUpdate !== undefined &&
+ incomingLastUpdate !== undefined &&
+ existingLastUpdate > incomingLastUpdate
+ ) {
+ return true;
+ }
+ if (
+ !existing.synced &&
+ incoming.synced &&
+ incomingLastUpdate !== undefined &&
+ existingLastUpdate === incomingLastUpdate &&
+ (incomingLastSynced === undefined || incomingLastSynced < incomingLastUpdate)
+ ) {
+ return true;
+ }
+ return false;
+}
diff --git a/src/utils/units.ts b/src/utils/units.ts
index 41b3601..075a9e1 100644
--- a/src/utils/units.ts
+++ b/src/utils/units.ts
@@ -1,5 +1,6 @@
import { pond } from "protobuf-ts/pond";
+//function is deprecated, use User.tempUnit() instead
export function getTemperatureUnit(): pond.TemperatureUnit {
return localStorage.getItem("temperature") === "f"
? pond.TemperatureUnit.TEMPERATURE_UNIT_FAHRENHEIT
@@ -31,6 +32,7 @@ export const fahrenheitToCelsius = (fahrenheit: number) => {
return (fahrenheit - 32) * (5 / 9);
};
+// function is deprecated, use User.pressureUnit() instead
export function getPressureUnit(): pond.PressureUnit {
return localStorage.getItem("pressure") === "kpa"
? pond.PressureUnit.PRESSURE_UNIT_KILOPASCALS
@@ -44,6 +46,7 @@ export function setPressureUnit(unit: pond.PressureUnit) {
);
}
+// function is deprecated, use User.distanceUnit() instead
export function getDistanceUnit(): pond.DistanceUnit {
return localStorage.getItem("distance") === "m"
? pond.DistanceUnit.DISTANCE_UNIT_METERS
@@ -54,6 +57,7 @@ export function setDistanceUnit(unit: pond.DistanceUnit) {
localStorage.setItem("distance", unit === pond.DistanceUnit.DISTANCE_UNIT_METERS ? "m" : "ft");
}
+// function is deprecated, use User.grainUnit() instead
export function getGrainUnit(): pond.GrainUnit {
switch(localStorage.getItem("grainUnit")){
case "mT":
@@ -81,13 +85,11 @@ export function setGrainUnit(unit: pond.GrainUnit) {
default:
localStorage.setItem("grainUnit", "bu")
}
- // localStorage.setItem("grainUnit", unit === pond.GrainUnit.GRAIN_UNIT_WEIGHT ? "mT" : "bu");
}
-export const distanceConversion = (val: number) => {
+export const distanceConversion = (val: number, distanceUnit: pond.DistanceUnit) => {
let converted = val;
-
- if (getDistanceUnit() === pond.DistanceUnit.DISTANCE_UNIT_METERS) {
+ if (distanceUnit === pond.DistanceUnit.DISTANCE_UNIT_METERS) {
converted = val / 3.281;
}
return converted;
diff --git a/src/vite-env.d.ts b/src/vite-env.d.ts
index 11f02fe..db728ea 100644
--- a/src/vite-env.d.ts
+++ b/src/vite-env.d.ts
@@ -1 +1,4 @@
///
+
+declare const __BUILD_DATE__: string
+declare const __GIT_HASH__: string
diff --git a/vite.config.ts b/vite.config.ts
index f48db4a..7ff8324 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -1,12 +1,71 @@
-import { defineConfig } from 'vite'
+import { defineConfig, type Plugin, type UserConfig } from 'vite'
import react from '@vitejs/plugin-react'
import tsconfigPaths from 'vite-tsconfig-paths'
import { VitePWA } from 'vite-plugin-pwa';
import * as path from 'path' // ✅ Import path module
+import { readFileSync, renameSync, existsSync, unlinkSync } from 'node:fs'
+import { fileURLToPath } from 'node:url'
+import { execSync } from 'node:child_process'
+
+const rootDir = path.dirname(fileURLToPath(import.meta.url))
+
+const LOCALNET_MODE = 'localnet'
+
+/** Dev server: serve the minimal LAN shell (indexLocal.html) instead of the full index with third-party bootstraps. */
+function useLocalnetShellHtml (mode: string, command: string): Plugin {
+ if (mode !== LOCALNET_MODE || command !== 'serve') {
+ return { name: 'localnet-shell-html-noop' }
+ }
+ return {
+ name: 'localnet-shell-html',
+ apply: 'serve',
+ transformIndexHtml: {
+ order: 'pre',
+ handler () {
+ return readFileSync(path.join(rootDir, 'indexLocal.html'), 'utf-8')
+ },
+ },
+ }
+}
+
+/** After build, LAN shell is emitted as indexLocal.html; rename to index.html so nginx and PWA still use /. */
+function emitLocalnetShellAsIndexHtml (mode: string): Plugin {
+ if (mode !== LOCALNET_MODE) {
+ return { name: 'emit-localnet-shell-as-index-noop' }
+ }
+ return {
+ name: 'emit-localnet-shell-as-index-html',
+ closeBundle () {
+ const outDir = path.join(rootDir, 'build')
+ const from = path.join(outDir, 'indexLocal.html')
+ const to = path.join(outDir, 'index.html')
+ if (existsSync(from)) {
+ if (existsSync(to)) unlinkSync(to)
+ renameSync(from, to)
+ }
+ },
+ }
+}
// https://vitejs.dev/config/
-export default defineConfig({
+export default defineConfig(({ command, mode }): UserConfig => {
+ const useLocalnetShell = mode === LOCALNET_MODE
+
+ let gitHash = 'unknown'
+ try {
+ gitHash = execSync('git rev-parse --short HEAD').toString().trim()
+ } catch {}
+
+ const buildDate = new Date().toISOString()
+
+ return {
+ define: {
+ __BUILD_DATE__: JSON.stringify(buildDate),
+ __GIT_HASH__: JSON.stringify(gitHash),
+ },
plugins: [
+ useLocalnetShellHtml(mode, command),
+ emitLocalnetShellAsIndexHtml(mode),
react(),
tsconfigPaths(),
VitePWA({
@@ -53,12 +112,15 @@ export default defineConfig({
target: 'esnext',
rollupOptions: {
input: {
- main: path.resolve(__dirname, 'index.html')
- }
+ main: path.join(
+ rootDir,
+ useLocalnetShell ? 'indexLocal.html' : 'index.html'
+ ),
+ },
}
},
esbuild: {
keepNames: true, // Prevent function name mangling
},
-
+ }
})