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

Merge branch 'dev_environment' of gitlab.com:brandx/bxt-app into libracart

Browse source
This commit is contained in:
Noor 2025-08-06 09:24:46 -06:00
commit 1596f14ecd
62 changed files with 404 additions and 131682 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/pages/DeviceComponent.tsx
View file

@ -168,7 +168,8 @@ export default function DeviceComponent() {
getContextKeys(),
getContextTypes(),
showErrors,
as
showErrors,
as,
)
.then(resp => {
if (resp.data.measurements) {
@ -247,8 +248,8 @@ export default function DeviceComponent() {
if (rComponent?.status.lastMeasurement) {
setRM(rComponent.status.lastMeasurement);
}
if (rComponent?.lastMeasurement) {
let measurements = rComponent.lastMeasurement.map(um =>
if (rComponent?.status.measurement) {
let measurements = rComponent.status.measurement.map(um =>
UnitMeasurement.any(um, user)
);
setRecentUnitMeasurement(measurements);
@ -431,6 +432,7 @@ export default function DeviceComponent() {
getContextKeys(),
getContextTypes(),
showErrors,
showErrors,
as
)
.then(response => {
@ -487,7 +489,6 @@ export default function DeviceComponent() {
component={component}
reading={row}
tableCell={true}
excludedNodes={deviceComponentPrefs?.excludedNodes}
/>
)
}
@ -528,7 +529,7 @@ export default function DeviceComponent() {
// component={component}
// reading={row}
// tableCell={true}
// excludedNodes={deviceComponentPrefs?.excludedNodes}
// excludedNodes={component.settings.excludedNodes}
// />
// )
// }
@ -628,6 +629,7 @@ export default function DeviceComponent() {
getContextKeys(),
getContextTypes(),
showErrors,
showErrors,
as)
.then(resp => {
let newRows = UnitMeasurement.convertMeasurements(