bruce-models 1.9.2 → 1.9.3

package/dist/bruce-models.umd.js

@@ -2022,18 +2022,24 @@
      * Needs to become ["Test", "Test1"].
      * We need to cull this in admin-ui.
      * @param path
-     * @returns
+     * @returns Possible paths this legacy one could mean.
      */
     function parseLegacyPath(path) {
         if (!path) {
             return [];
         }
+        const paths = [];
         if (path.startsWith("${") && path.endsWith("}")) {
             path = path.replace("${", "");
             path = path.replace("}", "");
-            return exports.PathUtils.ParseLegacy(path);
-        }
-        return exports.PathUtils.Parse(path);
+            // Split by dots.
+            paths.push(exports.PathUtils.ParseLegacy(path));
+            // Take string as is.
+            paths.push([path]);
+        }
+        // Split by backslashes.
+        paths.push(exports.PathUtils.Parse(path));
+        return paths;
     }
     (function (Calculator) {
         let EValueType;
@@ -2225,43 +2231,46 @@
         }
         Calculator.GetString = GetString;
         function GetMappingValue(value, entity) {
-            const attrPath = parseLegacyPath(value.field);
-            let eValue = exports.Entity.GetValue({
-                entity: entity,
-                path: attrPath
-            });
-            const isValueNum = !isNaN(+eValue);
-            for (let i = 0; i < value.values.length; i++) {
-                const option = value.values[i];
-                const mapValue = option.fieldValue;
-                const isMapValueNum = !isNaN(+mapValue);
-                if (isValueNum && isMapValueNum) {
-                    if (+mapValue == +eValue) {
-                        return option.appliedValue;
-                    }
-                    const mapSplit = mapValue.split("-");
-                    if (mapSplit.length == 2) {
-                        const min = mapSplit[0];
-                        const max = mapSplit[1];
-                        if (min != "") {
-                            if (+eValue < +min) {
-                                continue;
-                            }
+            const attrPaths = parseLegacyPath(value.field);
+            for (let i = 0; i < attrPaths.length; i++) {
+                const attrPath = attrPaths[i];
+                let eValue = exports.Entity.GetValue({
+                    entity: entity,
+                    path: attrPath
+                });
+                const isValueNum = !isNaN(+eValue);
+                for (let i = 0; i < value.values.length; i++) {
+                    const option = value.values[i];
+                    const mapValue = option.fieldValue;
+                    const isMapValueNum = !isNaN(+mapValue);
+                    if (isValueNum && isMapValueNum) {
+                        if (+mapValue == +eValue) {
+                            return option.appliedValue;
                         }
-                        if (max != "") {
-                            if (+eValue > +max) {
+                        const mapSplit = mapValue.split("-");
+                        if (mapSplit.length == 2) {
+                            const min = mapSplit[0];
+                            const max = mapSplit[1];
+                            if (min != "") {
+                                if (+eValue < +min) {
+                                    continue;
+                                }
+                            }
+                            if (max != "") {
+                                if (+eValue > +max) {
+                                    continue;
+                                }
+                            }
+                            if (min == "" && max == "") {
                                 continue;
                             }
+                            return option.appliedValue;
                         }
-                        if (min == "" && max == "") {
-                            continue;
-                        }
-                        return option.appliedValue;
                     }
-                }
-                else {
-                    if (mapValue == eValue) {
-                        return option.appliedValue;
+                    else {
+                        if (mapValue == eValue) {
+                            return option.appliedValue;
+                        }
                     }
                 }
             }
@@ -2269,31 +2278,34 @@
         }
         Calculator.GetMappingValue = GetMappingValue;
         function GetGradientValue(value, entity) {
-            const attrPath = parseLegacyPath(value.field);
-            let eValue = exports.Entity.GetValue({
-                entity: entity,
-                path: attrPath
-            });
-            eValue = Math.min(Math.max(eValue, value.min), value.max);
-            if (eValue < value.points[0].position) {
-                return exports.Color.ColorFromStr(value.points[0].color);
-            }
-            for (let i = 0; i < value.points.length - 1; i++) {
-                const pointA = value.points[i];
-                const pointB = value.points[i + 1];
-                if (eValue >= pointA.position && eValue <= pointB.position) {
-                    if (pointA.position == pointB.position) {
-                        return exports.Color.ColorFromStr(pointA.color);
-                    }
-                    const distance = (eValue - pointA.position) / (pointB.position - pointA.position);
-                    const colorA = exports.Color.ColorFromStr(pointA.color);
-                    const colorB = exports.Color.ColorFromStr(pointB.color);
-                    return {
-                        red: colorA.red + (colorB.red - colorA.red) * distance,
-                        green: colorA.green + (colorB.green - colorA.green) * distance,
-                        blue: colorA.blue + (colorB.blue - colorA.blue) * distance,
-                        alpha: colorA.alpha + (colorB.alpha - colorA.alpha) * distance
-                    };
+            const attrPaths = parseLegacyPath(value.field);
+            for (let i = 0; i < attrPaths.length; i++) {
+                const attrPath = attrPaths[i];
+                let eValue = exports.Entity.GetValue({
+                    entity: entity,
+                    path: attrPath
+                });
+                eValue = Math.min(Math.max(eValue, value.min), value.max);
+                if (eValue < value.points[0].position) {
+                    return exports.Color.ColorFromStr(value.points[0].color);
+                }
+                for (let i = 0; i < value.points.length - 1; i++) {
+                    const pointA = value.points[i];
+                    const pointB = value.points[i + 1];
+                    if (eValue >= pointA.position && eValue <= pointB.position) {
+                        if (pointA.position == pointB.position) {
+                            return exports.Color.ColorFromStr(pointA.color);
+                        }
+                        const distance = (eValue - pointA.position) / (pointB.position - pointA.position);
+                        const colorA = exports.Color.ColorFromStr(pointA.color);
+                        const colorB = exports.Color.ColorFromStr(pointB.color);
+                        return {
+                            red: colorA.red + (colorB.red - colorA.red) * distance,
+                            green: colorA.green + (colorB.green - colorA.green) * distance,
+                            blue: colorA.blue + (colorB.blue - colorA.blue) * distance,
+                            alpha: colorA.alpha + (colorB.alpha - colorA.alpha) * distance
+                        };
+                    }
                 }
             }
             return exports.Color.ColorFromStr(value.points[value.points.length - 1].color);