RnD/generalFunctions
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit '12fce6c' into HEAD

Browse Source 
# Conflicts:
#	index.js
#	src/configs/index.js
#	src/configs/machineGroupControl.json
#	src/helper/assetUtils.js
#	src/helper/childRegistrationUtils.js
#	src/helper/configUtils.js
#	src/helper/logger.js
#	src/helper/menuUtils.js
#	src/helper/menuUtils_DEPRECATED.js
#	src/helper/outputUtils.js
#	src/helper/validationUtils.js
#	src/measurements/Measurement.js
#	src/measurements/MeasurementContainer.js
#	src/measurements/examples.js
#	src/outliers/outlierDetection.js
This commit is contained in:
znetsixe
2026-03-31 18:07:57 +02:00
parent 27a6d3c709 12fce6c549
commit f96476bd23
53 changed files with 3545 additions and 1978 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/helper/configUtils.js
View File

@@ -80,7 +80,7 @@ class ConfigUtils {
// loop through objects and merge them obj1 will be updated with obj2 values
mergeObjects(obj1, obj2) {
for (let key in obj2) {
if (obj2.hasOwnProperty(key)) {
if (Object.prototype.hasOwnProperty.call(obj2, key)) {
const nextValue = obj2[key];
if (Array.isArray(nextValue)) {