From 216569b661b9e725e45a59f51896ae8297f85b98 Mon Sep 17 00:00:00 2001
From: csawatzky <chris@adaptiveagriculture.ca>
Date: Fri, 6 Jun 2025 09:13:02 -0600
Subject: [PATCH] write permission to the bin or team is required to make the
 transaction rows selectable

---
 src/bin/BinTransactions.tsx       | 93 ++++++++++++++++++++++++-------
 src/contract/contractSettings.tsx | 10 +++-
 src/models/Bin.ts                 |  2 +-
 src/models/Contract.ts            | 12 ++++
 src/models/Field.ts               | 13 +++++
 src/models/GrainBag.ts            | 13 +++++
 src/pages/Bin.tsx                 |  4 +-
 src/pages/Contracts.tsx           |  1 -
 8 files changed, 121 insertions(+), 27 deletions(-)

diff --git a/src/bin/BinTransactions.tsx b/src/bin/BinTransactions.tsx
index f690248..f8e7c90 100644
--- a/src/bin/BinTransactions.tsx
+++ b/src/bin/BinTransactions.tsx
@@ -18,10 +18,12 @@ import { getGrainUnit } from "utils";
 
 interface Props {
   bin: Bin
+  permissions: pond.Permission[]
+  refresh: () => void
 }
 
 export default function BinTransactions(props: Props){
-  const { bin } = props
+  const { bin, permissions, refresh } = props
   const [state, setState] = useState<pond.TransactionState>(pond.TransactionState.TRANSACTION_STATE_APPROVAL_REQUIRED)
   const transactionAPI = useTransactionAPI()
   const binAPI = useBinAPI()
@@ -67,8 +69,10 @@ export default function BinTransactions(props: Props){
       let binMap: Map<string, Bin> = new Map()
       resp.data.bins.map(b => {
         let bin = Bin.create(b)
-        options.push({label: bin.name(), value: bin.key()})
-        binMap.set(bin.key(), bin)
+        if(bin.key() !== props.bin.key()){
+          options.push({label: bin.name(), value: bin.key(), group: bin.grainName()})
+          binMap.set(bin.key(), bin)
+        }
       })
       setBinOptions(options)
       setBins(binMap)
@@ -80,19 +84,29 @@ export default function BinTransactions(props: Props){
     grainBagAPI.listGrainBags(0, 0, "asc", "name").then(resp => {
       setGrainBagOptions(resp.data.grainBags.map(g => {
         let grainBag = GrainBag.create(g)
-        return {label: grainBag.name(), value: grainBag.key()}
+        return {label: grainBag.name(), value: grainBag.key(), group: grainBag.grainName()}
       }))
     })
   }
 
   //load fields
   const loadFields = useCallback(()=>{
-
+    fieldAPI.listFields(0,0, "asc", "field_name").then(resp => {
+      setFieldOptions(resp.data.fields.map(f => {
+        let field = Field.create(f)
+        return {label: field.name(), value: field.key(), group: field.grainName()}
+      }))
+    })
   },[])
 
   //load contracts
   const loadContracts = useCallback(()=>{
-
+    contractAPI.listContracts(0,0, "asc", "name").then(resp => {
+      setContractOptions(resp.data.contracts.map(c => {
+        let contract = Contract.create(c)
+        return {label: contract.name(), value: contract.key(), group: contract.grainName()}
+      }))
+    })
   },[])
 
 
@@ -122,7 +136,6 @@ export default function BinTransactions(props: Props){
   }
 
   const submit = () => {
-    console.log("submitting transaction")
     let transaction = cloneDeep(selectedTransaction)
     if(transaction){
       //use the dropdowns to update the from/to for the transaction, meaning if the user added another object it will adjust its inventory as well
@@ -150,11 +163,20 @@ export default function BinTransactions(props: Props){
       }).catch(err => {
         openSnack("There was a problem submitting transaction approval")
       })
+      refresh()
     }
   }
 
   const reject = () => {
     //reject the transaction
+    if(selectedTransaction){
+      transactionAPI.submitApproval(selectedTransaction.transaction.key, false, selectedTransaction.transaction).then(resp => {
+        openSnack("Transaction rejected")
+      }).catch(err => {
+        openSnack("There was a problem rejecting the transaction")
+      })
+    }
+    refresh()
   }
 
   const getOptions = (type: pond.ObjectType) => {
@@ -162,7 +184,11 @@ export default function BinTransactions(props: Props){
       case pond.ObjectType.OBJECT_TYPE_BIN:
         return binOptions
       case pond.ObjectType.OBJECT_TYPE_GRAIN_BAG:
-        return grainBagOptions
+        return grainBagOptions      
+      case pond.ObjectType.OBJECT_TYPE_FIELD:
+        return fieldOptions      
+      case pond.ObjectType.OBJECT_TYPE_CONTRACT:
+        return contractOptions
       default:
         return []
     }
@@ -198,6 +224,7 @@ export default function BinTransactions(props: Props){
                 options={[
                   pond.ObjectType.OBJECT_TYPE_BIN,
                   pond.ObjectType.OBJECT_TYPE_GRAIN_BAG,
+                  pond.ObjectType.OBJECT_TYPE_FIELD
 
                 ]}
                 getOptionLabel={(option: pond.ObjectType) => ObjectDescriber(option).name}
@@ -212,7 +239,13 @@ export default function BinTransactions(props: Props){
                       loadBins()
                     }
                   }else if (val === pond.ObjectType.OBJECT_TYPE_GRAIN_BAG){
-
+                    if(grainBagOptions.length === 0){
+                      loadGrainbags()
+                    }
+                  }else if (val === pond.ObjectType.OBJECT_TYPE_FIELD){
+                    if (fieldOptions.length === 0){
+                      loadFields()
+                    }
                   }
                 }}
                 renderInput={params => <TextField {...params} label="Type" />}
