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

Merge branch 'component_quack' into airflow

Browse source
This commit is contained in:
csawatzky 2025-07-28 15:17:17 -06:00
commit cd06fcb6dd
2 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
package-lock.json generated
View file

@ -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#master",
"protobuf-ts": "git+https://gitlab+deploy-token-50627:hv8mB4WkyvtjBpJKU1rN@gitlab.com/brandx/protobuf-ts.git#airflow",
"query-string": "^9.2.1",
"react": "^18.3.1",
"react-beautiful-dnd": "^13.1.1",
@ -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#ea5c01a80b896e8a22e7930780b1b3479e449c90",
"resolved": "git+https://gitlab+deploy-token-50627:hv8mB4WkyvtjBpJKU1rN@gitlab.com/brandx/protobuf-ts.git#e6585789a9ae44f8ace247cff4411c79dd38c4d1",
"dependencies": {
"protobufjs": "^6.8.8"
}

14
src/component/ComponentForm.tsx
View file

@ -482,7 +482,7 @@ export default function ComponentForm(props: Props) {
const updateCalibrationTypes = (event: any, index: number) => {
let f = cloneDeep(form);
f.component.settings.calibrations[index].type = event.target.value as quack.MeasurementType;
f.component.settings.calibrations[index].measurementType = event.target.value as quack.MeasurementType;
setForm(f);
};
@ -508,7 +508,7 @@ export default function ComponentForm(props: Props) {
if (dimensions !== undefined && dimensions !== null) {
dimensions.lengthCm = value;
} else {
dimensions = pond.Dimensions.create({
dimensions = quack.Dimensions.create({
heightCm: 0,
lengthCm: value,
widthCm: 0
@ -537,7 +537,7 @@ export default function ComponentForm(props: Props) {
if (dimensions !== undefined && dimensions !== null) {
dimensions.heightCm = value;
} else {
dimensions = pond.Dimensions.create({
dimensions = quack.Dimensions.create({
heightCm: value,
lengthCm: 0,
widthCm: 0
@ -566,7 +566,7 @@ export default function ComponentForm(props: Props) {
if (dimensions !== undefined && dimensions !== null) {
dimensions.widthCm = value;
} else {
dimensions = pond.Dimensions.create({
dimensions = quack.Dimensions.create({
heightCm: 0,
lengthCm: 0,
widthCm: value
@ -788,7 +788,7 @@ export default function ComponentForm(props: Props) {
// !isMeasurementTypeValid(interaction.settings.conditions[index].measurementType)
// }
disabled={!component.settings.calibrate}
value={calibration.type ?? quack.MeasurementType.MEASUREMENT_TYPE_INVALID}
value={calibration.measurementType ?? quack.MeasurementType.MEASUREMENT_TYPE_INVALID}
onChange={event => updateCalibrationTypes(event, i)}
autoFocus={false}
margin="normal"
@ -814,8 +814,8 @@ export default function ComponentForm(props: Props) {
f.coefficients.push("0");
f.offsets.push("0");
f.component.settings.calibrations.push(
pond.Calibration.create({
type: quack.MeasurementType.MEASUREMENT_TYPE_INVALID,
quack.Calibration.create({
measurementType: quack.MeasurementType.MEASUREMENT_TYPE_INVALID,
calibrationOffset: 0,
calibrationCoefficient: 0
})