@dexteel/mesf-core 4.7.5 → 4.7.7

package/CHANGELOG.md

@@ -1,4 +1,9 @@
 # CHANGELOG
+## 4.7.7
+- Trendings: Scales now admits negative numbers
+- Trendings: Fix saveTagDefaults bug. When you save the default to Tag, you also save the View Tag selected.
+## 4.7.6
+- Remove margin in configurations page
 ## 4.7.5
 - Added function to format AssetFullPath and display a part in the input
 ## 4.7.4

package/dist/configurationMenu.d.ts

@@ -5,10 +5,9 @@ type SectionComponent = {
     main: React.FunctionComponent;
     exact?: boolean;
 };
-export interface SidebarType extends React.FunctionComponent<{
+export type SidebarType = React.FunctionComponent<{
     option?: string;
-}> {
-}
+}>;
 export type ConfigurationsType = [SectionComponent[], SidebarType];
 export default function Configuration(): React.JSX.Element;
 export {};

package/dist/index.esm.js

@@ -9627,8 +9627,8 @@ function Configuration() {
                 React__default.createElement(MenuList, { className: "mes-submenu" },
                     React__default.createElement(MenuItem, { selected: option === "forms", className: "p-0" },
                         React__default.createElement(Link, { to: "/configuration/forms", className: "nav-link" }, "Form Settings")))),
