From aa6219f4b7ad4d640d6ef5f991f80569fec5976d Mon Sep 17 00:00:00 2001 From: csawatzky Date: Mon, 27 Apr 2026 09:12:14 -0600 Subject: [PATCH] hotfix for when adding alerts from the bin page the conditions in the interaction were being showed in the converted value --- package-lock.json | 2 +- src/device/autoDetect/DeviceScannedComponents.tsx | 1 + src/objects/objectInteractions/NewObjectInteraction.tsx | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2cd53e8..a8d3068 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11205,7 +11205,7 @@ }, "node_modules/protobuf-ts": { "version": "1.0.0", - "resolved": "git+https://gitlab+deploy-token-50627:hv8mB4WkyvtjBpJKU1rN@gitlab.com/brandx/protobuf-ts.git#9c0f668d4a56b8216dd71a44c3110a818aaf3541", + "resolved": "git+https://gitlab+deploy-token-50627:hv8mB4WkyvtjBpJKU1rN@gitlab.com/brandx/protobuf-ts.git#29d9765ce93c04ad70d795b80e9873fc2fc5f600", "dependencies": { "protobufjs": "^6.8.8" } diff --git a/src/device/autoDetect/DeviceScannedComponents.tsx b/src/device/autoDetect/DeviceScannedComponents.tsx index 2be89a9..dda2bf4 100644 --- a/src/device/autoDetect/DeviceScannedComponents.tsx +++ b/src/device/autoDetect/DeviceScannedComponents.tsx @@ -71,6 +71,7 @@ export default function DeviceScannedComponents(props: Props){ let valid: quack.AddressData[] = [] //filter the address data let addr = scannedI2C?.settings?.foundAddresses + console.log(addr) if(addr){ addr.forEach(addrData => { if(!i2cBlacklistAddresses.includes(addrData.address)){ diff --git a/src/objects/objectInteractions/NewObjectInteraction.tsx b/src/objects/objectInteractions/NewObjectInteraction.tsx index 40aed71..8e68a3f 100644 --- a/src/objects/objectInteractions/NewObjectInteraction.tsx +++ b/src/objects/objectInteractions/NewObjectInteraction.tsx @@ -262,7 +262,7 @@ export default function NewObjectInteraction(props: Props){ const conditionGroup = (condition: pond.InteractionCondition, index: number) => { let measurementType = condition.measurementType; - let describer = describeMeasurement(measurementType, newAlertComponentType); + let describer = describeMeasurement(measurementType, newAlertComponentType, undefined, undefined, user); let isBoolean = condition.measurementType === Measurement.boolean; return (