consul-templaterb 1.18.4 → 1.18.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0dc3089b2ac9f444e1b9b0d01e1f0615db553d441fec27cfb957f9971ecd4e5e
-  data.tar.gz: 14695f0f6de3dd032aaf15316b5136e695f3ec61e1879592379515419431771e
+  metadata.gz: 395c9514652523bda8cc32eb9ae1f7c0b0d19941c2df9cb3c09654e5dcc63d9c
+  data.tar.gz: 5f444cf5c5dbc03ca4ca4515646882365f9e5a6347c083b2b590f2893944bcf8
 SHA512:
-  metadata.gz: 8b9f4fdbd637ad60ddb4de4068db591d851e342e91717587ec773e4351de6b58ed11cdee8f5452345f41061d397bc613621d4994e737a6701459dd9c4ea7887a
-  data.tar.gz: 2c455c1fd909169d491387bb05be7d19fffe90ba3660788dc6135d2e905fc8a8a10bd1b1e8c640b875918db24efdd41f3d588cbff81025c3ea2b10e8666ea40f
+  metadata.gz: 41d34ad14160c153fb02a256d23bd5fd858f30d0593afe551d50738fdd60bea6009ef8e86f2d04e4220891db3ef19492906250d5fa34ed29a3e44ede30e082ef
+  data.tar.gz: 81b45b14001c436a710a1ab766811cbae0671087bce17bd29aff06512545889a0fb6e317eaf9c6eac9239aaf08062e64f15fa3e086605b4ff5af939714734e15

data/.travis.yml

@@ -1,8 +1,8 @@
 language: ruby
 rvm:
-- 2.4.6
-- 2.5.5
-- 2.6.2
+- 2.4.7
+- 2.5.6
+- 2.6.4
 deploy:
   provider: rubygems
   api_key:

data/CHANGELOG.md

@@ -2,7 +2,14 @@
 
 ## (UNRELEASED)
 
-## 1.18.4
+## 1.18.5 (September 30, 2019)
+
+IMPROVEMENTS:
+
+* build on travis with latest ruby versions
+* consul-ui: allow filtering from URL to create shortcuts easily
+
+## 1.18.4 (September 19, 2019)
 
 IMPROVEMENTS:
 

data/lib/consul/async/version.rb

@@ -1,5 +1,5 @@
 module Consul
   module Async
-    VERSION = '1.18.4'.freeze
+    VERSION = '1.18.5'.freeze
   end
 end

data/samples/consul-ui/js/keys.js

