Removed the cyclical dependency in workspaces and announcement (Partial fix for: #1519) (#1522)

9 files changed, 19 insertions, 16 deletions

diff --git a/src/config.js b/src/config.js
index 3a728b55e..c85228d07 100644
--- a/src/config.js
+++ b/src/config.js
@@ -283,3 +283,6 @@ export const PLANS_MAPPING = {
   'franz-supporter-license-year-2019': PLANS.LEGACY,
   free: PLANS.FREE,
 };
+
+
+export const DEFAULT_SETTING_KEEP_ALL_WORKSPACES_LOADED = false;
diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js
index 245fd8a63..a5dc427ba 100644
--- a/src/containers/settings/EditSettingsScreen.js
+++ b/src/containers/settings/EditSettingsScreen.js
@@ -11,6 +11,7 @@ import Form from '../../lib/Form';
 import { APP_LOCALES, SPELLCHECKER_LOCALES } from '../../i18n/languages';
 import {
   DEFAULT_APP_SETTINGS, HIBERNATION_STRATEGIES, SIDEBAR_WIDTH, ICON_SIZES, NAVIGATION_BAR_BEHAVIOURS, SEARCH_ENGINE_NAMES, TODO_APPS,
+  DEFAULT_SETTING_KEEP_ALL_WORKSPACES_LOADED,
 } from '../../config';
 import { isMac } from '../../environment';
 import { config as spellcheckerConfig } from '../../features/spellchecker';
@@ -24,7 +25,6 @@ import ErrorBoundary from '../../components/util/ErrorBoundary';
 import globalMessages from '../../i18n/globalMessages';
 import { DEFAULT_IS_FEATURE_ENABLED_BY_USER } from '../../features/todos';
 import WorkspacesStore from '../../features/workspaces/store';
-import { DEFAULT_SETTING_KEEP_ALL_WORKSPACES_LOADED } from '../../features/workspaces';
 import ServicesStore from '../../stores/ServicesStore';
 
 const messages = defineMessages({
diff --git a/src/features/announcements/constants.js b/src/features/announcements/constants.js
new file mode 100644
index 000000000..284226fdf
--- /dev/null
+++ b/src/features/announcements/constants.js
@@ -0,0 +1,5 @@
+export const ANNOUNCEMENTS_ROUTES = {
+  TARGET: '/announcements/:id',
+};
+
+export const GA_CATEGORY_ANNOUNCEMENTS = 'Announcements';
diff --git a/src/features/announcements/index.js b/src/features/announcements/index.js
index 10f081bb1..369ded1b2 100644
--- a/src/features/announcements/index.js
+++ b/src/features/announcements/index.js
@@ -7,9 +7,6 @@ export const GA_CATEGORY_ANNOUNCEMENTS = 'Announcements';
 
 export const announcementsStore = new AnnouncementsStore();
 
-export const ANNOUNCEMENTS_ROUTES = {
-  TARGET: '/announcements/:id',
-};
 
 export default function initAnnouncements(stores, actions) {
   const { features } = stores;
diff --git a/src/features/announcements/store.js b/src/features/announcements/store.js
index 9ec5f67d2..4e465286a 100644
--- a/src/features/announcements/store.js
+++ b/src/features/announcements/store.js
@@ -7,7 +7,7 @@ import semver from 'semver';
 import localStorage from 'mobx-localstorage';
 
 import { FeatureStore } from '../utils/FeatureStore';
-import { ANNOUNCEMENTS_ROUTES } from '.';
+import { ANNOUNCEMENTS_ROUTES } from './constants';
 import { getAnnouncementRequest, getChangelogRequest, getCurrentVersionRequest } from './api';
 import { announcementActions } from './actions';
 import { createActionBindings } from '../utils/ActionBinding';
diff --git a/src/features/workspaces/constants.js b/src/features/workspaces/constants.js
new file mode 100644
index 000000000..413afa1e8
--- /dev/null
+++ b/src/features/workspaces/constants.js
@@ -0,0 +1,6 @@
+export const WORKSPACES_ROUTES = {
+  ROOT: '/settings/workspaces',
+  EDIT: '/settings/workspaces/:action/:id',
+};
+
+export const GA_CATEGORY_WORKSPACES = 'Workspaces';
diff --git a/src/features/workspaces/index.js b/src/features/workspaces/index.js
index 560b732ab..3db6de5b2 100644
--- a/src/features/workspaces/index.js
+++ b/src/features/workspaces/index.js
@@ -4,9 +4,6 @@ import { resetApiRequests } from './api';
 
 const debug = require('debug')('Ferdi:feature:workspaces');
 
-export const GA_CATEGORY_WORKSPACES = 'Workspaces';
-export const DEFAULT_SETTING_KEEP_ALL_WORKSPACES_LOADED = false;
-
 export const workspaceStore = new WorkspacesStore();
 
 export default function initWorkspaces(stores, actions) {
@@ -31,8 +28,3 @@ export default function initWorkspaces(stores, actions) {
     },
   );
 }
-
-export const WORKSPACES_ROUTES = {
-  ROOT: '/settings/workspaces',
-  EDIT: '/settings/workspaces/:action/:id',
-};
diff --git a/src/features/workspaces/store.js b/src/features/workspaces/store.js
index 5c90ff180..bddcb6eb4 100644
--- a/src/features/workspaces/store.js
+++ b/src/features/workspaces/store.js
@@ -13,7 +13,7 @@ import {
   getUserWorkspacesRequest,
   updateWorkspaceRequest,
 } from './api';
-import { WORKSPACES_ROUTES } from './index';
+import { WORKSPACES_ROUTES } from './constants';
 import { createReactions } from '../../stores/lib/Reaction';
 import { createActionBindings } from '../utils/ActionBinding';
 
diff --git a/src/routes.js b/src/routes.js
index 046e60cbb..5017ed837 100644
--- a/src/routes.js
+++ b/src/routes.js
@@ -30,9 +30,9 @@ import AuthLayoutContainer from './containers/auth/AuthLayoutContainer';
 import SubscriptionPopupScreen from './containers/subscription/SubscriptionPopupScreen';
 import WorkspacesScreen from './features/workspaces/containers/WorkspacesScreen';
 import EditWorkspaceScreen from './features/workspaces/containers/EditWorkspaceScreen';
-import { WORKSPACES_ROUTES } from './features/workspaces';
+import { WORKSPACES_ROUTES } from './features/workspaces/constants';
 import AnnouncementScreen from './features/announcements/components/AnnouncementScreen';
-import { ANNOUNCEMENTS_ROUTES } from './features/announcements';
+import { ANNOUNCEMENTS_ROUTES } from './features/announcements/constants';
 
 import SettingsStore from './stores/SettingsStore';