btwedutech/hoppscotch
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 6 Wiki Activity

chore: filter header for non active values

Browse Source
This commit is contained in:
nivedin
2023-12-04 16:30:18 +05:30
committed by Andrew Bastin
parent 9bfe195253
commit 056a8a8719
2 changed files with 36 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
packages/hoppscotch-common/src/components/graphql/Headers.vue
View File

@@ -619,20 +619,27 @@ const inheritedProperties = computed(() => {
const inheritedHeaders = props.inheritedProperties.headers.filter( const inheritedHeaders = props.inheritedProperties.headers.filter(
(header) => (header) =>
!request.value.headers.some( !request.value.headers.some(
(requestHeader) => requestHeader.key === header.key (requestHeader) => requestHeader.key === header.inheritedHeader?.key
) )
) )
const headers = inheritedHeaders.map((header, index) => ({ const headers = inheritedHeaders
inheritedFrom: props.inheritedProperties?.headers[index].parentName, .filter(
source: "headers", (header) =>
id: `header-${index}`, header.inheritedHeader !== null &&
header: { header.inheritedHeader !== undefined &&
key: header.inheritedHeader?.key, header.inheritedHeader.active
value: header.inheritedHeader?.value, )
active: 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 { let auth = [] as {
inheritedFrom: string inheritedFrom: string

29
packages/hoppscotch-common/src/components/http/Headers.vue
View File

@@ -570,20 +570,27 @@ const inheritedProperties = computed(() => {
const inheritedHeaders = props.inheritedProperties.headers.filter( const inheritedHeaders = props.inheritedProperties.headers.filter(
(header) => (header) =>
!request.value.headers.some( !request.value.headers.some(
(requestHeader) => requestHeader.key === header.key (requestHeader) => requestHeader.key === header.inheritedHeader?.key
) )
) )
const headers = inheritedHeaders.map((header, index) => ({ const headers = inheritedHeaders
inheritedFrom: props.inheritedProperties?.headers[index].parentName, .filter(
source: "headers", (header) =>
id: `header-${index}`, header.inheritedHeader !== null &&
header: { header.inheritedHeader !== undefined &&
key: header.inheritedHeader?.key, header.inheritedHeader.active
value: header.inheritedHeader?.value, )
active: 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 { let auth = [] as {
inheritedFrom: string inheritedFrom: string