diff options
author | Stefan Malzner <stefan@adlk.io> | 2017-12-15 14:41:49 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-12-15 14:41:49 +0100 |
commit | 19c45a41cdd8051ecd97cf90ca98b0e8a13c98fb (patch) | |
tree | 50c2b2512d15cae8525889714e1f003a17371ed7 /src/containers/settings/EditServiceScreen.js | |
parent | Merge pull request #469 from meetfranz/feature/hide-badge (diff) | |
parent | Add missing translation strings (diff) | |
download | ferdium-app-19c45a41cdd8051ecd97cf90ca98b0e8a13c98fb.tar.gz ferdium-app-19c45a41cdd8051ecd97cf90ca98b0e8a13c98fb.tar.zst ferdium-app-19c45a41cdd8051ecd97cf90ca98b0e8a13c98fb.zip |
Merge pull request #474 from meetfranz/feature/service-improvements
[PR] Service improvements
Diffstat (limited to 'src/containers/settings/EditServiceScreen.js')
-rw-r--r-- | src/containers/settings/EditServiceScreen.js | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/containers/settings/EditServiceScreen.js b/src/containers/settings/EditServiceScreen.js index cdde292b0..3c52152b1 100644 --- a/src/containers/settings/EditServiceScreen.js +++ b/src/containers/settings/EditServiceScreen.js | |||
@@ -127,11 +127,22 @@ export default class EditServiceScreen extends Component { | |||
127 | }); | 127 | }); |
128 | } | 128 | } |
129 | 129 | ||
130 | // More fine grained and use case specific validation rules | ||
130 | if (recipe.hasTeamId && recipe.hasCustomUrl) { | 131 | if (recipe.hasTeamId && recipe.hasCustomUrl) { |
131 | config.fields.team.validate = [oneRequired(['team', 'customUrl'])]; | 132 | config.fields.team.validate = [oneRequired(['team', 'customUrl'])]; |
132 | config.fields.customUrl.validate = [url, oneRequired(['team', 'customUrl'])]; | 133 | config.fields.customUrl.validate = [url, oneRequired(['team', 'customUrl'])]; |
133 | } | 134 | } |
134 | 135 | ||
136 | // If a service can be hosted and has a teamId or customUrl | ||
137 | if (recipe.hasHostedOption && (recipe.hasTeamId || recipe.hasCustomUrl)) { | ||
138 | if (config.fields.team) { | ||
139 | config.fields.team.validate = []; | ||
140 | } | ||
141 | if (config.fields.customUrl) { | ||
142 | config.fields.customUrl.validate = [url]; | ||
143 | } | ||
144 | } | ||
145 | |||
135 | if (recipe.hasIndirectMessages) { | 146 | if (recipe.hasIndirectMessages) { |
136 | Object.assign(config.fields, { | 147 | Object.assign(config.fields, { |
137 | isIndirectMessageBadgeEnabled: { | 148 | isIndirectMessageBadgeEnabled: { |