ADD `features` request

REFACTOR `defaults` -> `base`

5 files changed, 58 insertions, 14 deletions

diff --git a/src/api/FeaturesApi.js b/src/api/FeaturesApi.js
index 5749ab336..292dc80cc 100644
--- a/src/api/FeaturesApi.js
+++ b/src/api/FeaturesApi.js
@@ -3,7 +3,11 @@ export default class FeaturesApi {
     this.server = server;
   }
 
-  defaults() {
-    return this.server.getDefaultFeatures();
+  base() {
+    return this.server.getBaseFeatures();
+  }
+
+  features() {
+    return this.server.getFeatures();
   }
 }
diff --git a/src/api/server/ServerApi.js b/src/api/server/ServerApi.js
index 0951dfeda..ad7988bb2 100644
--- a/src/api/server/ServerApi.js
+++ b/src/api/server/ServerApi.js
@@ -260,8 +260,8 @@ export default class ServerApi {
   }
 
   // Features
-  async getDefaultFeatures() {
-    const request = await window.fetch(`${SERVER_URL}/${API_VERSION}/features/default`, this._prepareAuthRequest({
+  async getBaseFeatures() {
+    const request = await window.fetch(`${SERVER_URL}/${API_VERSION}/features/base`, this._prepareAuthRequest({
       method: 'GET',
     }));
     if (!request.ok) {
@@ -270,7 +270,21 @@ export default class ServerApi {
     const data = await request.json();
 
     const features = data;
-    console.debug('ServerApi::getDefaultFeatures resolves', features);
+    console.debug('ServerApi::getBaseFeatures resolves', features);
+    return features;
+  }
+
+  async getFeatures() {
+    const request = await window.fetch(`${SERVER_URL}/${API_VERSION}/features`, this._prepareAuthRequest({
+      method: 'GET',
+    }));
+    if (!request.ok) {
+      throw request;
+    }
+    const data = await request.json();
+
+    const features = data;
+    console.debug('ServerApi::getFeatures resolves', features);
     return features;
   }
 
diff --git a/src/containers/layout/AppLayoutContainer.js b/src/containers/layout/AppLayoutContainer.js
index e4a9d60c3..2db2b7bb7 100644
--- a/src/containers/layout/AppLayoutContainer.js
+++ b/src/containers/layout/AppLayoutContainer.js
@@ -26,6 +26,7 @@ export default class AppLayoutContainer extends Component {
   render() {
     const {
       app,
+      features,
       services,
       ui,
       news,
@@ -64,10 +65,13 @@ export default class AppLayoutContainer extends Component {
 
     const { children } = this.props;
 
+    const isLoadingFeatures = features.featuresRequest.isExecuting
+      && features.featuresRequest.isExecutingFirstTime;
+
     const isLoadingServices = services.allServicesRequest.isExecuting
       && services.allServicesRequest.isExecutingFirstTime;
 
-    if (isLoadingServices) {
+    if (isLoadingFeatures || isLoadingServices) {
       return (
         <AppLoader />
       );
diff --git a/src/stores/AppStore.js b/src/stores/AppStore.js
index a5640e8d3..162422017 100644
--- a/src/stores/AppStore.js
+++ b/src/stores/AppStore.js
@@ -158,9 +158,6 @@ export default class AppStore extends Store {
     this.locale = this._getDefaultLocale();
 
     this._healthCheck();
-
-    const defaults = this.stores.features.defaults;
-    console.log(defaults)
   }
 
   @computed get cacheSize() {
diff --git a/src/stores/FeaturesStore.js b/src/stores/FeaturesStore.js
index 5f738557f..817c2273f 100644
--- a/src/stores/FeaturesStore.js
+++ b/src/stores/FeaturesStore.js
@@ -5,14 +5,39 @@ import CachedRequest from './lib/CachedRequest';
 import Request from './lib/Request';
 
 export default class RecipesStore extends Store {
-  @observable defaultFeaturesRequest = new CachedRequest(this.api.features, 'defaults');
+  @observable baseFeaturesRequest = new CachedRequest(this.api.features, 'base');
+  @observable featuresRequest = new CachedRequest(this.api.features, 'features');
 
   setup() {
-    return this.defaults;
+    this.registerReactions([
+      this._monitorLoginStatus.bind(this),
+      this._debugFeatures.bind(this),
+    ]);
   }
 
-  @computed get defaults() {
-    console.log('GETTING DEFAULTS')
-    return this.defaultFeaturesRequest.execute().result || [];
+  @computed get base() {
+    return this.baseFeaturesRequest.execute().result || {};
+  }
+
+  @computed get features() {
+    if (this.stores.user.isLoggedIn) {
+      return this.featuresRequest.execute().result || {};
+    }
+
+    return this.base;
+  }
+
+  _debugFeatures() {
+    console.log(this.base, this.features)
+  }
+
+  _monitorLoginStatus() {
+    if (this.stores.user.isLoggedIn) {
+      this.featuresRequest.invalidate({ immediately: true });
+      this.featuresRequest.execute();
+    } else {
+      this.baseFeaturesRequest.invalidate({ immediately: true });
+      this.baseFeaturesRequest.execute();
+    }
   }
 }