70103 broken links fix (#2019)

* debugging links

* formatting

* downgrading cypress

* dockerfile changes

* Dockerfile changes

* revert dockerfile, upgrade node

* downgrade cypress

* yarn.lock

* yarn.lock update

* formatting

* cypress upgrade

Author: ahjyrkia

Dockerfile

@@ -41,4 +41,4 @@ RUN yarn global add serve@^14.2.3
 
 COPY --from=builder /opt/joremapui/build build/
 
-CMD ["serve", "-s", "-l", "5000", "build/"]
+CMD ["serve", "-s", "-l", "5000", "build/"]

package.json

@@ -117,7 +117,7 @@
     "bumped": "^0.10.11",
     "bumped-changelog": "0.3.13",
     "bumped-terminal": "^0.7.6",
-    "cypress": "^15.3.0",
+    "cypress": "^5.6.0",
     "cypress-commands": "^0.3.1",
     "cypress-wait-until": "^1.6.1",
     "lint-staged": "^9.0.0",

src/components/map/layers/NetworkLayers.tsx

@@ -148,12 +148,11 @@ class NetworkLayers extends Component<INetworkLayersProps> {
    * Sets a reaction object for TileserverLayer (replaces existing one) so
    * that reaction object's wouldn't multiply each time a VectorGridLayer is re-rendered.
    */
-  private setVectorgridLayerReaction = (type: TileserverLayer) => (
-    reaction: IReactionDisposer
-  ) => {
-    if (this.reactionDisposer[type]) this.reactionDisposer[type]()
-    this.reactionDisposer[type] = reaction
-  }
+  private setVectorgridLayerReaction =
+    (type: TileserverLayer) => (reaction: IReactionDisposer) => {
+      if (this.reactionDisposer[type]) this.reactionDisposer[type]()
+      this.reactionDisposer[type] = reaction
+    }
 
   render() {
     if (this.props.mapStore!.areNetworkLayersHidden) return null

src/components/map/layers/edit/RoutePathNeighborLinkLayer.tsx

@@ -227,13 +227,11 @@ class RoutePathNeighborLinkLayer extends Component<
 
   render() {
     const neighborLinks: INeighborLink[] = this.props.routePathLayerStore!.neighborLinks
-    const clusteredNeighborLinksMap: Map<
-      LatLngBounds,
-      INeighborLink[]
-    > = _getClusteredNeighborLinksMap(
-      neighborLinks,
-      this.props.routePathLayerStore!.neighborToAddType
-    )
+    const clusteredNeighborLinksMap: Map<LatLngBounds, INeighborLink[]> =
+      _getClusteredNeighborLinksMap(
+        neighborLinks,
+        this.props.routePathLayerStore!.neighborToAddType
+      )
 
     const clusteredNeighborLinkMapEntries = Array.from(clusteredNeighborLinksMap.entries())
 

src/components/map/tools/CopyRoutePathSegmentTool.ts

@@ -175,11 +175,12 @@ class CopyRoutePathSegmentTool implements BaseTool {
     RoutePathCopySegmentStore.setIsLoading(true)
 
     const transitType = RoutePathStore.routePath!.transitType!
-    const routesUsingRoutePathSegment: IRouteUsingRoutePathSegment[] = await RoutePathService.fetchRoutesUsingLinkSegment(
-      startSegmentPoint.nodeId,
-      endSegmentPoint.nodeId,
-      transitType
-    )
+    const routesUsingRoutePathSegment: IRouteUsingRoutePathSegment[] =
+      await RoutePathService.fetchRoutesUsingLinkSegment(
+        startSegmentPoint.nodeId,
+        endSegmentPoint.nodeId,
+        transitType
+      )
     const routesToCopyFrom: IRoutesToCopyFrom[] = []
     routesUsingRoutePathSegment.forEach((r: IRouteUsingRoutePathSegment) => {
       routesToCopyFrom.push({

src/components/sidebar/Sidebar.tsx

@@ -68,22 +68,22 @@ class Sidebar extends React.Component<ISidebarProps, ILinelistState> {
     ]
   }
 
-  private renderComponent = ({ view, isNew }: { view: view; isNew: boolean }) => (
-    props: any
-  ) => {
-    switch (view) {
-      case 'line':
-        return <LineView {...props} isNewLine={isNew} />
-      case 'node':
-        return <NodeView {...props} isNewNode={isNew} />
-      case 'stopArea':
-        return <StopAreaView {...props} isNewStopArea={isNew} />
-      case 'link':
-        return <LinkView {...props} isNewLink={isNew} />
-      case 'routePath':
-        return <RoutePathView {...props} isNewRoutePath={isNew} />
+  private renderComponent =
+    ({ view, isNew }: { view: view; isNew: boolean }) =>
+    (props: any) => {
+      switch (view) {
+        case 'line':
+          return <LineView {...props} isNewLine={isNew} />
+        case 'node':
+          return <NodeView {...props} isNewNode={isNew} />
+        case 'stopArea':
+          return <StopAreaView {...props} isNewStopArea={isNew} />
+        case 'link':
+          return <LinkView {...props} isNewLink={isNew} />
+        case 'routePath':
+          return <RoutePathView {...props} isNewRoutePath={isNew} />
+      }
     }
-  }
 
   render() {
     const isMapFullscreen = this.props.mapStore!.isMapFullscreen

src/components/sidebar/SidebarHeader.tsx

@@ -84,13 +84,8 @@ class SidebarHeader extends React.Component<ISidebarHeaderProps> {
   }
 
   render() {
-    const {
-      children,
-      className,
-      isEditing,
-      isBackButtonVisible,
-      isCloseButtonVisible,
-    } = this.props
+    const { children, className, isEditing, isBackButtonVisible, isCloseButtonVisible } =
+      this.props
     return (
       <div
         className={classnames(s.sidebarHeaderView, className ? className : undefined)}

src/components/sidebar/linkView/LinkView.tsx

@@ -126,11 +126,12 @@ class LinkView extends React.Component<ILinkViewProps, ILinkViewState> {
       const bounds = L.latLngBounds(link.geometry)
       this.props.mapStore!.setMapBounds(bounds)
 
-      const routePaths: IRoutePathWithDisabledInfo[] = await RoutePathService.fetchRoutePathsUsingLink(
-        link.startNode.id,
-        link.endNode.id,
-        link.transitType!
-      )
+      const routePaths: IRoutePathWithDisabledInfo[] =
+        await RoutePathService.fetchRoutePathsUsingLink(
+          link.startNode.id,
+          link.endNode.id,
+          link.transitType!
+        )
       this._setState({ routePathsUsingLink: routePaths })
     }
     this._setState({ isLoading: false })

src/components/sidebar/nodeView/NodeView.tsx

@@ -231,9 +231,8 @@ class NodeView extends React.Component<INodeViewProps, INodeViewState> {
 
   private fetchRoutePathsUsingNode = async (nodeId: string) => {
     this._setState({ isRoutePathsUsingNodeQueryLoading: true })
-    const routePaths: IRoutePathWithDisabledInfo[] = await RoutePathService.fetchRoutePathsUsingNode(
-      nodeId
-    )
+    const routePaths: IRoutePathWithDisabledInfo[] =
+      await RoutePathService.fetchRoutePathsUsingNode(nodeId)
     this._setState({
       isRoutePathsUsingNodeQueryLoading: false,
       routePathsUsingNode: routePaths,

src/components/sidebar/nodeView/ShortIdInput.tsx

@@ -61,9 +61,8 @@ class ShortIdInput extends React.Component<IStopFormProps, IStopFormState> {
     )
     if (this.mounted) {
       this.setState({
-        availableShortIdDropdownItems: this.createAvailableShortIdDropdownItems(
-          availableShortIds
-        ),
+        availableShortIdDropdownItems:
+          this.createAvailableShortIdDropdownItems(availableShortIds),
       })
     }
   }