@@ -260,7 +293,7 @@ export default function BinTransactions(props: Props){
                 options={[
                   pond.ObjectType.OBJECT_TYPE_BIN,
                   pond.ObjectType.OBJECT_TYPE_GRAIN_BAG,
-
+                  pond.ObjectType.OBJECT_TYPE_CONTRACT
                 ]}
                 getOptionLabel={(option: pond.ObjectType) => ObjectDescriber(option).name}
                 fullWidth
@@ -274,7 +307,13 @@ export default function BinTransactions(props: Props){
                       loadBins()
                     }
                   }else if (val === pond.ObjectType.OBJECT_TYPE_GRAIN_BAG){
-
+                    if(grainBagOptions.length === 0){
+                      loadGrainbags()
+                    }
+                  }else if (val === pond.ObjectType.OBJECT_TYPE_CONTRACT){
+                    if(contractOptions.length === 0){
+                      loadContracts()
+                    }
                   }
                 }}
                 renderInput={params => <TextField {...params} label="Type" />}
@@ -282,6 +321,12 @@ export default function BinTransactions(props: Props){
               <Autocomplete
                 sx={{marginY: 1}}
                 disabled={toDisabled}
+                groupBy={option => {
+                  if (option.group) {
+                    return option.group;
+                  }
+                  return "No Grain Type";
+                }}
                 id="autoFromObjects"
                 value={toOption}
                 options={getOptions(toType)}
@@ -366,7 +411,15 @@ export default function BinTransactions(props: Props){
         </DialogContent>
         <DialogActions>
           <Button variant="contained" onClick={closeDialog}>Close</Button>
-          <Button variant="contained" color="error" onClick={closeDialog}>Reject</Button>
+          <Button 
+            variant="contained" 
+            color="error" 
+            onClick={() => {
+              reject()
+              closeDialog()
+            }}>
+              Reject
+            </Button>
           <Button 
             variant="contained" 
             disabled={requiresMatch && selectedMatch === undefined}
@@ -446,14 +499,14 @@ export default function BinTransactions(props: Props){
         title="Pending Transactions"
         subtitle={"Select a transaction to approve"}
         noDataMessage="No Pending Transactions Found"
-        onRowClick={(row)=> {
-          setSelectedTransaction(row)
-          setFromType(row.transaction.fromObject)
-          setFromOption({label: objectNames.get(row.transaction.fromKey) ?? "", value: row.transaction.fromKey})
-          setToType(row.transaction.toObject)
-          setToOption({label: objectNames.get(row.transaction.toKey) ?? "", value: row.transaction.toKey})
-          setOpenDialog(true)
-        }}
+        onRowClick={permissions.includes(pond.Permission.PERMISSION_WRITE) ? (row)=> {
+            setSelectedTransaction(row)
+            setFromType(row.transaction.fromObject)
+            setFromOption({label: objectNames.get(row.transaction.fromKey) ?? "", value: row.transaction.fromKey})
+            setToType(row.transaction.toObject)
+            setToOption({label: objectNames.get(row.transaction.toKey) ?? "", value: row.transaction.toKey})
+            setOpenDialog(true)
+        } : undefined}
         rows={transactions}
         handleRowsPerPageChange={(e)=>{setTablePageSize(e.target.value)}}
         setPage={(page)=>{setTablePage(page)}}
diff --git a/src/contract/contractSettings.tsx b/src/contract/contractSettings.tsx
index 9d137c8..d52fb15 100644
--- a/src/contract/contractSettings.tsx
+++ b/src/contract/contractSettings.tsx
@@ -22,7 +22,7 @@ import GrainDescriber from "grain/GrainDescriber";
 import { Contract } from "models/Contract";
 import moment from "moment";
 import { pond } from "protobuf-ts/pond";
-import { useGlobalState, useTaskAPI, useContractAPI } from "providers";
+import { useGlobalState, useTaskAPI, useContractAPI, useSnackbar } from "providers";
 import React, { useEffect, useState } from "react";
 import { getGrainUnit } from "utils";
 
@@ -63,6 +63,7 @@ export default function ContractSettings(props: Props) {
   const [deleteWindow, setDeleteWindow] = useState(false);
   const [createDeliveryTask, setCreateDeliveryTask] = useState(false);
   const [conversionValue, setConversionValue] = useState("1");
+  const { openSnack } = useSnackbar()
   const [labels, setLabels] = useState<InputLabels>({
     sizeLabel: "Size",
     commodityLabel: "Commodity",
@@ -174,11 +175,14 @@ export default function ContractSettings(props: Props) {
       contractAPI
         .updateContract(contract.key(), name, settings, as)
         .then(resp => {
-          console.log("Updated Contract");
+          //console.log("Updated Contract");
+          openSnack("Contract Updated")
           close();
         })
         .catch(err => {
-          console.log("Error updating contract");
+          //console.log("Error updating contract");
+          openSnack("Error Updating Contract")
+
         });
     } else {
       let settings: pond.ContractSettings = pond.ContractSettings.create();
diff --git a/src/models/Bin.ts b/src/models/Bin.ts
index 1157837..177997a 100644
--- a/src/models/Bin.ts
+++ b/src/models/Bin.ts
@@ -155,7 +155,7 @@ export class Bin {
         return GrainDescriber(this.grain()).name;
       }
     } else {
-      return "";
+      return "None";
     }
   }
 
diff --git a/src/models/Contract.ts b/src/models/Contract.ts
index 2da8aba..804f12f 100644
--- a/src/models/Contract.ts
+++ b/src/models/Contract.ts
@@ -234,4 +234,16 @@ export class Contract {
     }
     return storedunitVal;
   }
+
+  public grainName(): string {
+    if (this.grain() !== pond.Grain.GRAIN_INVALID) {
+      if (this.grain() === pond.Grain.GRAIN_CUSTOM) {
+        return this.customType();
+      } else {
+        return GrainDescriber(this.grain()).name;
+      }
+    } else {
+      return "None";
+    }
+  }
 }
diff --git a/src/models/Field.ts b/src/models/Field.ts
index 5a1f13d..25b3263 100644
--- a/src/models/Field.ts
+++ b/src/models/Field.ts
@@ -4,6 +4,7 @@ import { or } from "utils/types";
 import area from "@turf/area";
 import { Feature } from "geojson";
 import { GeometryMapping } from "./GeometryMapping";
+import GrainDescriber from "grain/GrainDescriber";
 
 export class Field {
   public settings: pond.FieldSettings = pond.FieldSettings.create();
@@ -150,4 +151,16 @@ export class Field {
     }
     return coords;
   }
+
+  public grainName(): string {
+    if (this.grain() !== pond.Grain.GRAIN_INVALID) {
+      if (this.grain() === pond.Grain.GRAIN_CUSTOM) {
+        return this.customType();
+      } else {
+        return GrainDescriber(this.grain()).name;
+      }
+    } else {
+      return "None";
+    }
+  }
 }
diff --git a/src/models/GrainBag.ts b/src/models/GrainBag.ts
index 43ea658..82de416 100644
--- a/src/models/GrainBag.ts
+++ b/src/models/GrainBag.ts
@@ -1,3 +1,4 @@
+import GrainDescriber from "grain/GrainDescriber";
 import { cloneDeep } from "lodash";
 import { pond } from "protobuf-ts/pond";
 import { or } from "utils/types";
@@ -132,4 +133,16 @@ export class GrainBag {
     }
     return bpt;
   }
+
+  public grainName(): string {
+    if (this.grain() !== pond.Grain.GRAIN_INVALID) {
+      if (this.grain() === pond.Grain.GRAIN_CUSTOM) {
+        return this.customType();
+      } else {
+        return GrainDescriber(this.grain()).name;
+      }
+    } else {
+      return "None";
+    }
+  }
 }
