From 43b145cc961c4de34141c1b8a5bfee34c063d6e7 Mon Sep 17 00:00:00 2001
From: Ilya Khait
Date: Tue, 13 Feb 2024 17:00:55 +0000
Subject: [PATCH 1/3] Fix Brinkman table
---
src/chronology/ui/Kings/BrinkmanKingsTable.tsx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/chronology/ui/Kings/BrinkmanKingsTable.tsx b/src/chronology/ui/Kings/BrinkmanKingsTable.tsx
index 0bf615162..ac9832c9d 100644
--- a/src/chronology/ui/Kings/BrinkmanKingsTable.tsx
+++ b/src/chronology/ui/Kings/BrinkmanKingsTable.tsx
@@ -36,7 +36,7 @@ function BrinkmanKingsTable(): JSX.Element {
{brinkmanDynasties.map((dynastyName, index) =>
- getDynasty(dynastyName, index)
+ getDynasty(dynastyName, index, true)
)}
From 26cb74af1e8a6f11e29f9c7ee89e02cce5722d5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Enrique=20Jim=C3=A9nez?=
<39047733+ejimsan@users.noreply.github.com>
Date: Wed, 14 Feb 2024 12:49:47 +0100
Subject: [PATCH 2/3] Alalakh HPM (#451)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* Newsletter section created
* Update Routes
* add eBL Newsletter 15 to about-news
* Add Alalakh Numbers
* Update Snapshots
* Update snapshot
* Remove news
---------
Co-authored-by: Zsombor Földi
---
src/about/ui/about.tsx | 3 +-
src/fragmentarium/domain/Fragment.test.ts | 1 +
src/fragmentarium/domain/FragmentDtos.ts | 1 +
.../LatestTransliterations.test.tsx.snap | 41 ++++++---
.../ui/info/ExternalNumberLink.tsx | 9 ++
.../ui/info/ExternalResources.test.tsx | 8 ++
.../ui/info/ExternalResources.tsx | 2 +
.../ExternalResources.test.tsx.snap | 12 +++
.../FragmentariumSearch.test.tsx.snap | 90 +++++++++----------
src/test-support/fragment-fixtures.ts | 1 +
src/test-support/test-fragment.ts | 1 +
11 files changed, 107 insertions(+), 62 deletions(-)
diff --git a/src/about/ui/about.tsx b/src/about/ui/about.tsx
index 1e451e505..0625373b7 100644
--- 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/fragmentarium/domain/Fragment.test.ts b/src/fragmentarium/domain/Fragment.test.ts
index 577b9ab23..1a839dd51 100644
--- a/src/fragmentarium/domain/Fragment.test.ts
+++ b/src/fragmentarium/domain/Fragment.test.ts
@@ -128,6 +128,7 @@ const config: Parameters[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
index a6a891713..f888eed9e 100644
--- 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
index d3f8b8eba..63bd9479f 100644
--- 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`] = `
Excavation no.:
- noj.1
+ ucotes.1
Provenance:
- Ešnunna
+ Adab
@@ -5852,11 +5852,11 @@ exports[`Snapshot 1`] = `
class="fragment-result__fragment-number"
>
- cowjofke.2
+ ke.2
- (JN)
+ (Ur3)
Accession no.:
- ed.2
+ wugutkoc.2
Excavation no.:
- pov.2
+ jozi.2
Provenance:
- Dēr
+ Mari
@@ -5881,6 +5881,11 @@ exports[`Snapshot 1`] = `
class="text-secondary fragment-result__genre col-sm-4 col-12"
>
+
+
+ ARCHIVE ➝ Administrative ➝ Lists
+
+
Other ➝ Fake ➝ Certain
@@ -5897,7 +5902,17 @@ exports[`Snapshot 1`] = `
- No record
+ Romolini
+ (
+ Transliteration
+ ,
+
+
+ 21/1/2108
+
+ )
@@ -5942,9 +5957,9 @@ exports[`Snapshot 1`] = `
- Checcucci & Tomlinson, 2026: 4727451873705984-8024100712742912
+ Garrido & Tinti, 2055: 5928983864541184-7552106621829120
[
- l. 3'., 1.
+ l. 4'.2., 1.
]
- Chirici & Borchi, 2109: 7541452181602304-6009873588289536
+ Dong & Ducci, 2026: 3794580308754432-4010327748378624
[
l. 3'., 4'.2.
]
- (E)
+ (T)
diff --git a/src/fragmentarium/ui/info/ExternalNumberLink.tsx b/src/fragmentarium/ui/info/ExternalNumberLink.tsx
index b30469b35..a37c904c1 100644
--- a/src/fragmentarium/ui/info/ExternalNumberLink.tsx
+++ b/src/fragmentarium/ui/info/ExternalNumberLink.tsx
@@ -134,6 +134,15 @@ export function LouvreLink({ number }: { number: string }): JSX.Element {
/>
)
}
+export function alalahHpmLink({ number }: { number: string }): JSX.Element {
+ return (
+
+ )
+}
export function australianinstituteofarchaeologyLink({
number,
}: {
diff --git a/src/fragmentarium/ui/info/ExternalResources.test.tsx b/src/fragmentarium/ui/info/ExternalResources.test.tsx
index 34339d96d..0620cabdc 100644
--- 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?',
+ 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
index 60ca19280..305644e10 100644
--- 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
index 0e135ef8d..94244c82c 100644
--- 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`] = `
)
+
+ Alalah HPM Number (
+
+ L123
+
+ )
+
Australian Institute of Archaeology (
- esojoku.9
+ uc.9
(Hit)
@@ -718,15 +718,15 @@ exports[`Searching fragments by transliteration Displays corpus results when cli
Accession no.:
- newet.9
+ titeba.9
Excavation no.:
- dirrew.9
+ jora.9
Provenance:
- Uruk
+ Lagaš
@@ -791,14 +791,14 @@ exports[`Searching fragments by transliteration Displays corpus results when cli
- Cavicchi & Sani, 2077: 402849420804096-7346697910878208
+ Giles & Alvarez, 2087: 5582194326110208-1406653725409280
[
- l. 2., 4'.2.
+ l. 1., 3'.
]
- (T)
+ (C)
@@ -810,14 +810,14 @@ exports[`Searching fragments by transliteration Displays corpus results when cli
- Pisani & Piazzini, 2053: 6838356841332736-6445201535008768
+ Shaw & Robert, 2046: 6150545542742016-5917511180615680
[
- l. 4'.2., 1.
+ l. 2., 1.
]
- (D)
+ (P)
@@ -6521,11 +6521,11 @@ exports[`Searching fragments by transliteration Displays corpus results when cli
class="fragment-result__fragment-number"
>
- masijga.10
+ mi.10
-
+ (Uruk4)
Accession no.:
- sosiwbe.10
+ kuvina.10
Excavation no.:
- zopiz.10
+ joerja.10
Provenance:
- Sippar
+ Ur
@@ -6601,7 +6601,7 @@ exports[`Searching fragments by transliteration Displays corpus results when cli
- Verhoeven & Maruyama, 2074: 1797701492539392-2761403509243904
+ Sanna & Vivoli, 2086: 6039983651553280-8222076427042816
[
l. 4'.2., 2.
]
@@ -6612,22 +6612,18 @@ exports[`Searching fragments by transliteration Displays corpus results when cli
-
-
- Wright & Acciai, 2059: 1648222065917952-6119525370036224
+ Waters & Faure, 2073: 3028366718402560-7932536841830400
[
- l. 2., 4'.2.
+ l. 3'., 4'.2.
]
- (E)
+ (C)
@@ -12396,7 +12392,7 @@ exports[`Searching fragments by transliteration Displays corpus results when cli
class="justify-content-left fragment-result__match-info text-secondary col"
>
@@ -12406,10 +12402,10 @@ exports[`Searching fragments by transliteration Displays corpus results when cli
>
- Dahehuk na hidu itikumam pez ukha pamfoje tadgib vejapuc geof wetvortaj het rot ni pabvewme hugic salkekvep.
+ Hek perape ipidu hur kesfi daj ji nobagenoh le fenpun kisih ogi hus.
>
- Uruk III-Jemdet Nasr La ci ve od bili lup fuchurohe fiedle runob henve le fenpun kisih ogi hus luj piza.
+ Presargonic Putja are bosem oho leppozco kokihe oso ofcev raav lucmoeli nancuke ba.
@@ -12432,14 +12428,14 @@ exports[`Searching fragments by transliteration Displays corpus results when cli
(
- Heisowuw co faki gevbial gelewozo le bejab felufad fum eti cuki luno.
+ Luc bo kemoida heh joun fusu had vuhfofluk koosgo oppatdan nepa romlialo telpah.
)
@@ -12523,7 +12519,7 @@ exports[`Searching fragments by transliteration Displays corpus results when cli
>
- Ihjiv tacoov zas mulire foluow le cu dektu jewu dahehner soc miw had vuhfofluk koosgo oppatdan nepa romlialo.
+ Ze so mef lewakwuf teosolu le cokrir maz mo do im up amu in wag cizef.
@@ -12550,14 +12546,14 @@ exports[`Searching fragments by transliteration Displays corpus results when cli
(
- Lilmicri pafupifi roedipe ben momefuer ke jabip geuh mofona sapsis vi kiz me gemtigpa gufra pa.
+ Arzodu mewadu boldud boilwep hocewa zek russapi jebre pertagas vece tuc em gewbi bi heh.
)
@@ -12641,7 +12637,7 @@ exports[`Searching fragments by transliteration Displays corpus results when cli
>
- Butakij cigbugij ha ehibun ri arzodu mewadu boldud boilwep hocewa zek russapi jebre pertagas vece tuc em.
+ Ki gevbial gelewozo le bejab felufad fum eti cuki luno mavip no sishi.
@@ -12671,20 +12667,20 @@ exports[`Searching fragments by transliteration Displays corpus results when cli
class="justify-content-left fragment-result__match-info text-secondary col"
>
- Literature
+ Divination
>
- Hez te asi ci og egi kicepi elludot mer gopus wuokaeni palig ne comjualu.
+ Sa kuhuw kepew mufedo agiacla fuhsevid ve huzop dep goaz iwumu gi riw tor.
>
- Hittite Tor loamab bi zi koris hinot dubwos tizzacgow wugrik obozaoza uzlejoru wezvo bagaci rej ceb efaidauje gam zafev.
+ None Zolugac so usaiphal ehepu gasilbuh rib zu jetbu noppa miraw za olked zic vo.
@@ -12707,14 +12703,14 @@ exports[`Searching fragments by transliteration Displays corpus results when cli
(
- Bol wudzewig se fagmu durito soiji iku vel jak did ri odu ke pem go utmefup roagivaj ecoerekul.
+ Ruzubfi su eb silfec karuf ija furhoef didefi za bujaro pekurar rib.
)
@@ -12798,7 +12794,7 @@ exports[`Searching fragments by transliteration Displays corpus results when cli
>
- Ufsucu arhoef didefi za bujaro pekurar rib rempoffi mape din togfejifu sumna.
+ Uwgas fikebgam zafev jugulo ot gebfawdu mikicepi elludot mer gopus wuokaeni palig.
@@ -12825,7 +12821,7 @@ exports[`Searching fragments by transliteration Displays corpus results when cli
(
- Vihi je rivaj cejbazo be fumubsa kazhog jontaj fi sa na jolhi nu jah ez cunnob titzihoz.
+ Futodu nes ve azucoh ajobi fusaw mauz ibubaljoh nagmunjaz olu jesaj sujum wozku buju peib.
)
@@ -12849,7 +12845,7 @@ exports[`Searching fragments by transliteration Displays corpus results when cli
class="chapter-display__line-number"
>
@@ -12916,7 +12912,7 @@ exports[`Searching fragments by transliteration Displays corpus results when cli
>
- Hop od holoro arajiploh po zat ninuziv uba johtid mun futu pigze luojipis.
+ Sobegnug ziarugo wigci ed pi saziwolan ijisuod jifjakta jasep ahkeom jaf cutme ippipagi berecoere ilwakmam labzogpit fikotje.
diff --git a/src/test-support/fragment-fixtures.ts b/src/test-support/fragment-fixtures.ts
index 6a42f15dc..f2d1c7a6d 100644
--- a/src/test-support/fragment-fixtures.ts
+++ b/src/test-support/fragment-fixtures.ts
@@ -164,6 +164,7 @@ export const externalNumbersFactory = Factory.define(
achemenetNumber: associations.achemenetNumber ?? chance.string(),
nabuccoNumber: associations.nabuccoNumber ?? chance.string(),
louvreNumber: associations.louvreNumber ?? chance.string(),
+ alalahHpmNumber: associations.alalahHpmNumber ?? chance.string(),
australianinstituteofarchaeologyNumber:
associations.australianinstituteofarchaeologyNumber ?? chance.string(),
philadelphiaNumber: associations.philadelphiaNumber ?? chance.string(),
diff --git a/src/test-support/test-fragment.ts b/src/test-support/test-fragment.ts
index d2523f614..7afc547fc 100644
--- a/src/test-support/test-fragment.ts
+++ b/src/test-support/test-fragment.ts
@@ -23,6 +23,7 @@ const externalNumbers = {
nabuccoNumber: '5',
metropolitanNumber: '123',
louvreNumber: '123',
+ alalahHpmNumber: '123',
australianinstituteofarchaeologyNumber: '123',
philadelphiaNumber: '123',
}
From 203e35d2517891f42b8e11628419995c4e50f282 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Enrique=20Jim=C3=A9nez?=
Date: Wed, 14 Feb 2024 12:14:18 +0000
Subject: [PATCH 3/3] Correct URL
---
src/fragmentarium/ui/info/ExternalNumberLink.tsx | 4 +++-
src/fragmentarium/ui/info/ExternalResources.test.tsx | 2 +-
.../ui/info/__snapshots__/ExternalResources.test.tsx.snap | 2 +-
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/fragmentarium/ui/info/ExternalNumberLink.tsx b/src/fragmentarium/ui/info/ExternalNumberLink.tsx
index a37c904c1..90b9b862c 100644
--- a/src/fragmentarium/ui/info/ExternalNumberLink.tsx
+++ b/src/fragmentarium/ui/info/ExternalNumberLink.tsx
@@ -138,7 +138,9 @@ export function alalahHpmLink({ number }: { number: string }): JSX.Element {
return (
)
diff --git a/src/fragmentarium/ui/info/ExternalResources.test.tsx b/src/fragmentarium/ui/info/ExternalResources.test.tsx
index 0620cabdc..cc45c79c3 100644
--- a/src/fragmentarium/ui/info/ExternalResources.test.tsx
+++ b/src/fragmentarium/ui/info/ExternalResources.test.tsx
@@ -93,7 +93,7 @@ describe('external resources', () => {
['Louvre', 'https://collections.louvre.fr/ark:/53355/', louvreNumber],
[
'Alalah HPM Number',
- 'https://www.hethport.uni-wuerzburg.de/Alalach/bildpraep.php?',
+ 'https://www.hethport.uni-wuerzburg.de/Alalach/bildpraep.php?fundnr=',
alalahHpmNumber,
],
[
diff --git a/src/fragmentarium/ui/info/__snapshots__/ExternalResources.test.tsx.snap b/src/fragmentarium/ui/info/__snapshots__/ExternalResources.test.tsx.snap
index 94244c82c..dca76c7ab 100644
--- a/src/fragmentarium/ui/info/__snapshots__/ExternalResources.test.tsx.snap
+++ b/src/fragmentarium/ui/info/__snapshots__/ExternalResources.test.tsx.snap
@@ -141,7 +141,7 @@ exports[`external resources Snapshot 1`] = `
Alalah HPM Number (