From 69a848daf5a70153884c767e74dbc297df3340d5 Mon Sep 17 00:00:00 2001 From: Carter Date: Mon, 11 Aug 2025 11:22:01 -0600 Subject: [PATCH 1/7] merged staging and switched to master proto --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index fc7a1ac..ee0e9b7 100644 --- a/package.json +++ b/package.json @@ -54,7 +54,7 @@ "mui-tel-input": "^7.0.0", "notistack": "^3.0.1", "openweathermap-ts": "^1.2.10", - "protobuf-ts": "git+https://gitlab+deploy-token-50627:hv8mB4WkyvtjBpJKU1rN@gitlab.com/brandx/protobuf-ts.git#staging", + "protobuf-ts": "git+https://gitlab+deploy-token-50627:hv8mB4WkyvtjBpJKU1rN@gitlab.com/brandx/protobuf-ts.git#master", "query-string": "^9.2.1", "react": "^18.3.1", "react-beautiful-dnd": "^13.1.1", From 85ccecdcdc1906644f7dd80f31cf058dce2ca274 Mon Sep 17 00:00:00 2001 From: Carter Date: Wed, 13 Aug 2025 14:37:38 -0600 Subject: [PATCH 2/7] hotfix: if getting user with team fails, just get the user --- package-lock.json | 2 +- src/app/UserWrapper.tsx | 15 ++++++++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index eb7d904..0e4f8f9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -42,7 +42,7 @@ "mui-tel-input": "^7.0.0", "notistack": "^3.0.1", "openweathermap-ts": "^1.2.10", - "protobuf-ts": "git+https://gitlab+deploy-token-50627:hv8mB4WkyvtjBpJKU1rN@gitlab.com/brandx/protobuf-ts.git#staging", + "protobuf-ts": "git+https://gitlab+deploy-token-50627:hv8mB4WkyvtjBpJKU1rN@gitlab.com/brandx/protobuf-ts.git#master", "query-string": "^9.2.1", "react": "^18.3.1", "react-beautiful-dnd": "^13.1.1", diff --git a/src/app/UserWrapper.tsx b/src/app/UserWrapper.tsx index 722705e..cb4cdf8 100644 --- a/src/app/UserWrapper.tsx +++ b/src/app/UserWrapper.tsx @@ -82,7 +82,20 @@ export default function UserWrapper(props: Props) { firmware: new Map() }) }).catch(() => { - setGlobal(globalDefault) + userAPI.getUser(user_id).then(user => { + setGlobal({ + user: user ? user : User.create(), + team: globalDefault.team, + as: "", + showErrors: false, + userTeamPermissions: [], + backgroundTasksComplete: false, + firmware: new Map() + }) + }).catch(() => { + setGlobal(globalDefault) + }) + }) .finally(() => { setLoading(false) From 2dde79970da30fe24635328cc9b122b628e9c566 Mon Sep 17 00:00:00 2001 From: csawatzky Date: Wed, 13 Aug 2025 15:46:07 -0600 Subject: [PATCH 3/7] hotfix to have the duplicate button available to users with the installer feature flag --- src/bin/BinCardV2.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bin/BinCardV2.tsx b/src/bin/BinCardV2.tsx index 35fcd12..683e598 100644 --- a/src/bin/BinCardV2.tsx +++ b/src/bin/BinCardV2.tsx @@ -490,7 +490,7 @@ export default function BinCard(props: Props) { return ( - {user.hasFeature("admin") && ( + {user.hasFeature("installer") && ( Date: Thu, 14 Aug 2025 09:18:09 -0600 Subject: [PATCH 4/7] hotfix - putting back the background colour for the resposive table sticky header --- src/common/ResponsiveTable.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/ResponsiveTable.tsx b/src/common/ResponsiveTable.tsx index 79238ea..ef99665 100644 --- a/src/common/ResponsiveTable.tsx +++ b/src/common/ResponsiveTable.tsx @@ -59,7 +59,7 @@ const useStyles = makeStyles((theme: Theme) => { }, stickyHeader: { position: "sticky", - // backgroundColor: getThemeType() === "light" ? "rgb(245, 245, 245)" : "rgb(40, 40, 40)", + backgroundColor: getThemeType() === "light" ? "rgb(245, 245, 245)" : "rgb(40, 40, 40)", top: 0, zIndex: 300 //giving a really high z-index to make sure nothing is in front of it } From eae0628e8be9e149a64f9cdbe7b757b5c5993677 Mon Sep 17 00:00:00 2001 From: csawatzky Date: Mon, 18 Aug 2025 14:59:32 -0600 Subject: [PATCH 5/7] hotfix for the plenum column on the devices page to be renamed and the bin page sensors graph headers reading going through multiple conversions --- src/bin/graphs/BinComponentGraph.tsx | 2 +- src/pages/Devices.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/bin/graphs/BinComponentGraph.tsx b/src/bin/graphs/BinComponentGraph.tsx index 6b593a9..3c5a625 100644 --- a/src/bin/graphs/BinComponentGraph.tsx +++ b/src/bin/graphs/BinComponentGraph.tsx @@ -184,7 +184,7 @@ export default function BinComponentGraph(props: Props) { UnitMeasurement.create(m, user)) + lastMeasurement.map(m => UnitMeasurement.create(m, user)) )} /> } diff --git a/src/pages/Devices.tsx b/src/pages/Devices.tsx index 7721ec1..673f097 100644 --- a/src/pages/Devices.tsx +++ b/src/pages/Devices.tsx @@ -472,7 +472,7 @@ export default function Devices() { ] if (hasPlenums) { columns.push({ - title: "Plenum", + title: "Temp/Humidity", // sortKey: "hi", // disableSort: true, render: (device: Device) => { From 8a9d7af6ae3c1191a9a283d012be1dba43018348 Mon Sep 17 00:00:00 2001 From: csawatzky Date: Tue, 19 Aug 2025 15:34:47 -0600 Subject: [PATCH 6/7] adding temp oats to the grain describer to have a user test which is more accurate --- src/grain/GrainDescriber.ts | 38 +++++++++++++++++++++++++++++++++++-- 1 file changed, 36 insertions(+), 2 deletions(-) diff --git a/src/grain/GrainDescriber.ts b/src/grain/GrainDescriber.ts index ce394b3..769826c 100644 --- a/src/grain/GrainDescriber.ts +++ b/src/grain/GrainDescriber.ts @@ -48,7 +48,7 @@ const defaultGrain: GrainExtension = { bushelsPerTonne: 0 }; -export const GrainExtensions: Map = new Map([ +export const GrainExtensions: Map = new Map([ [pond.Grain.GRAIN_INVALID, defaultGrain], [pond.Grain.GRAIN_NONE, defaultGrain], [ @@ -190,7 +190,7 @@ export const GrainExtensions: Map = new Map([ [ pond.Grain.GRAIN_OATS, { - name: "Oats", + name: "Oats a", group: "Oats", equation: Equation.henderson, a: 0.000085511, @@ -203,6 +203,40 @@ export const GrainExtensions: Map = new Map([ weightConversionKg: 15.4222988297197, bushelsPerTonne: 64.842 } + ], + [ + 29, + { + name: "Oats b", + group: "Oats", + equation: Equation.chungPfost, + a: 442.85, + b: 0.21228, + c: 35.803, + setTempC: 32.0, + targetMC: 13.6, + img: OatImg, + colour: "#79955a", + weightConversionKg: 15.4222988297197, + bushelsPerTonne: 64.842 + } + ], + [ + 30, + { + name: "Oats c", + group: "Oats", + equation: Equation.oswin, + a: 12.412, + b: -0.060707, + c: 2.9397, + setTempC: 32.0, + targetMC: 13.6, + img: OatImg, + colour: "#79955a", + weightConversionKg: 15.4222988297197, + bushelsPerTonne: 64.842 + } ], [ pond.Grain.GRAIN_PEANUTS, From e313fd10ae008d16322d8a1a904ccbb69151b6ba Mon Sep 17 00:00:00 2001 From: csawatzky Date: Tue, 19 Aug 2025 15:51:58 -0600 Subject: [PATCH 7/7] proto update for the test oats enum --- package-lock.json | 2 +- src/grain/GrainDescriber.ts | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0e4f8f9..fe947bc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10911,7 +10911,7 @@ }, "node_modules/protobuf-ts": { "version": "1.0.0", - "resolved": "git+https://gitlab+deploy-token-50627:hv8mB4WkyvtjBpJKU1rN@gitlab.com/brandx/protobuf-ts.git#0b7dd45fa720d6c3f20ac7bafac4a3f0bdbc7ab6", + "resolved": "git+https://gitlab+deploy-token-50627:hv8mB4WkyvtjBpJKU1rN@gitlab.com/brandx/protobuf-ts.git#0cdf4d5e3038ef13318da0841886a7c9f0926f8d", "dependencies": { "protobufjs": "^6.8.8" } diff --git a/src/grain/GrainDescriber.ts b/src/grain/GrainDescriber.ts index 769826c..c140a85 100644 --- a/src/grain/GrainDescriber.ts +++ b/src/grain/GrainDescriber.ts @@ -48,7 +48,7 @@ const defaultGrain: GrainExtension = { bushelsPerTonne: 0 }; -export const GrainExtensions: Map = new Map([ +export const GrainExtensions: Map = new Map([ [pond.Grain.GRAIN_INVALID, defaultGrain], [pond.Grain.GRAIN_NONE, defaultGrain], [ @@ -205,7 +205,7 @@ export const GrainExtensions: Map = new Map } ], [ - 29, + pond.Grain.GRAIN_OATS_B, { name: "Oats b", group: "Oats", @@ -222,7 +222,7 @@ export const GrainExtensions: Map = new Map } ], [ - 30, + pond.Grain.GRAIN_OATS_C, { name: "Oats c", group: "Oats",