@dexteel/mesf-core 4.5.4 → 4.5.6

package/CHANGELOG.md

@@ -1,4 +1,12 @@
 # CHANGELOG
+## 4.5.6
+ - Fix login with Windows Auth
+## 4.5.5
+ - 115 fix area asset picker
+ - 114 fix error modal width
+ - 127 add columns in configuration jobs table
+ - change layout in login component
+ - 134 close aseet tree with esc
 ## 4.5.4
  - Add arrows dates navigator
 ## 4.5.3

package/dist/configuration/pages/job/components/JobsTable/customHooks/useJobsTableData.d.ts

@@ -9,10 +9,13 @@ export declare const useJobsTableData: ({ setRowSelected }: Props) => {
         id: number;
         sProcedure: string;
         Running: boolean;
-        LastStarted: null;
-        LastCounter: null;
+        LastStarted: Date | null;
+        LastCounter: Date;
         Enabled: boolean;
         RestartAfterFailure: boolean;
+        PeriodTime: number | null;
+        StartTime: Date;
+        NextExecutionTime: Date;
     }[];
     columnDefs: ColDef<any>[];
 };

package/dist/configuration/pages/job/models/Job.d.ts

@@ -1,14 +1,19 @@
 export interface Job {
-    row: Job;
     JobId: number;
     sProcedure: string;
-    LastStarted: null;
-    LastContact: null;
-    LastStatus: null;
+    LastStarted: Date | null;
+    LastContact: Date | null;
+    LastStatus: string | null;
     Counter: number;
-    LastCounter: null;
-    Enabled: boolean;
+    LastCounter: Date;
     RestartAfterFailure: boolean;
+    PeriodTime: number | null;
+    StartTime: Date;
+    NextExecutionTime: Date;
+    LastExecutionTime: Date;
+    LastExecutionResult: string;
+    CurrentStatus: string;
+    Enabled: boolean;
     SessionId: null;
     Started: null;
     Status: null;

package/dist/index.esm.js

@@ -368,6 +368,11 @@ var ModalTreeFilterControl = function (props) {
                 onClose(value, findNode.name, findNode);
         }
     };
+    var handleKeyDown = function (event) {
+        if (event.key === "Escape") {
+            onClose();
+        }
+    };
     var getNodeParent = function (node, id, chain) {
         if (chain === void 0) { chain = []; }
         if (!node || node.id === undefined) {
@@ -429,7 +434,7 @@ var ModalTreeFilterControl = function (props) {
                     nodes.name))), className: "delay-item-node", id: nodes.id, "data-isbranch": !nodes.isCode }, Array.isArray(nodes.children)
         ? nodes.children.map(function (node) { return renderTree(node); })
         : null)); };
