diff options
author | 2018-02-26 17:06:27 +0100 | |
---|---|---|
committer | 2018-02-26 17:06:27 +0100 | |
commit | 399f4f89229913c33e074bc3ee56a209ac2f3c1d (patch) | |
tree | 1b1078bf8e3fd9a81c4878e3a53814fe283917c4 /src/containers | |
parent | feat(App) Feature Added enterprise UI (diff) | |
parent | ADD `features` request (diff) | |
download | ferdium-app-399f4f89229913c33e074bc3ee56a209ac2f3c1d.tar.gz ferdium-app-399f4f89229913c33e074bc3ee56a209ac2f3c1d.tar.zst ferdium-app-399f4f89229913c33e074bc3ee56a209ac2f3c1d.zip |
Merge branch 'feature/features-api' into feature/enterprise-ui
Diffstat (limited to 'src/containers')
-rw-r--r-- | src/containers/layout/AppLayoutContainer.js | 6 | ||||
-rw-r--r-- | src/containers/settings/EditServiceScreen.js | 8 |
2 files changed, 9 insertions, 5 deletions
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 { | |||
26 | render() { | 26 | render() { |
27 | const { | 27 | const { |
28 | app, | 28 | app, |
29 | features, | ||
29 | services, | 30 | services, |
30 | ui, | 31 | ui, |
31 | news, | 32 | news, |
@@ -64,10 +65,13 @@ export default class AppLayoutContainer extends Component { | |||
64 | 65 | ||
65 | const { children } = this.props; | 66 | const { children } = this.props; |
66 | 67 | ||
68 | const isLoadingFeatures = features.featuresRequest.isExecuting | ||
69 | && features.featuresRequest.isExecutingFirstTime; | ||
70 | |||
67 | const isLoadingServices = services.allServicesRequest.isExecuting | 71 | const isLoadingServices = services.allServicesRequest.isExecuting |
68 | && services.allServicesRequest.isExecutingFirstTime; | 72 | && services.allServicesRequest.isExecutingFirstTime; |
69 | 73 | ||
70 | if (isLoadingServices) { | 74 | if (isLoadingFeatures || isLoadingServices) { |
71 | return ( | 75 | return ( |
72 | <AppLoader /> | 76 | <AppLoader /> |
73 | ); | 77 | ); |
diff --git a/src/containers/settings/EditServiceScreen.js b/src/containers/settings/EditServiceScreen.js index 9084b9889..0ddb84db0 100644 --- a/src/containers/settings/EditServiceScreen.js +++ b/src/containers/settings/EditServiceScreen.js | |||
@@ -141,17 +141,17 @@ export default class EditServiceScreen extends Component { | |||
141 | 141 | ||
142 | // More fine grained and use case specific validation rules | 142 | // More fine grained and use case specific validation rules |
143 | if (recipe.hasTeamId && recipe.hasCustomUrl) { | 143 | if (recipe.hasTeamId && recipe.hasCustomUrl) { |
144 | config.fields.team.validate = [oneRequired(['team', 'customUrl'])]; | 144 | config.fields.team.validators = [oneRequired(['team', 'customUrl'])]; |
145 | config.fields.customUrl.validate = [url, oneRequired(['team', 'customUrl'])]; | 145 | config.fields.customUrl.validators = [url, oneRequired(['team', 'customUrl'])]; |
146 | } | 146 | } |
147 | 147 | ||
148 | // If a service can be hosted and has a teamId or customUrl | 148 | // If a service can be hosted and has a teamId or customUrl |
149 | if (recipe.hasHostedOption && (recipe.hasTeamId || recipe.hasCustomUrl)) { | 149 | if (recipe.hasHostedOption && (recipe.hasTeamId || recipe.hasCustomUrl)) { |
150 | if (config.fields.team) { | 150 | if (config.fields.team) { |
151 | config.fields.team.validate = []; | 151 | config.fields.team.validators = []; |
152 | } | 152 | } |
153 | if (config.fields.customUrl) { | 153 | if (config.fields.customUrl) { |
154 | config.fields.customUrl.validate = [url]; | 154 | config.fields.customUrl.validators = [url]; |
155 | } | 155 | } |
156 | } | 156 | } |
157 | 157 | ||