From c5afdc2c3dab324d89aafc4f18972111026a3e56 Mon Sep 17 00:00:00 2001
From: csawatzky <chris@adaptiveagriculture.ca>
Date: Wed, 2 Apr 2025 12:42:26 -0600
Subject: [PATCH] adding in the lidar inventory control stuff

---
 package-lock.json           |  2 +-
 src/bin/BinSVGV2.tsx        |  4 ++--
 src/bin/BinSettings.tsx     |  7 ++++++-
 src/bin/BinVisualizerV2.tsx | 19 +++++++++++--------
 src/pages/Terminals.tsx     |  9 ++++++++-
 5 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 2e3b20c..1ebe439 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10770,7 +10770,7 @@
     },
     "node_modules/protobuf-ts": {
       "version": "1.0.0",
-      "resolved": "git+https://gitlab+deploy-token-50627:hv8mB4WkyvtjBpJKU1rN@gitlab.com/brandx/protobuf-ts.git#9074fe327f799b1faef10374bd7ede55f3eb6a17",
+      "resolved": "git+https://gitlab+deploy-token-50627:hv8mB4WkyvtjBpJKU1rN@gitlab.com/brandx/protobuf-ts.git#229e52a3f667df826cbd2e9b9de73fd0de70ab0c",
       "dependencies": {
         "protobufjs": "^6.8.8"
       }
diff --git a/src/bin/BinSVGV2.tsx b/src/bin/BinSVGV2.tsx
index a6093b9..a6ad9d1 100644
--- a/src/bin/BinSVGV2.tsx
+++ b/src/bin/BinSVGV2.tsx
@@ -980,7 +980,7 @@ export default function BinSVGV2(props: Props) {
         />
 
         {fillPercentage > 0 &&
-        (inventoryControl === pond.BinInventoryControl.BIN_INVENTORY_CONTROL_MANUAL ||
+        (inventoryControl !== pond.BinInventoryControl.BIN_INVENTORY_CONTROL_AUTOMATIC ||
           !inventoryControl) ? (
           inventoryLayer()
         ) : (
@@ -1024,7 +1024,7 @@ export default function BinSVGV2(props: Props) {
         />
 
         {fillPercentage > 0 &&
-          (inventoryControl === pond.BinInventoryControl.BIN_INVENTORY_CONTROL_MANUAL ||
+          (inventoryControl !== pond.BinInventoryControl.BIN_INVENTORY_CONTROL_AUTOMATIC ||
             !inventoryControl) &&
           inventoryLayer()}
         <ellipse
diff --git a/src/bin/BinSettings.tsx b/src/bin/BinSettings.tsx
index e149efb..345812e 100644
--- a/src/bin/BinSettings.tsx
+++ b/src/bin/BinSettings.tsx
@@ -827,7 +827,7 @@ export default function BinSettings(props: Props) {
               alignItems="center"
               justifyContent="space-between">
               <Grid>
-                <Typography>Control</Typography>
+                <Typography>Inventory Control</Typography>
               </Grid>
               <Grid>
                 <Typography>{inventoryControlLabel(inventoryControl)}</Typography>
@@ -852,6 +852,11 @@ export default function BinSettings(props: Props) {
                 control={<Radio />}
                 label={"Auto"}
               />
+              <FormControlLabel
+                value={pond.BinInventoryControl.BIN_INVENTORY_CONTROL_AUTOMATIC_LIDAR}
+                control={<Radio />}
+                label={"Auto (Lidar)"}
+              />
             </RadioGroup>
           </AccordionDetails>
           {inventoryControl === pond.BinInventoryControl.BIN_INVENTORY_CONTROL_AUTOMATIC &&
diff --git a/src/bin/BinVisualizerV2.tsx b/src/bin/BinVisualizerV2.tsx
index 88b8107..8459e2a 100644
--- a/src/bin/BinVisualizerV2.tsx
+++ b/src/bin/BinVisualizerV2.tsx
@@ -583,14 +583,17 @@ export default function BinVisualizer(props: Props) {
             </Typography>
             <Typography variant="body2">{isEmpty ? "" : getCapacityDisplay(capacity)}</Typography>
           </div>
-          {!isEmpty && lidarBushels && (
-            <div style={{ display: "flex", flexDirection: "row" }}>
-              <Typography variant="body2">
-                {(lidarBushels ? getVolume(lidarBushels) : 0).toLocaleString()} /{" "}
-                {(capacity ? getVolume(capacity) : 0).toLocaleString()} bu (est)
-              </Typography>
-            </div>
-          )}
+          {!isEmpty &&
+            lidarBushels &&
+            bin.inventoryControl() !==
+              pond.BinInventoryControl.BIN_INVENTORY_CONTROL_AUTOMATIC_LIDAR && (
+              <div style={{ display: "flex", flexDirection: "row" }}>
+                <Typography variant="body2">
+                  {(lidarBushels ? getVolume(lidarBushels) : 0).toLocaleString()} /{" "}
+                  {(capacity ? getVolume(capacity) : 0).toLocaleString()} bu (est)
+                </Typography>
+              </div>
+            )}
         </Box>
       </Box>
     );
diff --git a/src/pages/Terminals.tsx b/src/pages/Terminals.tsx
index 1beea03..5a8db59 100644
--- a/src/pages/Terminals.tsx
+++ b/src/pages/Terminals.tsx
@@ -156,6 +156,7 @@ export default function Terminals(props: Props) {
   const [teamSharing, setTeamSharing] = useState(false);
   const [baseShareDialog, setBaseShareDialog] = useState(false);
   const [removeSelfDialog, setRemoveSelfDialog] = useState(false);
+  const [loading, setLoading] = useState(false)
 
   useEffect(() => {
     if (currentTerminal) {
@@ -178,13 +179,18 @@ export default function Terminals(props: Props) {
   }, [props.terminal]);
 
   const load = useCallback(() => {
+    if(loading) return
+    setLoading(true)
     terminalAPI.listTerminals(200, 0, "asc", "name").then(resp => {
       setTerminals(resp.data.terminals.map(a => Terminal.any(a)));
+    }).catch(err => {
+      console.log("There was a problem loading Terminals")
+    }).finally(() => {
+      setLoading(false)
     })
   }, [terminalAPI, openSnack]); //eslint-disable-line react-hooks/exhaustive-deps
 
   useEffect(() => {
-    //TODO: will need to figure out a way to prevent multiple api calls when loading the page
     load();
   }, [load]);
 
@@ -312,6 +318,7 @@ export default function Terminals(props: Props) {
   const terminalTabs = () => {
     return (
       <React.Fragment>
+        {/* TODO: convert this to use DraggableTabs */}
         <Tabs
           variant="scrollable"
           scrollButtons="auto"