help for poems

CenterForDigitalHumanities · Jan 21, 2025 · e4e06e8 · e4e06e8
1 parent 01fd667
commit e4e06e8
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 5 deletions.
diff --git a/public/javascripts/deer/components/view/entity.js b/public/javascripts/deer/components/view/entity.js
@@ -74,7 +74,7 @@ export class CollectionLabel extends DeerView {
 
     constructor() {
         super()
-        this.template = (obj={}) => `<a href="../${[...collections].find(r=>r.name === obj.targetCollection)?.id.split('/').pop()}">${UTILS.getValue(obj.targetCollection)}</a>`
+        this.template = (obj={}) => `<a href="../${[...collections].find(r=>r.name === UTILS.getValue(obj.targetCollection))?.id.split('/').pop()}">${UTILS.getValue(obj.targetCollection)}</a>`
     }
 
     connectedCallback() {

diff --git a/public/javascripts/deer/components/view/poem.js b/public/javascripts/deer/components/view/poem.js
@@ -93,7 +93,15 @@ h1+.publication-info {
     </row>
     `
 export default class DlaPoemDetail extends DeerView {
-    static get observedAttributes() { return [DEER.ID, DEER.LAZY] }
+    static get observedAttributes() { return [DEER.ID, DEER.LAZY, DEER.FINAL] }
+
+    // loadCards after the Entity is loaded and deer-final is set to true
+    async attributeChangedCallback(name, oldValue, newValue) {
+        super.attributeChangedCallback(name, oldValue, newValue)
+        if (oldValue !== newValue && this.getAttribute(DEER.FINAL) === "true") {
+            this.loadCards()
+        }
+    }
 
     constructor() {
         super()
@@ -102,6 +110,11 @@ export default class DlaPoemDetail extends DeerView {
 
     connectedCallback() {
         super.connectedCallback()
+        this.addEventListener(DEER.EVENTS.LOADED, this.loadCards.bind(this))
+    }
+
+    loadCards() {
+        if(!this.Entity) return
         this.classList.remove(this.dataset.spinner)
         const historyWildcard = { "$exists": true, "$size": 0 }
         const exprQuery = {
@@ -251,7 +264,7 @@ class DlaSimpleExpression extends DeerView {
             case "reload":
             case "update":
                 this.Entity = msg.payload
-                this.innerHTML = this.template(msg.payload?.assertions) ?? this.innerHTML
+                if( msg.payload?.assertions ) this.innerHTML = this.template(msg.payload.assertions)
                 break
             case "error":
                 // this.#handleErrors(msg.payload)

diff --git a/public/javascripts/deer/components/view/view.js b/public/javascripts/deer/components/view/view.js
@@ -29,7 +29,7 @@ export default class DeerView extends HTMLElement {
             case "update":
             case "reload":
                 this.Entity = Object.assign(this.Entity ?? {},msg.payload)
-                this.innerHTML = this.template(msg.payload?.assertions) ?? this.innerHTML
+                if( msg.payload?.assertions ) this.innerHTML = this.template(msg.payload.assertions)
                 break
             case "error":
                 this.#handleErrors(msg.payload)

diff --git a/public/javascripts/deer/deer-utils.js b/public/javascripts/deer/deer-utils.js
@@ -69,7 +69,10 @@ const utils = {
         }
         if (Array.isArray(property)) {
             // It is an array of things, we can only presume that we want the array.  If it needs to become a string, local functions take on that responsibility.
-            return property
+            if(property.length === 1){
+                return this.getValue(property[0], alsoPeek, asType)
+            }
+            return property.map(p => this.getValue(p, alsoPeek, asType))
         } else {
             if (typeof property === "object") {
                 // TODO: JSON-LD insists on "@value", but this is simplified in a lot