SONAR-8761 rely on feature flag when displaying organization

diff --git a/server/sonar-web/src/main/js/store/appState/duck.js b/server/sonar-web/src/main/js/store/appState/duck.js
index 2322521c638424744011a4c92dcac1850f441898..bb90fcf3bd0ba60430e1ef6967475be18c3a2277 100644 (file)
--- a/server/sonar-web/src/main/js/store/appState/duck.js
+++ b/server/sonar-web/src/main/js/store/appState/duck.js
@@ -22,6 +22,7 @@ type AppState = {
   adminPages?: Array<*>,
   authenticationError: boolean,
   authorizationError: boolean,
+  organizationsEnabled: boolean,
   qualifiers: ?Array<string>
 };
 
@@ -54,6 +55,7 @@ export const requireAuthorization = () => ({
 const defaultValue = {
   authenticationError: false,
   authorizationError: false,
+  organizationsEnabled: false,
   qualifiers: null
 };
 

diff --git a/server/sonar-web/src/main/js/store/rootReducer.js b/server/sonar-web/src/main/js/store/rootReducer.js
index a8680622e829448fb88ab9090347915e0eacb9c9..aee309845c2e5ead300d74a8abc911efa6b2f4d3 100644 (file)
--- a/server/sonar-web/src/main/js/store/rootReducer.js
+++ b/server/sonar-web/src/main/js/store/rootReducer.js
@@ -121,7 +121,7 @@ export const getMyOrganizations = state => (
 );
 
 export const areThereCustomOrganizations = state => (
-    fromOrganizations.areThereCustomOrganizations(state.organizations)
+    getAppState(state).organizationsEnabled
 );
 
 export const getProjectActivity = state => (