@dexteel/mesf-core 4.10.1 → 4.10.3

package/CHANGELOG.md

@@ -1,4 +1,13 @@
 # CHANGELOG
+## 4.10.3
+- Trending: Fix first view 
+## 4.10.2
+- Trending: Fix root of tags tree
+- Trending: When no view detected, the Save View and Save View As work propertly and you can create the first view. Also the unit param was added to the Save View Modal
+- Trending: Fix the Digital/Analog icon of the view tags. Also fixed when add a new tag from the tree
+- Trending: The tag can be selected once for the view tags table
+## 4.10.1
+- Trending: Fix some bugs
 ## 4.10.0
 - Forms: Remove forms from mesf-core-frontend
 ## 4.9.0

package/dist/index.esm.js

@@ -9187,6 +9187,7 @@ var TagSelectionModal = function (_a) {
     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 backendOffset = 1000000;
     var _h = useState({}), openTagFolders = _h[0], setOpenTagFolders = _h[1];
     var _j = useState([]), selectedNodes = _j[0], setSelectedNodes = _j[1];
     useTrendingContext().state.viewTags;
@@ -9284,7 +9285,7 @@ var TagSelectionModal = function (_a) {
                 React__default.createElement(Tree, { classes: {
                         root: classes.assetRoot,
                         dropTarget: classes.dropTarget
-                    }, initialOpen: expanded, tree: tagsTreeData, rootId: 0, onDrop: handleDrop, canDrop: function (tag, options) {
+                    }, initialOpen: expanded, tree: tagsTreeData, rootId: backendOffset, onDrop: handleDrop, canDrop: function (tag, options) {
                         return !selectedNodes.some(function (selectedNode) {
                             return Number(selectedNode.id) === Number(options.dropTargetId);
                         });
@@ -9688,7 +9689,8 @@ var SaveAsViewModal = function (_a) {
                                 setNewView(newInputValue);
                             }
                         }, style: { width: "100%" }, renderInput: function (params) { return React__default.createElement(TextField, __assign({}, params, { label: "Views", variant: "outlined" })); } })) :
-                        (React__default.createElement("div", null, "No tag views detected, please add one")))),
+                        (React__default.createElement(Box, null,
+                            React__default.createElement(TextField, { style: { minWidth: "600px" }, size: 'small', id: "outlined-basic", label: "View name", variant: "outlined", value: newView, onChange: (function (e) { return setNewView(e.target.value); }) }))))),
                 React__default.createElement(Grid$1, { item: true, md: 12, xs: 12, style: { paddingTop: "2rem" }, className: classes.isPublicCheckbox },
                     React__default.createElement("label", null,
                         "Public",
@@ -9934,7 +9936,7 @@ var TableComponent = function (_a) {
     var handleAddTag = function (newTag) {
         var newArr = __spreadArray([], viewTags, true);
         if (newTag) {
-            newArr.push(__assign(__assign({}, newTag), { IsVisible: true }));
+            newArr.push(__assign(__assign({}, newTag), { IsVisible: true, TagType: newTag.TagTypeCode }));
             setViewTagsAndRefetch(newArr);
         }
     };
@@ -9963,7 +9965,13 @@ var TableComponent = function (_a) {
         { id: 'loadView', label: 'Load View', onClick: function () { return setLoadViewOpen(true); } },
     ];
     var handleTagSelect = function (selectedTag) {
-        handleAddTag(selectedTag);
+        var alreadySelected = viewTags.find(function (vt) { return vt.TagId === selectedTag.TagId; });
+        if (!alreadySelected) {
+            handleAddTag(selectedTag);
+        }
+        else {
+            setError("".concat(selectedTag.TagName, " is already selected"));
+        }
     };
     var handleDelete = function (index) { return __awaiter(void 0, void 0, void 0, function () {
         return __generator(this, function (_a) {
@@ -9982,14 +9990,18 @@ var TableComponent = function (_a) {
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
+                    if (!!viewSelected) return [3 /*break*/, 1];
+                    setSaveAsViewModalOpen(true);
+                    return [2 /*return*/];
+                case 1:
                     setIsLoading(true);
-                    if (!(viewSelected === null || viewSelected === void 0 ? void 0 : viewSelected.ViewId)) return [3 /*break*/, 5];
+                    if (!(viewSelected === null || viewSelected === void 0 ? void 0 : viewSelected.ViewId)) return [3 /*break*/, 6];
                     return [4 /*yield*/, upsertView(viewSelected === null || viewSelected === void 0 ? void 0 : viewSelected.ViewId, viewSelected.ViewName, viewSelected.IsPublic)];
-                case 1:
+                case 2:
                     resp = _a.sent();
-                    if (!resp.ok) return [3 /*break*/, 4];
+                    if (!resp.ok) return [3 /*break*/, 5];
                     return [4 /*yield*/, deleteAllViewTagsFromView(viewSelected.ViewId)];
-                case 2:
+                case 3:
                     deleteResp = _a.sent();
                     if (!deleteResp.ok) {
                         setError(deleteResp.message);
@@ -10003,7 +10015,7 @@ var TableComponent = function (_a) {
                                 }
                             });
                         }))];
-                case 3:
+                case 4:
                     results = _a.sent();
                     results.forEach(function (result, index) {
                         if (result.status === "rejected") {
@@ -10014,13 +10026,14 @@ var TableComponent = function (_a) {
                             setSnackbarMessage('View saved successfully');
                         }
                     });
-                    return [3 /*break*/, 5];
-                case 4:
-                    setError(resp.message);
-                    _a.label = 5;
+                    return [3 /*break*/, 6];
                 case 5:
+                    setError(resp.message);
+                    _a.label = 6;
+                case 6:
                     setIsLoading(false);
-                    return [2 /*return*/];
+                    _a.label = 7;
+                case 7: return [2 /*return*/];
             }
         });
     }); };
