adapt enterprise UI flags to features-api

5 files changed, 19 insertions, 15 deletions

diff --git a/src/components/settings/navigation/SettingsNavigation.js b/src/components/settings/navigation/SettingsNavigation.js
index 620f09189..46b2f82fc 100644
--- a/src/components/settings/navigation/SettingsNavigation.js
+++ b/src/components/settings/navigation/SettingsNavigation.js
@@ -44,12 +44,12 @@ export default class SettingsNavigation extends Component {
 
   render() {
     const { serviceCount } = this.props;
-    const { data: user } = this.props.stores.user;
+    const { features } = this.props.stores.features;
     const { intl } = this.context;
 
     return (
       <div className="settings-navigation">
-        {user.clientSettings && user.clientSettings.userCanManageServices && (
+        {features.userCanManageServices && (
           <Link
             to="/settings/recipes"
             className="settings-navigation__link"
@@ -100,8 +100,8 @@ export default class SettingsNavigation extends Component {
 
 SettingsNavigation.wrappedComponent.propTypes = {
   stores: PropTypes.shape({
-    user: PropTypes.shape({
-      data: PropTypes.object.isRequired,
+    features: PropTypes.shape({
+      features: PropTypes.object.isRequired,
     }).isRequired,
   }).isRequired,
 };
diff --git a/src/components/settings/services/EditServiceForm.js b/src/components/settings/services/EditServiceForm.js
index e23dfa9f6..3ffca99a7 100644
--- a/src/components/settings/services/EditServiceForm.js
+++ b/src/components/settings/services/EditServiceForm.js
@@ -107,6 +107,7 @@ export default class EditServiceForm extends Component {
       return null;
     },
     user: PropTypes.instanceOf(User).isRequired,
+    userCanManageServices: PropTypes.bool.isRequired,
     action: PropTypes.string.isRequired,
     form: PropTypes.instanceOf(Form).isRequired,
     onSubmit: PropTypes.func.isRequired,
@@ -169,6 +170,7 @@ export default class EditServiceForm extends Component {
       service,
       action,
       user,
+      userCanManageServices,
       form,
       isSaving,
       isDeleting,
@@ -324,7 +326,7 @@ export default class EditServiceForm extends Component {
         </div>
         <div className="settings__controls">
           {/* Delete Button */}
-          {action === 'edit' && user.clientSettings.userCanManageServices && deleteButton}
+          {action === 'edit' && userCanManageServices && deleteButton}
 
           {/* Save Button */}
           {isSaving || isValidatingCustomUrl ? (
diff --git a/src/containers/layout/AppLayoutContainer.js b/src/containers/layout/AppLayoutContainer.js
index 2db2b7bb7..7a398ed2d 100644
--- a/src/containers/layout/AppLayoutContainer.js
+++ b/src/containers/layout/AppLayoutContainer.js
@@ -5,6 +5,7 @@ import { inject, observer } from 'mobx-react';
 import AppStore from '../../stores/AppStore';
 import RecipesStore from '../../stores/RecipesStore';
 import ServicesStore from '../../stores/ServicesStore';
+import FeaturesStore from '../../stores/FeaturesStore';
 import UIStore from '../../stores/UIStore';
 import NewsStore from '../../stores/NewsStore';
 import SettingsStore from '../../stores/SettingsStore';
@@ -66,7 +67,7 @@ export default class AppLayoutContainer extends Component {
     const { children } = this.props;
 
     const isLoadingFeatures = features.featuresRequest.isExecuting
-      && features.featuresRequest.isExecutingFirstTime;
+      && !features.featuresRequest.wasExecuted;
 
     const isLoadingServices = services.allServicesRequest.isExecuting
       && services.allServicesRequest.isExecutingFirstTime;
@@ -134,6 +135,7 @@ export default class AppLayoutContainer extends Component {
 AppLayoutContainer.wrappedComponent.propTypes = {
   stores: PropTypes.shape({
     services: PropTypes.instanceOf(ServicesStore).isRequired,
+    features: PropTypes.instanceOf(FeaturesStore).isRequired,
     recipes: PropTypes.instanceOf(RecipesStore).isRequired,
     app: PropTypes.instanceOf(AppStore).isRequired,
     ui: PropTypes.instanceOf(UIStore).isRequired,
diff --git a/src/containers/settings/EditServiceScreen.js b/src/containers/settings/EditServiceScreen.js
index 0ddb84db0..f2d5550e1 100644
--- a/src/containers/settings/EditServiceScreen.js
+++ b/src/containers/settings/EditServiceScreen.js
@@ -6,6 +6,7 @@ import { defineMessages, intlShape } from 'react-intl';
 import UserStore from '../../stores/UserStore';
 import RecipesStore from '../../stores/RecipesStore';
 import ServicesStore from '../../stores/ServicesStore';
+import FeaturesStore from '../../stores/FeaturesStore';
 import Form from '../../lib/Form';
 import { gaPage } from '../../lib/analytics';
 
@@ -77,7 +78,7 @@ export default class EditServiceScreen extends Component {
     }
   }
 
-  prepareForm(recipe, service, userCanManageService) {
+  prepareForm(recipe, service, userCanManageServices) {
     const { intl } = this.context;
     const config = {
       fields: {
@@ -118,7 +119,7 @@ export default class EditServiceScreen extends Component {
     if (recipe.hasTeamId) {
       Object.assign(config.fields, {
         team: {
-          disabled: !userCanManageService,
+          disabled: !userCanManageServices,
           label: intl.formatMessage(messages.team),
           placeholder: intl.formatMessage(messages.team),
           value: service.team,
@@ -130,7 +131,7 @@ export default class EditServiceScreen extends Component {
     if (recipe.hasCustomUrl) {
       Object.assign(config.fields, {
         customUrl: {
-          disabled: !userCanManageService,
+          disabled: !userCanManageServices,
           label: intl.formatMessage(messages.customUrl),
           placeholder: 'https://',
           value: service.customUrl,
@@ -182,7 +183,7 @@ export default class EditServiceScreen extends Component {
   }
 
   render() {
-    const { recipes, services, user } = this.props.stores;
+    const { recipes, services, user, features } = this.props.stores;
     const { action } = this.props.router.params;
 
     let recipe;
@@ -217,7 +218,8 @@ export default class EditServiceScreen extends Component {
       );
     }
 
-    const form = this.prepareForm(recipe, service, user.data.clientSettings.userCanManageServices);
+    const userCanManageServices = features.features.userCanManageServices;
+    const form = this.prepareForm(recipe, service, userCanManageServices);
 
     return (
       <EditServiceForm
@@ -225,6 +227,7 @@ export default class EditServiceScreen extends Component {
         recipe={recipe}
         service={service}
         user={user.data}
+        userCanManageServices={userCanManageServices}
         form={form}
         status={services.actionStatus}
         isSaving={services.updateServiceRequest.isExecuting || services.createServiceRequest.isExecuting}
@@ -241,6 +244,7 @@ EditServiceScreen.wrappedComponent.propTypes = {
     user: PropTypes.instanceOf(UserStore).isRequired,
     recipes: PropTypes.instanceOf(RecipesStore).isRequired,
     services: PropTypes.instanceOf(ServicesStore).isRequired,
+    features: PropTypes.instanceOf(FeaturesStore).isRequired,
   }).isRequired,
   router: PropTypes.shape({
     params: PropTypes.shape({
diff --git a/src/models/User.js b/src/models/User.js
index 2eb48394f..6fca78f90 100644
--- a/src/models/User.js
+++ b/src/models/User.js
@@ -16,9 +16,6 @@ export default class User {
   @observable isDonor = false;
   @observable isMiner = false;
   @observable isSSO = false;
-  @observable clientSettings = {
-    userCanManageServices: true,
-  };
   @observable company = {
     name: 'Happle Apps',
     contact: {
@@ -45,7 +42,6 @@ export default class User {
     this.isSubscriptionOwner = data.isSubscriptionOwner || this.isSubscriptionOwner;
     this.isMiner = data.isMiner || this.isMiner;
     this.isSSO = data.isSSO || this.isSSO;
-    this.clientSettings = data.clientSettings || this.clientSettings;
     this.company = data.company || this.company;
   }