From 1f96fe2d316a09fe076ce1ce3911d5ca624bee02 Mon Sep 17 00:00:00 2001
From: Edmundo Ruiz Ghanem <edmundo@airbyte.io>
Date: Fri, 10 Jun 2022 08:44:41 -0400
Subject: [PATCH] Fix eslint errors manually disable assignmentExpression for
 arrays in prefer-destructuring rule

---
 airbyte-webapp/.eslintrc                           | 13 ++++++++-----
 airbyte-webapp/src/core/request/apiOverride.ts     |  2 +-
 .../Connector/ConnectorCard/useTestConnector.tsx   | 14 ++++++--------
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/airbyte-webapp/.eslintrc b/airbyte-webapp/.eslintrc
index 7fa35ba974a8..62dc5539d39a 100644
--- a/airbyte-webapp/.eslintrc
+++ b/airbyte-webapp/.eslintrc
@@ -30,7 +30,7 @@
     "object-shorthand": ["warn", "always"],
     "prefer-arrow-callback": "warn",
     "prefer-const": "warn",
-    "prefer-destructuring": "warn",
+    "prefer-destructuring": ["warn", { "AssignmentExpression": { "array": true } }],
     "prefer-object-spread": "warn",
     "prefer-template": "warn",
     "yoda": "warn",
@@ -69,10 +69,13 @@
     "@typescript-eslint/consistent-indexed-object-style": ["warn", "record"],
     "@typescript-eslint/consistent-type-definitions": ["warn", "interface"],
     "@typescript-eslint/no-unused-vars": "warn",
-    "react/function-component-definition": ["warn", {
-      "namedComponents": "arrow-function",
-      "unnamedComponents": "arrow-function"
-    }],
+    "react/function-component-definition": [
+      "warn",
+      {
+        "namedComponents": "arrow-function",
+        "unnamedComponents": "arrow-function"
+      }
+    ],
     "react/jsx-boolean-value": "warn",
     "react/jsx-curly-brace-presence": "warn",
     "react/jsx-fragments": "warn",
diff --git a/airbyte-webapp/src/core/request/apiOverride.ts b/airbyte-webapp/src/core/request/apiOverride.ts
index 03e6e022beb3..570e178508bd 100644
--- a/airbyte-webapp/src/core/request/apiOverride.ts
+++ b/airbyte-webapp/src/core/request/apiOverride.ts
@@ -51,7 +51,7 @@ export const apiOverride = async <T, U = unknown>(
   const requestUrl = `${apiUrl.replace(/\/v1\/?$/, "")}${url.startsWith("/") ? "" : "/"}${url}`;
 
   for (const middleware of options.middlewares) {
-    headers = (await middleware({ headers })).headers;
+    ({ headers } = await middleware({ headers }));
   }
 
   const response = await fetch(`${requestUrl}${new URLSearchParams(params)}`, {
diff --git a/airbyte-webapp/src/views/Connector/ConnectorCard/useTestConnector.tsx b/airbyte-webapp/src/views/Connector/ConnectorCard/useTestConnector.tsx
index 337ff7940520..4c586af3fa39 100644
--- a/airbyte-webapp/src/views/Connector/ConnectorCard/useTestConnector.tsx
+++ b/airbyte-webapp/src/views/Connector/ConnectorCard/useTestConnector.tsx
@@ -60,15 +60,13 @@ export const useTestConnector = (
             signal: controller.signal,
           };
         }
-      } else {
+      } else if (values) {
         // creating new connection
-        if (values) {
-          payload = {
-            connectionConfiguration: values.connectionConfiguration,
-            signal: controller.signal,
-            selectedConnectorDefinitionId: values.serviceType,
-          };
-        }
+        payload = {
+          connectionConfiguration: values.connectionConfiguration,
+          signal: controller.signal,
+          selectedConnectorDefinitionId: values.serviceType,
+        };
       }
 
       if (!payload) {