diff --git a/src/corpus/ui/TextView.sass b/src/corpus/ui/TextView.sass index 53f979974..050ebac03 100644 --- a/src/corpus/ui/TextView.sass +++ b/src/corpus/ui/TextView.sass @@ -40,5 +40,5 @@ align-items: flex-start justify-content: center - .OrganizationLinks__image + .ExternalResources__image max-height: 5em diff --git a/src/corpus/ui/__snapshots__/TextView.integration.test.ts.snap b/src/corpus/ui/__snapshots__/TextView.integration.test.ts.snap index 4d50baf3e..17ff06eba 100644 --- a/src/corpus/ui/__snapshots__/TextView.integration.test.ts.snap +++ b/src/corpus/ui/__snapshots__/TextView.integration.test.ts.snap @@ -240,7 +240,7 @@ exports[`Chapter Show chapter 1`] = ` > Cuneiform Artefacts of Iraq in Context @@ -567,7 +567,7 @@ exports[`Chapter Show list of manuscripts 1`] = ` > Cuneiform Artefacts of Iraq in Context @@ -1068,7 +1068,7 @@ exports[`With session 1`] = ` > Cuneiform Artefacts of Iraq in Context diff --git a/src/fragmentarium/domain/FragmentDtos.ts b/src/fragmentarium/domain/FragmentDtos.ts index 684cf357f..8d5ed9e4a 100644 --- a/src/fragmentarium/domain/FragmentDtos.ts +++ b/src/fragmentarium/domain/FragmentDtos.ts @@ -55,14 +55,23 @@ type RecordEntryDto = Pick type FolioDto = Pick -export interface ExternalNumbers { - cdliNumber: string - bmIdNumber: string - archibabNumber: string - bdtnsNumber: string - urOnlineNumber: string - hilprechtJenaNumber: string - hilprechtHeidelbergNumber: string +export const ExternalNumberTypes = [ + 'cdliNumber', + 'bmIdNumber', + 'archibabNumber', + 'bdtnsNumber', + 'urOnlineNumber', + 'hilprechtJenaNumber', + 'hilprechtHeidelbergNumber', + 'metropolitanNumber', + 'yalePeabodyNumber', +] as const +export type ExternalNumber = typeof ExternalNumberTypes[number] + +export type ExternalNumbers = { + [K in ExternalNumber]?: string +} & { + oraccNumbers?: readonly string[] } export default interface FragmentDto { diff --git a/src/fragmentarium/domain/fragment.ts b/src/fragmentarium/domain/fragment.ts index afdff261d..b24dccd5b 100644 --- a/src/fragmentarium/domain/fragment.ts +++ b/src/fragmentarium/domain/fragment.ts @@ -10,7 +10,11 @@ import { Joins } from './join' import { MarkupPart } from 'transliteration/domain/markup' import { Period, PeriodModifier } from 'common/period' import { Session } from 'auth/Session' -import { ExternalNumbers } from './FragmentDtos' +import { + ExternalNumber, + ExternalNumbers, + ExternalNumberTypes, +} from './FragmentDtos' import { RecordEntry } from './RecordEntry' import { ResearchProject } from 'research-projects/researchProject' import { MesopotamianDate } from 'fragmentarium/domain/Date' @@ -227,8 +231,10 @@ export class Fragment { }) } - private getExternalNumber(numberType: keyof ExternalNumbers): string { - return this.externalNumbers[numberType] + private getExternalNumber( + numberType: Exclude + ): string { + return this.externalNumbers[numberType] || '' } get cdliNumber(): string { @@ -252,6 +258,21 @@ export class Fragment { get hilprechtHeidelbergNumber(): string { return this.getExternalNumber('hilprechtHeidelbergNumber') } + get metropolitanNumber(): string { + return this.getExternalNumber('metropolitanNumber') + } + get yalePeabodyNumber(): string { + return this.getExternalNumber('yalePeabodyNumber') + } + get oraccNumbers(): readonly string[] { + return this.externalNumbers['oraccNumbers'] || [] + } + get hasExternalResources(): boolean { + return _.some([ + ...this.oraccNumbers, + ...ExternalNumberTypes.map((number) => this.getExternalNumber(number)), + ]) + } get atfHeading(): string { const cdliNumber = this.cdliNumber || 'X000001' diff --git a/src/fragmentarium/ui/fragment/CuneiformFragment.test.tsx b/src/fragmentarium/ui/fragment/CuneiformFragment.test.tsx index d42cb68b0..9be4a5931 100644 --- a/src/fragmentarium/ui/fragment/CuneiformFragment.test.tsx +++ b/src/fragmentarium/ui/fragment/CuneiformFragment.test.tsx @@ -146,17 +146,6 @@ it('Renders all folios', () => { } }) -it('Links museum record', () => { - expect( - screen.getByLabelText(`The British Museum object ${fragment.bmIdNumber}`) - ).toHaveAttribute( - 'href', - `https://www.britishmuseum.org/collection/object/${encodeURIComponent( - fragment.bmIdNumber - )}` - ) -}) - it('Updates view on Edition save', async () => { fragmentService.updateEdition.mockReturnValueOnce( Promise.resolve(updatedFragment) diff --git a/src/fragmentarium/ui/info/Details.test.tsx b/src/fragmentarium/ui/info/Details.test.tsx index 6656afdf3..8090786f4 100644 --- a/src/fragmentarium/ui/info/Details.test.tsx +++ b/src/fragmentarium/ui/info/Details.test.tsx @@ -138,26 +138,6 @@ describe('All details', () => { expect(screen.getByText(expectedMeasures)).toBeInTheDocument() }) - it('Renders editedInOraccProject', () => { - expect(screen.getByText(fragment.editedInOraccProject)).toBeInTheDocument() - }) - - it('Renders CDLI number', () => { - expect( - screen.getByText((_, node) => { - return node?.textContent === `CDLI: ${fragment.cdliNumber}` - }) - ).toBeInTheDocument() - }) - - it('Links CDLI number', () => - expect(screen.getByText(fragment.cdliNumber)).toHaveAttribute( - 'href', - `https://cdli.mpiwg-berlin.mpg.de/${encodeURIComponent( - fragment.cdliNumber - )}` - )) - it('Renders accession', () => { expect( screen.getByText(`Accession: ${fragment.accession}`) @@ -212,10 +192,6 @@ describe('Missing details', () => { ).toBeInTheDocument() }) - it('Renders dash for CDLI number', () => { - expect(screen.getByText('CDLI: -')).toBeInTheDocument() - }) - it('Renders dash for accession', () => { expect(screen.getByText('Accession: -')).toBeInTheDocument() }) diff --git a/src/fragmentarium/ui/info/Details.tsx b/src/fragmentarium/ui/info/Details.tsx index 59d656048..5b8511514 100644 --- a/src/fragmentarium/ui/info/Details.tsx +++ b/src/fragmentarium/ui/info/Details.tsx @@ -2,7 +2,6 @@ import React from 'react' import _ from 'lodash' import { Fragment, Script } from 'fragmentarium/domain/fragment' -import CdliLink from './CdliLink' import FragmentLink from 'fragmentarium/ui/FragmentLink' import ExternalLink from 'common/ExternalLink' import './Details.css' @@ -82,47 +81,6 @@ function Measurements({ fragment: { measures } }: Props): JSX.Element { return <>{_.isEmpty(measurements) ? '' : `${measurements} cm`} } -function CdliNumber({ fragment: { cdliNumber } }: Props): JSX.Element { - return ( - <> - CDLI:{' '} - {cdliNumber ? ( - {cdliNumber} - ) : ( - '-' - )} - - ) -} - -function EditedInOraccProject({ - fragment: { editedInOraccProject, cdliNumber }, -}: Props): JSX.Element { - const encodedCdliNumber = encodeURIComponent(cdliNumber) - const projectLink = - editedInOraccProject == 'ccp' - ? `https://ccp.yale.edu/${encodedCdliNumber}` - : `http://oracc.org/${encodeURIComponent( - editedInOraccProject.toLowerCase() - )}/${encodedCdliNumber}` - return ( - <> - {editedInOraccProject && ( - <> - Oracc Edition:{' '} - - {editedInOraccProject} - - - )} - - ) -} - function Accession({ fragment }: Props): JSX.Element { return <>Accession: {fragment.accession || '-'} } @@ -160,12 +118,6 @@ function Details({
  • -
  • - -
  • -
  • - -
  • diff --git a/src/fragmentarium/ui/info/ExternalNumberLink.tsx b/src/fragmentarium/ui/info/ExternalNumberLink.tsx new file mode 100644 index 000000000..06b0311b3 --- /dev/null +++ b/src/fragmentarium/ui/info/ExternalNumberLink.tsx @@ -0,0 +1,139 @@ +import ExternalLink from 'common/ExternalLink' +import React from 'react' + +interface Props { + number: string + baseUrl?: string + label: string +} +function ExternalNumberLink({ baseUrl, number, label }: Props): JSX.Element { + const url = `${baseUrl}${encodeURIComponent(number)}` + return ( + <> + {`${label} (`} + + {number} + + {')'} + + ) +} + +export function BmIdLink({ number }: { number: string }): JSX.Element { + return ( + + ) +} +export function CdliLink({ number }: { number: string }): JSX.Element { + return ( + + ) +} +export function BdtnsLink({ number }: { number: string }): JSX.Element { + return ( + + ) +} +export function ArchibabLink({ number }: { number: string }): JSX.Element { + return ( + + ) +} +export function UrOnlineLink({ number }: { number: string }): JSX.Element { + return ( + + ) +} +export function HilprechtJenaLink({ number }: { number: string }): JSX.Element { + return ( + + ) +} +export function HilprechtHeidelbergLink({ + number, +}: { + number: string +}): JSX.Element { + return ( + + ) +} +export function YalePeabodyLink({ number }: { number: string }): JSX.Element { + return ( + + ) +} + +function OraccLink({ + project, + cdliNumber, +}: { + project: string + cdliNumber: string +}): JSX.Element { + const baseUrl = + project === 'ccp' + ? 'https://ccp.yale.edu/' + : `https://oracc.org/${project}/` + return ( + + {project.toUpperCase()} + + ) +} + +export function OraccLinks({ + projects, + cdliNumber, +}: { + projects: readonly string[] + cdliNumber: string +}): JSX.Element { + return ( + <> + {'Oracc ('} + {projects.map((project, index) => ( + <> + {index !== 0 && ', '} + + + ))} + {')'} + + ) +} diff --git a/src/fragmentarium/ui/info/ExternalNumberLogoLink.tsx b/src/fragmentarium/ui/info/ExternalNumberLogoLink.tsx deleted file mode 100644 index 181c6cfaa..000000000 --- a/src/fragmentarium/ui/info/ExternalNumberLogoLink.tsx +++ /dev/null @@ -1,97 +0,0 @@ -import ExternalLink from 'common/ExternalLink' -import cdliLogo from './logos/cdli.png' -import bdtnsLogo from './logos/bdtns.png' -import archibabLogo from './logos/archibab.jpeg' -import urOnlineLogo from './logos/ur-online.jpeg' -import hilprechtJenaLogo from './logos/hilprecht-jena.png' -import hilprechtHeidelbergLogo from './logos/hilprecht-heidelberg.png' -import React from 'react' - -interface Props { - externalNumber: string - baseUrl: string - label: string - logo: string -} -function ExternalNumberLogoLink({ - baseUrl, - externalNumber, - label, - logo, -}: Props): JSX.Element { - const cdliUrl = `${baseUrl}${encodeURIComponent(externalNumber)}` - return ( - - {label} - - ) -} - -export function CdliLogoLink({ number }: { number: string }): JSX.Element { - return ( - - ) -} -export function BdtnsLogoLink({ number }: { number: string }): JSX.Element { - return ( - - ) -} -export function ArchibabLogoLink({ number }: { number: string }): JSX.Element { - return ( - - ) -} -export function UrOnlineLogoLink({ number }: { number: string }): JSX.Element { - return ( - - ) -} -export function HilprechtJenaLogoLink({ - number, -}: { - number: string -}): JSX.Element { - return ( - - ) -} -export function HilprechtHeidelbergLogoLink({ - number, -}: { - number: string -}): JSX.Element { - return ( - - ) -} diff --git a/src/fragmentarium/ui/info/ExternalResources.sass b/src/fragmentarium/ui/info/ExternalResources.sass new file mode 100644 index 000000000..5ba34bab5 --- /dev/null +++ b/src/fragmentarium/ui/info/ExternalResources.sass @@ -0,0 +1,10 @@ +.ExternalResources + &__image + height: auto + max-height: 3.5em + max-width: 100% + margin: 0.2em + + &__items + padding: 0 + list-style-position: inside diff --git a/src/fragmentarium/ui/info/ExternalResources.test.tsx b/src/fragmentarium/ui/info/ExternalResources.test.tsx new file mode 100644 index 000000000..245c354be --- /dev/null +++ b/src/fragmentarium/ui/info/ExternalResources.test.tsx @@ -0,0 +1,103 @@ +import React from 'react' +import { render, screen } from '@testing-library/react' +import ExternalResources from './ExternalResources' + +import { + externalNumbersFactory, + fragmentFactory, +} from 'test-support/fragment-fixtures' +import { Fragment } from 'fragmentarium/domain/fragment' + +const cdliNumber = 'P 0000+q' +const bmIdNumber = 'bm 00000+q' +const bdtnsNumber = 'bdtns123' +const archibabNumber = 'A38' +const urOnlineNumber = 'U5' +const hilprechtJenaNumber = 'H42' +const hilprechtHeidelbergNumber = 'H007' +const yalePeabodyNumber = 'y123' +let fragment: Fragment +let container: HTMLElement + +describe('external resources', () => { + beforeEach(async () => { + fragment = fragmentFactory.build( + {}, + { + associations: { + externalNumbers: externalNumbersFactory.build({ + cdliNumber, + bmIdNumber, + bdtnsNumber, + archibabNumber, + urOnlineNumber, + hilprechtJenaNumber, + hilprechtHeidelbergNumber, + yalePeabodyNumber, + }), + }, + } + ) + container = render().container + }) + + test.each([ + ['CDLI', 'https://cdli.mpiwg-berlin.mpg.de/', cdliNumber], + [ + 'The British Museum', + 'https://www.britishmuseum.org/collection/object/', + bmIdNumber, + ], + ['BDTNS', 'http://bdtns.filol.csic.es/', bdtnsNumber], + ['Archibab', 'http://www.archibab.fr/', archibabNumber], + ['Ur Online', 'http://www.ur-online.org/subject/', urOnlineNumber], + [ + 'Hilprecht Collection', + 'https://hilprecht.mpiwg-berlin.mpg.de/object3d/', + hilprechtJenaNumber, + ], + [ + 'Hilprecht Collection – HeiCuBeDa', + 'https://doi.org/10.11588/heidicon/', + hilprechtHeidelbergNumber, + ], + [ + 'Yale Babylonian Collection', + 'https://collections.peabody.yale.edu/search/Record/YPM-', + yalePeabodyNumber, + ], + ])('%s number is shown', async (label, link, number) => { + expect(screen.getByLabelText(`${label} text ${number}`)).toHaveAttribute( + 'href', + `${link}${encodeURIComponent(number)}` + ) + }) + test('Snapshot', async () => expect(container).toMatchSnapshot()) +}) + +describe('missing external resources', () => { + beforeEach(async () => { + fragment = fragmentFactory.build( + {}, + { + associations: { + externalNumbers: {}, + }, + } + ) + render() + }) + + test.each([ + 'CDLI', + 'The British Museum', + 'BDTNS', + 'Archibab', + 'Ur Online', + 'Hilprecht Collection', + 'Hilprecht Collection – HeiCuBeDa', + 'Yale Babylonian Collection', + ])('Mising %s number is not shown', async (label) => { + expect(screen.queryByText(label)).not.toBeInTheDocument() + }) +}) diff --git a/src/fragmentarium/ui/info/ExternalResources.tsx b/src/fragmentarium/ui/info/ExternalResources.tsx new file mode 100644 index 000000000..5872bdbe2 --- /dev/null +++ b/src/fragmentarium/ui/info/ExternalResources.tsx @@ -0,0 +1,54 @@ +import React from 'react' +import { Fragment } from 'fragmentarium/domain/fragment' +import './ExternalResources.sass' +import { + BdtnsLink, + CdliLink, + ArchibabLink, + UrOnlineLink, + HilprechtJenaLink, + HilprechtHeidelbergLink, + BmIdLink, + YalePeabodyLink, + OraccLinks, +} from './ExternalNumberLink' +import _ from 'lodash' + +type ExternalLinkComponent = ({ number }: { number: string }) => JSX.Element + +export default function ExternalResources({ + fragment, +}: { + readonly fragment: Fragment +}): JSX.Element { + const externalNumbers: ReadonlyArray<[string, ExternalLinkComponent]> = [ + [fragment.bmIdNumber, BmIdLink], + [fragment.cdliNumber, CdliLink], + [fragment.bdtnsNumber, BdtnsLink], + [fragment.archibabNumber, ArchibabLink], + [fragment.urOnlineNumber, UrOnlineLink], + [fragment.hilprechtJenaNumber, HilprechtJenaLink], + [fragment.hilprechtHeidelbergNumber, HilprechtHeidelbergLink], + [fragment.yalePeabodyNumber, YalePeabodyLink], + ] + return ( +
      + {externalNumbers.map( + ([number, LinkComponent], index) => + number && ( +
    • + +
    • + ) + )} + {!_.isEmpty(fragment.oraccNumbers) && ( +
    • + +
    • + )} +
    + ) +} diff --git a/src/fragmentarium/ui/info/Info.tsx b/src/fragmentarium/ui/info/Info.tsx index d524fca45..e70177581 100644 --- a/src/fragmentarium/ui/info/Info.tsx +++ b/src/fragmentarium/ui/info/Info.tsx @@ -2,7 +2,7 @@ import React from 'react' import ReferenceList from 'bibliography/ui/ReferenceList' import Details from 'fragmentarium/ui/info/Details' import Record from 'fragmentarium/ui/info/Record' -import OrganizationLinks from 'fragmentarium/ui/info/OrganizationLinks' +import ExternalResources from 'fragmentarium/ui/info/ExternalResources' import UncuratedReferences from 'fragmentarium/ui/info/UncuratedReferences' import { Fragment, UncuratedReference } from 'fragmentarium/domain/fragment' import FragmentService from 'fragmentarium/application/FragmentService' @@ -41,8 +41,10 @@ export default function Info({ fragmentService={fragmentService} />
    -

    References

    - +
    +

    References

    + +
    {fragment.hasUncuratedReferences && (
    )} + {fragment.hasExternalResources && ( +
    +

    Resources

    + +
    + )} - ) } diff --git a/src/fragmentarium/ui/info/OrganizationLinks.css b/src/fragmentarium/ui/info/OrganizationLinks.css deleted file mode 100644 index bf1904857..000000000 --- a/src/fragmentarium/ui/info/OrganizationLinks.css +++ /dev/null @@ -1,14 +0,0 @@ -.OrganizationLinks { - text-align: center; -} - -.OrganizationLinks a { - display: block; -} - -.OrganizationLinks__image { - height: auto; - max-height: 3.5em; - max-width: 100%; - margin: 0.2em; -} diff --git a/src/fragmentarium/ui/info/OrganizationLinks.test.tsx b/src/fragmentarium/ui/info/OrganizationLinks.test.tsx deleted file mode 100644 index b5ee6c443..000000000 --- a/src/fragmentarium/ui/info/OrganizationLinks.test.tsx +++ /dev/null @@ -1,57 +0,0 @@ -import React from 'react' -import { render, screen } from '@testing-library/react' -import OrganizationLinks from './OrganizationLinks' - -import cdliLogo from './logos/cdli.png' -import Museum from 'fragmentarium/domain/museum' -import { - externalNumbersFactory, - fragmentFactory, -} from 'test-support/fragment-fixtures' -import { Fragment } from 'fragmentarium/domain/fragment' - -const cdliNumber = 'P 0000+q' -const bmIdNumber = 'bm 00000+q' -let fragment: Fragment - -beforeEach(async () => { - fragment = fragmentFactory.build( - {}, - { - associations: { - externalNumbers: externalNumbersFactory.build({ - cdliNumber, - bmIdNumber, - }), - }, - } - ) - render() -}) - -it('Renders CDLI logo', () => { - expect(screen.getByAltText('CDLI')).toHaveAttribute('src', cdliLogo) -}) - -it('Links to CDLI text', () => { - expect(screen.getByLabelText(`CDLI text ${cdliNumber}`)).toHaveAttribute( - 'href', - `https://cdli.mpiwg-berlin.mpg.de/${encodeURIComponent(cdliNumber)}` - ) -}) - -it('Renders The British Museum logo', () => { - expect(screen.getByAltText('The British Museum')).toHaveAttribute( - 'src', - Museum.of('The British Museum').logo - ) -}) - -it('Links to The British Museum object', () => { - expect( - screen.getByLabelText(`The British Museum object ${bmIdNumber}`) - ).toHaveAttribute( - 'href', - Museum.of('The British Museum').createLinkFor(fragment).url - ) -}) diff --git a/src/fragmentarium/ui/info/OrganizationLinks.tsx b/src/fragmentarium/ui/info/OrganizationLinks.tsx deleted file mode 100644 index a861ecb6b..000000000 --- a/src/fragmentarium/ui/info/OrganizationLinks.tsx +++ /dev/null @@ -1,54 +0,0 @@ -import React from 'react' - -import ExternalLink from 'common/ExternalLink' - -import { Fragment } from 'fragmentarium/domain/fragment' -import { FragmentLink } from 'fragmentarium/domain/museum' - -import './OrganizationLinks.css' -import { - BdtnsLogoLink, - CdliLogoLink, - ArchibabLogoLink, - UrOnlineLogoLink, - HilprechtJenaLogoLink, - HilprechtHeidelbergLogoLink, -} from './ExternalNumberLogoLink' - -type LogoLinkComponent = ({ number }: { number: string }) => JSX.Element - -function MuseumLink({ link }: { readonly link: FragmentLink }): JSX.Element { - return ( - - {link.name} - - ) -} - -export default function OrganizationLinks({ - fragment, -}: { - readonly fragment: Fragment -}): JSX.Element { - const externalNumbers: ReadonlyArray<[string, LogoLinkComponent]> = [ - [fragment.cdliNumber, CdliLogoLink], - [fragment.bdtnsNumber, BdtnsLogoLink], - [fragment.archibabNumber, ArchibabLogoLink], - [fragment.urOnlineNumber, UrOnlineLogoLink], - [fragment.hilprechtJenaNumber, HilprechtJenaLogoLink], - [fragment.hilprechtHeidelbergNumber, HilprechtHeidelbergLogoLink], - ] - return ( -

    - {fragment.hasLink && } - {externalNumbers.map( - ([number, LogoLink], index) => - number && - )} -

    - ) -} diff --git a/src/fragmentarium/ui/info/ResearchProjects.tsx b/src/fragmentarium/ui/info/ResearchProjects.tsx index 29836916a..a919b5dc7 100644 --- a/src/fragmentarium/ui/info/ResearchProjects.tsx +++ b/src/fragmentarium/ui/info/ResearchProjects.tsx @@ -18,7 +18,7 @@ export function ProjectList({ title={project.name} > {project.name} diff --git a/src/fragmentarium/ui/info/__snapshots__/ExternalResources.test.tsx.snap b/src/fragmentarium/ui/info/__snapshots__/ExternalResources.test.tsx.snap new file mode 100644 index 000000000..d4e4b54d4 --- /dev/null +++ b/src/fragmentarium/ui/info/__snapshots__/ExternalResources.test.tsx.snap @@ -0,0 +1,106 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`external resources Snapshot 1`] = ` +
    + +
    +`; diff --git a/src/fragmentarium/ui/info/info.sass b/src/fragmentarium/ui/info/info.sass index 4b92f902f..8e05bb59c 100644 --- a/src/fragmentarium/ui/info/info.sass +++ b/src/fragmentarium/ui/info/info.sass @@ -1,2 +1,6 @@ -.info__help - margin-left: 0.5rem +.info + &__help + margin-left: 0.5rem + &__header + display: flex + align-items: baseline diff --git a/src/fragmentarium/ui/info/logos/archibab.jpeg b/src/fragmentarium/ui/info/logos/archibab.jpeg deleted file mode 100644 index 417dedcd4..000000000 Binary files a/src/fragmentarium/ui/info/logos/archibab.jpeg and /dev/null differ diff --git a/src/fragmentarium/ui/info/logos/bdtns.png b/src/fragmentarium/ui/info/logos/bdtns.png deleted file mode 100644 index 35385ef3c..000000000 Binary files a/src/fragmentarium/ui/info/logos/bdtns.png and /dev/null differ diff --git a/src/fragmentarium/ui/info/logos/cdli.png b/src/fragmentarium/ui/info/logos/cdli.png deleted file mode 100644 index 25be12578..000000000 Binary files a/src/fragmentarium/ui/info/logos/cdli.png and /dev/null differ diff --git a/src/fragmentarium/ui/info/logos/hilprecht-heidelberg.png b/src/fragmentarium/ui/info/logos/hilprecht-heidelberg.png deleted file mode 100644 index 2838cba53..000000000 Binary files a/src/fragmentarium/ui/info/logos/hilprecht-heidelberg.png and /dev/null differ diff --git a/src/fragmentarium/ui/info/logos/hilprecht-jena.png b/src/fragmentarium/ui/info/logos/hilprecht-jena.png deleted file mode 100644 index 88f563ccb..000000000 Binary files a/src/fragmentarium/ui/info/logos/hilprecht-jena.png and /dev/null differ diff --git a/src/fragmentarium/ui/info/logos/ur-online.jpeg b/src/fragmentarium/ui/info/logos/ur-online.jpeg deleted file mode 100644 index 09a9109c1..000000000 Binary files a/src/fragmentarium/ui/info/logos/ur-online.jpeg and /dev/null differ diff --git a/src/fragmentarium/ui/search/__snapshots__/FragmentariumSearch.test.tsx.snap b/src/fragmentarium/ui/search/__snapshots__/FragmentariumSearch.test.tsx.snap index d55f376f9..9ceea772e 100644 --- a/src/fragmentarium/ui/search/__snapshots__/FragmentariumSearch.test.tsx.snap +++ b/src/fragmentarium/ui/search/__snapshots__/FragmentariumSearch.test.tsx.snap @@ -694,11 +694,11 @@ exports[`Searching fragments by transliteration Displays corpus results when cli >

    - laepfa.9 + egiimsuh.9 - (OA) + (NA)

    - Mattei & Thomas, 2115: 372301728055296-234494088970240 + Duran & Morgan, 2047: 2475096543330304-6774523607121920 [ - l. 4'.2., 3'. + l. 4'.2., 1. ] - (C) + (T) - -
    1. - Collins & Cenni, 2037: 1444897496236032-7394762166370304 + Woods & Huff, 2105: 176413170728960-4588441272582144 [ - l. 3'., 4'.2. + l. 1., 2. ] - (A) + (T)
    2. @@ -6463,17 +6459,22 @@ exports[`Searching fragments by transliteration Displays corpus results when cli >

      - torofgov.10 + gumozo.10 - (MA) + (Hel)

      +
        + + ARCHIVE ➝ Administrative ➝ Lists + +
        Other ➝ Fake ➝ Certain @@ -6510,14 +6511,14 @@ exports[`Searching fragments by transliteration Displays corpus results when cli - Macdonald & Peeters, 2073: 8359987061456896-8916914698977280 + Baronti & Estrada, 2037: 2783108709482496-6526373642371072 [ - l. 1., 3'. + l. 1., 2. ] - (C) + (D) @@ -6529,9 +6530,9 @@ exports[`Searching fragments by transliteration Displays corpus results when cli - Rosati & Roy, 2038: 1577539168370688-5519014579142656 + Cognome & Driessen, 2106: 5414113119305728-4198870045163520 [ - l. 2., 3'. + l. 1., 4'.2. ] - Divination + Literature  >  - Ceawo af he omzigah jedef witijonu simaup rahoc ikecep uwrugan nobeto uzhaszo. + Dunupsa it githeku pesrab veh ef witijonu simaup rahoc ikecep uwrugan nobeto uzhaszo. > - Uruk IV Cimatkiv rorleb wowmu amdis nuret bo mum bofcuz fa mij ag oku. + Neo-Elamite Cucapi laan giligo vaguswin zulasbu kica hemfojpo ub deboc ak eji pivojbi aweik rud vilvij lajokriw goc cidbire.
    @@ -12344,7 +12345,7 @@ exports[`Searching fragments by transliteration Displays corpus results when cli class="chapter-display__line-number" > @@ -12462,7 +12463,7 @@ exports[`Searching fragments by transliteration Displays corpus results when cli class="chapter-display__line-number" > diff --git a/src/test-support/fragment-fixtures.ts b/src/test-support/fragment-fixtures.ts index f58fda8f4..555902f3a 100644 --- a/src/test-support/fragment-fixtures.ts +++ b/src/test-support/fragment-fixtures.ts @@ -157,6 +157,8 @@ export const externalNumbersFactory = Factory.define( hilprechtJenaNumber: associations.hilprechtJenaNumber ?? chance.string(), hilprechtHeidelbergNumber: associations.hilprechtHeidelbergNumber ?? chance.string(), + metropolitanNumber: associations.metropolitanNumber ?? chance.string(), + yalePeabodyNumber: associations.yalePeabodyNumber ?? chance.string(), } } )