5 files changed, 92 insertions, 35 deletions

diff --git a/src/components/settings/account/AccountDashboard.js b/src/components/settings/account/AccountDashboard.js
index 2fcfdfc9a..ede519fd6 100644
--- a/src/components/settings/account/AccountDashboard.js
+++ b/src/components/settings/account/AccountDashboard.js
@@ -44,6 +44,10 @@ const messages = defineMessages({
     id: 'settings.account.accountType.premium',
     defaultMessage: '!!!Premium Supporter Account',
   },
+  accountTypeEnterprise: {
+    id: 'settings.account.accountType.enterprise',
+    defaultMessage: '!!!Enterprise Account',
+  },
   accountEditButton: {
     id: 'settings.account.account.editButton',
     defaultMessage: '!!!Edit Account',
@@ -166,17 +170,21 @@ export default @observer class AccountDashboard extends Component {
                       </h2>
                       {user.organization && `${user.organization}, `}
                       {user.email}<br />
-                      {!user.isPremium && (
+                      {!user.isEnterprise && !user.isPremium && (
                         <span className="badge badge">{intl.formatMessage(messages.accountTypeBasic)}</span>
                       )}
                       {user.isPremium && (
                         <span className="badge badge--premium">{intl.formatMessage(messages.accountTypePremium)}</span>
                       )}
+                      {user.isEnterprise && (
+                        <span className="badge badge--success">{intl.formatMessage(messages.accountTypeEnterprise)}</span>
+                      )}
                     </div>
-                    <Link to="/settings/user/edit" className="button">
-                      {intl.formatMessage(messages.accountEditButton)}
-                    </Link>
-
+                    {!user.isSSO && (
+                      <Link to="/settings/user/edit" className="button">
+                        {intl.formatMessage(messages.accountEditButton)}
+                      </Link>
+                    )}
                     {user.emailValidated}
                   </div>
                 </div>
@@ -229,6 +237,33 @@ export default @observer class AccountDashboard extends Component {
                 )
               )}
 
+              {user.isEnterprise && (
+                <div className="account">
+                  <div className="account__box">
+                    <h2>{user.company.name}</h2>
+                    <p>
+                      Technical contact:&nbsp;
+                      <Link
+                        className="link"
+                        target="_blank"
+                        to={`mailto:${user.company.contact.technical}?subject=Franz`}
+                      >
+                        {user.company.contact.technical}
+                      </Link>
+                      <br />
+                      General contact:&nbsp;
+                      <Link
+                        className="link"
+                        target="_blank"
+                        to={`mailto:${user.company.contact.default}?subject=Franz`}
+                      >
+                        {user.company.contact.default}
+                      </Link>
+                    </p>
+                  </div>
+                </div>
+              )}
+
               {user.isMiner && (
                 <div className="account franz-form">
                   <div className="account__box account__box">
@@ -243,7 +278,7 @@ export default @observer class AccountDashboard extends Component {
                 </div>
               )}
 
-              {!user.isPremium && (
+              {!user.isEnterprise && !user.isPremium && (
                 isLoadingPlans ? (
                   <Loader />
                 ) : (
@@ -258,28 +293,29 @@ export default @observer class AccountDashboard extends Component {
                 )
               )}
 
-              <div className="account franz-form">
-                <div className="account__box">
-                  <h2>{intl.formatMessage(messages.headlineDangerZone)}</h2>
-                  {!isDeleteAccountSuccessful && (
-                    <div className="account__subscription">
-                      <p>{intl.formatMessage(messages.deleteInfo)}</p>
-                      <Button
-                        label={intl.formatMessage(messages.deleteAccount)}
-                        buttonType="danger"
-                        onClick={() => deleteAccount()}
-                        loaded={!isLoadingDeleteAccount}
-                      />
-                    </div>
-                  )}
-                  {isDeleteAccountSuccessful && (
-                    <p>{intl.formatMessage(messages.deleteEmailSent)}</p>
-                  )}
+              {!user.isEnterprise && (
+                <div className="account franz-form">
+                  <div className="account__box">
+                    <h2>{intl.formatMessage(messages.headlineDangerZone)}</h2>
+                    {!isDeleteAccountSuccessful && (
+                      <div className="account__subscription">
+                        <p>{intl.formatMessage(messages.deleteInfo)}</p>
+                        <Button
+                          label={intl.formatMessage(messages.deleteAccount)}
+                          buttonType="danger"
+                          onClick={() => deleteAccount()}
+                          loaded={!isLoadingDeleteAccount}
+                        />
+                      </div>
+                    )}
+                    {isDeleteAccountSuccessful && (
+                      <p>{intl.formatMessage(messages.deleteEmailSent)}</p>
+                    )}
+                  </div>
                 </div>
-              </div>
+              )}
             </div>
           )}
-
         </div>
         <ReactTooltip place="right" type="dark" effect="solid" />
       </div>
diff --git a/src/components/settings/navigation/SettingsNavigation.js b/src/components/settings/navigation/SettingsNavigation.js
index 66539f324..46b2f82fc 100644
--- a/src/components/settings/navigation/SettingsNavigation.js
+++ b/src/components/settings/navigation/SettingsNavigation.js
@@ -1,6 +1,7 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { defineMessages, intlShape } from 'react-intl';
+import { inject, observer } from 'mobx-react';
 
 import Link from '../../ui/Link';
 
@@ -31,6 +32,7 @@ const messages = defineMessages({
   },
 });
 
+@inject('stores') @observer
 export default class SettingsNavigation extends Component {
   static propTypes = {
     serviceCount: PropTypes.number.isRequired,
@@ -42,17 +44,20 @@ export default class SettingsNavigation extends Component {
 
   render() {
     const { serviceCount } = this.props;
+    const { features } = this.props.stores.features;
     const { intl } = this.context;
 
     return (
       <div className="settings-navigation">
-        <Link
-          to="/settings/recipes"
-          className="settings-navigation__link"
-          activeClassName="is-active"
-        >
-          {intl.formatMessage(messages.availableServices)}
-        </Link>
+        {features.userCanManageServices && (
+          <Link
+            to="/settings/recipes"
+            className="settings-navigation__link"
+            activeClassName="is-active"
+          >
+            {intl.formatMessage(messages.availableServices)}
+          </Link>
+        )}
         <Link
           to="/settings/services"
           className="settings-navigation__link"
@@ -92,3 +97,12 @@ export default class SettingsNavigation extends Component {
     );
   }
 }
+
+SettingsNavigation.wrappedComponent.propTypes = {
+  stores: PropTypes.shape({
+    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 f9afe4c8d..777a95fcf 100644
--- a/src/components/settings/services/EditServiceForm.js
+++ b/src/components/settings/services/EditServiceForm.js
@@ -106,6 +106,7 @@ export default @observer 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,
@@ -168,6 +169,7 @@ export default @observer class EditServiceForm extends Component {
       service,
       action,
       user,
+      userCanManageServices,
       form,
       isSaving,
       isDeleting,
@@ -326,7 +328,7 @@ export default @observer class EditServiceForm extends Component {
         </div>
         <div className="settings__controls">
           {/* Delete Button */}
-          {action === 'edit' && deleteButton}
+          {action === 'edit' && userCanManageServices && deleteButton}
 
           {/* Save Button */}
           {isSaving || isValidatingCustomUrl ? (
diff --git a/src/components/settings/user/EditUserForm.js b/src/components/settings/user/EditUserForm.js
index 6c0305089..b825f844a 100644
--- a/src/components/settings/user/EditUserForm.js
+++ b/src/components/settings/user/EditUserForm.js
@@ -45,6 +45,7 @@ export default @observer class EditServiceForm extends Component {
     form: PropTypes.instanceOf(Form).isRequired,
     onSubmit: PropTypes.func.isRequired,
     isSaving: PropTypes.bool.isRequired,
+    isEnterprise: PropTypes.bool.isRequired,
   };
 
   static defaultProps = {
@@ -71,6 +72,7 @@ export default @observer class EditServiceForm extends Component {
       // user,
       status,
       form,
+      isEnterprise,
       isSaving,
     } = this.props;
     const { intl } = this.context;
@@ -104,8 +106,10 @@ export default @observer class EditServiceForm extends Component {
               <Input field={form.$('lastname')} />
             </div>
             <Input field={form.$('email')} />
-            <Radio field={form.$('accountType')} />
-            {form.$('accountType').value === 'company' && (
+            {!isEnterprise && (
+              <Radio field={form.$('accountType')} />
+            )}
+            {!isEnterprise && form.$('accountType').value === 'company' && (
               <Input field={form.$('organization')} />
             )}
             <h2>{intl.formatMessage(messages.headlinePassword)}</h2>
diff --git a/src/components/ui/Input.js b/src/components/ui/Input.js
index 7fc5b69b0..7bf6e1b00 100644
--- a/src/components/ui/Input.js
+++ b/src/components/ui/Input.js
@@ -96,6 +96,7 @@ export default @observer class Input extends Component {
             onBlur={field.onBlur}
             onFocus={field.onFocus}
             ref={(element) => { this.inputElement = element; }}
+            disabled={field.disabled}
           />
           {suffix && (
             <span className="franz-form__input-suffix">{suffix}</span>