@museumwnf/viewer-core 2.5.1 → 2.6.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@museumwnf/viewer-core",
-  "version": "2.5.1",
+  "version": "2.6.0",
   "description": "Application engine for MWNF websites: turns a dataset.config.js into a mounted Vue application.",
   "type": "module",
   "license": "SEE LICENSE IN LICENSE.md",

package/src/dxa/exhibition/useExhibitionSheet.js

@@ -21,6 +21,13 @@
 // collapsed behind a toggle (the view's, folded after the description);
 // when only one exists it is relabelled plain "Description". EPM records
 // are the common case of the latter.
+//
+// The artist's life data goes on a line under the artist, and the Period /
+// Dynasty row is legacy's free-text line (`dynasty`); the record's linked
+// dynasties stand in when it has none, and keep their own popouts
+// (decision D5, inventory-app#2233).
+
+import { artistLine } from '../../record/derivations.js'
 
 /**
  * The exhibition's item-sheet spec, over its data layer's `data`.
@@ -54,14 +61,14 @@ export function useExhibitionSheet(data, config = {}) {
     { key: 'originalOwner', label: 'sheet.field.originalOwner', value: 'initial_owner' },
     { key: 'currentOwner', label: 'sheet.field.currentOwner', value: 'owner' },
     { key: 'date', label: 'sheet.field.date', value: 'dates' },
-    { key: 'artist', label: 'sheet.field.artists', value: (c) => c.record.artist_names, join: ', ' },
+    { key: 'artist', label: 'sheet.field.artists', value: (c) => artistLine((c.record.artist_names ?? []).join(', '), c.text, { style: 'line' }) },
     { key: 'scribe', label: 'sheet.field.scribe', value: 'scriber' },
     { key: 'workshop', label: 'sheet.field.workshop', value: 'workshop' },
     { key: 'type', label: 'sheet.field.type', value: 'type' },
     { key: 'inventoryNumber', label: 'sheet.field.inventoryNumber', value: (c) => c.record.owner_reference },
     { key: 'materials', label: 'sheet.field.materials', value: (c) => c.text.materials, join: '; ' },
     { key: 'dimensions', label: 'sheet.field.dimensions', value: 'dimensions' },
-    { key: 'dynasty', label: 'sheet.field.periodDynasty', value: dynastyNames },
+    { key: 'dynasty', label: 'sheet.field.periodDynasty', value: (c) => c.text?.dynasty || dynastyNames(c) },
     { key: 'production', label: 'sheet.field.placeOfProduction', value: 'place_of_production' },
     { key: 'provenance', label: 'sheet.field.provenance', value: 'provenance' },
     { key: 'binding', label: 'sheet.field.binding', value: 'binding_desc' },

package/src/dxa/gallery/useGallerySheet.js

@@ -21,6 +21,13 @@
 // collapsed behind a toggle (the view's, folded after the description);
 // when only one exists it is relabelled plain "Description". EPM records
 // are the common case of the latter.
+//
+// The artist's life data goes on a line under the artist, and the Period /
+// Dynasty row is legacy's free-text line (`dynasty`); the record's linked
+// dynasties stand in when it has none, and keep their own popouts
+// (decision D5, inventory-app#2233).
+
+import { artistLine } from '../../record/derivations.js'
 
 /**
  * The gallery's item-sheet spec, over its data layer's `data`.
@@ -54,14 +61,14 @@ export function useGallerySheet(data, config = {}) {
     { key: 'originalOwner', label: 'sheet.field.originalOwner', value: 'initial_owner' },
     { key: 'currentOwner', label: 'sheet.field.currentOwner', value: 'owner' },
     { key: 'date', label: 'sheet.field.date', value: 'dates' },
-    { key: 'artist', label: 'sheet.field.artists', value: (c) => c.record.artist_names, join: ', ' },
+    { key: 'artist', label: 'sheet.field.artists', value: (c) => artistLine((c.record.artist_names ?? []).join(', '), c.text, { style: 'line' }) },
     { key: 'scribe', label: 'sheet.field.scribe', value: 'scriber' },
     { key: 'workshop', label: 'sheet.field.workshop', value: 'workshop' },
     { key: 'type', label: 'sheet.field.type', value: 'type' },
     { key: 'inventoryNumber', label: 'sheet.field.inventoryNumber', value: (c) => c.record.owner_reference },
     { key: 'materials', label: 'sheet.field.materials', value: (c) => c.text.materials, join: '; ' },
     { key: 'dimensions', label: 'sheet.field.dimensions', value: 'dimensions' },
-    { key: 'dynasty', label: 'sheet.field.periodDynasty', value: dynastyNames },
+    { key: 'dynasty', label: 'sheet.field.periodDynasty', value: (c) => c.text?.dynasty || dynastyNames(c) },
     { key: 'production', label: 'sheet.field.placeOfProduction', value: 'place_of_production' },
     { key: 'provenance', label: 'sheet.field.provenance', value: 'provenance' },
     { key: 'binding', label: 'sheet.field.binding', value: 'binding_desc' },

package/src/i18n/language.js

@@ -93,7 +93,16 @@ export function resolveInitialLanguage(offered) {
 export function connectLanguageToRouter({ locale, offered, router }) {
   const multilingual = offered.length > 1
 
+  // The navigation under way, from the guard until it lands. Its URL already
+  // carries the language the guard set; rewriting the page being left
+  // instead cancels it, and the visitor stays there in the new language.
+  let pending = null
+  const settle = (to) => {
+    if (pending === to) pending = null
+  }
+
   router.beforeEach((to) => {
+    pending = to
     const next = negotiateLanguage(offered, {
       requested: multilingual ? to.query.lang : undefined,
       stored: readStoredLanguage(),
@@ -107,18 +116,28 @@ export function connectLanguageToRouter({ locale, offered, router }) {
     return true
   })
 
-  // A change of language from the switcher rewrites the URL. Not before the
-  // first navigation has resolved, though: the router is then still at its
-  // start location, `/`, and a replace from there cancels the navigation the
-  // visitor arrived with — every deep link landed on the home page. The guard
-  // above puts the language in the URL of that first navigation itself.
+  router.afterEach((to, from, failure) => {
+    settle(to)
+    // The visitor switched language while this page loaded.
+    if (!failure && multilingual && to.query.lang !== locale.value) {
+      router.replace({ query: { ...to.query, lang: locale.value } })
+    }
+  })
+  router.onError((error, to) => settle(to))
+
+  // A change of language from the switcher rewrites the URL. Not while a
+  // navigation is under way (see `pending`), and so not before the first one
+  // has resolved: the router is then still at its start location, `/`, and a
+  // replace from there cancels the navigation the visitor arrived with, so
+  // every deep link landed on the home page. The guard above puts the
+  // language in the URL of that first navigation itself.
   watch(
     locale,
     (code) => {
       applyDocumentLanguage(code)
       storeLanguage(code)
       const current = router.currentRoute.value
-      if (multilingual && current !== START_LOCATION && current.query.lang !== code) {
+      if (multilingual && !pending && current !== START_LOCATION && current.query.lang !== code) {
         router.replace({ query: { ...current.query, lang: code } })
       }
     },

package/src/index.js

@@ -39,7 +39,8 @@ export {
   glossaryEntries, glossaryTermsFor, glossaryTermsForText, sheetRows, useRecordSheet,
 } from './record/recordSheet.js'
 export {
-  citation, relatedRecords, searchGlossary, timelineLinkFor, useGlossaryPopup, useRelatedRecords,
+  artistLine, citation, relatedRecords, removeEndingPoint, searchGlossary, timelineLinkFor, useGlossaryPopup,
+  useRelatedRecords,
 } from './record/derivations.js'
 export { buildCollectionTree, collectionTreeFromThemes, useCollectionTree } from './record/collectionTree.js'
 export { groupByCountry, partnerHierarchy, partnerView } from './record/partners.js'

package/src/record/derivations.js

@@ -152,3 +152,64 @@ export function timelineLinkFor(record, { name = 'timeline-results', keys = {},
   if (to != null) query[keys.end ?? 'end'] = String(to)
   return { name, query }
 }
+
+// ── Legacy's sheet lines ───────────────────────────────────────────────────
+//
+// How legacy's sheets printed a value, written once so each website prints
+// it the way its own legacy did.
+
+/**
+ * `text` without the period(s) that end it, as legacy's `removeEndingPoint`
+ * printed most sheet values — sparing a period after "C", as in "B.C.".
+ * Anything but a string comes back as ''.
+ *
+ * Legacy's `preg_replace("/([^C])\.+[[:space:]]*$/", "\\1", …)`, read as a
+ * scan from the end rather than as that regex, which backtracks
+ * polynomially on a long run of periods. Same answers: the final run of
+ * periods goes with the whitespace after it; after a "C", or at the very
+ * start, the run's first period stays.
+ */
+export function removeEndingPoint(text) {
+  if (typeof text !== 'string') return ''
+  const body = text.trimEnd()
+  let start = body.length
+  while (start > 0 && body[start - 1] === '.') start--
+  if (start === body.length) return text
+  if (start === 0 || body[start - 1] === 'C') return body.length - start > 1 ? body.slice(0, start + 1) : text
+  return body.slice(0, start)
+}
+
+const lifePart = (value) => (typeof value === 'string' ? value.trim() : '')
+
+/**
+ * The artist line as Markdown: `artist`, then the artist's life data the
+ * record's translation carries (`artist_birthdate`, `artist_birthplace`,
+ * `artist_deathdate`, `artist_deathplace`), each part only when set and
+ * joined exactly as legacy joined it, in one of legacy's two shapes:
+ *
+ * - `'bracketed'` — Baroque Art's and Sharing History's `database_item.php`:
+ *   on the artist's line, after a no-break space,
+ *   `Name (1660, Chemnitz-1736, Augsburg)`; a missing birth date keeps the
+ *   comma before the place, as it did there. Nothing without an artist.
+ * - `'line'` — the galleries' and exhibitions' `DatabaseItem.vue`
+ *   (`returnArtistData`): on a line of its own under the artist,
+ *   `1660, Chemnitz - 1736, Augsburg`.
+ *
+ * Islamic Art's sheet printed the artist alone. '' when there is nothing
+ * to print.
+ */
+export function artistLine(artist, text, { style = 'bracketed' } = {}) {
+  const name = lifePart(artist)
+  const born = lifePart(text?.artist_birthdate)
+  const bornAt = lifePart(text?.artist_birthplace)
+  const died = lifePart(text?.artist_deathdate)
+  const diedAt = lifePart(text?.artist_deathplace)
+  if (style === 'line') {
+    const birth = [born, bornAt].filter(Boolean).join(', ')
+    const death = [died, diedAt].filter(Boolean).join(', ')
+    return [name, [birth, death].filter(Boolean).join(' - ')].filter(Boolean).join('  \n')
+  }
+  if (!name) return ''
+  if (!(born || bornAt || died || diedAt)) return name
+  return `${name} (${born}${bornAt ? `, ${bornAt}` : ''}${died ? `-${died}` : ''}${diedAt ? `, ${diedAt}` : ''})`
+}