commit for merge

This commit is contained in:
isaiM6
2022-08-01 14:08:29 -07:00
parent a294a2804b
commit cabc775f58
6 changed files with 104 additions and 10 deletions

View File

@@ -348,7 +348,8 @@ const newSendRequest = async () => {
const ensureMethodInEndpoint = () => {
if (
!/^http[s]?:\/\//.test(newEndpoint.value) &&
!newEndpoint.value.startsWith("<<")
!newEndpoint.value.startsWith("<<") &&
!newEndpoint.value.startsWith("{{")
) {
const domain = newEndpoint.value.split(/[/:#?]+/)[0]
if (domain === "localhost" || /([0-9]+\.)*[0-9]/.test(domain)) {

View File

@@ -3,7 +3,7 @@
<div
class="sticky z-10 flex items-center justify-between pl-4 border-b bg-primary border-dividerLight top-upperMobileSecondaryStickyFold sm:top-upperSecondaryStickyFold"
>
<label class="font-semibold text-secondaryLight"> Variables </label>
<label class="font-semibold text-secondaryLight"> My Variables </label>
<div class="flex">
<ButtonSecondary
v-tippy="{ theme: 'tooltip' }"
@@ -15,28 +15,28 @@
</div>
<div>
<div
v-for="(vari, index) in workingVars"
:key="`vari-${vari.id}-${index}`"
v-for="(variable, index) in workingVars"
:key="`vari-${variable.id}-${index}`"
class="flex border-b divide-x divide-dividerLight border-dividerLight draggable-content group"
>
<SmartEnvInput
v-model="vari.key"
v-model="variable.key"
:placeholder="`${t('count.parameter', { count: index + 1 })}`"
@change="
updateVar(index, {
id: vari.id,
id: variable.id,
key: $event,
value: vari.value,
value: variable.value,
})
"
/>
<SmartEnvInput
v-model="vari.value"
v-model="variable.value"
:placeholder="`${t('count.value', { count: index + 1 })}`"
@change="
updateVar(index, {
id: vari.id,
key: vari.key,
id: variable.id,
key: variable.key,
value: $event,
})
"

View File

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