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

merge commit

Browse Source
This commit is contained in:
isaiM6
2022-08-01 14:11:37 -07:00
parent cabc775f58 f515ac4f52
commit 630ab1f4f4
3 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/hoppscotch-app/components/smart/EnvInput.vue
View File

@@ -118,6 +118,8 @@ const aggregateVars = useReadonlyStream(restVars$, []) as Ref<HoppRESTVar[]>
const aggregateVars = useReadonlyStream(restVars$, []) as Ref<HoppRESTVar[]> const aggregateVars = useReadonlyStream(restVars$, []) as Ref<HoppRESTVar[]>
const aggregateVars = useReadonlyStream(restVars$, []) as Ref<HoppRESTVar[]>
const envVars = computed(() => const envVars = computed(() =>
props.envs props.envs
? props.envs.map((x) => ({ ? props.envs.map((x) => ({

6
packages/hoppscotch-app/helpers/utils/EffectiveURL.ts
View File

@@ -15,10 +15,14 @@ import {
HoppRESTParam, HoppRESTParam,
} from "@hoppscotch/data" } from "@hoppscotch/data"
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
import { parseTemplateStringV } from "@hoppscotch/data/src/pathVariables" import { parseTemplateStringV } from "@hoppscotch/data/src/pathVariables"
======= =======
import { parseTemplateStringV } from "@hoppscotch/data/src/variables" import { parseTemplateStringV } from "@hoppscotch/data/src/variables"
>>>>>>> origin/codeday/main >>>>>>> origin/codeday/main
=======
import { parseTemplateStringV } from "@hoppscotch/data/src/variables"
>>>>>>> origin/codeday/jason
import { arrayFlatMap, arraySort } from "../functional/array" import { arrayFlatMap, arraySort } from "../functional/array"
import { toFormData } from "../functional/formData" import { toFormData } from "../functional/formData"
import { tupleToRecord } from "../functional/record" import { tupleToRecord } from "../functional/record"
@@ -308,6 +312,8 @@ export function getEffectiveRESTRequest(
const effectiveFinalVars = request.vars const effectiveFinalVars = request.vars
const effectiveFinalVars = request.vars
const effectiveFinalBody = getFinalBodyFromRequest(request, envVariables) const effectiveFinalBody = getFinalBodyFromRequest(request, envVariables)
return { return {

7
packages/hoppscotch-data/src/environment.ts
View File

@@ -12,6 +12,7 @@ export type Environment = {
export type Variables = { export type Variables = {
key: string key: string
value: string value: string
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
}[] }[]
@@ -24,6 +25,12 @@ const REGEX_PATHVAR = /{{([^>]*)}}/g // "{{myVariable}}"
const REGEX_ENV_VAR = /<<([^>]*)>>/g // "<<myVariable>>" const REGEX_ENV_VAR = /<<([^>]*)>>/g // "<<myVariable>>"
const REGEX_PATH_VAR = /{{([^>]*)}}/g // "{{myVariable}}" const REGEX_PATH_VAR = /{{([^>]*)}}/g // "{{myVariable}}"
>>>>>>> origin/codeday/main >>>>>>> origin/codeday/main
=======
}[]
const REGEX_ENV_VAR = /<<([^>]*)>>/g // "<<myVariable>>"
const REGEX_PATH_VAR = /{{([^>]*)}}/g // "{{myVariable}}"
>>>>>>> origin/codeday/jason
/** /**
* How much times can we expand environment variables * How much times can we expand environment variables