From 1d7c0c0ba1aa5072305c30d5c223a23f99ccd1f3 Mon Sep 17 00:00:00 2001
From: nivedin <nivedinp@gmail.com>
Date: Mon, 12 Feb 2024 13:22:06 +0530
Subject: [PATCH] fix: team secret env tooltip update bug

---
 .../components/environments/teams/Details.vue |  2 +-
 .../editor/extensions/HoppEnvironment.ts      | 19 ++++++++++++++++++-
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/packages/hoppscotch-common/src/components/environments/teams/Details.vue b/packages/hoppscotch-common/src/components/environments/teams/Details.vue
index 1f9673e2a..eeefb72b4 100644
--- a/packages/hoppscotch-common/src/components/environments/teams/Details.vue
+++ b/packages/hoppscotch-common/src/components/environments/teams/Details.vue
@@ -380,7 +380,7 @@ const saveEnvironment = async () => {
   const variables = pipe(
     filterdVariables,
     A.map((e) =>
-      e.secret ? { key: e.key, secret: e.secret, value: undefined } : e
+      e.secret ? { key: e.key, secret: e.secret ?? false, value: undefined } : e
     )
   )
 
diff --git a/packages/hoppscotch-common/src/helpers/editor/extensions/HoppEnvironment.ts b/packages/hoppscotch-common/src/helpers/editor/extensions/HoppEnvironment.ts
index 06ca1b012..d763226c2 100644
--- 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 && !tooltipEnv.value && hasSecretEnv) {
         envValue = "******"
+      } else if (tooltipEnv?.secret && !tooltipEnv.value && !hasSecretEnv) {
+        envValue = "Empty"
       } else if (!tooltipEnv?.sourceEnv) {
         envValue = "Not Found"
       } else if (!tooltipEnv?.value) {