Merge pull request #464 from UUDigitalHumanitieslab/feature/getRaw

Node.prototype.getRaw
UUDigitalHumanitieslab · Apr 20, 2021 · 0db1cba · 0db1cba
2 parents e2bbfda + 0df65c4
commit 0db1cba
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/frontend/src/common-rdf/node.ts b/frontend/src/common-rdf/node.ts
@@ -171,6 +171,13 @@ export default class Node extends Model {
         return value;
     }
 
+    /**
+     * Sometimes, we still want the original, less-intelligent .get behavior.
+     */
+    getRaw(key: string): OptimizedNative {
+        return super.get(key);
+    }
+
     /**
      * Adapt the has method to JSON-LD array semantics.
      */

diff --git a/frontend/src/panel-source-list/source-summary-view.ts b/frontend/src/panel-source-list/source-summary-view.ts
@@ -31,7 +31,7 @@ export default class SourceSummaryView extends View {
         this.fields = options.fields;
         this.name = this.model.get(schema('name'))[0];
         this.author = this.model.get(schema.author)[0];
-        this.identifier = this.model.attributes['@id'];
+        this.identifier = this.model.id;
         if (this.query !== undefined) {
             this.renderHighlights();
         }

diff --git a/frontend/src/panel-source/source-view.ts b/frontend/src/panel-source/source-view.ts
@@ -73,7 +73,7 @@ class SourcePanel extends CompositeView {
         super(options);
         this.validate();
         this.toolbarModel = new Model({
-            metadata: false, 
+            metadata: false,
             annotations: options.showHighlightsInitially || false
         });
         this.toolbar = new SourceToolbarView({ model: this.toolbarModel }).render();
@@ -117,10 +117,9 @@ class SourcePanel extends CompositeView {
             // Traversing the JSON serialization, instead of a regular
             // `model.get`, because the URI dereferences to plain text instead
             // of a RDF-formatted resource and this would trip up the
-            // `Store.obtain()` call. TODO: replace this with a nicer API,
-            // perhaps `model.getRaw()`.
+            // `Store.obtain()` call.
             $.get(
-                this.model.toJSON()[vocab('fullText')][0]['@id'] as string
+                this.model.getRaw(vocab('fullText'))[0]['@id'] as string
             ).then(this._createHtv.bind(this));
         }
         return this;