Merge remote-tracking branch 'origin/master' into feature/sign-proven…

…ance
ElectronicBabylonianLiterature · Feb 14, 2024 · f048b04 · f048b04
2 parents df7f55c + 203e35d
commit f048b04
Show file tree

Hide file tree

Showing 12 changed files with 110 additions and 63 deletions.
diff --git a/src/about/ui/about.tsx b/src/about/ui/about.tsx
@@ -20,8 +20,7 @@ export const tabIds = [
   'signs',
   'dictionary',
   'bibliography',
-  'date-converter',
-  'list-of-kings',
+  'news',
 ] as const
 export type TabId = typeof tabIds[number]
 

diff --git a/src/chronology/ui/Kings/BrinkmanKingsTable.tsx b/src/chronology/ui/Kings/BrinkmanKingsTable.tsx
@@ -36,7 +36,7 @@ function BrinkmanKingsTable(): JSX.Element {
     <Table className="table-borderless chronology-display">
       <tbody>
         {brinkmanDynasties.map((dynastyName, index) =>
-          getDynasty(dynastyName, index)
+          getDynasty(dynastyName, index, true)
         )}
       </tbody>
     </Table>

diff --git a/src/fragmentarium/domain/Fragment.test.ts b/src/fragmentarium/domain/Fragment.test.ts
@@ -128,6 +128,7 @@ const config: Parameters<typeof Fragment['create']>[0] = {
     nabuccoNumber: '123',
     metropolitanNumber: '123',
     louvreNumber: '123',
+    alalahHpmNumber: '123',
     australianinstituteofarchaeologyNumber: '123',
     philadelphiaNumber: '123',
   },

diff --git a/src/fragmentarium/domain/FragmentDtos.ts b/src/fragmentarium/domain/FragmentDtos.ts
@@ -71,6 +71,7 @@ export const ExternalNumberTypes = [
   'nabuccoNumber',
   'metropolitanNumber',
   'louvreNumber',
+  'alalahHpmNumber',
   'australianinstituteofarchaeologyNumber',
   'philadelphiaNumber',
   'yalePeabodyNumber',

diff --git a/src/fragmentarium/ui/front-page/__snapshots__/LatestTransliterations.test.tsx.snap b/src/fragmentarium/ui/front-page/__snapshots__/LatestTransliterations.test.tsx.snap
@@ -37,11 +37,11 @@ exports[`Snapshot 1`] = `
               </p>
               <p>
                 Excavation no.: 
-                noj.1
+                ucotes.1
               </p>
               <p>
                 Provenance: 
-                Ešnunna
+                Adab
               </p>
             </small>
           </div>
@@ -5852,27 +5852,27 @@ exports[`Snapshot 1`] = `
             class="fragment-result__fragment-number"
           >
             <a
-              href="/fragmentarium/cowjofke.2"
+              href="/fragmentarium/ke.2"
             >
-              cowjofke.2
+              ke.2
             </a>
-             (JN)
+             (Ur3)
           </h4>
           <div
             class="fragment-result__archaeology-info"
           >
             <small>
               <p>
                 Accession no.: 
-                ed.2
+                wugutkoc.2
               </p>
               <p>
                 Excavation no.: 
-                pov.2
+                jozi.2
               </p>
               <p>
                 Provenance: 
-                Dēr
+                Mari
               </p>
             </small>
           </div>
@@ -5881,6 +5881,11 @@ exports[`Snapshot 1`] = `
           class="text-secondary fragment-result__genre col-sm-4 col-12"
         >
           <ul>
+            <ul>
+              <small>
+                ARCHIVE ➝ Administrative ➝ Lists 
+              </small>
+            </ul>
             <ul>
               <small>
                 Other ➝ Fake ➝ Certain 
@@ -5897,7 +5902,17 @@ exports[`Snapshot 1`] = `
             <li
               class="Record__entry"
             >
-              No record
+              Romolini
+               (
+              Transliteration
+              ,
+               
+              <time
+                datetime="2108-01-21"
+              >
+                21/1/2108
+              </time>
+              )
             </li>
           </ol>
         </div>
@@ -5942,9 +5957,9 @@ exports[`Snapshot 1`] = `
                 <span
                   class="reference-popover__citation"
                 >
-                  Checcucci & Tomlinson, 2026: 4727451873705984-8024100712742912 
+                  Garrido & Tinti, 2055: 5928983864541184-7552106621829120 
                   [
-                  l. 3'., 1.
+                  l. 4'.2., 1.
                   ]
                   <span
                     class="type-abbreviation"
@@ -5961,14 +5976,14 @@ exports[`Snapshot 1`] = `
                 <span
                   class="reference-popover__citation"
                 >
-                  Chirici & Borchi, 2109: 7541452181602304-6009873588289536 
+                  Dong & Ducci, 2026: 3794580308754432-4010327748378624 
                   [
                   l. 3'., 4'.2.
                   ]
                   <span
                     class="type-abbreviation"
                   >
-                     (E)
+                     (T)
                   </span>
                 </span>
               </li>

diff --git a/src/fragmentarium/ui/info/ExternalNumberLink.tsx b/src/fragmentarium/ui/info/ExternalNumberLink.tsx
@@ -134,6 +134,17 @@ export function LouvreLink({ number }: { number: string }): JSX.Element {
     />
   )
 }
+export function alalahHpmLink({ number }: { number: string }): JSX.Element {
+  return (
+    <ExternalNumberLink
+      number={number}
+      baseUrl={
+        'https://www.hethport.uni-wuerzburg.de/Alalach/bildpraep.php?fundnr='
+      }
+      label={'Alalah HPM Number'}
+    />
+  )
+}
 export function australianinstituteofarchaeologyLink({
   number,
 }: {

diff --git a/src/fragmentarium/ui/info/ExternalResources.test.tsx b/src/fragmentarium/ui/info/ExternalResources.test.tsx
@@ -19,6 +19,7 @@ const achemenetNumber = 'H00744'
 const nabuccoNumber = 'H00765'
 const metropolitanNumber = 'M123'
 const louvreNumber = 'L123'
+const alalahHpmNumber = 'L123'
 const australianinstituteofarchaeologyNumber = 'L123'
 const philadelphiaNumber = 'P123'
 const yalePeabodyNumber = 'y123'
@@ -43,6 +44,7 @@ describe('external resources', () => {
             nabuccoNumber,
             metropolitanNumber,
             louvreNumber,
+            alalahHpmNumber,
             australianinstituteofarchaeologyNumber,
             philadelphiaNumber,
             yalePeabodyNumber,
@@ -89,6 +91,11 @@ describe('external resources', () => {
       metropolitanNumber,
     ],
     ['Louvre', 'https://collections.louvre.fr/ark:/53355/', louvreNumber],
+    [
+      'Alalah HPM Number',
+      'https://www.hethport.uni-wuerzburg.de/Alalach/bildpraep.php?fundnr=',
+      alalahHpmNumber,
+    ],
     [
       'Australian Institute of Archaeology',
       'https://aiarch.pedestal3d.com/r/',
@@ -138,6 +145,7 @@ describe('missing external resources', () => {
     'NaBuCCo',
     'The Metropolitan Museum of Art',
     'Louvre',
+    'Alalah HPM Number',
     'Australian Institute of Archaeology',
     'Penn Museum',
     'Yale Babylonian Collection',

diff --git a/src/fragmentarium/ui/info/ExternalResources.tsx b/src/fragmentarium/ui/info/ExternalResources.tsx
@@ -12,6 +12,7 @@ import {
   NabuccoLink,
   MetropolitanLink,
   LouvreLink,
+  alalahHpmLink,
   australianinstituteofarchaeologyLink,
   PhiladelphiaLink,
   BmIdLink,
@@ -50,6 +51,7 @@ export default function ExternalResources({
     [fragment.getExternalNumber('nabuccoNumber'), NabuccoLink],
     [fragment.getExternalNumber('metropolitanNumber'), MetropolitanLink],
     [fragment.getExternalNumber('louvreNumber'), LouvreLink],
+    [fragment.getExternalNumber('alalahHpmNumber'), alalahHpmLink],
     [
       fragment.getExternalNumber('australianinstituteofarchaeologyNumber'),
       australianinstituteofarchaeologyLink,

diff --git a/src/fragmentarium/ui/info/__snapshots__/ExternalResources.test.tsx.snap b/src/fragmentarium/ui/info/__snapshots__/ExternalResources.test.tsx.snap
@@ -137,6 +137,18 @@ exports[`external resources Snapshot 1`] = `
       </a>
       )
     </li>
+    <li>
+      Alalah HPM Number (
+      <a
+        aria-label="Alalah HPM Number text L123"
+        href="https://www.hethport.uni-wuerzburg.de/Alalach/bildpraep.php?fundnr=L123"
+        rel="noopener noreferrer"
+        target="_blank"
+      >
+        L123
+      </a>
+      )
+    </li>
     <li>
       Australian Institute of Archaeology (
       <a