Revize 812b9f90

draggable list start

re #9741

frontend/src/features/TrackingTool/trackingToolSlice.ts

@@ -2 +2 @@
 import { LatLngTuple } from "leaflet"
 import mapConfig from "../../config/mapConfig"
 import { PathDto } from "../../swagger/data-contracts"
-import buildPathVariants, { isMapPointDisplayable, MapPoint, PathVariant } from "./pathUtils"
+import buildPathVariants, { isMapPointDisplayable, MapPoint, PathVariant } from "./Map/pathUtils"
 import { sendTextForProcessing } from "./trackingToolThunks"
 import storage from "redux-persist/lib/storage"
 import TrackingToolState from './TrackingToolState'
@@ -60 +60 @@
             ...state,
             currentPage: action.payload,
         }),
-        updateMapMarker: (state: TrackingToolState, action: { payload: { idx: number, item: MapPoint } }) => {
-            const { idx, item } = action.payload
+        // Updates map marker while ignoring its idx property
+        updateMapMarkerWithId: (state: TrackingToolState, action: { payload: { id: string, item: MapPoint } }) => {
+            const { item } = action.payload
+            const idx = state.primaryPathIdx
+            if (!state.pathVariants || state.pathVariants.length <= idx) {
+                return state
+            }
+
+            const mapMarkerIdx = state.pathVariants[idx].findIndex((item) => item.id === action.payload.id)
+            if (mapMarkerIdx === -1) {
+                return state
+            }
+
+            const newPathVariant = [...state.pathVariants[idx]]
+            newPathVariant[mapMarkerIdx] = item
+            return {
+                ...state,
+                pathVariants: [...state.pathVariants.slice(0, idx), newPathVariant, ...state.pathVariants.slice(idx + 1)],
+            }
+        },
+        // Updates map marker based on its idx property
+        updateMapMarker: (state: TrackingToolState, action: { payload: { item: MapPoint } }) => {
+            const { item } = action.payload
+            const idx = state.primaryPathIdx
             if (!state.pathVariants || state.pathVariants.length <= idx) {
                 return state
             }
@@ -81 +103 @@
                 })
             }
         },
+        swapMapMarkerIndices: (state: TrackingToolState, action: { payload: { destination: number, source: number } }) => {
+            const { destination, source } = action.payload
+            if (!state.pathVariants || state.pathVariants.length === 0) {
+                return state
+            }
+
+            return {
+                ...state,
+                pathVariants: state.pathVariants.map((pathVariant, i) => {
+                    if (state.primaryPathIdx !== i) {
+                        return [...pathVariant]
+                    }
+
+                    if (pathVariant.length <= destination || pathVariant.length <= source) {
+                        return [...pathVariant]
+                    }
+
+                    // JS dark magic splice
+                    const result = [...pathVariant]
+                    const [removed] = result.splice(source, 1)
+                    result.splice(destination, 0, removed)
+                    return result
+                })
+            }
+        },
         clear: () => ({ ...initialState }),
         mergeWithCurrentPath: (state: TrackingToolState, action: { payload: PathVariant }) => {
             const { payload: jsonPath } = action
@@ -104 +151 @@
             const pathMap = new Map(path.map((item) => [item.catalogItem.id as string, item]))
 
             // Create an array of items to be replaced and items to be added to the end
-            const itemsToReplace: MapPoint[] = []
+            // const itemsToReplace: MapPoint[] = []
             const itemsToAdd: MapPoint[] = []
             jsonPath.forEach((item) => {
                 if (!pathMap.has(item.catalogItem.id as string)) {
                     itemsToAdd.push(item)
                     return
                 }
-                
-                const idx = pathMap.get(item.catalogItem.id as string)!.idx
-                item.idx = idx
-                itemsToReplace.push(item)
+
+                // const idx = pathMap.get(item.catalogItem.id as string)!.idx
+                // item.idx = idx
+                // itemsToReplace.push(item)
             })
 
             // Iterate over items to replace and replace them
             const newPath = [...path]
-            itemsToReplace.forEach((item) => {
-                newPath[item.idx] = item
-            })
+            // itemsToReplace.forEach((item) => {
+            //     newPath[item.idx] = item
+            // })
 
             // Add items to the end
             itemsToAdd.forEach((item) => {
-                item.active = false
+                item.active = !state.pathVariants || state.pathVariants.length === 0
                 item.idx = newPath.length
                 newPath.push(item)
             })
@@ -176 +223 @@
     },
 })
 
-export const { consumeErr, setPrimaryIdx, resetDialogApiCallSuccess, clear, updateMapMarker, mergeWithCurrentPath } =
-    trackingToolSlice.actions
+export const {
+    consumeErr,
+    setPrimaryIdx,
+    resetDialogApiCallSuccess,
+    clear,
+    updateMapMarker,
+    mergeWithCurrentPath,
+    swapMapMarkerIndices,
+    updateMapMarkerWithId
+} = trackingToolSlice.actions
 const trackingToolReducer = trackingToolSlice.reducer
 export default trackingToolReducer