Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Alalakh HPM #451

Merged
merged 8 commits into from
Feb 14, 2024
Merged
Show file tree
Hide file tree
Changes from 7 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions src/about/ui/__snapshots__/about.test.tsx.snap
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,17 @@ exports[`Snapshot 1`] = `
>
Bibliography
</a>
<a
aria-controls="about-tabpane-news"
aria-selected="false"
class="nav-item nav-link"
data-rb-event-key="news"
href="#"
id="about-tab-news"
role="tab"
>
News
</a>
</nav>
<div
class="tab-content"
Expand Down
7 changes: 5 additions & 2 deletions src/about/ui/about.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import AboutProject from 'about/ui/project'
import AboutFragmentarium from 'about/ui/fragmentarium'
import AboutCorpus from 'about/ui/corpus'
import AboutSigns from 'about/ui/signs'
import AboutNews from 'about/ui/news'
import AboutDictionary from 'about/ui/dictionary'
import AboutBibliography from 'about/ui/bibliography'
import _ from 'lodash'
Expand All @@ -20,8 +21,7 @@ export const tabIds = [
'signs',
'dictionary',
'bibliography',
'date-converter',
'list-of-kings',
'news',
] as const
export type TabId = typeof tabIds[number]

Expand Down Expand Up @@ -71,6 +71,9 @@ export default function About({
<Tab eventKey="bibliography" title="Bibliography">
{AboutBibliography(markupService)}
</Tab>
<Tab eventKey="news" title="News">
{AboutNews(markupService)}
</Tab>
</Tabs>
</AppContent>
)
Expand Down
118 changes: 118 additions & 0 deletions src/about/ui/news.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,118 @@
import React from 'react'
import { Markdown } from 'common/Markdown'
import Markup from 'markup/ui/markup'
import MarkupService from 'markup/application/MarkupService'

export default function AboutNews(markupService: MarkupService): JSX.Element {
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Function AboutNews has 110 lines of code (exceeds 25 allowed). Consider refactoring.

return (
<>
<Markup markupService={markupService} text="" />
<Markdown text="Important new developments and recently implemented features are regularly summarized in the eBL Newsletters (see below). If you wish to receive future eBL Newsletters, send us an [e-mail]([email protected])." />

<h3>eBL Newsletter 15 (February 2024)</h3>
<h4>Fragmentarium</h4>
<ul>
<li>
114 Penn Museum tablets have been provided with new photographs, taken
by Anna Glenn. Photos of 227 Jena tablets, ca. 2,000 BM Babylon
Collection tablets, and ca. 10,000 Yale tablets have also been
uploaded.
</li>
<li>
The Alalakh tablets have been added:
[https://www.ebl.lmu.de/fragmentarium/search/?site=Alalakh](https://www.ebl.lmu.de/fragmentarium/search/?site=Alalakh)
</li>
<li>
It is possible to search for sites entering the parameter in the URL,
e.g.
[https://www.ebl.lmu.de/fragmentarium/search/?site=Uruk](https://www.ebl.lmu.de/fragmentarium/search/?site=Uruk)
</li>
<li>
It is now possible to use Wild cards (*) in the Museum number search.
</li>
<li>
The Museum number search now searches for Excavation numbers too.
</li>
<li>
Findspots have been added to the database. Work will be done on their
display.
</li>
<li>
Envelopes can now be given as part of the Joins Group (see e.g.
[HS.1016](https://www.ebl.lmu.de/fragmentarium/HS.1016))
</li>
<li>
The following new Genres have been added (for a full list see
[here](https://github.com/ElectronicBabylonianLiterature/ebl-api/blob/master/ebl/fragmentarium/domain/genres.py)):
<ul>
<li>ARCHIVAL → Administrative → Tabular Account</li>
<li>ARCHIVAL → Administrative → Field Plan</li>
<li>ARCHIVAL → Legal → Guardianship</li>
<li>ARCHIVAL → Legal → Herding</li>
<li>ARCHIVAL → Legal → Hire</li>
<li>ARCHIVAL → Legal → Lease</li>
<li>ARCHIVAL → Legal → Marriage</li>
<li>ARCHIVAL → Legal → Rental</li>
<li>ARCHIVAL → Legal → Suretyship</li>
<li>CANONICAL → Lexicography → Acrographic word list → Kagal</li>
<li>
CANONICAL → Lexicography → Thematic Word Lists → Personal names
</li>
<li>
CANONICAL → Lexicography → Thematic Word Lists → Personal names →
Ur-ab-ba
</li>
<li>CANONICAL → Literature → Hymns → Divine → Letter-Prayer</li>
<li>CANONICAL → Magic → Exorcistic → Ardat lilî</li>
<li>CANONICAL → Technical → Astronomy → Goal Year Texts</li>
<li>
CANONICAL → Technical → Astronomy → Goal Year Procedure Texts
</li>
<li>MONUMENTAL → Year Names</li>
<li>OTHER → Drawing</li>
</ul>
</li>
</ul>
<h4>Bibliography & Tools</h4>
<ul>
<li>
The AfO Register Textstellen (over 40,000 references) has been
imported.
</li>
<li>
It is possible to search for AfO Register references
([https://www.ebl.lmu.de/bibliography/afo-register](https://www.ebl.lmu.de/bibliography/afo-register));
the AfO Register references are now shown under the individual records
when matches are found (e.g.
[IM.74403](https://www.ebl.lmu.de/fragmentarium/IM.74403)).
<ul>
<li>
The matching depends on the field{' '}
<code>traditionalReferences</code>, invisible to the user. That
field attempts to account for all possible variations in
traditional references to cuneiform tablets, e.g. “
<code>SpTU 1, 2</code>” is also recorded as “
<code>ADFU 9, 2</code>”, “<code>SBTU 1, 2</code>”, etc. Still,
only a small number of AfO Register references (approximately
17,5%) can be linked. eBL users are kindly requested to alert us
if they find references that should be matched with Fragmentarium
records.
</li>
<li>
The date converter that underlies the eBL Dates has now been
deployed as an independent tool:
[https://www.ebl.lmu.de/tools/date-converter](https://www.ebl.lmu.de/tools/date-converter)
</li>
</ul>
</li>
</ul>
<h4>Corpus</h4>
<ul>
<li>
An Arabic translation of the *Theodicy* (II.1), prepared by Wasim
Khatabe and Wadieh Zerkly, has been uploaded.
</li>
</ul>
</>
)
}
1 change: 1 addition & 0 deletions src/fragmentarium/domain/Fragment.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,7 @@ const config: Parameters<typeof Fragment['create']>[0] = {
nabuccoNumber: '123',
metropolitanNumber: '123',
louvreNumber: '123',
alalahHpmNumber: '123',
australianinstituteofarchaeologyNumber: '123',
philadelphiaNumber: '123',
},
Expand Down
1 change: 1 addition & 0 deletions src/fragmentarium/domain/FragmentDtos.ts
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ export const ExternalNumberTypes = [
'nabuccoNumber',
'metropolitanNumber',
'louvreNumber',
'alalahHpmNumber',
'australianinstituteofarchaeologyNumber',
'philadelphiaNumber',
'yalePeabodyNumber',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,11 @@ exports[`Snapshot 1`] = `
</p>
<p>
Excavation no.:
noj.1
ucotes.1
</p>
<p>
Provenance:
Ešnunna
Adab
</p>
</small>
</div>
Expand Down Expand Up @@ -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>
Expand All @@ -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
Expand All @@ -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>
Expand Down Expand Up @@ -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"
Expand All @@ -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>
Expand Down
9 changes: 9 additions & 0 deletions src/fragmentarium/ui/info/ExternalNumberLink.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,15 @@ 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?'}
label={'Alalah HPM Number'}
/>
)
}
export function australianinstituteofarchaeologyLink({
number,
}: {
Expand Down
8 changes: 8 additions & 0 deletions src/fragmentarium/ui/info/ExternalResources.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -43,6 +44,7 @@ describe('external resources', () => {
nabuccoNumber,
metropolitanNumber,
louvreNumber,
alalahHpmNumber,
australianinstituteofarchaeologyNumber,
philadelphiaNumber,
yalePeabodyNumber,
Expand Down Expand Up @@ -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/',
Expand Down Expand Up @@ -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',
Expand Down
2 changes: 2 additions & 0 deletions src/fragmentarium/ui/info/ExternalResources.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import {
NabuccoLink,
MetropolitanLink,
LouvreLink,
alalahHpmLink,
australianinstituteofarchaeologyLink,
PhiladelphiaLink,
BmIdLink,
Expand Down Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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?L123"
rel="noopener noreferrer"
target="_blank"
>
L123
</a>
)
</li>
<li>
Australian Institute of Archaeology (
<a
Expand Down
Loading
Loading