@dexteel/mesf-core 7.7.0 → 7.8.1

package/.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-  ".": "7.7.0"
+  ".": "7.8.1"
 }

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # Changelog
 
+## [7.8.1](https://github.com/dexteel/mesf-core-frontend/compare/@dexteel/mesf-core-v7.8.0...@dexteel/mesf-core-v7.8.1) (2025-12-22)
+
+
+### Bug Fixes
+
+* **Create User:** enhance user creation process with password and profile management ([9400641](https://github.com/dexteel/mesf-core-frontend/commit/94006418d13d944364cacf410a94b385f48b6140))
+* **Edit User:** streamline user update process and improve profile ID handling ([f1397e5](https://github.com/dexteel/mesf-core-frontend/commit/f1397e58496fa8e9f4d10bd4a4d84db2af3c08e8))
+
+## [7.8.0](https://github.com/dexteel/mesf-core-frontend/compare/@dexteel/mesf-core-v7.7.0...@dexteel/mesf-core-v7.8.0) (2025-12-22)
+
+
+### Features
+
+* **Trendings V2:** auto-scroll, select, and toast on tag search result click in Tags Tree V2 ([5b869fb](https://github.com/dexteel/mesf-core-frontend/commit/5b869fb6ef38b7f4f7ad8e9b8c101db774970b52))
+
+
+### Bug Fixes
+
+* **Trendings V2:** Fix wiping of views when saving ([33ca2d4](https://github.com/dexteel/mesf-core-frontend/commit/33ca2d413b4adddc48692f93eb1f3804339a9bc3))
+
 ## [7.7.0](https://github.com/dexteel/mesf-core-frontend/compare/@dexteel/mesf-core-v7.6.0...@dexteel/mesf-core-v7.7.0) (2025-12-22)
 
 

package/dist/index.esm.js

@@ -4578,36 +4578,36 @@ var CreateUser = function (_a) {
         setOpen(false);
     };
     var UserName = watch("UserName");
-    var profilesIds = watch("ProfilesId");
-    var setProfiles = useMutation({
-        mutationFn: setProfilesToUser,
-        onError: function (error) {
-            setError(error.message);
-        },
-    });
     var createUser = useMutation({
-        mutationFn: upsertUser,
-        onSuccess: function (userCreatedId) { return __awaiter(void 0, void 0, void 0, function () {
+        mutationFn: function (data) { return __awaiter(void 0, void 0, void 0, function () {
+            var userId, passwordResult;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0:
-                        _a.trys.push([0, 2, , 3]);
-                        return [4 /*yield*/, setProfiles.mutateAsync({
-                                UserId: userCreatedId,
-                                profileIds: profilesIds,
-                            })];
+                    case 0: return [4 /*yield*/, upsertUser(data)];
                     case 1:
-                        _a.sent();
-                        setOpen(true);
-                        onHide(true);
-                        return [3 /*break*/, 3];
+                        userId = _a.sent();
+                        return [4 /*yield*/, setPassword(userId, data.UserName)];
                     case 2:
+                        passwordResult = _a.sent();
+                        if (!passwordResult.ok) {
+                            throw new Error(passwordResult.message || "Error setting password");
+                        }
+                        if (!(data.ProfilesId && Array.isArray(data.ProfilesId))) return [3 /*break*/, 4];
+                        return [4 /*yield*/, setProfilesToUser({
+                                UserId: userId,
+                                profileIds: data.ProfilesId,
+                            })];
+                    case 3:
                         _a.sent();
-                        return [3 /*break*/, 3];
-                    case 3: return [2 /*return*/];
+                        _a.label = 4;
+                    case 4: return [2 /*return*/, userId];
                 }
             });
         }); },
+        onSuccess: function () {
+            setOpen(true);
+            onHide(true);
+        },
         onError: function (error) {
             setError(error.message);
         },
@@ -5072,39 +5072,39 @@ var EditUser = function (_a) {
         }
         setOpen(false);
     };
-    var setProfiles = useMutation({
-        mutationFn: setProfilesToUser,
-        onError: function (error) {
-            setError(error.message);
-        },
-    });
     var editUser = useMutation({
-        mutationFn: upsertUser,
-        onSuccess: function (userUpdatedId) { return __awaiter(void 0, void 0, void 0, function () {
-            var currentLoggedUserId;
+        mutationFn: function (data) { return __awaiter(void 0, void 0, void 0, function () {
+            var userUpdatedId, validProfileIds;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0:
-                        _a.trys.push([0, 2, , 3]);
-                        return [4 /*yield*/, setProfiles.mutateAsync({
+                    case 0: return [4 /*yield*/, upsertUser(data)];
+                    case 1:
+                        userUpdatedId = _a.sent();
+                        validProfileIds = Array.isArray(profilesIds)
+                            ? profilesIds.filter(function (id) { return !isNaN(id) && id > 0; })
+                            : [];
+                        // Step 3: Set the profiles for the user
+                        return [4 /*yield*/, setProfilesToUser({
                                 UserId: userUpdatedId,
-                                profileIds: profilesIds,
+                                profileIds: validProfileIds,
                             })];
-                    case 1:
-                        _a.sent();
-                        currentLoggedUserId = getUserId();
-                        if (currentLoggedUserId === userUpdatedId) {
-                            // Update context - the area-selector effect will update the name
-                            setDefaultAreaId(defaultAssetId);
-                        }
-                        onHide(true);
-                        setOpen(true);
-                        return [3 /*break*/, 3];
                     case 2:
+                        // Step 3: Set the profiles for the user
                         _a.sent();
-                        return [3 /*break*/, 3];
-                    case 3: return [2 /*return*/];
+                        return [2 /*return*/, userUpdatedId];
+                }
+            });
+        }); },
+        onSuccess: function (userUpdatedId) { return __awaiter(void 0, void 0, void 0, function () {
+            var currentLoggedUserId;
+            return __generator(this, function (_a) {
+                currentLoggedUserId = getUserId();
+                if (currentLoggedUserId === userUpdatedId && defaultAssetId) {
+                    setDefaultAreaId(defaultAssetId);
                 }
+                onHide(true);
+                setOpen(true);
+                return [2 /*return*/];
             });
         }); },
         onError: function (error) {
@@ -5133,7 +5133,13 @@ var EditUser = function (_a) {
             if (isSuccess) {
                 var userSelected = rows ? rows[0] : null;
                 if (userSelected) {
-                    var profilesIds_1 = (((_a = userSelected.ProfilesId) === null || _a === void 0 ? void 0 : _a.toString()) || "").split(",") || [];
+                    var profilesIdsString = ((_a = userSelected.ProfilesId) === null || _a === void 0 ? void 0 : _a.toString()) || "";
+                    var profilesIds_1 = profilesIdsString
+                        .split(",")
+                        .map(function (pId) { return pId.trim(); })
+                        .filter(function (pId) { return pId !== ""; })
+                        .map(function (pId) { return parseInt(pId); })
+                        .filter(function (pId) { return !isNaN(pId); });
                     setValue("UserId", userSelected.UserId);
                     setValue("UserName", userSelected.UserName);
                     setValue("FirstName", userSelected.FirstName);
@@ -5142,7 +5148,7 @@ var EditUser = function (_a) {
                     setValue("IsActive", userSelected.IsActive);
                     setValue("LastLogin", userSelected.LastLogin);
                     setValue("DefaultAssetId", userSelected.DefaultAssetId);
-                    setValue("ProfilesId", profilesIds_1.map(function (pId) { return parseInt(pId); }));
+                    setValue("ProfilesId", profilesIds_1);
                 }
             }
         }
@@ -12062,7 +12068,7 @@ var getViewTags = function (ViewId) { return __awaiter(void 0, void 0, void 0, f
 }); };
 var upsertViewTag = function (_a) { return __awaiter(void 0, [_a], void 0, function (_b) {
     var apiService, parameters, resp;
-    var viewId = _b.viewId, tagId = _b.tagId, color = _b.color, minScale = _b.minScale, maxScale = _b.maxScale, isVisible = _b.isVisible, isAutoScale = _b.isAutoScale, unit = _b.unit;
+    var viewId = _b.viewId, tagId = _b.tagId, color = _b.color, minScale = _b.minScale, maxScale = _b.maxScale, isVisible = _b.isVisible, isAutoScale = _b.isAutoScale, unit = _b.unit; _b.order; _b.alias; _b.tagType; _b.sourceTagId; _b.bitIndex;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0:
@@ -12158,6 +12164,37 @@ var ConfirmationDialogRaw = function (_a) {
                 React__default.createElement(Button, { variant: "contained", size: "small", color: "primary", onClick: handleOk }, "Ok")))));
 };
 
+var STORAGE_PREFIX = "mesf_trending_view_v2_";
+var saveViewToLocal = function (viewId, viewTags) {
+    try {
+        var key = "".concat(STORAGE_PREFIX).concat(viewId);
+        localStorage.setItem(key, JSON.stringify(viewTags));
+    }
+    catch (e) {
+        console.error("Failed to save view to local storage", e);
+    }
+};
+var getViewFromLocal = function (viewId) {
+    try {
+        var key = "".concat(STORAGE_PREFIX).concat(viewId);
+        var data = localStorage.getItem(key);
+        return data ? JSON.parse(data) : null;
+    }
+    catch (e) {
+        console.error("Failed to load view from local storage", e);
+        return null;
+    }
+};
+var removeViewFromLocal = function (viewId) {
+    try {
+        var key = "".concat(STORAGE_PREFIX).concat(viewId);
+        localStorage.removeItem(key);
+    }
+    catch (e) {
+        console.error("Failed to remove view from local storage", e);
+    }
+};
+
 var SaveUpdateDeleteViewModalV2 = function (_a) {
     var _b, _c, _d;
     var open = _a.open, mode = _a.mode, handleClose = _a.handleClose, view = _a.view;
@@ -12195,7 +12232,7 @@ var SaveUpdateDeleteViewModalV2 = function (_a) {
     };
     var updateViewTag = useMutation({
         mutationFn: function (_a) {
-            var viewId = _a.viewId, tagId = _a.tagId, color = _a.color, minScale = _a.minScale, maxScale = _a.maxScale, isVisible = _a.isVisible, isAutoScale = _a.isAutoScale, unit = _a.unit;
+            var viewId = _a.viewId, tagId = _a.tagId, color = _a.color, minScale = _a.minScale, maxScale = _a.maxScale, isVisible = _a.isVisible, isAutoScale = _a.isAutoScale, unit = _a.unit, order = _a.order, alias = _a.alias, tagType = _a.tagType, sourceTagId = _a.sourceTagId, bitIndex = _a.bitIndex;
             return upsertViewTag({
                 viewId: viewId,
                 tagId: tagId,
@@ -12205,6 +12242,11 @@ var SaveUpdateDeleteViewModalV2 = function (_a) {
                 isVisible: isVisible,
                 isAutoScale: isAutoScale,
                 unit: unit,
+                order: order,
+                alias: alias,
+                tagType: tagType,
+                sourceTagId: sourceTagId,
+                bitIndex: bitIndex,
             });
         },
         onError: function (error) {
@@ -12217,6 +12259,12 @@ var SaveUpdateDeleteViewModalV2 = function (_a) {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
+                        if (view === null || view === void 0 ? void 0 : view.ViewId) {
+                            removeViewFromLocal(view.ViewId);
+                        }
+                        else if (viewSelected === null || viewSelected === void 0 ? void 0 : viewSelected.ViewId) {
+                            removeViewFromLocal(viewSelected.ViewId);
+                        }
                         setSnackbarMessage("The view was deleted successfully");
                         setSnackbarOpen(true);
                         return [4 /*yield*/, queryClient.invalidateQueries({ queryKey: ["views-v2"] })];
@@ -12239,31 +12287,43 @@ var SaveUpdateDeleteViewModalV2 = function (_a) {
             });
         }); },
         onSuccess: function (viewId) { return __awaiter(void 0, void 0, void 0, function () {
-            var results, failed;
+            var backendTags, results, failed;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, Promise.allSettled(Object.values(viewTags)
-                            .sort(function (a, b) { return a.order - b.order; })
-                            .map(function (_a) { return __awaiter(void 0, [_a], void 0, function (_b) {
-                            var viewTag = _b.viewTag;
-                            return __generator(this, function (_c) {
-                                switch (_c.label) {
-                                    case 0: return [4 /*yield*/, updateViewTag.mutate({
-                                            viewId: viewId,
-                                            tagId: viewTag.TagId,
-                                            color: viewTag.Color,
-                                            minScale: viewTag.MinScale,
-                                            maxScale: viewTag.MaxScale,
-                                            isVisible: viewTag.IsVisible,
-                                            isAutoScale: viewTag.IsAutoScale,
-                                            unit: viewTag.Unit,
-                                        })];
-                                    case 1:
-                                        _c.sent();
-                                        return [2 /*return*/];
-                                }
-                            });
-                        }); }))];
+                    case 0:
+                        // Save complete state to local storage (metadata + virtual tags)
+                        saveViewToLocal(viewId, viewTags);
+                        backendTags = Object.values(viewTags).filter(function (_a) {
+                            var viewTag = _a.viewTag;
+                            return !viewTag.IsBitExtracted;
+                        });
+                        return [4 /*yield*/, Promise.allSettled(backendTags
+                                .sort(function (a, b) { return a.order - b.order; })
+                                .map(function (_a) { return __awaiter(void 0, [_a], void 0, function (_b) {
+                                var viewTag = _b.viewTag, order = _b.order;
+                                return __generator(this, function (_c) {
+                                    switch (_c.label) {
+                                        case 0: return [4 /*yield*/, updateViewTag.mutateAsync({
+                                                viewId: viewId,
+                                                tagId: viewTag.TagId,
+                                                color: viewTag.Color,
+                                                minScale: viewTag.MinScale,
+                                                maxScale: viewTag.MaxScale,
+                                                isVisible: viewTag.IsVisible,
+                                                isAutoScale: viewTag.IsAutoScale,
+                                                unit: viewTag.Unit,
+                                                order: order,
+                                                alias: viewTag.Alias,
+                                                tagType: viewTag.TagType,
+                                                sourceTagId: viewTag.SourceTagId,
+                                                bitIndex: viewTag.BitIndex,
+                                            })];
+                                        case 1:
+                                            _c.sent();
+                                            return [2 /*return*/];
+                                    }
+                                });
+                            }); }))];
                     case 1:
                         results = _a.sent();
                         failed = results.filter(function (r) { return r.status === "rejected"; });
@@ -12301,7 +12361,7 @@ var SaveUpdateDeleteViewModalV2 = function (_a) {
                     setIsSubmitLoading(true);
                     viewToDelete = view || viewSelected;
                     if (!!isNil(viewToDelete)) return [3 /*break*/, 2];
-                    return [4 /*yield*/, removeView.mutate(viewToDelete.ViewId)];
+                    return [4 /*yield*/, removeView.mutateAsync(viewToDelete.ViewId)];
                 case 1:
                     _a.sent();
                     _a.label = 2;
@@ -12892,6 +12952,22 @@ var ColorPickerV2 = function (_a) {
                 } }, tagColors.map(function (tagColor) { return (React__default.createElement(ColorSwatch, { key: tagColor, color: tagColor, onSelect: handleColorSelect })); })))));
 };
 
+var NotificationSnackBar = function (_a) {
+    var message = _a.message, _b = _a.onHide, onHide = _b === void 0 ? function () { } : _b, _c = _a.severity, severity = _c === void 0 ? "success" : _c;
+    var handleClose = function (event, reason) {
+        if (reason === "clickaway") {
+            return;
+        }
+        onHide();
+    };
+    var _d = useState(true), open = _d[0], setOpen = _d[1];
+    useEffect(function () {
+        setOpen(!!message);
+    }, [message]);
+    return (React__default.createElement(Snackbar, { open: open, autoHideDuration: 2500, onClose: handleClose, anchorOrigin: { vertical: "bottom", horizontal: "center" } },
+        React__default.createElement(Alert$3, { elevation: 6, variant: "filled", severity: severity, onClose: handleClose }, message)));
+};
+
 var NewFolderModal = function (_a) {
     var open = _a.open, handleClose = _a.handleClose, tagNodeSelectedInTree = _a.tagNodeSelectedInTree;
     var _b = useState(), name = _b[0], setName = _b[1];
@@ -13129,7 +13205,7 @@ var TagFolderCustomNodeV2 = function (_a) {
             (_a = containerRef.current) === null || _a === void 0 ? void 0 : _a.removeEventListener("contextmenu", handleContextMenu);
         };
     }, []);
-    return (React__default.createElement(Box, { onClick: onClickHandler, sx: {
+    return (React__default.createElement(Box, { "data-node-id": node.id, onClick: onClickHandler, sx: {
             paddingInlineStart: depth * 2,
             cursor: "pointer",
             alignItems: "center",
@@ -13410,13 +13486,14 @@ var TagsTreeModalV2 = function (_a) {
     var open = _a.open, handleClose = _a.handleClose, onTagSelect = _a.onTagSelect;
     var _b = useState(false), isLoading = _b[0], setIsLoading = _b[1];
     var _c = useState(""), error = _c[0], setError = _c[1];
-    var _d = useState([]), tagsTreeData = _d[0], setTagsTreeData = _d[1];
-    var _e = useState(null), tagNodeSelectedInTree = _e[0], setTagNodeSelectedInTree = _e[1];
-    var _f = useState(null), anchorPoint = _f[0], setAnchorPoint = _f[1];
-    var _g = useState(false), showContextMenu = _g[0], setShowContextMenu = _g[1];
+    var _d = useState(null), snackbarMessage = _d[0], setSnackbarMessage = _d[1];
+    var _e = useState([]), tagsTreeData = _e[0], setTagsTreeData = _e[1];
+    var _f = useState(null), tagNodeSelectedInTree = _f[0], setTagNodeSelectedInTree = _f[1];
+    var _g = useState(null), anchorPoint = _g[0], setAnchorPoint = _g[1];
+    var _h = useState(false), showContextMenu = _h[0], setShowContextMenu = _h[1];
     var backendOffset = 1000000;
-    var _h = useState({}), openTagFolders = _h[0], setOpenTagFolders = _h[1];
-    var _j = useState([]), selectedNodes = _j[0], setSelectedNodes = _j[1];
+    var _j = useState({}), openTagFolders = _j[0], setOpenTagFolders = _j[1];
+    var _k = useState([]), selectedNodes = _k[0], setSelectedNodes = _k[1];
     var handleContextMenu = function (data, e) {
         e.preventDefault();
         var top = e.clientY;
@@ -13429,7 +13506,7 @@ var TagsTreeModalV2 = function (_a) {
             setTagNodeSelectedInTree(selectedNode);
         }
     };
-    var _k = useSearchTagsTree$1(), tagsTree = _k.data, tagsTreeLoading = _k.isLoading, tagsTreeIsError = _k.isError, tagsTreeError = _k.error, tagsTreeIsSuccess = _k.isSuccess, tagsTreeIsFetched = _k.isFetched, refetch = _k.refetch;
+    var _l = useSearchTagsTree$1(), tagsTree = _l.data, tagsTreeLoading = _l.isLoading, tagsTreeIsError = _l.isError, tagsTreeError = _l.error, tagsTreeIsSuccess = _l.isSuccess, tagsTreeIsFetched = _l.isFetched, refetch = _l.refetch;
     var updateTagFolder = useMutation({
         mutationFn: function (_a) {
             var tagFolderId = _a.tagFolderId, parentTagFolderId = _a.parentTagFolderId, tagFolderName = _a.tagFolderName, isActive = _a.isActive;
@@ -13528,6 +13605,10 @@ var TagsTreeModalV2 = function (_a) {
         });
         setOpenTagFolders(newOpenTagFolders);
         setSelectedNodes([result.node]);
+        if (result.node.data && result.node.data.TagTypeCode !== "F") {
+            onTagSelect(result.node.data);
+            setSnackbarMessage("Tag \"".concat(result.node.data.TagName, "\" added"));
+        }
         // Scroll to the node after expansion
         setTimeout(function () {
             var nodeElement = document.querySelector("[data-node-id=\"".concat(result.id, "\"]"));
@@ -13615,7 +13696,8 @@ var TagsTreeModalV2 = function (_a) {
                                     return (React__default.createElement(TagFolderCustomNodeV2, { setContextMenuOver: handleContextMenu, node: node, options: options, isSelected: selected, openTagFolders: openTagFolders, setOpenTagFolders: setOpenTagFolders, handleSelect: handleClick }));
                                 }, dragPreviewRender: function (monitorProps) { return React__default.createElement(CustomDragPreview, { monitorProps: monitorProps }); } })))))),
                 React__default.createElement(ContextMenu, { anchorPoint: anchorPoint, isOpen: showContextMenu, setShowContextMenu: setShowContextMenu, tagNodeSelectedInTree: tagNodeSelectedInTree, getTagsTreeData: function () { return refetch(); } }),
-                React__default.createElement(ErrorModal, { error: error, onHide: function () { return setError(""); } })))));
+                React__default.createElement(ErrorModal, { error: error, onHide: function () { return setError(""); } }),
+                React__default.createElement(NotificationSnackBar, { message: snackbarMessage, onHide: function () { return setSnackbarMessage(null); } })))));
 };
 
 var BitSelectorModal = function (_a) {
@@ -13962,20 +14044,31 @@ var TagsTableV2 = function () {
             var viewId = _a.viewId, viewName = _a.viewName, isPublic = _a.isPublic;
             return upsertView({ viewId: viewId, viewName: viewName, isPublic: isPublic });
         },
-        onSuccess: function () { return __awaiter(void 0, void 0, void 0, function () {
-            var results, failed;
+        onSuccess: function (viewId) { return __awaiter(void 0, void 0, void 0, function () {
+            var backendTags, results, failed;
             var _a;
             return __generator(this, function (_b) {
                 switch (_b.label) {
-                    case 0: return [4 /*yield*/, deleteAllViewTags.mutate((_a = viewSelected === null || viewSelected === void 0 ? void 0 : viewSelected.ViewId) !== null && _a !== void 0 ? _a : 0)];
+                    case 0:
+                        // Save complete state to local storage (metadata + virtual tags)
+                        if (viewSelected === null || viewSelected === void 0 ? void 0 : viewSelected.ViewId) {
+                            saveViewToLocal(viewSelected.ViewId, viewTags);
+                        }
+                        // Wait for delete to finish before inserting new tags
+                        return [4 /*yield*/, deleteAllViewTags.mutateAsync((_a = viewSelected === null || viewSelected === void 0 ? void 0 : viewSelected.ViewId) !== null && _a !== void 0 ? _a : 0)];
                     case 1:
+                        // Wait for delete to finish before inserting new tags
                         _b.sent();
-                        return [4 /*yield*/, Promise.allSettled(Object.values(viewTags)
+                        backendTags = Object.values(viewTags).filter(function (_a) {
+                            var viewTag = _a.viewTag;
+                            return !viewTag.IsBitExtracted;
+                        });
+                        return [4 /*yield*/, Promise.allSettled(backendTags
                                 .sort(function (a, b) { return b.order - a.order; })
                                 .map(function (_a) {
                                 var _b;
-                                var viewTag = _a.viewTag;
-                                return upsertViewTag({
+                                var viewTag = _a.viewTag, order = _a.order;
+                                return updateViewTag.mutateAsync({
                                     viewId: (_b = viewSelected === null || viewSelected === void 0 ? void 0 : viewSelected.ViewId) !== null && _b !== void 0 ? _b : 0,
                                     tagId: viewTag.TagId,
                                     color: viewTag.Color,
@@ -13984,6 +14077,11 @@ var TagsTableV2 = function () {
                                     isVisible: viewTag.IsVisible,
                                     isAutoScale: viewTag.IsAutoScale,
                                     unit: viewTag.Unit,
+                                    order: order,
+                                    alias: viewTag.Alias,
+                                    tagType: viewTag.TagType,
+                                    sourceTagId: viewTag.SourceTagId,
+                                    bitIndex: viewTag.BitIndex,
                                 });
                             }))];
                     case 2:
@@ -14005,7 +14103,7 @@ var TagsTableV2 = function () {
     });
     var updateViewTag = useMutation({
         mutationFn: function (_a) {
-            var viewId = _a.viewId, tagId = _a.tagId, color = _a.color, minScale = _a.minScale, maxScale = _a.maxScale, isVisible = _a.isVisible, isAutoScale = _a.isAutoScale, unit = _a.unit;
+            var viewId = _a.viewId, tagId = _a.tagId, color = _a.color, minScale = _a.minScale, maxScale = _a.maxScale, isVisible = _a.isVisible, isAutoScale = _a.isAutoScale, unit = _a.unit, order = _a.order, alias = _a.alias, tagType = _a.tagType, sourceTagId = _a.sourceTagId, bitIndex = _a.bitIndex;
             return upsertViewTag({
                 viewId: viewId,
                 tagId: tagId,
@@ -14015,6 +14113,11 @@ var TagsTableV2 = function () {
                 isVisible: isVisible,
                 isAutoScale: isAutoScale,
                 unit: unit,
+                order: order,
+                alias: alias,
+                tagType: tagType,
+                sourceTagId: sourceTagId,
+                bitIndex: bitIndex,
             });
         },
         onError: function (error) {
@@ -16313,26 +16416,70 @@ var TrendingsPageV2 = function () {
     // This preserves local order changes (from drag-and-drop) until a new view is loaded
     var loadedViewIdRef = useRef(null);
     useEffect(function () {
-        if (!viewTagsSuccess || !viewTagsData || !Array.isArray(viewTagsData))
+        if (!viewTagsSuccess ||
+            !viewTagsData ||
+            !Array.isArray(viewTagsData) ||
+            viewId === null)
             return;
         // Only reset viewTags when viewId actually changes (loading a different view)
         // Do NOT reset if viewId is the same (data is just refetching)
         if (viewId === loadedViewIdRef.current)
             return;
         loadedViewIdRef.current = viewId;
-        var vTags = viewTagsData.reduce(function (carr, curr, idx) {
-            if (isNil(curr.Color)) {
-                curr.Color = getRandomColor();
-            }
-            carr[curr.TagId] = {
-                viewTag: curr,
-                order: idx,
-            };
-            return carr;
-        }, {});
+        var backendTags = viewTagsData;
+        var localViewTags = getViewFromLocal(viewId);
+        var mergedTags = {};
+        if (localViewTags) {
+            // If local storage exists, use it as the source of truth for metadata (Order, Alias)
+            // and for virtual tags (Bit Extracted)
+            var backendTagIds_1 = new Set(backendTags.map(function (t) { return t.TagId; }));
+            // 1. Process local tags
+            Object.values(localViewTags).forEach(function (entry) {
+                var viewTag = entry.viewTag;
+                // If it's a backend tag, check if it still exists in the backend response
+                // (Permission check or tag deletion check)
+                if (!viewTag.IsBitExtracted) {
+                    if (backendTagIds_1.has(viewTag.TagId)) {
+                        mergedTags[viewTag.TagId] = entry;
+                    }
+                }
+                else {
+                    // Virtual tags are always added from local storage
+                    mergedTags[viewTag.TagId] = entry;
+                }
+            });
+            // 2. Add any new backend tags that might be missing from local storage
+            // (Rare case, but possible if added by another user/session)
+            backendTags.forEach(function (backendTag) {
+                if (!mergedTags[backendTag.TagId]) {
+                    // Add with default order at the end
+                    var maxOrder = Math.max.apply(Math, __spreadArray(__spreadArray([], Object.values(mergedTags).map(function (t) { return t.order; }), false), [0], false));
+                    if (isNil(backendTag.Color)) {
+                        backendTag.Color = getRandomColor();
+                    }
+                    mergedTags[backendTag.TagId] = {
+                        viewTag: backendTag,
+                        order: maxOrder + 1,
+                    };
+                }
+            });
+        }
+        else {
+            // No local storage -> Use backend tags with default ordering
+            mergedTags = backendTags.reduce(function (carr, curr, idx) {
+                if (isNil(curr.Color)) {
+                    curr.Color = getRandomColor();
+                }
+                carr[curr.TagId] = {
+                    viewTag: curr,
+                    order: idx,
+                };
+                return carr;
+            }, {});
+        }
         // Reset stable ref when loading new view
         stableTagIdsRef.current = [];
-        setViewTagsAndRefetch(vTags);
+        setViewTagsAndRefetch(mergedTags);
     }, [viewTagsSuccess, viewTagsData, setViewTagsAndRefetch, viewId]);
     // Update context with calculated min/max values
     // Use ref to prevent infinite loop from object reference changes
@@ -19984,22 +20131,6 @@ var ShiftSelector = function (_a) {
         React__default.createElement(ErrorModal, { error: error, onHide: function () { return setError(""); }, title: "Error loading shifts" })));
 };
 
-var NotificationSnackBar = function (_a) {
-    var message = _a.message, _b = _a.onHide, onHide = _b === void 0 ? function () { } : _b, _c = _a.severity, severity = _c === void 0 ? "success" : _c;
-    var handleClose = function (event, reason) {
-        if (reason === "clickaway") {
-            return;
-        }
-        onHide();
-    };
-    var _d = useState(true), open = _d[0], setOpen = _d[1];
-    useEffect(function () {
-        setOpen(!!message);
-    }, [message]);
-    return (React__default.createElement(Snackbar, { open: open, autoHideDuration: 2500, onClose: handleClose, anchorOrigin: { vertical: "bottom", horizontal: "center" } },
-        React__default.createElement(Alert$3, { elevation: 6, variant: "filled", severity: severity, onClose: handleClose }, message)));
-};
-
 var useEntrySubmission = function (_a) {
     var _b = _a === void 0 ? {} : _a, onSuccess = _b.onSuccess, onError = _b.onError, _c = _b.isNewEntry, isNewEntry = _c === void 0 ? false : _c, _d = _b.onHide, onHide = _d === void 0 ? function () { } : _d;
     var _e = useState(false), isSubmitLoading = _e[0], setIsSubmitLoading = _e[1];