-    return (React__default.createElement(Dialog, __assign({ onClose: function (event, reason) { return null; }, "aria-label": title, maxWidth: "xs", TransitionProps: { onEntering: handleEntering }, "aria-labelledby": "confirmation-dialog-title", open: open }, other),
+    return (React__default.createElement(Dialog, __assign({ onClose: function (event, reason) { return null; }, "aria-label": title, maxWidth: "xs", TransitionProps: { onEntering: handleEntering }, "aria-labelledby": "confirmation-dialog-title", open: open }, other, { onKeyDown: handleKeyDown }),
         React__default.createElement(DialogTitle$1, { id: "confirmation-dialog-title" }, title),
         React__default.createElement(DialogContent$1, { dividers: true },
             React__default.createElement(TreeView, { className: classes.root, defaultCollapseIcon: React__default.createElement(MinusSquare, null), defaultExpandIcon: React__default.createElement(PlusSquare, null), ref: treeRef, selected: value === undefined ? "" : value.toString(), expanded: expanded, onNodeSelect: handleChange, onNodeToggle: handleToogle }, data && data.id !== undefined && renderTree(data))),
@@ -477,7 +482,7 @@ var TreePickerControl = function (props) {
     };
     return (React__default.createElement(Grid, { container: true, className: classes.root },
         React__default.createElement(Grid, { container: true, item: true, md: 12, xs: 12, style: { position: "relative" } },
-            React__default.createElement(Grid, { item: true, style: { position: "relative" } },
+            React__default.createElement(Grid, { item: true, style: { position: "relative", width: "100%" } },
                 React__default.createElement(TextField, { label: inputTitle, variant: "outlined", value: props.description, margin: "dense", autoComplete: "off", fullWidth: true, disabled: true }),
                 React__default.createElement(AccountTreeIcon, { style: {
                         position: "absolute",
@@ -1043,7 +1048,7 @@ var useJobsTableData = function (_a) {
     var _b = useJobsContext().state, jobsData = _b.jobsData, blockButtons = _b.blockButtons;
     var classes = useStyles$s();
     var rows = jobsData.map(function (_a) {
-        var JobId = _a.JobId, sProcedure = _a.sProcedure, Running = _a.Running, LastStarted = _a.LastStarted, LastCounter = _a.LastCounter, Enabled = _a.Enabled, RestartAfterFailure = _a.RestartAfterFailure;
+        var JobId = _a.JobId, sProcedure = _a.sProcedure, Running = _a.Running, LastStarted = _a.LastStarted, LastCounter = _a.LastCounter, Enabled = _a.Enabled, RestartAfterFailure = _a.RestartAfterFailure, PeriodTime = _a.PeriodTime, StartTime = _a.StartTime, NextExecutionTime = _a.NextExecutionTime;
         return ({
             id: JobId,
             sProcedure: sProcedure,
@@ -1051,7 +1056,10 @@ var useJobsTableData = function (_a) {
             LastStarted: LastStarted,
             LastCounter: LastCounter,
             Enabled: Enabled,
-            RestartAfterFailure: RestartAfterFailure
+            RestartAfterFailure: RestartAfterFailure,
+            PeriodTime: PeriodTime,
+            StartTime: StartTime,
+            NextExecutionTime: NextExecutionTime
         });
     });
     var onActionsClick = function (e, params) {
@@ -1121,12 +1129,50 @@ var useJobsTableData = function (_a) {
         },
         {
             field: "Running",
-            minWidth: 100,
-            maxWidth: 100,
+            minWidth: 60,
+            maxWidth: 60,
             headerName: "Status",
             valueFormatter: function (_a) {
                 var value = _a.value;
-                return (value ? "running" : "inactive");
+                return (value ? "Running" : "Inactive");
+            },
+            flex: 1
+        },
+        {
+            field: "PeriodTime",
+            minWidth: 80,
+            maxWidth: 80,
+            headerName: "Period Time",
+            flex: 1,
+            valueFormatter: function (_a) {
+                var value = _a.value;
+                if (value === null || value === undefined)
+                    return "";
+                var horas = Math.floor(value / 3600);
+                var minutos = Math.floor((value % 3600) / 60);
+                var segundos = value % 60;
+                return "".concat(horas, "h ").concat(minutos, "min ").concat(segundos, "s");
+            }
+        },
+        {
+            field: "StartTime",
+            minWidth: 130,
+            maxWidth: 130,
+            headerName: "Start Time",
+            valueFormatter: function (_a) {
+                var value = _a.value;
+                return value === null ? "NULL" : moment(value).format("DD/MM/YYYY HH:mm");
+            },
+            flex: 1
+        },
+        {
+            field: "NextExecutionTime",
+            minWidth: 115,
+            maxWidth: 115,
+            headerName: "Next Execution",
+            valueFormatter: function (_a) {
+                var value = _a.value;
+                return value === null ? "NULL" : moment(value).format("DD/MM/YYYY HH:mm");
             },
             flex: 1
         },
@@ -1143,8 +1189,8 @@ var useJobsTableData = function (_a) {
         },
         {
             field: "LastCounter",
-            minWidth: 130,
-            maxWidth: 130,
+            minWidth: 115,
+            maxWidth: 115,
             headerName: "Last Seen",
             valueFormatter: function (_a) {
                 var value = _a.value;
@@ -1154,8 +1200,8 @@ var useJobsTableData = function (_a) {
         },
         {
             field: "Enabled",
-            minWidth: 70,
-            maxWidth: 70,
+            minWidth: 50,
+            maxWidth: 50,
             headerName: "Enabled",
             valueFormatter: function (_a) {
                 var value = _a.value;
@@ -1273,14 +1319,14 @@ var MesfModal = Object.assign(Modal, {
 });
 
 var ErrorModal = function (_a) {
-    var error = _a.error, onHide = _a.onHide, _b = _a.title, title = _b === void 0 ? "Something went wrong!" : _b, _c = _a.size, size = _c === void 0 ? "sm" : _c;
+    var error = _a.error, onHide = _a.onHide, _b = _a.title, title = _b === void 0 ? "Something went wrong!" : _b, _c = _a.size, size = _c === void 0 ? "md" : _c;
     return !!error ? (React__default.createElement(MesfModal, { open: true, handleClose: function () {
             onHide();
         }, title: title, maxWidth: size },
         React__default.createElement(MesfModal.Content, null,
             React__default.createElement("div", null, error)),
         React__default.createElement(MesfModal.Actions, null,
-            React__default.createElement(Grid$1, { container: true, spacing: 2, justifyContent: "flex-end", style: { padding: "1rem" } },
+            React__default.createElement(Grid$1, { container: true, spacing: 2, justifyContent: "flex-end", style: { padding: "1rem", minWidth: "600px" } },
                 React__default.createElement(Grid$1, { item: true, md: 2, xs: 12 },
                     React__default.createElement(Button$1, { fullWidth: true, variant: "contained", color: "default", onClick: function () {
                             onHide();
@@ -7720,7 +7766,16 @@ var LoginWithEmailAndPassword = function () {
     }); };
     return (React__default.createElement(React__default.Fragment, null,
         React__default.createElement("form", { onSubmit: login },
-            React__default.createElement(Alert$1, { show: showError, variant: "danger", dismissible: true, onClose: function () {
+            React__default.createElement("div", { className: "form-group row" },
+                React__default.createElement(TextField, { variant: "outlined", margin: "dense", id: "txtUserName", label: "User", name: "userName", onChange: function (e) { return setUserName(e.target.value); }, type: "text", autoComplete: "off", className: "form-control" })),
+            React__default.createElement("div", { className: "form-group row" },
+                React__default.createElement(TextField, { variant: "outlined", margin: "dense", id: "txtPassword", label: "Password", name: "password", onChange: function (e) { return setPassword(e.target.value); }, type: "password", className: "form-control" })),
+            React__default.createElement("div", { className: "row" },
+                React__default.createElement(Button$1, { fullWidth: true, variant: "contained", style: {
+                        backgroundColor: (password.length === 0 || username.length === 0) ? '#CCCCCC' : '#479DC4',
+                        color: (password.length === 0 || username.length === 0) ? 'black' : 'white'
+                    }, type: "submit", disabled: password.length === 0 || username.length === 0 }, "Login")),
+            React__default.createElement(Alert$1, { style: { marginTop: 20 }, show: showError, variant: "danger", dismissible: true, onClose: function () {
                     setShowError(false);
                     setError(undefined);
                 } },
@@ -7731,13 +7786,7 @@ var LoginWithEmailAndPassword = function () {
                         ? "There was an error"
                         : error.internalError.message === undefined
                             ? error.internalError
-                            : error.internalError.message)),
-            React__default.createElement("div", { className: "form-group row" },
-                React__default.createElement("input", { id: "txtUserName", placeholder: "User", name: "userName", onChange: function (e) { return setUserName(e.target.value); }, type: "text", autoComplete: "off", className: "form-control" })),
-            React__default.createElement("div", { className: "form-group row" },
-                React__default.createElement("input", { id: "txtPassword", placeholder: "Password", name: "password", onChange: function (e) { return setPassword(e.target.value); }, type: "password", className: "form-control" })),
-            React__default.createElement("div", { className: "row" },
-                React__default.createElement("button", { className: "btn btn-primary mes-button-primary mx-auto col-md-12 mt-3 ", type: "submit", disabled: password.length === 0 || username.length === 0 }, "Login")))));
+                            : error.internalError.message)))));
 };
 
 /*
@@ -7832,7 +7881,7 @@ var LoginWithAzureADForm = function () {
     }); };
     return (React__default.createElement("form", { onSubmit: login },
         React__default.createElement("div", { className: "row" },
-            React__default.createElement("button", { className: "btn btn-primary mes-button-primary mx-auto col-md-12 mt-3 ", type: "submit" }, "Login with Azure AD"))));
+            React__default.createElement(Button$1, { fullWidth: true, variant: "contained", style: { backgroundColor: '#479DC4', color: 'white' }, type: "submit" }, "Login with Azure AD"))));
 };
 
 var LoginWithAzureAD = function (_a) {
@@ -7884,7 +7933,7 @@ var LoginAsGuest = function () {
                         ? error.internalError
                         : error.internalError.message)),
         React__default.createElement("div", { className: "row" },
-            React__default.createElement("button", { className: "btn btn-primary mes-button-primary mx-auto col-md-12 mt-3 ", role: "button", onClick: loginAsGuest }, "Guest"))));
+            React__default.createElement(Button$1, { fullWidth: true, variant: "contained", style: { backgroundColor: '#479DC4', color: 'white' }, role: "button", onClick: loginAsGuest }, "Guest"))));
 };
 
 var LoginWithWindowsAuthentication = function () {
@@ -7953,7 +8002,7 @@ var LoginWithWindowsAuthentication = function () {
                     " ",
                     error)),
             React__default.createElement("div", { className: "row" },
-                React__default.createElement("button", { className: "btn btn-primary mes-button-primary mx-auto col-md-12 mt-3 ", role: "button", onClick: login }, "Windows Auth"))));
+                React__default.createElement(Button$1, { fullWidth: true, variant: "contained", style: { backgroundColor: '#479DC4', color: 'white' }, role: "button", onClick: login }, "Windows Auth"))));
     return null;
 };
 
@@ -7964,7 +8013,7 @@ function Login(_a) {
     var _c = useState(""), message = _c[0], setMessage = _c[1];
     var useEmailAndPassword = get(authConfig, "useEmailAndPassword", true);
     var useAzureAD = get(authConfig, "useAzureAD", false);
-    get(authConfig, "useWindowsAuth", false);
+    var useWindowsAuth = get(authConfig, "useWindowsAuth", false);
     var guestIsEnabled = get(authConfig, "guestIsEnabled", false);
     var handleClose = function () {
         setOpen(false);
@@ -7984,14 +8033,22 @@ function Login(_a) {
                 React__default.createElement(Navbar.Brand, { href: "/" }, "MESF"))),
         React__default.createElement("div", { className: "container-fluid" },
             React__default.createElement("div", { className: "row" },
-                React__default.createElement("div", { className: "col-12 col-md-6 mx-auto my-5" },
-                    React__default.createElement("div", { className: "card" },
-                        React__default.createElement("div", { className: "card-header text-center" }, "Login"),
-                        React__default.createElement("div", { className: "card-body m-3" },
-                            useEmailAndPassword && React__default.createElement(LoginWithEmailAndPassword, null),
-                            useAzureAD && (React__default.createElement(LoginWithAzureAD, { config: authConfig.AzureConfig })),
-                            React__default.createElement(LoginWithWindowsAuthentication, null),
-                            guestIsEnabled && React__default.createElement(LoginAsGuest, null)))))),
+                React__default.createElement("div", { className: "col-10 col-md-6 mx-auto my-5" },
+                    React__default.createElement(Paper$1, { elevation: 2 },
+                        React__default.createElement("div", { className: "card-header text-center" },
+                            React__default.createElement("b", null, "LOGIN")),
+                        React__default.createElement(Grid$1, { container: true, justifyContent: "space-between", alignItems: "center" }, (!useAzureAD && !guestIsEnabled && !useWindowsAuth) ? (React__default.createElement(Grid$1, { item: true, xs: 12 },
+                            React__default.createElement(Paper$1, { elevation: 2, style: { padding: 40, margin: "40px 40px 40px 40px" } }, useEmailAndPassword && React__default.createElement(LoginWithEmailAndPassword, null)))) : (React__default.createElement(React__default.Fragment, null,
+                            React__default.createElement(Grid$1, { item: true, md: 5, xs: 5 },
+                                React__default.createElement(Paper$1, { elevation: 2, style: { padding: 40, margin: "40px -40px 40px 40px" } }, useEmailAndPassword && React__default.createElement(LoginWithEmailAndPassword, null))),
+                            React__default.createElement(Grid$1, { item: true, md: 1, xs: 1, style: { maxWidth: "20px" } },
+                                React__default.createElement("span", { className: "text-muted font-weight-bold" }, "OR")),
+                            React__default.createElement(Grid$1, { item: true, md: 5, xs: 5, style: { marginBottom: "auto" } },
+                                React__default.createElement(Paper$1, { elevation: 2, style: { padding: 40, margin: "40px 40px 40px -40px", minHeight: 248, display: 'flex', flexDirection: 'column', justifyContent: 'space-evenly' } },
+                                    React__default.createElement(React__default.Fragment, null,
+                                        React__default.createElement(LoginWithWindowsAuthentication, null),
+                                        useAzureAD && (React__default.createElement(LoginWithAzureAD, { config: authConfig.AzureConfig })),
+                                        guestIsEnabled && React__default.createElement(LoginAsGuest, null))))))))))),
         React__default.createElement(Snackbar$1, { open: open, autoHideDuration: 6000, onClose: handleClose, message: message })));
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dexteel/mesf-core",
-  "version": "4.5.4",
+  "version": "4.5.6",
   "author": "Dexteel Team",
   "module": "dist/index.esm.js",
   "typings": "dist/index.d.ts",