From db1d0ba6f8161d2db19ce5ab85dc90cd425d09db Mon Sep 17 00:00:00 2001
From: Yugay Vasiliy <vasyayugay99@gmail.com>
Date: Thu, 22 Feb 2024 11:23:49 +0000
Subject: [PATCH] refactoring

---
 src/fragmentarium/application/FragmentService.ts   |  6 +++---
 .../infrastructure/FragmentRepository.ts           |  2 +-
 ...gySearchForm.sass => ProvenanceSearchForm.sass} |  2 +-
 ...logySearchForm.tsx => ProvenanceSearchForm.tsx} | 14 +++++++-------
 src/fragmentarium/ui/SearchForm.test.tsx           |  8 +++-----
 src/fragmentarium/ui/SearchForm.tsx                |  8 ++++----
 .../ui/front-page/Fragmentarium.test.tsx           |  2 +-
 .../ui/search/FragmentariumSearch.test.tsx         |  2 +-
 src/query/FragmentQuery.ts                         |  2 +-
 9 files changed, 22 insertions(+), 24 deletions(-)
 rename src/fragmentarium/ui/{ArchaeologySearchForm.sass => ProvenanceSearchForm.sass} (65%)
 rename src/fragmentarium/ui/{ArchaeologySearchForm.tsx => ProvenanceSearchForm.tsx} (72%)

diff --git a/src/fragmentarium/application/FragmentService.ts b/src/fragmentarium/application/FragmentService.ts
index c09ce61a1..78c07ed69 100644
--- a/src/fragmentarium/application/FragmentService.ts
+++ b/src/fragmentarium/application/FragmentService.ts
@@ -56,7 +56,7 @@ export interface FragmentRepository {
   ): Bluebird<Fragment>
   findInCorpus(number: string): Bluebird<ReadonlyArray<ManuscriptAttestation>>
   fetchGenres(): Bluebird<string[][]>
-  fetchArchaeologies(): Bluebird<string[][]>
+  fetchProvenances(): Bluebird<string[][]>
   fetchPeriods(): Bluebird<string[]>
   updateGenres(number: string, genres: Genres): Bluebird<Fragment>
   updateScript(number: string, script: Script): Bluebird<Fragment>
