Update latest additions (#421)

* extract query latest into separate method * update tests * fix type error * make result list responsive * stack grid on mobile * Refactoring responsive cols * add spacing on mobile
ElectronicBabylonianLiterature · Dec 27, 2023 · 2f22315 · 2f22315
1 parent 6bd7174
commit 2f22315
Show file tree

Hide file tree

Showing 10 changed files with 15,464 additions and 15,424 deletions.
diff --git a/src/fragmentarium/application/FragmentService.test.ts b/src/fragmentarium/application/FragmentService.test.ts
@@ -77,6 +77,7 @@ const fragmentRepository = {
   lineToVecRanking: jest.fn(),
   findInCorpus: jest.fn(),
   query: jest.fn(),
+  queryLatest: jest.fn(),
   listAllFragments: jest.fn(),
   queryByTraditionalReferences: jest.fn(),
 }

diff --git a/src/fragmentarium/application/FragmentService.ts b/src/fragmentarium/application/FragmentService.ts
@@ -88,6 +88,7 @@ export interface FragmentRepository {
   fetchCdliInfo(cdliNumber: string): Bluebird<CdliInfo>
   lineToVecRanking(number: string): Bluebird<LineToVecRanking>
   query(fragmentQuery: FragmentQuery): Bluebird<QueryResult>
+  queryLatest(): Bluebird<QueryResult>
   queryByTraditionalReferences(
     traditionalReferences: string[]
   ): Bluebird<FragmentAfoRegisterQueryResult>
@@ -338,6 +339,10 @@ export class FragmentService {
     return this.fragmentRepository.query(fragmentQuery)
   }
 
+  queryLatest(): Bluebird<QueryResult> {
+    return this.fragmentRepository.queryLatest()
+  }
+
   queryByTraditionalReferences(
     traditionalReferences: string[]
   ): Bluebird<FragmentAfoRegisterQueryResult> {

diff --git a/src/fragmentarium/infrastructure/FragmentRepository.ts b/src/fragmentarium/infrastructure/FragmentRepository.ts
@@ -133,6 +133,13 @@ function createQueryItem(dto): QueryItem {
   }
 }
 
+function createQueryResult(dto): QueryResult {
+  return {
+    matchCountTotal: dto.matchCountTotal,
+    items: dto.items.map(createQueryItem),
+  }
+}
+
 class ApiFragmentRepository
   implements FragmentInfoRepository, FragmentRepository, AnnotationRepository {
   constructor(private readonly apiClient: JsonApiClient) {}
@@ -381,10 +388,13 @@ class ApiFragmentRepository
   query(fragmentQuery: FragmentQuery): Promise<QueryResult> {
     return this.apiClient
       .fetchJson(`/fragments/query?${stringify(fragmentQuery)}`, false)
-      .then((result) => ({
-        matchCountTotal: result.matchCountTotal,
-        items: result.items.map(createQueryItem),
-      }))
+      .then(createQueryResult)
+  }
+
+  queryLatest(): Promise<QueryResult> {
+    return this.apiClient
+      .fetchJson('/fragments/latest', false)
+      .then(createQueryResult)
   }
 
   queryByTraditionalReferences(

diff --git a/src/fragmentarium/ui/front-page/Fragmentarium.test.tsx b/src/fragmentarium/ui/front-page/Fragmentarium.test.tsx
@@ -83,7 +83,7 @@ describe('Fragment lists', () => {
   beforeEach(async () => {
     latest = fragmentFactory.build()
     session = new MemorySession(['read:fragments', 'transliterate:fragments'])
-    fragmentService.query.mockReturnValueOnce(
+    fragmentService.queryLatest.mockReturnValueOnce(
       Promise.resolve({ items: [queryItemOf(latest)], matchCountTotal: 0 })
     )
     fragmentService.find.mockReturnValueOnce(Promise.resolve(latest))

diff --git a/src/fragmentarium/ui/front-page/LatestTransliterations.test.tsx b/src/fragmentarium/ui/front-page/LatestTransliterations.test.tsx
@@ -35,7 +35,7 @@ beforeEach(async () => {
     {},
     { transient: { chance } }
   )
-  fragmentService.query.mockReturnValueOnce(
+  fragmentService.queryLatest.mockReturnValueOnce(
     Promise.resolve({
       items: fragments.map(queryItemOf),
       matchCountTotal: 0,

diff --git a/src/fragmentarium/ui/front-page/LatestTransliterations.tsx b/src/fragmentarium/ui/front-page/LatestTransliterations.tsx
@@ -40,5 +40,5 @@ export default withData<
       <LatestTransliterations data={data} fragmentService={fragmentService} />
     )
   },
-  (props) => props.fragmentService.query({ latest: true })
+  (props) => props.fragmentService.queryLatest()
 )