Add port option to service proxy config

7 files changed, 23 insertions, 7 deletions

diff --git a/src/components/settings/services/EditServiceForm.js b/src/components/settings/services/EditServiceForm.js
index fac25c160..31ada4b22 100644
--- a/src/components/settings/services/EditServiceForm.js
+++ b/src/components/settings/services/EditServiceForm.js
@@ -97,7 +97,7 @@ const messages = defineMessages({
   },
   headlineProxy: {
     id: 'settings.service.form.proxy.headline',
-    defaultMessage: '!!!Proxy Settings',
+    defaultMessage: '!!!HTTP/HTTPS Proxy Settings',
   },
   proxyInfo: {
     id: 'settings.service.form.proxy.info',
@@ -351,7 +351,12 @@ export default @observer class EditServiceForm extends Component {
                   <Toggle field={form.$('proxy.isEnabled')} />
                   {form.$('proxy.isEnabled').value && (
                     <Fragment>
-                      <Input field={form.$('proxy.host')} />
+                      <div className="grid">
+                        <div className="grid__row">
+                          <Input field={form.$('proxy.host')} className="proxyHost" />
+                          <Input field={form.$('proxy.port')} />
+                        </div>
+                      </div>
                       <Input field={form.$('proxy.user')} />
                       <Input
                         field={form.$('proxy.password')}
diff --git a/src/components/ui/Select.js b/src/components/ui/Select.js
index 6e91300e3..da52243ca 100644
--- a/src/components/ui/Select.js
+++ b/src/components/ui/Select.js
@@ -26,8 +26,6 @@ export default @observer class Select extends Component {
       disabled,
     } = this.props;
 
-    console.log('disabled', disabled);
-
     return (
       <div
         className={classnames({
diff --git a/src/containers/settings/EditServiceScreen.js b/src/containers/settings/EditServiceScreen.js
index f0b7268d6..b46908344 100644
--- a/src/containers/settings/EditServiceScreen.js
+++ b/src/containers/settings/EditServiceScreen.js
@@ -71,6 +71,10 @@ const messages = defineMessages({
     id: 'settings.service.form.proxy.host',
     defaultMessage: '!!!Proxy Host/IP',
   },
+  proxyPort: {
+    id: 'settings.service.form.proxy.port',
+    defaultMessage: '!!!Port',
+  },
   proxyUser: {
     id: 'settings.service.form.proxy.user',
     defaultMessage: '!!!User',
@@ -233,6 +237,11 @@ export default @inject('stores', 'actions') @observer class EditServiceScreen ex
               value: serviceProxyConfig.host,
               default: '',
             },
+            port: {
+              label: intl.formatMessage(messages.proxyPort),
+              value: serviceProxyConfig.port,
+              default: '',
+            },
             user: {
               label: intl.formatMessage(messages.proxyUser),
               value: serviceProxyConfig.user,
diff --git a/src/containers/settings/EditUserScreen.js b/src/containers/settings/EditUserScreen.js
index adad8a9bd..3d35effc5 100644
--- a/src/containers/settings/EditUserScreen.js
+++ b/src/containers/settings/EditUserScreen.js
@@ -147,7 +147,6 @@ export default @inject('stores', 'actions') @observer class EditUserScreen exten
           // user={user.data}
           status={user.actionStatus}
           form={form}
-          isEnterprise={user.data.isEnterprise}
           isSaving={user.updateUserInfoRequest.isExecuting}
           onSubmit={d => this.onSubmit(d)}
         />
diff --git a/src/features/serviceProxy/index.js b/src/features/serviceProxy/index.js
index d46f9e6f1..4bea327ad 100644
--- a/src/features/serviceProxy/index.js
+++ b/src/features/serviceProxy/index.js
@@ -34,7 +34,7 @@ export default function init(stores) {
         const serviceProxyConfig = proxySettings[service.id];
 
         if (serviceProxyConfig && serviceProxyConfig.isEnabled && serviceProxyConfig.host) {
-          const proxyHost = serviceProxyConfig.host;
+          const proxyHost = `${serviceProxyConfig.host}${serviceProxyConfig.port ? `:${serviceProxyConfig.port}` : ''}`;
           debug(`Setting proxy config from service settings for "${service.name}" (${service.id}) to`, proxyHost);
 
           s.setProxy({ proxyRules: proxyHost }, () => {
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index 356eaae66..67885661c 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -133,9 +133,10 @@
   "settings.service.form.iconDelete": "Delete",
   "settings.service.form.iconUpload": "Drop your image, or click here",
   "settings.service.form.enableDarkMode": "Enable Dark Mode",
-  "settings.service.form.proxy.headline": "Proxy Settings",
+  "settings.service.form.proxy.headline": "HTTP/HTTPS Proxy Settings",
   "settings.service.form.proxy.isEnabled": "Use Proxy",
   "settings.service.form.proxy.host": "Proxy Host/IP",
+  "settings.service.form.proxy.port": "Port",
   "settings.service.form.proxy.user": "User (optional)",
   "settings.service.form.proxy.password": "Password (optional)",
   "settings.service.form.proxy.info": "Proxy settings will not synced with the Franz servers.",
diff --git a/src/styles/settings.scss b/src/styles/settings.scss
index f94ca114d..750b6bedd 100644
--- a/src/styles/settings.scss
+++ b/src/styles/settings.scss
@@ -216,6 +216,10 @@
         letter-spacing: -0.1px;
       }
     }
+
+    .proxyHost {
+      flex-basis: 70%;
+    }
   }
 
   .settings__close {