@dexteel/mesf-core 4.8.3 → 4.8.5

package/CHANGELOG.md

@@ -1,4 +1,8 @@
 # CHANGELOG
+## 4.8.5
+- Trending: Fix bugs on Add Tag modal, SaveDefaultToTag, Remove Tag, Save View, Edit viewTags, and performance (#204)
+## 4.8.4
+- Trending: In Add Tag modal, fix unnecessary calls to /children bug. Now only makes calls when the tag has childrens (#203)
 ## 4.8.3
 - Trending: Add new icon to ViewTags table and Add tag modal to know if it is Digital or Real (#205 and #206)
 ## 4.8.2

package/dist/index.esm.js

@@ -9663,7 +9663,8 @@ var TrendingsInitialState = {
         }
     ],
     viewSelected: null,
-    viewTags: []
+    viewTags: [],
+    shouldRefetchSeries: 1
 };
 var TrendingsReducer = createSlice({
     name: "__",
@@ -9671,6 +9672,7 @@ var TrendingsReducer = createSlice({
     reducers: {
         setTotalScope: function (state, _a) {
             var payload = _a.payload; _a.type;
+            state.shouldRefetchSeries += 1;
             state.graphShouldUpdate += 1;
             if (!isNil$1(payload.start) && !isNil$1(payload.end) && !isNil$1(payload.scope)) {
                 //from arrow navigators
@@ -9818,6 +9820,12 @@ var TrendingsReducer = createSlice({
         setViewTags: function (state, _a) {
             var payload = _a.payload;
             state.viewTags = payload;
+            state.graphShouldUpdate += 1;
+        },
+        setViewTagsAndRefetch: function (state, _a) {
+            var payload = _a.payload;
+            state.viewTags = payload;
+            state.shouldRefetchSeries += 1;
         },
         setGraphShouldUpdate: function (state) {
             state.graphShouldUpdate = +1;
@@ -10123,31 +10131,36 @@ var TagSelectionModal = function (_a) {
                     case 2:
                         response = _a.sent();
                         return [4 /*yield*/, Promise.all(response.data.map(function (dbTag) { return __awaiter(void 0, void 0, void 0, function () {
-                                var childTagName, children;
+                                var children, childTagName;
                                 return __generator(this, function (_a) {
                                     switch (_a.label) {
                                         case 0:
+                                            children = null;
                                             childTagName = tagName !== "root" ? tagName + "." + dbTag.tagName : dbTag.tagName;
+                                            if (!isNil$1(dbTag.tagType)) return [3 /*break*/, 2];
                                             return [4 /*yield*/, fetchChildren(childTagName, depth + 1, maxDepth)];
                                         case 1:
                                             children = _a.sent();
-                                            return [2 /*return*/, {
+                                            _a.label = 2;
+                                        case 2: return [2 /*return*/, {
+                                                TagId: dbTag.tagId,
+                                                TagName: childTagName,
+                                                shortName: dbTag.tagName,
+                                                children: children,
+                                                isLoaded: true,
+                                                tag: {
                                                     TagId: dbTag.tagId,
-                                                    TagName: childTagName,
-                                                    shortName: dbTag.tagName,
-                                                    children: children,
-                                                    isLoaded: true,
-                                                    tag: {
-                                                        TagId: dbTag.tagId,
-                                                        TagName: dbTag.tagName,
-                                                        Color: dbTag.color || getColor(),
-                                                        IsAutoScale: true,
-                                                        MinScale: dbTag.minScale,
-                                                        MaxScale: dbTag.maxScale,
-                                                        IsVisible: true,
-                                                        TagType: dbTag.tagType
-                                                    }
-                                                }];
+                                                    TagName: dbTag.tagName,
+                                                    Color: dbTag.color || getColor(),
+                                                    IsAutoScale: (dbTag.minValue || dbTag.maxValue) ? false : true,
+                                                    MinScale: dbTag.minValue,
+                                                    MaxScale: dbTag.maxValue,
+                                                    IsVisible: true,
+                                                    TagType: dbTag.tagType,
+                                                    Alias: dbTag.alias,
+                                                    Unit: dbTag.unit
+                                                }
+                                            }];
                                     }
                                 });
                             }); }))];
@@ -10322,7 +10335,7 @@ var getViewTags = function (ViewId) { return __awaiter(void 0, void 0, void 0, f
         }
     });
 }); };
-var upsertViewTag = function (ViewId, TagId, Color, MinScale, MaxScale, IsVisible, IsAutoScale) { return __awaiter(void 0, void 0, void 0, function () {
+var upsertViewTag = function (ViewId, TagId, Color, MinScale, MaxScale, IsVisible, IsAutoScale, Unit) { return __awaiter(void 0, void 0, void 0, function () {
     var apiService, parameters, resp;
     return __generator(this, function (_a) {
         switch (_a.label) {
@@ -10336,6 +10349,7 @@ var upsertViewTag = function (ViewId, TagId, Color, MinScale, MaxScale, IsVisibl
                 parameters.push({ name: "MaxScale", value: MaxScale });
                 parameters.push({ name: "IsVisible", value: IsVisible });
                 parameters.push({ name: "IsAutoScale", value: IsAutoScale });
+                parameters.push({ name: "Unit", value: Unit });
                 return [4 /*yield*/, apiService.callV2("[mssql2022].[IH_100020].[ih].[UpsertViewTag]", parameters)];
             case 1:
                 resp = _a.sent();
@@ -10695,8 +10709,8 @@ var SaveAsViewModal = function (_a) {
                     if (!resp.ok) return [3 /*break*/, 3];
                     ViewId_1 = resp.data.returnValue;
                     return [4 /*yield*/, Promise.allSettled(viewTags.map(function (_a) {
-                            var TagId = _a.TagId, Color = _a.Color, MinScale = _a.MinScale, MaxScale = _a.MaxScale, IsAutoScale = _a.IsAutoScale, IsVisible = _a.IsVisible;
-                            upsertViewTag(ViewId_1, TagId, Color, MinScale, MaxScale, IsVisible, IsAutoScale)
+                            var TagId = _a.TagId, Color = _a.Color, MinScale = _a.MinScale, MaxScale = _a.MaxScale, IsAutoScale = _a.IsAutoScale, IsVisible = _a.IsVisible, Unit = _a.Unit;
+                            upsertViewTag(ViewId_1, TagId, Color, MinScale, MaxScale, IsVisible, IsAutoScale, Unit)
                                 .then(function (r) {
                                 if (!r.ok) {
                                     setError(r.message);
@@ -10855,7 +10869,7 @@ var formatTimeDiffWithMs = function (start, end) {
 var TableComponent = function (_a) {
     var chartData = _a.chartData, cursorData = _a.cursorData, getTagsFromAPI = _a.getTagsFromAPI;
     var classes = useTagsTableStyles();
-    var _b = useTrendingContext(), _c = _b.state, viewTags = _c.viewTags, viewSelected = _c.viewSelected, _d = _b.actions, setViewTags = _d.setViewTags, setGraphShouldUpdate = _d.setGraphShouldUpdate; _d.setViewSelected;
+    var _b = useTrendingContext(), _c = _b.state, viewTags = _c.viewTags, viewSelected = _c.viewSelected, _d = _b.actions, setViewTags = _d.setViewTags, setViewTagsAndRefetch = _d.setViewTagsAndRefetch;
     var _e = useState({}); _e[0]; _e[1];
     var _f = useState(''), error = _f[0], setError = _f[1];
     var _g = useState(false); _g[0]; var setIsLoading = _g[1];
@@ -10872,10 +10886,9 @@ 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); });
+        var newTags = viewTags.map(function (tag) { return tag.TagId === tagId ? __assign(__assign({}, tag), { Alias: newName }) : tag; });
         setViewTags(newTags);
     };
     var handleVisibilityChange = function (tagId, value) {
@@ -10896,13 +10909,13 @@ var TableComponent = function (_a) {
     };
     var handleDeleteTag = function (tagId) {
         var newTags = viewTags.filter(function (tag) { return tag.TagId !== tagId; });
-        setViewTags(newTags);
+        setViewTagsAndRefetch(newTags);
     };
     var handleAddTag = function (newTag) {
         var newArr = __spreadArray([], viewTags, true);
         if (newTag) {
             newArr.push(newTag);
-            setViewTags(newArr);
+            setViewTagsAndRefetch(newArr);
         }
     };
     var handleAbleScales = function (tagId, checked) {
@@ -10962,8 +10975,8 @@ var TableComponent = function (_a) {
                         setError(deleteResp.message);
                     }
                     return [4 /*yield*/, Promise.allSettled(viewTags.map(function (_a) {
-                            var TagId = _a.TagId, Color = _a.Color, MinScale = _a.MinScale, MaxScale = _a.MaxScale, IsAutoScale = _a.IsAutoScale, IsVisible = _a.IsVisible;
-                            upsertViewTag(viewSelected === null || viewSelected === void 0 ? void 0 : viewSelected.ViewId, TagId, Color, MinScale, MaxScale, IsVisible, IsAutoScale)
+                            var TagId = _a.TagId, Color = _a.Color, MinScale = _a.MinScale, MaxScale = _a.MaxScale, IsAutoScale = _a.IsAutoScale, IsVisible = _a.IsVisible, Unit = _a.Unit;
+                            upsertViewTag(viewSelected === null || viewSelected === void 0 ? void 0 : viewSelected.ViewId, TagId, Color, MinScale, MaxScale, IsVisible, IsAutoScale, Unit)
                                 .then(function (r) {
                                 if (!r.ok) {
                                     setError(r.message);
@@ -11034,7 +11047,7 @@ var TableComponent = function (_a) {
                     return [4 /*yield*/, saveTagDefaults(TagId, Alias, Color, MinScale, MaxScale, Unit)];
                 case 1:
                     saveTagDefaultsResp = _b.sent();
-                    return [4 /*yield*/, upsertViewTag(viewSelected === null || viewSelected === void 0 ? void 0 : viewSelected.ViewId, TagId, Color, MinScale, MaxScale, IsVisible, IsAutoScale)];
+                    return [4 /*yield*/, upsertViewTag(viewSelected === null || viewSelected === void 0 ? void 0 : viewSelected.ViewId, TagId, Color, MinScale, MaxScale, IsVisible, IsAutoScale, Unit)];
                 case 2:
                     upsertViewTagResp = _b.sent();
                     if (!saveTagDefaultsResp.ok) {
@@ -11149,7 +11162,7 @@ var TableComponent = function (_a) {
                                 React__default.createElement("td", { className: classes.aliasCol },
                                     React__default.createElement(Tooltip, { title: tag.TagName, placement: "top", arrow: true, interactive: true, enterDelay: 500 },
                                         React__default.createElement("div", { style: { display: 'flex', alignItems: 'center' } },
-                                            React__default.createElement("div", { className: classes.dataType, style: { backgroundColor: tag.TagType === "Real" ? "blue" : "red" } }, tag.TagType === "Real" ? "A" : "D"),
+                                            React__default.createElement("div", { className: classes.dataType, style: { backgroundColor: tag.TagType === "Real" || tag.TagType === "A" ? "blue" : "red" } }, tag.TagType === "Real" || tag.TagType === "A" ? "A" : "D"),
                                             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);
@@ -11181,14 +11194,14 @@ var TableComponent = function (_a) {
                                             }
                                         } })),
                                 React__default.createElement("td", { className: "".concat(classes.autoScale, " ").concat(classes.checkbox) },
-                                    React__default.createElement("input", { type: "checkbox", checked: tag.IsAutoScale, onChange: function (e) { return handleAutoScaleChange(tag.TagId, tag.IsAutoScale); } })),
+                                    React__default.createElement("input", { type: "checkbox", checked: !!tag.IsAutoScale, onChange: function (e) { return handleAutoScaleChange(tag.TagId, tag.IsAutoScale); } })),
                                 React__default.createElement("td", { className: "".concat(classes.autoScale, " ").concat(classes.checkbox) },
                                     React__default.createElement("input", { type: "text", style: {
                                             width: '100%'
                                         }, onClick: function () { return handleAbleScales(tag.TagId, tag.IsAutoScale); }, onChange: function (e) {
                                             var value = e.target.value;
                                             handleUnitChange(tag.TagId, value);
-                                        }, value: tag.Unit, onFocus: function (e) { return e.target.select(); } })),
+                                        }, value: tag.Unit === "-" ? '' : tag.Unit, onFocus: function (e) { return e.target.select(); } })),
                                 React__default.createElement("td", null, round((_a = dataTable[tag.TagName]) === null || _a === void 0 ? void 0 : _a.y1, 3)),
                                 React__default.createElement("td", { className: classes.doubleInput }, round((_b = dataTable[tag.TagName]) === null || _b === void 0 ? void 0 : _b.y2, 3)),
                                 React__default.createElement("td", null, round((_c = dataTable[tag.TagName]) === null || _c === void 0 ? void 0 : _c.y2y1, 3)),
@@ -11774,16 +11787,16 @@ var TrendingChart = function (_a) {
 Chart.register(CategoryScale, LinearScale, PointElement, LineElement, Title, Tooltip$1, Legend, TimeScale, zoomPlugin);
 var Trending = function (_a) {
     _a.title; var getTagsFromAPI = _a.getTagsFromAPI;
-    var _b = useTrendingContext(), state = _b.state, viewTags = _b.state.viewTags;
-    var _c = useState(''), error = _c[0], setError = _c[1];
-    var _d = useState(true), loading = _d[0], setLoading = _d[1];
-    var _e = useState([]), series = _e[0], setSeries = _e[1];
-    var _f = useChartOptions(), chartOptions = _f[0], setChartOptions = _f[1];
-    var _g = useState({
+    var _b = useTrendingContext(), state = _b.state, _c = _b.state, viewTags = _c.viewTags, shouldRefetchSeries = _c.shouldRefetchSeries;
+    var _d = useState(''), error = _d[0], setError = _d[1];
+    var _e = useState(true), loading = _e[0], setLoading = _e[1];
+    var _f = useState([]), series = _f[0], setSeries = _f[1];
+    var _g = useChartOptions(), chartOptions = _g[0], setChartOptions = _g[1];
+    var _h = useState({
         labels: [],
         datasets: []
-    }), chartData = _g[0], setChartData = _g[1];
-    var _h = useState(null), cursorData = _h[0], setCursorData = _h[1];
+    }), chartData = _h[0], setChartData = _h[1];
+    var _j = useState(null), cursorData = _j[0], setCursorData = _j[1];
     var debounceForFetchingData = useRef(null);
     useEffect(function () {
         if (debounceForFetchingData.current) {
@@ -11823,7 +11836,7 @@ var Trending = function (_a) {
             }); };
             fetchData();
         }, 800);
-    }, [state.graphShouldUpdate, viewTags]);
+    }, [shouldRefetchSeries]);
     return (React__default.createElement(React__default.Fragment, null,
         React__default.createElement(Grid$1, { container: true, style: { width: "95svw", height: "81svh", margin: 0 } },
             React__default.createElement(Header, { setChartOptions: setChartOptions }),
@@ -11838,7 +11851,7 @@ var Trending = function (_a) {
 
 var TrendingsPage = function (props) {
     var _a = useState(''), error = _a[0], setError = _a[1];
-    var _b = useTrendingContext(), viewSelected = _b.state.viewSelected, _c = _b.actions, setViews = _c.setViews, setViewTags = _c.setViewTags, setViewSelected = _c.setViewSelected;
+    var _b = useTrendingContext(), viewSelected = _b.state.viewSelected, _c = _b.actions, setViews = _c.setViews, setViewTagsAndRefetch = _c.setViewTagsAndRefetch, setViewSelected = _c.setViewSelected;
     var getTagsFromAPI = function (forceReload) {
         if (forceReload === void 0) { forceReload = false; }
         return __awaiter(void 0, void 0, void 0, function () {
@@ -11863,7 +11876,7 @@ var TrendingsPage = function (props) {
                     case 2:
                         viewTagsResp = _a.sent();
                         if (viewTagsResp.ok) {
-                            setViewTags(viewTagsResp.data.tables[0].rows);
+                            setViewTagsAndRefetch(viewTagsResp.data.tables[0].rows);
                         }
                         else {
                             setError(viewTagsResp.message);