Fix rollback (#217)

Completes remaining rollback items that were missed in previous PR. Tested in FF and Chrome. Merging to expedite creation of new release tag.

* Add MLab data to <InfoPanel /> table view

* exclude src/vectortiles from being checked by eslint

* removed residual gmaps stuff

* update package-lock.json after npm install

* remove attempt at quickly adding server location display

* rolled back changes in lat/lon submissions to previous version in https://github.com/m-lab/piecewise/blob/37822ab3c5de19c26fd046dd81dd7ec3cd411df0/src/frontend/components/Survey.jsx

* rolled back changes in lat/lon submissions to previous version in 37822ab

Co-authored-by: Jeremia Kimelman <jbkimelman@gmail.com>

Author: critzo

docs

@@ -171,7 +171,7 @@
     "html-loader": "^0.5.5",
     "html-webpack-harddisk-plugin": "^1.0.1",
     "html-webpack-plugin": "^3.2.0",
-    "husky": "^2.3.0",
+    "husky": "^6.0.0",
     "jest": "^25.3.0",
     "jest-each": "^26.1.0",
     "jsdoc": "^3.6.4",

package-lock.json

@@ -9,7 +9,6 @@ import 'react-form-builder2/dist/app.css';
 import Error from './Error.jsx';
 
 const Front = lazy(() => import('./Front.jsx'));
-const GoogleMaps = lazy(() => import('./GoogleMaps.jsx'));
 const Loading = lazy(() => import('./Loading.jsx'));
 const Login = lazy(() => import('./Login.jsx'));
 const Dashboard = lazy(() => import('./Dashboard.jsx'));
@@ -84,10 +83,6 @@ export default function App() {
             />
             <Route path="/thankyou" render={props => <ThankYou {...props} />} />
             <Route path="/survey" render={props => <Survey {...props} />} />
-            <Route
-              path="/geocoder"
-              render={props => <GoogleMaps {...props} />}
-            />
           </LazyBoundary>
           <Redirect to="/" />
         </Switch>

package.json

@@ -82,7 +82,7 @@ export default function Basic() {
   };
 
   // handle geolocation consent
-  const [locationConsent, setLocationConsent] = useState(false);
+  const [locationConsent, setLocationConsent] = useState(true);
   // site settings
   const [settings, setSettings] = useState({});
 
@@ -145,7 +145,7 @@ export default function Basic() {
   const handleSubmit = event => {
     event.preventDefault();
     history.push({
-      pathname: '/geocoder',
+      pathname: '/survey',
       state: { settings: settings, locationConsent: locationConsent },
     });
   };
@@ -195,6 +195,26 @@ export default function Basic() {
           </Col>
         </Row>
         <Form onSubmit={handleSubmit}>
+          <fieldset>
+            <Form.Group>
+              <Form.Label>Do you want to use your browser location?</Form.Label>
+              <Form.Check
+                type="radio"
+                name="location"
+                id="location-yes"
+                label="Use my browser location"
+                onChange={() => setLocationConsent(true)}
+                defaultChecked
+              />
+              <Form.Check
+                type="radio"
+                name="location"
+                id="location-no"
+                label="Do not use my location"
+                onChange={() => setLocationConsent(false)}
+              />
+            </Form.Group>
+          </fieldset>
           <Form.Group {...location}>
             <Form.Check.Input required type="checkbox" id="consent" />
             <Form.Check.Label>

src/frontend/components/App.jsx

@@ -15,8 +15,6 @@ import NdtWidget from './utils/NdtWidget.jsx';
 export default function Survey(props) {
   const settings = props.location.state.settings;
   const locationConsent = props.location.state.locationConsent;
-  const latitude = props.location.state.latitude;
-  const longitude = props.location.state.longitude;
   const [form, setForm] = React.useState(null);
   const [formId, setFormId] = React.useState();
   const [location, setLocation] = React.useState({});
@@ -53,8 +51,8 @@ export default function Survey(props) {
           c2sRate: results.c2sRate,
           s2cRate: results.s2cRate,
           MinRTT: results.MinRTT,
-          latitude: latitude,
-          longitude: longitude,
+          latitude: location.latitude,
+          longitude: location.longitude,
           fields: formData,
         },
       }),
@@ -194,8 +192,6 @@ Survey.propTypes = {
     state: PropTypes.shape({
       settings: PropTypes.object.isRequired,
       locationConsent: PropTypes.bool.isRequired,
-      latitude: PropTypes.string.isRequired,
-      longitude: PropTypes.string.isRequired,
     }),
   }),
 };

src/frontend/components/Front.jsx

@@ -219,7 +219,7 @@ export default function NdtWidget(props) {
       </Row>
       <Row>
         <Col>{text}</Col>
-      </Row>
+      </Row>    
     </Container>
   );
 }

src/frontend/components/GoogleMaps.jsx

@@ -22,7 +22,6 @@
       crossorigin="anonymous"
     />
     <script src="https://api.mapbox.com/mapbox-gl-js/v1.10.1/mapbox-gl.js"></script>
-    <script src="https://maps.googleapis.com/maps/api/js?key=%PIECEWISE_GOOGLE_KEY%&libraries=places"></script>
     <style id="server-side-styles"></style>
   </head>
   <body>