fix: environment tooltip update bug (#3819)

hoppscotch · Feb 13, 2024 · 45b5327 · 45b5327
1 parent de4635d
commit 45b5327
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 3 deletions.
diff --git a/packages/hoppscotch-common/src/helpers/editor/extensions/HoppEnvironment.ts b/packages/hoppscotch-common/src/helpers/editor/extensions/HoppEnvironment.ts
@@ -14,12 +14,15 @@ import {
  AggregateEnvironment,
  aggregateEnvsWithSecrets$,
  getAggregateEnvsWithSecrets,
+ getCurrentEnvironment,
  getSelectedEnvironmentType,
 } from "~/newstore/environments"
 import { invokeAction } from "~/helpers/actions"
 import IconUser from "~icons/lucide/user?raw"
 import IconUsers from "~icons/lucide/users?raw"
 import IconEdit from "~icons/lucide/edit?raw"
+import { SecretEnvironmentService } from "~/services/secret-environment.service"
+import { getService } from "~/modules/dioc"
 
 const HOPP_ENVIRONMENT_REGEX = /(<<[a-zA-Z0-9-_]+>>)/g
 
@@ -28,6 +31,8 @@ const HOPP_ENV_HIGHLIGHT =
 const HOPP_ENV_HIGHLIGHT_FOUND = "env-found"
 const HOPP_ENV_HIGHLIGHT_NOT_FOUND = "env-not-found"
 
+const secretEnvironmentService = getService(SecretEnvironmentService)
+
 const cursorTooltipField = (aggregateEnvs: AggregateEnvironment[]) =>
  hoverTooltip(
  (view, pos, side) => {
@@ -67,9 +72,21 @@ const cursorTooltipField = (aggregateEnvs: AggregateEnvironment[]) =>
  const envName = tooltipEnv?.sourceEnv ?? "Choose an Environment"
 
  let envValue = "Not Found"
+
+ const currentSelectedEnvironment = getCurrentEnvironment()
+
+ const hasSecretEnv = secretEnvironmentService.hasSecretValue(
+ tooltipEnv?.sourceEnv !== "Global"
+ ? currentSelectedEnvironment.id
+ : "Global",
+ tooltipEnv?.key ?? ""
+ )
+
  if (!tooltipEnv?.secret && tooltipEnv?.value) envValue = tooltipEnv.value
- else if (tooltipEnv?.secret && tooltipEnv.value) {
+ else if (tooltipEnv?.secret && hasSecretEnv) {
  envValue = "******"
+ } else if (tooltipEnv?.secret && !hasSecretEnv) {
+ envValue = "Empty"
  } else if (!tooltipEnv?.sourceEnv) {
  envValue = "Not Found"
  } else if (!tooltipEnv?.value) {

diff --git a/packages/hoppscotch-common/src/services/persistence/validation-schemas/index.ts b/packages/hoppscotch-common/src/services/persistence/validation-schemas/index.ts
@@ -374,6 +374,10 @@ const EnvironmentVariablesSchema = z.union([
  key: z.string(),
  secret: z.literal(true),
  }),
+ z.object({
+ key: z.string(),
+ value: z.string(),
+ }),
 ])
 
 export const SECRET_ENVIRONMENT_VARIABLE_SCHEMA = z.union([
@@ -405,7 +409,9 @@ const HoppTestResultSchema = z
  .object({
  additions: z.array(EnvironmentVariablesSchema),
  updations: z.array(
- EnvironmentVariablesSchema.refine((x) => !x.secret).and(
+ EnvironmentVariablesSchema.refine(
+ (x) => "secret" in x && !x.secret
+ ).and(
  z.object({
  previousValue: z.string(),
  })
@@ -418,7 +424,9 @@ const HoppTestResultSchema = z
  .object({
  additions: z.array(EnvironmentVariablesSchema),
  updations: z.array(
- EnvironmentVariablesSchema.refine((x) => !x.secret).and(
+ EnvironmentVariablesSchema.refine(
+ (x) => "secret" in x && !x.secret
+ ).and(
  z.object({
  previousValue: z.string(),
  })