fix: close context menu when typing

Co-authored-by: Liyas Thomas <liyascthomas@gmail.com>

packages/hoppscotch-backend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hoppscotch-backend",
-  "version": "2023.12.0-1",
+  "version": "2023.12.2",
   "description": "",
   "author": "",
   "private": true,

packages/hoppscotch-backend/src/errors.ts

@@ -28,6 +28,13 @@ export const JSON_INVALID = 'json_invalid';
  */
 export const AUTH_PROVIDER_NOT_SPECIFIED = 'auth/provider_not_specified';
 
+/**
+ * Auth Provider not specified
+ * (Auth)
+ */
+export const AUTH_PROVIDER_NOT_CONFIGURED =
+  'auth/provider_not_configured_correctly';
+
 /**
  * Environment variable "VITE_ALLOWED_AUTH_PROVIDERS" is not present in .env file
  */

packages/hoppscotch-backend/src/infra-config/helper.ts

@@ -1,10 +1,33 @@
+import { AuthProvider } from 'src/auth/helper';
+import { AUTH_PROVIDER_NOT_CONFIGURED } from 'src/errors';
 import { PrismaService } from 'src/prisma/prisma.service';
+import { InfraConfigEnum } from 'src/types/InfraConfig';
+import { throwErr } from 'src/utils';
 
 export enum ServiceStatus {
   ENABLE = 'ENABLE',
   DISABLE = 'DISABLE',
 }
 
+const AuthProviderConfigurations = {
+  [AuthProvider.GOOGLE]: [
+    InfraConfigEnum.GOOGLE_CLIENT_ID,
+    InfraConfigEnum.GOOGLE_CLIENT_SECRET,
+  ],
+  [AuthProvider.GITHUB]: [
+    InfraConfigEnum.GITHUB_CLIENT_ID,
+    InfraConfigEnum.GITHUB_CLIENT_SECRET,
+  ],
+  [AuthProvider.MICROSOFT]: [
+    InfraConfigEnum.MICROSOFT_CLIENT_ID,
+    InfraConfigEnum.MICROSOFT_CLIENT_SECRET,
+  ],
+  [AuthProvider.EMAIL]: [
+    InfraConfigEnum.MAILER_SMTP_URL,
+    InfraConfigEnum.MAILER_ADDRESS_FROM,
+  ],
+};
+
 /**
  * Load environment variables from the database and set them in the process
  *
@@ -42,3 +65,42 @@ export function stopApp() {
     process.kill(process.pid, 'SIGTERM');
   }, 5000);
 }
+
+/**
+ * Get the configured SSO providers
+ * @returns Array of configured SSO providers
+ */
+export function getConfiguredSSOProviders() {
+  const allowedAuthProviders: string[] =
+    process.env.VITE_ALLOWED_AUTH_PROVIDERS.split(',');
+  let configuredAuthProviders: string[] = [];
+
+  const addProviderIfConfigured = (provider) => {
+    const configParameters: string[] = AuthProviderConfigurations[provider];
+
+    const isConfigured = configParameters.every((configParameter) => {
+      return process.env[configParameter];
+    });
+
+    if (isConfigured) configuredAuthProviders.push(provider);
+  };
+
+  allowedAuthProviders.forEach((provider) => addProviderIfConfigured(provider));
+
+  if (configuredAuthProviders.length === 0) {
+    throwErr(AUTH_PROVIDER_NOT_CONFIGURED);
+  } else if (allowedAuthProviders.length !== configuredAuthProviders.length) {
+    const unConfiguredAuthProviders = allowedAuthProviders.filter(
+      (provider) => {
+        return !configuredAuthProviders.includes(provider);
+      },
+    );
+    console.log(
+      `${unConfiguredAuthProviders.join(
+        ',',
+      )} SSO auth provider(s) are not configured properly. Do configure them from Admin Dashboard.`,
+    );
+  }
+
+  return configuredAuthProviders.join(',');
+}

packages/hoppscotch-backend/src/infra-config/infra-config.service.ts

@@ -17,9 +17,9 @@ import {
   INFRA_CONFIG_UPDATE_FAILED,
   INFRA_CONFIG_SERVICE_NOT_CONFIGURED,
 } from 'src/errors';
-import { throwErr, validateEmail, validateSMTPUrl } from 'src/utils';
+import { throwErr, validateSMTPEmail, validateSMTPUrl } from 'src/utils';
 import { ConfigService } from '@nestjs/config';
-import { ServiceStatus, stopApp } from './helper';
+import { ServiceStatus, getConfiguredSSOProviders, stopApp } from './helper';
 import { EnableAndDisableSSOArgs, InfraConfigArgs } from './input-args';
 import { AuthProvider } from 'src/auth/helper';
 
@@ -71,7 +71,7 @@ export class InfraConfigService implements OnModuleInit {
       },
       {
         name: InfraConfigEnum.VITE_ALLOWED_AUTH_PROVIDERS,
-        value: process.env.VITE_ALLOWED_AUTH_PROVIDERS.toLocaleUpperCase(),
+        value: getConfiguredSSOProviders(),
       },
     ];
 
@@ -130,6 +130,19 @@ export class InfraConfigService implements OnModuleInit {
     };
   }
 
+  /**
+   * Get all the InfraConfigs as map
+   * @returns InfraConfig map
+   */
+  async getInfraConfigsMap() {
+    const infraConfigs = await this.prisma.infraConfig.findMany();
+    const infraConfigMap: Record<string, string> = {};
+    infraConfigs.forEach((config) => {
+      infraConfigMap[config.name] = config.value;
+    });
+    return infraConfigMap;
+  }
+
   /**
    * Update InfraConfig by name
    * @param name Name of the InfraConfig
@@ -187,30 +200,24 @@ export class InfraConfigService implements OnModuleInit {
   /**
    * Check if the service is configured or not
    * @param service Service can be Auth Provider, Mailer, Audit Log etc.
+   * @param configMap Map of all the infra configs
    * @returns Either true or false
    */