@@ -177,8 +177,8 @@ export class FragmentService {
   fetchGenres(): Bluebird<string[][]> {
     return this.fragmentRepository.fetchGenres()
   }
-  fetchArchaeologies(): Bluebird<string[][]> {
-    return this.fragmentRepository.fetchArchaeologies()
+  fetchProvenances(): Bluebird<string[][]> {
+    return this.fragmentRepository.fetchProvenances()
   }
 
   fetchPeriods(): Bluebird<string[]> {
diff --git a/src/fragmentarium/infrastructure/FragmentRepository.ts b/src/fragmentarium/infrastructure/FragmentRepository.ts
index 0cae0c5c3..c01cc2894 100644
--- a/src/fragmentarium/infrastructure/FragmentRepository.ts
+++ b/src/fragmentarium/infrastructure/FragmentRepository.ts
@@ -196,7 +196,7 @@ class ApiFragmentRepository
   fetchGenres(): Promise<string[][]> {
     return this.apiClient.fetchJson('/genres', false)
   }
-  fetchArchaeologies(): Promise<string[][]> {
+  fetchProvenances(): Promise<string[][]> {
     return this.apiClient.fetchJson('/provenances', false)
   }
 
diff --git a/src/fragmentarium/ui/ArchaeologySearchForm.sass b/src/fragmentarium/ui/ProvenanceSearchForm.sass
similarity index 65%
rename from src/fragmentarium/ui/ArchaeologySearchForm.sass
rename to src/fragmentarium/ui/ProvenanceSearchForm.sass
index 9cc213404..df1687c0b 100644
--- a/src/fragmentarium/ui/ArchaeologySearchForm.sass
+++ b/src/fragmentarium/ui/ProvenanceSearchForm.sass
@@ -1,3 +1,3 @@
-.archaeology-selector
+.provenance-selector
     &__menu
         z-index: 99 !important
\ No newline at end of file
diff --git a/src/fragmentarium/ui/ArchaeologySearchForm.tsx b/src/fragmentarium/ui/ProvenanceSearchForm.tsx
similarity index 72%
rename from src/fragmentarium/ui/ArchaeologySearchForm.tsx
rename to src/fragmentarium/ui/ProvenanceSearchForm.tsx
index d3e63a616..80ab2b3ad 100644
--- a/src/fragmentarium/ui/ArchaeologySearchForm.tsx
+++ b/src/fragmentarium/ui/ProvenanceSearchForm.tsx
@@ -2,7 +2,7 @@ import React from 'react'
 import withData from 'http/withData'
 import Select from 'react-select'
 import FragmentService from 'fragmentarium/application/FragmentService'
-import './ArchaeologySearchForm.sass'
+import './ProvenanceSearchForm.sass'
 
 export default withData<
   {
@@ -13,15 +13,15 @@ export default withData<
   ReadonlyArray<ReadonlyArray<string>>
 >(
   ({ data, value, onChange }) => {
-    const options = data.map((archaeology) => ({
-      value: archaeology[0],
-      label: archaeology[0],
+    const options = data.map((site) => ({
+      value: site.join(' '),
+      label: site.join(' '),
     }))
     const defaultOption = value ? { value: value, label: value } : null
 
     return (
       <Select
-        aria-label="select-archaeology"
+        aria-label="select-provenance"
         placeholder="Provenance"
         options={options}
         value={defaultOption}
@@ -29,10 +29,10 @@ export default withData<
           onChange(selection?.value || null)
         }}
         isSearchable={true}
-        classNamePrefix={'archaeology-selector'}
+        classNamePrefix={'provenance-selector'}
         isClearable
       />
     )
   },
-  (props) => props.fragmentService.fetchArchaeologies()
+  (props) => props.fragmentService.fetchProvenances()
 )
diff --git a/src/fragmentarium/ui/SearchForm.test.tsx b/src/fragmentarium/ui/SearchForm.test.tsx
index ff2f49ab6..219a6ded8 100644
--- a/src/fragmentarium/ui/SearchForm.test.tsx
+++ b/src/fragmentarium/ui/SearchForm.test.tsx
@@ -89,9 +89,7 @@ beforeEach(async () => {
     Promise.resolve(Object.keys(Periods))
   )
   fragmentService.fetchGenres.mockReturnValue(Promise.resolve(genres))
-  fragmentService.fetchArchaeologies.mockReturnValue(
-    Promise.resolve(provenances)
-  )
+  fragmentService.fetchProvenances.mockReturnValue(Promise.resolve(provenances))
   wordService.searchLemma.mockReturnValue(Promise.resolve([word]))
   wordService.findAll.mockReturnValue(Promise.resolve([]))
   session.isAllowedToReadFragments.mockReturnValue(true)
@@ -228,11 +226,11 @@ describe('Script period selection form', () => {
 
 describe('Provenance selection form', () => {
   beforeEach(() => {
-    userEvent.type(screen.getByLabelText('select-archaeology'), 'Assur')
+    userEvent.type(screen.getByLabelText('select-provenance'), 'Assur')
   })
   it('displays user input', async () => {
     await waitFor(() =>
-      expect(screen.getByLabelText('select-archaeology')).toHaveValue('Assur')
+      expect(screen.getByLabelText('select-provenance')).toHaveValue('Assur')
     )
   })
 
diff --git a/src/fragmentarium/ui/SearchForm.tsx b/src/fragmentarium/ui/SearchForm.tsx
index 60aeebfd8..1a0c088a1 100644
--- a/src/fragmentarium/ui/SearchForm.tsx
+++ b/src/fragmentarium/ui/SearchForm.tsx
@@ -33,7 +33,7 @@ import {
 import GenreSearchForm from './GenreSearchForm'
 import BibliographyService from 'bibliography/application/BibliographyService'
 import { ResearchProjects } from 'research-projects/researchProject'
-import ArchaeologySearchForm from './ArchaeologySearchForm'
+import ProvenanceSearchForm from './ProvenanceSearchForm'
 
 interface State {
   number: string | null
@@ -85,7 +85,7 @@ class SearchForm extends Component<Props, State> {
       scriptPeriod: fragmentQuery.scriptPeriod || '',
       scriptPeriodModifier: fragmentQuery.scriptPeriodModifier || '',
       genre: fragmentQuery.genre || '',
-      site: fragmentQuery.archaeology || '',
+      site: fragmentQuery.provenance || '',
       isValid: isValidNumber(fragmentQuery.number),
     }
 
@@ -141,7 +141,7 @@ class SearchForm extends Component<Props, State> {
           : '',
         scriptPeriod: state.scriptPeriod,
         genre: state.genre,
-        site: state.site,
+        site: state.site ? state.site.split(' ')[0] : '',
         project: this.props.project,
       },
       (value) => !value
@@ -244,7 +244,7 @@ class SearchForm extends Component<Props, State> {
               <HelpTrigger overlay={ProvenanceSearchHelp()} />
             </Col>
             <Col>
-              <ArchaeologySearchForm
+              <ProvenanceSearchForm
                 fragmentService={this.props.fragmentService}
                 onChange={this.onChange('site')}
                 value={this.state.site}
diff --git a/src/fragmentarium/ui/front-page/Fragmentarium.test.tsx b/src/fragmentarium/ui/front-page/Fragmentarium.test.tsx
index e52cfe583..75f4cf3c9 100644
--- a/src/fragmentarium/ui/front-page/Fragmentarium.test.tsx
+++ b/src/fragmentarium/ui/front-page/Fragmentarium.test.tsx
@@ -59,7 +59,7 @@ beforeEach(() => {
   wordService.findAll.mockReturnValue(Promise.resolve([]))
   fragmentService.fetchPeriods.mockReturnValueOnce(Promise.resolve([]))
   fragmentService.fetchGenres.mockReturnValueOnce(Promise.resolve([]))
-  fragmentService.fetchArchaeologies.mockRejectedValueOnce(Promise.resolve([]))
+  fragmentService.fetchProvenances.mockRejectedValueOnce(Promise.resolve([]))
 })
 
 describe('Statistics', () => {
diff --git a/src/fragmentarium/ui/search/FragmentariumSearch.test.tsx b/src/fragmentarium/ui/search/FragmentariumSearch.test.tsx
index b1bf42509..8bc87d29d 100644
--- a/src/fragmentarium/ui/search/FragmentariumSearch.test.tsx
+++ b/src/fragmentarium/ui/search/FragmentariumSearch.test.tsx
@@ -77,7 +77,7 @@ beforeEach(async () => {
   session = new MemorySession(['read:fragments'])
   fragmentService.fetchPeriods.mockReturnValueOnce(Promise.resolve([]))
   fragmentService.fetchGenres.mockReturnValueOnce(Promise.resolve([]))
-  fragmentService.fetchArchaeologies.mockReturnValueOnce(Promise.resolve([]))
+  fragmentService.fetchProvenances.mockReturnValueOnce(Promise.resolve([]))
 })
 
 describe('Search', () => {
diff --git a/src/query/FragmentQuery.ts b/src/query/FragmentQuery.ts
index 9d645bd6e..c5b33d5e9 100644
--- a/src/query/FragmentQuery.ts
+++ b/src/query/FragmentQuery.ts
@@ -18,7 +18,7 @@ export type FragmentQuery = Partial<{
   scriptPeriod: PeriodString
   scriptPeriodModifier: PeriodModifierString
   genre: string
-  archaeology: string
+  provenance: string
   project: keyof typeof ResearchProjects | null
   latest: boolean
 }>