From 056a8a8719bcbc36e704233789b6ecc7f1b940ff Mon Sep 17 00:00:00 2001
From: nivedin <nivedinp@gmail.com>
Date: Mon, 4 Dec 2023 16:30:18 +0530
Subject: [PATCH] chore: filter header for non active values

---
 .../src/components/graphql/Headers.vue        | 29 ++++++++++++-------
 .../src/components/http/Headers.vue           | 29 ++++++++++++-------
 2 files changed, 36 insertions(+), 22 deletions(-)

diff --git a/packages/hoppscotch-common/src/components/graphql/Headers.vue b/packages/hoppscotch-common/src/components/graphql/Headers.vue
index c532a9e3a..c9cdc6fae 100644
--- a/packages/hoppscotch-common/src/components/graphql/Headers.vue
+++ b/packages/hoppscotch-common/src/components/graphql/Headers.vue
@@ -619,20 +619,27 @@ const inheritedProperties = computed(() => {
   const inheritedHeaders = props.inheritedProperties.headers.filter(
     (header) =>
       !request.value.headers.some(
-        (requestHeader) => requestHeader.key === header.key
+        (requestHeader) => requestHeader.key === header.inheritedHeader?.key
       )
   )
 
-  const headers = inheritedHeaders.map((header, index) => ({
-    inheritedFrom: props.inheritedProperties?.headers[index].parentName,
-    source: "headers",
-    id: `header-${index}`,
-    header: {
-      key: header.inheritedHeader?.key,
-      value: header.inheritedHeader?.value,
-      active: header.inheritedHeader?.active,
-    },
-  }))
+  const headers = inheritedHeaders
+    .filter(
+      (header) =>
+        header.inheritedHeader !== null &&
+        header.inheritedHeader !== undefined &&
+        header.inheritedHeader.active
+    )
+    .map((header, index) => ({
+      inheritedFrom: props.inheritedProperties?.headers[index].parentName,
+      source: "headers",
+      id: `header-${index}`,
+      header: {
+        key: header.inheritedHeader?.key,
+        value: header.inheritedHeader?.value,
+        active: header.inheritedHeader?.active,
+      },
+    }))
 
   let auth = [] as {
     inheritedFrom: string
diff --git a/packages/hoppscotch-common/src/components/http/Headers.vue b/packages/hoppscotch-common/src/components/http/Headers.vue
index f7ce8caeb..9e462d863 100644
--- a/packages/hoppscotch-common/src/components/http/Headers.vue
+++ b/packages/hoppscotch-common/src/components/http/Headers.vue
@@ -570,20 +570,27 @@ const inheritedProperties = computed(() => {
   const inheritedHeaders = props.inheritedProperties.headers.filter(
     (header) =>
       !request.value.headers.some(
-        (requestHeader) => requestHeader.key === header.key
+        (requestHeader) => requestHeader.key === header.inheritedHeader?.key
       )
   )
 
-  const headers = inheritedHeaders.map((header, index) => ({
-    inheritedFrom: props.inheritedProperties?.headers[index].parentName,
-    source: "headers",
-    id: `header-${index}`,
-    header: {
-      key: header.inheritedHeader?.key,
-      value: header.inheritedHeader?.value,
-      active: header.inheritedHeader?.active,
-    },
-  }))
+  const headers = inheritedHeaders
+    .filter(
+      (header) =>
+        header.inheritedHeader !== null &&
+        header.inheritedHeader !== undefined &&
+        header.inheritedHeader.active
+    )
+    .map((header, index) => ({
+      inheritedFrom: props.inheritedProperties?.headers[index].parentName,
+      source: "headers",
+      id: `header-${index}`,
+      header: {
+        key: header.inheritedHeader?.key,
+        value: header.inheritedHeader?.value,
+        active: header.inheritedHeader?.active,
+      },
+    }))
 
   let auth = [] as {
     inheritedFrom: string