-  isServiceConfigured(service: AuthProvider) {
+  isServiceConfigured(
+    service: AuthProvider,
+    configMap: Record<string, string>,
+  ) {
     switch (service) {
       case AuthProvider.GOOGLE:
-        return (
+        return configMap.GOOGLE_CLIENT_ID && configMap.GOOGLE_CLIENT_SECRET;
-          this.configService.get<string>('INFRA.GOOGLE_CLIENT_ID') &&
-          this.configService.get<string>('INFRA.GOOGLE_CLIENT_SECRET')
-        );
       case AuthProvider.GITHUB:
-        return (
+        return configMap.GITHUB_CLIENT_ID && configMap.GITHUB_CLIENT_SECRET;
-          this.configService.get<string>('INFRA.GITHUB_CLIENT_ID') &&
-          !this.configService.get<string>('INFRA.GITHUB_CLIENT_SECRET')
-        );
       case AuthProvider.MICROSOFT:
         return (
-          this.configService.get<string>('INFRA.MICROSOFT_CLIENT_ID') &&
+          configMap.MICROSOFT_CLIENT_ID && configMap.MICROSOFT_CLIENT_SECRET
-          !this.configService.get<string>('INFRA.MICROSOFT_CLIENT_SECRET')
         );
       case AuthProvider.EMAIL:
-        return (
+        return configMap.MAILER_SMTP_URL && configMap.MAILER_ADDRESS_FROM;
-          this.configService.get<string>('INFRA.MAILER_SMTP_URL') &&
-          this.configService.get<string>('INFRA.MAILER_ADDRESS_FROM')
-        );
       default:
         return false;
     }
@@ -229,11 +236,11 @@ export class InfraConfigService implements OnModuleInit {
 
     let updatedAuthProviders = allowedAuthProviders;
 
-    for (let i = 0; i < providerInfo.length; i++) {
+    const infraConfigMap = await this.getInfraConfigsMap();
-      const { provider, status } = providerInfo[i];
 
+    providerInfo.forEach(({ provider, status }) => {
       if (status === ServiceStatus.ENABLE) {
-        const isConfigured = this.isServiceConfigured(provider);
+        const isConfigured = this.isServiceConfigured(provider, infraConfigMap);
         if (!isConfigured) {
           throwErr(INFRA_CONFIG_SERVICE_NOT_CONFIGURED);
         }
@@ -243,7 +250,7 @@ export class InfraConfigService implements OnModuleInit {
           (p) => p !== provider,
         );
       }
-    }
+    });
 
     updatedAuthProviders = [...new Set(updatedAuthProviders)];
 
@@ -342,7 +349,7 @@ export class InfraConfigService implements OnModuleInit {
           if (!isValidUrl) return E.left(INFRA_CONFIG_INVALID_INPUT);
           break;
         case InfraConfigEnumForClient.MAILER_ADDRESS_FROM:
-          const isValidEmail = validateEmail(infraConfigs[i].value);
+          const isValidEmail = validateSMTPEmail(infraConfigs[i].value);
           if (!isValidEmail) return E.left(INFRA_CONFIG_INVALID_INPUT);
           break;
         case InfraConfigEnumForClient.GOOGLE_CLIENT_ID:

packages/hoppscotch-backend/src/main.ts

@@ -17,7 +17,8 @@ async function bootstrap() {
   console.log(`Port: ${configService.get('PORT')}`);
 
   checkEnvironmentAuthProvider(
-    configService.get('VITE_ALLOWED_AUTH_PROVIDERS'),
+    configService.get('INFRA.VITE_ALLOWED_AUTH_PROVIDERS') ??
+      configService.get('VITE_ALLOWED_AUTH_PROVIDERS'),
   );
 
   app.use(

packages/hoppscotch-backend/src/utils.ts

@@ -131,6 +131,28 @@ export const validateEmail = (email: string) => {
   ).test(email);
 };
 
+// Regular expressions for supported address object formats by nodemailer
+// check out for more info https://nodemailer.com/message/addresses
+const emailRegex1 = /^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/;
+const emailRegex2 =
+  /^[\w\s]* <([a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,})>$/;
+const emailRegex3 =
+  /^"[\w\s]+" <([a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,})>$/;
+
+/**
+ * Checks to see if the SMTP email is valid or not
+ * @param email
+ * @returns A Boolean depending on the format of the email
+ */
+export const validateSMTPEmail = (email: string) => {
+  // Check if the input matches any of the formats
+  return (
+    emailRegex1.test(email) ||
+    emailRegex2.test(email) ||
+    emailRegex3.test(email)
+  );
+};
+
 /**
  * Checks to see if the URL is valid or not
  * @param url The URL to validate

packages/hoppscotch-cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hoppscotch/cli",
-  "version": "0.5.0",
+  "version": "0.5.1",
   "description": "A CLI to run Hoppscotch test scripts in CI environments.",
   "homepage": "https://hoppscotch.io",
   "main": "dist/index.js",

packages/hoppscotch-cli/src/__tests__/commands/test.spec.ts

@@ -118,6 +118,15 @@ describe("Test 'hopp test <file> --env <file>' command:", () => {
     const { error } = await runCLI(args);
     expect(error).toBeNull();
   });
+
+  test("Correctly resolves environment variables referenced in the request body", async () => {
+    const COLL_PATH = getTestJsonFilePath("req-body-env-vars-coll.json");
+    const ENVS_PATH = getTestJsonFilePath("req-body-env-vars-envs.json");
+    const args = `test ${COLL_PATH} --env ${ENVS_PATH}`;
+
+    const { error } = await runCLI(args);
+    expect(error).toBeNull();
+  });
 });
 
 describe("Test 'hopp test <file> --delay <delay_in_ms>' command:", () => {

packages/hoppscotch-cli/src/__tests__/samples/req-body-env-vars-coll.json

@@ -0,0 +1,30 @@
+{
+  "v": 2,
+  "name": "Test environment variables in request body",
+  "folders": [],
+  "requests": [
+    {
+      "v": "1",
+      "name": "test-request",
+      "endpoint": "https://echo.hoppscotch.io",
+      "method": "POST",
+      "headers": [],
+      "params": [],
+      "auth": {
+        "authType": "none",
+        "authActive": true
+      },
+      "body": {
+        "contentType": "application/json",
+        "body": "{\n   \"firstName\": \"<<firstName>>\",\n   \"lastName\": \"<<lastName>>\",\n   \"greetText\": \"<<salutation>>, <<fullName>>\",\n   \"fullName\": \"<<fullName>>\",\n   \"id\": \"<<id>>\"\n}"
+      },
+      "preRequestScript": "",
+      "testScript": "pw.test(\"Status code is 200\", ()=> {\n  pw.expect(pw.response.status).toBe(200);\n});\n\npw.test(\"Successfully resolves environments recursively\", ()=> {\n  pw.expect(pw.env.getResolve(\"recursiveVarX\")).toBe(\"Hello\")\n  pw.expect(pw.env.getResolve(\"recursiveVarY\")).toBe(\"Hello\")\n  pw.expect(pw.env.getResolve(\"salutation\")).toBe(\"Hello\")\n});\n\npw.test(\"Successfully resolves environments referenced in the request body\", () => {\n  const expectedId = \"7\"\n  const expectedFirstName = \"John\"\n  const expectedLastName = \"Doe\"\n  const expectedFullName = `${expectedFirstName} ${expectedLastName}`\n  const expectedGreetText = `Hello, ${expectedFullName}`\n\n  pw.expect(pw.env.getResolve(\"recursiveVarX\")).toBe(\"Hello\")\n  pw.expect(pw.env.getResolve(\"recursiveVarY\")).toBe(\"Hello\")\n  pw.expect(pw.env.getResolve(\"salutation\")).toBe(\"Hello\")\n\n  const { id, firstName, lastName, fullName, greetText } = JSON.parse(pw.response.body.data)\n\n  pw.expect(id).toBe(expectedId)\n  pw.expect(expectedFirstName).toBe(firstName)\n  pw.expect(expectedLastName).toBe(lastName)\n  pw.expect(fullName).toBe(expectedFullName)\n  pw.expect(greetText).toBe(expectedGreetText)\n});"
+    }
+  ],
+  "auth": {
+    "authType": "none",
+    "authActive": true
+  },
+  "headers": []
+}

packages/hoppscotch-cli/src/__tests__/samples/req-body-env-vars-envs.json

@@ -0,0 +1,37 @@
+{
+  "name": "Response body sample",
+  "variables": [
+    {
+      "key": "firstName",
+      "value": "John"
+    },
+    {
+      "key": "lastName",
+      "value": "Doe"
+    },
+    {
+      "key": "id",
+      "value": "7"
+    },
+    {
+      "key": "fullName",
+      "value": "<<firstName>> <<lastName>>"
+    },
+    {
+      "key": "recursiveVarX",
+      "value": "<<recursiveVarY>>"
+    },
+    {
+      "key": "recursiveVarY",
+      "value": "<<salutation>>"
+    },
+    {
+      "key": "salutation",
+      "value": "Hello"
+    },
+    {
+      "key": "greetText",
+      "value": "<<salutation>> <<fullName>>"
+    }
+  ]
+}

packages/hoppscotch-cli/src/__tests__/utils.ts

@@ -22,12 +22,10 @@ export const trimAnsi = (target: string) => {
 
 export const getErrorCode = (out: string) => {
   const ansiTrimmedStr = trimAnsi(out);
-
   return ansiTrimmedStr.split(" ")[0];
 };
 
 export const getTestJsonFilePath = (file: string) => {
-  const filePath = `${process.cwd()}/src/__tests__/samples/${file}`;
+  const filePath = resolve(__dirname, `../../src/__tests__/samples/${file}`);
-
   return filePath;
 };

packages/hoppscotch-cli/src/options/test/env.ts

@@ -37,8 +37,7 @@ export async function parseEnvsData(path: string) {
       envPairs.push({ key, value });
     }
   } else if (HoppEnvExportObjectResult.success) {
-    const { key, value } = HoppEnvExportObjectResult.data.variables[0];
+    envPairs.push(...HoppEnvExportObjectResult.data.variables);
-    envPairs.push({ key, value });
   }
 
   return <HoppEnvs>{ global: [], selected: envPairs };

packages/hoppscotch-common/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@hoppscotch/common",
   "private": true,
-  "version": "2023.12.0-1",
+  "version": "2023.12.2",
   "scripts": {
     "dev": "pnpm exec npm-run-all -p -l dev:*",
     "test": "vitest --run",

packages/hoppscotch-common/src/components/collections/SaveRequest.vue

@@ -33,7 +33,6 @@
           @select="onSelect"
           @update-team="updateTeam"
           @update-collection-type="updateCollectionType"
-          @set-team-collection-adapter="teamCollectionAdapter = $event"
         />
       </div>
     </template>
@@ -87,7 +86,6 @@ import { platform } from "~/platform"
 import { useService } from "dioc/vue"
 import { RESTTabService } from "~/services/tab/rest"
 import { GQLTabService } from "~/services/tab/graphql"
-import TeamCollectionAdapter from "~/helpers/teams/TeamCollectionAdapter"
 
 const t = useI18n()
 const toast = useToast()
@@ -95,8 +93,6 @@ const toast = useToast()
 const RESTTabs = useService(RESTTabService)
 const GQLTabs = useService(GQLTabService)
 
-const teamCollectionAdapter = ref<TeamCollectionAdapter>()
-
 type SelectedTeam = GetMyTeamsQuery["myTeams"][number] | undefined
 
 type CollectionType =
@@ -384,6 +380,7 @@ const saveRequestAs = async () => {
       platform: "rest",
       workspaceType: "team",
     })
+
     pipe(
       updateTeamRequest(picked.value.requestID, data),
       TE.match(
@@ -391,31 +388,7 @@ const saveRequestAs = async () => {
           toast.error(`${getErrorMessage(err)}`)
           modalLoadingState.value = false
         },
-        (result) => {
+        () => {
-          const { updateRequest } = result
-
-          RESTTabs.currentActiveTab.value.document = {
-            request: requestUpdated,
-            isDirty: false,
-            saveContext: {
-              originLocation: "team-collection",
-              requestID: updateRequest.id,
-              collectionID: updateRequest.collectionID,
-            },
-          }
-
-          if (teamCollectionAdapter.value) {
-            const { auth, headers } =
-              teamCollectionAdapter.value.cascadeParentCollectionForHeaderAuth(
-                updateRequest.collectionID
-              )
-
-            RESTTabs.currentActiveTab.value.document.inheritedProperties = {
-              auth,
-              headers,
-            }
-          }
-
           modalLoadingState.value = false
           requestSaved()
         }
@@ -543,18 +516,6 @@ const updateTeamCollectionOrFolder = (
           },
         }
 
-        if (teamCollectionAdapter.value) {
-          const { auth, headers } =
-            teamCollectionAdapter.value.cascadeParentCollectionForHeaderAuth(
-              createRequestInCollection.collection.id
-            )
-
-          RESTTabs.currentActiveTab.value.document.inheritedProperties = {
-            auth,
-            headers,
-          }
-        }
-
         modalLoadingState.value = false
         requestSaved()
       }

packages/hoppscotch-common/src/components/collections/index.vue

@@ -262,7 +262,6 @@ const emit = defineEmits<{
   (event: "select", payload: Picked | null): void
   (event: "update-team", team: SelectedTeam): void
   (event: "update-collection-type", type: CollectionType["type"]): void
-  (event: "set-team-collection-adapter", adapter: TeamCollectionAdapter): void
 }>()
 
 type SelectedTeam = GetMyTeamsQuery["myTeams"][number] | undefined
@@ -355,7 +354,6 @@ watch(
   (newTeam) => {
     if (newTeam) {
       teamCollectionAdapter.changeTeamID(newTeam.id)
-      emit("set-team-collection-adapter", teamCollectionAdapter)
     }
   }
 )

packages/hoppscotch-common/src/components/graphql/Sidebar.vue

@@ -187,7 +187,7 @@ import IconClock from "~icons/lucide/clock"
 import IconCopy from "~icons/lucide/copy"
 import IconBox from "~icons/lucide/box"
 import { computed, nextTick, reactive, ref } from "vue"
-import { GraphQLField, GraphQLType } from "graphql"
+import { GraphQLField, GraphQLType, getNamedType } from "graphql"
 import { refAutoReset } from "@vueuse/core"
 import { useCodemirror } from "@composables/codemirror"
 import { copyToClipboard } from "@helpers/utils/clipboard"
@@ -260,12 +260,6 @@ function getFilteredGraphqlTypes(filterText: string, types: GraphQLType[]) {
   })
 }
 
-function resolveRootType(type: GraphQLType) {
-  let t: any = type
-  while (t.ofType) t = t.ofType
-  return t
-}
-
 const toast = useToast()
 
 const downloadSchemaIcon = refAutoReset<typeof IconDownload | typeof IconCheck>(
@@ -331,7 +325,7 @@ const handleJumpToType = async (type: GraphQLType) => {
   selectedGqlTab.value = "types"
   await nextTick()
 
-  const rootTypeName = resolveRootType(type).name
+  const rootTypeName = getNamedType(type).name
   const target = document.getElementById(`type_${rootTypeName}`)
   if (target) {
     target.scrollIntoView({ block: "center", behavior: "smooth" })

packages/hoppscotch-common/src/components/graphql/TypeLink.vue

@@ -8,7 +8,7 @@
 </template>
 
 <script setup lang="ts">
-import { GraphQLScalarType, GraphQLType } from "graphql"
+import { GraphQLScalarType, GraphQLType, getNamedType } from "graphql"
 import { computed } from "vue"
 
 const props = defineProps<{
@@ -21,15 +21,9 @@ const emit = defineEmits<{
 
 const typeString = computed(() => `${props.gqlType}`)
 const isScalar = computed(() => {
-  return resolveRootType(props.gqlType) instanceof GraphQLScalarType
+  return getNamedType(props.gqlType) instanceof GraphQLScalarType
 })
 
-function resolveRootType(type: GraphQLType) {
-  let t = type as any
-  while (t.ofType !== null) t = t.ofType
-  return t
-}
-
 function jumpToType() {
   if (isScalar.value) return
   emit("jump-to-type", props.gqlType)

packages/hoppscotch-common/src/components/http/PreRequestScript.vue

@@ -99,6 +99,7 @@ useCodemirror(
     linter,
     completer,
     environmentHighlights: false,
+    contextMenuEnabled: false,
   })
 )
 

packages/hoppscotch-common/src/components/http/Tests.vue

@@ -95,6 +95,7 @@ useCodemirror(
     linter,
     completer,
     environmentHighlights: false,
+    contextMenuEnabled: false,
   })
 )
 

packages/hoppscotch-common/src/components/share/index.vue

@@ -21,7 +21,7 @@
       />
     </div>
     <div class="flex flex-col">
-      <div v-if="loading" class="flex flex-col items-center justify-center p-4">
+      <div v-if="loading" class="flex flex-col items-center justify-center">
         <HoppSmartSpinner class="mb-4" />
         <span class="text-secondaryLight">{{ t("state.loading") }}</span>
       </div>
@@ -451,7 +451,7 @@ const getErrorMessage = (err: GQLError<string>) => {
   }
   switch (err.error) {
     case "shortcode/not_found":
-      return t("shared_requests.not_found")
+      return t("shared_request.not_found")
     default:
       return t("error.something_went_wrong")
   }

packages/hoppscotch-common/src/components/smart/EnvInput.vue

@@ -79,6 +79,7 @@ const props = withDefaults(
     readonly?: boolean
     autoCompleteSource?: string[]
     inspectionResults?: InspectorResult[] | undefined
+    contextMenuEnabled?: boolean
   }>(),
   {
     modelValue: "",
@@ -91,6 +92,7 @@ const props = withDefaults(
     autoCompleteSource: undefined,
     inspectionResult: undefined,
     inspectionResults: undefined,
+    contextMenuEnabled: true,
   }
 )
 
@@ -359,8 +361,11 @@ const initView = (el: any) => {
     handleTextSelection()
   }, 140)
 
-  el.addEventListener("mouseup", debounceFn)
+  // Only add event listeners if context menu is enabled in the component
-  el.addEventListener("keyup", debounceFn)
+  if (props.contextMenuEnabled) {
+    el.addEventListener("mouseup", debounceFn)
+    el.addEventListener("keyup", debounceFn)
+  }
 
   const extensions: Extension = [
     EditorView.contentAttributes.of({ "aria-label": props.placeholder }),
@@ -396,7 +401,7 @@ const initView = (el: any) => {
         ev.preventDefault()
       },
       scroll(event) {
-        if (event.target) {
+        if (event.target && props.contextMenuEnabled) {
           handleTextSelection()
         }
       },
@@ -405,7 +410,6 @@ const initView = (el: any) => {
       class {
         update(update: ViewUpdate) {
           if (props.readonly) return
-
           if (update.docChanged) {
             const prevValue = clone(cachedValue.value)
 
@@ -436,6 +440,17 @@ const initView = (el: any) => {
               clipboardEv = null
               pastedValue = null
             }
+
+            if (props.contextMenuEnabled) {
+              // close the context menu if text is being updated in the editor
+              invokeAction("contextmenu.open", {
+                position: {
+                  top: 0,
+                  left: 0,
+                },
+                text: null,
+              })
+            }
           }
         }
       }

packages/hoppscotch-common/src/components/teams/Invite.vue

@@ -124,6 +124,8 @@
                 E.isRight(pendingInvites.data) &&
                 pendingInvites.data.right.team?.teamInvitations.length === 0
               "
+              :src="`/images/states/${colorMode.value}/add_group.svg`"
+              :alt="t('empty.pending_invites')"
               :text="t('empty.pending_invites')"
             />
             <div

packages/hoppscotch-common/src/components/teams/MemberStack.vue

@@ -17,7 +17,7 @@
       v-if="props.showCount && props.teamMembers.length > maxMembersSoftLimit"
       v-tippy="{ theme: 'tooltip', allowHTML: true }"
       :title="remainingSlicedMembers"
-      class="font- text-8px z-10 inline-flex h-5 w-5 cursor-pointer items-center justify-center rounded-full bg-dividerDark text-secondaryDark ring-2 ring-primary focus:outline-none focus-visible:ring-2 focus-visible:ring-primaryDark"
+      class="text-[8px] z-10 inline-flex h-5 w-5 cursor-pointer items-center justify-center rounded-full bg-dividerDark text-secondaryDark ring-2 ring-primary focus:outline-none focus-visible:ring-2 focus-visible:ring-primaryDark"
       tabindex="0"
       @click="handleClick()"
     >

packages/hoppscotch-common/src/components/workspace/Selector.vue

@@ -33,7 +33,7 @@
       </HoppSmartPlaceholder>
       <div v-else-if="!loading" class="flex flex-col">
         <div
-          class="sticky -top-2 top-0 z-10 mb-2 flex items-center justify-between bg-popover py-2 pl-2"
+          class="sticky top-0 z-10 mb-2 flex items-center justify-between bg-popover py-2 pl-2"
         >
           <div class="flex items-center px-2 font-semibold text-secondaryLight">
             {{ t("team.title") }}

packages/hoppscotch-common/src/composables/codemirror.ts

@@ -63,6 +63,8 @@ type CodeMirrorOptions = {
 
   additionalExts?: Extension[]
 
+  contextMenuEnabled?: boolean
+
   // callback on editor update
   onUpdate?: (view: ViewUpdate) => void
 }
@@ -208,6 +210,9 @@ export function useCodemirror(
 ): { cursor: Ref<{ line: number; ch: number }> } {
   const { subscribeToStream } = useStreamSubscriber()
 
+  // Set default value for contextMenuEnabled if not provided
+  options.contextMenuEnabled = options.contextMenuEnabled ?? true
+
   const additionalExts = new Compartment()
   const language = new Compartment()
   const lineWrapping = new Compartment()
@@ -272,8 +277,11 @@ export function useCodemirror(
               handleTextSelection()
             }, 140)
 
-            el.addEventListener("mouseup", debounceFn)
+            // Only add event listeners if context menu is enabled in the editor
-            el.addEventListener("keyup", debounceFn)
+            if (options.contextMenuEnabled) {
+              el.addEventListener("mouseup", debounceFn)
+              el.addEventListener("keyup", debounceFn)
+            }
 
             if (options.onUpdate) {
               options.onUpdate(update)
@@ -312,7 +320,7 @@ export function useCodemirror(
       ),
       EditorView.domEventHandlers({
         scroll(event) {
-          if (event.target) {
+          if (event.target && options.contextMenuEnabled) {
             handleTextSelection()
           }
         },

packages/hoppscotch-common/src/helpers/backend/gql/mutations/UpdateRequest.graphql

@@ -2,6 +2,5 @@ mutation UpdateRequest($data: UpdateTeamRequestInput!, $requestID: ID!) {
   updateRequest(data: $data, requestID: $requestID) {
     id
     title
-    collectionID
   }
 }

packages/hoppscotch-common/src/helpers/functional/json.ts

@@ -1,13 +1,24 @@
 import * as O from "fp-ts/Option"
 import { flow } from "fp-ts/function"
 
+type SafeParseJSON = {
+  (str: string, convertToArray: true): O.Option<Array<unknown>>
+  (str: string, convertToArray?: false): O.Option<Record<string, unknown>>
+}
+
 /**
  * Checks and Parses JSON string
  * @param str Raw JSON data to be parsed
  * @returns Option type with some(JSON data) or none
  */
-export const safeParseJSON = (str: string): O.Option<object> =>
+export const safeParseJSON: SafeParseJSON = (str, convertToArray = false) =>
-  O.tryCatch(() => JSON.parse(str))
+  O.tryCatch(() => {
+    const data = JSON.parse(str)
+    if (convertToArray) {
+      return Array.isArray(data) ? data : [data]
+    }
+    return data
+  })
 
 /**
  * Checks if given string is a JSON string

packages/hoppscotch-common/src/helpers/import-export/import/hoppEnv.ts

@@ -18,7 +18,7 @@ const hoppEnvSchema = z.object({
 })
 
 export const hoppEnvImporter = (content: string) => {
-  const parsedContent = safeParseJSON(content)
+  const parsedContent = safeParseJSON(content, true)
 
   // parse json from the environments string
   if (O.isNone(parsedContent)) {

packages/hoppscotch-common/src/helpers/import-export/import/openapi.ts

@@ -549,13 +549,19 @@ const convertPathToHoppReqs = (
     ),
 
     // Construct request object
-    RA.map(({ method, info }) =>
+    RA.map(({ method, info }) => {
-      makeRESTRequest({
+      const openAPIUrl = parseOpenAPIUrl(doc)
+      const openAPIPath = replaceOpenApiPathTemplating(pathName)
+
+      const endpoint =
+        openAPIUrl.endsWith("/") && openAPIPath.startsWith("/")
+          ? openAPIUrl + openAPIPath.slice(1)
+          : openAPIUrl + openAPIPath
+
+      return makeRESTRequest({
         name: info.operationId ?? info.summary ?? "Untitled Request",
         method: method.toUpperCase(),
-        endpoint: `${parseOpenAPIUrl(doc)}${replaceOpenApiPathTemplating(
+        endpoint,
-          pathName
-        )}`,
 
         // We don't need to worry about reference types as the Dereferencing pass should remove them
         params: parseOpenAPIParams(
@@ -572,7 +578,7 @@ const convertPathToHoppReqs = (
         preRequestScript: "",
         testScript: "",
       })
-    ),
+    }),
 
     // Disable Readonly
     RA.toArray

packages/hoppscotch-common/src/helpers/shortcode/ShortcodeListAdapter.ts

@@ -156,7 +156,6 @@ export default class ShortcodeListAdapter {
     const [shortcodeCreated$, shortcodeCreatedSub] = runAuthOnlyGQLSubscription(
       {
         query: ShortcodeCreatedDocument,
-        variables: {},
       }
     )
 
@@ -173,7 +172,6 @@ export default class ShortcodeListAdapter {
     const [shortcodeRevoked$, shortcodeRevokedSub] = runAuthOnlyGQLSubscription(
       {
         query: ShortcodeDeletedDocument,
-        variables: {},
       }
     )
 
@@ -190,7 +188,6 @@ export default class ShortcodeListAdapter {
     const [shortcodeUpdated$, shortcodeUpdatedSub] = runAuthOnlyGQLSubscription(
       {
         query: ShortcodeUpdatedDocument,
-        variables: {},
       }
     )
 

packages/hoppscotch-common/src/helpers/teams/TeamCollectionAdapter.ts

@@ -1034,11 +1034,6 @@ export default class NewTeamCollectionAdapter {
     }
   }
 
-  /**
-   * Used to obtain the inherited auth and headers for a given folder path, used for both REST and GraphQL team collections
-   * @param folderPath the path of the folder to cascade the auth from
-   * @returns the inherited auth and headers for the given folder path
-   */
   public cascadeParentCollectionForHeaderAuth(folderPath: string) {
     let auth: HoppInheritedProperty["auth"] = {
       parentID: folderPath ?? "",
@@ -1094,10 +1089,7 @@ export default class NewTeamCollectionAdapter {
       const parentFolderAuth = data.auth
       const parentFolderHeaders = data.headers
 
-      if (
+      if (parentFolderAuth?.authType === "inherit" && path.length === 1) {
-        parentFolderAuth?.authType === "inherit" &&
-        [...path.slice(0, i + 1)].length === 1
-      ) {
         auth = {
           parentID: [...path.slice(0, i + 1)].join("/"),
           parentName: parentFolder.title,

packages/hoppscotch-common/src/newstore/collections.ts

@@ -68,7 +68,7 @@ export function navigateToFolderWithIndexPath(
 }
 
 /**
- * Used to obtain the inherited auth and headers for a given folder path, used for both REST and GraphQL personal collections
+ * Used to obtain the inherited auth and headers for a given folder path, used for both REST and GraphQL
  * @param folderPath the path of the folder to cascade the auth from
  * @param type the type of collection
  * @returns the inherited auth and headers for the given folder path

packages/hoppscotch-common/src/pages/e/_id.vue

@@ -18,41 +18,6 @@
       :properties="properties"
       :shared-request-i-d="sharedRequestID"
     />
-    <div v-else class="flex flex-1 flex-col items-center justify-center p-4">
-      <div
-        v-if="sharedRequestDetails.loading"
-        class="flex flex-1 flex-col items-center justify-center p-4"
-      >
-        <HoppSmartSpinner />
-      </div>
-      <div v-else>
-        <div
-          v-if="
-            !sharedRequestDetails.loading && E.isLeft(sharedRequestDetails.data)
-          "
-          class="flex flex-col items-center p-4"
-        >
-          <icon-lucide-alert-triangle class="svg-icons mb-2 opacity-75" />
-          <h1 class="heading text-center">
-            {{ t("error.invalid_link") }}
-          </h1>
-          <p class="mt-2 text-center">
-            {{ t("error.invalid_embed_link") }}
-          </p>
-        </div>
-        <div
-          v-if="
-            !sharedRequestDetails.loading &&
-            E.isRight(sharedRequestDetails.data)
-          "
-          class="flex flex-1 flex-col items-center justify-center p-4"
-        >
-          <h1 class="heading">
-            {{ t("state.loading") }}
-          </h1>
-        </div>
-      </div>
-    </div>
   </div>
 </template>
 

packages/hoppscotch-selfhost-desktop/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@hoppscotch/selfhost-desktop",
   "private": true,
-  "version": "2023.12.0-1",
+  "version": "2023.12.2",
   "type": "module",
   "scripts": {
     "dev:vite": "vite",
@@ -76,8 +76,6 @@
     "vite-plugin-pwa": "^0.13.1",
     "vite-plugin-static-copy": "^0.12.0",
     "vite-plugin-vue-layouts": "^0.7.0",
-    "vite-plugin-windicss": "^1.8.8",
+    "vue-tsc": "^1.0.11"
-    "vue-tsc": "^1.0.11",
-    "windicss": "^3.5.6"
   }
 }

packages/hoppscotch-selfhost-desktop/src-tauri/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "hoppscotch-desktop"
-version = "23.12.0-1"
+version = "23.12.2"
 description = "A Tauri App"
 authors = ["you"]
 license = ""

packages/hoppscotch-selfhost-desktop/src-tauri/tauri.conf.json

@@ -8,7 +8,7 @@
   },
   "package": {
     "productName": "Hoppscotch",
-    "version": "23.12.0-1"
+    "version": "23.12.2"
   },
   "tauri": {
     "allowlist": {

packages/hoppscotch-selfhost-desktop/vite.config.ts

@@ -8,7 +8,6 @@ import VueI18n from "@intlify/vite-plugin-vue-i18n"
 import Components from "unplugin-vue-components/vite"
 import Icons from "unplugin-icons/vite"
 import Inspect from "vite-plugin-inspect"
-import WindiCSS from "vite-plugin-windicss"
 import { VitePWA } from "vite-plugin-pwa"
 import Pages from "vite-plugin-pages"
 import Layouts from "vite-plugin-vue-layouts"
@@ -105,9 +104,6 @@ export default defineConfig({
       compositionOnly: true,
       include: [path.resolve(__dirname, "locales")],
     }),
-    WindiCSS({
-      root: path.resolve(__dirname, "../hoppscotch-common"),
-    }),
     Components({
       dts: "../hoppscotch-common/src/components.d.ts",
       dirs: [

packages/hoppscotch-selfhost-web/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@hoppscotch/selfhost-web",
   "private": true,
-  "version": "2023.12.0-1",
+  "version": "2023.12.2",
   "type": "module",
   "scripts": {
     "dev:vite": "vite",

packages/hoppscotch-selfhost-web/src/platform/auth/auth.platform.ts

@@ -114,6 +114,7 @@ async function setInitialUser() {
     } else {
       setUser(null)
       isGettingInitialUser.value = false
+      await logout()
     }
 
     return
@@ -146,22 +147,26 @@ async function setInitialUser() {
 }
 
 async function refreshToken() {
-  const res = await axios.get(
+  try {
-    `${import.meta.env.VITE_BACKEND_API_URL}/auth/refresh`,
+    const res = await axios.get(
-    {
+      `${import.meta.env.VITE_BACKEND_API_URL}/auth/refresh`,
-      withCredentials: true,
+      {
+        withCredentials: true,
+      }
+    )
+
+    const isSuccessful = res.status === 200
+
+    if (isSuccessful) {
+      authEvents$.next({
+        event: "token_refresh",
+      })
     }
-  )
 
-  const isSuccessful = res.status === 200
+    return isSuccessful
-
+  } catch (error) {
-  if (isSuccessful) {
+    return false
-    authEvents$.next({
-      event: "token_refresh",
-    })
   }
-
-  return isSuccessful
 }
 
 async function sendMagicLink(email: string) {

packages/hoppscotch-sh-admin/README.md

@@ -24,7 +24,7 @@
 ## **Built with**
 
 - [HTML](https://developer.mozilla.org/en-US/docs/Web/HTML)
-- [CSS](https://developer.mozilla.org/en-US/docs/Web/CSS), [SCSS](https://sass-lang.com), [Windi CSS](https://windicss.org)
+- [CSS](https://developer.mozilla.org/en-US/docs/Web/CSS), [SCSS](https://sass-lang.com), [Tailwind CSS](https://tailwindcss.com)
 - [JavaScript](https://developer.mozilla.org/en-US/docs/Web/JavaScript)
 - [TypeScript](https://www.typescriptlang.org)
 - [Vue](https://vuejs.org)

packages/hoppscotch-sh-admin/package.json

@@ -1,7 +1,7 @@
 {
   "name": "hoppscotch-sh-admin",
   "private": true,
-  "version": "2023.12.0-1",
+  "version": "2023.12.2",
   "type": "module",
   "scripts": {
     "dev": "pnpm exec npm-run-all -p -l dev:*",

packages/hoppscotch-sh-admin/src/components.d.ts

@@ -1,9 +1,9 @@
 // generated by unplugin-vue-components
 // We suggest you to commit this file into source control
 // Read more: https://github.com/vuejs/core/pull/3399
-import '@vue/runtime-core';
+import '@vue/runtime-core'
 
-export {};
+export {}
 
 declare module '@vue/runtime-core' {
   export interface GlobalComponents {
@@ -13,8 +13,6 @@ declare module '@vue/runtime-core' {
     AppModal: typeof import('./components/app/Modal.vue')['default']
     AppSidebar: typeof import('./components/app/Sidebar.vue')['default']
     AppToast: typeof import('./components/app/Toast.vue')['default']
-    ButtonPrimary: typeof import('./../../hoppscotch-ui/src/components/button/Primary.vue')['default']
-    ButtonSecondary: typeof import('./../../hoppscotch-ui/src/components/button/Secondary.vue')['default']
     DashboardMetricsCard: typeof import('./components/dashboard/MetricsCard.vue')['default']
     HoppButtonPrimary: typeof import('@hoppscotch/ui')['HoppButtonPrimary']
     HoppButtonSecondary: typeof import('@hoppscotch/ui')['HoppButtonSecondary']
@@ -23,6 +21,7 @@ declare module '@vue/runtime-core' {
     HoppSmartConfirmModal: typeof import('@hoppscotch/ui')['HoppSmartConfirmModal']
     HoppSmartInput: typeof import('@hoppscotch/ui')['HoppSmartInput']
     HoppSmartItem: typeof import('@hoppscotch/ui')['HoppSmartItem']
+    HoppSmartLink: typeof import('@hoppscotch/ui')['HoppSmartLink']
     HoppSmartModal: typeof import('@hoppscotch/ui')['HoppSmartModal']
     HoppSmartPicture: typeof import('@hoppscotch/ui')['HoppSmartPicture']
     HoppSmartSpinner: typeof import('@hoppscotch/ui')['HoppSmartSpinner']
@@ -30,42 +29,13 @@ declare module '@vue/runtime-core' {
     HoppSmartTable: typeof import('@hoppscotch/ui')['HoppSmartTable']
     HoppSmartTabs: typeof import('@hoppscotch/ui')['HoppSmartTabs']
     HoppSmartToggle: typeof import('@hoppscotch/ui')['HoppSmartToggle']
-    IconLucideArrowLeft: typeof import('~icons/lucide/arrow-left')['default']
     IconLucideChevronDown: typeof import('~icons/lucide/chevron-down')['default']
     IconLucideInbox: typeof import('~icons/lucide/inbox')['default']
-    IconLucideUser: typeof import('~icons/lucide/user')['default']
     SettingsAuthProvider: typeof import('./components/settings/AuthProvider.vue')['default']
     SettingsConfigurations: typeof import('./components/settings/Configurations.vue')['default']
     SettingsReset: typeof import('./components/settings/Reset.vue')['default']
     SettingsServerRestart: typeof import('./components/settings/ServerRestart.vue')['default']
     SettingsSmtpConfiguration: typeof import('./components/settings/SmtpConfiguration.vue')['default']
-    SmartAnchor: typeof import('./../../hoppscotch-ui/src/components/smart/Anchor.vue')['default']
-    SmartAutoComplete: typeof import('./../../hoppscotch-ui/src/components/smart/AutoComplete.vue')['default']
-    SmartCheckbox: typeof import('./../../hoppscotch-ui/src/components/smart/Checkbox.vue')['default']
-    SmartConfirmModal: typeof import('./../../hoppscotch-ui/src/components/smart/ConfirmModal.vue')['default']
-    SmartExpand: typeof import('./../../hoppscotch-ui/src/components/smart/Expand.vue')['default']
-    SmartFileChip: typeof import('./../../hoppscotch-ui/src/components/smart/FileChip.vue')['default']
-    SmartInput: typeof import('./../../hoppscotch-ui/src/components/smart/Input.vue')['default']
-    SmartIntersection: typeof import('./../../hoppscotch-ui/src/components/smart/Intersection.vue')['default']
-    SmartItem: typeof import('./../../hoppscotch-ui/src/components/smart/Item.vue')['default']
-    SmartLink: typeof import('./../../hoppscotch-ui/src/components/smart/Link.vue')['default']
-    SmartModal: typeof import('./../../hoppscotch-ui/src/components/smart/Modal.vue')['default']
-    SmartPicture: typeof import('./../../hoppscotch-ui/src/components/smart/Picture.vue')['default']
-    SmartPlaceholder: typeof import('./../../hoppscotch-ui/src/components/smart/Placeholder.vue')['default']
-    SmartProgressRing: typeof import('./../../hoppscotch-ui/src/components/smart/ProgressRing.vue')['default']
-    SmartRadio: typeof import('./../../hoppscotch-ui/src/components/smart/Radio.vue')['default']
-    SmartRadioGroup: typeof import('./../../hoppscotch-ui/src/components/smart/RadioGroup.vue')['default']
-    SmartSelectWrapper: typeof import('./../../hoppscotch-ui/src/components/smart/SelectWrapper.vue')['default']
-    SmartSlideOver: typeof import('./../../hoppscotch-ui/src/components/smart/SlideOver.vue')['default']
-    SmartSpinner: typeof import('./../../hoppscotch-ui/src/components/smart/Spinner.vue')['default']
-    SmartTab: typeof import('./../../hoppscotch-ui/src/components/smart/Tab.vue')['default']
-    SmartTable: typeof import('./../../hoppscotch-ui/src/components/smart/Table.vue')['default']
-    SmartTabs: typeof import('./../../hoppscotch-ui/src/components/smart/Tabs.vue')['default']
-    SmartToggle: typeof import('./../../hoppscotch-ui/src/components/smart/Toggle.vue')['default']
-    SmartTree: typeof import('./../../hoppscotch-ui/src/components/smart/Tree.vue')['default']
-    SmartTreeBranch: typeof import('./../../hoppscotch-ui/src/components/smart/TreeBranch.vue')['default']
-    SmartWindow: typeof import('./../../hoppscotch-ui/src/components/smart/Window.vue')['default']
-    SmartWindows: typeof import('./../../hoppscotch-ui/src/components/smart/Windows.vue')['default']
     TeamsAdd: typeof import('./components/teams/Add.vue')['default']
     TeamsDetails: typeof import('./components/teams/Details.vue')['default']
     TeamsInvite: typeof import('./components/teams/Invite.vue')['default']
@@ -76,27 +46,6 @@ declare module '@vue/runtime-core' {
     UsersDetails: typeof import('./components/users/Details.vue')['default']
     UsersInviteModal: typeof import('./components/users/InviteModal.vue')['default']
     UsersSharedRequests: typeof import('./components/users/SharedRequests.vue')['default']
-    AppHeader: typeof import('./components/app/Header.vue')['default'];
-    AppLogin: typeof import('./components/app/Login.vue')['default'];
-    AppLogout: typeof import('./components/app/Logout.vue')['default'];
-    AppModal: typeof import('./components/app/Modal.vue')['default'];
-    AppSidebar: typeof import('./components/app/Sidebar.vue')['default'];
-    AppToast: typeof import('./components/app/Toast.vue')['default'];
-    DashboardMetricsCard: typeof import('./components/dashboard/MetricsCard.vue')['default'];
-    HoppButtonSecondary: typeof import('@hoppscotch/ui')['HoppButtonSecondary'];
-    HoppSmartAnchor: typeof import('@hoppscotch/ui')['HoppSmartAnchor'];
-    HoppSmartConfirmModal: typeof import('@hoppscotch/ui')['HoppSmartConfirmModal'];
-    HoppSmartInput: typeof import('@hoppscotch/ui')['HoppSmartInput'];
-    HoppSmartItem: typeof import('@hoppscotch/ui')['HoppSmartItem'];
-    HoppSmartPicture: typeof import('@hoppscotch/ui')['HoppSmartPicture'];
-    HoppSmartSpinner: typeof import('@hoppscotch/ui')['HoppSmartSpinner'];
-    IconLucideInbox: typeof import('~icons/lucide/inbox')['default'];
-    TeamsAdd: typeof import('./components/teams/Add.vue')['default'];
-    TeamsDetails: typeof import('./components/teams/Details.vue')['default'];
-    TeamsInvite: typeof import('./components/teams/Invite.vue')['default'];
-    TeamsMembers: typeof import('./components/teams/Members.vue')['default'];
-    TeamsPendingInvites: typeof import('./components/teams/PendingInvites.vue')['default'];
-    Tippy: typeof import('vue-tippy')['Tippy'];
-    UsersInviteModal: typeof import('./components/users/InviteModal.vue')['default'];
   }
+
 }

packages/hoppscotch-sh-admin/src/components/app/Sidebar.vue

@@ -12,7 +12,7 @@
       :class="isOpen ? '' : '-translate-x-full ease-in'"
       class="sidebar-container transform !md:translate-x-0 ease-out"
     >
-      <div :class="isExpanded ? 'w-80' : 'w-full'">
+      <div :class="isExpanded ? 'w-56' : 'w-full'">
         <div class="flex items-center justify-start px-4 my-4">
           <div class="flex items-center">
             <HoppSmartLink class="flex items-center space-x-4" to="/dashboard">
@@ -26,7 +26,6 @@
             </HoppSmartLink>
           </div>
         </div>
-
         <nav class="my-5">
           <HoppSmartLink
             v-for="(navigation, index) in primaryNavigations"
@@ -39,19 +38,32 @@
             :to="navigation.to"
             tabindex="0"
             :exact="navigation.exact"
-            class="nav-link"
             :class="
               !isExpanded
                 ? 'flex items-center justify-center'
                 : 'flex items-center'
             "
+            @click="setActiveTab(navigation.label)"
           >
-            <div v-if="navigation.icon">
+            <div
-              <component :is="navigation.icon" class="svg-icons" />
+              class="flex p-5 w-full font-bold"
+              :class="
+                activeTab === navigation.label
+                  ? 'bg-primaryDark text-secondaryDark border-l-2 border-l-emerald-600'
+                  : 'bg-primary hover:bg-primaryLight hover:text-secondaryDark focus-visible:text-secondaryDark focus-visible:bg-primaryLight focus-visible:outline-none'
+              "
+            >
+              <div
+                v-if="navigation.icon"
+                class="svg-icons"
+                :class="isExpanded ? 'mr-3' : 'mx-auto'"
+              >
+                <component :is="navigation.icon" />
+              </div>
+              <span v-if="isExpanded" class="nav-title">
+                {{ navigation.label }}
+              </span>
             </div>
-            <span v-if="isExpanded" class="nav-title">
-              {{ navigation.label }}
-            </span>
           </HoppSmartLink>
         </nav>
       </div>
@@ -60,19 +72,27 @@
 </template>
 
 <script setup lang="ts">
-import { HoppSmartLink } from '@hoppscotch/ui';
+import { ref, type Component } from 'vue';
+
+import { useI18n } from '~/composables/i18n';
 import { useSidebar } from '~/composables/useSidebar';
 import IconDashboard from '~icons/lucide/layout-dashboard';
+import IconSettings from '~icons/lucide/settings';
 import IconUser from '~icons/lucide/user';
 import IconUsers from '~icons/lucide/users';
-import IconSettings from '~icons/lucide/settings';
-import { useI18n } from '~/composables/i18n';
 
 const t = useI18n();
 
 const { isOpen, isExpanded } = useSidebar();
 
-const primaryNavigations = [
+type NavigationItem = {
+  label: string;
+  icon: Component;
+  to: string;
+  exact: boolean;
+};
+
+const primaryNavigations: NavigationItem[] = [
   {
     label: t('metrics.dashboard'),
     icon: IconDashboard,
@@ -98,6 +118,12 @@ const primaryNavigations = [
     exact: true,
   },
 ];
+
+const activeTab = ref('Dashboard');
+
+const setActiveTab = (tab: string) => {
+  activeTab.value = tab;
+};
 </script>
 
 <style scoped lang="scss">
@@ -106,54 +132,4 @@ const primaryNavigations = [
   @apply transition duration-300;
   @apply flex overflow-y-auto bg-primary border-r border-divider;
 }
-
-.nav-link {
-  @apply relative;
-  @apply p-4;
-  @apply flex flex-1;
-  @apply items-center;
-  @apply space-x-4;
-  @apply hover:bg-primaryDark hover:text-secondaryDark;
-  @apply focus-visible:text-secondaryDark;
-  @apply after:absolute;
-  @apply after:inset-x-0;
-  @apply after:md:inset-x-auto;
-  @apply after:md:inset-y-0;
-  @apply after:bottom-0;
-  @apply after:md:bottom-auto;
-  @apply after:md:left-0;
-  @apply after:z-10;
-  @apply after:h-0.5;
-  @apply after:md:h-full;
-  @apply after:w-full;
-  @apply after:md:w-0.5;
-  @apply after:content-[''];
-  @apply focus:after:bg-divider;
-
-  .svg-icons {
-    @apply opacity-75;
-  }
-
-  &.router-link-active {
-    @apply text-secondaryDark;
-    @apply bg-primaryLight;
-    @apply hover:text-secondaryDark;
-    @apply after:bg-accent;
-
-    .svg-icons {
-      @apply opacity-100;
-    }
-  }
-
-  &.exact-active-link {
-    @apply text-secondaryDark;
-    @apply bg-primaryLight;
-    @apply hover:text-secondaryDark;
-    @apply after:bg-accent;
-
-    .svg-icons {
-      @apply opacity-100;
-    }
-  }
-}
 </style>

pnpm-lock.yaml

@@ -1063,15 +1063,9 @@ importers:
       vite-plugin-vue-layouts:
         specifier: ^0.7.0
         version: 0.7.0(vite@4.5.0)(vue-router@4.2.5)(vue@3.3.9)
-      vite-plugin-windicss:
-        specifier: ^1.8.8
-        version: 1.9.1(vite@4.5.0)
       vue-tsc:
         specifier: ^1.0.11
         version: 1.8.8(typescript@4.9.5)
-      windicss:
-        specifier: ^3.5.6
-        version: 3.5.6
 
   packages/hoppscotch-selfhost-web:
     dependencies:
@@ -4237,7 +4231,7 @@ packages:
     peerDependencies:
       vue: 3.3.9
     dependencies:
-      vue: 3.3.9(typescript@4.9.5)
+      vue: 3.3.9(typescript@5.3.2)
 
   /@codemirror/autocomplete@6.11.1(@codemirror/language@6.9.3)(@codemirror/state@6.3.3)(@codemirror/view@6.22.3)(@lezer/common@1.0.3):
     resolution: {integrity: sha512-L5UInv8Ffd6BPw0P3EF7JLYAMeEbclY7+6Q11REt8vhih8RuLreKtPy/xk8wPxs4EQgYqzI7cdgpiYwWlbS/ow==}
@@ -7059,7 +7053,7 @@ packages:
       lodash-es: 4.17.21
       path: 0.12.7
       vite-plugin-eslint: 1.8.1(eslint@8.55.0)(vite@3.2.4)
-      vue: 3.3.9(typescript@4.9.5)
+      vue: 3.3.9(typescript@4.9.3)
       vuedraggable-es: 4.1.1(vue@3.3.9)
     transitivePeerDependencies:
       - '@vue/composition-api'
@@ -7098,7 +7092,7 @@ packages:
     peerDependencies:
       vue: 3.3.9
     dependencies:
-      vue: 3.3.9(typescript@4.9.5)
+      vue: 3.3.9(typescript@5.3.2)
 
   /@humanwhocodes/config-array@0.11.10:
     resolution: {integrity: sha512-KVVjQmNUepDVGXNuoRRdmmEjruj0KfiGSbS8LVc12LMsWDQzRXJ0qdhN8L8uUigKpfEHRhlaQFY0ib1tnUbNeQ==}
@@ -7400,7 +7394,7 @@ packages:
     dependencies:
       '@intlify/bundle-utils': 7.4.0(vue-i18n@9.2.2)
       '@intlify/shared': 9.4.1
-      '@rollup/pluginutils': 5.0.3(rollup@3.29.4)
+      '@rollup/pluginutils': 5.0.3(rollup@2.79.1)
       '@vue/compiler-sfc': 3.3.10
       debug: 4.3.4(supports-color@9.2.2)
       fast-glob: 3.3.1
@@ -8993,7 +8987,6 @@ packages:
       estree-walker: 2.0.2
       picomatch: 2.3.1
       rollup: 2.79.1
-    dev: true
 
   /@rollup/pluginutils@5.0.3(rollup@3.29.4):
     resolution: {integrity: sha512-hfllNN4a80rwNQ9QCxhxuHCGHMAvabXqxNdaChUSSadMre7t4iEUI6fFAhBOn/eIYTgYVhBv7vCLsAJ4u3lf3g==}
@@ -9008,6 +9001,7 @@ packages:
       estree-walker: 2.0.2
       picomatch: 2.3.1
       rollup: 3.29.4
+    dev: true
 
   /@rollup/pluginutils@5.1.0(rollup@2.79.1):
     resolution: {integrity: sha512-XTIWOPPcpvyKI6L1NHo0lFlCyznUEyPmPY1mc3KpPVDYulHSTvyeLNVW00QTLIAFNhR3kYnJTQHeGqU4M3n09g==}
@@ -10625,7 +10619,7 @@ packages:
       regenerator-runtime: 0.13.11
       systemjs: 6.14.2
       terser: 5.24.0
-      vite: 3.2.4(@types/node@17.0.27)(terser@5.24.0)
+      vite: 3.2.4(@types/node@18.18.8)(sass@1.58.0)(terser@5.24.0)
 
   /@vitejs/plugin-legacy@2.3.0(terser@5.24.0)(vite@4.5.0):
     resolution: {integrity: sha512-Bh62i0gzQvvT8AeAAb78nOnqSYXypkRmQmOTImdPZ39meHR9e2une3AIFmVo4s1SDmcmJ6qj18Sa/lRc/14KaA==}
@@ -11143,7 +11137,7 @@ packages:
       '@types/web-bluetooth': 0.0.14
       '@vueuse/metadata': 8.7.5
       '@vueuse/shared': 8.7.5(vue@3.3.9)
-      vue: 3.3.9(typescript@4.9.5)
+      vue: 3.3.9(typescript@5.3.2)
       vue-demi: 0.14.6(vue@3.3.9)
 
   /@vueuse/core@9.12.0(vue@3.3.9):
@@ -11202,7 +11196,7 @@ packages:
       vue:
         optional: true
     dependencies:
-      vue: 3.3.9(typescript@4.9.5)
+      vue: 3.3.9(typescript@5.3.2)
       vue-demi: 0.14.6(vue@3.3.9)
 
   /@vueuse/shared@9.12.0(vue@3.3.9):
@@ -11422,30 +11416,6 @@ packages:
       tslib: 2.6.2
     dev: true
 
-  /@windicss/config@1.9.1:
-    resolution: {integrity: sha512-MjutTiS9XIteriwkH9D+que+bILbpulekYzjJGQDg3Sb2H87aOcO30f7N11ZiHF5OYoZn4yJz4lDbB3A6IuXfQ==}
-    dependencies:
-      debug: 4.3.4(supports-color@9.2.2)
-      jiti: 1.19.3
-      windicss: 3.5.6
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /@windicss/plugin-utils@1.9.1:
-    resolution: {integrity: sha512-sz/Z2sxUZIkJ2nVeTmtYTtXhWxe/yTTkM5nqU6eKhP0n6waipTCJJdLvWoZcgzQBbBCL/JLRQd/9BYsBqKuLDQ==}
-    dependencies:
-      '@antfu/utils': 0.7.6
-      '@windicss/config': 1.9.1
-      debug: 4.3.4(supports-color@9.2.2)
-      fast-glob: 3.3.1
-      magic-string: 0.30.4
-      micromatch: 4.0.5
-      windicss: 3.5.6
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
   /@xtuc/ieee754@1.2.0:
     resolution: {integrity: sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==}
     dev: true
@@ -13614,7 +13584,7 @@ packages:
         optional: true
     dependencies:
       rxjs: 7.8.1
-      vue: 3.3.9(typescript@4.9.5)
+      vue: 3.3.9(typescript@5.3.2)
     dev: false
 
   /dir-glob@3.0.1:
@@ -24162,7 +24132,7 @@ packages:
     dependencies:
       fast-glob: 3.3.2
       unplugin: 1.5.1
-      vite: 4.5.0(@types/node@18.18.8)(sass@1.69.5)(terser@5.24.0)
+      vite: 4.5.0(@types/node@17.0.27)(sass@1.69.5)(terser@5.24.0)
     dev: true
 
   /unplugin-icons@0.14.9(@vue/compiler-sfc@3.2.45)(vite@3.2.4):
@@ -24772,7 +24742,7 @@ packages:
       '@types/eslint': 8.44.3
       eslint: 8.55.0
       rollup: 2.79.1
-      vite: 3.2.4(@types/node@17.0.27)(terser@5.24.0)
+      vite: 3.2.4(@types/node@18.18.8)(sass@1.58.0)(terser@5.24.0)
 
   /vite-plugin-eslint@1.8.1(eslint@8.55.0)(vite@4.5.0):
     resolution: {integrity: sha512-PqdMf3Y2fLO9FsNPmMX+//2BF5SF8nEWspZdgl4kSt7UvHDRHVVfHvxsD7ULYzZrJDGRxR81Nq7TOFgwMnUang==}
@@ -24803,7 +24773,7 @@ packages:
     peerDependencies:
       vite: '>=2.0.0'
     dependencies:
-      vite: 4.5.0(@types/node@18.18.8)(sass@1.69.5)(terser@5.24.0)
+      vite: 4.5.0(@types/node@17.0.27)(sass@1.69.5)(terser@5.24.0)
     dev: true
 
   /vite-plugin-inspect@0.7.38(rollup@2.79.1)(vite@4.5.0):
@@ -25066,54 +25036,6 @@ packages:
       - supports-color
     dev: true
 
-  /vite-plugin-windicss@1.9.1(vite@4.5.0):
-    resolution: {integrity: sha512-CWm1b/tXVCJTbEGn4oB8B7Gev9xDuY9k4E/KiJqDuLYspBUFQyZKPF2mSZ3DfNdojsfqgzxu9ervqvlb9jJ7fw==}
-    peerDependencies:
-      vite: ^2.0.1 || ^3.0.0 || ^4.0.0
-    dependencies:
-      '@windicss/plugin-utils': 1.9.1
-      debug: 4.3.4(supports-color@9.2.2)
-      kolorist: 1.8.0
-      vite: 4.5.0(@types/node@18.18.8)(sass@1.69.5)(terser@5.24.0)
-      windicss: 3.5.6
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /vite@3.2.4(@types/node@17.0.27)(terser@5.24.0):
-    resolution: {integrity: sha512-Z2X6SRAffOUYTa+sLy3NQ7nlHFU100xwanq1WDwqaiFiCe+25zdxP1TfCS5ojPV2oDDcXudHIoPnI1Z/66B7Yw==}
-    engines: {node: ^14.18.0 || >=16.0.0}
-    hasBin: true
-    peerDependencies:
-      '@types/node': '>= 14'
-      less: '*'
-      sass: '*'
-      stylus: '*'
-      sugarss: '*'
-      terser: ^5.4.0
-    peerDependenciesMeta:
-      '@types/node':
-        optional: true
-      less:
-        optional: true
-      sass:
-        optional: true
-      stylus:
-        optional: true
-      sugarss:
-        optional: true
-      terser:
-        optional: true
-    dependencies:
-      '@types/node': 17.0.27
-      esbuild: 0.15.15
-      postcss: 8.4.32
-      resolve: 1.22.4
-      rollup: 2.79.1
-      terser: 5.24.0
-    optionalDependencies:
-      fsevents: 2.3.3
-
   /vite@3.2.4(@types/node@18.18.8)(sass@1.58.0)(terser@5.24.0):
     resolution: {integrity: sha512-Z2X6SRAffOUYTa+sLy3NQ7nlHFU100xwanq1WDwqaiFiCe+25zdxP1TfCS5ojPV2oDDcXudHIoPnI1Z/66B7Yw==}
     engines: {node: ^14.18.0 || >=16.0.0}
@@ -25536,7 +25458,7 @@ packages:
       '@vue/composition-api':
         optional: true
     dependencies:
-      vue: 3.3.9(typescript@4.9.5)
+      vue: 3.3.9(typescript@5.3.2)
 
   /vue-eslint-parser@9.3.1(eslint@8.47.0):
     resolution: {integrity: sha512-Clr85iD2XFZ3lJ52/ppmUDG/spxQu6+MAeHXjjyI4I1NUYZ9xmenQp4N0oaHJhrA8OOxltCVxMRfANGa70vU0g==}
@@ -25620,7 +25542,7 @@ packages:
       vue: 3.3.9
     dependencies:
       '@vue/devtools-api': 6.5.1
-      vue: 3.3.9(typescript@4.9.5)
+      vue: 3.3.9(typescript@5.3.2)
 
   /vue-template-compiler@2.7.14:
     resolution: {integrity: sha512-zyA5Y3ArvVG0NacJDkkzJuPQDF8RFeRlzV2vLeSnhSpieO6LK2OVbdLPi5MPPs09Ii+gMO8nY4S3iKQxBxDmWQ==}
@@ -25732,7 +25654,7 @@ packages:
       vue: 3.3.9
     dependencies:
       sortablejs: 1.14.0
-      vue: 3.3.9(typescript@4.9.5)
+      vue: 3.3.9(typescript@5.3.2)
 
   /w3c-hr-time@1.0.2:
     resolution: {integrity: sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==}
@@ -26003,12 +25925,6 @@ packages:
     dependencies:
       string-width: 4.2.3
 
-  /windicss@3.5.6:
-    resolution: {integrity: sha512-P1mzPEjgFMZLX0ZqfFht4fhV/FX8DTG7ERG1fBLiWvd34pTLVReS5CVsewKn9PApSgXnVfPWwvq+qUsRwpnwFA==}
-    engines: {node: '>= 12'}
-    hasBin: true
-    dev: true
-
   /windows-release@4.0.0:
     resolution: {integrity: sha512-OxmV4wzDKB1x7AZaZgXMVsdJ1qER1ed83ZrTYd5Bwq2HfJVg3DJS8nqlAG4sMoJ7mu8cuRmLEYyU13BKwctRAg==}
     engines: {node: '>=10'}

prod.Dockerfile

@@ -1,4 +1,4 @@
-FROM node:18-alpine3.16 as base_builder
+FROM node:18-alpine3.19 as base_builder
 
 WORKDIR /usr/src/app