@websy/websy-designs 1.4.4 → 1.4.6

package/dist/server/helpers/v1/pgHelper.js

@@ -337,7 +337,6 @@ class PGHelper {
     })
   }
   execute (query) {
-    console.log(query)    
     return new Promise((resolve, reject) => {
       if (query !== null) {
         this.client.query(query, (err, queryResponse) => {

package/dist/websy-designs-es6.debug.js

@@ -3697,6 +3697,26 @@ class WebsyRouter {
       this.navigate(`${inputPath}?${path}`, 'main', null, noHistory)
     }
   }
+  removeAllUrlParams (reloadView = false, noHistory = true) {
+    // const output = {
+    //   path: '',
+    //   items: {}
+    // }
+    // this.currentParams = output
+    let inputPath = this.currentView
+    if (this.options.urlPrefix) {
+      inputPath = `/${this.options.urlPrefix}/${inputPath}`
+    }    
+    if (reloadView === true) {
+      this.navigate(`${inputPath}`, 'main', null, noHistory)
+    }
+    else {
+      this.currentParams = {
+        path: '',
+        items: {}
+      }
+    }
+  }
   buildUrlPath (params) {
     let path = []
     for (let key in params) {
@@ -3717,6 +3737,9 @@ class WebsyRouter {
         if (!this.groups[g]) {
           this.addGroup(g)
         }
+        if (els[i].classList.contains(this.options.activeClass)) {
+          this.groups[g].activeView = v
+        }
         if (this.groups[g].views.indexOf(v) === -1) {
           this.groups[g].views.push(v)
         }
@@ -3760,9 +3783,9 @@ class WebsyRouter {
         if (this.groups[g].activeView) {
           views.push({view: this.groups[g].activeView, group: g})
         }
-        else {
-          views.push({view: this.groups[g].views[0], group: g})
-        }        
+        // else {
+        //   views.push({view: this.groups[g].views[0], group: g})
+        // }        
       }
     }
     return views
@@ -3935,12 +3958,12 @@ class WebsyRouter {
       <article id='${elementId}_content' class='websy-content-article'></article>
       <div id='${elementId}_loading' class='websy-loading-container'><div class='websy-ripple'><div></div><div></div></div></div>
     `
-    if (options.help && options.help !== '') {
+    if (options && options.help && options.help !== '') {
       html += `
         <Help not yet supported>
       `
     }
-    if (options.tooltip && options.tooltip.value && options.tooltip.value !== '') {
+    if (options && options.tooltip && options.tooltip.value && options.tooltip.value !== '') {
       html += `
           <div class="websy-info ${this.options.tooltip.classes.join(' ') || ''}" data-info="${this.options.tooltip.value}">
             <svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 512 512"><title>ionicons-v5-e</title><path d="M256,56C145.72,56,56,145.72,56,256s89.72,200,200,200,200-89.72,200-200S366.28,56,256,56Zm0,82a26,26,0,1,1-26,26A26,26,0,0,1,256,138Zm48,226H216a16,16,0,0,1,0-32h28V244H228a16,16,0,0,1,0-32h32a16,16,0,0,1,16,16V332h28a16,16,0,0,1,0,32Z"/></svg>
@@ -4046,7 +4069,7 @@ class WebsyRouter {
       this.addGroup(group)
     }
     if (toggle === true && this.groups[group].activeView !== '') {
-      newPath = ''
+      newPath = inputPath === this.groups[group].activeView ? '' : inputPath
     }        
     this.previousView = this.currentView    
     this.previousPath = this.currentPath    

package/dist/websy-designs-es6.js

@@ -3994,6 +3994,31 @@ var WebsyRouter = /*#__PURE__*/function () {
         this.navigate("".concat(inputPath, "?").concat(path), 'main', null, noHistory);
       }
     }
+  }, {
+    key: "removeAllUrlParams",
+    value: function removeAllUrlParams() {
+      var reloadView = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
+      var noHistory = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
+      // const output = {
+      //   path: '',
+      //   items: {}
+      // }
+      // this.currentParams = output
+      var inputPath = this.currentView;
+
+      if (this.options.urlPrefix) {
+        inputPath = "/".concat(this.options.urlPrefix, "/").concat(inputPath);
+      }
+
+      if (reloadView === true) {
+        this.navigate("".concat(inputPath), 'main', null, noHistory);
+      } else {
+        this.currentParams = {
+          path: '',
+          items: {}
+        };
+      }
+    }
   }, {
     key: "buildUrlPath",
     value: function buildUrlPath(params) {
@@ -4025,6 +4050,10 @@ var WebsyRouter = /*#__PURE__*/function () {
             this.addGroup(g);
           }
 
+          if (els[i].classList.contains(this.options.activeClass)) {
+            this.groups[g].activeView = v;
+          }
+
           if (this.groups[g].views.indexOf(v) === -1) {
             this.groups[g].views.push(v);
           }
@@ -4084,12 +4113,10 @@ var WebsyRouter = /*#__PURE__*/function () {
               view: this.groups[g].activeView,
               group: g
             });
-          } else {
-            views.push({
-              view: this.groups[g].views[0],
-              group: g
-            });
-          }
+          } // else {
+          //   views.push({view: this.groups[g].views[0], group: g})
+          // }        
+
         }
       }
 
@@ -4298,11 +4325,11 @@ var WebsyRouter = /*#__PURE__*/function () {
 
       var html = "\n      <article id='".concat(elementId, "_content' class='websy-content-article'></article>\n      <div id='").concat(elementId, "_loading' class='websy-loading-container'><div class='websy-ripple'><div></div><div></div></div></div>\n    ");
 
-      if (options.help && options.help !== '') {
+      if (options && options.help && options.help !== '') {
         html += "\n        <Help not yet supported>\n      ";
       }
 
-      if (options.tooltip && options.tooltip.value && options.tooltip.value !== '') {
+      if (options && options.tooltip && options.tooltip.value && options.tooltip.value !== '') {
         html += "\n          <div class=\"websy-info ".concat(this.options.tooltip.classes.join(' ') || '', "\" data-info=\"").concat(this.options.tooltip.value, "\">\n            <svg xmlns=\"http://www.w3.org/2000/svg\" width=\"20\" height=\"20\" viewBox=\"0 0 512 512\"><title>ionicons-v5-e</title><path d=\"M256,56C145.72,56,56,145.72,56,256s89.72,200,200,200,200-89.72,200-200S366.28,56,256,56Zm0,82a26,26,0,1,1-26,26A26,26,0,0,1,256,138Zm48,226H216a16,16,0,0,1,0-32h28V244H228a16,16,0,0,1,0-32h32a16,16,0,0,1,16,16V332h28a16,16,0,0,1,0,32Z\"/></svg>\n          </div>   \n        ");
       }
 
@@ -4429,7 +4456,7 @@ var WebsyRouter = /*#__PURE__*/function () {
       }
 
       if (toggle === true && this.groups[group].activeView !== '') {
-        newPath = '';
+        newPath = inputPath === this.groups[group].activeView ? '' : inputPath;
       }
 
       this.previousView = this.currentView;