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

6 files changed, 13 insertions, 13 deletions

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';