@@ -10089,7 +10102,7 @@ var TableComponent = function (_a) {
                     React__default.createElement("table", { style: { width: '100%', tableLayout: 'fixed', textAlign: "center" } },
                         React__default.createElement("thead", null,
                             React__default.createElement("tr", null,
-                                React__default.createElement("th", { className: classes.visible }, "View:"),
+                                React__default.createElement("th", { className: classes.visible }, (viewSelected === null || viewSelected === void 0 ? void 0 : viewSelected.ViewName) && "View:"),
                                 React__default.createElement("th", { className: classes.aliasCol }, viewSelected === null || viewSelected === void 0 ? void 0 : viewSelected.ViewName),
                                 React__default.createElement("th", { className: classes.color }),
                                 React__default.createElement("th", { colSpan: 4, className: "".concat(classes.topTitles, " ").concat(classes.scale) }, "Scale"),
@@ -10182,7 +10195,8 @@ 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.TagTypeCode === "Real" || tag.TagTypeCode === "A" ? "blue" : ("red") } }, tag.TagTypeCode === "Real" || tag.TagTypeCode === "A" ? "A" : "D"),
+                                            tag.TagType &&
+                                                (React__default.createElement("div", { className: classes.dataType, style: { backgroundColor: tag.TagType === "A" ? "blue" : "red" } }, tag.TagType)),
                                             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);
@@ -10231,7 +10245,7 @@ var TableComponent = function (_a) {
                                 React__default.createElement("td", null,
                                     !isNaN(((_f = dataTable[tag.TagName]) === null || _f === void 0 ? void 0 : _f.pmax.y) * 0) ? round((_g = dataTable[tag.TagName]) === null || _g === void 0 ? void 0 : _g.pmax.y) : 0,
                                     " ")));
-                        }) : React__default.createElement("div", { style: { padding: '2rem' } },
+                        }) : React__default.createElement("div", { style: { padding: '1rem' } },
                             React__default.createElement("div", { style: { padding: "1rem" } }, "No tag view detected. "),
                             React__default.createElement("div", { style: { padding: "1rem" } },
                                 React__default.createElement(Button$1, { onClick: function () { return setTagsTreeModalOpen(true); }, variant: 'contained', color: 'primary' }, " Add tag")),
@@ -10885,13 +10899,14 @@ var TrendingsPage = function (props) {
                         setViews(viewsResp.data.tables[0].rows);
                         lastCreated = void 0;
                         if (!viewSelected || forceReload) {
-                            lastCreated = viewsResp.data.tables[0].rows.reduce(function (prev, current) { return (prev.ViewId > current.ViewId) ? prev : current; });
+                            lastCreated = viewsResp.data.tables[0].rows.reduce(function (prev, current) { return (prev && (prev.ViewId > current.ViewId)) ? prev : current; }, null);
                             //viewSelected
                             setViewSelected(lastCreated);
                         }
                         else {
                             lastCreated = viewSelected;
                         }
+                        console.log(lastCreated);
                         return [4 /*yield*/, getViewTags(lastCreated.ViewId)];
                     case 2:
                         viewTagsResp = _a.sent();