diff options
author | 2018-02-13 11:02:28 +0100 | |
---|---|---|
committer | 2018-02-13 11:02:28 +0100 | |
commit | 4284b88f44caa9b7adb180a1e07bdd834f5b7ad6 (patch) | |
tree | 619e5a42fb9100c4b7982a6ecf55d28fe276e546 /src/containers | |
parent | Merge pull request #654 from meetfranz/feature/invite-button (diff) | |
download | ferdium-app-4284b88f44caa9b7adb180a1e07bdd834f5b7ad6.tar.gz ferdium-app-4284b88f44caa9b7adb180a1e07bdd834f5b7ad6.tar.zst ferdium-app-4284b88f44caa9b7adb180a1e07bdd834f5b7ad6.zip |
feat(App) Feature Added enterprise UI
##Account Dashboard:
- CHANGE account type to 'Enterprise Account' (green badge)
- REMOVE button 'Edit Account' if SSO login is used
- ADD company name and contact information
- REMOVE premium account plans section
- REMOVE account deletion
##Settings Navigation
- REMOVE available services if user not allowed to manage services
##Edit Service
- REMOVE delete button if user not allowed to manage services
- CHANGE disable team / custom URL if user not allowed to manage services
##Edit User
- REMOVE account type
##User.js
- ADD mock enterprise properties
##Input.js
- FIX disabled passthrough
Diffstat (limited to 'src/containers')
-rw-r--r-- | src/containers/settings/EditServiceScreen.js | 6 | ||||
-rw-r--r-- | src/containers/settings/EditUserScreen.js | 1 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/containers/settings/EditServiceScreen.js b/src/containers/settings/EditServiceScreen.js index 00e888cc4..9084b9889 100644 --- a/src/containers/settings/EditServiceScreen.js +++ b/src/containers/settings/EditServiceScreen.js | |||
@@ -77,7 +77,7 @@ export default class EditServiceScreen extends Component { | |||
77 | } | 77 | } |
78 | } | 78 | } |
79 | 79 | ||
80 | prepareForm(recipe, service) { | 80 | prepareForm(recipe, service, userCanManageService) { |
81 | const { intl } = this.context; | 81 | const { intl } = this.context; |
82 | const config = { | 82 | const config = { |
83 | fields: { | 83 | fields: { |
@@ -118,6 +118,7 @@ export default class EditServiceScreen extends Component { | |||
118 | if (recipe.hasTeamId) { | 118 | if (recipe.hasTeamId) { |
119 | Object.assign(config.fields, { | 119 | Object.assign(config.fields, { |
120 | team: { | 120 | team: { |
121 | disabled: !userCanManageService, | ||
121 | label: intl.formatMessage(messages.team), | 122 | label: intl.formatMessage(messages.team), |
122 | placeholder: intl.formatMessage(messages.team), | 123 | placeholder: intl.formatMessage(messages.team), |
123 | value: service.team, | 124 | value: service.team, |
@@ -129,6 +130,7 @@ export default class EditServiceScreen extends Component { | |||
129 | if (recipe.hasCustomUrl) { | 130 | if (recipe.hasCustomUrl) { |
130 | Object.assign(config.fields, { | 131 | Object.assign(config.fields, { |
131 | customUrl: { | 132 | customUrl: { |
133 | disabled: !userCanManageService, | ||
132 | label: intl.formatMessage(messages.customUrl), | 134 | label: intl.formatMessage(messages.customUrl), |
133 | placeholder: 'https://', | 135 | placeholder: 'https://', |
134 | value: service.customUrl, | 136 | value: service.customUrl, |
@@ -215,7 +217,7 @@ export default class EditServiceScreen extends Component { | |||
215 | ); | 217 | ); |
216 | } | 218 | } |
217 | 219 | ||
218 | const form = this.prepareForm(recipe, service); | 220 | const form = this.prepareForm(recipe, service, user.data.clientSettings.userCanManageServices); |
219 | 221 | ||
220 | return ( | 222 | return ( |
221 | <EditServiceForm | 223 | <EditServiceForm |
diff --git a/src/containers/settings/EditUserScreen.js b/src/containers/settings/EditUserScreen.js index dda8ce513..a67fa7fb5 100644 --- a/src/containers/settings/EditUserScreen.js +++ b/src/containers/settings/EditUserScreen.js | |||
@@ -145,6 +145,7 @@ export default class EditUserScreen extends Component { | |||
145 | // user={user.data} | 145 | // user={user.data} |
146 | status={user.actionStatus} | 146 | status={user.actionStatus} |
147 | form={form} | 147 | form={form} |
148 | isEnterprise={user.data.isEnterprise} | ||
148 | isSaving={user.updateUserInfoRequest.isExecuting} | 149 | isSaving={user.updateUserInfoRequest.isExecuting} |
149 | onSubmit={d => this.onSubmit(d)} | 150 | onSubmit={d => this.onSubmit(d)} |
150 | /> | 151 | /> |