Street links modifications (#1091)

* Allows for a more natural usage of rendering map children * Add add-street-link modification * add street link modifications * Fix tests * Remove modification containers * Load opportunity data on page load * Fix modify streets polygon saving * Fix multiple polylines and polygons * Ensure all new parameters are saved * Ensure the FeatureGroup exists before using it's leaflet elements * Update snapshots, fix tests * Update more tests and snapshots * Fix modification deletion * Fix jest tests * Update yarn.lock * Update yarn.lock again * Fix add trip pattern * WebVitals Tracking (#1093) * Track UI performance * Add WebVitals tracking to App * Add Bike LTS selector, refactor advanced settings (#1094)
vlc · Jun 6, 2020 · 4c52d94 · 4c52d94
1 parent 1777dd8
commit 4c52d94
Show file tree

Hide file tree

Showing 106 changed files with 9,185 additions and 4,251 deletions.
diff --git a/__mocks__/@fortawesome/free-solid-svg-icons.js b/__mocks__/@fortawesome/free-solid-svg-icons.js
@@ -1,4 +1,4 @@
-const I = require.requireActual('@fortawesome/free-solid-svg-icons')
+const I = jest.requireActual('@fortawesome/free-solid-svg-icons')
 
 /**
  * Return just the name and not the entire SVG object. Throw an error if the

diff --git a/__mocks__/leaflet.js b/__mocks__/leaflet.js
@@ -2,29 +2,29 @@
 
 import assign from 'lodash/assign'
 
-const L = require.requireActual('leaflet')
+const L = jest.requireActual('leaflet')
 const LeafletMock = jest.genMockFromModule('leaflet')
 
 class ControlMock extends LeafletMock.Control {
-  constructor (options) {
+  constructor(options) {
     super()
     this.options = {...L.Control.prototype.options, ...options}
   }
 
-  getPosition () {
+  getPosition() {
     return this.options.position
   }
 
-  setPosition (position) {
+  setPosition(position) {
     this.options.position = position
     return this
   }
 }
 
-const controlMock = options => new ControlMock(options)
+const controlMock = (options) => new ControlMock(options)
 
 class LayersControlMock extends ControlMock {
-  constructor (baseLayers = [], overlays = [], options) {
+  constructor(baseLayers = [], overlays = [], options) {
     super(options)
     this._layers = []
 
@@ -36,21 +36,21 @@ class LayersControlMock extends ControlMock {
     })
   }
 
-  _addLayer (layer, name, overlay) {
+  _addLayer(layer, name, overlay) {
     this._layers.push({layer, name, overlay})
   }
 
-  addBaseLayer (layer, name) {
+  addBaseLayer(layer, name) {
     this._addLayer(layer, name)
     return this
   }
 
-  addOverlay (layer, name) {
+  addOverlay(layer, name) {
     this._addLayer(layer, name, true)
     return this
   }
 
-  removeLayer (obj) {
+  removeLayer(obj) {
     this._layers.splice(this._layers.indexOf(obj), 1)
   }
 }
@@ -61,7 +61,7 @@ controlMock.layers = (baseLayers, overlays, options) => {
 }
 
 class MapMock extends LeafletMock.Map {
-  constructor (id, options = {}) {
+  constructor(id, options = {}) {
     super()
     assign(this, L.Mixin.Events)
 
@@ -81,85 +81,85 @@ class MapMock extends LeafletMock.Map {
     }
   }
 
-  _limitZoom (zoom) {
+  _limitZoom(zoom) {
     const min = this.getMinZoom()
     const max = this.getMaxZoom()
     return Math.max(min, Math.min(max, zoom))
   }
 
-  _resetView (center, zoom) {
+  _resetView(center, zoom) {
     this._initialCenter = center
     this._zoom = zoom
   }
 
-  fitBounds (bounds, options) {
+  fitBounds(bounds, options) {
     this._bounds = bounds
     this._boundsOptions = options
   }
 
-  getBounds () {
+  getBounds() {
     return this._bounds
   }
 
-  getCenter () {
+  getCenter() {
     return this._initialCenter
   }
 
-  getMaxZoom () {
+  getMaxZoom() {
     return this.options.maxZoom === undefined ? Infinity : this.options.maxZoom
   }
 
-  getMinZoom () {
+  getMinZoom() {
     return this.options.minZoom === undefined ? 0 : this.options.minZoom
   }
 
-  getZoom () {
+  getZoom() {
     return this._zoom
   }
 
-  setMaxBounds (bounds) {
+  setMaxBounds(bounds) {
     bounds = L.latLngBounds(bounds)
     this.options.maxBounds = bounds
     return this
   }
 
-  setView (center, zoom) {
+  setView(center, zoom) {
     zoom = zoom === undefined ? this.getZoom() : zoom
     this._resetView(L.latLng(center), this._limitZoom(zoom))
     return this
   }
 
-  setZoom (zoom) {
+  setZoom(zoom) {
     return this.setView(this.getCenter(), zoom)
   }
 
-  project (point, zoom = 9) {
+  project(point, zoom = 9) {
     return L.Map.prototype.project(point, zoom)
   }
 
-  unproject (point, zoom = 9) {
+  unproject(point, zoom = 9) {
     return L.Map.prototype.unproject(point, zoom)
   }
 }
 
 class PopupMock extends LeafletMock.Popup {
-  constructor (options, source) {
+  constructor(options, source) {
     super()
     assign(this, L.Mixin.Events)
 
     this.options = {...L.Popup.prototype.options, ...options}
     this._source = source
   }
 
-  getContent () {
+  getContent() {
     return this._content
   }
 
-  setContent (content) {
+  setContent(content) {
     this._content = content
   }
 
-  bindPopup () {}
+  bindPopup() {}
 }
 
 module.exports = {
@@ -170,10 +170,10 @@ module.exports = {
   latLng: L.latLng,
   LatLngBounds: L.LatLngBounds,
   latLngBounds: L.latLngBounds,
-  geoJson (data, props) {
+  geoJson(data, props) {
     return {
       data,
-      getLayers () {
+      getLayers() {
         return []
       },
       props

diff --git a/__mocks__/next/dynamic.js b/__mocks__/next/dynamic.js
@@ -0,0 +1,5 @@
+module.exports = function dynamic() {
+  return function DynamicMockedComponent() {
+    return null
+  }
+}
diff --git a/__mocks__/uuid.js b/__mocks__/uuid.js
@@ -1,4 +1,4 @@
-const uuid = require.requireActual('uuid')
+const uuid = jest.requireActual('uuid')
 
 module.exports = {
   ...uuid,

diff --git a/jest.config.js b/jest.config.js
@@ -8,10 +8,10 @@ module.exports = {
   },
   // Add the current working directory to the path to allow absolute imports from /lib
   modulePaths: ['.'],
-  notify: true,
-  setupFiles: ['./lib/utils/enzyme'],
+  notify: false,
+  setupFiles: ['./jest/enzyme', './jest/fetch'],
   snapshotSerializers: [
-    './lib/utils/geojson-snapshot-serializer',
+    './jest/geojson-snapshot-serializer',
     'enzyme-to-json/serializer'
   ],
   testPathIgnorePatterns: ['<rootDir>/.next/', '<rootDir>/node_modules/']

diff --git a/lib/utils/enzyme.js → jest/enzyme.js b/lib/utils/enzyme.js → jest/enzyme.js
diff --git a/jest/fetch.js b/jest/fetch.js
@@ -0,0 +1 @@
+require('whatwg-fetch')
diff --git a/lib/utils/geojson-snapshot-serializer.js → jest/geojson-snapshot-serializer.js b/lib/utils/geojson-snapshot-serializer.js → jest/geojson-snapshot-serializer.js
diff --git a/jsconfig.json b/jsconfig.json
@@ -0,0 +1,5 @@
+{
+  "compilerOptions": {
+    "baseUrl": "."
+  }
+}
diff --git a/lib/actions/analysis/__tests__/index.js b/lib/actions/analysis/__tests__/index.js
@@ -19,7 +19,7 @@ describe('actions > analysis', () => {
     await store.dispatch(analysis.fetchTravelTimeSurface())
 
     const actions = store.getActions()
-    expect(actions).toHaveLength(10)
+    expect(actions).toHaveLength(5)
     expect(actions[0].type).toBe('set isochrone fetch status')
     expect(actions[1].type).toBe('set profile request')
   })

diff --git a/lib/actions/fetch.js b/lib/actions/fetch.js
@@ -1,6 +1,5 @@
 import isObject from 'lodash/isObject'
 
-import fetch from 'lib/utils/fetch'
 import {timer} from 'lib/utils/metric'
 
 import {getUser} from '../user'
@@ -316,9 +315,7 @@ function createResponse(res) {
 }
 
 async function deserialize(res) {
-  const header = `${res.headers.get('Content-Type')} ${res.headers.get(
-    'Content'
-  )}`
+  const header = res.headers.get('Content-Type') || res.headers.get('Content')
   if (header.indexOf('json') > -1) return res.json()
   if (header.indexOf('octet-stream') > -1) return res.arrayBuffer()
   if (header.indexOf('text') > -1) return res.text()

diff --git a/lib/actions/get-feeds-routes-and-stops.js b/lib/actions/get-feeds-routes-and-stops.js
@@ -9,8 +9,8 @@ import {
   REMOVE_STOPS,
   REMOVE_TRIPS,
   REROUTE
-} from 'lib/constants'
-import * as query from 'lib/graphql/query'
+} from '../constants'
+import * as query from '../graphql/query'
 
 import {setFeeds} from './'
 import fetch from './fetch'

diff --git a/lib/components/__tests__/__snapshots__/create-region.js.snap b/lib/components/__tests__/__snapshots__/create-region.js.snap
@@ -13,7 +13,7 @@ exports[`create-region.render 1`] = `
         }
       }
     >
-      <Stack
+      <ForwardRef
         as="form"
         p={4}
         spacing={4}
@@ -383,7 +383,7 @@ exports[`create-region.render 1`] = `
                 mb={4}
                 onChange={[Function]}
               >
-                <Stack
+                <ForwardRef
                   mb={4}
                   spacing={4}
                 >
@@ -1235,7 +1235,7 @@ exports[`create-region.render 1`] = `
                       </div>
                     </Box>
                   </Flex>
-                </Stack>
+                </ForwardRef>
               </EditBoundsForm>
               <Button
                 block={true}
@@ -1360,7 +1360,7 @@ exports[`create-region.render 1`] = `
             </form>
           </Box>
         </Flex>
-      </Stack>
+      </ForwardRef>
     </div>
   </InnerDock>
 </CreateRegion>

diff --git a/lib/components/__tests__/__snapshots__/edit-bundle.js.snap b/lib/components/__tests__/__snapshots__/edit-bundle.js.snap
@@ -4,7 +4,7 @@ exports[`Component EditBundle snapshot(mount) 1`] = `
 <EditBundle
   bundleProjects={Array []}
 >
-  <Stack
+  <ForwardRef
     spacing={8}
   >
     <Flex
@@ -80,7 +80,7 @@ exports[`Component EditBundle snapshot(mount) 1`] = `
                         ]
                       }
                     >
-                      <ForwardRef(LoadableComponent)
+                      <DynamicMockedComponent
                         getOptionLabel={[Function]}
                         getOptionValue={[Function]}
                         onChange={[Function]}
@@ -113,15 +113,7 @@ exports[`Component EditBundle snapshot(mount) 1`] = `
                             "option": [Function],
                           }
                         }
-                      >
-                        <loading
-                          error={null}
-                          isLoading={true}
-                          pastDelay={false}
-                          retry={[Function]}
-                          timedOut={false}
-                        />
-                      </ForwardRef(LoadableComponent)>
+                      />
                     </S>
                   </div>
                 </Box>
@@ -131,6 +123,6 @@ exports[`Component EditBundle snapshot(mount) 1`] = `
         </div>
       </Box>
     </Flex>
-  </Stack>
+  </ForwardRef>
 </EditBundle>
 `;
diff --git a/lib/components/__tests__/__snapshots__/edit-region.js.snap b/lib/components/__tests__/__snapshots__/edit-region.js.snap
@@ -62,6 +62,7 @@ exports[`Component > EditRegion 1`] = `
     }
     router={
       Router {
+        "_bps": undefined,
         "_getServerData": [Function],
         "_getStaticData": [Function],
         "_wrapApp": undefined,
@@ -107,7 +108,7 @@ exports[`Component > EditRegion 1`] = `
           }
         }
       >
-        <Stack
+        <ForwardRef
           p={4}
           spacing={4}
         >
@@ -408,7 +409,7 @@ exports[`Component > EditRegion 1`] = `
                   mb={4}
                   onChange={[Function]}
                 >
-                  <Stack
+                  <ForwardRef
                     mb={4}
                     spacing={4}
                   >
@@ -1260,7 +1261,7 @@ exports[`Component > EditRegion 1`] = `
                         </div>
                       </Box>
                     </Flex>
-                  </Stack>
+                  </ForwardRef>
                 </EditBoundsForm>
                 <Button
                   block={true}
@@ -1483,7 +1484,7 @@ exports[`Component > EditRegion 1`] = `
               </div>
             </Box>
           </Flex>
-        </Stack>
+        </ForwardRef>
       </div>
     </InnerDock>
   </EditRegion>