-            React__default.createElement("div", { className: "col-md-10 m-3", style: { flex: "80%" } },
-                React__default.createElement(Routes, null, routes.map(function (route, index) { return (React__default.createElement(Route, { key: index, path: route.path, element: React__default.createElement(route.main, null) })); }))))));
+            React__default.createElement("div", { className: "col-md-10", style: { flex: "80%" } },
+                React__default.createElement(Routes, null, routes.map(function (route, index) { return (React__default.createElement(Route, { key: "".concat(route.path), path: route.path, element: React__default.createElement(route.main, null) })); }))))));
 }
 
 var Home = function () { return (React__default.createElement("div", { style: {
@@ -10050,7 +10050,7 @@ var TagSelectionModal = function (_a) {
                                                     tag: {
                                                         TagId: dbTag.tagId,
                                                         TagName: dbTag.tagName,
-                                                        Color: getColor(),
+                                                        Color: dbTag.color || getColor(),
                                                         IsAutoScale: true,
                                                         MinScale: dbTag.minScale,
                                                         MaxScale: dbTag.maxScale,
@@ -10641,7 +10641,6 @@ var TableComponent = function (_a) {
     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) {
         var newTags = viewTags.map(function (tag) {
             var _a;
@@ -10686,11 +10685,11 @@ var TableComponent = function (_a) {
             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), saveViewModalOpen = _j[0], setSaveViewModalOpen = _j[1];
-    var _k = useState(false), saveAsViewModalOpen = _k[0], setSaveAsViewModalOpen = _k[1];
-    var _l = useState(false), loadViewOpen = _l[0], setLoadViewOpen = _l[1];
+    var _f = useState(null), selectedRowIndex = _f[0], setSelectedRowIndex = _f[1];
+    var _g = useState(false), addTagModalOpen = _g[0], setAddTagModalOpen = _g[1];
+    var _h = useState(false), saveViewModalOpen = _h[0], setSaveViewModalOpen = _h[1];
+    var _j = useState(false), saveAsViewModalOpen = _j[0], setSaveAsViewModalOpen = _j[1];
+    var _k = useState(false), loadViewOpen = _k[0], setLoadViewOpen = _k[1];
     var handleClose = function () { return setAddTagModalOpen(false); };
     var ContextMenu = function (_a) {
         var x = _a.x, y = _a.y, options = _a.options;
@@ -10701,7 +10700,7 @@ var TableComponent = function (_a) {
             React__default.createElement("ul", null, options.map(function (option) { return (React__default.createElement("li", { key: option.id, onClick: option.onClick }, option.label)); }))));
     };
     // Position state for the context menu
-    var _m = useState({ x: 0, y: 0 }), contextMenuPosition = _m[0], setContextMenuPosition = _m[1];
+    var _l = useState({ x: 0, y: 0 }), contextMenuPosition = _l[0], setContextMenuPosition = _l[1];
     var contextMenuOptions = [
         { id: 'delete', label: 'Remove Tag', onClick: function () { return handleDelete(); } },
         { id: 'add', label: 'Add Tag', onClick: function () { return setAddTagModalOpen(true); } },
@@ -10738,14 +10737,6 @@ var TableComponent = function (_a) {
             }
         });
     }); };
-    useEffect(function () {
-        if (Array.isArray(viewTags)) {
-            setEditableTagNames(viewTags.reduce(function (acc, tag) {
-                acc[tag.TagId] = tag.Alias || tag.TagName;
-                return acc;
-            }, {}));
-        }
-    }, [viewTags]);
     useEffect(function () {
         var handleGlobalClick = function (e) {
             if (selectedRowIndex !== null) {
@@ -10773,39 +10764,27 @@ var TableComponent = function (_a) {
         setContextMenuPosition({ x: event.clientX, y: event.clientY });
     };
     var handleSaveDefaultToTag = function () { return __awaiter(void 0, void 0, void 0, function () {
-        var promises, allResponses, error_1;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
+        var _a, TagId, Alias, Color, MinScale, MaxScale, Unit, IsVisible, IsAutoScale, saveTagDefaultsResp, upsertViewTagResp;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
                 case 0:
-                    _a.trys.push([0, 2, 3, 4]);
-                    promises = viewTags.map(function (vt) { return __awaiter(void 0, void 0, void 0, function () {
-                        var response;
-                        return __generator(this, function (_a) {
-                            switch (_a.label) {
-                                case 0: return [4 /*yield*/, saveTagDefaults(vt.TagId, vt.Alias, vt.Color, vt.MinScale, vt.MaxScale, vt.Unit)];
-                                case 1:
-                                    response = _a.sent();
-                                    return [2 /*return*/, response];
-                            }
-                        });
-                    }); });
-                    return [4 /*yield*/, Promise.all(promises)];
+                    if (!(viewSelected && selectedRowIndex !== null)) return [3 /*break*/, 3];
+                    _a = viewTags[selectedRowIndex], TagId = _a.TagId, Alias = _a.Alias, Color = _a.Color, MinScale = _a.MinScale, MaxScale = _a.MaxScale, Unit = _a.Unit, IsVisible = _a.IsVisible, IsAutoScale = _a.IsAutoScale;
+                    return [4 /*yield*/, saveTagDefaults(TagId, Alias, Color, MinScale, MaxScale, Unit)];
                 case 1:
-                    allResponses = _a.sent();
-                    allResponses.forEach(function (r) {
-                        if (!r.ok) {
-                            setError(r.message);
-                        }
-                    });
-                    return [3 /*break*/, 4];
+                    saveTagDefaultsResp = _b.sent();
+                    return [4 /*yield*/, upsertViewTag(viewSelected === null || viewSelected === void 0 ? void 0 : viewSelected.ViewId, TagId, Color, MinScale, MaxScale, IsVisible, IsAutoScale)];
                 case 2:
-                    error_1 = _a.sent();
-                    setError(error_1.message);
-                    return [3 /*break*/, 4];
-                case 3:
+                    upsertViewTagResp = _b.sent();
+                    if (!saveTagDefaultsResp.ok) {
+                        setError(saveTagDefaultsResp.message);
+                    }
+                    if (!upsertViewTagResp.ok) {
+                        setError(upsertViewTagResp.message);
+                    }
                     setSelectedRowIndex(null);
-                    return [7 /*endfinally*/];
-                case 4: return [2 /*return*/];
+                    _b.label = 3;
+                case 3: return [2 /*return*/];
             }
         });
     }); };
@@ -10895,35 +10874,33 @@ var TableComponent = function (_a) {
                                 React__default.createElement("td", { className: classes.inputCol },
                                     React__default.createElement(Tooltip, { title: tag.TagName, placement: "top", arrow: true, interactive: true, enterDelay: 500 },
                                         React__default.createElement("div", null,
-                                            React__default.createElement("input", { type: "text", style: { width: '100%' }, value: editableTagNames[tag.TagId], onFocus: function (e) { return e.target.select(); }, onChange: function (e) {
-                                                    var _a;
-                                                    setEditableTagNames(__assign(__assign({}, editableTagNames), (_a = {}, _a[tag.TagId] = e.target.value, _a)));
-                                                }, onKeyDown: function (e) {
-                                                    if (e.key === 'Enter') {
-                                                        handleChangeAlias(tag.TagId, editableTagNames[tag.TagId]);
-                                                    }
+                                            React__default.createElement("input", { type: "text", style: { width: '100%' }, value: tag.Alias || tag.TagName, onFocus: function (e) { return e.target.select(); }, onChange: function (e) {
+                                                    var newAlias = e.target.value;
+                                                    handleChangeAlias(tag.TagId, newAlias);
                                                 } })))),
                                 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: __assign({ width: '100%' }, (tag.IsAutoScale ? {
+                                    React__default.createElement("input", { type: "number", 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');
+                                            if (!isNaN(numericValue) && value.trim() !== '') {
+                                                handleChange(tag.TagId, numericValue, 'MinScale');
+                                            }
                                         } })),
                                 React__default.createElement("td", { className: classes.inputCol },
-                                    React__default.createElement("input", { type: "text", style: __assign({ width: '100%' }, (tag.IsAutoScale ? {
+                                    React__default.createElement("input", { type: "number" // Cambiado de text a number para una mejor validación de entrada
+                                        , 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
                                             if (!isNaN(numericValue) && value.trim() !== '') {
                                                 handleChange(tag.TagId, numericValue, 'MaxScale');
                                             }