Revize 81698b9a

merge fixes

frontend/src/features/Catalog/CatalogItemDetail.tsx

@@ -100 +100 @@
         },
         {
             rowName: 'Coordinates',
-            items: item?.longitude && item?.latitude ? `${item?.latitude}°, ${item?.longitude}°` : '-, -',
+            // Must be in array otherwise the string gets iterated
+            items: [item?.longitude && item?.latitude ? `${item?.latitude}°, ${item?.longitude}°` : '-'],
         },
         {
             rowName: 'Certainty',

frontend/src/features/Catalog/CatalogTable.tsx

@@ -113 +113 @@
                     {item.name}
                 </Link>
             </TableCell>
-            {mapValueOrDefault(item.alternativeNames?.join(', '), {
+            {mapValueOrDefault(item.allNames?.join(', '), {
                 display: '-webkit-box',
                 overflow: 'hidden',
                 WebkitBoxOrient: 'vertical',

frontend/src/features/Navigation/navigationSlice.tsx

@@ -12 +12 @@
     storage
 }
 
-const initialState = {
+const initialState: NavigationState = {
     selectedMenuItem: '',
     open: false
 }
@@ -21 +21 @@
     name: 'navigation',
     initialState,
     reducers: {
-        setSelectedMenuItem: (state, action) => ({...state, selectedMenuItem: action.payload}),
-        setOpen: (state, action) => ({...state, open: action.payload}),
+        setSelectedMenuItem: (state: NavigationState, action: any) => ({...state, selectedMenuItem: action.payload}),
+        setOpen: (state: NavigationState, action: any) => ({...state, open: action.payload}),
     }
 })
 

frontend/src/features/TrackingTool/trackingToolSlice.ts

@@ -17 +17 @@
     activePaths: Set<number> // indices of the active paths
     // trigger to close the dialog when API call is finished
     dialogApiCallSuccess: boolean
+    pathsPerPage: number // max number of paths to show on the map at once
+    currentPage: number // current page of paths - starts from 0
 }
 
+const defaultPathsPerPage = 5
+
 const initialState: TrackingToolState = {
     isLoading: false,
     mapCenter: [
@@ -28 +32 @@
     primaryPathIdx: 0,
     activePaths: new Set(),
     dialogApiCallSuccess: true,
+    pathsPerPage: defaultPathsPerPage,
+    currentPage: 0,
 }
 
 // Returns tuple of average latitude and longitude
@@ -56 +62 @@
             ...state,
             dialogApiCallSuccess: false,
         }),
-        clear: (state: TrackingToolState) => ({...initialState})
+        setPage: (state: TrackingToolState, action: any) => ({
+            ...state,
+            currentPage: action.payload,
+        }),
+        clear: () => ({...initialState})
     },
     extraReducers: (builder) => {
         builder.addCase(sendTextForProcessing.fulfilled, (state, action) => {
@@ -75 +85 @@
                         : (state.mapCenter as LatLngTuple),
                 isLoading: false,
                 dialogApiCallSuccess: true,
+                currentPage: 0,
             }
         })
         builder.addCase(sendTextForProcessing.rejected, (state, action) => ({
@@ -82 +93 @@
             lastError: action.error.message,
             isLoading: false,
             dialogApiCallSuccess: false,
+            currentPage: 0,
         }))
         builder.addCase(sendTextForProcessing.pending, (state) => {
             return {