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

nivedin · web-flow · commit a325f2945d41 · 2025-05-29T18:36:58.000+05:30
diff --git a/packages/hoppscotch-cli/src/utils/request.ts b/packages/hoppscotch-cli/src/utils/request.ts
@@ -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;
diff --git a/packages/hoppscotch-common/src/components/environments/my/Details.vue b/packages/hoppscotch-common/src/components/environments/my/Details.vue
@@ -380,7 +380,7 @@ watch(
                   ? "Global"
                   : workingEnvID.value,
                 index
-              ) ?? "",
+              ) ?? e.currentValue,
             initialValue: e.initialValue,
             secret: e.secret,
           },
diff --git a/packages/hoppscotch-common/src/components/environments/teams/Details.vue b/packages/hoppscotch-common/src/components/environments/teams/Details.vue
@@ -347,7 +347,7 @@ watch(
                   props.editingEnvironment?.id ?? "",
                   index,
                   e.secret
-                ) ?? "",
+                ) ?? e.currentValue,
               initialValue: e.initialValue,
               secret: e.secret,
             },
diff --git a/packages/hoppscotch-common/src/helpers/editor/extensions/HoppEnvironment.ts b/packages/hoppscotch-common/src/helpers/editor/extensions/HoppEnvironment.ts
@@ -125,7 +125,7 @@ const cursorTooltipField = (aggregateEnvs: AggregateEnvironment[]) =>
                 ? currentSelectedEnvironment.id
                 : "Global",
               tooltipEnv?.key ?? ""
-            )?.currentValue ?? "")
+            )?.currentValue ?? tooltipEnv?.currentValue)
           : tooltipEnv?.currentValue
 
       const hasSecretEnv = secretEnvironmentService.hasSecretValue(
diff --git a/packages/hoppscotch-common/src/helpers/import-export/export/environment.ts b/packages/hoppscotch-common/src/helpers/import-export/export/environment.ts
@@ -47,7 +47,7 @@ export const transformEnvironmentVariables = ({
         key,
         secret,
         initialValue,
-        currentValue: "",
+        currentValue: variable.secret ? "" : (variable.currentValue ?? ""),
       }
     }),
   }
diff --git a/packages/hoppscotch-common/src/helpers/import-export/import/insomniaEnv.ts b/packages/hoppscotch-common/src/helpers/import-export/import/insomniaEnv.ts
@@ -76,7 +76,7 @@ export const insomniaEnvImporter = (contents: string[]) => {
           ([key, value]) => ({
             key,
             initialValue: value,
-            currentValue: "",
+            currentValue: value,
             secret: false,
           })
         ),
diff --git a/packages/hoppscotch-common/src/helpers/import-export/import/postmanEnv.ts b/packages/hoppscotch-common/src/helpers/import-export/import/postmanEnv.ts
@@ -57,7 +57,7 @@ export const postmanEnvImporter = (contents: string[]) => {
       variables: values.map(({ key, value, type }) => ({
         key,
         initialValue: value,
-        currentValue: "",
+        currentValue: value,
         secret: type === "secret",
       })),
     })
diff --git a/packages/hoppscotch-common/src/helpers/utils/environments.ts b/packages/hoppscotch-common/src/helpers/utils/environments.ts
@@ -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,
+      }
     }
   )
 
diff --git a/packages/hoppscotch-common/src/newstore/environments.ts b/packages/hoppscotch-common/src/newstore/environments.ts
@@ -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,39 +568,35 @@ 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,
         })
       })
 
       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",
diff --git a/packages/hoppscotch-common/src/services/inspection/inspectors/environment.inspector.ts b/packages/hoppscotch-common/src/services/inspection/inspectors/environment.inspector.ts
@@ -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) {
diff --git a/packages/hoppscotch-data/src/environment/index.ts b/packages/hoppscotch-data/src/environment/index.ts
@@ -204,7 +204,7 @@ export const translateToNewEnvironmentVariables = (
   return {
     key: x.key,
     initialValue: x.initialValue ?? x.value ?? "",
-    currentValue: "",
+    currentValue: x.currentValue ?? x.value ?? "",
     secret: false,
   }
 }
diff --git a/packages/hoppscotch-data/src/environment/v/2.ts b/packages/hoppscotch-data/src/environment/v/2.ts
@@ -32,7 +32,7 @@ export default defineVersion({
           key,
           secret,
           initialValue: secret ? "" : variable.value,
-          currentValue: "",
+          currentValue: secret ? "" : variable.value,
         }
       }),
     }

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ const processVariables = (variable: Environment["variables"][number]) => {`
`45`	`45`	`currentValue:`
`46`	`46`	`"currentValue" in variable && variable.currentValue !== ""`
`47`	`47`	`? variable.currentValue`
`48`		`- : process.env[variable.key] \|\| "",`
	`48`	`+ : process.env[variable.key] \|\| variable.initialValue,`
`49`	`49`	`};`
`50`	`50`	`}`
`51`	`51`	`return variable;`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ export const transformEnvironmentVariables = ({`
`47`	`47`	`key,`
`48`	`48`	`secret,`
`49`	`49`	`initialValue,`
`50`		`- currentValue: "",`
	`50`	`+ currentValue: variable.secret ? "" : (variable.currentValue ?? ""),`
`51`	`51`	`}`
`52`	`52`	`}),`
`53`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,13 @@ const unWrapEnvironments = (`
`38`	`38`	`currentValue: secretVar.value,`
`39`	`39`	`}`
`40`	`40`	`}`
`41`		`- return { ...globalVar, currentValue: currentVar?.currentValue ?? "" }`
	`41`	`+ return {`
	`42`	`+ ...globalVar,`
	`43`	`+ currentValue:`
	`44`	`+ currentVar?.currentValue ??`
	`45`	`+ globalVar.currentValue ??`
	`46`	`+ globalVar.initialValue,`
	`47`	`+ }`
`42`	`48`	`})`
`43`	`49`
`44`	`50`	`const resolvedSelectedWithSecrets = selected.variables.map(`
`@@ -57,7 +63,13 @@ const unWrapEnvironments = (`
`57`	`63`	`currentValue: secretVar.value,`
`58`	`64`	`}`
`59`	`65`	`}`
`60`		`- return { ...selectedVar, currentValue: currentVar?.currentValue ?? "" }`
	`66`	`+ return {`
	`67`	`+ ...selectedVar,`
	`68`	`+ currentValue:`
	`69`	`+ currentVar?.currentValue ??`
	`70`	`+ selectedVar.currentValue ??`
	`71`	`+ selectedVar.initialValue,`
	`72`	`+ }`
`61`	`73`	`}`
`62`	`74`	`)`
`63`	`75`