@@ -86,15 +86,18 @@ class ConsulKeys {
 
   onClickServiceName(source) {
     this.selectKey(source);
-    this.updateURL($(source).find(".key-name").html());
+    this.selectedKeyName = $(source).find(".key-name").html()
+    this.updateURL();
   }
 
-  updateURL(link) {
-    var newUrl = window.location.protocol + "//" + window.location.host + window.location.pathname;
-    if (link) {
-      newUrl += '?key=' + link
+  updateURL() {
+    var newUrl = new URL(location.href);
+    if (this.selectedKeyName) {
+      newUrl.searchParams.set('key', this.selectedKeyName);
+    } else {
+      newUrl.searchParams.delete('key')
     }
-    window.history.pushState({},"",newUrl);
+    window.history.pushState({},"",newUrl.href);
   }
 
   selectKey(source) {

data/samples/consul-ui/js/nodes.js

@@ -3,12 +3,23 @@ class ConsulNodes {
     this.ressourceURL = ressourceURL;
     this.fetchRessource();
     this.instanceFilter = $("#instance-filter");
+    var filter = new URL(location.href).searchParams.get('filter');
+    if (filter!=null && filter!='') {
+      this.instanceFilter.val(filter);
+    };
     this.instanceFilter.keyup(debounce(this.filterInstances, 400));
     this.refresh = parseInt(refresh);
     this.filterStatus = null;
     this.maxDisplayed = 100;
     this.displayedCount = 0;
     this.servicesStatus = {};
+    window.setTimeout(function(){
+      if (filter!=null && filter!='') {
+        consulNodes.instanceFilter.val(filter);
+        console.log(this.instanceFilter.value)
+        consulNodes.filterInstances();
+      }
+    }, 100);
   }
 
   fetchRessource() {
@@ -29,8 +40,19 @@ class ConsulNodes {
     this.filterInstances();
   }
 
+  updateURL() {
+    var newUrl = new URL(location.href);
+    if (consulNodes.instanceFilter.val()!='') {
+      newUrl.searchParams.set('filter', consulNodes.instanceFilter.val());
+    } else {
+      newUrl.searchParams.delete('filter')
+    }
+    window.history.pushState({},"",newUrl);
+  }
+
   filterInstances() {
     updateFilterDisplay(consulNodes.filterStatus);
+    consulNodes.updateURL();
     consulNodes.displayedCount = 0;
     consulNodes.servicesStatus = {};
     var filter = new RegExp(consulNodes.instanceFilter.val());

data/samples/consul-ui/js/service.js

@@ -12,12 +12,22 @@ class ConsulService {
     this.serviceFilterCounter = $("#service-counter");
     this.serviceFilterCount = 0;
     this.showProxiesInList = false;
+    this.selectedServiceName = new URL(location.href).searchParams.get('service');
+    this.serviceFilterValue = new URL(location.href).searchParams.get('filter');
     var cs = this
     this.loadFavorites();
     window.setTimeout(function(){
       cs.showTags($('#showTagsInList:checked').length > 0);
       cs.showProxies($('#showProxiesInList:checked').length > 0);
     }, 100);
+    
+  }
+
+  initFilterValue() {
+    if (this.serviceFilterValue) {
+      this.serviceFilter.val(this.serviceFilterValue);
+      this.filterService()
+    }
   }
 
   showTags(enableTags) {
@@ -44,31 +54,28 @@ class ConsulService {
     await this.reloadServiceList();
     console.log('Data generated at: ' + data['generated_at']);
 
-    var urlParam = new URL(location.href).searchParams.get('service');
-
+    var urlParam = this.selectedServiceName
     if (urlParam) {
       var nodes = document.getElementById('service-list').childNodes;
       for (const node of nodes) {
         if($(node).find(".service-name").html() == urlParam) {
-          var selectedElement = $(node)
+          var selectedElement = $(node);
           this.selectService(selectedElement);
-          selectedElement.focus()
+          selectedElement.focus();
           break;
         }
       }
-      this.serviceFilter.val(urlParam);
-      this.filterService()
-  } else {
-      var servicePrefix = '#service_'
+    } else {
+      var servicePrefix = '#service_';
       if (location.hash.startsWith(servicePrefix)) {
-        urlParam = location.hash.substr(servicePrefix.length)
+        urlParam = location.hash.substr(servicePrefix.length);
       }
       this.selectService(document.getElementById('service-list').firstElementChild);
     }
-
     if(this.refresh > 0) {
       setTimeout(this.fetchRessource, this.refresh * 1000);
     }
+    this.initFilterValue();
   }
 
   async reloadServiceList() {
@@ -95,7 +102,6 @@ class ConsulService {
 
     this.serviceFilterCounter.html(this.serviceFilterCount);
     resizeWrapper('service-wrapper', 'service-list');
-    this.filterService();
   }
 
   appendService(service, index) {
@@ -163,14 +169,16 @@ class ConsulService {
 
   filterService() {
     var filter;
-    var serviceVal = consulService.serviceFilter.val();
+    var filterValue = consulService.serviceFilter.val();
     try {
-      filter = new RegExp(serviceVal);
+      filter = new RegExp(filterValue);
     } catch (e) {
-      var safeReg = serviceVal.replace(/[-[\]{}()*+?.,\\^$|]/g, "\\$&")
-      console.log("Failed to compile regexp for '" + serviceVal + "', using strict lookup due to: " + e);
+      var safeReg = filterValue.replace(/[-[\]{}()*+?.,\\^$|]/g, "\\$&")
+      console.log("Failed to compile regexp for '" + filterValue + "', using strict lookup due to: " + e);
       filter = new RegExp(safeReg);
     }
+    consulService.serviceFilterValue = filterValue
+    consulService.updateURL()
     consulService.serviceFilterCount = 0;
     var showProxiesInList = consulService.showProxiesInList;
     consulService.serviceList.children('.serviceListItem').each(function (){
@@ -189,7 +197,8 @@ class ConsulService {
 
   onClickServiceName(source) {
     this.selectService(source);
-    this.updateURL($(source).find(".service-name").html());
+    this.selectedServiceName = $(source).find(".service-name").html()
+    this.updateURL();
   }
 
   onClickFilter(source) {
@@ -221,11 +230,18 @@ class ConsulService {
     })
   }
 
-  updateURL(link) {
-    var newUrl = window.location.protocol + "//" + window.location.host + window.location.pathname;
-    if (link) {
-      newUrl += '?service=' + link
+  updateURL() {
+    var newUrl = new URL(location.href);
+    if (this.selectedServiceName) {
+      newUrl.searchParams.set('service', this.selectedServiceName);
+    } else {
+      newUrl.searchParams.delete('service')
     }
+    if (this.serviceFilterValue) {
+      newUrl.searchParams.set('filter', this.serviceFilterValue);
+    } else {
+      newUrl.searchParams.delete('filter')
+    }  
     window.history.pushState({},"",newUrl);
   }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: consul-templaterb
 version: !ruby/object:Gem::Version
-  version: 1.18.4
+  version: 1.18.5
 platform: ruby
 authors:
 - SRE Core Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-19 00:00:00.000000000 Z
+date: 2019-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-http-request