thibaud-lclr/api-client
1
0
Fork 0
Code Packages Activity Actions

fix: fill current value to existing value (#5109)

Browse source
This commit is contained in:
Nivedin 2025-05-29 18:36:58 +05:30 committed by GitHub
parent caeddac94c
commit a325f2945d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
12 changed files with 41 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packages/hoppscotch-cli/src/utils/request.ts
View file

@ -45,7 +45,7 @@ const processVariables = (variable: Environment["variables"][number]) => {
currentValue:
"currentValue" in variable && variable.currentValue !== ""
? variable.currentValue
: process.env[variable.key] || "",
: process.env[variable.key] || variable.initialValue,
};
}
return variable;

2
packages/hoppscotch-common/src/components/environments/my/Details.vue
View file

@ -380,7 +380,7 @@ watch(
? "Global"
: workingEnvID.value,
index
) ?? "",
) ?? e.currentValue,
initialValue: e.initialValue,
secret: e.secret,
},

2
packages/hoppscotch-common/src/components/environments/teams/Details.vue
View file

@ -347,7 +347,7 @@ watch(
props.editingEnvironment?.id ?? "",
index,
e.secret
) ?? "",
) ?? e.currentValue,
initialValue: e.initialValue,
secret: e.secret,
},

2
packages/hoppscotch-common/src/helpers/editor/extensions/HoppEnvironment.ts
View file

@ -125,7 +125,7 @@ const cursorTooltipField = (aggregateEnvs: AggregateEnvironment[]) =>
? currentSelectedEnvironment.id
: "Global",
tooltipEnv?.key ?? ""
)?.currentValue ?? "")
)?.currentValue ?? tooltipEnv?.currentValue)
: tooltipEnv?.currentValue
const hasSecretEnv = secretEnvironmentService.hasSecretValue(

2
packages/hoppscotch-common/src/helpers/import-export/export/environment.ts
View file

@ -47,7 +47,7 @@ export const transformEnvironmentVariables = ({
key,
secret,
initialValue,
currentValue: "",
currentValue: variable.secret ? "" : (variable.currentValue ?? ""),
}
}),
}

2
packages/hoppscotch-common/src/helpers/import-export/import/insomniaEnv.ts
View file

@ -76,7 +76,7 @@ export const insomniaEnvImporter = (contents: string[]) => {
([key, value]) => ({
key,
initialValue: value,
currentValue: "",
currentValue: value,
secret: false,
})
),

2
packages/hoppscotch-common/src/helpers/import-export/import/postmanEnv.ts
View file

@ -57,7 +57,7 @@ export const postmanEnvImporter = (contents: string[]) => {
variables: values.map(({ key, value, type }) => ({
key,
initialValue: value,
currentValue: "",
currentValue: value,
secret: type === "secret",
})),
})

16
packages/hoppscotch-common/src/helpers/utils/environments.ts
View file

@ -38,7 +38,13 @@ const unWrapEnvironments = (
currentValue: secretVar.value,
}
}
return { ...globalVar, currentValue: currentVar?.currentValue ?? "" }
return {
...globalVar,
currentValue:
currentVar?.currentValue ??
globalVar.currentValue ??
globalVar.initialValue,
}
})
const resolvedSelectedWithSecrets = selected.variables.map(
@ -57,7 +63,13 @@ const unWrapEnvironments = (
currentValue: secretVar.value,
}
}
return { ...selectedVar, currentValue: currentVar?.currentValue ?? "" }
return {
...selectedVar,
currentValue:
currentVar?.currentValue ??
selectedVar.currentValue ??
selectedVar.initialValue,
}
}
)

29
packages/hoppscotch-common/src/newstore/environments.ts
View file

@ -523,17 +523,16 @@ export function getAggregateEnvs() {
export function getAggregateEnvsWithSecrets() {
const currentEnv = getCurrentEnvironment()
return [
...currentEnv.variables.map((x, index) => {
let currentValue
let currentValue = x.currentValue
if (x.secret) {
currentValue =
secretEnvironmentService.getSecretEnvironmentVariableValue(
currentEnv.id,
index
)
} else {
currentValue = x.currentValue
) ?? ""
}
return <AggregateEnvironment>{
@ -545,15 +544,13 @@ export function getAggregateEnvsWithSecrets() {
}
}),
...getGlobalVariables().map((x, index) => {
let currentValue
let currentValue = x.currentValue
if (x.secret) {
currentValue =
secretEnvironmentService.getSecretEnvironmentVariableValue(
"Global",
index
)
} else {
currentValue = x.currentValue
) ?? ""
}
return <AggregateEnvironment>{
key: x.key,
@ -571,19 +568,17 @@ export const aggregateEnvsWithSecrets$: Observable<AggregateEnvironment[]> =
map(([selectedEnv, globalEnv]) => {
const results: AggregateEnvironment[] = []
selectedEnv?.variables.map((x, index) => {
let currentValue
let currentValue = x.currentValue
if (x.secret) {
currentValue =
secretEnvironmentService.getSecretEnvironmentVariableValue(
selectedEnv.id,
index
)
} else {
currentValue = x.currentValue
) ?? ""
}
results.push({
key: x.key,
currentValue: currentValue ?? "",
currentValue: currentValue,
initialValue: x.initialValue,
secret: x.secret,
sourceEnv: selectedEnv.name,
@ -591,19 +586,17 @@ export const aggregateEnvsWithSecrets$: Observable<AggregateEnvironment[]> =
})
globalEnv.variables.map((x, index) => {
let currentValue
let currentValue = x.currentValue
if (x.secret) {
currentValue =
secretEnvironmentService.getSecretEnvironmentVariableValue(
"Global",
index
)
} else {
currentValue = x.currentValue
) ?? ""
}
results.push({
key: x.key,
currentValue: currentValue ?? "",
currentValue: currentValue,
initialValue: x.initialValue,
secret: x.secret,
sourceEnv: "Global",

13
packages/hoppscotch-common/src/services/inspection/inspectors/environment.inspector.ts
View file

@ -221,12 +221,13 @@ export class EnvironmentInspectorService extends Service implements Inspector {
env.key
)
const hasCurrentValue = this.currentEnvs.hasValue(
env.sourceEnv !== "Global"
? currentSelectedEnvironment.id
: "Global",
env.key
)
const hasCurrentValue =
this.currentEnvs.hasValue(
env.sourceEnv !== "Global"
? currentSelectedEnvironment.id
: "Global",
env.key
) || env.currentValue !== ""
if (env.key === formattedExEnv) {
if (env.secret ? !hasSecretEnv : !hasCurrentValue) {

2
packages/hoppscotch-data/src/environment/index.ts
View file

@ -204,7 +204,7 @@ export const translateToNewEnvironmentVariables = (
return {
key: x.key,
initialValue: x.initialValue ?? x.value ?? "",
currentValue: "",
currentValue: x.currentValue ?? x.value ?? "",
secret: false,
}
}

2
packages/hoppscotch-data/src/environment/v/2.ts
View file

@ -32,7 +32,7 @@ export default defineVersion({
key,
secret,
initialValue: secret ? "" : variable.value,
currentValue: "",
currentValue: secret ? "" : variable.value,
}
}),
}