Merge pull request #2010 from HSLdevcom/develop

Fix a bug with selected links
HSLdevcom · Nov 4, 2024 · e455fd4 · e455fd4
2 parents 0efb467 + c88e56e
commit e455fd4
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 640 deletions.
diff --git a/.nvmrc b/.nvmrc
@@ -0,0 +1 @@
+12.22.12
diff --git a/package.json b/package.json
@@ -22,7 +22,6 @@
     "dotenv-expand": "4.2.0",
     "extract-text-webpack-plugin": "3.0.2",
     "file-loader": "0.11.2",
-    "forever": "^1.0.0",
     "fork-ts-checker-webpack-plugin": "^0.2.8",
     "fs-extra": "3.0.1",
     "graphql": "^14.5.8",
@@ -86,7 +85,7 @@
     "release-patch": "bumped release patch",
     "release-minor": "bumped release minor",
     "release-major": "bumped release major",
-    "production": "forever start -c \"yarn run serve -s -l 5000\" build && forever logs -f 0",
+    "production": "serve -s -l 5000 build",
     "cypress": "CYPRESS_E2E=true cypress",
     "cypress:run:dev": "CYPRESS_E2E=true cypress run --env configFile=dev",
     "cypress:run:stage": "CYPRESS_E2E=true cypress run --env configFile=stage",
@@ -119,9 +118,7 @@
     "cypress": "5.5.0",
     "cypress-commands": "^0.3.1",
     "cypress-wait-until": "^1.6.1",
-    "del-cli": "^1.1.0",
     "mobx-react-devtools": "^6.0.1",
-    "npm-run-all": "^4.1.3",
     "react-dev-utils": "^5.0.1",
     "sass": "^1.26.1",
     "sass-loader": "^7.1.0",

diff --git a/src/components/map/layers/edit/EditLinkLayer.tsx b/src/components/map/layers/edit/EditLinkLayer.tsx
@@ -5,7 +5,7 @@ import React, { useCallback, useEffect, useRef, useState } from 'react';
 import { withLeaflet, Marker as LeafletMarker } from 'react-leaflet';
 import ToolbarToolType from '~/enums/toolbarToolType';
 import EventListener, { INodeClickParams } from '~/helpers/EventListener';
-import { ILink, INode } from '~/models';
+import { INode } from '~/models';
 import { LinkStore } from '~/stores/linkStore';
 import { LoginStore } from '~/stores/loginStore';
 import { MapFilter, MapStore } from '~/stores/mapStore';
@@ -42,20 +42,20 @@ const EditLinkLayer = inject(
     'networkStore'
 )(
     observer((props: IEditLinkLayerProps) => {
-        const [editableLinks, setEditableLinks] = useState<L.Polyline[]>([]);
+        const [selectedLinks, setSelectedLinks] = useState<L.Polyline[]>([]);
         const enableSelectNetworkEntityToolTimeout = useRef<number>();
 
         useEffect(() => {
-            editableLinks.forEach((editableLink) => {
-                editableLink.remove();
+            selectedLinks.forEach((selectedLinks) => {
+                selectedLinks.remove();
             });
-            drawEditableLink();
+            drawSelectedLink();
         }, [props.linkStore!.link?.geometry, props.networkStore!.selectedDate]);
 
         const updateLinkGeometry = useCallback(() => {
-            const latLngs = editableLinks[0].getLatLngs()[0] as L.LatLng[];
+            const latLngs = selectedLinks[0].getLatLngs()[0] as L.LatLng[];
             props.linkStore!.updateLinkGeometry(latLngs);
-        }, [editableLinks]);
+        }, [selectedLinks]);
 
         useEffect(() => {
             const map = props.leaflet.map;
@@ -88,42 +88,36 @@ const EditLinkLayer = inject(
             };
         }, [updateLinkGeometry, props.leaflet.map]);
 
-        const drawEditableLink = () => {
+        const drawSelectedLink = () => {
             const link = props.linkStore!.link;
             const map = props.leaflet.map;
             if (!map || !link || !link.geometry) return;
 
+            const isLinkOld = isNetworkElementOld(link.dateRanges);
+            const selectedLink = L.polyline([_.cloneDeep(link.geometry)], {
+                interactive: false,
+                color: isLinkOld ? OLD_LINK_COLOR : ACTIVE_LINK_COLOR,
+            }).addTo(map);
+
             const isEditable =
                 props.loginStore!.hasWriteAccess && props.linkStore!.isLinkGeometryEditable;
-            drawLinkToMap(link, isEditable);
-        };
 
-        const drawLinkToMap = (link: ILink, isEditable: boolean) => {
-            const map = props.leaflet.map;
-            if (map) {
-                const isLinkOld = isNetworkElementOld(link.dateRanges);
-                const editableLink = L.polyline([_.cloneDeep(link.geometry)], {
-                    interactive: false,
-                    color: isLinkOld ? OLD_LINK_COLOR : ACTIVE_LINK_COLOR,
-                }).addTo(map);
-
-                if (isEditable) {
-                    editableLink.enableEdit();
-                    const latLngs = editableLink.getLatLngs() as L.LatLng[][];
-                    const coords = latLngs[0];
-                    const coordsToDisable = [coords[0], coords[coords.length - 1]];
-                    coordsToDisable.forEach((coordToDisable: any) => {
-                        const vertexMarker = coordToDisable.__vertex;
-                        vertexMarker.dragging.disable();
-                        vertexMarker._events.click = {};
-                        vertexMarker.setOpacity(0);
-                        // Put vertex marker z-index low so that it
-                        // would be below other layers that needs to be clickable
-                        vertexMarker.setZIndexOffset(-1000);
-                    });
-                    setEditableLinks([editableLink]);
-                }
+            if (isEditable) {
+                selectedLink.enableEdit();
+                const latLngs = selectedLink.getLatLngs() as L.LatLng[][];
+                const coords = latLngs[0];
+                const coordsToDisable = [coords[0], coords[coords.length - 1]];
+                coordsToDisable.forEach((coordToDisable: any) => {
+                    const vertexMarker = coordToDisable.__vertex;
+                    vertexMarker.dragging.disable();
+                    vertexMarker._events.click = {};
+                    vertexMarker.setOpacity(0);
+                    // Put vertex marker z-index low so that it
+                    // would be below other layers that needs to be clickable
+                    vertexMarker.setZIndexOffset(-1000);
+                });
             }
+            setSelectedLinks([selectedLink]);
         };
 
         const renderLinkDecorator = () => {