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

fix: race condition mutating defaultRESTRequest

Browse Source
This commit is contained in:
liyasthomas
2021-12-31 23:25:46 +05:30
parent b78b2d0e78
commit 4ecd69cc5a
4 changed files with 19 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
packages/hoppscotch-app/components/http/Headers.vue
View File

@@ -233,12 +233,9 @@ watch(bulkHeaders, () => {
.split("\n")
.filter((x) => x.trim().length > 0 && x.includes(":"))
.map((item) => ({
key: item
.substring(0, item.indexOf(":"))
.trimLeft()
.replace(/^\/\//, ""),
key: item.substring(0, item.indexOf(":")).trimLeft().replace(/^#/, ""),
value: item.substring(item.indexOf(":") + 1).trimLeft(),
active: !item.trim().startsWith("//"),
active: !item.trim().startsWith("#"),
}))
const filteredHeaders = workingHeaders.value.filter((x) => x.key !== "")
@@ -251,15 +248,16 @@ watch(bulkHeaders, () => {
console.error(e)
}
})
watch(workingHeaders, (newHeadersList) => {
// If we are in bulk mode, don't apply direct changes
if (bulkMode.value) return
try {
const currentBulkHeaders = bulkHeaders.value.split("\n").map((item) => ({
key: item.substring(0, item.indexOf(":")).trimLeft().replace(/^\/\//, ""),
key: item.substring(0, item.indexOf(":")).trimLeft().replace(/^#/, ""),
value: item.substring(item.indexOf(":") + 1).trimLeft(),
active: !item.trim().startsWith("//"),
active: !item.trim().startsWith("#"),
}))
const filteredHeaders = newHeadersList.filter((x) => x.key !== "")
@@ -267,7 +265,7 @@ watch(workingHeaders, (newHeadersList) => {
if (!isEqual(currentBulkHeaders, filteredHeaders)) {
bulkHeaders.value = filteredHeaders
.map((header) => {
return `${header.active ? "" : "//"}${header.key}: ${header.value}`
return `${header.active ? "" : "#"}${header.key}: ${header.value}`
})
.join("\n")
}

14
packages/hoppscotch-app/components/http/Parameters.vue
View File

@@ -224,12 +224,9 @@ watch(bulkParams, () => {
.split("\n")
.filter((x) => x.trim().length > 0 && x.includes(":"))
.map((item) => ({
key: item
.substring(0, item.indexOf(":"))
.trimLeft()
.replace(/^\/\//, ""),
key: item.substring(0, item.indexOf(":")).trimLeft().replace(/^#/, ""),
value: item.substring(item.indexOf(":") + 1).trimLeft(),
active: !item.trim().startsWith("//"),
active: !item.trim().startsWith("#"),
}))
const filteredParams = workingParams.value.filter((x) => x.key !== "")
@@ -242,15 +239,16 @@ watch(bulkParams, () => {
console.error(e)
}
})
watch(workingParams, (newParamsList) => {
// If we are in bulk mode, don't apply direct changes
if (bulkMode.value) return
try {
const currentBulkParams = bulkParams.value.split("\n").map((item) => ({
key: item.substring(0, item.indexOf(":")).trimLeft().replace(/^\/\//, ""),
key: item.substring(0, item.indexOf(":")).trimLeft().replace(/^#/, ""),
value: item.substring(item.indexOf(":") + 1).trimLeft(),
active: !item.trim().startsWith("//"),
active: !item.trim().startsWith("#"),
}))
const filteredParams = newParamsList.filter((x) => x.key !== "")
@@ -258,7 +256,7 @@ watch(workingParams, (newParamsList) => {
if (!isEqual(currentBulkParams, filteredParams)) {
bulkParams.value = filteredParams
.map((param) => {
return `${param.active ? "" : "//"}${param.key}: ${param.value}`
return `${param.active ? "" : "#"}${param.key}: ${param.value}`
})
.join("\n")
}