Cleanup templates & pin deck.gl 8.4.10 (#212)

* Pin deck.gl version to 8.4.10 * Remove duplicated redux action in Store * Remove small features from skeleton template & cleanup * Remove code for geocoderWidget, isoline and Login button in the header
CartoDB · Mar 11, 2021 · 33e29b1 · 33e29b1 · vercel · Mar 11, 2021
1 parent 98bb5f6
commit 33e29b1
Show file tree

Hide file tree

Showing 13 changed files with 8 additions and 79 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,7 @@
 - Adapt to new **multi-package** structure for carto-react libs [#206](https://github.com/CartoDB/carto-react-lib/pull/206)
 - Fix layer generator with second layer [#204](https://github.com/CartoDB/carto-react-template/pull/204)
 - Fix bug in formatter applied to histogram [#211](https://github.com/CartoDB/carto-react-template/pull/211)
+- Cleanup templates & pin deck.gl 8.4.10 [#212](https://github.com/CartoDB/carto-react-template/pull/212)
 
 ## 1.0.0-beta12 (2021-02-08)
 - Refactor on basic JSX & JS stuff [#170](https://github.com/CartoDB/carto-react-template/pull/170)

diff --git a/template-sample-app/template.json b/template-sample-app/template.json
@@ -23,7 +23,7 @@
       "@turf/bbox-polygon": "^6.3.0",
       "@turf/boolean-intersects": "^6.3.0",
       "cypress": "^6.3.0",
-      "deck.gl": "^8.4.9",
+      "deck.gl": "8.4.10",
       "echarts": "^4.9.0",
       "echarts-for-react": "^2.0.16",
       "eslint-config-prettier": "^7.2.0",

diff --git a/template-sample-app/template/package.dev.json b/template-sample-app/template/package.dev.json
@@ -25,7 +25,7 @@
     "@turf/bbox-polygon": "^6.3.0",
     "@turf/boolean-intersects": "^6.3.0",
     "cypress": "^6.3.0",
-    "deck.gl": "^8.4.9",
+    "deck.gl": "8.4.10",
     "echarts": "^4.9.0",
     "echarts-for-react": "^2.0.16",
     "history": "^5.0.0",

diff --git a/template-sample-app/template/src/components/views/stores/Stores.js b/template-sample-app/template/src/components/views/stores/Stores.js
@@ -27,14 +27,6 @@ function Stores() {
 
   useEffect(() => {
     dispatch(addSource(storesSource));
-
-    dispatch(
-      addLayer({
-        id: STORES_LAYER_ID,
-        source: storesSource.id,
-      })
-    );
-
     dispatch(addLayer({ id: STORES_LAYER_ID, source: storesSource.id }));
 
     return () => {

diff --git a/template-skeleton/template.json b/template-skeleton/template.json
@@ -23,7 +23,7 @@
       "@turf/bbox-polygon": "^6.3.0",
       "@turf/boolean-intersects": "^6.3.0",
       "cypress": "^6.3.0",
-      "deck.gl": "^8.4.9",
+      "deck.gl": "8.4.10",
       "echarts": "^4.9.0",
       "echarts-for-react": "^2.0.16",
       "eslint-config-prettier": "^7.2.0",

diff --git a/template-skeleton/template/cypress/integration/home_page_spec.js b/template-skeleton/template/cypress/integration/home_page_spec.js
@@ -11,7 +11,6 @@ describe('Home Page', () => {
     cy.visit(HOME_PAGE);
 
     cy.findByRole('tab', { name: /Home/i }).should('exist');
-    cy.findByRole('button', { name: /Login/i }).should('exist');
   });
 
   it('main elements are visible', () => {
@@ -23,8 +22,5 @@ describe('Home Page', () => {
     // Zoom controls
     cy.findByRole('button', { name: /Increase zoom/i }).should('exist');
     cy.findByRole('button', { name: /Decrease zoom/i }).should('exist');
-
-    // Geocoder
-    cy.findByPlaceholderText('Search address').should('exist');
   });
 });
diff --git a/template-skeleton/template/package.dev.json b/template-skeleton/template/package.dev.json
@@ -25,7 +25,7 @@
     "@turf/bbox-polygon": "^6.3.0",
     "@turf/boolean-intersects": "^6.3.0",
     "cypress": "^6.3.0",
-    "deck.gl": "^8.4.9",
+    "deck.gl": "8.4.10",
     "echarts": "^4.9.0",
     "echarts-for-react": "^2.0.16",
     "history": "^5.0.0",

diff --git a/template-skeleton/template/src/components/layers/GeocoderLayer.js b/template-skeleton/template/src/components/layers/GeocoderLayer.js
diff --git a/template-skeleton/template/src/components/layers/index.js b/template-skeleton/template/src/components/layers/index.js
@@ -1,9 +1,7 @@
-import GeocoderLayer from './GeocoderLayer';
 // [hygen] Import layers
 
 export const getLayers = () => {
   return [
-    GeocoderLayer(),
     // [hygen] Add layer
   ];
 };
diff --git a/template-skeleton/template/src/components/views/Main.js b/template-skeleton/template/src/components/views/Main.js
@@ -16,7 +16,6 @@ import {
 import { makeStyles } from '@material-ui/core/styles';
 import { Alert } from '@material-ui/lab';
 import ExpandLessIcon from '@material-ui/icons/ExpandLess';
-import { GeocoderWidget } from '@carto/react-widgets';
 import { BASEMAPS } from '@carto/react-basemaps';
 import Map from 'components/common/Map';
 import ZoomControl from 'components/common/ZoomControl';
@@ -110,18 +109,6 @@ const useStyles = makeStyles((theme) => ({
       },
     },
   },
-  geocoder: {
-    position: 'absolute',
-    top: theme.spacing(4),
-    left: theme.spacing(4),
-    zIndex: 1,
-
-    [theme.breakpoints.down('xs')]: {
-      top: theme.spacing(2),
-      left: theme.spacing(2),
-      width: `calc(100% - ${theme.spacing(4)}px)`,
-    },
-  },
   zoomControl: {
     position: 'absolute',
     bottom: theme.spacing(4),
@@ -176,10 +163,6 @@ function Main() {
     dispatch(setBottomSheetOpen(!bottomSheetOpen));
   };
 
-  const onGeocoderWidgetError = (error) => {
-    dispatch(setError(`Geocoding error: ${error.message}`));
-  };
-
   return (
     <Grid container direction='row' alignItems='stretch' item xs>
       <nav className={classes.drawer}>
@@ -235,7 +218,6 @@ function Main() {
 
       <Grid item className={`${classes.mapWrapper} ${isGmaps ? classes.gmaps : ''}`}>
         <Map layers={getLayers()} />
-        <GeocoderWidget className={classes.geocoder} onError={onGeocoderWidgetError} />
         <Hidden xsDown>
           <ZoomControl className={classes.zoomControl} />
         </Hidden>

diff --git a/template-skeleton/template/src/components/views/login/UserMenu.js b/template-skeleton/template/src/components/views/login/UserMenu.js
@@ -11,7 +11,6 @@ import {
   Typography,
 } from '@material-ui/core';
 import { logout } from '@carto/react-redux';
-import UserMenuLogin from './UserMenuLogin';
 
 const useStyles = makeStyles((theme) => ({
   avatar: {
@@ -34,12 +33,12 @@ function UserMenu() {
     return null;
   }
 
-  // User is NOT logged in, so display Login with CARTO
+  // User is NOT logged in, so display nothing
   if (!user) {
-    return <UserMenuLogin />;
+    return null;
   }
 
-  // At this point, there is an oauthApp and the user has logged in.
+  // At this point, there is an oauthApp and the user has logged in (forceOAuthLogin mode).
   const open = Boolean(anchorEl);
 
   const handleMenu = (event) => {

diff --git a/template-skeleton/template/src/store/appSlice.js b/template-skeleton/template/src/store/appSlice.js
@@ -4,14 +4,10 @@ const slice = createSlice({
   name: 'app',
   initialState: {
     error: null,
-    isolineResult: null,
     bottomSheetOpen: false,
     forceOAuthLogin: false, // enable for an initial Login screen
   },
   reducers: {
-    setIsolineResult: (state, action) => {
-      state.isolineResult = action.payload;
-    },
     setError: (state, action) => {
       state.error = action.payload;
     },
@@ -23,7 +19,6 @@ const slice = createSlice({
 
 export default slice.reducer;
 
-export const setIsolineResult = (payload) => ({ type: 'app/setIsolineResult', payload });
 export const setError = (payload) => ({ type: 'app/setError', payload });
 export const setBottomSheetOpen = (payload) => ({
   type: 'app/setBottomSheetOpen',

diff --git a/template-skeleton/template/src/store/initialStateSlice.js b/template-skeleton/template/src/store/initialStateSlice.js
@@ -23,8 +23,6 @@ export const oauthInitialState = {
     clientId: 'TYPE HERE YOUR OAUTH CLIENT ID',
     scopes: [
       'user:profile', // to load avatar photo
-      'dataservices:geocoding', // to use geocoding through Data Services API
-      'dataservices:isolines', // to launch isochrones or isodistances through Data Services API
     ],
     authorizeEndPoint: 'https://carto.com/oauth2/authorize', // only valid if keeping https://localhost:3000/oauthCallback
   },