@teipublisher/pb-components 3.6.1 → 3.6.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teipublisher/pb-components",
-  "version": "3.6.1",
+  "version": "3.6.3",
   "description": "Collection of webcomponents underlying TEI Publisher",
   "repository": "https://github.com/eeditiones/tei-publisher-components.git",
   "main": "index.html",

package/src/authority/kbga.js

@@ -12,10 +12,20 @@ export class KBGA extends Registry {
     const results = [];
 
     const register = this.getRegister();
-    const searchParam = register === 'bibls' ? 'biblsearch' : 'search';
-    const url = `https://meta.karl-barth.ch/api/${register}?${searchParam}=${encodeURIComponent(
-      key,
-    )}&perPage=${this._limit}`;
+    const baseUrl =
+      this._register === 'object' ? 'https://kba.karl-barth.ch' : 'https://meta.karl-barth.ch';
+    let searchQuery;
+    switch (register) {
+      case 'objects':
+            searchQuery = `fields%5B0%5D=creation_min&values%5B0%5D=${encodeURIComponent(key)}&operators%5B0%5D=%3D`;
+        break;
+      case 'bibls':
+        searchQuery = `biblsearch=${encodeURIComponent(key)}`;
+        break;
+      default:
+        searchQuery = `search=${encodeURIComponent(key)}`;
+    }
+    const url = `${baseUrl}/api/${register}?${searchQuery}&perPage=${this._limit}`;
     const label = this.getLabelField();
     return new Promise(resolve => {
       fetch(url)
@@ -28,6 +38,18 @@ export class KBGA extends Registry {
             ) {
               return;
             }
+            if (this._register === 'object') {
+              results.push({
+                register: this._register,
+                id: String(item.id),
+                label: item.full_id,
+                details: item.title,
+                link: item.permalink,
+                strings: [],
+                provider: 'KBGA',
+              });
+              return;
+            }
             const result = {
               register: this._register,
               id: this._prefix ? `${this._prefix}:${item['full-id']}` : item['full-id'],
@@ -54,6 +76,20 @@ export class KBGA extends Registry {
     const label = this.getLabelField();
     return new Promise(resolve => {
       this.getRecord(key).then(json => {
+        if (this._register === 'object') {
+          const { title, object_creation_min, permalink } = json.data;
+          const dates = object_creation_min ? `<p>${object_creation_min}</p>` : '';
+          const output = `
+            <h3 class="label"><a href="${permalink}" target="_blank">${title}</a></h3>
+            ${dates}
+          `;
+          container.innerHTML = output;
+          resolve({
+            id: String(json.data.id),
+            strings: [],
+          });
+          return;
+        }
         const died = json.data.death ? `† ${json.data.death}` : '';
         const dates = json.data.birth ? `<p>* ${json.data.birth} ${died}</p>` : '';
         const note = json.data.note_bio ? `<p>${json.data.note_bio}</p>` : '';
@@ -81,12 +117,17 @@ export class KBGA extends Registry {
    */
   async getRecord(key) {
     const id = key.replace(/^.*-([^-]+)$/, '$1');
-    return fetch(`https://meta.karl-barth.ch/api/${this.getRegister()}/${id}`)
+    const baseUrl =
+      this._register === 'object' ? 'https://kba.karl-barth.ch' : 'https://meta.karl-barth.ch';
+    return fetch(`${baseUrl}/api/${this.getRegister()}/${id}`)
       .then(response => response.json())
       .then(json => {
         const output = { ...json };
         output.name = json.data[this.getLabelField()];
         switch (this._register) {
+          case 'object':
+            output.name = `${json.data.title} (${json.data.object_creation_min})`;
+            break;
           case 'place':
             output.country = json.data.country;
             output.location = json.data.location.coordinates;
@@ -109,6 +150,9 @@ export class KBGA extends Registry {
   getLabelField() {
     let label;
     switch (this._register) {
+      case 'object':
+        label = 'title';
+        break;
       case 'place':
         label = 'placeName_full';
         break;
@@ -135,6 +179,9 @@ export class KBGA extends Registry {
     }
     let register;
     switch (this._register) {
+      case 'object':
+        register = 'objects';
+        break;
       case 'person':
       case 'organization':
         register = 'actors';

package/src/pb-authority-lookup.js

@@ -87,6 +87,20 @@ export class PbAuthorityLookup extends themableMixin(pbMixin(LitElement)) {
     this._authorities = {};
     this.noOccurrences = false;
     this.group = 'tei';
+    this._queryGeneration = 0;
+    this._queryDebounceMs = 300;
+  }
+
+  disconnectedCallback() {
+    super.disconnectedCallback();
+    if (this._queryTimer) {
+      clearTimeout(this._queryTimer);
+      this._queryTimer = null;
+    }
+    if (this._occurrencesController) {
+      this._occurrencesController.abort();
+      this._occurrencesController = null;
+    }
   }
 
   connectedCallback() {
@@ -101,7 +115,7 @@ export class PbAuthorityLookup extends themableMixin(pbMixin(LitElement)) {
       this.query = ev.detail.query;
       this.type = ev.detail.type;
       this._results = [];
-      this._query();
+      this._scheduleQuery(true);
     });
 
     waitOnce('pb-page-ready', () => {
@@ -110,7 +124,7 @@ export class PbAuthorityLookup extends themableMixin(pbMixin(LitElement)) {
         this._authorities[connector.register] = connector;
       });
       if (this.autoLookup) {
-        this._query();
+        this._scheduleQuery(true);
       }
     });
 
@@ -347,28 +361,76 @@ export class PbAuthorityLookup extends themableMixin(pbMixin(LitElement)) {
     }
     this._results = [];
     this.query = e.target.value;
-    this._query();
+    this._scheduleQuery();
+  }
+
+  _scheduleQuery(immediate = false) {
+    if (this._queryTimer) {
+      clearTimeout(this._queryTimer);
+      this._queryTimer = null;
+    }
+    if (immediate) {
+      this._query();
+      return;
+    }
+    this._queryTimer = setTimeout(() => {
+      this._queryTimer = null;
+      this._query();
+    }, this._queryDebounceMs);
   }
 
   _query() {
+    const generation = ++this._queryGeneration;
+
+    if (this._occurrencesController) {
+      this._occurrencesController.abort();
+      this._occurrencesController = null;
+    }
+
+    const authority = this._authorities[this.type];
+    if (!authority) {
+      return;
+    }
+
     this.emitTo('pb-start-update');
-    this._authorities[this.type].query(this.query).then(results => {
-      this._occurrences(results.items).then(merged => {
+    authority
+      .query(this.query)
+      .then(results => {
+        if (generation !== this._queryGeneration) {
+          return undefined;
+        }
+        return this._occurrences(results.items, generation);
+      })
+      .then(merged => {
+        if (merged === undefined || generation !== this._queryGeneration) {
+          return;
+        }
         this._results = merged;
+        this.emitTo('pb-end-update');
+      })
+      .catch(err => {
+        if (generation !== this._queryGeneration) {
+          return;
+        }
+        console.error('<pb-authority-lookup> query failed: %s', err.message);
+        this.emitTo('pb-end-update');
       });
-      this.emitTo('pb-end-update');
-      // this.shadowRoot.getElementById('query').focus();
-    });
   }
 
   _addEntity() {
     this.emitTo('pb-authority-new-entity', { query: this.query, type: this.type });
   }
 
-  _occurrences(items) {
+  _occurrences(items, generation) {
     if (this.noOccurrences) {
       return Promise.resolve(items);
     }
+    if (this._occurrencesController) {
+      this._occurrencesController.abort();
+    }
+    const controller = new AbortController();
+    this._occurrencesController = controller;
+
     const params = new FormData();
     params.append('register', this.type);
     items.forEach(item => {
@@ -378,13 +440,27 @@ export class PbAuthorityLookup extends themableMixin(pbMixin(LitElement)) {
       fetch(`${this.getEndpoint()}/api/annotations/occurrences`, {
         method: 'POST',
         body: params,
+        signal: controller.signal,
       })
         .then(response => {
+          if (generation !== this._queryGeneration) {
+            resolve(undefined);
+            return undefined;
+          }
           if (response.ok) {
             return response.json();
           }
+          resolve(items);
+          return undefined;
         })
         .then(json => {
+          if (json === undefined) {
+            return;
+          }
+          if (generation !== this._queryGeneration) {
+            resolve(undefined);
+            return;
+          }
           items.forEach(item => {
             if (json[item.id]) {
               item.occurrences = json[item.id];
@@ -406,6 +482,13 @@ export class PbAuthorityLookup extends themableMixin(pbMixin(LitElement)) {
             return d;
           });
           resolve(items);
+        })
+        .catch(err => {
+          if (err.name === 'AbortError' || generation !== this._queryGeneration) {
+            resolve(undefined);
+            return;
+          }
+          resolve(items);
         });
     });
   }

package/src/pb-view-annotate.js

@@ -342,10 +342,6 @@ class PbViewAnnotate extends PbView {
 
     this.subscribeTo('pb-add-annotation', ev => this.addAnnotation(ev.detail));
     this.subscribeTo('pb-edit-annotation', this._editAnnotation.bind(this));
-    this.subscribeTo('pb-start-update', () => {
-      this._cancelMarkerRefresh();
-      this._clearMarkers();
-    });
     this.subscribeTo('pb-refresh', () => {
       this._ranges = [];
       this._rangesMap.clear();
@@ -471,6 +467,12 @@ class PbViewAnnotate extends PbView {
     }
   }
 
+  _doLoad(params) {
+    this._cancelMarkerRefresh();
+    this._clearMarkers();
+    super._doLoad(params);
+  }
+
   _handleContent() {
     super._handleContent();
     this.updateComplete.then(() => {
@@ -861,6 +863,7 @@ class PbViewAnnotate extends PbView {
     if (json[this.getKey(span.dataset.type)] !== '') {
       span.classList.remove('incomplete');
     }
+    this._scheduleMarkerRefresh();
   }
 
   _editAnnotation(ev) {