diff --git a/src/pages/Bin.tsx b/src/pages/Bin.tsx
index bf06aec..aea7243 100644
--- a/src/pages/Bin.tsx
+++ b/src/pages/Bin.tsx
@@ -969,7 +969,7 @@ export default function Bin(props: Props) {
               />
             )}
             {detail === "transactions" &&
-              <BinTransactions bin={bin}/>
+              <BinTransactions bin={bin} permissions={permissions}/>
             }
           </Grid>
         </Grid>
@@ -1090,7 +1090,7 @@ export default function Bin(props: Props) {
           />
         </TabPanelMine>
         <TabPanelMine value={mobileTab} index={6}>
-          <BinTransactions bin={bin}/>
+          <BinTransactions bin={bin} permissions={permissions}/>
         </TabPanelMine>
       </Card>
     );
diff --git a/src/pages/Contracts.tsx b/src/pages/Contracts.tsx
index 606651f..bd42f72 100644
--- a/src/pages/Contracts.tsx
+++ b/src/pages/Contracts.tsx
@@ -38,7 +38,6 @@ export default function Contracts() {
           as
         )
         .then(resp => {
-          console.log(resp)
           let contracts: Contract[] = [];
           let contractPermissions: Map<string, pond.Permission[]> = new Map();
           resp.data.contracts.forEach(contract => {