@ntlab/sipd-tu-bridge-ui 1.1.2 → 1.1.4

package/controller/security.js

@@ -26,16 +26,12 @@ const Controller = require('@ntlab/express-controller');
 const Express = require('express').application;
 
 class SecurityController extends Controller {
+
     buildRoutes() {
         this.addRoute('index', 'get', '/login', (req, res, next) => {
-            let redir;
-            if (req.params.r) {
-                redir = req.params.r;
-            } else if (req.query.r) {
-                redir = req.query.r;
-            }
+            const redirect = req.params.r || req.query.r || req.getPath('/');
             res.app.slots.mainmenu.enabled = false;
-            res.render('security/login', {redirect: redir ? redir : req.getPath('/')});
+            res.render('security/login', {redirect});
         });
         this.addRoute('login', 'post', '/login', (req, res, next) => {
             const result = {
@@ -44,7 +40,7 @@ class SecurityController extends Controller {
             if (req.user.authenticate(req.body.username, req.body.password)) {
                 req.user.login();
                 result.success = true;
-                result.url = req.body.continue ? req.body.continue : req.getPath('/');
+                result.url = req.body.continue ?? req.getPath('/');
             } else {
                 result.error = this._('Invalid username and/or password');
             }
@@ -66,7 +62,7 @@ class SecurityController extends Controller {
      * @returns {SecurityController}
      */
     static create(app, prefix = '/') {
-        const controller = new SecurityController({prefix: prefix, name: 'Security'});
+        const controller = new SecurityController({prefix, name: 'Security'});
         app.use(prefix, controller.router);
         return controller;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ntlab/sipd-tu-bridge-ui",
-  "version": "1.1.2",
+  "version": "1.1.4",
   "description": "SIPD Penatausahaan Bridge Web Interface",
   "main": "index.js",
   "scripts": {

package/views/ui/index.ejs

@@ -61,6 +61,9 @@ $.uiCon = {
             .on('queue', function() {
                 $.queue.reload();
                 $.uiRefresh();
+            })
+            .on('error', function() {
+                $.error.reload();
             });
     }
 }

package/views/ui/util.ejs

@@ -29,7 +29,7 @@ $.uiRefresh = function() {
             }
         });
 }
-$.addLog(el, message) {
+$.addLog = function(el, message) {
     message += '\\r\\n';
     if (el.text().substr(-message.length) !== message) {
         el.append(document.createTextNode(message));