Merge pull request #6471 from espoon-voltti/display-city-in-unit-listing

Lisätään yksikköhakuun kunta-sarake

Author: Joosakur

frontend/src/employee-frontend/components/Units.tsx

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2017-2022 City of Espoo
+// SPDX-FileCopyrightText: 2017-2025 City of Espoo
 //
 // SPDX-License-Identifier: LGPL-2.1-or-later
 
@@ -117,6 +117,7 @@ export default React.memo(function Units() {
                       ].join(', ')
                     : unit.visitingAddress.streetAddress}
                 </Td>
+                <Td>{unit.visitingAddress.postOffice}</Td>
                 <Td>
                   {unit.type.map((type) => i18n.common.types[type]).join(', ')}
                 </Td>
@@ -215,10 +216,16 @@ export default React.memo(function Units() {
                 </SortableTh>
                 <SortableTh
                   sorted={sortColumn === 'address' ? sortDirection : undefined}
-                  onClick={() => sortBy('address')}
+                  onClick={() => sortBy('visitingAddress.streetAddress')}
                 >
                   {i18n.units.address}
                 </SortableTh>
+                <SortableTh
+                  sorted={sortColumn === 'city' ? sortDirection : undefined}
+                  onClick={() => sortBy('visitingAddress.postOffice')}
+                >
+                  {i18n.units.city}
+                </SortableTh>
                 <SortableTh
                   sorted={sortColumn === 'type' ? sortDirection : undefined}
                   onClick={() => sortBy('type')}

frontend/src/employee-frontend/state/units.tsx

@@ -44,7 +44,12 @@ const defaultState: UnitsState = {
 
 export const UnitsContext = createContext<UnitsState>(defaultState)
 
-export type SearchColumn = 'name' | 'area.name' | 'address' | 'type'
+export type SearchColumn =
+  | 'name'
+  | 'area.name'
+  | 'visitingAddress.streetAddress'
+  | 'visitingAddress.postOffice'
+  | 'type'
 
 export const UnitsContextProvider = React.memo(function UnitsContextProvider({
   children

frontend/src/lib-customizations/defaults/employee/i18n/fi.tsx

@@ -2169,6 +2169,7 @@ export const fi = {
     name: 'Nimi',
     area: 'Alue',
     address: 'Osoite',
+    city: 'Kunta',
     type: 'Tyyppi',
     findByName: 'Etsi yksikön nimellä',
     selectProviderTypes: 'Valitse järjestämismuoto',