@dexteel/mesf-core 4.6.0 → 4.6.1

package/CHANGELOG.md

@@ -1,4 +1,6 @@
 # CHANGELOG
+## 4.6.1
+- Fix manual scales
 ## 4.6.0
 - Add Views and ViewTags functionalities to Trendings
 ## 4.5.9
@@ -84,4 +86,4 @@
 ## 2.1.5
 - Fix exportExcel method. Now it supports when sheets structure is defined. **REQUIRES mesf-core-api@1.2.2**
 ## 2.1.3
-- Implementation of **exportExcel** inside MESApiService. **REQUIRES mesf-core-api@1.2.0**
+- Implementation of **exportExcel** inside MESApiService. **REQUIRES mesf-core-api@1.2.0**

package/dist/index.esm.js

@@ -8469,6 +8469,9 @@ var TrendingsReducer = createSlice({
         setViewTags: function (state, _a) {
             var payload = _a.payload;
             state.viewTags = payload;
+        },
+        setGraphShouldUpdate: function (state) {
+            state.graphShouldUpdate = +1;
         }
     }
 });
@@ -9193,9 +9196,8 @@ var timeDifference = function (start, end) {
 var TableComponent = function (_a) {
     var chartData = _a.chartData, cursorData = _a.cursorData;
     var classes = useTagsTableStyles();
-    var _b = useTrendingContext(), _c = _b.state, viewTags = _c.viewTags, viewSelected = _c.viewSelected, setViewTags = _b.actions.setViewTags;
-    var _d = useState(''), error = _d[0], setError = _d[1];
-    var _e = useState(""); _e[0]; _e[1];
+    var _b = useTrendingContext(), _c = _b.state, viewTags = _c.viewTags, viewSelected = _c.viewSelected, _d = _b.actions, setViewTags = _d.setViewTags, setGraphShouldUpdate = _d.setGraphShouldUpdate;
+    var _e = useState(''), error = _e[0], setError = _e[1];
     var dataTable = useTagsDataTable({ viewTags: viewTags, chartData: chartData, cursorData: cursorData });
     var _f = useState({}), editableTagNames = _f[0], setEditableTagNames = _f[1];
     var handleChange = function (tagId, value, property) {
@@ -9204,6 +9206,7 @@ var TableComponent = function (_a) {
             return tag.TagId === tagId ? __assign(__assign({}, tag), (_a = {}, _a[property] = value, _a.IsAutoScale = false, _a)) : tag;
         });
         setViewTags(newTags);
+        setGraphShouldUpdate();
     };
     var handleChangeAlias = function (tagId, newName) {
         var newTags = viewTags.map(function (tag) { return (tag.TagId === tagId ? __assign(__assign({}, tag), { Alias: newName }) : tag); });
@@ -9232,6 +9235,11 @@ var TableComponent = function (_a) {
             setViewTags(newArr);
         }
     };
+    var handleAbleScales = function (tagId, checked) {
+        if (checked) {
+            handleAutoScaleChange(tagId, checked);
+        }
+    };
     var _g = useState(null), selectedRowIndex = _g[0], setSelectedRowIndex = _g[1];
     var _h = useState(false), addTagModalOpen = _h[0], setAddTagModalOpen = _h[1];
     var _j = useState(false), saveAsViewModalOpen = _j[0], setSaveAsViewModalOpen = _j[1];
@@ -9433,13 +9441,21 @@ var TableComponent = function (_a) {
                                 React__default.createElement("td", { className: classes.color },
                                     React__default.createElement(ColorPicker, { onChange: handleColorChange, color: tag.Color, elementId: tag.TagId })),
                                 React__default.createElement("td", { className: classes.inputCol },
-                                    React__default.createElement("input", { type: "text", style: { width: '100%' }, disabled: tag.IsAutoScale, value: tag.MinScale, onFocus: function (e) { return e.target.select(); }, onChange: function (e) {
+                                    React__default.createElement("input", { type: "text", style: __assign({ width: '100%' }, (tag.IsAutoScale ? {
+                                            backgroundColor: 'rgba(239, 239, 239, 0.3)',
+                                            color: 'rgba(84, 84, 84, 1)',
+                                            border: '1px solid rgba(118, 118, 118, 0.3)'
+                                        } : {})), value: tag.MinScale, onClick: function () { return handleAbleScales(tag.TagId, tag.IsAutoScale); }, onFocus: function (e) { return e.target.select(); }, onChange: function (e) {
                                             var value = e.target.value;
                                             var numericValue = Number(value);
                                             handleChange(tag.TagId, numericValue, 'MinScale');
                                         } })),
                                 React__default.createElement("td", { className: classes.inputCol },
-                                    React__default.createElement("input", { type: "text", style: { width: '100%' }, disabled: tag.IsAutoScale, value: tag.MaxScale, onFocus: function (e) { return e.target.select(); }, onChange: function (e) {
+                                    React__default.createElement("input", { type: "text", style: __assign({ width: '100%' }, (tag.IsAutoScale ? {
+                                            backgroundColor: 'rgba(239, 239, 239, 0.3)',
+                                            color: 'rgba(84, 84, 84, 1)',
+                                            border: '1px solid rgba(118, 118, 118, 0.3)'
+                                        } : {})), value: tag.MaxScale, onClick: function () { return handleAbleScales(tag.TagId, tag.IsAutoScale); }, onFocus: function (e) { return e.target.select(); }, onChange: function (e) {
                                             var value = e.target.value;
                                             var numericValue = Number(value);
                                             // Check if the value is a number and not empty
@@ -9868,53 +9884,62 @@ var TrendingChart = function (_a) {
     var verticalLinePlugin = useGetVerticalLinePlugin(setChartArea, setLineTabCoords);
     var xAxisDatePlugin = useXAxisDatePlugin();
     var yAxisPlugin = useYAxisPlugin();
+    var seriesVsTags = useRef({});
     useEffect(function () {
         var axes = [];
         if (!series.length) {
             return;
         }
         viewTags.forEach(function (tag, index) {
-            var _a;
-            if ((_a = series[index]) === null || _a === void 0 ? void 0 : _a.length) {
-                var existingAxis = axes.find(function (existingTag) {
-                    return areRangesSimilar(existingTag, tag);
-                });
-                if (!existingAxis) {
-                    axes.push(tag); // Add new axis if no similar one exists
-                }
+            var existingAxis = axes.findIndex(function (existingTag) {
+                return areRangesSimilar(existingTag, tag);
+            });
+            if (existingAxis === -1) {
+                axes.push(tag); // Add new axis if no similar one exists
+                seriesVsTags.current[tag.TagId] = tag.TagId;
+            }
+            else {
+                seriesVsTags.current[tag.TagId] = axes[existingAxis].TagId;
             }
         });
         // Configure yAxes based on grouped axes
-        var yAxesConfig = axes.map(function (axis, index) {
+        var yAxesConfig = axes.map(function (axis) {
             return {
-                id: "y-axis-".concat(index),
+                id: "y-axis-".concat(axis.TagId),
                 type: "linear",
-                display: axis.visible,
+                display: axis.IsVisible,
                 scaleLabel: {
                     display: true,
-                    labelString: axis.tagName
-                },
-                ticks: {
-                    min: axis.autoScale ? undefined : axis.minScale,
-                    max: axis.autoScale ? undefined : axis.maxScale
+                    labelString: axis.TagName
                 },
+                min: axis.IsAutoScale ? undefined : axis.MinScale,
+                max: axis.IsAutoScale ? undefined : axis.MaxScale,
+                suggestedMin: axis.IsAutoScale ? undefined : axis.MinScale,
+                suggestedMax: axis.IsAutoScale ? undefined : axis.MaxScale,
+                stepSize: 10,
                 grid: {
                     display: true
                 },
-                afterUpdate: function (axis) {
-                    var chart = axis.chart;
+                afterUpdate: function (a) {
+                    var chart = a.chart;
                     var keys = Object.keys(chart.scales).filter(function (sc) { return sc !== 'x'; });
+                    var counterOfDefaultsScales = 0;
                     if (keys.length > 1) {
                         for (var scaleKey in chart.scales) {
                             var scale = chart.scales[scaleKey];
                             if (scale.max === 1 && scale.min === 0) {
                                 chart.scales[scaleKey].display = false;
                                 chart.scales[scaleKey].options.display = false;
+                                counterOfDefaultsScales++;
                             }
                             else {
                                 chart.scales[scaleKey].display = true;
                                 chart.scales[scaleKey].options.display = true;
                             }
+                            if (counterOfDefaultsScales === keys.length) {
+                                chart.scales[keys[0]].display = true;
+                                chart.scales[keys[0]].options.display = true;
+                            }
                         }
                     }
                 }
@@ -9929,11 +9954,9 @@ var TrendingChart = function (_a) {
         });
         var updatedSeries = series.map(function (serie, index) {
             var tag = viewTags[index];
-            var axisIndex = axes.findIndex(function (existingTag) {
-                return areRangesSimilar(existingTag, tag);
-            });
+            var yAxisTagId = seriesVsTags.current[tag.TagId];
             return {
-                yAxisID: axisIndex >= 0 ? "y-axis-".concat(axisIndex) : undefined,
+                yAxisID: "y-axis-".concat(yAxisTagId),
                 data: serie.map(function (sample) { return ({
                     x: new Date(sample.timestamp),
                     y: sample.value