diff --git a/light9/collector/web/index.html b/light9/collector/web/index.html
--- a/light9/collector/web/index.html
+++ b/light9/collector/web/index.html
@@ -3,12 +3,12 @@
collector
-
+
-
+
@@ -62,7 +62,7 @@
is: "light9-collector-device",
properties: {
graph: {type: Object, notify: true},
- uri: {type: String, notify: true},
+ uri: {type: Object, notify: true},
attrs: {type: Array, notify: true},
},
observers: [
@@ -70,7 +70,7 @@
],
initUpdates: function(updates) {
updates.addListener(function(msg) {
- if (msg.outputAttrsSet && msg.outputAttrsSet.dev == this.uri) {
+ if (msg.outputAttrsSet && msg.outputAttrsSet.dev == this.uri.value) {
this.set('attrs', msg.outputAttrsSet.attrs);
this.attrs.forEach(function(row) {
row.valClass = row.val == 255 ? 'full' : (row.val ? 'nonzero' : '');
@@ -141,8 +141,10 @@
return this.graph.Uri(x);
};
this.set('devices', []);
- _.uniq(_.sortBy(this.graph.subjects(U('rdf:type'), U(':DeviceClass'))), true).forEach(function(dc) {
- _.sortBy(this.graph.subjects(U('rdf:type'), dc)).forEach(function(dev) {
+
+ let classes = this.graph.subjects(U('rdf:type'), U(':DeviceClass'));
+ _.uniq(_.sortBy(classes, 'value'), true).forEach(function(dc) {
+ _.sortBy(this.graph.subjects(U('rdf:type'), dc), 'value').forEach(function(dev) {
this.push('devices', dev);
}.bind(this));
}.bind(this));
diff --git a/light9/web/resource-display.html b/light9/web/resource-display.html
--- a/light9/web/resource-display.html
+++ b/light9/web/resource-display.html
@@ -14,7 +14,7 @@
zpadding: 2px;
}
-
+
{{label}}
@@ -42,7 +42,7 @@
is: "resource-display",
properties: {
graph: { type: Object },
- uri: { type: String },
+ uri: { type: Object }, // Use .value for the string
label: { type: String },
rename: { type: Boolean },
minor: { type: Boolean },
@@ -55,7 +55,7 @@
},
onUri: function(graph, uri) {
if (!this.graph) return;
- this.graph.runHandler(this.setLabel.bind(this), `label ${this.uri}`);
+ this.graph.runHandler(this.setLabel.bind(this), `label ${this.uri.value}`);
},
setLabel: function() {
if (!this.uri) {
@@ -69,7 +69,7 @@
this.label = null;
}
if (!this.label) {
- this.label = this.uri.replace(/.*\//, '');
+ this.label = this.uri.value.replace(/.*\//, '');
}
},
onRename: function() {
@@ -91,7 +91,7 @@
var label = this.graph.Uri('rdfs:label');
var ctxs = this.graph.contextsWithPattern(this.uri, label, null);
if (ctxs.length != 1) {
- throw new Error(`${ctxs.length} label stmts for ${this.uri}`);
+ throw new Error(`${ctxs.length} label stmts for ${this.uri.label}`);
}
this.graph.patchObject(this.uri, label,
this.graph.Literal(this.renameTo),