consul-templaterb 1.21.1 → 1.21.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/CHANGELOG.md +5 -0
- data/lib/consul/async/version.rb +1 -1
- data/samples/consul-ui/decorators.js.erb +1 -1
- data/samples/consul-ui/js/service.js +1 -1
- data/samples/consul-ui/js/utils.js +3 -2
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 2a13955774e22748154d767161d2b240fbc7f47fcfa920f74e214d9e41ca2b52
|
|
4
|
+
data.tar.gz: 00ff006308911a8aadba9367f85cc7ce7009681471a6c99e7fe4c088ae0478c9
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 377bc047876586bd0ddadb8339b29ed6256398d5ffbd4d93503d6d712d0e197848066409769f5f4ce2ea02aade3cc3ad0e19e4662d81ac9cff8f688ec69f9455
|
|
7
|
+
data.tar.gz: b745bd8859ed065da5bc16f19a7d501b878859af4bdced48564771c922e816ff6ba21bdd993042f940320364d1b16ba9f9eb790d6032ca4057eb1b0252ff13b9
|
data/CHANGELOG.md
CHANGED
|
@@ -2,6 +2,11 @@
|
|
|
2
2
|
|
|
3
3
|
## (UNRELEASED)
|
|
4
4
|
|
|
5
|
+
## 1.21.2 (November 22, 2019)
|
|
6
|
+
|
|
7
|
+
* Added instance information into serviceMetaDecorator() calls to
|
|
8
|
+
allow more sophisticated decorators.
|
|
9
|
+
|
|
5
10
|
## 1.21.1 (November 22, 2019)
|
|
6
11
|
|
|
7
12
|
* Default service meta decorator now decorates http/https links in
|
data/lib/consul/async/version.rb
CHANGED
|
@@ -22,7 +22,7 @@ function serviceInstanceDecorator(instance, element) {
|
|
|
22
22
|
* serviceMetaDecorator must return a HTML node to decorate a service instance meta.
|
|
23
23
|
* It should return the decorated element.
|
|
24
24
|
*/
|
|
25
|
-
function serviceMetaDecorator(key, value) {
|
|
25
|
+
function serviceMetaDecorator(instance, key, value) {
|
|
26
26
|
if (httpRegexp.test(value)) {
|
|
27
27
|
return url_decorator(key, value);
|
|
28
28
|
} else {
|
|
@@ -308,7 +308,7 @@ class ServiceMainSelector extends MainSelector {
|
|
|
308
308
|
element.appendChild(tagsGenerator(instance.tags));
|
|
309
309
|
element.appendChild(document.createElement("hr"));
|
|
310
310
|
}
|
|
311
|
-
element.appendChild(serviceMetaGenerator(instance
|
|
311
|
+
element.appendChild(serviceMetaGenerator(instance));
|
|
312
312
|
element.appendChild(connectGenerator(instance));
|
|
313
313
|
element.appendChild(checksStatusGenerator(instance, instance.name));
|
|
314
314
|
element.setAttribute("status", state);
|
|
@@ -175,7 +175,8 @@ function connectGenerator(instance) {
|
|
|
175
175
|
return connectItem
|
|
176
176
|
}
|
|
177
177
|
|
|
178
|
-
function serviceMetaGenerator(
|
|
178
|
+
function serviceMetaGenerator(instance) {
|
|
179
|
+
var instanceMeta = instance.sMeta;
|
|
179
180
|
var top = document.createElement('div');
|
|
180
181
|
top.className = 'instance-meta';
|
|
181
182
|
if (instanceMeta) {
|
|
@@ -189,7 +190,7 @@ function serviceMetaGenerator(instanceMeta) {
|
|
|
189
190
|
container.appendChild(metaH);
|
|
190
191
|
var metaVH = document.createElement('dd');
|
|
191
192
|
metaVH.className = 'col-sm-8 lookup';
|
|
192
|
-
metaVH.appendChild(serviceMetaDecorator(meta, instanceMeta[meta]));
|
|
193
|
+
metaVH.appendChild(serviceMetaDecorator(instance, meta, instanceMeta[meta]));
|
|
193
194
|
container.appendChild(metaVH);
|
|
194
195
|
}
|
|
195
196
|
}
|