From 9a64b4322adadbe18929c2da114eb0813426c4f9 Mon Sep 17 00:00:00 2001
From: Vijay Aravamudhan <vraravam@users.noreply.github.com>
Date: Wed, 20 Oct 2021 10:49:47 +0530
Subject: chore: use 'window['ferdi']' (split out from pr #2092) (#2104)

Co-authored-by: Markus Hatvan <markus_hatvan@aon.at>
---
 src/lib/Menu.js | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

(limited to 'src/lib/Menu.js')

diff --git a/src/lib/Menu.js b/src/lib/Menu.js
index b1cbaf992..1495fc80e 100644
--- a/src/lib/Menu.js
+++ b/src/lib/Menu.js
@@ -313,7 +313,7 @@ const menuItems = defineMessages({
 });
 
 function getActiveService() {
-  return window.ferdi.stores.services.active;
+  return window['ferdi'].stores.services.active;
 }
 
 const _titleBarTemplateFactory = (intl, locked) => [
@@ -375,7 +375,7 @@ const _titleBarTemplateFactory = (intl, locked) => [
         label: intl.formatMessage(menuItems.openQuickSwitch),
         accelerator: `${cmdOrCtrlShortcutKey()}+S`,
         click() {
-          window.ferdi.features.quickSwitch.state.isModalVisible = true;
+          window['ferdi'].features.quickSwitch.state.isModalVisible = true;
         },
       },
       {
@@ -391,7 +391,7 @@ const _titleBarTemplateFactory = (intl, locked) => [
             // Focus webview so find in page popup gets focused
             service.webview.focus();
 
-            window.ferdi.actions.service.sendIPCMessage({
+            window['ferdi'].actions.service.sendIPCMessage({
               serviceId: service.id,
               channel: 'find-in-page',
               args: {},
@@ -457,12 +457,12 @@ const _titleBarTemplateFactory = (intl, locked) => [
         label: intl.formatMessage(menuItems.toggleDarkMode),
         type: 'checkbox',
         accelerator: `${cmdOrCtrlShortcutKey()}+${shiftKey()}+D`,
-        checked: window.ferdi.stores.settings.app.darkMode,
+        checked: window['ferdi'].stores.settings.app.darkMode,
         click: () => {
-          window.ferdi.actions.settings.update({
+          window['ferdi'].actions.settings.update({
             type: 'app',
             data: {
-              darkMode: !window.ferdi.stores.settings.app.darkMode,
+              darkMode: !window['ferdi'].stores.settings.app.darkMode,
             },
           });
         },
@@ -579,13 +579,13 @@ class FranzMenu {
     // need to clone object so we don't modify computed (cached) object
     const serviceTpl = Object.assign([], this.serviceTpl());
 
-    // Don't initialize when window.ferdi is undefined
-    if (window.ferdi === undefined) {
+    // Don't initialize when window['ferdi'] is undefined
+    if (window['ferdi'] === undefined) {
       console.log('skipping menu init');
       return;
     }
 
-    const { intl } = window.ferdi;
+    const { intl } = window['ferdi'];
     const tpl = _titleBarTemplateFactory(intl, this.stores.settings.app.locked);
     const { actions } = this;
 
@@ -593,13 +593,13 @@ class FranzMenu {
       tpl[1].submenu.push({
         label: intl.formatMessage(menuItems.autohideMenuBar),
         type: 'checkbox',
-        checked: window.ferdi.stores.settings.app.autohideMenuBar,
+        checked: window['ferdi'].stores.settings.app.autohideMenuBar,
         click: () => {
-          window.ferdi.actions.settings.update({
+          window['ferdi'].actions.settings.update({
             type: 'app',
             data: {
               autohideMenuBar:
-                !window.ferdi.stores.settings.app.autohideMenuBar,
+                !window['ferdi'].stores.settings.app.autohideMenuBar,
             },
           });
         },
@@ -893,7 +893,7 @@ class FranzMenu {
   }
 
   serviceTpl() {
-    const { intl } = window.ferdi;
+    const { intl } = window['ferdi'];
     const { user, services, settings } = this.stores;
     if (!user.isLoggedIn) return [];
     const menu = [];
@@ -988,7 +988,7 @@ class FranzMenu {
   workspacesMenu() {
     const { workspaces, activeWorkspace, isWorkspaceDrawerOpen } =
       workspaceStore;
-    const { intl } = window.ferdi;
+    const { intl } = window['ferdi'];
     const menu = [];
 
     // Add new workspace item:
@@ -1050,7 +1050,7 @@ class FranzMenu {
 
   todosMenu() {
     const { isTodosPanelVisible, isFeatureEnabledByUser } = this.stores.todos;
-    const { intl } = window.ferdi;
+    const { intl } = window['ferdi'];
     const menu = [];
 
     const drawerLabel = isTodosPanelVisible
@@ -1084,7 +1084,7 @@ class FranzMenu {
   }
 
   debugMenu() {
-    const { intl } = window.ferdi;
+    const { intl } = window['ferdi'];
 
     return [
       {
@@ -1107,7 +1107,7 @@ class FranzMenu {
       {
         label: intl.formatMessage(menuItems.publishDebugInfo),
         click: () => {
-          window.ferdi.features.publishDebugInfo.state.isModalVisible = true;
+          window['ferdi'].features.publishDebugInfo.state.isModalVisible = true;
         },
       },
     ];
-- 
cgit v1.2.3-70-g09d2


From 91c69428ed0dc2dd26b00c6dd5a6684f25515a34 Mon Sep 17 00:00:00 2001
From: Abin Mn <abinmn619@gmail.com>
Date: Tue, 26 Oct 2021 21:18:20 +0530
Subject: Cleanup/remove feature toggle for todo, workspace, service proxy
 (#2134)

* Remove DEFAULT_FEATURES_CONFIG from config
* Remove static controller

Co-authored-by: Madhuri B <MadhuriBandanadam@users.noreply.github.com>
---
 src/components/layout/Sidebar.js                   |  36 +++---
 .../settings/navigation/SettingsNavigation.js      |  21 ++--
 .../settings/settings/EditSettingsForm.js          |  16 +--
 src/config.ts                                      |   9 +-
 src/containers/settings/EditServiceScreen.js       |   2 -
 src/containers/settings/EditSettingsScreen.js      |  18 ++-
 src/features/settingsWS/actions.ts                 |  13 --
 src/features/settingsWS/index.ts                   |  28 -----
 src/features/settingsWS/state.ts                   |  13 --
 src/features/settingsWS/store.js                   | 132 ---------------------
 src/features/todos/index.ts                        |  25 +---
 src/features/todos/store.js                        |   9 --
 src/features/workspaces/index.ts                   |  22 +---
 src/features/workspaces/store.js                   |   8 --
 .../app/Controllers/Http/StaticController.js       |  20 ----
 src/internal-server/start/routes.js                |   5 -
 src/lib/Menu.js                                    |  21 +---
 src/stores.types.ts                                |   4 -
 src/stores/FeaturesStore.js                        |  10 +-
 19 files changed, 50 insertions(+), 362 deletions(-)
 delete mode 100755 src/features/settingsWS/actions.ts
 delete mode 100755 src/features/settingsWS/index.ts
 delete mode 100755 src/features/settingsWS/state.ts
 delete mode 100755 src/features/settingsWS/store.js
 delete mode 100644 src/internal-server/app/Controllers/Http/StaticController.js

(limited to 'src/lib/Menu.js')

diff --git a/src/components/layout/Sidebar.js b/src/components/layout/Sidebar.js
index 2bae57648..18492be80 100644
--- a/src/components/layout/Sidebar.js
+++ b/src/components/layout/Sidebar.js
@@ -14,7 +14,6 @@ import {
   addNewServiceShortcutKey,
   muteFerdiShortcutKey,
 } from '../../environment';
-import { workspaceStore } from '../../features/workspaces';
 import { todosStore } from '../../features/todos';
 import { todoActions } from '../../features/todos/actions';
 import AppStore from '../../stores/AppStore';
@@ -160,8 +159,7 @@ class Sidebar extends Component {
                 <i className="mdi mdi-lock" />
               </button>
             ) : null}
-            {todosStore.isFeatureEnabled &&
-            todosStore.isFeatureEnabledByUser ? (
+            {todosStore.isFeatureEnabledByUser ? (
               <button
                 type="button"
                 onClick={() => {
@@ -179,23 +177,21 @@ class Sidebar extends Component {
                 <i className="mdi mdi-check-all" />
               </button>
             ) : null}
-            {workspaceStore.isFeatureEnabled ? (
-              <button
-                type="button"
-                onClick={() => {
-                  toggleWorkspaceDrawer();
-                  this.updateToolTip();
-                }}
-                className={`sidebar__button sidebar__button--workspaces ${
-                  isWorkspaceDrawerOpen ? 'is-active' : ''
-                }`}
-                data-tip={`${intl.formatMessage(
-                  workspaceToggleMessage,
-                )} (${workspaceToggleShortcutKey(false)})`}
-              >
-                <i className="mdi mdi-view-grid" />
-              </button>
-            ) : null}
+            <button
+              type="button"
+              onClick={() => {
+                toggleWorkspaceDrawer();
+                this.updateToolTip();
+              }}
+              className={`sidebar__button sidebar__button--workspaces ${
+                isWorkspaceDrawerOpen ? 'is-active' : ''
+              }`}
+              data-tip={`${intl.formatMessage(
+                workspaceToggleMessage,
+              )} (${workspaceToggleShortcutKey(false)})`}
+            >
+              <i className="mdi mdi-view-grid" />
+            </button>
             <button
               type="button"
               onClick={() => {
diff --git a/src/components/settings/navigation/SettingsNavigation.js b/src/components/settings/navigation/SettingsNavigation.js
index 18a71fdeb..dbb1365b0 100644
--- a/src/components/settings/navigation/SettingsNavigation.js
+++ b/src/components/settings/navigation/SettingsNavigation.js
@@ -6,7 +6,6 @@ import { RouterStore } from 'mobx-react-router';
 
 import { LOCAL_SERVER, LIVE_FERDI_API, LIVE_FRANZ_API } from '../../../config';
 import Link from '../../ui/Link';
-import { workspaceStore } from '../../../features/workspaces';
 import UIStore from '../../../stores/UIStore';
 import SettingsStore from '../../../stores/SettingsStore';
 import UserStore from '../../../stores/UserStore';
@@ -117,17 +116,15 @@ class SettingsNavigation extends Component {
           {intl.formatMessage(messages.yourServices)}{' '}
           <span className="badge">{serviceCount}</span>
         </Link>
-        {workspaceStore.isFeatureEnabled ? (
-          <Link
-            to="/settings/workspaces"
-            className="settings-navigation__link"
-            activeClassName="is-active"
-            disabled={!isLoggedIn}
-          >
-            {intl.formatMessage(messages.yourWorkspaces)}{' '}
-            <span className="badge">{workspaceCount}</span>
-          </Link>
-        ) : null}
+        <Link
+          to="/settings/workspaces"
+          className="settings-navigation__link"
+          activeClassName="is-active"
+          disabled={!isLoggedIn}
+        >
+          {intl.formatMessage(messages.yourWorkspaces)}{' '}
+          <span className="badge">{workspaceCount}</span>
+        </Link>
         {!isUsingWithoutAccount && (
           <Link
             to="/settings/user"
diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js
index 60bd91493..54f2025e5 100644
--- a/src/components/settings/settings/EditSettingsForm.js
+++ b/src/components/settings/settings/EditSettingsForm.js
@@ -194,9 +194,7 @@ class EditSettingsForm extends Component {
     isClearingAllCache: PropTypes.bool.isRequired,
     onClearAllCache: PropTypes.func.isRequired,
     getCacheSize: PropTypes.func.isRequired,
-    isTodosEnabled: PropTypes.bool.isRequired,
     isTodosActivated: PropTypes.bool.isRequired,
-    isWorkspaceEnabled: PropTypes.bool.isRequired,
     automaticUpdates: PropTypes.bool.isRequired,
     isDarkmodeEnabled: PropTypes.bool.isRequired,
     isAdaptableDarkModeEnabled: PropTypes.bool.isRequired,
@@ -244,8 +242,6 @@ class EditSettingsForm extends Component {
       isClearingAllCache,
       onClearAllCache,
       getCacheSize,
-      isTodosEnabled,
-      isWorkspaceEnabled,
       automaticUpdates,
       isDarkmodeEnabled,
       isTodosActivated,
@@ -414,14 +410,12 @@ class EditSettingsForm extends Component {
 
                 <Hr />
 
-                {isWorkspaceEnabled && (
-                  <>
-                    <Toggle field={form.$('keepAllWorkspacesLoaded')} />
-                    <Hr />
-                  </>
-                )}
+                <>
+                  <Toggle field={form.$('keepAllWorkspacesLoaded')} />
+                  <Hr />
+                </>
 
-                {isTodosEnabled && !hasAddedTodosAsService && (
+                {!hasAddedTodosAsService && (
                   <>
                     <Toggle field={form.$('enableTodos')} />
                     {isTodosActivated && (
diff --git a/src/config.ts b/src/config.ts
index 15567bf66..fb073c062 100644
--- a/src/config.ts
+++ b/src/config.ts
@@ -140,13 +140,6 @@ export const ICON_SIZES = {
 // The bias should always be the "Normal icons" value
 export const iconSizeBias = 20;
 
-export const DEFAULT_FEATURES_CONFIG = {
-  isServiceProxyEnabled: true,
-  isWorkspaceEnabled: true,
-  isTodosEnabled: true,
-  isSettingsWSEnabled: false,
-};
-
 export const DEFAULT_WINDOW_OPTIONS = {
   width: 800,
   height: 600,
@@ -237,7 +230,7 @@ export const DEFAULT_APP_SETTINGS = {
   liftSingleInstanceLock: false,
   enableLongPressServiceHint: false,
   proxyFeatureEnabled: false,
-  onlyShowFavoritesInUnreadCount: false
+  onlyShowFavoritesInUnreadCount: false,
 };
 
 export const DEFAULT_SERVICE_SETTINGS = {
diff --git a/src/containers/settings/EditServiceScreen.js b/src/containers/settings/EditServiceScreen.js
index ef907dcb8..ddf7fab36 100644
--- a/src/containers/settings/EditServiceScreen.js
+++ b/src/containers/settings/EditServiceScreen.js
@@ -8,7 +8,6 @@ import UserStore from '../../stores/UserStore';
 import RecipesStore from '../../stores/RecipesStore';
 import ServicesStore from '../../stores/ServicesStore';
 import SettingsStore from '../../stores/SettingsStore';
-import FeaturesStore from '../../stores/FeaturesStore';
 import Form from '../../lib/Form';
 
 import ServiceError from '../../components/settings/services/ServiceError';
@@ -445,7 +444,6 @@ EditServiceScreen.wrappedComponent.propTypes = {
     recipes: PropTypes.instanceOf(RecipesStore).isRequired,
     services: PropTypes.instanceOf(ServicesStore).isRequired,
     settings: PropTypes.instanceOf(SettingsStore).isRequired,
-    features: PropTypes.instanceOf(FeaturesStore).isRequired,
   }).isRequired,
   router: PropTypes.instanceOf(RouterStore).isRequired,
   actions: PropTypes.shape({
diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js
index 76c525045..64f5b2e01 100644
--- a/src/containers/settings/EditSettingsScreen.js
+++ b/src/containers/settings/EditSettingsScreen.js
@@ -339,14 +339,12 @@ class EditSettingsScreen extends Component {
       },
     });
 
-    if (workspaces.isFeatureActive) {
-      const { keepAllWorkspacesLoaded } = workspaces.settings;
-      if (
-        Boolean(keepAllWorkspacesLoaded) !==
-        Boolean(settingsData.keepAllWorkspacesLoaded)
-      ) {
-        workspaceActions.toggleKeepAllWorkspacesLoadedSetting();
-      }
+    const { keepAllWorkspacesLoaded } = workspaces.settings;
+    if (
+      Boolean(keepAllWorkspacesLoaded) !==
+      Boolean(settingsData.keepAllWorkspacesLoaded)
+    ) {
+      workspaceActions.toggleKeepAllWorkspacesLoadedSetting();
     }
 
     if (todos.isFeatureActive) {
@@ -696,7 +694,7 @@ class EditSettingsScreen extends Component {
   }
 
   render() {
-    const { app, todos, workspaces, services } = this.props.stores;
+    const { app, services } = this.props.stores;
     const {
       updateStatus,
       updateStatusTypes,
@@ -721,8 +719,6 @@ class EditSettingsScreen extends Component {
           getCacheSize={() => app.cacheSize}
           isClearingAllCache={isClearingAllCache}
           onClearAllCache={clearAllCache}
-          isTodosEnabled={todos.isFeatureActive}
-          isWorkspaceEnabled={workspaces.isFeatureActive}
           lockingFeatureEnabled={lockingFeatureEnabled}
           automaticUpdates={this.props.stores.settings.app.automaticUpdates}
           isDarkmodeEnabled={this.props.stores.settings.app.darkMode}
diff --git a/src/features/settingsWS/actions.ts b/src/features/settingsWS/actions.ts
deleted file mode 100755
index 03a398eb5..000000000
--- a/src/features/settingsWS/actions.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import PropTypes from 'prop-types';
-import { createActionsFromDefinitions } from '../../actions/lib/actions';
-
-export const settingsWSActions = createActionsFromDefinitions(
-  {
-    greet: {
-      name: PropTypes.string.isRequired,
-    },
-  },
-  PropTypes.checkPropTypes,
-);
-
-export default settingsWSActions;
diff --git a/src/features/settingsWS/index.ts b/src/features/settingsWS/index.ts
deleted file mode 100755
index 9bb206d82..000000000
--- a/src/features/settingsWS/index.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import { reaction } from 'mobx';
-import { SettingsWSStore } from './store';
-
-const debug = require('debug')('Ferdi:feature:settingsWS');
-
-export const settingsStore = new SettingsWSStore();
-
-export default function initSettingsWebSocket(
-  stores: { features: any },
-  actions: any,
-) {
-  const { features } = stores;
-
-  // Toggle SettingsWebSocket feature
-  reaction(
-    () => features.features.isSettingsWSEnabled,
-    isEnabled => {
-      if (isEnabled) {
-        debug('Initializing `settingsWS` feature');
-        settingsStore.start(stores, actions);
-      } else if (settingsStore) {
-        debug('Disabling `settingsWS` feature');
-        settingsStore.stop();
-      }
-    },
-    { fireImmediately: true },
-  );
-}
diff --git a/src/features/settingsWS/state.ts b/src/features/settingsWS/state.ts
deleted file mode 100755
index 7b16b2b6e..000000000
--- a/src/features/settingsWS/state.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { observable } from 'mobx';
-
-const defaultState = {
-  isFeatureActive: false,
-};
-
-export const settingsWSState = observable(defaultState);
-
-export function resetState() {
-  Object.assign(settingsWSState, defaultState);
-}
-
-export default settingsWSState;
diff --git a/src/features/settingsWS/store.js b/src/features/settingsWS/store.js
deleted file mode 100755
index 3b9e10825..000000000
--- a/src/features/settingsWS/store.js
+++ /dev/null
@@ -1,132 +0,0 @@
-import { observable } from 'mobx';
-import WebSocket from 'ws';
-import ms from 'ms';
-
-import { FeatureStore } from '../utils/FeatureStore';
-import { createReactions } from '../../stores/lib/Reaction';
-import { WS_API } from '../../environment-remote';
-
-const debug = require('debug')('Ferdi:feature:settingsWS:store');
-
-export class SettingsWSStore extends FeatureStore {
-  stores = null;
-
-  actions = null;
-
-  ws = null;
-
-  pingTimeout = null;
-
-  reconnectTimeout = null;
-
-  @observable connected = false;
-
-  start(stores, actions) {
-    this.stores = stores;
-    this.actions = actions;
-
-    this._registerReactions(
-      createReactions([
-        this._initialize.bind(this),
-        this._reconnect.bind(this),
-        this._close.bind(this),
-      ]),
-    );
-  }
-
-  connect() {
-    try {
-      const wsURL = `${WS_API}/ws/${this.stores.user.data.id}`;
-      debug('Setting up WebSocket to', wsURL);
-
-      this.ws = new WebSocket(wsURL);
-
-      this.ws.on('open', () => {
-        debug('Opened WebSocket');
-        this.send({
-          action: 'authorize',
-          token: this.stores.user.authToken,
-        });
-
-        this.connected = true;
-
-        this.heartbeat();
-      });
-
-      this.ws.on('message', data => {
-        const resp = JSON.parse(data);
-        debug('Received message', resp);
-
-        if (resp.id) {
-          this.stores.user.getUserInfoRequest.patch(result => {
-            if (!result) return;
-
-            debug('Patching user object with new values');
-            Object.assign(result, resp);
-          });
-        }
-      });
-
-      this.ws.on('ping', this.heartbeat.bind(this));
-    } catch (error) {
-      console.error(error);
-    }
-  }
-
-  heartbeat() {
-    debug('Heartbeat');
-    clearTimeout(this.pingTimeout);
-
-    this.pingTimeout = setTimeout(() => {
-      debug('Terminating connection, reconnecting in 35');
-      this.ws.terminate();
-
-      this.connected = false;
-    }, ms('35s'));
-  }
-
-  send(data) {
-    if (this.ws && this.ws.readyState === 1) {
-      this.ws.send(JSON.stringify(data));
-      debug('Sending data', data);
-    } else {
-      debug('WebSocket is not initialized');
-    }
-  }
-
-  // Reactions
-
-  _initialize() {
-    if (this.stores.user.data.id && !this.ws) {
-      this.connect();
-    }
-  }
-
-  _reconnect() {
-    if (!this.connected) {
-      debug('Trying to reconnect in 30s');
-      this.reconnectTimeout = setInterval(() => {
-        debug('Trying to reconnect');
-        this.connect();
-      }, ms('30s'));
-    } else {
-      debug('Clearing reconnect interval');
-      clearInterval(this.reconnectTimeout);
-    }
-  }
-
-  _close() {
-    if (!this.stores.user.isLoggedIn) {
-      debug('Stopping reactions');
-      this._stopReactions();
-
-      if (this.ws) {
-        debug('Terminating connection');
-        this.ws.terminate();
-        this.ws = null;
-      }
-    }
-  }
-}
-
-export default SettingsWSStore;
diff --git a/src/features/todos/index.ts b/src/features/todos/index.ts
index 3665812e6..2fa8c3130 100644
--- a/src/features/todos/index.ts
+++ b/src/features/todos/index.ts
@@ -1,29 +1,8 @@
-import { reaction } from 'mobx';
 import TodoStore from './store';
 
-const debug = require('debug')('Ferdi:feature:todos');
-
 export const todosStore = new TodoStore();
 
-export default function initTodos(
-  stores: { todos?: any; features?: any },
-  actions: any,
-) {
+export default function initTodos(stores: { todos?: any }, actions: any) {
   stores.todos = todosStore;
-  const { features } = stores;
-
-  // Toggle todos feature
-  reaction(
-    () => features.features.isTodosEnabled,
-    isEnabled => {
-      if (isEnabled) {
-        debug('Initializing `todos` feature');
-        todosStore.start(stores, actions);
-      } else if (todosStore.isFeatureActive) {
-        debug('Disabling `todos` feature');
-        todosStore.stop();
-      }
-    },
-    { fireImmediately: true },
-  );
+  todosStore.start(stores, actions);
 }
diff --git a/src/features/todos/store.js b/src/features/todos/store.js
index 010a029ff..d158ed480 100644
--- a/src/features/todos/store.js
+++ b/src/features/todos/store.js
@@ -23,8 +23,6 @@ const debug = require('debug')('Ferdi:feature:todos:store');
 export default class TodoStore extends FeatureStore {
   @observable stores = null;
 
-  @observable isFeatureEnabled = false;
-
   @observable isFeatureActive = false;
 
   @observable webview = null;
@@ -123,7 +121,6 @@ export default class TodoStore extends FeatureStore {
     // REACTIONS
 
     this._allReactions = createReactions([
-      this._setFeatureEnabledReaction,
       this._updateTodosConfig,
       this._firstLaunchReaction,
       this._routeCheckReaction,
@@ -262,12 +259,6 @@ export default class TodoStore extends FeatureStore {
 
   // Reactions
 
-  _setFeatureEnabledReaction = () => {
-    const { isTodosEnabled } = this.stores.features.features;
-
-    this.isFeatureEnabled = isTodosEnabled;
-  };
-
   _updateTodosConfig = () => {
     // Resend the config if any part changes in Franz:
     this._onTodosClientInitialized();
diff --git a/src/features/workspaces/index.ts b/src/features/workspaces/index.ts
index ecca64b41..25975936a 100644
--- a/src/features/workspaces/index.ts
+++ b/src/features/workspaces/index.ts
@@ -1,28 +1,8 @@
-import { reaction } from 'mobx';
 import WorkspacesStore from './store';
-import { resetApiRequests } from './api';
-
-const debug = require('debug')('Ferdi:feature:workspaces');
 
 export const workspaceStore = new WorkspacesStore();
 
 export default function initWorkspaces(stores, actions) {
   stores.workspaces = workspaceStore;
-  const { features } = stores;
-
-  // Toggle workspace feature
-  reaction(
-    () => features.features.isWorkspaceEnabled,
-    isEnabled => {
-      if (isEnabled && !workspaceStore.isFeatureActive) {
-        debug('Initializing `workspaces` feature');
-        workspaceStore.start(stores, actions);
-      } else if (workspaceStore.isFeatureActive) {
-        debug('Disabling `workspaces` feature');
-        workspaceStore.stop();
-        resetApiRequests();
-      }
-    },
-    { fireImmediately: true },
-  );
+  workspaceStore.start(stores, actions);
 }
diff --git a/src/features/workspaces/store.js b/src/features/workspaces/store.js
index 0fa43b723..17ec17b3a 100644
--- a/src/features/workspaces/store.js
+++ b/src/features/workspaces/store.js
@@ -18,8 +18,6 @@ import { KEEP_WS_LOADED_USID } from '../../config';
 const debug = require('debug')('Ferdi:feature:workspaces:store');
 
 export default class WorkspacesStore extends FeatureStore {
-  @observable isFeatureEnabled = true;
-
   @observable isFeatureActive = false;
 
   @observable activeWorkspace = null;
@@ -97,7 +95,6 @@ export default class WorkspacesStore extends FeatureStore {
 
     this._allReactions = createReactions([
       this._openDrawerWithSettingsReaction,
-      this._setFeatureEnabledReaction,
       this._cleanupInvalidServiceReferences,
       this._setActiveServiceOnWorkspaceSwitchReaction,
       this._activateLastUsedWorkspaceReaction,
@@ -251,11 +248,6 @@ export default class WorkspacesStore extends FeatureStore {
 
   // Reactions
 
-  _setFeatureEnabledReaction = () => {
-    const { isWorkspaceEnabled } = this.stores.features.features;
-    this.isFeatureEnabled = isWorkspaceEnabled;
-  };
-
   _setWorkspaceBeingEditedReaction = () => {
     const { pathname } = this.stores.router.location;
     const match = matchRoute('/settings/workspaces/edit/:id', pathname);
diff --git a/src/internal-server/app/Controllers/Http/StaticController.js b/src/internal-server/app/Controllers/Http/StaticController.js
deleted file mode 100644
index 33e0e52d9..000000000
--- a/src/internal-server/app/Controllers/Http/StaticController.js
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * Controller for routes with static responses
- */
-
-import { DEFAULT_FEATURES_CONFIG } from '../../../../config';
-
-// TODO: This endpoint and associated code needs to be remoeved as cleanup
-class StaticController {
-  // Enable all features
-  features({ response }) {
-    return response.send(DEFAULT_FEATURES_CONFIG);
-  }
-
-  // Return an empty array
-  emptyArray({ response }) {
-    return response.send([]);
-  }
-}
-
-export default StaticController;
diff --git a/src/internal-server/start/routes.js b/src/internal-server/start/routes.js
index 50b9448cf..177035dac 100644
--- a/src/internal-server/start/routes.js
+++ b/src/internal-server/start/routes.js
@@ -55,17 +55,12 @@ Route.group(() => {
   Route.get('recipes', 'RecipeController.list');
   Route.get('recipes/download/:recipe', 'RecipeController.download');
   Route.get('recipes/search', 'RecipeController.search');
-  Route.get('recipes/update', 'StaticController.emptyArray');
 
   // Workspaces
   Route.put('workspace/:id', 'WorkspaceController.edit');
   Route.delete('workspace/:id', 'WorkspaceController.delete');
   Route.post('workspace', 'WorkspaceController.create');
   Route.get('workspace', 'WorkspaceController.list');
-
-  // Static responses
-  Route.get('features/:mode?', 'StaticController.features');
-  Route.get('services', 'StaticController.emptyArray');
 })
   .prefix(API_VERSION)
   .middleware(OnlyAllowFerdi);
diff --git a/src/lib/Menu.js b/src/lib/Menu.js
index 1495fc80e..7d4c228f5 100644
--- a/src/lib/Menu.js
+++ b/src/lib/Menu.js
@@ -21,7 +21,6 @@ import {
   muteFerdiShortcutKey,
 } from '../environment';
 import { aboutAppDetails, ferdiVersion } from '../environment-remote';
-import { todosStore } from '../features/todos';
 import { todoActions } from '../features/todos/actions';
 import { workspaceActions } from '../features/workspaces/actions';
 import { workspaceStore } from '../features/workspaces/index';
@@ -479,12 +478,12 @@ const _titleBarTemplateFactory = (intl, locked) => [
     label: intl.formatMessage(menuItems.workspaces),
     accelerator: `${altKey()}+W`,
     submenu: [],
-    visible: !locked && workspaceStore.isFeatureEnabled,
+    visible: !locked,
   },
   {
     label: intl.formatMessage(menuItems.todos),
     submenu: [],
-    visible: !locked && todosStore.isFeatureEnabled,
+    visible: !locked,
   },
   {
     label: intl.formatMessage(menuItems.window),
@@ -698,13 +697,9 @@ class FranzMenu {
         tpl[2].submenu = serviceTpl;
       }
 
-      if (workspaceStore.isFeatureEnabled) {
-        tpl[3].submenu = this.workspacesMenu();
-      }
+      tpl[3].submenu = this.workspacesMenu();
 
-      if (todosStore.isFeatureEnabled) {
-        tpl[4].submenu = this.todosMenu();
-      }
+      tpl[4].submenu = this.todosMenu();
     } else {
       const touchIdEnabled = isMac
         ? this.stores.settings.app.useTouchIdToUnlock &&
@@ -872,13 +867,9 @@ class FranzMenu {
         tpl[3].submenu = serviceTpl;
       }
 
-      if (workspaceStore.isFeatureEnabled) {
-        tpl[4].submenu = this.workspacesMenu();
-      }
+      tpl[4].submenu = this.workspacesMenu();
 
-      if (todosStore.isFeatureEnabled) {
-        tpl[5].submenu = this.todosMenu();
-      }
+      tpl[5].submenu = this.todosMenu();
 
       tpl[tpl.length - 1].submenu.push(
         {
diff --git a/src/stores.types.ts b/src/stores.types.ts
index e5978a392..c63cdd4b8 100644
--- a/src/stores.types.ts
+++ b/src/stores.types.ts
@@ -231,7 +231,6 @@ interface TodosStore {
   actions: Actions;
   api: Api;
   isFeatureActive: () => void;
-  isFeatureEnabled: () => void;
   isInitialized: true;
   stores: Stores;
   userAgentModel: () => void;
@@ -246,7 +245,6 @@ interface TodosStore {
   _reactions: any[];
   _reload: () => void;
   _routeCheckReaction: () => void;
-  _setFeatureEnabledReaction: () => void;
   _updateSettings: () => void;
   _updateTodosConfig: () => void;
   isFeatureEnabledByUser: () => void;
@@ -343,7 +341,6 @@ export interface WorkspacesStore {
   saving: boolean;
   filterServicesByActiveWorkspace: () => void;
   isFeatureActive: () => void;
-  isFeatureEnabled: () => void;
   isSettingsRouteActive: () => void;
   isSwitchingWorkspace: () => void;
   isWorkspaceDrawerOpen: () => void;
@@ -359,7 +356,6 @@ export interface WorkspacesStore {
   _openDrawerWithSettingsReaction: () => void;
   _reactions: any[];
   _setActiveServiceOnWorkspaceSwitchReaction: () => void;
-  _setFeatureEnabledReaction: () => void;
   _setWorkspaceBeingEditedReaction: () => void;
   _toggleKeepAllWorkspacesLoadedSetting: () => void;
   _updateSettings: () => void;
diff --git a/src/stores/FeaturesStore.js b/src/stores/FeaturesStore.js
index 8e0134d7f..fdb502b6b 100644
--- a/src/stores/FeaturesStore.js
+++ b/src/stores/FeaturesStore.js
@@ -9,13 +9,10 @@ import workspaces from '../features/workspaces';
 import quickSwitch from '../features/quickSwitch';
 import nightlyBuilds from '../features/nightlyBuilds';
 import publishDebugInfo from '../features/publishDebugInfo';
-import settingsWS from '../features/settingsWS';
 import communityRecipes from '../features/communityRecipes';
 import todos from '../features/todos';
 import appearance from '../features/appearance';
 
-import { DEFAULT_FEATURES_CONFIG } from '../config';
-
 export default class FeaturesStore extends Store {
   @observable defaultFeaturesRequest = new CachedRequest(
     this.api.features,
@@ -27,7 +24,7 @@ export default class FeaturesStore extends Store {
     'features',
   );
 
-  @observable features = { ...DEFAULT_FEATURES_CONFIG };
+  @observable features = { };
 
   async setup() {
     this.registerReactions([
@@ -41,12 +38,12 @@ export default class FeaturesStore extends Store {
 
   @computed get anonymousFeatures() {
     return (
-      this.defaultFeaturesRequest.execute().result || DEFAULT_FEATURES_CONFIG
+      this.defaultFeaturesRequest.execute().result || {}
     );
   }
 
   _updateFeatures = () => {
-    const features = { ...DEFAULT_FEATURES_CONFIG };
+    const features = { };
     if (this.stores.user.isLoggedIn) {
       let requestResult = {};
       try {
@@ -77,7 +74,6 @@ export default class FeaturesStore extends Store {
     quickSwitch();
     nightlyBuilds();
     publishDebugInfo();
-    settingsWS(this.stores, this.actions);
     communityRecipes(this.stores, this.actions);
     todos(this.stores, this.actions);
     appearance(this.stores);
-- 
cgit v1.2.3-70-g09d2