From 62972747866740dae84fc7b519fcedd731572329 Mon Sep 17 00:00:00 2001 From: Stefan Malzner Date: Tue, 27 Nov 2018 18:06:14 +0100 Subject: feat(App): Add proxy support for services --- .../settings/services/EditServiceForm.js | 45 ++++++++++++++++++++-- 1 file changed, 42 insertions(+), 3 deletions(-) (limited to 'src/components/settings/services') diff --git a/src/components/settings/services/EditServiceForm.js b/src/components/settings/services/EditServiceForm.js index 777a95fcf..47772efae 100644 --- a/src/components/settings/services/EditServiceForm.js +++ b/src/components/settings/services/EditServiceForm.js @@ -15,6 +15,8 @@ import Toggle from '../../ui/Toggle'; import Button from '../../ui/Button'; import ImageUpload from '../../ui/ImageUpload'; +import PremiumFeatureContainer from '../../ui/PremiumFeatureContainer'; + const messages = defineMessages({ saveService: { id: 'settings.service.form.saveButton', @@ -92,6 +94,14 @@ const messages = defineMessages({ id: 'settings.service.form.iconUpload', defaultMessage: '!!!Drop your image, or click here', }, + headlineProxy: { + id: 'settings.service.form.proxy.headline', + defaultMessage: '!!!Proxy Settings', + }, + proxyInfo: { + id: 'settings.service.form.proxy.info', + defaultMessage: '!!!Proxy settings will not be synchronized with the Franz servers.', + }, }); export default @observer class EditServiceForm extends Component { @@ -106,13 +116,14 @@ 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, onDelete: PropTypes.func.isRequired, isSaving: PropTypes.bool.isRequired, isDeleting: PropTypes.bool.isRequired, + isProxyFeatureEnabled: PropTypes.bool.isRequired, + isProxyFeaturePremiumFeature: PropTypes.bool.isRequired, }; static defaultProps = { @@ -169,11 +180,12 @@ export default @observer class EditServiceForm extends Component { service, action, user, - userCanManageServices, form, isSaving, isDeleting, onDelete, + isProxyFeatureEnabled, + isProxyFeaturePremiumFeature, } = this.props; const { intl } = this.context; @@ -318,6 +330,33 @@ export default @observer class EditServiceForm extends Component { /> + + {isProxyFeatureEnabled && ( + +
+

+ {intl.formatMessage(messages.headlineProxy)} + beta +

+ + {form.$('proxy.isEnabled').value && ( +
+ + + +

+ + {intl.formatMessage(messages.proxyInfo)} +

+
+ )} +
+
+ )} + {recipe.message && (

@@ -328,7 +367,7 @@ export default @observer class EditServiceForm extends Component {

{/* Delete Button */} - {action === 'edit' && userCanManageServices && deleteButton} + {action === 'edit' && deleteButton} {/* Save Button */} {isSaving || isValidatingCustomUrl ? ( -- cgit v1.2.3-54-g00ecf