feat: turn off spaces nearby and geolocation setting

Author: pyphilia

public/app/listeners/getGeolocationEnabled.js

@@ -1,3 +1,7 @@
+/**
+ * @deprecated
+ */
+
 const { DEFAULT_GEOLOCATION_ENABLED } = require('../config/config');
 const { GET_GEOLOCATION_ENABLED_CHANNEL } = require('../config/channels');
 const { ERROR_GENERAL } = require('../config/errors');

public/app/listeners/index.js

@@ -9,8 +9,6 @@ const getSpaces = require('./getSpaces');
 const { deleteSpace, deleteSpaceAndResources } = require('./deleteSpace');
 const syncSpace = require('./syncSpace');
 const exportSpace = require('./exportSpace');
-const getGeolocationEnabled = require('./getGeolocationEnabled');
-const setGeolocationEnabled = require('./setGeolocationEnabled');
 const showLoadSpacePrompt = require('./showLoadSpacePrompt');
 const showExportSpacePrompt = require('./showExportSpacePrompt');
 const showDeleteSpacePrompt = require('./showDeleteSpacePrompt');
@@ -71,8 +69,6 @@ module.exports = {
   deleteSpace,
   deleteSpaceAndResources,
   exportSpace,
-  getGeolocationEnabled,
-  setGeolocationEnabled,
   showLoadSpacePrompt,
   showExportSpacePrompt,
   showDeleteSpacePrompt,

public/app/listeners/setGeolocationEnabled.js

@@ -1,3 +1,7 @@
+/**
+ * @deprecated
+ */
+
 const { SET_GEOLOCATION_ENABLED_CHANNEL } = require('../config/channels');
 const { ERROR_GENERAL } = require('../config/errors');
 const logger = require('../logger');

public/electron.js

@@ -48,8 +48,6 @@ const {
   SET_DEVELOPER_MODE_CHANNEL,
   GET_SYNC_MODE_CHANNEL,
   SET_SYNC_MODE_CHANNEL,
-  GET_GEOLOCATION_ENABLED_CHANNEL,
-  SET_GEOLOCATION_ENABLED_CHANNEL,
   GET_DATABASE_CHANNEL,
   SET_DATABASE_CHANNEL,
   SYNC_SPACE_CHANNEL,
@@ -100,8 +98,6 @@ const {
   showLoadSpacePrompt,
   showExportSpacePrompt,
   showDeleteSpacePrompt,
-  getGeolocationEnabled,
-  setGeolocationEnabled,
   getUserFolder,
   setLanguage,
   getLanguage,
@@ -473,18 +469,6 @@ app.on('ready', async () => {
   // called when setting space as recent
   ipcMain.on(SET_SPACE_AS_RECENT_CHANNEL, setSpaceAsRecent(mainWindow, db));
 
-  // called when getting geolocation enabled
-  ipcMain.on(
-    GET_GEOLOCATION_ENABLED_CHANNEL,
-    getGeolocationEnabled(mainWindow, db)
-  );
-
-  // called when setting geolocation enabled
-  ipcMain.on(
-    SET_GEOLOCATION_ENABLED_CHANNEL,
-    setGeolocationEnabled(mainWindow, db)
-  );
-
   // called when setting action accessibility
   ipcMain.on(
     SET_ACTION_ACCESSIBILITY_CHANNEL,

src/App.js

@@ -47,11 +47,9 @@ import {
   buildImportDataInClassroomPath,
 } from './config/paths';
 import {
-  getGeolocation,
   getUserFolder,
   getLanguage,
   getDeveloperMode,
-  getGeolocationEnabled,
   isAuthenticated,
 } from './actions';
 import { DEFAULT_LANGUAGE, USER_MODES, PRODUCT_NAME } from './config/constants';
@@ -89,17 +87,14 @@ export class App extends Component {
   state = { height: 0, isDownloadingUpdate: false };
 
   static propTypes = {
-    dispatchGetGeolocation: PropTypes.func.isRequired,
     dispatchGetUserFolder: PropTypes.func.isRequired,
     dispatchGetLanguage: PropTypes.func.isRequired,
     dispatchGetDeveloperMode: PropTypes.func.isRequired,
-    dispatchGetGeolocationEnabled: PropTypes.func.isRequired,
     dispatchIsAuthenticated: PropTypes.func.isRequired,
     lang: PropTypes.string,
     i18n: PropTypes.shape({
       changeLanguage: PropTypes.func.isRequired,
     }).isRequired,
-    geolocationEnabled: PropTypes.bool.isRequired,
     classes: PropTypes.shape({
       toastrIcon: PropTypes.string.isRequired,
       fullScreen: PropTypes.string.isRequired,
@@ -119,7 +114,6 @@ export class App extends Component {
       dispatchGetUserFolder,
       dispatchGetLanguage,
       dispatchGetDeveloperMode,
-      dispatchGetGeolocationEnabled,
       dispatchIsAuthenticated,
       userMode,
     } = this.props;
@@ -128,7 +122,6 @@ export class App extends Component {
     dispatchGetLanguage();
     dispatchGetDeveloperMode();
     dispatchGetUserFolder();
-    dispatchGetGeolocationEnabled();
 
     if (userMode === USER_MODES.TEACHER) {
       this.checkAppUpgrade();
@@ -142,27 +135,14 @@ export class App extends Component {
 
   componentDidUpdate({
     lang: prevLang,
-    geolocationEnabled: prevGeolocationEnabled,
-    dispatchGetGeolocation,
     connexionStatus: prevConnexionStatus,
     userMode: prevUserMode,
   }) {
-    const {
-      lang,
-      i18n,
-      geolocationEnabled,
-      connexionStatus,
-      userMode,
-    } = this.props;
+    const { lang, i18n, connexionStatus, userMode } = this.props;
     if (lang !== prevLang) {
       i18n.changeLanguage(lang);
     }
 
-    // fetch geolocation only if enabled
-    if (geolocationEnabled && geolocationEnabled !== prevGeolocationEnabled) {
-      dispatchGetGeolocation();
-    }
-
     // display toastr when connexion status changes
     if (connexionStatus !== prevConnexionStatus) {
       this.triggerConnectionToastr();
@@ -353,20 +333,13 @@ export class App extends Component {
 
 const mapStateToProps = ({ authentication }) => ({
   lang: authentication.getIn(['user', 'settings', 'lang']),
-  geolocationEnabled: authentication.getIn([
-    'user',
-    'settings',
-    'geolocationEnabled',
-  ]),
   userMode: authentication.getIn(['user', 'settings', 'userMode']),
 });
 
 const mapDispatchToProps = {
-  dispatchGetGeolocation: getGeolocation,
   dispatchGetUserFolder: getUserFolder,
   dispatchGetLanguage: getLanguage,
   dispatchGetDeveloperMode: getDeveloperMode,
-  dispatchGetGeolocationEnabled: getGeolocationEnabled,
   dispatchIsAuthenticated: isAuthenticated,
 };
 

src/App.test.js

@@ -12,13 +12,10 @@ describe('<App />', () => {
       changeLanguage: jest.fn(),
     },
     t: jest.fn(),
-    dispatchGetGeolocation: jest.fn(),
     dispatchGetUserFolder: jest.fn(),
     dispatchGetLanguage: jest.fn(),
     dispatchGetDeveloperMode: jest.fn(),
-    dispatchGetGeolocationEnabled: jest.fn(),
     dispatchIsAuthenticated: jest.fn(),
-    geolocationEnabled: false,
     classes: {
       toastrIcon: '',
       fullScreen: '',

src/components/Settings.js

@@ -10,7 +10,6 @@ import Divider from '@material-ui/core/Divider';
 import Styles from '../Styles';
 import LanguageSelect from './common/LanguageSelect';
 import DeveloperSwitch from './common/DeveloperSwitch';
-import GeolocationControl from './common/GeolocationControl';
 import Main from './common/Main';
 import {
   SETTINGS_ACTIONS_CLASS,
@@ -100,7 +99,6 @@ export class Settings extends Component {
             <LanguageSelect />
             {authenticated && (
               <>
-                <GeolocationControl />
                 <SyncAdvancedSwitch />
                 <StudentModeSwitch />
                 {this.renderDeveloperModeSwitch()}

src/components/Settings.test.js

@@ -4,7 +4,6 @@ import Typography from '@material-ui/core/Typography';
 import { Settings } from './Settings';
 import LanguageSelect from './common/LanguageSelect';
 import DeveloperSwitch from './common/DeveloperSwitch';
-import GeolocationControl from './common/GeolocationControl';
 import FontSizeSlider from './common/FontSizeSlider';
 import { USER_MODES } from '../config/constants';
 
@@ -64,10 +63,6 @@ describe('<Settings />', () => {
     expect(wrapper.find(DeveloperSwitch)).toHaveLength(1);
   });
 
-  it('renders one <GeolocationControl /> component', () => {
-    expect(wrapper.find(GeolocationControl)).toHaveLength(1);
-  });
-
   it('renders one <FontSizeSlider /> component', () => {
     expect(wrapper.find(FontSizeSlider)).toHaveLength(1);
   });

src/components/SpacesNearby.js

@@ -1,3 +1,7 @@
+/**
+ * @deprecated
+ */
+
 import React, { Component } from 'react';
 import { connect } from 'react-redux';
 import PropTypes from 'prop-types';

src/components/__snapshots__/Settings.test.js.snap

@@ -16,7 +16,6 @@ exports[`<Settings /> renders correctly 1`] = `
     </WithStyles(ForwardRef(Typography))>
     <WithStyles(ForwardRef(FormGroup))>
       <withI18nextTranslation(WithStyles(Connect(LanguageSelect))) />
-      <withI18nextTranslation(WithStyles(Connect(GeolocationControl))) />
       <withI18nextTranslation(WithStyles(Connect(SyncAdvancedSwitch))) />
       <withI18nextTranslation(WithStyles(Connect(StudentModeSwitch))) />
       <withI18nextTranslation(WithStyles(Connect(DeveloperSwitch))) />

src/components/common/GeolocationControl.js

@@ -1,3 +1,7 @@
+/**
+ * @deprecated
+ */
+
 import React, { Component } from 'react';
 import FormControl from '@material-ui/core/FormControl';
 import { withStyles } from '@material-ui/core/styles';
@@ -12,7 +16,7 @@ import Loader from './Loader';
 import { CONTROL_TYPES, FORM_CONTROL_MIN_WIDTH } from '../../config/constants';
 import { GEOLOCATION_CONTROL_ID } from '../../config/selectors';
 
-const styles = theme => ({
+const styles = (theme) => ({
   formControl: {
     margin: theme.spacing(),
     minWidth: FORM_CONTROL_MIN_WIDTH,

src/components/common/GeolocationControl.test.js

@@ -1,3 +1,7 @@
+/**
+ * @deprecated
+ */
+
 import React from 'react';
 import { shallow } from 'enzyme';
 import Button from '@material-ui/core/Button';

src/components/common/MainMenu.js

@@ -7,7 +7,6 @@ import MenuItem from '@material-ui/core/MenuItem';
 import ListItemIcon from '@material-ui/core/ListItemIcon';
 import Tooltip from '@material-ui/core/Tooltip';
 import SaveIcon from '@material-ui/icons/Save';
-import SearchIcon from '@material-ui/icons/Search';
 import Language from '@material-ui/icons/Language';
 import CodeIcon from '@material-ui/icons/Code';
 import ListItemText from '@material-ui/core/ListItemText';
@@ -25,7 +24,6 @@ import {
   HOME_PATH,
   LOAD_SPACE_PATH,
   SETTINGS_PATH,
-  SPACES_NEARBY_PATH,
   VISIT_PATH,
   DEVELOPER_PATH,
   DASHBOARD_PATH,
@@ -38,7 +36,6 @@ import {
   LOAD_MENU_ITEM_ID,
   HOME_MENU_ITEM_ID,
   VISIT_MENU_ITEM_ID,
-  SPACES_NEARBY_MENU_ITEM_ID,
   DASHBOARD_MENU_ITEM_ID,
   DEVELOPER_MENU_ITEM_ID,
   SIGN_OUT_MENU_ITEM_ID,
@@ -264,19 +261,6 @@ export class MainMenu extends Component {
             </ListItemIcon>
             <ListItemText primary={t('Saved Spaces')} />
           </MenuItem>
-          {this.renderOfflineMenuItem(
-            <MenuItem
-              id={SPACES_NEARBY_MENU_ITEM_ID}
-              onClick={() => this.handleClick(SPACES_NEARBY_PATH)}
-              button
-              selected={path === SPACES_NEARBY_PATH}
-            >
-              <ListItemIcon>
-                <SearchIcon />
-              </ListItemIcon>
-              <ListItemText primary={t('Spaces Nearby')} />
-            </MenuItem>
-          )}
           {this.renderOfflineMenuItem(
             <MenuItem
               id={VISIT_MENU_ITEM_ID}

src/components/common/MainMenu.test.js

@@ -17,8 +17,8 @@ import {
 } from '../../config/paths';
 import { DEFAULT_USER_MODE } from '../../config/constants';
 
-const MENUITEM_OFFLINE_NUMBER = 2;
-const MENUITEM_OFFLINE_ONLINE_COUNT = 11;
+const MENUITEM_OFFLINE_NUMBER = 1;
+const MENUITEM_OFFLINE_ONLINE_COUNT = 9;
 
 const createMainMenuProps = (
   developerMode,
@@ -103,10 +103,10 @@ describe('<MainMenu />', () => {
     });
 
     it(`renders ${
-      MENUITEM_OFFLINE_ONLINE_COUNT + 1
+      MENUITEM_OFFLINE_ONLINE_COUNT + MENUITEM_OFFLINE_NUMBER
     } <MenuItem /> components`, () => {
       expect(wrapper.find(MenuItem)).toHaveLength(
-        MENUITEM_OFFLINE_ONLINE_COUNT + 1
+        MENUITEM_OFFLINE_ONLINE_COUNT + MENUITEM_OFFLINE_NUMBER
       );
     });
   });