From bb4f4aca5426739b6fcdd365ddc8b702e3c88220 Mon Sep 17 00:00:00 2001
From: Anwarul Islam <anwaarulislaam@gmail.com>
Date: Wed, 29 Oct 2025 23:21:05 +0600
Subject: [PATCH] feat(common): handle null collection and add private access
 hint for mock servers (#5527)

* fix(mock-server): handle null collection case in dashboard display

* feat(mock-server): add private access hint for non-public mock servers

* fix(mock-server): update private access hint for clarity

* refactor(mock-server): remove console logs from mock server creation and update
---
 packages/hoppscotch-common/locales/en.json                  | 2 ++
 .../src/components/mockServer/CreateMockServer.vue          | 6 ++++--
 .../src/components/mockServer/EditMockServer.vue            | 6 ++++--
 .../src/components/mockServer/MockServerDashboard.vue       | 5 ++++-
 packages/hoppscotch-common/src/newstore/mockServers.ts      | 2 +-
 5 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/packages/hoppscotch-common/locales/en.json b/packages/hoppscotch-common/locales/en.json
index 4d800091..bc8be5f8 100644
--- a/packages/hoppscotch-common/locales/en.json
+++ b/packages/hoppscotch-common/locales/en.json
@@ -873,6 +873,8 @@
     "subdomain_based_url": "Subdomain based URL",
     "mock_server_updated": "Mock server updated successfully",
     "no_collection": "No collection",
+    "collection_deleted": "associated collection deleted.",
+    "private_access_hint": "For private mock servers, include the header 'x-api-key' with your Personal Access Token (create one from your profile).",
     "status": "Status",
     "server_running": "Server is running",
     "server_stopped": "Server is stopped",
diff --git a/packages/hoppscotch-common/src/components/mockServer/CreateMockServer.vue b/packages/hoppscotch-common/src/components/mockServer/CreateMockServer.vue
index 7c60016f..2cf5310e 100644
--- a/packages/hoppscotch-common/src/components/mockServer/CreateMockServer.vue
+++ b/packages/hoppscotch-common/src/components/mockServer/CreateMockServer.vue
@@ -182,6 +182,10 @@
               </HoppSmartToggle>
             </div>
           </div>
+          <!-- Hint for private mock servers -->
+          <div v-if="!isPublic" class="w-full mt-2 text-xs text-secondaryLight">
+            {{ t("mock_server.private_access_hint") }}
+          </div>
 
           <!-- Display created server info -->
           <div v-if="createdServer" class="flex flex-col space-y-4">
@@ -478,7 +482,6 @@ const createMockServer = async () => {
         loading.value = false
       },
       (result) => {
-        console.log("Mock server created:", result)
         toast.success(t("mock_server.mock_server_created"))
 
         // Add the new mock server to the store
@@ -511,7 +514,6 @@ const toggleMockServer = async () => {
         loading.value = false
       },
       (result) => {
-        console.log("Mock server updated:", result)
         toast.success(
           newActiveState
             ? t("mock_server.mock_server_started")
diff --git a/packages/hoppscotch-common/src/components/mockServer/EditMockServer.vue b/packages/hoppscotch-common/src/components/mockServer/EditMockServer.vue
index 2b131235..36b787b1 100644
--- a/packages/hoppscotch-common/src/components/mockServer/EditMockServer.vue
+++ b/packages/hoppscotch-common/src/components/mockServer/EditMockServer.vue
@@ -117,6 +117,9 @@
               }}
             </span>
           </div>
+          <div v-if="!isPublic" class="text-xs text-secondaryLight">
+            {{ t("mock_server.private_access_hint") }}
+          </div>
         </div>
       </div>
     </template>
@@ -255,8 +258,7 @@ const toggleMockServer = async () => {
         toast.error(t("error.something_went_wrong"))
         loading.value = false
       },
-      (result) => {
-        console.log("Mock server updated:", result)
+      () => {
         toast.success(
           newActiveState
             ? t("mock_server.mock_server_started")
diff --git a/packages/hoppscotch-common/src/components/mockServer/MockServerDashboard.vue b/packages/hoppscotch-common/src/components/mockServer/MockServerDashboard.vue
index e0b7c941..2509900b 100644
--- a/packages/hoppscotch-common/src/components/mockServer/MockServerDashboard.vue
+++ b/packages/hoppscotch-common/src/components/mockServer/MockServerDashboard.vue
@@ -87,7 +87,10 @@
               </span>
               <span class="truncate text-secondaryLight">
                 {{
-                  mockServer.collection?.title || t("mock_server.no_collection")
+                  mockServer.collection === null
+                    ? t("mock_server.collection_deleted")
+                    : mockServer.collection?.title ||
+                      t("mock_server.no_collection")
                 }}
               </span>
             </div>
diff --git a/packages/hoppscotch-common/src/newstore/mockServers.ts b/packages/hoppscotch-common/src/newstore/mockServers.ts
index df5ea8b4..ca67038c 100644
--- a/packages/hoppscotch-common/src/newstore/mockServers.ts
+++ b/packages/hoppscotch-common/src/newstore/mockServers.ts
@@ -32,7 +32,7 @@ export type MockServer = {
     id: string
     title: string
     requests?: any[]
-  }
+  } | null
   // Legacy fields for backward compatibility
   userUid?: string
   collectionID?: string