@dexteel/mesf-core 4.7.11 → 4.8.1

package/CHANGELOG.md

@@ -1,4 +1,7 @@
 # CHANGELOG
+## 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
 - Trending: Fix Unit column title bug
 ## 4.7.10

package/dist/index.esm.js

@@ -39,6 +39,7 @@ import CreateIcon from '@material-ui/icons/Create';
 import DeleteIcon from '@material-ui/icons/Delete';
 import LockIcon from '@material-ui/icons/Lock';
 import { ArrowRight, ChevronLeft, ChevronRight } from '@material-ui/icons';
+import SkipNextIcon from '@material-ui/icons/SkipNext';
 import { Line } from 'react-chartjs-2';
 import PersonPinCircleIcon from '@material-ui/icons/PersonPinCircle';
 import PropTypes from 'prop-types';
@@ -10248,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) {
@@ -10256,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];
@@ -10813,6 +10813,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) {
@@ -10858,11 +10859,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;
@@ -10873,7 +10874,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); } },
@@ -10886,41 +10887,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)
@@ -10930,7 +10924,7 @@ var TableComponent = function (_a) {
                                 }
                             });
                         }))];
-                case 2:
+                case 3:
                     results = _a.sent();
                     results.forEach(function (result, index) {
                         if (result.status === "rejected") {
@@ -10941,11 +10935,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*/];
             }
@@ -10981,6 +10975,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 () {
@@ -11323,19 +11318,33 @@ var CustomOptionsComponent = function (_a) {
                 "Stepped"))));
 };
 
-var dateNavigator = function (startDate, endDate, scope, operator) {
-    if (scope === "custom") {
-        var durationInMs = moment(endDate).diff(moment(startDate));
-        var newStartDate = moment(startDate)[operator](durationInMs).toDate();
-        var newEndDate = moment(endDate)[operator](durationInMs).toDate();
-        return { newStartDate: newStartDate, newEndDate: newEndDate };
+var dateNavigator = function (startDate, endDate, scope, operator, current) {
+    if (current === void 0) { current = false; }
+    var newStartDate;
+    var newEndDate = endDate;
+    if (current) {
+        newEndDate = new Date();
+        if (scope === "custom") {
+            // If scope is custom, keep the same startDate
+            newStartDate = startDate;
+        }
+        else {
+            var _a = scope.split(" "), quantity = _a[0], duration = _a[1];
+            newStartDate = moment(newEndDate).subtract(quantity, duration[0]).toDate();
+        }
     }
     else {
-        var _a = scope.split(" "), quantity = _a[0], duration = _a[1];
-        var newStartDate = moment(startDate)[operator](quantity, duration[0]).toDate();
-        var newEndDate = moment(endDate)[operator](quantity, duration[0]).toDate();
-        return { newStartDate: newStartDate, newEndDate: newEndDate };
+        if (scope === "custom") {
+            var durationInMs = moment(endDate).diff(moment(startDate));
+            newStartDate = moment(startDate)[operator](durationInMs).toDate();
+        }
+        else {
+            var _b = scope.split(" "), quantity = _b[0], duration = _b[1];
+            newStartDate = moment(startDate)[operator](quantity, duration[0]).toDate();
+            newEndDate = moment(endDate)[operator](quantity, duration[0]).toDate();
+        }
     }
+    return { newStartDate: newStartDate, newEndDate: newEndDate };
 };
 
 var Header = function (_a) {
@@ -11346,8 +11355,9 @@ var Header = function (_a) {
         showGrid: true,
         stepped: false
     }), customOptions = _c[0], setCustomOptions = _c[1];
-    var handleDateNavigator = function (operator) {
-        var newDates = dateNavigator(state.timeScopeStart, state.timeScopeEnd, state.scope, operator);
+    var handleDateNavigator = function (operator, current) {
+        if (current === void 0) { current = false; }
+        var newDates = dateNavigator(state.timeScopeStart, state.timeScopeEnd, state.scope, operator, current);
         if (newDates) {
             actions.setTotalScope({ start: newDates.newStartDate, end: newDates.newEndDate, scope: state.scope });
         }
@@ -11414,7 +11424,10 @@ var Header = function (_a) {
                     } })),
             React__default.createElement(Grid$1, { item: true },
                 React__default.createElement(IconButton$1, { onClick: function () { return handleDateNavigator("add"); }, className: "".concat(classes.navigatorButton) },
-                    React__default.createElement(ChevronRight, { fontSize: "large" })))),
+                    React__default.createElement(ChevronRight, { fontSize: "large" }))),
+            React__default.createElement(Grid$1, { item: true },
+                React__default.createElement(IconButton$1, { onClick: function () { return handleDateNavigator("subtract", true); }, className: "".concat(classes.navigatorButton) },
+                    React__default.createElement(SkipNextIcon, { fontSize: "large" })))),
         React__default.createElement(Grid$1, { md: 6, item: true, container: true, justifyContent: "space-between" },
             React__default.createElement(Grid$1, { item: true, container: true, wrap: "nowrap", spacing: 1 },
                 React__default.createElement(Grid$1, { item: true, container: true },