@dexteel/mesf-core 4.7.0 → 4.7.2

package/CHANGELOG.md

@@ -1,4 +1,9 @@
 # CHANGELOG
+## 4.7.2
+- Trending: Fix repeated tags bug. When you select a tag that was already in the view, you get an error message
+- MESF: Add a button in the navbar to go to /trendings
+## 4.7.1
+- Trending: fix error when removing a tag and saving the view & fix load view
 ## 4.7.0
 A new page is introduced to display a table containing forms and establish relationships between forms/assets/users. Additionally, tables are created to effectively showcase relevant information
 ## 4.6.2

package/dist/index.esm.js

@@ -1,5 +1,5 @@
 export { LicenseManager } from 'ag-grid-enterprise';
-import { Typography, TextField, makeStyles as makeStyles$1, Button as Button$1, Grid as Grid$1, Dialog as Dialog$1, DialogTitle as DialogTitle$2, DialogContent as DialogContent$2, DialogContentText, DialogActions as DialogActions$2, FormHelperText, CircularProgress as CircularProgress$1, Badge, FormControlLabel, Checkbox, Snackbar as Snackbar$1, Paper as Paper$1, MenuItem as MenuItem$1, useTheme as useTheme$1, createStyles as createStyles$1, FormControl as FormControl$1, Select as Select$1, Box, Divider, Tooltip, IconButton as IconButton$1, debounce, List, ListItem, ListItemText } from '@material-ui/core';
+import { Typography, TextField, makeStyles as makeStyles$1, Button as Button$1, Grid as Grid$1, Dialog as Dialog$1, DialogTitle as DialogTitle$2, DialogContent as DialogContent$2, DialogContentText, DialogActions as DialogActions$2, FormHelperText, CircularProgress as CircularProgress$1, Badge, FormControlLabel, Checkbox, Snackbar as Snackbar$1, Paper as Paper$1, MenuItem as MenuItem$1, useTheme as useTheme$1, Tooltip, createStyles as createStyles$1, FormControl as FormControl$1, Select as Select$1, Box, Divider, IconButton as IconButton$1, debounce, List, ListItem, ListItemText } from '@material-ui/core';
 import { values, get, isNil as isNil$1, isEmpty, isNaN } from 'lodash-es';
 import * as React from 'react';
 import React__default, { useState, useRef, useEffect, Component, createContext, useContext, useMemo, useCallback, lazy, Suspense } from 'react';
@@ -14,6 +14,7 @@ import { useMsal, MsalProvider } from '@azure/msal-react';
 import { LogLevel, PublicClientApplication } from '@azure/msal-browser';
 import { useComplexState } from 'use-complex-state';
 import { createSlice } from '@reduxjs/toolkit';
+import ShowChartIcon from '@material-ui/icons/ShowChart';
 import MenuItem from '@material-ui/core/MenuItem';
 import MenuList from '@material-ui/core/MenuList';
 import Paper from '@material-ui/core/Paper';
