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

chore: update env tooltip updation mechanism

Browse Source
This commit is contained in:
nivedin
2024-02-19 21:15:02 +05:30
committed by Andrew Bastin
parent e01818444e
commit 7685409ee6
2 changed files with 48 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
packages/hoppscotch-common/src/components/smart/EnvInput.vue
View File

@@ -373,16 +373,27 @@ const envVars = computed(() => {
key: x.key,
sourceEnv: "source" in x ? x.source : null,
value: "********",
secret: true,
}
}
return {
key: x.key,
value: x.value,
sourceEnv: "source" in x ? x.source : null,
secret: false,
}
})
: [
...tabs.currentActiveTab.value.document.request.requestVariables,
...tabs.currentActiveTab.value.document.request.requestVariables.map(
(x) => {
return {
key: x.key,
value: x.value,
sourceEnv: "RequestVariable",
secret: false,
}
}
),
...aggregateEnvs.value,
]
})

87
packages/hoppscotch-common/src/helpers/editor/extensions/HoppEnvironment.ts
View File

@@ -216,48 +216,43 @@ export class HoppEnvironmentPlugin {
subscribeToStream: StreamSubscriberFunc,
private editorView: Ref<EditorView | undefined>
) {
// const aggregateEnvs = getAggregateEnvsWithSecrets()
// const currentTab = restTabs.currentActiveTab.value
// watch(
// currentTab.document.request.requestVariables,
// (reqVariables) => {
// console.log("reqVariables", reqVariables)
// this.envs = [
// ...reqVariables.map((variable) => ({
// key: variable.key,
// value: variable.value,
// sourceEnv: "RequestVariable",
// secret: false,
// })),
// ...aggregateEnvs,
// ]
// this.editorView.value?.dispatch({
// effects: this.compartment.reconfigure([
// cursorTooltipField(this.envs),
// environmentHighlightStyle(this.envs),
// ]),
// })
// },
// { immediate: true }
// )
const currentTab = restTabs.currentActiveTab.value
const aggregateEnvs = getAggregateEnvsWithSecrets()
const currentTab = restTabs.currentActiveTab.value
this.envs = [
...currentTab.document.request.requestVariables.map((variable) => ({
key: variable.key,
value: variable.value,
sourceEnv: "RequestVariable",
secret: false,
})),
...aggregateEnvs,
]
watch(
currentTab.document.request,
(reqVariables) => {
this.envs = [
...reqVariables.requestVariables.map((variable) => ({
key: variable.key,
value: variable.value,
sourceEnv: "RequestVariable",
secret: false,
})),
...aggregateEnvs,
]
this.editorView.value?.dispatch({
effects: this.compartment.reconfigure([
cursorTooltipField(this.envs),
environmentHighlightStyle(this.envs),
]),
})
},
{ immediate: true, deep: true }
)
subscribeToStream(aggregateEnvsWithSecrets$, (envs) => {
this.envs = envs
this.envs = [
...currentTab.document.request.requestVariables.map((variable) => ({
key: variable.key,
value: variable.value,
sourceEnv: "RequestVariable",
secret: false,
})),
...envs,
]
this.editorView.value?.dispatch({
effects: this.compartment.reconfigure([
cursorTooltipField(this.envs),
@@ -284,20 +279,10 @@ export class HoppReactiveEnvPlugin {
envsRef: Ref<AggregateEnvironment[]>,
private editorView: Ref<EditorView | undefined>
) {
const currentTab = restTabs.currentActiveTab
watch(
[currentTab.value.document.request, envsRef],
([reqVariables, envs]) => {
this.envs = [
...reqVariables.requestVariables.map((variable) => ({
key: variable.key,
value: variable.value,
sourceEnv: "RequestVariable",
secret: false,
})),
...envs,
]
envsRef,
(envs) => {
this.envs = envs
this.editorView.value?.dispatch({
effects: this.compartment.reconfigure([