@dexteel/mesf-core 4.8.0 → 4.8.2

package/CHANGELOG.md

@@ -1,5 +1,5 @@
 # CHANGELOG
-## 4.8.0
+## 4.8.0-1
 - Trending: Fix when removing view tag bug (#184)
 - Trending: Add new button to navigate to current date (#189 and #207)
 ## 4.7.11

package/dist/index.esm.js

@@ -10249,7 +10249,7 @@ var upsertViewTag = function (ViewId, TagId, Color, MinScale, MaxScale, IsVisibl
         }
     });
 }); };
-var deleteViewTag = function (ViewId, TagId) { return __awaiter(void 0, void 0, void 0, function () {
+var deleteAllViewTagsFromView = function (ViewId) { return __awaiter(void 0, void 0, void 0, function () {
     var apiService, parameters, resp;
     return __generator(this, function (_a) {
         switch (_a.label) {
@@ -10257,8 +10257,7 @@ var deleteViewTag = function (ViewId, TagId) { return __awaiter(void 0, void 0,
                 apiService = new MESApiService();
                 parameters = [];
                 parameters.push({ name: "ViewId", value: ViewId });
-                parameters.push({ name: "TagId", value: TagId });
-                return [4 /*yield*/, apiService.callV2("[mssql2022].[IH_100020].[ih].[DeleteViewTag]", parameters)];
+                return [4 /*yield*/, apiService.callV2("[mssql2022].[IH_100020].[ih].[DeleteAllViewTagsFromView]", parameters)];
             case 1:
                 resp = _a.sent();
                 return [2 /*return*/, resp];
@@ -10798,14 +10797,40 @@ var useTagsTableStyles = makeStyles$1(function (theme) { return ({
     }
 }); });
 
-var timeDifference = function (start, end) {
-    var differenceMilliseconds = start - end;
-    var seconds = Math.floor(differenceMilliseconds / 1000);
-    var minutes = Math.floor(seconds / 60);
-    var hours = Math.floor(minutes / 60);
-    var remainingMinutes = minutes % 60;
-    var remainingSeconds = seconds % 60;
-    return "".concat(hours, "h ").concat(remainingMinutes, "m ").concat(remainingSeconds, "s");
+var formatTimeDiffWithMs = function (start, end) {
+    // Calculate total difference in milliseconds
+    var totalMilliseconds = end - start;
+    // Convert milliseconds to seconds, minutes, hours, days, and months for comparison
+    var seconds = totalMilliseconds / 1000;
+    var minutes = seconds / 60;
+    var hours = minutes / 60;
+    var days = hours / 24;
+    var months = days / 30; // Approximation of a month
+    var remainingSeconds = seconds % 60; // Remaining seconds after full minutes
+    if (months > 12) {
+        var years = months / 12;
+        return "".concat(Math.floor(years), " years, ").concat(Math.floor(months % 12), " months");
+    }
+    else if (months > 6) {
+        return "".concat(Math.floor(months), " months, ").concat(Math.floor(days % 30), " days");
+    }
+    else if (days > 10) {
+        return "".concat(Math.floor(days), " days, ").concat(Math.floor(hours % 24), " hours");
+    }
+    else if (days > 1) {
+        return "".concat(Math.floor(days), " days, ").concat(Math.floor(hours % 24), " hours");
+    }
+    else if (hours > 12) {
+        return "".concat(Math.floor(hours), " hours, ").concat(Math.floor(minutes % 60), " minutes, ").concat(remainingSeconds.toFixed(2), " seconds");
+    }
+    else if (hours < 1) {
+        // If there are 0 hours, return just minutes and remaining seconds
+        return "".concat(Math.floor(minutes), " minutes, ").concat(remainingSeconds.toFixed(2), " seconds");
+    }
+    else {
+        // For time intervals less than 12 hours but more than 1 hour, return hours, minutes, and remaining seconds
+        return "".concat(Math.floor(hours), " hours, ").concat(Math.floor(minutes % 60), " minutes, ").concat(remainingSeconds.toFixed(2), " seconds");
+    }
 };
 
 var TableComponent = function (_a) {
@@ -10814,6 +10839,7 @@ 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; _d.setViewSelected;
     var _e = useState(''), error = _e[0], setError = _e[1];
     var _f = useState(false); _f[0]; var setIsLoading = _f[1];
+    var _g = useState(null), viewTagForDelete = _g[0], setViewTagForDelete = _g[1];
     var dataTable = useTagsDataTable({ viewTags: viewTags, chartData: chartData, cursorData: cursorData });
     var handleChange = function (tagId, value, property) {
         var newTags = viewTags.map(function (tag) {
@@ -10859,11 +10885,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), saveAsViewModalOpen = _j[0], setSaveAsViewModalOpen = _j[1];
-    var _k = useState(false), loadViewOpen = _k[0], setLoadViewOpen = _k[1];
-    var _l = useState(''), snackbarMessage = _l[0], setSnackbarMessage = _l[1];
+    var _h = useState(null), selectedRowIndex = _h[0], setSelectedRowIndex = _h[1];
+    var _j = useState(false), addTagModalOpen = _j[0], setAddTagModalOpen = _j[1];
+    var _k = useState(false), saveAsViewModalOpen = _k[0], setSaveAsViewModalOpen = _k[1];
+    var _l = useState(false), loadViewOpen = _l[0], setLoadViewOpen = _l[1];
+    var _m = useState(''), snackbarMessage = _m[0], setSnackbarMessage = _m[1];
     var handleClose = function () { return setAddTagModalOpen(false); };
     var ContextMenu = function (_a) {
         var x = _a.x, y = _a.y, options = _a.options;
@@ -10874,7 +10900,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 _o = useState({ x: 0, y: 0 }), contextMenuPosition = _o[0], setContextMenuPosition = _o[1];
     var contextMenuOptions = [
         { id: 'delete', label: 'Remove Tag', onClick: function () { return handleDelete(); } },
         { id: 'add', label: 'Add Tag', onClick: function () { return setAddTagModalOpen(true); } },
@@ -10887,41 +10913,34 @@ var TableComponent = function (_a) {
         handleAddTag(selectedTag);
     };
     var handleDelete = function (index) { return __awaiter(void 0, void 0, void 0, function () {
-        var tagToDelete, resp;
         return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    if (!(selectedRowIndex !== null)) return [3 /*break*/, 3];
-                    tagToDelete = viewTags[selectedRowIndex];
-                    if (!(viewSelected === null || viewSelected === void 0 ? void 0 : viewSelected.ViewId)) return [3 /*break*/, 2];
-                    return [4 /*yield*/, deleteViewTag(viewSelected === null || viewSelected === void 0 ? void 0 : viewSelected.ViewId, tagToDelete.TagId)];
-                case 1:
-                    resp = _a.sent();
-                    if (resp.ok) {
-                        handleDeleteTag(tagToDelete.TagId);
-                    }
-                    else {
-                        setError(resp.message);
-                    }
-                    _a.label = 2;
-                case 2:
-                    setSelectedRowIndex(null); // Reset the selected row index
-                    _a.label = 3;
-                case 3: return [2 /*return*/];
+            if (!isNil$1(viewTagForDelete)) {
+                if (viewSelected === null || viewSelected === void 0 ? void 0 : viewSelected.ViewId) {
+                    handleDeleteTag(viewTagForDelete.TagId);
+                }
+                setSelectedRowIndex(null); // Reset the selected row index 
+                setViewTagForDelete(null);
             }
+            return [2 /*return*/];
         });
     }); };
     var handleSaveView = function () { return __awaiter(void 0, void 0, void 0, function () {
-        var resp, results;
+        var resp, deleteResp, results;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
                     setIsLoading(true);
-                    if (!(viewSelected === null || viewSelected === void 0 ? void 0 : viewSelected.ViewId)) return [3 /*break*/, 4];
+                    if (!(viewSelected === null || viewSelected === void 0 ? void 0 : viewSelected.ViewId)) return [3 /*break*/, 5];
                     return [4 /*yield*/, upsertView(viewSelected === null || viewSelected === void 0 ? void 0 : viewSelected.ViewId, viewSelected.ViewName, viewSelected.IsPublic)];
                 case 1:
                     resp = _a.sent();
-                    if (!resp.ok) return [3 /*break*/, 3];
+                    if (!resp.ok) return [3 /*break*/, 4];
+                    return [4 /*yield*/, deleteAllViewTagsFromView(viewSelected.ViewId)];
+                case 2:
+                    deleteResp = _a.sent();
+                    if (!deleteResp.ok) {
+                        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)
@@ -10931,7 +10950,7 @@ var TableComponent = function (_a) {
                                 }
                             });
                         }))];
-                case 2:
+                case 3:
                     results = _a.sent();
                     results.forEach(function (result, index) {
                         if (result.status === "rejected") {
@@ -10942,11 +10961,11 @@ var TableComponent = function (_a) {
                             setSnackbarMessage('View saved successfully');
                         }
                     });
-                    return [3 /*break*/, 4];
-                case 3:
-                    setError(resp.message);
-                    _a.label = 4;
+                    return [3 /*break*/, 5];
                 case 4:
+                    setError(resp.message);
+                    _a.label = 5;
+                case 5:
                     setIsLoading(false);
                     return [2 /*return*/];
             }
@@ -10982,6 +11001,7 @@ var TableComponent = function (_a) {
         event.preventDefault();
         event.stopPropagation(); // Prevent the click event from propagating to the document
         setSelectedRowIndex(index);
+        setViewTagForDelete(viewTags[index]);
         setContextMenuPosition({ x: event.clientX, y: event.clientY });
     };
     var handleSaveDefaultToTag = function () { return __awaiter(void 0, void 0, void 0, function () {
@@ -11021,12 +11041,9 @@ var TableComponent = function (_a) {
                                 React__default.createElement("th", { className: classes.color }),
                                 React__default.createElement("th", { colSpan: 4, className: "".concat(classes.topTitles, " ").concat(classes.scale) }, "Scale"),
                                 React__default.createElement("th", { className: "".concat(classes.topTitles, " ").concat(classes.xStats) }, cursorData ? (function () {
-                                    var date = new Date(cursorData.x1);
-                                    var formattedDate = date.toLocaleString('en-US', {
-                                        hour12: false,
-                                        month: 'short',
-                                        day: 'numeric'
-                                    });
+                                    var dateX1 = new Date(cursorData.x1);
+                                    var dateX2 = new Date(cursorData.x2);
+                                    var formattedDate = dateX1.toLocaleString('en-US', __assign({ hour12: false, month: 'short', day: 'numeric' }, (dateX1.getFullYear() !== dateX2.getFullYear() && { year: 'numeric' })));
                                     var dateText = "".concat(formattedDate);
                                     return (React__default.createElement(React__default.Fragment, null,
                                         React__default.createElement("span", { style: {
@@ -11040,12 +11057,9 @@ var TableComponent = function (_a) {
                                         dateText));
                                 })() : null),
                                 React__default.createElement("th", { className: "".concat(classes.topTitles, " ").concat(classes.xStats) }, cursorData ? (function () {
-                                    var date = new Date(cursorData.x2);
-                                    var formattedDate = date.toLocaleString('en-US', {
-                                        hour12: false,
-                                        month: 'short',
-                                        day: 'numeric'
-                                    });
+                                    var dateX1 = new Date(cursorData.x1);
+                                    var dateX2 = new Date(cursorData.x2);
+                                    var formattedDate = dateX2.toLocaleString('en-US', __assign({ hour12: false, month: 'short', day: 'numeric' }, (dateX1.getFullYear() !== dateX2.getFullYear() && { year: 'numeric' })));
                                     var dateText = "".concat(formattedDate);
                                     return (React__default.createElement(React__default.Fragment, null,
                                         React__default.createElement("span", { style: {
@@ -11058,7 +11072,7 @@ var TableComponent = function (_a) {
                                             } }),
                                         dateText));
                                 })() : null),
-                                React__default.createElement("th", { colSpan: 3, className: "".concat(classes.topTitles, " ").concat(classes.xStats) }, cursorData ? timeDifference(cursorData.x2, cursorData.x1) : null)))),
+                                React__default.createElement("th", { colSpan: 3, className: "".concat(classes.topTitles, " ").concat(classes.xStats) }, cursorData ? formatTimeDiffWithMs(cursorData.x1, cursorData.x2) : null)))),
                     React__default.createElement("table", { style: { width: '100%', tableLayout: 'fixed', textAlign: "center" } },
                         React__default.createElement("thead", null,
                             React__default.createElement("tr", { className: classes.bottomTitlesRow },
@@ -11079,7 +11093,7 @@ var TableComponent = function (_a) {
                                             minute: '2-digit',
                                             second: '2-digit'
                                         });
-                                        var milliseconds = date.getMilliseconds().toString().padStart(2, '0');
+                                        var milliseconds = (date.getMilliseconds() / 1000).toFixed(2).substring(2);
                                         var dateText = "".concat(formattedHour, ".").concat(milliseconds, " hs");
                                         return (React__default.createElement(React__default.Fragment, null, dateText));
                                     })() : null,
@@ -11094,7 +11108,7 @@ var TableComponent = function (_a) {
                                             minute: '2-digit',
                                             second: '2-digit'
                                         });
-                                        var milliseconds = date.getMilliseconds().toString().padStart(2, '0');
+                                        var milliseconds = (date.getMilliseconds() / 1000).toFixed(2).substring(2);
                                         var dateText = "".concat(formattedHour, ".").concat(milliseconds, " hs");
                                         return (React__default.createElement(React__default.Fragment, null, dateText));
                                     })() : null,