brandxtech/frontend
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

hotfix for when adding alerts from the bin page the conditions in the interaction were being showed in the converted value

Browse source
This commit is contained in:
csawatzky 2026-04-27 09:12:14 -06:00
parent a7a8eed01e
commit aa6219f4b7
3 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
package-lock.json generated
View file

@ -11205,7 +11205,7 @@
}, },
"node_modules/protobuf-ts": { "node_modules/protobuf-ts": {
"version": "1.0.0", "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": { "dependencies": {
"protobufjs": "^6.8.8" "protobufjs": "^6.8.8"
} }

1
src/device/autoDetect/DeviceScannedComponents.tsx
View file

@ -71,6 +71,7 @@ export default function DeviceScannedComponents(props: Props){
let valid: quack.AddressData[] = [] let valid: quack.AddressData[] = []
//filter the address data //filter the address data
let addr = scannedI2C?.settings?.foundAddresses let addr = scannedI2C?.settings?.foundAddresses
console.log(addr)
if(addr){ if(addr){
addr.forEach(addrData => { addr.forEach(addrData => {
if(!i2cBlacklistAddresses.includes(addrData.address)){ if(!i2cBlacklistAddresses.includes(addrData.address)){

2
src/objects/objectInteractions/NewObjectInteraction.tsx
View file

@ -262,7 +262,7 @@ export default function NewObjectInteraction(props: Props){
const conditionGroup = (condition: pond.InteractionCondition, index: number) => { const conditionGroup = (condition: pond.InteractionCondition, index: number) => {
let measurementType = condition.measurementType; let measurementType = condition.measurementType;
let describer = describeMeasurement(measurementType, newAlertComponentType); let describer = describeMeasurement(measurementType, newAlertComponentType, undefined, undefined, user);
let isBoolean = condition.measurementType === Measurement.boolean; let isBoolean = condition.measurementType === Measurement.boolean;
return ( return (
<React.Fragment key={index}> <React.Fragment key={index}>