@@ -8190,6 +8191,10 @@ function Header$1(_a) {
                 React__default.createElement(Nav, { className: "me-auto" },
                     React__default.createElement(CustomNavbar, null)),
                 React__default.createElement(Nav, { className: "ml-auto", style: { alignItems: "baseline" } },
+                    React__default.createElement(Nav, { className: "mx-2" },
+                        React__default.createElement(Nav.Link, { as: Link, to: "/trendings" },
+                            React__default.createElement(Tooltip, { title: 'Trendings', placement: "top", arrow: true, interactive: true, enterDelay: 1500 },
+                                React__default.createElement(ShowChartIcon, null)))),
                     React__default.createElement(Nav, null,
                         React__default.createElement("span", { className: "navbar-text" }, date.toLocaleTimeString())),
                     React__default.createElement(Nav, { className: "mx-2" },
@@ -9624,21 +9629,7 @@ var TrendingsInitialState = {
         }
     ],
     viewSelected: null,
-    viewTags: [
-        {
-            ViewId: 0,
-            TagId: 0,
-            TagName: '',
-            Color: '',
-            IsVisible: true,
-            MinScale: 0,
-            MaxScale: 0,
-            IsAutoScale: true,
-            Alias: '',
-            TagType: '',
-            Unit: ''
-        }
-    ]
+    viewTags: []
 };
 var TrendingsReducer = createSlice({
     name: "__",
@@ -9956,6 +9947,7 @@ var TagSelectionModal = function (_a) {
     var _c = useState(''), error = _c[0], setError = _c[1];
     var _d = useState([]), treeData = _d[0], setTreeData = _d[1];
     var _e = useState([]), expanded = _e[0], setExpanded = _e[1];
+    var viewTags = useTrendingContext().state.viewTags;
     var currentColorIndex = useRef(0);
     useEffect(function () {
         var loadData = function () { return __awaiter(void 0, void 0, void 0, function () {
@@ -10055,17 +10047,22 @@ var TagSelectionModal = function (_a) {
     /* I have to get the grandchildren because the toggle action would not be triggered if no children */
     var handleNodeToggle = function (event, nodeIds) { return __awaiter(void 0, void 0, void 0, function () {
         return __generator(this, function (_a) {
-            // console.log("Toggle:", nodeIds);
             setExpanded(nodeIds);
             return [2 /*return*/];
         });
     }); };
     var handleNodeSelect = function (event, nodeId) { return __awaiter(void 0, void 0, void 0, function () {
-        var node;
+        var node, alreadySelected;
         return __generator(this, function (_a) {
             node = findNode(treeData, nodeId);
             if (node === null || node === void 0 ? void 0 : node.TagId) {
-                onTagSelect(node.tag);
+                alreadySelected = viewTags.find(function (vt) { return vt.TagId === node.TagId; });
+                if (!alreadySelected) {
+                    onTagSelect(node.tag);
+                }
+                else {
+                    setError("".concat(node.TagName, " is already added to the view"));
+                }
             }
             return [2 /*return*/];
         });
@@ -10149,7 +10146,7 @@ var getViews = function (Search) { return __awaiter(void 0, void 0, void 0, func
         }
     });
 }); };
-var getViewTags = function (ViewId) { return __awaiter(void 0, void 0, void 0, function () {
+var upsertView = function (ViewId, ViewName, isPublic) { return __awaiter(void 0, void 0, void 0, function () {
     var apiService, parameters, resp;
     return __generator(this, function (_a) {
         switch (_a.label) {
@@ -10157,14 +10154,17 @@ var getViewTags = function (ViewId) { return __awaiter(void 0, void 0, void 0, f
                 apiService = new MESApiService();
                 parameters = [];
                 parameters.push({ name: "ViewId", value: ViewId });
-                return [4 /*yield*/, apiService.callV2("[mssql2022].[IH_100020].[ih].[GetViewTags]", parameters)];
+                parameters.push({ name: "ViewName", value: ViewName });
+                parameters.push({ name: "isPublic", value: isPublic });
+                return [4 /*yield*/, apiService.callV2("[mssql2022].[IH_100020].[ih].[UpsertView]", parameters)];
             case 1:
                 resp = _a.sent();
                 return [2 /*return*/, resp];
         }
     });
 }); };
-var upsertView = function (ViewId, ViewName, isPublic) { return __awaiter(void 0, void 0, void 0, function () {
+//viewTags
+var getViewTags = function (ViewId) { return __awaiter(void 0, void 0, void 0, function () {
     var apiService, parameters, resp;
     return __generator(this, function (_a) {
         switch (_a.label) {
@@ -10172,9 +10172,7 @@ var upsertView = function (ViewId, ViewName, isPublic) { return __awaiter(void 0
                 apiService = new MESApiService();
                 parameters = [];
                 parameters.push({ name: "ViewId", value: ViewId });
-                parameters.push({ name: "ViewName", value: ViewName });
-                parameters.push({ name: "isPublic", value: isPublic });
-                return [4 /*yield*/, apiService.callV2("[mssql2022].[IH_100020].[ih].[UpsertView]", parameters)];
+                return [4 /*yield*/, apiService.callV2("[mssql2022].[IH_100020].[ih].[GetViewTags]", parameters)];
             case 1:
                 resp = _a.sent();
                 return [2 /*return*/, resp];
@@ -10201,6 +10199,22 @@ var upsertViewTag = function (ViewId, TagId, Color, MinScale, MaxScale, IsVisibl
                 return [2 /*return*/, resp];
         }
     });
+}); };
+var deleteViewTag = function (ViewId, TagId) { return __awaiter(void 0, void 0, void 0, function () {
+    var apiService, parameters, resp;
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 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)];
+            case 1:
+                resp = _a.sent();
+                return [2 /*return*/, resp];
+        }
+    });
 }); };
 
 var LoadViewModal = function (_a) {
@@ -10657,13 +10671,31 @@ var TableComponent = function (_a) {
         handleAddTag(selectedTag);
         handleClose();
     };
-    var handleDelete = function (index) {
-        if (selectedRowIndex !== null) {
-            var tagToDelete = viewTags[selectedRowIndex];
-            handleDeleteTag(tagToDelete.TagId);
-            setSelectedRowIndex(null); // Reset the selected row index
-        }
-    };
+    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*/];
+            }
+        });
+    }); };
     useEffect(function () {
         if (Array.isArray(viewTags)) {
             setEditableTagNames(viewTags.reduce(function (acc, tag) {
@@ -10887,8 +10919,6 @@ var TableComponent = function (_a) {
                 } }),
             React__default.createElement(LoadViewModal, { open: loadViewOpen, handleClose: function (shouldUpdate) {
                     setLoadViewOpen(false);
-                    if (shouldUpdate)
-                        getTagsFromAPI().then(function () { });
                 } })),
         React__default.createElement(ErrorModal, { error: error, onHide: function () { return setError(''); } })));
 };
@@ -11474,7 +11504,7 @@ var Trending = function (_a) {
 
 var TrendingsPage = function (props) {
     var _a = useState(''), error = _a[0], setError = _a[1];
-    var _b = useTrendingContext().actions, setViews = _b.setViews, setViewTags = _b.setViewTags, setViewSelected = _b.setViewSelected;
+    var _b = useTrendingContext(), viewSelected = _b.state.viewSelected, _c = _b.actions, setViews = _c.setViews, setViewTags = _c.setViewTags, setViewSelected = _c.setViewSelected;
     var getTagsFromAPI = function () { return __awaiter(void 0, void 0, void 0, function () {
         var viewsResp, lastCreated, viewTagsResp;
         return __generator(this, function (_a) {
@@ -11484,9 +11514,15 @@ var TrendingsPage = function (props) {
                     viewsResp = _a.sent();
                     if (!viewsResp.ok) return [3 /*break*/, 3];
                     setViews(viewsResp.data.tables[0].rows);
-                    lastCreated = viewsResp.data.tables[0].rows.reduce(function (prev, current) { return (prev.ViewId > current.ViewId) ? prev : current; });
-                    //viewSelected
-                    setViewSelected(lastCreated);
+                    lastCreated = void 0;
+                    if (!viewSelected) {
+                        lastCreated = viewsResp.data.tables[0].rows.reduce(function (prev, current) { return (prev.ViewId > current.ViewId) ? prev : current; });
+                        //viewSelected
+                        setViewSelected(lastCreated);
+                    }
+                    else {
+                        lastCreated = viewSelected;
+                    }
                     return [4 /*yield*/, getViewTags(lastCreated.ViewId)];
                 case 2:
                     viewTagsResp = _a.sent();