From 2772cb2e3e75f16b3dc96a2441518ed0772e3ba1 Mon Sep 17 00:00:00 2001
From: Vijay A <avijayr@protonmail.com>
Date: Wed, 8 Sep 2021 20:47:39 +0530
Subject: chore: proxy feature is always turned on: remove 'enabled' flag

---
 src/containers/settings/EditServiceScreen.js | 77 +++++++++++++---------------
 1 file changed, 36 insertions(+), 41 deletions(-)

(limited to 'src/containers/settings')

diff --git a/src/containers/settings/EditServiceScreen.js b/src/containers/settings/EditServiceScreen.js
index c880e97ae..3a66a27e6 100644
--- a/src/containers/settings/EditServiceScreen.js
+++ b/src/containers/settings/EditServiceScreen.js
@@ -18,8 +18,6 @@ import ErrorBoundary from '../../components/util/ErrorBoundary';
 import { required, url, oneRequired } from '../../helpers/validation-helpers';
 import { getSelectOptions } from '../../helpers/i18n-helpers';
 
-import { config as proxyFeature } from '../../features/serviceProxy';
-
 import { SPELLCHECKER_LOCALES } from '../../i18n/languages';
 
 import globalMessages from '../../i18n/globalMessages';
@@ -131,7 +129,7 @@ export default @inject('stores', 'actions') @observer class EditServiceScreen ex
     }
   }
 
-  prepareForm(recipe, service, proxy) {
+  prepareForm(recipe, service) {
     const {
       intl,
     } = this.context;
@@ -275,44 +273,42 @@ export default @inject('stores', 'actions') @observer class EditServiceScreen ex
       });
     }
 
-    if (proxy.isEnabled) {
-      const serviceProxyConfig = stores.settings.proxy[service.id] || {};
-
-      Object.assign(config.fields, {
-        proxy: {
-          name: 'proxy',
-          label: 'proxy',
-          fields: {
-            isEnabled: {
-              label: intl.formatMessage(messages.enableProxy),
-              value: serviceProxyConfig.isEnabled,
-              default: false,
-            },
-            host: {
-              label: intl.formatMessage(messages.proxyHost),
-              value: serviceProxyConfig.host,
-              default: '',
-            },
-            port: {
-              label: intl.formatMessage(messages.proxyPort),
-              value: serviceProxyConfig.port,
-              default: '',
-            },
-            user: {
-              label: intl.formatMessage(messages.proxyUser),
-              value: serviceProxyConfig.user,
-              default: '',
-            },
-            password: {
-              label: intl.formatMessage(messages.proxyPassword),
-              value: serviceProxyConfig.password,
-              default: '',
-              type: 'password',
-            },
+    const serviceProxyConfig = stores.settings.proxy[service.id] || {};
+
+    Object.assign(config.fields, {
+      proxy: {
+        name: 'proxy',
+        label: 'proxy',
+        fields: {
+          isEnabled: {
+            label: intl.formatMessage(messages.enableProxy),
+            value: serviceProxyConfig.isEnabled,
+            default: false,
+          },
+          host: {
+            label: intl.formatMessage(messages.proxyHost),
+            value: serviceProxyConfig.host,
+            default: '',
+          },
+          port: {
+            label: intl.formatMessage(messages.proxyPort),
+            value: serviceProxyConfig.port,
+            default: '',
+          },
+          user: {
+            label: intl.formatMessage(messages.proxyUser),
+            value: serviceProxyConfig.user,
+            default: '',
+          },
+          password: {
+            label: intl.formatMessage(messages.proxyPassword),
+            value: serviceProxyConfig.password,
+            default: '',
+            type: 'password',
           },
         },
-      });
-    }
+      },
+    });
 
     return new Form(config);
   }
@@ -381,7 +377,7 @@ export default @inject('stores', 'actions') @observer class EditServiceScreen ex
       );
     }
 
-    const form = this.prepareForm(recipe, service, proxyFeature);
+    const form = this.prepareForm(recipe, service);
 
     return (
       <ErrorBoundary>
@@ -397,7 +393,6 @@ export default @inject('stores', 'actions') @observer class EditServiceScreen ex
           onSubmit={(d) => this.onSubmit(d)}
           onDelete={() => this.deleteService()}
           openRecipeFile={(file) => this.openRecipeFile(file)}
-          isProxyFeatureEnabled={proxyFeature.isEnabled}
         />
       </ErrorBoundary>
     );
-- 
cgit v1.2.3-54-g00ecf