fix: skip parameter in findMany

.github/workflows/release-push-docker.yml

@@ -1,66 +0,0 @@
-name: "Push containers to Docker Hub on release"
-
-on:
-  push:
-    tags:
-      - '*.*.*'
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Setup environment
-        run: cp .env.example .env
-
-      - name: Log in to Docker Hub
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-
-      - name: Build and push `${{ secrets.DOCKER_BACKEND_CONTAINER_NAME }}`
-        uses: docker/build-push-action@v4
-        with:
-          context: .
-          file: ./prod.Dockerfile
-          target: backend
-          push: true
-          tags: |
-            ${{ secrets.DOCKER_ORG_NAME }}/${{ secrets.DOCKER_BACKEND_CONTAINER_NAME }}:latest
-            ${{ secrets.DOCKER_ORG_NAME }}/${{ secrets.DOCKER_BACKEND_CONTAINER_NAME }}:${{ github.ref_name }}
-
-      - name: Build and push `${{ secrets.DOCKER_FRONTEND_CONTAINER_NAME }}`
-        uses: docker/build-push-action@v4
-        with:
-          context: .
-          file: ./prod.Dockerfile
-          target: app
-          push: true
-          tags: |
-            ${{ secrets.DOCKER_ORG_NAME }}/${{ secrets.DOCKER_FRONTEND_CONTAINER_NAME }}:latest
-            ${{ secrets.DOCKER_ORG_NAME }}/${{ secrets.DOCKER_FRONTEND_CONTAINER_NAME }}:${{ github.ref_name }}
-
-      - name: Build and push `${{ secrets.DOCKER_SH_ADMIN_CONTAINER_NAME }}`
-        uses: docker/build-push-action@v4
-        with:
-          context: .
-          file: ./prod.Dockerfile
-          target: sh_admin
-          push: true
-          tags: |
-            ${{ secrets.DOCKER_ORG_NAME }}/${{ secrets.DOCKER_SH_ADMIN_CONTAINER_NAME }}:latest
-            ${{ secrets.DOCKER_ORG_NAME }}/${{ secrets.DOCKER_SH_ADMIN_CONTAINER_NAME }}:${{ github.ref_name }}
-
-      - name: Build and push `${{ secrets.DOCKER_AIO_CONTAINER_NAME }}`
-        uses: docker/build-push-action@v4
-        with:
-          context: .
-          file: ./prod.Dockerfile
-          target: aio
-          push: true
-          tags: |
-            ${{ secrets.DOCKER_ORG_NAME }}/${{ secrets.DOCKER_AIO_CONTAINER_NAME }}:latest
-            ${{ secrets.DOCKER_ORG_NAME }}/${{ secrets.DOCKER_AIO_CONTAINER_NAME }}:${{ github.ref_name }}

CODE_OF_CONDUCT.md

@@ -6,8 +6,8 @@ We as members, contributors, and leaders pledge to make participation in our
 community a harassment-free experience for everyone, regardless of age, body
 size, visible or invisible disability, ethnicity, sex characteristics, gender
 identity and expression, level of experience, education, socio-economic status,
-nationality, personal appearance, race, caste, color, religion, or sexual
+nationality, personal appearance, race, religion, or sexual identity
-identity and orientation.
+and orientation.
 
 We pledge to act and interact in ways that contribute to an open, welcoming,
 diverse, inclusive, and healthy community.
@@ -22,17 +22,17 @@ community include:
 * Giving and gracefully accepting constructive feedback
 * Accepting responsibility and apologizing to those affected by our mistakes,
   and learning from the experience
-* Focusing on what is best not just for us as individuals, but for the overall
+* Focusing on what is best not just for us as individuals, but for the
-  community
+  overall community
 
 Examples of unacceptable behavior include:
 
-* The use of sexualized language or imagery, and sexual attention or advances of
+* The use of sexualized language or imagery, and sexual attention or
-  any kind
+  advances of any kind
 * Trolling, insulting or derogatory comments, and personal or political attacks
 * Public or private harassment
-* Publishing others' private information, such as a physical or email address,
+* Publishing others' private information, such as a physical or email
-  without their explicit permission
+  address, without their explicit permission
 * Other conduct which could reasonably be considered inappropriate in a
   professional setting
 
@@ -82,15 +82,15 @@ behavior was inappropriate. A public apology may be requested.
 
 ### 2. Warning
 
-**Community Impact**: A violation through a single incident or series of
+**Community Impact**: A violation through a single incident or series
-actions.
+of actions.
 
 **Consequence**: A warning with consequences for continued behavior. No
 interaction with the people involved, including unsolicited interaction with
 those enforcing the Code of Conduct, for a specified period of time. This
 includes avoiding interactions in community spaces as well as external channels
-like social media. Violating these terms may lead to a temporary or permanent
+like social media. Violating these terms may lead to a temporary or
-ban.
+permanent ban.
 
 ### 3. Temporary Ban
 
@@ -106,27 +106,23 @@ Violating these terms may lead to a permanent ban.
 ### 4. Permanent Ban
 
 **Community Impact**: Demonstrating a pattern of violation of community
-standards, including sustained inappropriate behavior, harassment of an
+standards, including sustained inappropriate behavior,  harassment of an
 individual, or aggression toward or disparagement of classes of individuals.
 
-**Consequence**: A permanent ban from any sort of public interaction within the
+**Consequence**: A permanent ban from any sort of public interaction within
-community.
+the community.
 
 ## Attribution
 
 This Code of Conduct is adapted from the [Contributor Covenant][homepage],
-version 2.1, available at
+version 2.0, available at
-[https://www.contributor-covenant.org/version/2/1/code_of_conduct.html][v2.1].
+https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
 
-Community Impact Guidelines were inspired by
+Community Impact Guidelines were inspired by [Mozilla's code of conduct
-[Mozilla's code of conduct enforcement ladder][Mozilla CoC].
+enforcement ladder](https://github.com/mozilla/diversity).
-
-For answers to common questions about this code of conduct, see the FAQ at
-[https://www.contributor-covenant.org/faq][FAQ]. Translations are available at
-[https://www.contributor-covenant.org/translations][translations].
 
 [homepage]: https://www.contributor-covenant.org
-[v2.1]: https://www.contributor-covenant.org/version/2/1/code_of_conduct.html
+
-[Mozilla CoC]: https://github.com/mozilla/diversity
+For answers to common questions about this code of conduct, see the FAQ at
-[FAQ]: https://www.contributor-covenant.org/faq
+https://www.contributor-covenant.org/faq. Translations are available at
-[translations]: https://www.contributor-covenant.org/translations
+https://www.contributor-covenant.org/translations.

README.md

@@ -2,18 +2,23 @@
   <a href="https://hoppscotch.io">
     <img
       src="https://avatars.githubusercontent.com/u/56705483"
-      alt="Hoppscotch"
+      alt="Hoppscotch Logo"
       height="64"
     />
   </a>
-  <h3>
+  <br />
+  <p>
+    <h3>
+      <b>
+        Hoppscotch
+      </b>
+    </h3>
+  </p>
+  <p>
     <b>
-      Hoppscotch
+      Open source API development ecosystem
     </b>
-  </h3>
+  </p>
-  <b>
-    Open Source API Development Ecosystem
-  </b>
   <p>
 
 [![contributions welcome](https://img.shields.io/badge/contributions-welcome-brightgreen?logo=github)](CODE_OF_CONDUCT.md) [![Website](https://img.shields.io/website?url=https%3A%2F%2Fhoppscotch.io&logo=hoppscotch)](https://hoppscotch.io) [![Tests](https://github.com/hoppscotch/hoppscotch/actions/workflows/tests.yml/badge.svg)](https://github.com/hoppscotch/hoppscotch/actions) [![Tweet](https://img.shields.io/twitter/url?url=https%3A%2F%2Fhoppscotch.io%2F)](https://twitter.com/share?text=%F0%9F%91%BD%20Hoppscotch%20%E2%80%A2%20Open%20source%20API%20development%20ecosystem%20-%20Helps%20you%20create%20requests%20faster,%20saving%20precious%20time%20on%20development.&url=https://hoppscotch.io&hashtags=hoppscotch&via=hoppscotch_io)
@@ -29,18 +34,23 @@
   </p>
   <br />
   <p>
-    <a href="https://hoppscotch.io">
+    <a href="https://hoppscotch.io/#gh-light-mode-only" target="_blank">
-      <picture>
+      <img
-        <source media="(prefers-color-scheme: dark)" srcset="./packages/hoppscotch-common/public/images/banner-dark.png">
+        src="./packages/hoppscotch-common/public/images/banner-light.png"
-        <source media="(prefers-color-scheme: light)" srcset="./packages/hoppscotch-common/public/images/banner-light.png">
+        alt="Hoppscotch"
-        <img alt="Hoppscotch" src="./packages/hoppscotch-common/public/images/banner-dark.png">
+        width="100%"
-      </picture>
+      />
+    </a>
+    <a href="https://hoppscotch.io/#gh-dark-mode-only" target="_blank">
+      <img
+        src="./packages/hoppscotch-common/public/images/banner-dark.png"
+        alt="Hoppscotch"
+        width="100%"
+      />
     </a>
   </p>
 </div>
 
-_We highly recommend you take a look at the [**Hoppscotch Documentation**](https://docs.hoppscotch.io) to learn more about the app._
-
 #### **Support**
 
 [![Chat on Discord](https://img.shields.io/badge/chat-Discord-7289DA?logo=discord)](https://hoppscotch.io/discord) [![Chat on Telegram](https://img.shields.io/badge/chat-Telegram-2CA5E0?logo=telegram)](https://hoppscotch.io/telegram) [![Discuss on GitHub](https://img.shields.io/badge/discussions-GitHub-333333?logo=github)](https://github.com/hoppscotch/hoppscotch/discussions)
@@ -49,9 +59,9 @@ _We highly recommend you take a look at the [**Hoppscotch Documentation**](https
 
 ❤️ **Lightweight:** Crafted with minimalistic UI design.
 
-⚡️ **Fast:** Send requests and get responses in real time.
+⚡️ **Fast:** Send requests and get/copy responses in real-time.
 
-🗄️ **HTTP Methods:** Request methods define the type of action you are requesting to be performed.
+**HTTP Methods**
 
 - `GET` - Requests retrieve resource information
 - `POST` - The server creates a new entry in a database
@@ -64,15 +74,17 @@ _We highly recommend you take a look at the [**Hoppscotch Documentation**](https
 - `TRACE` - Performs a message loop-back test along the path to the target resource
 - `<custom>` - Some APIs use custom request methods such as `LIST`. Type in your custom methods.
 
-🌈 **Theming:** Customizable combinations for background, foreground, and accent colors — [customize now](https://hoppscotch.io/settings).
+🌈 **Make it yours:** Customizable combinations for background, foreground, and accent colors — [customize now](https://hoppscotch.io/settings).
 
-- Choose a theme: System preference, Light, Dark, and Black
+**Theming**
-- Choose accent colors: Green, Teal, Blue, Indigo, Purple, Yellow, Orange, Red, and Pink
+
+- Choose a theme: System (default), Light, Dark, and Black
+- Choose accent color: Green (default), Teal, Blue, Indigo, Purple, Yellow, Orange, Red, and Pink
 - Distraction-free Zen mode
 
-_Customized themes are synced with your cloud/local session._
+_Customized themes are synced with cloud / local session_
 
-🔥 **PWA:** Install as a [Progressive Web App](https://web.dev/progressive-web-apps) on your device.
+🔥 **PWA:** Install as a [PWA](https://web.dev/what-are-pwas/) on your device.
 
 - Instant loading with Service Workers
 - Offline support
@@ -95,7 +107,7 @@ _Customized themes are synced with your cloud/local session._
 
 📡 **Server-Sent Events:** Receive a stream of updates from a server over an HTTP connection without resorting to polling.
 
-🌩 **Socket.IO:** Send and Receive data with the SocketIO server.
+🌩 **Socket.IO:** Send and Receive data with SocketIO server.
 
 🦟 **MQTT:** Subscribe and Publish to topics of an MQTT Broker.
 
@@ -115,7 +127,7 @@ _Customized themes are synced with your cloud/local session._
 - OAuth 2.0
 - OIDC Access Token/PKCE
 
-📢 **Headers:** Describes the format the body of your request is being sent in.
+📢 **Headers:** Describes the format the body of your request is being sent as.
 
 📫 **Parameters:** Use request parameters to set varying parts in simulated requests.
 
@@ -125,14 +137,14 @@ _Customized themes are synced with your cloud/local session._
 - FormData, JSON, and many more
 - Toggle between key-value and RAW input parameter list
 
-📮 **Response:** Contains the status line, headers, and the message/response body.
+👋 **Response:** Contains the status line, headers, and the message/response body.
 
-- Copy the response to the clipboard
+- Copy response to clipboard
-- Download the response as a file
+- Download response as a file
 - View response headers
-- View raw and preview HTML, image, JSON, and XML responses
+- View raw and preview of HTML, image, JSON, XML responses
 
-⏰ **History:** Request entries are synced with your cloud/local session storage.
+⏰ **History:** Request entries are synced with cloud / local session storage to restore with a single click.
 
 📁 **Collections:** Keep your API requests organized with collections and folders. Reuse them with a single click.
 
@@ -140,32 +152,7 @@ _Customized themes are synced with your cloud/local session._
 - Nested folders
 - Export and import as a file or GitHub gist
 
-_Collections are synced with your cloud/local session storage._
+_Collections are synced with cloud / local session storage_
-
-📜 **Pre-Request Scripts:** Snippets of code associated with a request that is executed before the request is sent.
-
-- Set environment variables
-- Include timestamp in the request headers
-- Send a random alphanumeric string in the URL parameters
-- Any JavaScript functions
-
-👨‍👩‍👧‍👦 **Teams:** Helps you collaborate across your teams to design, develop, and test APIs faster.
-
-- Create unlimited teams
-- Create unlimited shared collections
-- Create unlimited team members
-- Role-based access control
-- Cloud sync
-- Multiple devices
-
-👥 **Workspaces:** Organize your personal and team collections environments into workspaces. Easily switch between workspaces to manage multiple projects.
-
-- Create unlimited workspaces
-- Switch between personal and team workspaces
-
-⌨️ **Keyboard Shortcuts:** Optimized for efficiency.
-
-> **[Read our documentation on Keyboard Shortcuts](https://docs.hoppscotch.io/documentation/features/shortcuts)**
 
 🌐 **Proxy:** Enable Proxy Mode from Settings to access blocked APIs.
 
@@ -174,31 +161,60 @@ _Collections are synced with your cloud/local session storage._
 - Access APIs served in non-HTTPS (`http://`) endpoints
 - Use your Proxy URL
 
-_Official proxy server is hosted by Hoppscotch - **[GitHub](https://github.com/hoppscotch/proxyscotch)** - **[Privacy Policy](https://docs.hoppscotch.io/support/privacy)**._
+_Official proxy server is hosted by Hoppscotch - **[GitHub](https://github.com/hoppscotch/proxyscotch)** - **[Privacy Policy](https://docs.hoppscotch.io/support/privacy)**_
+
+📜 **Pre-Request Scripts β:** Snippets of code associated with a request that is executed before the request is sent.
+
+- Set environment variables
+- Include timestamp in the request headers
+- Send a random alphanumeric string in the URL parameters
+- Any JavaScript functions
+
+📄 **API Documentation:** Create and share dynamic API documentation easily, quickly.
+
+1. Add your requests to Collections and Folders
+2. Export Collections and easily share your APIs with the rest of your team
+3. Import Collections and Generate Documentation on-the-go
+
+⌨️ **Keyboard Shortcuts:** Optimized for efficiency.
+
+> **[Read our documentation on Keyboard Shortcuts](https://docs.hoppscotch.io/documentation/features/shortcuts)**
 
 🌎 **i18n:** Experience the app in your language.
 
-Help us to translate Hoppscotch. Please read [`TRANSLATIONS`](TRANSLATIONS.md) for details on our [`CODE OF CONDUCT`](CODE_OF_CONDUCT.md) and the process for submitting pull requests to us.
+Help us to translate Hoppscotch. Please read [`TRANSLATIONS`](TRANSLATIONS.md) for details on our [`CODE OF CONDUCT`](CODE_OF_CONDUCT.md), and the process for submitting pull requests to us.
 
-☁️ **Auth + Sync:** Sign in and sync your data in real-time across all your devices.
+📦 **Add-ons:** Official add-ons for hoppscotch.
 
-**Sign in with:**
+- **[Proxy](https://github.com/hoppscotch/proxyscotch)** - A simple proxy server created for Hoppscotch
+- **[CLI β](https://github.com/hoppscotch/hopp-cli)** - A CLI solution for Hoppscotch
+- **[Browser Extensions](https://github.com/hoppscotch/hoppscotch-extension)** - Browser extensions that simplifies access to Hoppscotch
+
+  [![Firefox](https://raw.github.com/alrra/browser-logos/master/src/firefox/firefox_16x16.png) **Firefox**](https://addons.mozilla.org/en-US/firefox/addon/hoppscotch) &nbsp;|&nbsp; [![Chrome](https://raw.github.com/alrra/browser-logos/master/src/chrome/chrome_16x16.png) **Chrome**](https://chrome.google.com/webstore/detail/hoppscotch-extension-for-c/amknoiejhlmhancpahfcfcfhllgkpbld)
+
+  > **Extensions fixes `CORS` issues.**
+
+- **[Hopp-Doc-Gen](https://github.com/hoppscotch/hopp-doc-gen)** - An API doc generator CLI for Hoppscotch
+
+_Add-ons are developed and maintained under **[Hoppscotch Organization](https://github.com/hoppscotch)**._
+
+☁️ **Auth + Sync:** Sign in and sync your data in real-time.
+
+**Sign in with**
 
 - GitHub
 - Google
 - Microsoft
 - Email
-- SSO (Single Sign-On)[^EE]
 
-**🔄 Synchronize your data:** Handoff to continue tasks on your other devices.
+**Synchronize your data**
 
-- Workspaces
 - History
 - Collections
 - Environments
 - Settings
 
-✅ **Post-Request Tests:** Write tests associated with a request that is executed after the request's response.
+✅ **Post-Request Tests β:** Write tests associated with a request that is executed after the request's response.
 
 - Check the status code as an integer
 - Filter response headers
@@ -206,7 +222,7 @@ Help us to translate Hoppscotch. Please read [`TRANSLATIONS`](TRANSLATIONS.md) f
 - Set environment variables
 - Write JavaScript code
 
-🌱 **Environments:** Environment variables allow you to store and reuse values in your requests and scripts.
+🌱 **Environments** : Environment variables allow you to store and reuse values in your requests and scripts.
 
 - Unlimited environments and variables
 - Initialize through the pre-request script
@@ -225,31 +241,22 @@ Help us to translate Hoppscotch. Please read [`TRANSLATIONS`](TRANSLATIONS.md) f
 
 </details>
 
+👨‍👩‍👧‍👦 **Teams β:** Helps you collaborate across your team to design, develop, and test APIs faster.
+
+- Unlimited teams
+- Unlimited shared collections
+- Unlimited team members
+- Role-based access control
+- Cloud sync
+- Multiple devices
+
 🚚 **Bulk Edit:** Edit key-value pairs in bulk.
 
 - Entries are separated by newline
 - Keys and values are separated by `:`
 - Prepend `#` to any row you want to add but keep disabled
 
-🎛️ **Admin dashboard:** Manage your team and invite members.
+**For more features, please read our [documentation](https://docs.hoppscotch.io).**
-
-- Insights
-- Manage users
-- Manage teams
-
-📦 **Add-ons:** Official add-ons for hoppscotch.
-
-- **[Hoppscotch CLI](https://github.com/hoppscotch/hopp-cli)** - Command-line interface for Hoppscotch.
-- **[Proxy](https://github.com/hoppscotch/proxyscotch)** - A simple proxy server created for Hoppscotch.
-- **[Browser Extensions](https://github.com/hoppscotch/hoppscotch-extension)** - Browser extensions that enhance your Hoppscotch experience.
-
-  [![Firefox](https://raw.github.com/alrra/browser-logos/master/src/firefox/firefox_16x16.png) **Firefox**](https://addons.mozilla.org/en-US/firefox/addon/hoppscotch) &nbsp;|&nbsp; [![Chrome](https://raw.github.com/alrra/browser-logos/master/src/chrome/chrome_16x16.png) **Chrome**](https://chrome.google.com/webstore/detail/hoppscotch-extension-for-c/amknoiejhlmhancpahfcfcfhllgkpbld)
-
-  > **Extensions fix `CORS` issues.**
-
-_Add-ons are developed and maintained under **[Hoppscotch Organization](https://github.com/hoppscotch)**._
-
-**For a complete list of features, please read our [documentation](https://docs.hoppscotch.io).**
 
 ## **Demo**
 
@@ -261,9 +268,18 @@ _Add-ons are developed and maintained under **[Hoppscotch Organization](https://
 2. Click "Send" to simulate the request
 3. View the response
 
+## **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)
+- [JavaScript](https://developer.mozilla.org/en-US/docs/Web/JavaScript)
+- [TypeScript](https://www.typescriptlang.org)
+- [Vue](https://vuejs.org)
+- [Vite](https://vitejs.dev)
+
 ## **Developing**
 
-Follow our [self-hosting documentation](https://docs.hoppscotch.io/documentation/self-host/getting-started) to get started with the development environment.
+Follow our [self-hosting guide](https://docs.hoppscotch.io/documentation/self-host/getting-started) to get started with the development environment.
 
 ## **Contributing**
 
@@ -281,7 +297,7 @@ See the [`CHANGELOG`](CHANGELOG.md) file for details.
 
 ## **Authors**
 
-This project owes its existence to the collective efforts of all those who contribute — [contribute now](CONTRIBUTING.md).
+This project exists thanks to all the people who contribute — [contribute](CONTRIBUTING.md).
 
 <div align="center">
   <a href="https://github.com/hoppscotch/hoppscotch/graphs/contributors">
@@ -293,6 +309,4 @@ This project owes its existence to the collective efforts of all those who contr
 
 ## **License**
 
-This project is licensed under the [MIT License](https://opensource.org/licenses/MIT) — see the [`LICENSE`](LICENSE) file for details.
+This project is licensed under the [MIT License](https://opensource.org/licenses/MIT) - see the [`LICENSE`](LICENSE) file for details.
-
-[^EE]: Enterprise edition feature. [Learn more](https://docs.hoppscotch.io/documentation/self-host/getting-started).

SECURITY.md

@@ -2,9 +2,8 @@
 
 This document outlines security procedures and general policies for the Hoppscotch project.
 
-- [Security Policy](#security-policy)
+1. [Reporting a security vulnerability](#reporting-a-security-vulnerability)
-  - [Reporting a security vulnerability](#reporting-a-security-vulnerability)
+3. [Incident response process](#incident-response-process)
-  - [Incident response process](#incident-response-process)
 
 ## Reporting a security vulnerability
 

TRANSLATIONS.md

@@ -9,24 +9,26 @@ Before you start working on a new language, please look through the [open pull r
 if there is no existing translation, you can create a new one by following these steps:
 
 1. **[Fork the repository](https://github.com/hoppscotch/hoppscotch/fork).**
-2. **Checkout the `main` branch for latest translations.**
+2. **Checkout the `i18n` branch for latest translations.**
-3. **Create a new branch for your translation with base branch `main`.**
+3. **Create a new branch for your translation with base branch `i18n`.**
 4. **Create target language file in the [`/packages/hoppscotch-common/locales`](https://github.com/hoppscotch/hoppscotch/tree/main/packages/hoppscotch-common/locales) directory.**
 5. **Copy the contents of the source file [`/packages/hoppscotch-common/locales/en.json`](https://github.com/hoppscotch/hoppscotch/blob/main/packages/hoppscotch-common/locales/en.json) to the target language file.**
 6. **Translate the strings in the target language file.**
 7. **Add your language entry to [`/packages/hoppscotch-common/languages.json`](https://github.com/hoppscotch/hoppscotch/blob/main/packages/hoppscotch-common/languages.json).**
-8. **Save and commit changes.**
+8. **Save & commit changes.**
 9. **Send a pull request.**
 
 _You may send a pull request before all steps above are complete: e.g., you may want to ask for help with translations, or getting tests to pass. However, your pull request will not be merged until all steps above are complete._
 
+`i18n` branch will be merged into `main` branch once every week.
+
 Completing an initial translation of the whole site is a fairly large task. One way to break that task up is to work with other translators through pull requests on your fork. You can also [add collaborators to your fork](https://help.github.com/en/github/setting-up-and-managing-your-github-user-account/inviting-collaborators-to-a-personal-repository) if you'd like to invite other translators to commit directly to your fork and share responsibility for merging pull requests.
 
 ## Updating a translation
 
 ### Corrections
 
-If you notice spelling or grammar errors, typos, or opportunities for better phrasing, open a pull request with your suggested fix. If you see a problem that you aren't sure of or don't have time to fix, [open an issue](https://github.com/hoppscotch/hoppscotch/issues/new/choose).
+If you notice spelling or grammar errors, typos, or opportunities for better phrasing, open a pull request with your suggested fix. If you see a problem that you aren't sure of or don't have time to fix, open an issue.
 
 ### Broken links
 

docker-compose.yml

@@ -20,7 +20,7 @@ services:
       - PORT=3170
     volumes:
       # Uncomment the line below when modifying code. Only applicable when using the "dev" target.
-      - ./packages/hoppscotch-backend/:/usr/src/app/packages/hoppscotch-backend
+      # - ./packages/hoppscotch-backend/:/usr/src/app
       - /usr/src/app/node_modules/
     depends_on:
       hoppscotch-db:

package.json

@@ -32,14 +32,5 @@
     "@types/node": "^17.0.24",
     "cross-env": "^7.0.3",
     "http-server": "^14.1.1"
-  },
-  "pnpm": {
-    "packageExtensions": {
-      "httpsnippet@^3.0.1": {
-        "peerDependencies": {
-          "ajv": "6.12.3"
-        }
-      }
-    }
   }
 }

packages/hoppscotch-backend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hoppscotch-backend",
-  "version": "2023.8.0",
+  "version": "2023.4.8",
   "description": "",
   "author": "",
   "private": true,
@@ -21,8 +21,7 @@
     "test:cov": "jest --coverage",
     "test:debug": "node --inspect-brk -r tsconfig-paths/register -r ts-node/register node_modules/.bin/jest --runInBand",
     "test:e2e": "jest --config ./test/jest-e2e.json",
-    "do-test": "pnpm run test",
+    "do-test": "pnpm run test"
-    "seed": "node --loader ts-node/esm prisma/seed.ts"
   },
   "dependencies": {
     "@nestjs-modules/mailer": "^1.8.1",
@@ -58,7 +57,6 @@
     "passport-jwt": "^4.0.1",
     "passport-local": "^1.0.0",
     "passport-microsoft": "^1.0.0",
-    "pg": "^8.11.3",
     "prisma": "^4.16.2",
     "reflect-metadata": "^0.1.13",
     "rimraf": "^3.0.2",

packages/hoppscotch-backend/prisma/migrations/20230918072549_init/migration.sql

@@ -1,2 +0,0 @@
--- CreateIndex
-CREATE INDEX "TeamMember_userUid_idx" ON "TeamMember"("userUid");

packages/hoppscotch-backend/prisma/schema.prisma

@@ -26,7 +26,6 @@ model TeamMember {
   team    Team           @relation(fields: [teamID], references: [id], onDelete: Cascade)
 
   @@unique([teamID, userUid])
-  @@index([userUid])
 }
 
 model TeamInvitation {

packages/hoppscotch-backend/prisma/seed.ts

@@ -1,58 +0,0 @@
-import { PrismaClient, TeamMemberRole } from '@prisma/client';
-const prisma = new PrismaClient();
-
-const noOfUsers = 600000;
-
-const getAllUser = async () => {
-  const users = await prisma.user.findMany();
-  return users;
-};
-
-const createUsers = async () => {
-  for (let i = 1; i <= noOfUsers; i++) {
-    try {
-      await prisma.user.create({
-        data: {
-          email: `${i}@gmail.com`,
-        },
-      });
-    } catch (_) {}
-  }
-};
-
-const createTeams = async () => {
-  const users = await getAllUser();
-
-  for (let i = 0; i < users.length; i++) {
-    try {
-      await prisma.team.create({
-        data: {
-          name: `Team ${i + 1}`,
-          members: {
-            create: {
-              userUid: users[i].uid,
-              role: TeamMemberRole.OWNER,
-            },
-          },
-        },
-      });
-    } catch (_) {}
-  }
-};
-
-async function main() {
-  console.log('Seeding...');
-
-  await createUsers();
-  await createTeams();
-}
-
-main()
-  .then(async () => {
-    await prisma.$disconnect();
-  })
-  .catch(async (e) => {
-    console.error(e);
-    await prisma.$disconnect();
-    process.exit(1);
-  });

packages/hoppscotch-backend/src/app.module.ts

@@ -20,7 +20,6 @@ import { ShortcodeModule } from './shortcode/shortcode.module';
 import { COOKIES_NOT_FOUND } from './errors';
 import { ThrottlerModule } from '@nestjs/throttler';
 import { AppController } from './app.controller';
-import { DbModule } from './db/db.module';
 
 @Module({
   imports: [
@@ -67,7 +66,6 @@ import { DbModule } from './db/db.module';
       ttl: +process.env.RATE_LIMIT_TTL,
       limit: +process.env.RATE_LIMIT_MAX,
     }),
-    DbModule,
     UserModule,
     AuthModule,
     AdminModule,

packages/hoppscotch-backend/src/constants.ts

@@ -1 +0,0 @@
-export const PG_CONNECTION = 'PG_CONNECTION';

packages/hoppscotch-backend/src/db/db.module.ts

@@ -1,21 +0,0 @@
-import { Global, Module } from '@nestjs/common';
-import { Pool } from 'pg';
-import { PG_CONNECTION } from 'src/constants';
-
-const dbProvider = {
-  provide: PG_CONNECTION,
-  useValue: new Pool({
-    user: 'postgres',
-    host: 'hoppscotch-db',
-    database: 'hoppscotch',
-    password: 'testpass',
-    port: 5432,
-  }),
-};
-
-@Global()
-@Module({
-    providers: [dbProvider],
-    exports: [dbProvider],
-})
-export class DbModule {}

packages/hoppscotch-backend/src/prisma/prisma.service.ts

@@ -7,11 +7,7 @@ export class PrismaService
   implements OnModuleInit, OnModuleDestroy
 {
   constructor() {
-    super(
+    super();
-      {
-        log: ['query', 'info', 'warn', 'error'],
-      }
-    );
   }
   async onModuleInit() {
     await this.$connect();

packages/hoppscotch-backend/src/team/team.resolver.ts

@@ -22,7 +22,6 @@ import { throwErr } from 'src/utils';
 import { AuthUser } from 'src/types/AuthUser';
 import { GqlThrottlerGuard } from 'src/guards/gql-throttler.guard';
 import { SkipThrottle } from '@nestjs/throttler';
-import { cons } from 'fp-ts/lib/ReadonlyNonEmptyArray';
 
 @UseGuards(GqlThrottlerGuard)
 @Resolver(() => Team)
@@ -56,13 +55,8 @@ export class TeamResolver {
     description: 'Returns the list of members of a team',
     complexity: 10,
   })
-  async teamMembers(@Parent() team: Team): Promise<TeamMember[]> {
+  teamMembers(@Parent() team: Team): Promise<TeamMember[]> {
-    const startR = Date.now();
+    return this.teamService.getTeamMembers(team.id);
-    const members = await this.teamService.getTeamMembers(team.id);
-    const endR = Date.now();
-    console.log('response generation: (teamMembers)', endR - startR, 'ms');
-
-    return members;
   }
 
   @ResolveField(() => TeamMemberRole, {
@@ -70,61 +64,41 @@ export class TeamResolver {
     nullable: true,
   })
   @UseGuards(GqlAuthGuard)
-  async myRole(
+  myRole(
     @Parent() team: Team,
     @GqlUser() user: AuthUser,
   ): Promise<TeamMemberRole | null> {
-    const startR = Date.now();
+    return this.teamService.getRoleOfUserInTeam(team.id, user.uid);
-    const role = await this.teamService.getRoleOfUserInTeam(team.id, user.uid);
-    const endR = Date.now();
-    console.log('response generation: (myRole)', endR - startR, 'ms');
-
-    return role;
   }
 
   @ResolveField(() => Int, {
     description: 'The number of users with the OWNER role in the team',
   })
-  async ownersCount(@Parent() team: Team): Promise<number> {
+  ownersCount(@Parent() team: Team): Promise<number> {
-    const startR = Date.now();
+    return this.teamService.getCountOfUsersWithRoleInTeam(
-    const count = await this.teamService.getCountOfUsersWithRoleInTeam(
       team.id,
       TeamMemberRole.OWNER,
     );
-    const endR = Date.now();
-    console.log('response generation: (ownersCount)', endR - startR, 'ms');
-
-    return count;
   }
 
   @ResolveField(() => Int, {
     description: 'The number of users with the EDITOR role in the team',
   })
-  async editorsCount(@Parent() team: Team): Promise<number> {
+  editorsCount(@Parent() team: Team): Promise<number> {
-    const startR = Date.now();
+    return this.teamService.getCountOfUsersWithRoleInTeam(
-    const count = await this.teamService.getCountOfUsersWithRoleInTeam(
       team.id,
       TeamMemberRole.EDITOR,
     );
-    const endR = Date.now();
-    console.log('response generation: (editorsCount)', endR - startR, 'ms');
-
-    return count;
   }
 
   @ResolveField(() => Int, {
     description: 'The number of users with the VIEWER role in the team',
   })
-  async viewersCount(@Parent() team: Team): Promise<number> {
+  viewersCount(@Parent() team: Team): Promise<number> {
-    const startR = Date.now();
+    return this.teamService.getCountOfUsersWithRoleInTeam(
-    const count = await this.teamService.getCountOfUsersWithRoleInTeam(
       team.id,
       TeamMemberRole.VIEWER,
     );
-    const endR = Date.now();
-    console.log('response generation: (viewersCount)', endR - startR, 'ms');
-
-    return count;
   }
 
   // Query
@@ -132,7 +106,7 @@ export class TeamResolver {
     description: 'List of teams that the executing user belongs to.',
   })
   @UseGuards(GqlAuthGuard)
-  async myTeams(
+  myTeams(
     @GqlUser() user: AuthUser,
     @Args({
       name: 'cursor',
@@ -143,15 +117,7 @@ export class TeamResolver {
     })
     cursor?: string,
   ): Promise<Team[]> {
-    const startR = Date.now();
+    return this.teamService.getTeamsOfUser(user.uid, cursor ?? null);
-    const teams = await this.teamService.getTeamsOfUser(
-      user.uid,
-      cursor ?? null,
-    );
-    const endR = Date.now();
-    console.log('response generation: (myTeams)', endR - startR, 'ms');
-
-    return teams;
   }
 
   @Query(() => Team, {
@@ -164,7 +130,7 @@ export class TeamResolver {
     TeamMemberRole.EDITOR,
     TeamMemberRole.OWNER,
   )
-  async team(
+  team(
     @Args({
       name: 'teamID',
       type: () => ID,
@@ -172,12 +138,7 @@ export class TeamResolver {
     })
     teamID: string,
   ): Promise<Team | null> {
-    const startR = Date.now();
+    return this.teamService.getTeamWithID(teamID);
-    const team = await this.teamService.getTeamWithID(teamID);
-    const endR = Date.now();
-    console.log('response generation: (team)', endR - startR, 'ms');
-
-    return team;
   }
 
   // Mutation
@@ -190,11 +151,7 @@ export class TeamResolver {
     @Args({ name: 'name', description: 'Displayed name of the team' })
     name: string,
   ): Promise<Team> {
-    const startR = Date.now();
     const team = await this.teamService.createTeam(name, user.uid);
-    const endR = Date.now();
-    console.log('response generation: (createTeam)', endR - startR, 'ms');
-
     if (E.isLeft(team)) throwErr(team.left);
     return team.right;
   }
@@ -212,11 +169,7 @@ export class TeamResolver {
     })
     teamID: string,
   ): Promise<boolean> {
-    const startR = Date.now();
     const isUserLeft = await this.teamService.leaveTeam(teamID, user.uid);
-    const endR = Date.now();
-    console.log('response generation: (leaveTeam)', endR - startR, 'ms');
-
     if (E.isLeft(isUserLeft)) throwErr(isUserLeft.left);
     return isUserLeft.right;
   }
@@ -241,11 +194,7 @@ export class TeamResolver {
     })
     userUid: string,
   ): Promise<boolean> {
-    const startR = Date.now();
     const isRemoved = await this.teamService.leaveTeam(teamID, userUid);
-    const endR = Date.now();
-    console.log('response generation: (removeTeamMember)', endR - startR, 'ms');
-
     if (E.isLeft(isRemoved)) throwErr(isRemoved.left);
     return isRemoved.right;
   }
@@ -261,11 +210,7 @@ export class TeamResolver {
     @Args({ name: 'newName', description: 'The updated name of the team' })
     newName: string,
   ): Promise<Team> {
-    const startR = Date.now();
     const team = await this.teamService.renameTeam(teamID, newName);
-    const endR = Date.now();
-    console.log('response generation: (renameTeam)', endR - startR, 'ms');
-
     if (E.isLeft(team)) throwErr(team.left);
     return team.right;
   }
@@ -279,11 +224,7 @@ export class TeamResolver {
     @Args({ name: 'teamID', description: 'ID of the team', type: () => ID })
     teamID: string,
   ): Promise<boolean> {
-    const startR = Date.now();
     const isDeleted = await this.teamService.deleteTeam(teamID);
-    const endR = Date.now();
-    console.log('response generation: (deleteTeam)', endR - startR, 'ms');
-
     if (E.isLeft(isDeleted)) throwErr(isDeleted.left);
     return isDeleted.right;
   }
@@ -313,19 +254,11 @@ export class TeamResolver {
     })
     newRole: TeamMemberRole,
   ): Promise<TeamMember> {
-    const startR = Date.now();
     const teamMember = await this.teamService.updateTeamMemberRole(
       teamID,
       userUid,
       newRole,
     );
-    const endR = Date.now();
-    console.log(
-      'response generation: (updateTeamMemberRole)',
-      endR - startR,
-      'ms',
-    );
-
     if (E.isLeft(teamMember)) throwErr(teamMember.left);
     return teamMember.right;
   }

packages/hoppscotch-backend/src/team/team.service.ts

@@ -1,4 +1,4 @@
-import { Inject, Injectable, OnModuleInit } from '@nestjs/common';
+import { Injectable, OnModuleInit } from '@nestjs/common';
 import { TeamMember, TeamMemberRole, Team } from './team.model';
 import { PrismaService } from '../prisma/prisma.service';
 import { TeamMember as DbTeamMember } from '@prisma/client';
@@ -23,8 +23,6 @@ import * as T from 'fp-ts/Task';
 import * as A from 'fp-ts/Array';
 import { throwErr } from 'src/utils';
 import { AuthUser } from '../types/AuthUser';
-import { PG_CONNECTION } from 'src/constants';
-import { Client } from 'pg';
 
 @Injectable()
 export class TeamService implements UserDataHandler, OnModuleInit {
@@ -32,11 +30,8 @@ export class TeamService implements UserDataHandler, OnModuleInit {
     private readonly prisma: PrismaService,
     private readonly userService: UserService,
     private readonly pubsub: PubSubService,
-    @Inject(PG_CONNECTION) private conn: Client,
   ) {}
 
-  enableRawSql: boolean = false;
-
   onModuleInit() {
     this.userService.registerUserDataHandler(this);
   }
@@ -57,37 +52,12 @@ export class TeamService implements UserDataHandler, OnModuleInit {
     teamID: string,
     role: TeamMemberRole,
   ): Promise<number> {
-    if (this.enableRawSql) {
+    return await this.prisma.teamMember.count({
-      const startQ = Date.now();
-      const count = await this.conn.query(
-        `SELECT COUNT(*) FROM "TeamMember" WHERE "teamID" = '${teamID}' AND "role" = '${role}';`,
-      );
-      const endQ = Date.now();
-      console.log(
-        'getCountOfUsersWithRoleInTeam >>>>>>>>>>',
-        endQ - startQ,
-        'ms >>>>>',
-        count.rows,
-      );
-      return count.rows[0].count;
-    }
-
-    const startQ = Date.now();
-    const count = await this.prisma.teamMember.count({
       where: {
         teamID,
         role,
       },
     });
-    const endQ = Date.now();
-    console.log(
-      'getCountOfUsersWithRoleInTeam >>>>>>>>>>',
-      endQ - startQ,
-      'ms >>>>>',
-      count,
-    );
-
-    return count;
   }
 
   async addMemberToTeamWithEmail(
@@ -107,11 +77,6 @@ export class TeamService implements UserDataHandler, OnModuleInit {
     uid: string,
     role: TeamMemberRole,
   ): Promise<TeamMember> {
-    const tm = await this.conn.query(
-      `INSERT INTO "TeamMember" (id, userUid, teamID, role) VALUES ('${new Date().toISOString()}', '${uid}', '${teamID}', '${role}') RETURNING *;`,
-    );
-    console.log('addMemberToTeam >>>>>>>>>>', tm.rows[0]);
-
     const teamMember = await this.prisma.teamMember.create({
       data: {
         userUid: uid,
@@ -136,31 +101,6 @@ export class TeamService implements UserDataHandler, OnModuleInit {
   }
 
   async deleteTeam(teamID: string): Promise<E.Left<string> | E.Right<boolean>> {
-    if (this.enableRawSql) {
-      const startQ = Date.now();
-      const t = await this.conn.query(
-        `SELECT * FROM "Team" WHERE "id" = '${teamID}'`,
-      );
-      if (t.rows.length === 0) return E.left(TEAM_INVALID_ID);
-
-      await this.conn.query(
-        `DELETE FROM "TeamMember" WHERE "teamID" = '${teamID}' RETURNING *`,
-      );
-
-      await this.conn.query(`DELETE FROM "Team" WHERE "id" = '${teamID}'`);
-      const endQ = Date.now();
-      console.log(
-        'deleteTeam >>>>>>>>>>',
-        endQ - startQ,
-        'ms',
-        '>>>>>',
-        t.rows[0],
-      );
-
-      return E.right(true);
-    }
-
-    const startQ = Date.now();
     const team = await this.prisma.team.findUnique({
       where: {
         id: teamID,
@@ -179,8 +119,6 @@ export class TeamService implements UserDataHandler, OnModuleInit {
         id: teamID,
       },
     });
-    const endQ = Date.now();
-    console.log('deleteTeam >>>>>>>>>>', endQ - startQ, 'ms', '>>>>>', team);
 
     return E.right(true);
   }
@@ -197,26 +135,6 @@ export class TeamService implements UserDataHandler, OnModuleInit {
     const isValidTitle = this.validateTeamName(newName);
     if (E.isLeft(isValidTitle)) return isValidTitle;
 
-    if (this.enableRawSql) {
-      const startQ = Date.now();
-      const ut = await this.conn.query(
-        `UPDATE "Team" SET "name" = '${newName}' WHERE "id" = '${teamID}' RETURNING *`,
-      );
-      const endQ = Date.now();
-      console.log(
-        'renameTeam >>>>>>>>>>',
-        endQ - startQ,
-        'ms',
-        '>>>>>',
-        ut.rows[0],
-      );
-
-      return E.right(<Team>{
-        id: ut.rows[0].id,
-        name: ut.rows[0].name,
-      });
-    }
-
     try {
       const updatedTeam = await this.prisma.team.update({
         where: {
@@ -238,48 +156,6 @@ export class TeamService implements UserDataHandler, OnModuleInit {
     userUid: string,
     newRole: TeamMemberRole,
   ): Promise<E.Left<string> | E.Right<TeamMember>> {
-    if (this.enableRawSql) {
-      const startQ = Date.now();
-      const oc = await this.conn.query(
-        `SELECT COUNT(*) FROM "TeamMember" WHERE "teamID" = '${teamID}' AND "role" = '${TeamMemberRole.OWNER}';`,
-      );
-      const tm = await this.conn.query(
-        `SELECT * FROM "TeamMember" WHERE "teamID" = '${teamID}' AND "userUid" = '${userUid}'`,
-      );
-      if (tm.rows.length === 0) return E.left(TEAM_MEMBER_NOT_FOUND);
-
-      const ownerCount = oc.rows[0].count;
-      if (
-        tm.rows[0].role === TeamMemberRole.OWNER &&
-        newRole != TeamMemberRole.OWNER &&
-        ownerCount === 1
-      ) {
-        return E.left(TEAM_ONLY_ONE_OWNER);
-      }
-
-      const utm = await this.conn.query(
-        `UPDATE "teamMember" SET "role" = '${newRole}' WHERE "teamID" = '${teamID}' AND "userUid" = '${userUid}'`,
-      );
-      const endQ = Date.now();
-      console.log(
-        'updateTeamMemberRole >>>>>>>>>>',
-        endQ - startQ,
-        'ms',
-        '>>>>>',
-        utm.rows[0],
-      );
-
-      const updatedMember: TeamMember = {
-        membershipID: utm.rows[0].id,
-        userUid: utm.rows[0].userUid,
-        role: TeamMemberRole[utm.rows[0].role],
-      };
-      this.pubsub.publish(`team/${teamID}/member_updated`, updatedMember);
-
-      return E.right(updatedMember);
-    }
-
-    const startQ = Date.now();
     const ownerCount = await this.prisma.teamMember.count({
       where: {
         teamID,
@@ -316,14 +192,6 @@ export class TeamService implements UserDataHandler, OnModuleInit {
         role: newRole,
       },
     });
-    const endQ = Date.now();
-    console.log(
-      'updateTeamMemberRole >>>>>>>>>>',
-      endQ - startQ,
-      'ms',
-      '>>>>>',
-      result,
-    );
 
     const updatedMember: TeamMember = {
       membershipID: result.id,
@@ -340,30 +208,6 @@ export class TeamService implements UserDataHandler, OnModuleInit {
     teamID: string,
     userUid: string,
   ): Promise<E.Left<string> | E.Right<boolean>> {
-    if (this.enableRawSql) {
-      const oc = await this.conn.query(
-        `SELECT COUNT(*) FROM "TeamMember" WHERE "teamID" = '${teamID}' AND "role" = '${TeamMemberRole.OWNER}';`,
-      );
-      const ownerCount = oc.rows[0].count;
-      console.log('leaveTeam >>>>>>>>>>', oc.rows);
-
-      const member = await this.getTeamMember(teamID, userUid);
-      if (!member) return E.left(TEAM_INVALID_ID_OR_USER);
-
-      if (ownerCount === 1 && member.role === TeamMemberRole.OWNER) {
-        return E.left(TEAM_ONLY_ONE_OWNER);
-      }
-
-      const dtm = await this.conn.query(
-        `DELETE FROM "TeamMember" WHERE "teamID" = '${teamID}' AND "userUid" = '${userUid}'`,
-      );
-      console.log('leaveTeam >>>>>>>>>>', dtm);
-
-      this.pubsub.publish(`team/${teamID}/member_removed`, userUid);
-
-      return E.right(true);
-    }
-
     const ownerCount = await this.prisma.teamMember.count({
       where: {
         teamID,
@@ -404,34 +248,6 @@ export class TeamService implements UserDataHandler, OnModuleInit {
     const isValidName = this.validateTeamName(name);
     if (E.isLeft(isValidName)) return isValidName;
 
-    if (this.enableRawSql) {
-      const startQ = Date.now();
-      const t = await this.conn.query(
-        `INSERT INTO "Team" (id, name) VALUES ('${new Date().toISOString()}', '${name}') RETURNING *`,
-      );
-      const tm = await this.conn.query(
-        `INSERT INTO "TeamMember" ("id", "userUid", "teamID", "role") VALUES ('${new Date().toISOString()}', '${creatorUid}' , '${
-          t.rows[0].id
-        }', '${TeamMemberRole.OWNER}') RETURNING *`,
-      );
-      const endQ = Date.now();
-      ``;
-      console.log(
-        'createTeam >>>>>>>>>>',
-        endQ - startQ,
-        'ms',
-        '>>>>>',
-        t.rows[0],
-        tm.rows[0],
-      );
-
-      return E.right(<Team>{
-        id: t.rows[0].id,
-        name: t.rows[0].name,
-      });
-    }
-
-    const startQ = Date.now();
     const team = await this.prisma.team.create({
       data: {
         name: name,
@@ -443,42 +259,12 @@ export class TeamService implements UserDataHandler, OnModuleInit {
         },
       },
     });
-    const endQ = Date.now();
-    console.log('createTeam >>>>>>>>>> ', endQ - startQ, 'ms', '>>>>>', team);
 
     return E.right(team);
   }
 
   async getTeamsOfUser(uid: string, cursor: string | null): Promise<Team[]> {
-    if (this.enableRawSql) {
-      const startQ = Date.now();
-      let users;
-      if (cursor) {
-        users = await this.conn.query(
-          `SELECT * FROM "TeamMember" LEFT JOIN "Team" ON "TeamMember"."teamID" = "Team"."id" WHERE "TeamMember"."userUid" = '${uid}' and "TeamMember"."teamID" > '${cursor}' LIMIT 10`,
-        );
-      } else {
-        users = await this.conn.query(
-          `SELECT * FROM "TeamMember" LEFT JOIN "Team" ON "TeamMember"."teamID" = "Team"."id" WHERE "TeamMember"."userUid" = '${uid}' LIMIT 10`,
-        );
-      }
-      const endQ = Date.now();
-      console.log(
-        'getTeamsOfUser >>>>>>>>>>',
-        endQ - startQ,
-        'ms',
-        '>>>>>',
-        users.rows,
-      );
-
-      return users.rows.map((entry) => ({
-        id: entry.teamID,
-        name: entry.name,
-      }));
-    }
-
     if (!cursor) {
-      const startQ = Date.now();
       const entries = await this.prisma.teamMember.findMany({
         take: 10,
         where: {
@@ -488,18 +274,9 @@ export class TeamService implements UserDataHandler, OnModuleInit {
           team: true,
         },
       });
-      const endQ = Date.now();
-      console.log(
-        'getTeamsOfUser >>>>>>>>>>',
-        endQ - startQ,
-        'ms',
-        '>>>>>',
-        entries,
-      );
 
       return entries.map((entry) => entry.team);
     } else {
-      const startQ = Date.now();
       const entries = await this.prisma.teamMember.findMany({
         take: 10,
         skip: 1,
@@ -516,56 +293,17 @@ export class TeamService implements UserDataHandler, OnModuleInit {
           team: true,
         },
       });
-      const endQ = Date.now();
-      console.log(
-        'getTeamsOfUser >>>>>>>>>>',
-        endQ - startQ,
-        'ms',
-        '>>>>>',
-        entries,
-      );
-
       return entries.map((entry) => entry.team);
     }
   }
 
   async getTeamWithID(teamID: string): Promise<Team | null> {
-    if (this.enableRawSql) {
-      const startQ = Date.now();
-      const team = await this.conn.query(
-        `SELECT * FROM "Team" WHERE "id" = '${teamID}'`,
-      );
-      const endQ = Date.now();
-      console.log(
-        'getTeamWithID >>>>>>>>>>',
-        endQ - startQ,
-        'ms',
-        '>>>>>',
-        team.rows,
-      );
-
-      if (team.rows.length === 0) return null;
-      return <Team>{
-        id: team.rows[0].id,
-        name: team.rows[0].name,
-      };
-    }
-
     try {
-      const startQ = Date.now();
       const team = await this.prisma.team.findUnique({
         where: {
           id: teamID,
         },
       });
-      const endQ = Date.now();
-      console.log(
-        'getTeamWithID >>>>>>>>>>',
-        endQ - startQ,
-        'ms',
-        '>>>>>',
-        team,
-      );
 
       return team;
     } catch (_e) {
@@ -615,30 +353,7 @@ export class TeamService implements UserDataHandler, OnModuleInit {
     teamID: string,
     userUid: string,
   ): Promise<TeamMember | null> {
-    if (this.enableRawSql) {
-      const startQ = Date.now();
-      const member = await this.conn.query(
-        `SELECT * FROM "TeamMember" WHERE "teamID" = '${teamID}' AND "userUid" = '${userUid}'`,
-      );
-      const endQ = Date.now();
-      console.log(
-        'getTeamMember >>>>>>>>>>',
-        endQ - startQ,
-        'ms',
-        '>>>>>',
-        member.rows,
-      );
-
-      if (member.rows.length === 0) return null;
-      return <TeamMember>{
-        membershipID: member.rows[0].id,
-        userUid: member.rows[0].userUid,
-        role: TeamMemberRole[member.rows[0].role],
-      };
-    }
-
     try {
-      const startQ = Date.now();
       const teamMember = await this.prisma.teamMember.findUnique({
         where: {
           teamID_userUid: {
@@ -647,14 +362,6 @@ export class TeamService implements UserDataHandler, OnModuleInit {
           },
         },
       });
-      const endQ = Date.now();
-      console.log(
-        'getTeamMember >>>>>>>>>>',
-        endQ - startQ,
-        'ms',
-        '>>>>>',
-        teamMember,
-      );
 
       if (!teamMember) return null;
 
@@ -726,44 +433,11 @@ export class TeamService implements UserDataHandler, OnModuleInit {
   }
 
   async getTeamMembers(teamID: string): Promise<TeamMember[]> {
-    if (this.enableRawSql) {
-      const startQ = Date.now();
-      const members = await this.conn.query(
-        `SELECT * FROM "TeamMember" WHERE "teamID" = '${teamID}'`,
-      );
-      const endQ = Date.now();
-
-      console.log(
-        'getTeamMembers >>>>>>>>>>',
-        endQ - startQ,
-        'ms',
-        '>>>>>',
-        members.rows,
-      );
-
-      return members.rows.map((entry) => {
-        return {
-          membershipID: entry.id,
-          userUid: entry.userUid,
-          role: TeamMemberRole[entry.role],
-        };
-      });
-    }
-
-    const startQ = Date.now();
     const dbTeamMembers = await this.prisma.teamMember.findMany({
       where: {
         teamID,
       },
     });
-    const endQ = Date.now();
-    console.log(
-      'getTeamMembers >>>>>>>>>>',
-      endQ - startQ,
-      'ms',
-      '>>>>>',
-      dbTeamMembers,
-    );
 
     const members = dbTeamMembers.map(
       (entry) =>
@@ -796,39 +470,8 @@ export class TeamService implements UserDataHandler, OnModuleInit {
     teamID: string,
     cursor: string | null,
   ): Promise<TeamMember[]> {
-    if (this.enableRawSql) {
-      const startQ = Date.now();
-      let members;
-      if (cursor) {
-        members = await this.conn.query(
-          `SELECT * FROM "TeamMember" WHERE "teamID" = '${teamID}' AND "id" > '${cursor}' LIMIT 10`,
-        );
-      }
-      members = await this.conn.query(
-        `SELECT * FROM "TeamMember" WHERE "teamID" = '${teamID}' LIMIT 10`,
-      );
-      const endQ = Date.now();
-      console.log(
-        'getMembersOfTeam >>>>>>>>>>',
-        endQ - startQ,
-        'ms',
-        '>>>>>',
-        members.rows,
-      );
-
-      return members.rows.map(
-        (entry) =>
-          <TeamMember>{
-            membershipID: entry.id,
-            userUid: entry.userUid,
-            role: TeamMemberRole[entry.role],
-          },
-      );
-    }
-
     let teamMembers: DbTeamMember[];
 
-    const startQ = Date.now();
     if (!cursor) {
       teamMembers = await this.prisma.teamMember.findMany({
         take: 10,
@@ -848,14 +491,6 @@ export class TeamService implements UserDataHandler, OnModuleInit {
         },
       });
     }
-    const endQ = Date.now();
-    console.log(
-      'getMembersOfTeam >>>>>>>>>>',
-      endQ - startQ,
-      'ms',
-      '>>>>>',
-      teamMembers,
-    );
 
     const members = teamMembers.map(
       (entry) =>

packages/hoppscotch-cli/CODE_OF_CONDUCT.md

@@ -0,0 +1,128 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+We as members, contributors, and leaders pledge to make participation in our
+community a harassment-free experience for everyone, regardless of age, body
+size, visible or invisible disability, ethnicity, sex characteristics, gender
+identity and expression, level of experience, education, socio-economic status,
+nationality, personal appearance, race, religion, or sexual identity
+and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming,
+diverse, inclusive, and healthy community.
+
+## Our Standards
+
+Examples of behavior that contributes to a positive environment for our
+community include:
+
+- Demonstrating empathy and kindness toward other people
+- Being respectful of differing opinions, viewpoints, and experiences
+- Giving and gracefully accepting constructive feedback
+- Accepting responsibility and apologizing to those affected by our mistakes,
+  and learning from the experience
+- Focusing on what is best not just for us as individuals, but for the
+  overall community
+
+Examples of unacceptable behavior include:
+
+- The use of sexualized language or imagery, and sexual attention or
+  advances of any kind
+- Trolling, insulting or derogatory comments, and personal or political attacks
+- Public or private harassment
+- Publishing others' private information, such as a physical or email
+  address, without their explicit permission
+- Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Enforcement Responsibilities
+
+Community leaders are responsible for clarifying and enforcing our standards of
+acceptable behavior and will take appropriate and fair corrective action in
+response to any behavior that they deem inappropriate, threatening, offensive,
+or harmful.
+
+Community leaders have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct, and will communicate reasons for moderation
+decisions when appropriate.
+
+## Scope
+
+This Code of Conduct applies within all community spaces, and also applies when
+an individual is officially representing the community in public spaces.
+Examples of representing our community include using an official e-mail address,
+posting via an official social media account, or acting as an appointed
+representative at an online or offline event.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported to the community leaders responsible for enforcement at
+support@hoppscotch.io.
+All complaints will be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and security of the
+reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining
+the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed
+unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing
+clarity around the nature of the violation and an explanation of why the
+behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series
+of actions.
+
+**Consequence**: A warning with consequences for continued behavior. No
+interaction with the people involved, including unsolicited interaction with
+those enforcing the Code of Conduct, for a specified period of time. This
+includes avoiding interactions in community spaces as well as external channels
+like social media. Violating these terms may lead to a temporary or
+permanent ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including
+sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public
+communication with the community for a specified period of time. No public or
+private interaction with the people involved, including unsolicited interaction
+with those enforcing the Code of Conduct, is allowed during this period.
+Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community
+standards, including sustained inappropriate behavior, harassment of an
+individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within
+the community.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 2.0, available at
+https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
+
+Community Impact Guidelines were inspired by [Mozilla's code of conduct
+enforcement ladder](https://github.com/mozilla/diversity).
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see the FAQ at
+https://www.contributor-covenant.org/faq. Translations are available at
+https://www.contributor-covenant.org/translations.

packages/hoppscotch-cli/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2022
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

packages/hoppscotch-cli/README.md

@@ -1,19 +1,29 @@
+<div align="center">
+  <a href="https://hoppscotch.io">
+    <img
+      src="https://avatars.githubusercontent.com/u/56705483"
+      alt="Hoppscotch Logo"
+      height="64"
+    />
+  </a>
+</div>
+<div align="center">
+
 # Hoppscotch CLI <font size=2><sup>ALPHA</sup></font>
 
-A CLI to run Hoppscotch Test Scripts in CI environments.
+</div>
+
+A CLI to run Hoppscotch test scripts in CI environments.
 
 ### **Commands:**
-
 - `hopp test [options] [file]`: testing hoppscotch collection.json file
 
 ### **Usage:**
-
+```
-```bash
 hopp [options or commands] arguments
 ```
 
 ### **Options:**
-
 - `-v`, `--ver`: see the current version of the CLI
 - `-h`, `--help`: display help for command
 
@@ -35,21 +45,17 @@ hopp [options or commands] arguments
    - Executes and outputs test-script response.
 
     #### Options:
-
     ##### `-e <file_path>` / `--env <file_path>`
-
     - Accepts path to env.json with contents in below format:
-
         ```json
         {
             "ENV1":"value1",
             "ENV2":"value2"
         }
         ```
-
     - You can now access those variables using `pw.env.get('<var_name>')`
 
-		Taking the above example, `pw.env.get("ENV1")` will return `"value1"`
+			Taking the above example, `pw.env.get("ENV1")` will return `"value1"`
 
 ## Install
 
@@ -69,59 +75,4 @@ npm i -g @hoppscotch/cli
 
 ## **Contributing:**
 
-When contributing to this repository, please first discuss the change you wish to make via issue,
+To get started contributing to the repository, please read **[CONTRIBUTING.md](./CONTRIBUTING.md)**
-email, or any other method with the owners of this repository before making a change.
-
-Please note we have a code of conduct, please follow it in all your interactions with the project.
-
-## Pull Request Process
-
-1. Ensure any install or build dependencies are removed before the end of the layer when doing a
-   build.
-2. Update the README.md with details of changes to the interface, this includes new environment
-   variables, exposed ports, useful file locations and container parameters.
-3. Increase the version numbers in any examples files and the README.md to the new version that this
-   Pull Request would represent. The versioning scheme we use is [SemVer](https://semver.org).
-4. You may merge the Pull Request once you have the sign-off of two other developers, or if you
-   do not have permission to do that, you may request the second reviewer merge it for you.
-
-## Set Up The Development Environment
-
-1. After cloning the repository, execute the following commands:
-
-    ```bash
-    pnpm install
-    pnpm run build
-    ```
-
-2. In order to test locally, you can use two types of package linking:
-
-    1. The 'pnpm exec' way (preferred since it does not hamper your original installation of the CLI):
-
-        ```bash
-        pnpm link @hoppscotch/cli
-
-        // Then to use or test the CLI:
-        pnpm exec hopp
-
-        // After testing, to remove the package linking:
-        pnpm rm @hoppscotch/cli
-        ```
-
-    2. The 'global' way (warning: this might override the globally installed CLI, if exists):
-
-        ```bash
-        sudo pnpm link --global
-
-        // Then to use or test the CLI:
-        hopp
-
-        // After testing, to remove the package linking:
-        sudo pnpm rm --global @hoppscotch/cli
-        ```
-
-3. To use the Typescript watch scripts:
-
-      ```bash
-      pnpm run dev
-      ```

packages/hoppscotch-common/locales/en.json

@@ -653,12 +653,11 @@
       "chat": "Chat with support",
       "open_docs": "Read Documentation",
       "open_keybindings": "Keyboard shortcuts",
-      "open_github": "Open GitHub repository",
       "social": "Social",
       "title": "General"
     },
     "miscellaneous": {
-      "invite": "Invite your friends to Hoppscotch",
+      "invite": "Invite people to Hoppscotch",
       "title": "Miscellaneous"
     },
     "request": {
@@ -670,13 +669,7 @@
       "tab_headers": "Headers tab",
       "tab_authorization": "Authorization tab",
       "tab_pre_request_script": "Pre-request script tab",
-      "tab_tests": "Tests tab",
+      "tab_tests": "Tests tab"
-      "tab_query": "Query tab",
-      "tab_variables": "Variables tab"
-    },
-    "graphql": {
-      "connect": "Connect to server",
-      "disconnect": "Disconnect from server"
     },
     "response": {
       "copy": "Copy response",
@@ -686,25 +679,25 @@
     "environments": {
       "new": "Create new environment",
       "new_variable": "Create a new environment variable",
-      "edit": "Edit current environment",
+      "edit": "Edit selected environment",
-      "delete": "Delete current environment",
+      "delete": "Delete selected environment",
-      "duplicate": "Duplicate current environment",
+      "duplicate": "Duplicate selected environment",
       "edit_global": "Edit global environment",
       "duplicate_global": "Duplicate global environment",
       "title": "Environments"
     },
     "workspace": {
       "new": "Create new team",
-      "edit": "Edit current team",
+      "edit": "Edit selected team",
-      "delete": "Delete current team",
+      "delete": "Delete selected team",
       "invite": "Invite people to team",
-      "switch_to_personal": "Switch to your personal workspace",
+      "switch_to_personal": "Switch to personal workspace",
       "title": "Teams"
     },
     "tab": {
-      "duplicate": "Duplicate current tab",
+      "duplicate": "Duplicate tab",
       "close_current": "Close current tab",
-      "close_others": "Close all other tabs",
+      "close_others": "Close other tabs",
       "new_tab": "Open a new tab",
       "title": "Tabs"
     },
@@ -717,15 +710,15 @@
     "change_language": "Change Language",
     "settings": {
       "theme": {
-        "black": "Black",
+        "black": "Black Mode",
-        "dark": "Dark",
+        "dark": "Dark Mode",
-        "light": "Light",
+        "light": "Light Mode",
-        "system": "System preference"
+        "system": "System Mode"
       },
       "font": {
-        "size_sm": "Small",
+        "size_sm": "Change to Small",
-        "size_md": "Medium",
+        "size_md": "Change to Medium",
-        "size_lg": "Large"
+        "size_lg": "Change to Large"
       },
       "change_interceptor": "Change Interceptor",
       "change_language": "Change Language"

packages/hoppscotch-common/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@hoppscotch/common",
   "private": true,
-  "version": "2023.8.0",
+  "version": "2023.4.8",
   "scripts": {
     "dev": "pnpm exec npm-run-all -p -l dev:*",
     "test": "vitest --run",
@@ -63,7 +63,7 @@
     "graphql": "^16.8.0",
     "graphql-language-service-interface": "^2.9.1",
     "graphql-tag": "^2.12.6",
-    "httpsnippet": "^3.0.1",
+    "httpsnippet": "^2.0.0",
     "insomnia-importers": "^3.6.0",
     "io-ts": "^2.2.20",
     "js-yaml": "^4.1.0",
@@ -117,7 +117,6 @@
     "@intlify/vite-plugin-vue-i18n": "^7.0.0",
     "@relmify/jest-fp-ts": "^2.1.1",
     "@rushstack/eslint-patch": "^1.3.3",
-    "@types/har-format": "^1.2.12",
     "@types/js-yaml": "^4.0.5",
     "@types/lodash-es": "^4.17.8",
     "@types/lossless-json": "^1.0.1",

packages/hoppscotch-common/src/App.vue

@@ -18,7 +18,6 @@ import { HOPP_MODULES } from "@modules/."
 import { isLoadingInitialRoute } from "@modules/router"
 import { useI18n } from "@composables/i18n"
 import { APP_IS_IN_DEV_MODE } from "@helpers/dev"
-import { platform } from "./platform"
 
 const t = useI18n()
 
@@ -46,5 +45,4 @@ if (APP_IS_IN_DEV_MODE) {
 
 // Run module root component setup code
 HOPP_MODULES.forEach((mod) => mod.onRootSetup?.())
-platform.addedHoppModules?.forEach((mod) => mod.onRootSetup?.())
 </script>

packages/hoppscotch-common/src/components/app/ActionHandler.vue

@@ -17,6 +17,7 @@ import { pipe } from "fp-ts/function"
 import * as TE from "fp-ts/TaskEither"
 import { deleteTeam as backendDeleteTeam } from "~/helpers/backend/mutations/Team"
 import { defineActionHandler, invokeAction } from "~/helpers/actions"
+import { showChat } from "~/modules/crisp"
 import { useToast } from "~/composables/toast"
 import { useI18n } from "~/composables/i18n"
 
@@ -61,6 +62,10 @@ defineActionHandler("modals.login.toggle", () => {
   showLogin.value = !showLogin.value
 })
 
+defineActionHandler("flyouts.chat.open", () => {
+  showChat()
+})
+
 defineActionHandler("modals.team.delete", ({ teamId }) => {
   teamID.value = teamId
   confirmRemove.value = true

packages/hoppscotch-common/src/components/app/Footer.vue

@@ -76,7 +76,6 @@
                   }
                 "
               />
-              <!--
               <HoppSmartItem
                 ref="chat"
                 :icon="IconMessageCircle"
@@ -89,34 +88,20 @@
                   }
                 "
               />
-              -->
+              <HoppSmartItem
-              <template
+                :icon="IconGift"
-                v-for="footerItem in platform.ui?.additionalFooterMenuItems"
+                :label="`${t('app.whats_new')}`"
-                :key="footerItem.id"
+                to="https://docs.hoppscotch.io/documentation/changelog"
-              >
+                blank
-                <template v-if="footerItem.action.type === 'link'">
+                @click="hide()"
-                  <HoppSmartItem
+              />
-                    :icon="footerItem.icon"
+              <HoppSmartItem
-                    :label="footerItem.text(t)"
+                :icon="IconActivity"
-                    :to="footerItem.action.href"
+                :label="t('app.status')"
-                    blank
+                to="https://status.hoppscotch.io"
-                    @click="hide()"
+                blank
-                  />
+                @click="hide()"
-                </template>
+              />
-                <HoppSmartItem
-                  v-else
-                  :icon="footerItem.icon"
-                  :label="footerItem.text(t)"
-                  blank
-                  @click="
-                    () => {
-                      // @ts-expect-error TypeScript not understanding the type
-                      footerItem.action.do()
-                      hide()
-                    }
-                  "
-                />
-              </template>
               <hr />
               <HoppSmartItem
                 :icon="IconGithub"
@@ -222,11 +207,15 @@ import IconColumns from "~icons/lucide/columns"
 import IconSidebarOpen from "~icons/lucide/sidebar-open"
 import IconShieldCheck from "~icons/lucide/shield-check"
 import IconBook from "~icons/lucide/book"
+import IconMessageCircle from "~icons/lucide/message-circle"
+import IconGift from "~icons/lucide/gift"
+import IconActivity from "~icons/lucide/activity"
 import IconGithub from "~icons/lucide/github"
 import IconTwitter from "~icons/lucide/twitter"
 import IconUserPlus from "~icons/lucide/user-plus"
 import IconLock from "~icons/lucide/lock"
 import IconLifeBuoy from "~icons/lucide/life-buoy"
+import { showChat } from "@modules/crisp"
 import { useSetting } from "@composables/settings"
 import { useI18n } from "@composables/i18n"
 import { useReadonlyStream } from "@composables/stream"
@@ -273,6 +262,10 @@ const nativeShare = () => {
   }
 }
 
+const chatWithUs = () => {
+  showChat()
+}
+
 const showDeveloperOptionModal = () => {
   if (currentUser.value) {
     showDeveloperOptions.value = true

packages/hoppscotch-common/src/components/app/Options.vue

@@ -30,37 +30,105 @@
         <h2 class="p-4 font-semibold font-bold text-secondaryDark">
           {{ t("support.title") }}
         </h2>
-        <template
+        <HoppSmartItem
-          v-for="item in platform.ui?.additionalSupportOptionsMenuItems"
+          :icon="IconBook"
-          :key="item.id"
+          :label="t('app.documentation')"
-        >
+          to="https://docs.hoppscotch.io"
-          <HoppSmartItem
+          :description="t('support.documentation')"
-            v-if="item.action.type === 'link'"
+          :info-icon="IconChevronRight"
-            :icon="item.icon"
+          active
-            :label="item.text(t)"
+          blank
-            :to="item.action.href"
+          @click="hideModal()"
-            :description="item.subtitle(t)"
+        />
-            :info-icon="IconChevronRight"
+        <HoppSmartItem
-            active
+          :icon="IconGift"
-            blank
+          :label="t('app.whats_new')"
-            @click="hideModal()"
+          to="https://docs.hoppscotch.io/documentation/changelog"
-          />
+          :description="t('support.changelog')"
-          <HoppSmartItem
+          :info-icon="IconChevronRight"
-            v-else
+          active
-            :icon="item.icon"
+          blank
-            :label="item.text(t)"
+          @click="hideModal()"
-            :description="item.subtitle(t)"
+        />
-            :info-icon="IconChevronRight"
+        <HoppSmartItem
-            active
+          :icon="IconActivity"
-            @click="
+          :label="t('app.status')"
-              () => {
+          to="https://status.hoppscotch.io"
-                // @ts-expect-error Typescript isn't able to understand
+          blank
-                item.action.do()
+          :description="t('app.status_description')"
-                hideModal()
+          :info-icon="IconChevronRight"
-              }
+          active
-            "
+          @click="hideModal()"
-          />
+        />
-        </template>
+        <HoppSmartItem
+          :icon="IconLock"
+          :label="`${t('app.terms_and_privacy')}`"
+          to="https://docs.hoppscotch.io/support/privacy"
+          blank
+          :description="t('app.terms_and_privacy')"
+          :info-icon="IconChevronRight"
+          active
+          @click="hideModal()"
+        />
+        <h2 class="p-4 font-semibold font-bold text-secondaryDark">
+          {{ t("settings.follow") }}
+        </h2>
+        <HoppSmartItem
+          :icon="IconDiscord"
+          :label="t('app.discord')"
+          to="https://hoppscotch.io/discord"
+          blank
+          :description="t('app.join_discord_community')"
+          :info-icon="IconChevronRight"
+          active
+          @click="hideModal()"
+        />
+        <HoppSmartItem
+          :icon="IconTwitter"
+          :label="t('app.twitter')"
+          to="https://hoppscotch.io/twitter"
+          blank
+          :description="t('support.twitter')"
+          :info-icon="IconChevronRight"
+          active
+          @click="hideModal()"
+        />
+        <HoppSmartItem
+          :icon="IconGithub"
+          :label="`${t('app.github')}`"
+          to="https://github.com/hoppscotch/hoppscotch"
+          blank
+          :description="t('support.github')"
+          :info-icon="IconChevronRight"
+          active
+          @click="hideModal()"
+        />
+        <HoppSmartItem
+          :icon="IconMessageCircle"
+          :label="t('app.chat_with_us')"
+          :description="t('support.chat')"
+          :info-icon="IconChevronRight"
+          active
+          @click="chatWithUs()"
+        />
+        <HoppSmartItem
+          :icon="IconUserPlus"
+          :label="`${t('app.invite')}`"
+          :description="t('shortcut.miscellaneous.invite')"
+          :info-icon="IconChevronRight"
+          active
+          @click="expandInvite()"
+        />
+        <HoppSmartItem
+          v-if="navigatorShare"
+          v-tippy="{ theme: 'tooltip' }"
+          :icon="IconShare2"
+          :label="`${t('request.share')}`"
+          :description="t('request.share_description')"
+          :info-icon="IconChevronRight"
+          active
+          @click="nativeShare()"
+        />
       </div>
     </template>
   </HoppSmartModal>
@@ -70,12 +138,24 @@
 import { watch } from "vue"
 import IconSidebar from "~icons/lucide/sidebar"
 import IconSidebarOpen from "~icons/lucide/sidebar-open"
+import IconBook from "~icons/lucide/book"
+import IconGift from "~icons/lucide/gift"
+import IconActivity from "~icons/lucide/activity"
+import IconLock from "~icons/lucide/lock"
+import IconDiscord from "~icons/brands/discord"
+import IconTwitter from "~icons/brands/twitter"
+import IconGithub from "~icons/lucide/github"
+import IconMessageCircle from "~icons/lucide/message-circle"
+import IconUserPlus from "~icons/lucide/user-plus"
+import IconShare2 from "~icons/lucide/share-2"
 import IconChevronRight from "~icons/lucide/chevron-right"
 import { useSetting } from "@composables/settings"
+import { invokeAction } from "~/helpers/actions"
+import { showChat } from "@modules/crisp"
 import { useI18n } from "@composables/i18n"
-import { platform } from "~/platform"
 
 const t = useI18n()
+const navigatorShare = !!navigator.share
 
 const ZEN_MODE = useSetting("ZEN_MODE")
 const EXPAND_NAVIGATION = useSetting("EXPAND_NAVIGATION")
@@ -96,6 +176,11 @@ const emit = defineEmits<{
   (e: "hide-modal"): void
 }>()
 
+const chatWithUs = () => {
+  showChat()
+  hideModal()
+}
+
 const expandNavigation = () => {
   EXPAND_NAVIGATION.value = !EXPAND_NAVIGATION.value
   hideModal()
@@ -106,6 +191,24 @@ const expandCollection = () => {
   hideModal()
 }
 
+const expandInvite = () => {
+  invokeAction("modals.share.toggle")
+}
+
+const nativeShare = () => {
+  if (navigator.share) {
+    navigator
+      .share({
+        title: "Hoppscotch",
+        text: "Hoppscotch • Open source API development ecosystem - Helps you create requests faster, saving precious time on development.",
+        url: "https://hoppscotch.io",
+      })
+      .catch(console.error)
+  } else {
+    // fallback
+  }
+}
+
 const hideModal = () => {
   emit("hide-modal")
 }

packages/hoppscotch-common/src/components/app/Support.vue

@@ -8,46 +8,89 @@
   >
     <template #body>
       <div class="flex flex-col space-y-2">
-        <template
+        <HoppSmartItem
-          v-for="item in platform.ui?.additionalSupportOptionsMenuItems"
+          :icon="IconBook"
-          :key="item.id"
+          :label="t('app.documentation')"
-        >
+          to="https://docs.hoppscotch.io"
-          <HoppSmartItem
+          :description="t('support.documentation')"
-            v-if="item.action.type === 'link'"
+          :info-icon="IconChevronRight"
-            :icon="item.icon"
+          active
-            :label="item.text(t)"
+          blank
-            :to="item.action.href"
+          @click="hideModal()"
-            :description="item.subtitle(t)"
+        />
-            :info-icon="IconChevronRight"
+        <HoppSmartItem
-            active
+          :icon="IconZap"
-            blank
+          :label="t('app.keyboard_shortcuts')"
-            @click="hideModal()"
+          :description="t('support.shortcuts')"
-          />
+          :info-icon="IconChevronRight"
-          <HoppSmartItem
+          active
-            v-else
+          @click="showShortcuts()"
-            :icon="item.icon"
+        />
-            :label="item.text(t)"
+        <HoppSmartItem
-            :description="item.subtitle(t)"
+          :icon="IconGift"
-            :info-icon="IconChevronRight"
+          :label="t('app.whats_new')"
-            active
+          to="https://docs.hoppscotch.io/documentation/changelog"
-            @click="
+          :description="t('support.changelog')"
-              () => {
+          :info-icon="IconChevronRight"
-                // @ts-expect-error Typescript isn't able to understand
+          active
-                item.action.do()
+          blank
-                hideModal()
+          @click="hideModal()"
-              }
+        />
-            "
+        <HoppSmartItem
-          />
+          :icon="IconMessageCircle"
-        </template>
+          :label="t('app.chat_with_us')"
+          :description="t('support.chat')"
+          :info-icon="IconChevronRight"
+          active
+          @click="chatWithUs()"
+        />
+        <HoppSmartItem
+          :icon="IconGitHub"
+          :label="t('app.github')"
+          to="https://hoppscotch.io/github"
+          blank
+          :description="t('support.github')"
+          :info-icon="IconChevronRight"
+          active
+          @click="hideModal()"
+        />
+        <HoppSmartItem
+          :icon="IconDiscord"
+          :label="t('app.join_discord_community')"
+          to="https://hoppscotch.io/discord"
+          blank
+          :description="t('support.community')"
+          :info-icon="IconChevronRight"
+          active
+          @click="hideModal()"
+        />
+        <HoppSmartItem
+          :icon="IconTwitter"
+          :label="t('app.twitter')"
+          to="https://hoppscotch.io/twitter"
+          blank
+          :description="t('support.twitter')"
+          :info-icon="IconChevronRight"
+          active
+          @click="hideModal()"
+        />
       </div>
     </template>
   </HoppSmartModal>
 </template>
 
 <script setup lang="ts">
+import IconTwitter from "~icons/brands/twitter"
+import IconDiscord from "~icons/brands/discord"
+import IconGitHub from "~icons/lucide/github"
+import IconMessageCircle from "~icons/lucide/message-circle"
+import IconGift from "~icons/lucide/gift"
+import IconZap from "~icons/lucide/zap"
+import IconBook from "~icons/lucide/book"
 import IconChevronRight from "~icons/lucide/chevron-right"
+import { invokeAction } from "@helpers/actions"
+import { showChat } from "@modules/crisp"
 import { useI18n } from "@composables/i18n"
-import { platform } from "~/platform"
 
 const t = useI18n()
 
@@ -59,6 +102,16 @@ const emit = defineEmits<{
   (e: "hide-modal"): void
 }>()
 
+const chatWithUs = () => {
+  showChat()
+  hideModal()
+}
+
+const showShortcuts = () => {
+  invokeAction("flyouts.keybinds.toggle")
+  hideModal()
+}
+
 const hideModal = () => {
   emit("hide-modal")
 }

packages/hoppscotch-common/src/components/environments/Add.vue

@@ -21,12 +21,7 @@
           <label for="value" class="font-semibold min-w-10">{{
             t("environment.value")
           }}</label>
-          <input
+          <input type="text" :value="value" class="input" />
-            v-model="editingValue"
-            type="text"
-            class="input"
-            :placeholder="t('environment.value')"
-          />
         </div>
         <div class="flex items-center space-x-8 ml-2">
           <label for="scope" class="font-semibold min-w-10">
@@ -110,12 +105,9 @@ watch(
       scope.value = {
         type: "global",
       }
-      replaceWithVariable.value = false
       editingName.value = ""
-      editingValue.value = ""
+      replaceWithVariable.value = false
     }
-    editingName.value = props.name
-    editingValue.value = props.value
   }
 )
 
@@ -140,7 +132,6 @@ const scope = ref<Scope>({
 const replaceWithVariable = ref(false)
 
 const editingName = ref(props.name)
-const editingValue = ref(props.value)
 
 const addEnvironment = async () => {
   if (!editingName.value) {
@@ -150,13 +141,13 @@ const addEnvironment = async () => {
   if (scope.value.type === "global") {
     addGlobalEnvVariable({
       key: editingName.value,
-      value: editingValue.value,
+      value: props.value,
     })
     toast.success(`${t("environment.updated")}`)
   } else if (scope.value.type === "my-environment") {
     addEnvironmentVariable(scope.value.index, {
       key: editingName.value,
-      value: editingValue.value,
+      value: props.value,
     })
     toast.success(`${t("environment.updated")}`)
   } else {
@@ -164,7 +155,7 @@ const addEnvironment = async () => {
       ...scope.value.environment.environment.variables,
       {
         key: editingName.value,
-        value: editingValue.value,
+        value: props.value,
       },
     ]
     await pipe(
@@ -191,7 +182,7 @@ const addEnvironment = async () => {
     //replace the currenttab endpoint containing the value in the text with variablename
     currentActiveTab.value.document.request.endpoint =
       currentActiveTab.value.document.request.endpoint.replace(
-        editingValue.value,
+        props.value,
         variableName
       )
   }

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

@@ -32,7 +32,6 @@
           @keyup.escape="hide()"
         >
           <HoppSmartItem
-            v-if="!isScopeSelector"
             :label="`${t('environment.no_environment')}`"
             :info-icon="
               selectedEnvironmentIndex.type === 'NO_ENV_SELECTED'
@@ -49,21 +48,6 @@
               }
             "
           />
-          <HoppSmartItem
-            v-else-if="isScopeSelector && modelValue"
-            :label="t('environment.global')"
-            :icon="IconGlobe"
-            :info-icon="modelValue.type === 'global' ? IconCheck : undefined"
-            :active-info-icon="modelValue.type === 'global'"
-            @click="
-              () => {
-                $emit('update:modelValue', {
-                  type: 'global',
-                })
-                hide()
-              }
-            "
-          />
           <HoppSmartTabs
             v-model="selectedEnvTab"
             :styles="`sticky overflow-x-auto my-2 border border-divider rounded flex-shrink-0 z-0 top-0 bg-primary ${
@@ -82,14 +66,14 @@
                 :key="`gen-${index}`"
                 :icon="IconLayers"
                 :label="gen.name"
-                :info-icon="isEnvActive(index) ? IconCheck : undefined"
+                :info-icon="index === selectedEnv.index ? IconCheck : undefined"
-                :active-info-icon="isEnvActive(index)"
+                :active-info-icon="index === selectedEnv.index"
                 @click="
                   () => {
-                    handleEnvironmentChange(index, {
+                    selectedEnvironmentIndex = {
-                      type: 'my-environment',
+                      type: 'MY_ENV',
-                      environment: gen,
+                      index: index,
-                    })
+                    }
                     hide()
                   }
                 "
@@ -129,14 +113,18 @@
                   :key="`gen-team-${index}`"
                   :icon="IconLayers"
                   :label="gen.environment.name"
-                  :info-icon="isEnvActive(gen.id) ? IconCheck : undefined"
+                  :info-icon="
-                  :active-info-icon="isEnvActive(gen.id)"
+                    gen.id === selectedEnv.teamEnvID ? IconCheck : undefined
+                  "
+                  :active-info-icon="gen.id === selectedEnv.teamEnvID"
                   @click="
                     () => {
-                      handleEnvironmentChange(index, {
+                      selectedEnvironmentIndex = {
-                        type: 'team-environment',
+                        type: 'TEAM_ENV',
-                        environment: gen,
+                        teamEnvID: gen.id,
-                      })
+                        teamID: gen.teamID,
+                        environment: gen.environment,
+                      }
                       hide()
                     }
                   "
@@ -297,7 +285,6 @@ import IconCheck from "~icons/lucide/check"
 import IconLayers from "~icons/lucide/layers"
 import IconEye from "~icons/lucide/eye"
 import IconEdit from "~icons/lucide/edit"
-import IconGlobe from "~icons/lucide/globe"
 import { TippyComponent } from "vue-tippy"
 import { useI18n } from "~/composables/i18n"
 import { GQLError } from "~/helpers/backend/GQLClient"
@@ -308,39 +295,11 @@ import {
   selectedEnvironmentIndex$,
   setSelectedEnvironmentIndex,
 } from "~/newstore/environments"
-import { changeWorkspace, workspaceStatus$ } from "~/newstore/workspace"
+import { workspaceStatus$ } from "~/newstore/workspace"
 import TeamEnvironmentAdapter from "~/helpers/teams/TeamEnvironmentAdapter"
 import { useColorMode } from "@composables/theming"
 import { breakpointsTailwind, useBreakpoints } from "@vueuse/core"
 import { invokeAction } from "~/helpers/actions"
-import { TeamEnvironment } from "~/helpers/teams/TeamEnvironment"
-import { Environment } from "@hoppscotch/data"
-import { onMounted } from "vue"
-import { onLoggedIn } from "~/composables/auth"
-import TeamListAdapter from "~/helpers/teams/TeamListAdapter"
-import { useLocalState } from "~/newstore/localstate"
-import { GetMyTeamsQuery } from "~/helpers/backend/graphql"
-
-type Scope =
-  | {
-      type: "global"
-    }
-  | {
-      type: "my-environment"
-      environment: Environment
-      index: number
-    }
-  | {
-      type: "team-environment"
-      environment: TeamEnvironment
-    }
-const props = defineProps<{
-  isScopeSelector?: boolean
-  modelValue?: Scope
-}>()
-const emit = defineEmits<{
-  (e: "update:modelValue", data: Scope): void
-}>()
 
 const breakpoints = useBreakpoints(breakpointsTailwind)
 const mdAndLarger = breakpoints.greater("md")
@@ -355,38 +314,6 @@ const myEnvironments = useReadonlyStream(environments$, [])
 
 const workspace = useReadonlyStream(workspaceStatus$, { type: "personal" })
 
-// TeamList-Adapter
-const teamListAdapter = new TeamListAdapter(true)
-const myTeams = useReadonlyStream(teamListAdapter.teamList$, null)
-const teamListFetched = ref(false)
-const REMEMBERED_TEAM_ID = useLocalState("REMEMBERED_TEAM_ID")
-
-onLoggedIn(() => {
-  !teamListAdapter.isInitialized && teamListAdapter.initialize()
-})
-
-const switchToTeamWorkspace = (team: GetMyTeamsQuery["myTeams"][number]) => {
-  REMEMBERED_TEAM_ID.value = team.id
-  changeWorkspace({
-    teamID: team.id,
-    teamName: team.name,
-    type: "team",
-  })
-}
-watch(
-  () => myTeams.value,
-  (newTeams) => {
-    if (newTeams && !teamListFetched.value) {
-      teamListFetched.value = true
-      if (REMEMBERED_TEAM_ID.value) {
-        const team = newTeams.find((t) => t.id === REMEMBERED_TEAM_ID.value)
-        if (team) switchToTeamWorkspace(team)
-      }
-    }
-  }
-)
-
-// TeamEnv List Adapter
 const teamEnvListAdapter = new TeamEnvironmentAdapter(undefined)
 const teamListLoading = useReadonlyStream(teamEnvListAdapter.loading$, false)
 const teamAdapterError = useReadonlyStream(teamEnvListAdapter.error$, null)
@@ -395,70 +322,6 @@ const teamEnvironmentList = useReadonlyStream(
   []
 )
 
-const handleEnvironmentChange = (
-  index: number,
-  env?:
-    | {
-        type: "my-environment"
-        environment: Environment
-      }
-    | {
-        type: "team-environment"
-        environment: TeamEnvironment
-      }
-) => {
-  if (props.isScopeSelector && env) {
-    if (env.type === "my-environment") {
-      emit("update:modelValue", {
-        type: "my-environment",
-        environment: env.environment,
-        index,
-      })
-    } else if (env.type === "team-environment") {
-      emit("update:modelValue", {
-        type: "team-environment",
-        environment: env.environment,
-      })
-    }
-  } else {
-    if (env && env.type === "my-environment") {
-      selectedEnvironmentIndex.value = {
-        type: "MY_ENV",
-        index,
-      }
-    } else if (env && env.type === "team-environment") {
-      selectedEnvironmentIndex.value = {
-        type: "TEAM_ENV",
-        teamEnvID: env.environment.id,
-        teamID: env.environment.teamID,
-        environment: env.environment.environment,
-      }
-    }
-  }
-}
-const isEnvActive = (id: string | number) => {
-  if (props.isScopeSelector) {
-    if (props.modelValue?.type === "my-environment") {
-      return props.modelValue.index === id
-    } else if (props.modelValue?.type === "team-environment") {
-      return (
-        props.modelValue?.type === "team-environment" &&
-        props.modelValue.environment &&
-        props.modelValue.environment.id === id
-      )
-    }
-  } else {
-    if (selectedEnvironmentIndex.value.type === "MY_ENV") {
-      return selectedEnv.value.index === id
-    } else {
-      return (
-        selectedEnvironmentIndex.value.type === "TEAM_ENV" &&
-        selectedEnv.value.teamEnvID === id
-      )
-    }
-  }
-}
-
 const selectedEnvironmentIndex = useStream(
   selectedEnvironmentIndex$,
   { type: "NO_ENV_SELECTED" },
@@ -486,90 +349,34 @@ watch(
 )
 
 const selectedEnv = computed(() => {
-  if (props.isScopeSelector) {
+  if (selectedEnvironmentIndex.value.type === "MY_ENV") {
-    if (props.modelValue?.type === "my-environment") {
+    const environment =
-      return {
+      myEnvironments.value[selectedEnvironmentIndex.value.index]
-        type: "MY_ENV",
+    return {
-        index: props.modelValue.index,
+      type: "MY_ENV",
-        name: props.modelValue.environment?.name,
+      index: selectedEnvironmentIndex.value.index,
-      }
+      name: environment.name,
-    } else if (props.modelValue?.type === "team-environment") {
+      variables: environment.variables,
+    }
+  } else if (selectedEnvironmentIndex.value.type === "TEAM_ENV") {
+    const teamEnv = teamEnvironmentList.value.find(
+      (env) =>
+        env.id ===
+        (selectedEnvironmentIndex.value.type === "TEAM_ENV" &&
+          selectedEnvironmentIndex.value.teamEnvID)
+    )
+    if (teamEnv) {
       return {
         type: "TEAM_ENV",
-        name: props.modelValue.environment.environment.name,
+        name: teamEnv.environment.name,
-        teamEnvID: props.modelValue.environment.id,
+        teamEnvID: selectedEnvironmentIndex.value.teamEnvID,
-      }
+        variables: teamEnv.environment.variables,
-    } else {
-      return { type: "global", name: "Global" }
-    }
-  } else {
-    if (selectedEnvironmentIndex.value.type === "MY_ENV") {
-      const environment =
-        myEnvironments.value[selectedEnvironmentIndex.value.index]
-      return {
-        type: "MY_ENV",
-        index: selectedEnvironmentIndex.value.index,
-        name: environment.name,
-        variables: environment.variables,
-      }
-    } else if (selectedEnvironmentIndex.value.type === "TEAM_ENV") {
-      const teamEnv = teamEnvironmentList.value.find(
-        (env) =>
-          env.id ===
-          (selectedEnvironmentIndex.value.type === "TEAM_ENV" &&
-            selectedEnvironmentIndex.value.teamEnvID)
-      )
-      if (teamEnv) {
-        return {
-          type: "TEAM_ENV",
-          name: teamEnv.environment.name,
-          teamEnvID: selectedEnvironmentIndex.value.teamEnvID,
-          variables: teamEnv.environment.variables,
-        }
-      } else {
-        return { type: "NO_ENV_SELECTED" }
       }
     } else {
       return { type: "NO_ENV_SELECTED" }
     }
-  }
+  } else {
-})
+    return { type: "NO_ENV_SELECTED" }
-
-// Set the selected environment as initial scope value
-onMounted(() => {
-  if (props.isScopeSelector) {
-    if (
-      selectedEnvironmentIndex.value.type === "MY_ENV" &&
-      selectedEnvironmentIndex.value.index !== undefined
-    ) {
-      emit("update:modelValue", {
-        type: "my-environment",
-        environment: myEnvironments.value[selectedEnvironmentIndex.value.index],
-        index: selectedEnvironmentIndex.value.index,
-      })
-    } else if (
-      selectedEnvironmentIndex.value.type === "TEAM_ENV" &&
-      selectedEnvironmentIndex.value.teamEnvID &&
-      teamEnvironmentList.value &&
-      teamEnvironmentList.value.length > 0
-    ) {
-      const teamEnv = teamEnvironmentList.value.find(
-        (env) =>
-          env.id ===
-          (selectedEnvironmentIndex.value.type === "TEAM_ENV" &&
-            selectedEnvironmentIndex.value.teamEnvID)
-      )
-      if (teamEnv) {
-        emit("update:modelValue", {
-          type: "team-environment",
-          environment: teamEnv,
-        })
-      }
-    } else {
-      emit("update:modelValue", {
-        type: "global",
-      })
-    }
   }
 })
 

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

@@ -300,7 +300,7 @@ watch(
 
 defineActionHandler("modals.environment.add", ({ envName, variableName }) => {
   editingVariableName.value = envName
-  if (variableName) editingVariableValue.value = variableName
+  editingVariableValue.value = variableName
   displayModalNew(true)
 })
 </script>

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

@@ -144,6 +144,8 @@ const selectedOperation = ref<gql.OperationDefinitionNode | null>(null)
 const gqlQueryString = useVModel(props, "modelValue", emit)
 
 const debouncedOnUpdateQueryState = debounce((update: ViewUpdate) => {
+  if (!update.selectionSet) return
+
   const selectedPos = update.state.selection.main.head
   const queryString = update.state.doc.toJSON().join(update.state.lineBreak)
 

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

@@ -71,7 +71,6 @@ import { connect } from "~/helpers/graphql/connection"
 import { disconnect } from "~/helpers/graphql/connection"
 import { InterceptorService } from "~/services/interceptor.service"
 import { useService } from "dioc/vue"
-import { defineActionHandler } from "~/helpers/actions"
 
 const t = useI18n()
 
@@ -141,12 +140,4 @@ const cancelSwitch = () => {
   if (connected.value) disconnect()
   connectionSwitchModal.value = false
 }
-
-defineActionHandler(
-  "gql.connect",
-  gqlConnect,
-  computed(() => !connected.value)
-)
-
-defineActionHandler("gql.disconnect", disconnect, connected)
 </script>

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

@@ -69,8 +69,8 @@ import { useService } from "dioc/vue"
 import { InterceptorService } from "~/services/interceptor.service"
 import { editGraphqlRequest } from "~/newstore/collections"
 
-export type GQLOptionTabs = "query" | "headers" | "variables" | "authorization"
+type OptionTabs = "query" | "headers" | "variables" | "authorization"
-const selectedOptionTab = ref<GQLOptionTabs>("query")
+const selectedOptionTab = ref<OptionTabs>("query")
 const interceptorService = useService(InterceptorService)
 
 const t = useI18n()
@@ -206,8 +206,4 @@ defineActionHandler("request.save-as", () => {
   showSaveRequestModal.value = true
 })
 defineActionHandler("request.reset", clearGQLQuery)
-
-defineActionHandler("request.open-tab", ({ tab }) => {
-  selectedOptionTab.value = tab as GQLOptionTabs
-})
 </script>

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

@@ -128,14 +128,8 @@ const downloadResponse = (str: string) => {
   }, 1000)
 }
 
-defineActionHandler(
+defineActionHandler("response.file.download", () =>
-  "response.file.download",
+  downloadResponse(responseString.value)
-  () => downloadResponse(responseString.value),
-  computed(() => !!props.response && props.response.length > 0)
-)
-defineActionHandler(
-  "response.copy",
-  () => copyResponse(responseString.value),
-  computed(() => !!props.response && props.response.length > 0)
 )
+defineActionHandler("response.copy", () => copyResponse(responseString.value))
 </script>

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

@@ -508,17 +508,30 @@ const changeTab = (tab: ComputedHeader["source"]) => {
 
 const inspectionService = useService(InspectionService)
 
-const headerKeyResults = inspectionService.getResultViewFor(
+const allTabResults = inspectionService.tabs
-  currentTabID.value,
-  (result) =>
-    result.locations.type === "header" && result.locations.position === "key"
-)
 
-const headerValueResults = inspectionService.getResultViewFor(
+const headerKeyResults = computed(() => {
-  currentTabID.value,
+  return (
-  (result) =>
+    allTabResults.value
-    result.locations.type === "header" && result.locations.position === "value"
+      .get(currentTabID.value)
-)
+      .filter(
+        (result) =>
+          result.locations.type === "header" &&
+          result.locations.position === "key"
+      ) ?? []
+  )
+})
+const headerValueResults = computed(() => {
+  return (
+    allTabResults.value
+      .get(currentTabID.value)
+      .filter(
+        (result) =>
+          result.locations.type === "header" &&
+          result.locations.position === "value"
+      ) ?? []
+  )
+})
 
 const getInspectorResult = (results: InspectorResult[], index: number) => {
   return results.filter((result) => {

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

@@ -178,7 +178,7 @@ import IconCheckCircle from "~icons/lucide/check-circle"
 import IconCircle from "~icons/lucide/circle"
 import IconTrash from "~icons/lucide/trash"
 import IconWrapText from "~icons/lucide/wrap-text"
-import { reactive, ref, watch } from "vue"
+import { computed, reactive, ref, watch } from "vue"
 import { flow, pipe } from "fp-ts/function"
 import * as O from "fp-ts/Option"
 import * as A from "fp-ts/Array"
@@ -409,18 +409,30 @@ const clearContent = () => {
 
 const inspectionService = useService(InspectionService)
 
-const parameterKeyResults = inspectionService.getResultViewFor(
+const allTabResults = inspectionService.tabs
-  currentTabID.value,
-  (result) =>
-    result.locations.type === "parameter" && result.locations.position === "key"
-)
 
-const parameterValueResults = inspectionService.getResultViewFor(
+const parameterKeyResults = computed(() => {
-  currentTabID.value,
+  return (
-  (result) =>
+    allTabResults.value
-    result.locations.type === "parameter" &&
+      .get(currentTabID.value)
-    result.locations.position === "value"
+      .filter(
-)
+        (result) =>
+          result.locations.type === "parameter" &&
+          result.locations.position === "key"
+      ) ?? []
+  )
+})
+const parameterValueResults = computed(() => {
+  return (
+    allTabResults.value
+      .get(currentTabID.value)
+      .filter(
+        (result) =>
+          result.locations.type === "parameter" &&
+          result.locations.position === "value"
+      ) ?? []
+  )
+})
 
 const getInspectorResult = (results: InspectorResult[], index: number) => {
   return results.filter((result) => {

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

@@ -642,5 +642,9 @@ const COLUMN_LAYOUT = useSetting("COLUMN_LAYOUT")
 
 const inspectionService = useService(InspectionService)
 
-const tabResults = inspectionService.getResultViewFor(currentTabID.value)
+const allTabResults = inspectionService.tabs
+
+const tabResults = computed(() => {
+  return allTabResults.value.get(currentTabID.value) ?? []
+})
 </script>

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

@@ -101,6 +101,6 @@ const newActiveHeadersCount$ = computed(() => {
 })
 
 defineActionHandler("request.open-tab", ({ tab }) => {
-  selectedOptionsTab.value = tab as RequestOptionTabs
+  selectedOptionsTab.value = tab
 })
 </script>

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

@@ -145,8 +145,13 @@ const statusCategory = computed(() => {
 
 const inspectionService = useService(InspectionService)
 
-const tabResults = inspectionService.getResultViewFor(
+const allTabResults = inspectionService.tabs
-  currentTabID.value,
+
-  (result) => result.locations.type === "response"
+const tabResults = computed(() => {
-)
+  return (
+    allTabResults.value
+      .get(currentTabID.value)
+      ?.filter((result) => result.locations.type === "response") ?? []
+  )
+})
 </script>

packages/hoppscotch-common/src/helpers/actions.ts

@@ -2,14 +2,12 @@
  * For example, sending a request.
  */
 
-import { Ref, onBeforeUnmount, onMounted, reactive, watch } from "vue"
+import { Ref, onBeforeUnmount, onMounted, watch } from "vue"
 import { BehaviorSubject } from "rxjs"
 import { HoppRESTDocument } from "./rest/document"
 import { HoppGQLRequest, HoppRESTRequest } from "@hoppscotch/data"
 import { RequestOptionTabs } from "~/components/http/RequestOptions.vue"
 import { HoppGQLSaveContext } from "./graphql/document"
-import { GQLOptionTabs } from "~/components/graphql/RequestOptions.vue"
-import { computed } from "vue"
 
 export type HoppAction =
   | "contextmenu.open" // Send/Cancel a Hoppscotch Request
@@ -18,7 +16,7 @@ export type HoppAction =
   | "request.copy-link" // Copy Request Link
   | "request.save" // Save to Collections
   | "request.save-as" // Save As
-  | "request.rename" // Rename request on REST or GraphQL
+  | "rest.request.rename" // Rename
   | "request.method.next" // Select Next Method
   | "request.method.prev" // Select Previous Method
   | "request.method.get" // Select GET Method
@@ -28,11 +26,6 @@ export type HoppAction =
   | "request.method.delete" // Select DELETE Method
   | "request.import-curl" // Import cURL
   | "request.show-code" // Show generated code
-  | "gql.connect" // Connect to GraphQL endpoint given
-  | "gql.disconnect" // Disconnect from GraphQL endpoint given
-  | "tab.close-current" // Close current tab
-  | "tab.close-other" // Close other tabs
-  | "tab.open-new" // Open new tab
   | "collection.new" // Create root collection
   | "flyouts.chat.open" // Shows the keybinds flyout
   | "flyouts.keybinds.toggle" // Shows the keybinds flyout
@@ -113,11 +106,11 @@ type HoppActionArgsMap = {
         request: HoppGQLRequest
       }
   "request.open-tab": {
-    tab: RequestOptionTabs | GQLOptionTabs
+    tab: RequestOptionTabs
   }
 
-  "tab.duplicate-tab": {
+  "request.duplicate-tab": {
-    tabID?: string
+    tabID: string
   }
 
   "gql.request.open": {
@@ -157,7 +150,7 @@ type BoundActionList = {
   [A in HoppAction | HoppActionWithArgs]?: Array<ActionFunc<A>>
 }
 
-const boundActions: BoundActionList = reactive({})
+const boundActions: BoundActionList = {}
 
 export const activeActions$ = new BehaviorSubject<
   (HoppAction | HoppActionWithArgs)[]
@@ -213,15 +206,6 @@ export function unbindAction<A extends HoppAction | HoppActionWithArgs>(
   activeActions$.next(Object.keys(boundActions) as HoppAction[])
 }
 
-/**
- * Returns a ref that indicates whether a given action is bound at a given time
- *
- * @param action The action to check
- */
-export function isActionBound(action: HoppAction): Ref<boolean> {
-  return computed(() => !!boundActions[action])
-}
-
 /**
  * A composable function that defines a component can handle a given
  * HoppAction. The handler will be bound when the component is mounted

packages/hoppscotch-common/src/helpers/keybindings.ts

@@ -56,7 +56,7 @@ export const bindings: {
   "alt-x": "request.method.delete",
   "ctrl-k": "modals.search.toggle",
   "ctrl-/": "flyouts.keybinds.toggle",
-  "shift-/": "modals.support.toggle",
+  "?": "modals.support.toggle",
   "ctrl-m": "modals.share.toggle",
   "alt-r": "navigation.jump.rest",
   "alt-q": "navigation.jump.graphql",
@@ -120,8 +120,7 @@ function generateKeybindingString(ev: KeyboardEvent): ShortcutKey | null {
 }
 
 function getPressedKey(ev: KeyboardEvent): Key | null {
-  const val = ev.code.toLowerCase()
+  const val = ev.key.toLowerCase()
-
   // Check arrow keys
   if (val === "arrowup") return "up"
   else if (val === "arrowdown") return "down"
@@ -129,20 +128,21 @@ function getPressedKey(ev: KeyboardEvent): Key | null {
   else if (val === "arrowright") return "right"
 
   // Check letter keys
-  const isLetter = val.startsWith("key")
+  const isLetter = ev.code.toLowerCase().startsWith("key")
-  if (isLetter) return val.substring(3) as Key
+  if (isLetter) return ev.code.toLowerCase().substring(3) as Key
 
   // Check if number keys
-  const isDigit = val.startsWith("digit")
+  if (val.length === 1 && !isNaN(val as any)) return val as Key
-  if (isDigit) return val.substring(5) as Key
 
-  // Check if slash
+  // Check if question mark
-  if (val === "slash") return "/"
+  if (val === "?") return "?"
+
+  // Check if question mark
+  if (val === "/") return "/"
 
   // Check if period
-  if (val === "period") return "."
+  if (val === ".") return "."
 
-  // Check if enter
   if (val === "enter") return "enter"
 
   // If no other cases match, this is not a valid key

packages/hoppscotch-common/src/helpers/new-codegen/har.ts

@@ -98,11 +98,7 @@ const buildHarPostData = (req: HoppRESTRequest): Har.PostData | undefined => {
   }
 }
 
-export const buildHarRequest = (
+export const buildHarRequest = (req: HoppRESTRequest): Har.Request => {
-  req: HoppRESTRequest
-): Har.Request & {
-  postData: Har.PostData & Exclude<Har.PostData, undefined>
-} => {
   return {
     bodySize: -1, // TODO: It would be cool if we can calculate the body size
     headersSize: -1, // TODO: It would be cool if we can calculate the header size
@@ -112,9 +108,6 @@ export const buildHarRequest = (
     method: req.method,
     queryString: buildHarQueryStrings(req),
     url: req.endpoint,
-    postData: buildHarPostData(req) ?? {
+    postData: buildHarPostData(req),
-      mimeType: "x-unknown",
-      params: [],
-    },
   }
 }

packages/hoppscotch-common/src/helpers/new-codegen/index.ts

@@ -1,4 +1,4 @@
-import { HTTPSnippet } from "httpsnippet"
+import * as HTTPSnippet from "httpsnippet"
 import { HoppRESTRequest } from "@hoppscotch/data"
 import * as O from "fp-ts/Option"
 import * as E from "fp-ts/Either"

packages/hoppscotch-common/src/helpers/rest/tab.ts

@@ -7,7 +7,6 @@ import { HoppRESTResponse } from "../types/HoppRESTResponse"
 import { getDefaultRESTRequest } from "./default"
 import { HoppTestResult } from "../types/HoppTestResult"
 import { platform } from "~/platform"
-import { nextTick } from "vue"
 
 export type HoppRESTTab = {
   id: string
@@ -179,9 +178,7 @@ export function closeTab(tabID: string) {
 
   tabOrdering.value.splice(tabOrdering.value.indexOf(tabID), 1)
 
-  nextTick(() => {
+  tabMap.delete(tabID)
-    tabMap.delete(tabID)
-  })
 }
 
 export function closeOtherTabs(tabID: string) {

packages/hoppscotch-common/src/index.ts

@@ -28,7 +28,6 @@ export function createHoppApp(el: string | Element, platformDef: PlatformDef) {
   performMigrations()
 
   HOPP_MODULES.forEach((mod) => mod.onVueAppInit?.(app))
-  platformDef.addedHoppModules?.forEach((mod) => mod.onVueAppInit?.(app))
 
   app.mount(el)
 

packages/hoppscotch-common/src/modules/crisp.ts

@@ -0,0 +1,32 @@
+import { HoppModule } from "."
+
+export const showChat = () => {
+  ;(window as any).$crisp.push([
+    "do",
+    "chat:show",
+    (window as any).$crisp.push(["do", "chat:open"]),
+  ])
+}
+
+export default <HoppModule>{
+  onVueAppInit() {
+    // TODO: Env variable this ?
+    ;(window as any).$crisp = []
+    ;(window as any).CRISP_WEBSITE_ID = "3ad30257-c192-4773-955d-fb05a4b41af3"
+
+    const d = document
+    const s = d.createElement("script")
+
+    s.src = "https://client.crisp.chat/l.js"
+    s.async = true
+    d.getElementsByTagName("head")[0].appendChild(s)
+    ;(window as any).$crisp.push(["do", "chat:hide"])
+    ;(window as any).$crisp.push([
+      "on",
+      "chat:closed",
+      () => {
+        ;(window as any).$crisp.push(["do", "chat:hide"])
+      },
+    ])
+  },
+}

packages/hoppscotch-common/src/modules/router.ts

@@ -53,9 +53,6 @@ export default <HoppModule>{
       HOPP_MODULES.forEach((mod) => {
         mod.onBeforeRouteChange?.(to, from, router)
       })
-      platform.addedHoppModules?.forEach((mod) => {
-        mod.onBeforeRouteChange?.(to, from, router)
-      })
     })
 
     // Instead of this a better architecture is for the router
@@ -69,14 +66,10 @@ export default <HoppModule>{
       HOPP_MODULES.forEach((mod) => {
         mod.onAfterRouteChange?.(to, router)
       })
-      platform.addedHoppModules?.forEach((mod) => {
-        mod.onAfterRouteChange?.(to, router)
-      })
     })
 
     app.use(router)
 
     HOPP_MODULES.forEach((mod) => mod.onRouterInit?.(app, router))
-    platform.addedHoppModules?.forEach((mod) => mod.onRouterInit?.(app, router))
   },
 }

packages/hoppscotch-common/src/pages/graphql.vue

@@ -27,7 +27,7 @@
                 @open-rename-modal="openReqRenameModal(tab)"
                 @close-tab="removeTab(tab.id)"
                 @close-other-tabs="closeOtherTabsAction(tab.id)"
-                @duplicate-tab="duplicateTab(tab.id)"
+                @duplicate-tab="duplicateTab(tab)"
               />
             </template>
 
@@ -203,15 +203,12 @@ const renameReqName = () => {
   showRenamingReqNameModalForTabID.value = undefined
 }
 
-const duplicateTab = (tabID: string) => {
+const duplicateTab = (tab: HoppGQLTab) => {
-  const tab = getTabRef(tabID)
+  const newTab = createNewTab({
-  if (tab.value) {
+    request: tab.document.request,
-    const newTab = createNewTab({
+    isDirty: true,
-      request: tab.value.document.request,
+  })
-      isDirty: true,
+  currentTabID.value = newTab.id
-    })
-    currentTabID.value = newTab.id
-  }
 }
 
 defineActionHandler("gql.request.open", ({ request, saveContext }) => {
@@ -221,19 +218,4 @@ defineActionHandler("gql.request.open", ({ request, saveContext }) => {
     isDirty: false,
   })
 })
-
-defineActionHandler("request.rename", () => {
-  openReqRenameModal(getTabRef(currentTabID.value).value!)
-})
-
-defineActionHandler("tab.duplicate-tab", ({ tabID }) => {
-  duplicateTab(tabID ?? currentTabID.value)
-})
-defineActionHandler("tab.close-current", () => {
-  removeTab(currentTabID.value)
-})
-defineActionHandler("tab.close-other", () => {
-  closeOtherTabs(currentTabID.value)
-})
-defineActionHandler("tab.open-new", addNewTab)
 </script>

packages/hoppscotch-common/src/pages/index.vue

@@ -94,7 +94,7 @@
 </template>
 
 <script lang="ts" setup>
-import { ref, onMounted, onBeforeUnmount, onBeforeMount } from "vue"
+import { ref, onMounted, onBeforeUnmount, onBeforeMount, watch } from "vue"
 import { safelyExtractRESTRequest } from "@hoppscotch/data"
 import { translateExtURLParams } from "~/helpers/RESTExtURLParams"
 import { useRoute } from "vue-router"
@@ -140,6 +140,7 @@ import { useService } from "dioc/vue"
 import { InspectionService } from "~/services/inspection"
 import { HeaderInspectorService } from "~/services/inspection/inspectors/header.inspector"
 import { EnvironmentInspectorService } from "~/services/inspection/inspectors/environment.inspector"
+import { URLInspectorService } from "~/services/inspection/inspectors/url.inspector"
 import { ResponseInspectorService } from "~/services/inspection/inspectors/response.inspector"
 
 const savingRequest = ref(false)
@@ -214,8 +215,6 @@ const sortTabs = (e: { oldIndex: number; newIndex: number }) => {
   updateTabOrdering(e.oldIndex, e.newIndex)
 }
 
-const inspectionService = useService(InspectionService)
-
 const removeTab = (tabID: string) => {
   const tabState = getTabRef(tabID).value
 
@@ -461,22 +460,22 @@ defineActionHandler("rest.request.open", ({ doc }) => {
   createNewTab(doc)
 })
 
-defineActionHandler("request.rename", openReqRenameModal)
+defineActionHandler("rest.request.rename", openReqRenameModal)
-defineActionHandler("tab.duplicate-tab", ({ tabID }) => {
+defineActionHandler("request.duplicate-tab", ({ tabID }) => {
-  duplicateTab(tabID ?? currentTabID.value)
+  duplicateTab(tabID)
 })
-defineActionHandler("tab.close-current", () => {
-  removeTab(currentTabID.value)
-})
-defineActionHandler("tab.close-other", () => {
-  closeOtherTabs(currentTabID.value)
-})
-defineActionHandler("tab.open-new", addNewTab)
 
+const inspectionService = useService(InspectionService)
 useService(HeaderInspectorService)
 useService(EnvironmentInspectorService)
+useService(URLInspectorService)
 useService(ResponseInspectorService)
-for (const inspectorDef of platform.additionalInspectors ?? []) {
+
-  useService(inspectorDef.service)
+watch(
-}
+  () => currentTabID.value,
+  () => {
+    inspectionService.initializeTabInspectors()
+  },
+  { immediate: true }
+)
 </script>

packages/hoppscotch-common/src/platform/index.ts

@@ -7,12 +7,9 @@ import { HistoryPlatformDef } from "./history"
 import { TabStatePlatformDef } from "./tab"
 import { AnalyticsPlatformDef } from "./analytics"
 import { InterceptorsPlatformDef } from "./interceptors"
-import { HoppModule } from "~/modules"
-import { InspectorsPlatformDef } from "./inspectors"
 
 export type PlatformDef = {
   ui?: UIPlatformDef
-  addedHoppModules?: HoppModule[]
   auth: AuthPlatformDef
   analytics?: AnalyticsPlatformDef
   sync: {
@@ -23,7 +20,6 @@ export type PlatformDef = {
     tabState: TabStatePlatformDef
   }
   interceptors: InterceptorsPlatformDef
-  additionalInspectors?: InspectorsPlatformDef
   platformFeatureFlags: {
     exportAsGIST: boolean
   }

packages/hoppscotch-common/src/platform/inspectors.ts

@@ -1,16 +0,0 @@
-import { Service } from "dioc"
-import { Inspector } from "~/services/inspection"
-
-/**
- * Defines an added interceptor by the platform
- */
-export type PlatformInspectorsDef = {
-  // We are keeping this as the only mode for now
-  // So that if we choose to add other modes, we can do without breaking
-  type: "service"
-  service: typeof Service<unknown> & { ID: string } & {
-    new (): Service & Inspector
-  }
-}
-
-export type InspectorsPlatformDef = PlatformInspectorsDef[]

packages/hoppscotch-common/src/platform/std/inspections/extension.inspector.ts

@@ -1,107 +0,0 @@
-import { Service } from "dioc"
-import {
-  InspectionService,
-  Inspector,
-  InspectorResult,
-} from "~/services/inspection"
-import { getI18n } from "~/modules/i18n"
-import { HoppRESTRequest } from "@hoppscotch/data"
-import { computed, markRaw } from "vue"
-import IconAlertTriangle from "~icons/lucide/alert-triangle"
-import { Ref } from "vue"
-import { InterceptorService } from "~/services/interceptor.service"
-import { ExtensionInterceptorService } from "~/platform/std/interceptors/extension"
-
-/**
- * This inspector is responsible for inspecting the URL of a request.
- * It checks if the URL contains localhost and if the extension is installed.
- * It also provides an action to enable the extension.
- *
- * NOTE: Initializing this service registers it as a inspector with the Inspection Service.
- */
-export class ExtensionInspectorService extends Service implements Inspector {
-  public static readonly ID = "EXTENSION_INSPECTOR_SERVICE"
-
-  private t = getI18n()
-
-  public readonly inspectorID = "extension"
-
-  private readonly interceptorService = this.bind(InterceptorService)
-  private readonly extensionService = this.bind(ExtensionInterceptorService)
-
-  private readonly inspection = this.bind(InspectionService)
-
-  constructor() {
-    super()
-
-    this.inspection.registerInspector(this)
-  }
-
-  getInspections(req: Readonly<Ref<HoppRESTRequest>>) {
-    const currentExtensionStatus = this.extensionService.extensionStatus
-
-    const isExtensionInstalled = computed(
-      () => currentExtensionStatus.value === "available"
-    )
-
-    const EXTENSIONS_ENABLED = computed(
-      () => this.interceptorService.currentInterceptorID.value === "extension"
-    )
-
-    return computed(() => {
-      const results: InspectorResult[] = []
-
-      const url = req.value.endpoint
-      const localHostURLs = ["localhost", "127.0.0.1"]
-
-      const isContainLocalhost = localHostURLs.some((host) =>
-        url.includes(host)
-      )
-
-      if (
-        isContainLocalhost &&
-        (!EXTENSIONS_ENABLED.value || !isExtensionInstalled.value)
-      ) {
-        let text
-
-        if (!isExtensionInstalled.value) {
-          if (currentExtensionStatus.value === "unknown-origin") {
-            text = this.t("inspections.url.extension_unknown_origin")
-          } else {
-            text = this.t("inspections.url.extension_not_installed")
-          }
-        } else if (!EXTENSIONS_ENABLED.value) {
-          text = this.t("inspections.url.extention_not_enabled")
-        } else {
-          text = this.t("inspections.url.localhost")
-        }
-
-        results.push({
-          id: "url",
-          icon: markRaw(IconAlertTriangle),
-          text: {
-            type: "text",
-            text: text,
-          },
-          action: {
-            text: this.t("inspections.url.extention_enable_action"),
-            apply: () => {
-              this.interceptorService.currentInterceptorID.value = "extension"
-            },
-          },
-          severity: 2,
-          isApplicable: true,
-          locations: {
-            type: "url",
-          },
-          doc: {
-            text: this.t("action.learn_more"),
-            link: "https://docs.hoppscotch.io/documentation/features/interceptor#browser-extension",
-          },
-        })
-      }
-
-      return results
-    })
-  }
-}

packages/hoppscotch-common/src/platform/std/ui/footerItem.ts

@@ -1,25 +0,0 @@
-import { HoppFooterMenuItem } from "../../ui"
-import IconGift from "~icons/lucide/gift"
-import IconActivity from "~icons/lucide/activity"
-
-export const whatsNew: HoppFooterMenuItem = {
-  id: "whats-new",
-  text: (t) => t("app.whats_new"),
-  icon: IconGift,
-  action: {
-    type: "link",
-    href: "https://docs.hoppscotch.io/documentation/changelog",
-  },
-}
-
-export const status: HoppFooterMenuItem = {
-  id: "status",
-  text: (t) => t("app.status"),
-  icon: IconActivity,
-  action: {
-    type: "link",
-    href: "https://status.hoppscotch.io",
-  },
-}
-
-export const stdFooterItems = [whatsNew, status]

packages/hoppscotch-common/src/platform/std/ui/supportOptionsItem.ts

@@ -1,110 +0,0 @@
-import { invokeAction } from "~/helpers/actions"
-import { HoppSupportOptionsMenuItem } from "~/platform/ui"
-import IconBook from "~icons/lucide/book"
-import IconGift from "~icons/lucide/gift"
-import IconZap from "~icons/lucide/zap"
-import IconGitHub from "~icons/lucide/github"
-import IconTwitter from "~icons/brands/twitter"
-import IconDiscord from "~icons/brands/discord"
-import IconUserPlus from "~icons/lucide/user-plus"
-
-export const documentation: HoppSupportOptionsMenuItem = {
-  id: "documentation",
-  text: (t) => t("app.documentation"),
-  subtitle: (t) => t("support.documentation"),
-  icon: IconBook,
-  action: {
-    type: "link",
-    href: "https://docs.hoppscotch.io",
-  },
-}
-
-export const shortcuts: HoppSupportOptionsMenuItem = {
-  id: "shortcuts",
-  text: (t) => t("app.keyboard_shortcuts"),
-  subtitle: (t) => t("support.shortcuts"),
-  icon: IconZap,
-  action: {
-    type: "custom",
-    do() {
-      invokeAction("flyouts.keybinds.toggle")
-    },
-  },
-}
-
-export const changelog: HoppSupportOptionsMenuItem = {
-  id: "changelog",
-  text: (t) => t("app.whats_new"),
-  subtitle: (t) => t("support.changelog"),
-  icon: IconGift,
-  action: {
-    type: "link",
-    href: "https://docs.hoppscotch.io/documentation/changelog",
-  },
-}
-
-export const github: HoppSupportOptionsMenuItem = {
-  id: "github",
-  text: (t) => t("app.github"),
-  subtitle: (t) => t("support.github"),
-  icon: IconGitHub,
-  action: {
-    type: "link",
-    href: "https://hoppscotch.io/github",
-  },
-}
-
-export const discord: HoppSupportOptionsMenuItem = {
-  id: "discord",
-  text: (t) => t("app.join_discord_community"),
-  subtitle: (t) => t("support.community"),
-  icon: IconDiscord,
-  action: {
-    type: "link",
-    href: "https://hoppscotch.io/discord",
-  },
-}
-
-export const twitter: HoppSupportOptionsMenuItem = {
-  id: "discord",
-  text: (t) => t("app.twitter"),
-  subtitle: (t) => t("support.twitter"),
-  icon: IconTwitter,
-  action: {
-    type: "link",
-    href: "https://hoppscotch.io/discord",
-  },
-}
-
-export const invite: HoppSupportOptionsMenuItem = {
-  id: "invite",
-  text: (t) => t("app.invite"),
-  subtitle: (t) => t("shortcut.miscellaneous.invite"),
-  icon: IconUserPlus,
-  action: {
-    type: "custom",
-    do() {
-      if (navigator.share) {
-        navigator
-          .share({
-            title: "Hoppscotch",
-            text: "Hoppscotch • Open source API development ecosystem - Helps you create requests faster, saving precious time on development.",
-            url: "https://hoppscotch.io",
-          })
-          .catch(console.error)
-      } else {
-        // fallback
-      }
-    },
-  },
-}
-
-export const stdSupportOptionItems: HoppSupportOptionsMenuItem[] = [
-  documentation,
-  shortcuts,
-  changelog,
-  github,
-  discord,
-  twitter,
-  invite,
-]

packages/hoppscotch-common/src/platform/ui.ts

@@ -1,20 +1,4 @@
-import { Ref, Component } from "vue"
+import { Ref } from "vue"
-import { getI18n } from "~/modules/i18n"
-
-export type HoppFooterMenuItem = {
-  id: string
-  text: (t: ReturnType<typeof getI18n>) => string
-  icon: Component
-  action: { type: "link"; href: string } | { type: "custom"; do: () => void }
-}
-
-export type HoppSupportOptionsMenuItem = {
-  id: string
-  text: (t: ReturnType<typeof getI18n>) => string
-  subtitle: (t: ReturnType<typeof getI18n>) => string
-  icon: Component
-  action: { type: "link"; href: string } | { type: "custom"; do: () => void }
-}
 
 export type UIPlatformDef = {
   appHeader?: {
@@ -22,15 +6,4 @@ export type UIPlatformDef = {
     paddingLeft?: Ref<string>
   }
   onCodemirrorInstanceMount?: (element: HTMLElement) => void
-
-  /**
-   * Additonal menu items shown in the "Help and Feedback" menu
-   * in the app footer.
-   */
-  additionalFooterMenuItems?: HoppFooterMenuItem[]
-
-  /**
-   * Additional Support Options menu items shown in the app header
-   */
-  additionalSupportOptionsMenuItems?: HoppSupportOptionsMenuItem[]
 }

packages/hoppscotch-common/src/services/context-menu/menu/__tests__/environment.menu.spec.ts

@@ -61,7 +61,7 @@ describe("EnvironmentMenuService", () => {
       expect(actionsMock.invokeAction).toHaveBeenCalledWith(
         "modals.environment.add",
         {
-          envName: "",
+          envName: "test",
           variableName: test,
         }
       )

packages/hoppscotch-common/src/services/context-menu/menu/environment.menu.ts

@@ -42,7 +42,7 @@ export class EnvironmentMenuService extends Service implements ContextMenu {
         icon: markRaw(IconPlusCircle),
         action: () => {
           invokeAction("modals.environment.add", {
-            envName: "",
+            envName: "test",
             variableName: text,
           })
         },

packages/hoppscotch-common/src/services/inspection/__tests__/index.spec.ts

@@ -1,7 +1,6 @@
 import { describe, it, expect } from "vitest"
 import { Inspector, InspectionService, InspectorResult } from "../"
 import { TestContainer } from "dioc/testing"
-import { ref } from "vue"
 
 const inspectorResultMock: InspectorResult[] = [
   {
@@ -22,7 +21,7 @@ const inspectorResultMock: InspectorResult[] = [
 
 const testInspector: Inspector = {
   inspectorID: "inspector1",
-  getInspections: () => ref(inspectorResultMock),
+  getInspectorFor: () => inspectorResultMock,
 }
 
 describe("InspectionService", () => {

packages/hoppscotch-common/src/services/inspection/index.ts

@@ -1,9 +1,7 @@
 import { HoppRESTRequest } from "@hoppscotch/data"
-import { refDebounced } from "@vueuse/core"
 import { Service } from "dioc"
-import { computed, markRaw, reactive } from "vue"
 import { Component, Ref, ref, watch } from "vue"
-import { currentActiveTab } from "~/helpers/rest/tab"
+import { currentActiveTab, currentTabID } from "~/helpers/rest/tab"
 import { HoppRESTResponse } from "~/helpers/types/HoppRESTResponse"
 
 /**
@@ -82,16 +80,15 @@ export interface Inspector {
    */
   inspectorID: string
   /**
-   * Returns the inspector results for the request.
+   * Returns the inspector results for the request
-   * NOTE: The refs passed down are readonly and are debounced to avoid performance issues
+   * @param req The request to inspect
-   * @param req The ref to the request to inspect
+   * @param res The response to inspect
-   * @param res The ref to the response to inspect
+   * @returns The inspector results
-   * @returns The ref to the inspector results
    */
-  getInspections: (
+  getInspectorFor: (
-    req: Readonly<Ref<HoppRESTRequest>>,
+    req: HoppRESTRequest,
-    res: Readonly<Ref<HoppRESTResponse | null | undefined>>
+    res?: HoppRESTResponse
-  ) => Ref<InspectorResult[]>
+  ) => InspectorResult[]
 }
 
 /**
@@ -101,73 +98,38 @@ export interface Inspector {
 export class InspectionService extends Service {
   public static readonly ID = "INSPECTION_SERVICE"
 
-  private inspectors: Map<string, Inspector> = reactive(new Map())
+  private inspectors: Map<string, Inspector> = new Map()
 
-  private tabs: Ref<Map<string, InspectorResult[]>> = ref(new Map())
+  public tabs: Ref<Map<string, InspectorResult[]>> = ref(new Map())
-
-  constructor() {
-    super()
-
-    this.initializeListeners()
-  }
 
   /**
    * Registers a inspector with the inspection service
    * @param inspector The inspector instance to register
    */
   public registerInspector(inspector: Inspector) {
-    // markRaw is required here so that the inspector is not made reactive
+    this.inspectors.set(inspector.inspectorID, inspector)
-    this.inspectors.set(inspector.inspectorID, markRaw(inspector))
   }
 
-  private initializeListeners() {
+  public initializeTabInspectors() {
     watch(
-      () => [this.inspectors.entries(), currentActiveTab.value.id],
+      currentActiveTab.value,
-      () => {
+      (tab) => {
-        const reqRef = computed(() => currentActiveTab.value.document.request)
+        if (!tab) return
-        const resRef = computed(() => currentActiveTab.value.response)
+        const req = currentActiveTab.value.document.request
-
+        const res = currentActiveTab.value.response
-        const debouncedReq = refDebounced(reqRef, 1000, { maxWait: 2000 })
+        const inspectors = Array.from(this.inspectors.values()).map((x) =>
-        const debouncedRes = refDebounced(resRef, 1000, { maxWait: 2000 })
+          x.getInspectorFor(req, res)
-
-        const inspectorRefs = Array.from(this.inspectors.values()).map((x) =>
-          x.getInspections(debouncedReq, debouncedRes)
         )
-
+        this.tabs.value.set(
-        const activeInspections = computed(() =>
+          currentTabID.value,
-          inspectorRefs.flatMap((x) => x!.value)
+          inspectors.flatMap((x) => x)
-        )
-
-        watch(
-          () => [...inspectorRefs.flatMap((x) => x!.value)],
-          () => {
-            this.tabs.value.set(
-              currentActiveTab.value.id,
-              activeInspections.value
-            )
-          },
-          { immediate: true }
         )
       },
-      { immediate: true, flush: "pre" }
+      { immediate: true, deep: true }
     )
   }
 
   public deleteTabInspectorResult(tabID: string) {
-    // TODO: Move Tabs into a service and implement this with an event instead
     this.tabs.value.delete(tabID)
   }
-
-  /**
-   * Returns a reactive view into the inspector results for a specific tab
-   * @param tabID The ID of the tab to get the results for
-   * @param filter The filter to apply to the results.
-   * @returns The ref into the inspector results, if the tab doesn't exist, a ref into an empty array is returned
-   */
-  public getResultViewFor(
-    tabID: string,
-    filter: (x: InspectorResult) => boolean = () => true
-  ) {
-    return computed(() => this.tabs.value.get(tabID)?.filter(filter) ?? [])
-  }
 }

packages/hoppscotch-common/src/services/inspection/inspectors/__tests__/environment.inspector.spec.ts

@@ -3,23 +3,16 @@ import { describe, expect, it, vi } from "vitest"
 import { EnvironmentInspectorService } from "../environment.inspector"
 import { InspectionService } from "../../index"
 import { getDefaultRESTRequest } from "~/helpers/rest/default"
-import { ref } from "vue"
 
 vi.mock("~/modules/i18n", () => ({
   __esModule: true,
   getI18n: () => (x: string) => x,
 }))
 
-vi.mock("~/newstore/environments", async () => {
+vi.mock("~/newstore/environments", () => ({
-  const { BehaviorSubject }: any = await vi.importActual("rxjs")
+  __esModule: true,
-
+  getAggregateEnvs: () => [{ key: "EXISTING_ENV_VAR", value: "test_value" }],
-  return {
+}))
-    __esModule: true,
-    aggregateEnvs$: new BehaviorSubject([
-      { key: "EXISTING_ENV_VAR", value: "test_value" },
-    ]),
-  }
-})
 
 describe("EnvironmentInspectorService", () => {
   it("registers with the inspection service upon initialization", () => {
@@ -42,14 +35,14 @@ describe("EnvironmentInspectorService", () => {
       const container = new TestContainer()
       const envInspector = container.bind(EnvironmentInspectorService)
 
-      const req = ref({
+      const req = {
         ...getDefaultRESTRequest(),
         endpoint: "<<UNDEFINED_ENV_VAR>>",
-      })
+      }
 
-      const result = envInspector.getInspections(req)
+      const result = envInspector.getInspectorFor(req)
 
-      expect(result.value).toContainEqual(
+      expect(result).toContainEqual(
         expect.objectContaining({
           id: "environment",
           isApplicable: true,
@@ -65,31 +58,31 @@ describe("EnvironmentInspectorService", () => {
       const container = new TestContainer()
       const envInspector = container.bind(EnvironmentInspectorService)
 
-      const req = ref({
+      const req = {
         ...getDefaultRESTRequest(),
         endpoint: "<<EXISTING_ENV_VAR>>",
-      })
+      }
 
-      const result = envInspector.getInspections(req)
+      const result = envInspector.getInspectorFor(req)
 
-      expect(result.value).toHaveLength(0)
+      expect(result).toHaveLength(0)
     })
 
     it("should return an inspector result when the headers contain undefined environment variables", () => {
       const container = new TestContainer()
       const envInspector = container.bind(EnvironmentInspectorService)
 
-      const req = ref({
+      const req = {
         ...getDefaultRESTRequest(),
         endpoint: "http://example.com/api/data",
         headers: [
           { key: "<<UNDEFINED_ENV_VAR>>", value: "some-value", active: true },
         ],
-      })
+      }
 
-      const result = envInspector.getInspections(req)
+      const result = envInspector.getInspectorFor(req)
 
-      expect(result.value).toContainEqual(
+      expect(result).toContainEqual(
         expect.objectContaining({
           id: "environment",
           isApplicable: true,
@@ -105,34 +98,34 @@ describe("EnvironmentInspectorService", () => {
       const container = new TestContainer()
       const envInspector = container.bind(EnvironmentInspectorService)
 
-      const req = ref({
+      const req = {
         ...getDefaultRESTRequest(),
         endpoint: "http://example.com/api/data",
         headers: [
           { key: "<<EXISTING_ENV_VAR>>", value: "some-value", active: true },
         ],
-      })
+      }
 
-      const result = envInspector.getInspections(req)
+      const result = envInspector.getInspectorFor(req)
 
-      expect(result.value).toHaveLength(0)
+      expect(result).toHaveLength(0)
     })
 
     it("should return an inspector result when the params contain undefined environment variables", () => {
       const container = new TestContainer()
       const envInspector = container.bind(EnvironmentInspectorService)
 
-      const req = ref({
+      const req = {
         ...getDefaultRESTRequest(),
         endpoint: "http://example.com/api/data",
         params: [
           { key: "<<UNDEFINED_ENV_VAR>>", value: "some-value", active: true },
         ],
-      })
+      }
 
-      const result = envInspector.getInspections(req)
+      const result = envInspector.getInspectorFor(req)
 
-      expect(result.value).toContainEqual(
+      expect(result).toContainEqual(
         expect.objectContaining({
           id: "environment",
           isApplicable: true,
@@ -148,18 +141,18 @@ describe("EnvironmentInspectorService", () => {
       const container = new TestContainer()
       const envInspector = container.bind(EnvironmentInspectorService)
 
-      const req = ref({
+      const req = {
         ...getDefaultRESTRequest(),
         endpoint: "http://example.com/api/data",
         headers: [],
         params: [
           { key: "<<EXISTING_ENV_VAR>>", value: "some-value", active: true },
         ],
-      })
+      }
 
-      const result = envInspector.getInspections(req)
+      const result = envInspector.getInspectorFor(req)
 
-      expect(result.value).toHaveLength(0)
+      expect(result).toHaveLength(0)
     })
   })
 })

packages/hoppscotch-common/src/services/inspection/inspectors/__tests__/header.inspector.spec.ts

@@ -3,7 +3,6 @@ import { describe, expect, it, vi } from "vitest"
 import { HeaderInspectorService } from "../header.inspector"
 import { InspectionService } from "../../index"
 import { getDefaultRESTRequest } from "~/helpers/rest/default"
-import { ref } from "vue"
 
 vi.mock("~/modules/i18n", () => ({
   __esModule: true,
@@ -31,15 +30,15 @@ describe("HeaderInspectorService", () => {
       const container = new TestContainer()
       const headerInspector = container.bind(HeaderInspectorService)
 
-      const req = ref({
+      const req = {
         ...getDefaultRESTRequest(),
         endpoint: "http://example.com/api/data",
         headers: [{ key: "Cookie", value: "some-cookie", active: true }],
-      })
+      }
 
-      const result = headerInspector.getInspections(req)
+      const result = headerInspector.getInspectorFor(req)
 
-      expect(result.value).toContainEqual(
+      expect(result).toContainEqual(
         expect.objectContaining({ id: "header", isApplicable: true })
       )
     })
@@ -48,15 +47,15 @@ describe("HeaderInspectorService", () => {
       const container = new TestContainer()
       const headerInspector = container.bind(HeaderInspectorService)
 
-      const req = ref({
+      const req = {
         ...getDefaultRESTRequest(),
         endpoint: "http://example.com/api/data",
         headers: [{ key: "Authorization", value: "Bearer abcd", active: true }],
-      })
+      }
 
-      const result = headerInspector.getInspections(req)
+      const result = headerInspector.getInspectorFor(req)
 
-      expect(result.value).toHaveLength(0)
+      expect(result).toHaveLength(0)
     })
   })
 })

packages/hoppscotch-common/src/services/inspection/inspectors/__tests__/response.inspector.spec.ts

@@ -1,245 +0,0 @@
-import { TestContainer } from "dioc/testing"
-import { describe, expect, it, beforeEach, afterEach, vi } from "vitest"
-import { ResponseInspectorService } from "../response.inspector"
-import { InspectionService } from "../../index"
-import { getDefaultRESTRequest } from "~/helpers/rest/default"
-import { ref } from "vue"
-import { HoppRESTResponse } from "~/helpers/types/HoppRESTResponse"
-
-vi.mock("~/modules/i18n", () => ({
-  __esModule: true,
-  getI18n: () => (x: string) => x,
-}))
-
-describe("ResponseInspectorService", () => {
-  beforeEach(() => {
-    vi.stubGlobal("navigator", {
-      onLine: true,
-    })
-  })
-
-  afterEach(() => {
-    vi.unstubAllGlobals()
-  })
-
-  it("registers with the inspection service upon initialization", () => {
-    const container = new TestContainer()
-
-    const registerInspectorFn = vi.fn()
-
-    container.bindMock(InspectionService, {
-      registerInspector: registerInspectorFn,
-    })
-
-    const responseInspector = container.bind(ResponseInspectorService)
-
-    expect(registerInspectorFn).toHaveBeenCalledOnce()
-    expect(registerInspectorFn).toHaveBeenCalledWith(responseInspector)
-  })
-
-  describe("getInspectorFor", () => {
-    it("should return an empty array when response is undefined", () => {
-      const container = new TestContainer()
-      const responseInspector = container.bind(ResponseInspectorService)
-
-      const req = ref({
-        ...getDefaultRESTRequest(),
-        endpoint: "http://example.com/api/data",
-      })
-
-      const result = responseInspector.getInspections(req, ref(undefined))
-
-      expect(result.value).toHaveLength(0)
-    })
-
-    it("should return an inspector result when response type is not success or status code is not 200 and if the network is not available", () => {
-      const container = new TestContainer()
-      const responseInspector = container.bind(ResponseInspectorService)
-
-      const req = ref({
-        ...getDefaultRESTRequest(),
-        endpoint: "http://example.com/api/data",
-      })
-      const res = ref<HoppRESTResponse>({
-        type: "network_fail",
-        error: new Error("test"),
-        req: req.value,
-      })
-
-      vi.stubGlobal("navigator", {
-        onLine: false,
-      })
-
-      const result = responseInspector.getInspections(req, res)
-
-      expect(result.value).toContainEqual(
-        expect.objectContaining({ id: "url", isApplicable: true })
-      )
-    })
-
-    it("should return no inspector result when response type is not success or status code is not 200 and if the network is not available", () => {
-      const container = new TestContainer()
-      const responseInspector = container.bind(ResponseInspectorService)
-
-      const req = ref({
-        ...getDefaultRESTRequest(),
-        endpoint: "http://example.com/api/data",
-      })
-      const res = ref<HoppRESTResponse>({
-        type: "network_fail",
-        error: new Error("test"),
-        req: req.value,
-      })
-
-      const result = responseInspector.getInspections(req, res)
-
-      expect(result.value).toHaveLength(0)
-    })
-
-    it("should handle network_fail responses and return nothing when no network is present", () => {
-      const container = new TestContainer()
-      const responseInspector = container.bind(ResponseInspectorService)
-
-      const req = ref({
-        ...getDefaultRESTRequest(),
-        endpoint: "http://example.com/api/data",
-      })
-      const res = ref<HoppRESTResponse>({
-        type: "network_fail",
-        error: new Error("test"),
-        req: req.value,
-      })
-
-      vi.stubGlobal("navigator", {
-        onLine: false,
-      })
-
-      const result = responseInspector.getInspections(req, res)
-
-      expect(result.value).toContainEqual(
-        expect.objectContaining({
-          text: { type: "text", text: "inspections.response.network_error" },
-        })
-      )
-    })
-
-    it("should handle network_fail responses and return nothing when network is present", () => {
-      const container = new TestContainer()
-      const responseInspector = container.bind(ResponseInspectorService)
-
-      const req = ref({
-        ...getDefaultRESTRequest(),
-        endpoint: "http://example.com/api/data",
-      })
-      const res = ref<HoppRESTResponse>({
-        type: "network_fail",
-        error: new Error("test"),
-        req: req.value,
-      })
-
-      const result = responseInspector.getInspections(req, res)
-
-      expect(result.value).toHaveLength(0)
-    })
-
-    it("should handle fail responses", () => {
-      const container = new TestContainer()
-      const responseInspector = container.bind(ResponseInspectorService)
-
-      const req = ref({
-        ...getDefaultRESTRequest(),
-        endpoint: "http://example.com/api/data",
-      })
-      const res = ref<HoppRESTResponse>({
-        type: "fail",
-        statusCode: 500,
-        body: Uint8Array.from([]),
-        headers: [],
-        meta: { responseDuration: 0, responseSize: 0 },
-        req: req.value,
-      })
-
-      const result = responseInspector.getInspections(req, res)
-
-      expect(result.value).toContainEqual(
-        expect.objectContaining({
-          text: { type: "text", text: "inspections.response.default_error" },
-        })
-      )
-    })
-
-    it("should handle 404 responses", () => {
-      const container = new TestContainer()
-      const responseInspector = container.bind(ResponseInspectorService)
-
-      const req = ref({
-        ...getDefaultRESTRequest(),
-        endpoint: "http://example.com/api/data",
-      })
-      const res = ref<HoppRESTResponse>({
-        type: "success",
-        statusCode: 404,
-        body: Uint8Array.from([]),
-        headers: [],
-        meta: { responseDuration: 0, responseSize: 0 },
-        req: req.value,
-      })
-
-      const result = responseInspector.getInspections(req, res)
-
-      expect(result.value).toContainEqual(
-        expect.objectContaining({
-          text: { type: "text", text: "inspections.response.404_error" },
-        })
-      )
-    })
-
-    it("should handle 401 responses", () => {
-      const container = new TestContainer()
-      const responseInspector = container.bind(ResponseInspectorService)
-
-      const req = ref({
-        ...getDefaultRESTRequest(),
-        endpoint: "http://example.com/api/data",
-      })
-      const res = ref<HoppRESTResponse>({
-        type: "success",
-        statusCode: 401,
-        body: Uint8Array.from([]),
-        headers: [],
-        meta: { responseDuration: 0, responseSize: 0 },
-        req: req.value,
-      })
-
-      const result = responseInspector.getInspections(req, res)
-
-      expect(result.value).toContainEqual(
-        expect.objectContaining({
-          text: { type: "text", text: "inspections.response.401_error" },
-        })
-      )
-    })
-
-    it("should handle successful responses", () => {
-      const container = new TestContainer()
-      const responseInspector = container.bind(ResponseInspectorService)
-
-      const req = ref({
-        ...getDefaultRESTRequest(),
-        endpoint: "http://example.com/api/data",
-      })
-      const res = ref<HoppRESTResponse>({
-        type: "success",
-        statusCode: 200,
-        body: Uint8Array.from([]),
-        headers: [],
-        meta: { responseDuration: 0, responseSize: 0 },
-        req: req.value,
-      })
-
-      const result = responseInspector.getInspections(req, res)
-
-      expect(result.value).toHaveLength(0)
-    })
-  })
-})

packages/hoppscotch-common/src/services/inspection/inspectors/__tests__/response.interceptor.spec.ts

@@ -0,0 +1,151 @@
+import { TestContainer } from "dioc/testing"
+import { describe, expect, it, vi } from "vitest"
+import { ResponseInspectorService } from "../response.inspector"
+import { InspectionService } from "../../index"
+import { getDefaultRESTRequest } from "~/helpers/rest/default"
+
+vi.mock("~/modules/i18n", () => ({
+  __esModule: true,
+  getI18n: () => (x: string) => x,
+}))
+
+describe("ResponseInspectorService", () => {
+  it("registers with the inspection service upon initialization", () => {
+    const container = new TestContainer()
+
+    const registerInspectorFn = vi.fn()
+
+    container.bindMock(InspectionService, {
+      registerInspector: registerInspectorFn,
+    })
+
+    const responseInspector = container.bind(ResponseInspectorService)
+
+    expect(registerInspectorFn).toHaveBeenCalledOnce()
+    expect(registerInspectorFn).toHaveBeenCalledWith(responseInspector)
+  })
+
+  describe("getInspectorFor", () => {
+    it("should return an empty array when response is undefined", () => {
+      const container = new TestContainer()
+      const responseInspector = container.bind(ResponseInspectorService)
+
+      const req = {
+        ...getDefaultRESTRequest(),
+        endpoint: "http://example.com/api/data",
+      }
+
+      const result = responseInspector.getInspectorFor(req, undefined)
+
+      expect(result).toHaveLength(0)
+    })
+
+    it("should return an inspector result when response type is not success or status code is not 200", () => {
+      const container = new TestContainer()
+      const responseInspector = container.bind(ResponseInspectorService)
+
+      const req = {
+        ...getDefaultRESTRequest(),
+        endpoint: "http://example.com/api/data",
+      }
+      const res = { type: "network_fail", statusCode: 400 }
+
+      const result = responseInspector.getInspectorFor(req, res)
+
+      expect(result).toContainEqual(
+        expect.objectContaining({ id: "url", isApplicable: true })
+      )
+    })
+
+    it("should handle network_fail responses", () => {
+      const container = new TestContainer()
+      const responseInspector = container.bind(ResponseInspectorService)
+
+      const req = {
+        ...getDefaultRESTRequest(),
+        endpoint: "http://example.com/api/data",
+      }
+      const res = { type: "network_fail", statusCode: 500 }
+
+      const result = responseInspector.getInspectorFor(req, res)
+
+      expect(result).toContainEqual(
+        expect.objectContaining({
+          text: { type: "text", text: "inspections.response.network_error" },
+        })
+      )
+    })
+
+    it("should handle fail responses", () => {
+      const container = new TestContainer()
+      const responseInspector = container.bind(ResponseInspectorService)
+
+      const req = {
+        ...getDefaultRESTRequest(),
+        endpoint: "http://example.com/api/data",
+      }
+      const res = { type: "fail", statusCode: 500 }
+
+      const result = responseInspector.getInspectorFor(req, res)
+
+      expect(result).toContainEqual(
+        expect.objectContaining({
+          text: { type: "text", text: "inspections.response.default_error" },
+        })
+      )
+    })
+
+    it("should handle 404 responses", () => {
+      const container = new TestContainer()
+      const responseInspector = container.bind(ResponseInspectorService)
+
+      const req = {
+        ...getDefaultRESTRequest(),
+        endpoint: "http://example.com/api/data",
+      }
+      const res = { type: "success", statusCode: 404 }
+
+      const result = responseInspector.getInspectorFor(req, res)
+
+      expect(result).toContainEqual(
+        expect.objectContaining({
+          text: { type: "text", text: "inspections.response.404_error" },
+        })
+      )
+    })
+
+    it("should handle 401 responses", () => {
+      const container = new TestContainer()
+      const responseInspector = container.bind(ResponseInspectorService)
+
+      const req = {
+        ...getDefaultRESTRequest(),
+        endpoint: "http://example.com/api/data",
+      }
+      const res = { type: "success", statusCode: 401 }
+
+      const result = responseInspector.getInspectorFor(req, res)
+
+      expect(result).toContainEqual(
+        expect.objectContaining({
+          text: { type: "text", text: "inspections.response.401_error" },
+        })
+      )
+    })
+
+    it("should handle successful responses", () => {
+      const container = new TestContainer()
+      const responseInspector = container.bind(ResponseInspectorService)
+
+      const req = {
+        ...getDefaultRESTRequest(),
+        endpoint: "http://example.com/api/data",
+      }
+      const res = { type: "success", statusCode: 200 }
+
+      const result = responseInspector.getInspectorFor(req, res)
+
+      expect(result).toHaveLength(0)
+    })
+  })
+})

packages/hoppscotch-common/src/services/inspection/inspectors/__tests__/url.inspector.spec.ts

@@ -1,17 +1,15 @@
 import { TestContainer } from "dioc/testing"
 import { describe, expect, it, vi } from "vitest"
-import { ExtensionInspectorService } from "../extension.inspector"
+import { URLInspectorService } from "../url.inspector"
-import { InspectionService } from "~/services/inspection"
+import { InspectionService } from "../../index"
 import { getDefaultRESTRequest } from "~/helpers/rest/default"
-import { ref } from "vue"
-import { ExtensionInterceptorService } from "~/platform/std/interceptors/extension"
 
 vi.mock("~/modules/i18n", () => ({
   __esModule: true,
   getI18n: () => (x: string) => x,
 }))
 
-describe("ExtensionInspectorService", () => {
+describe("URLInspectorService", () => {
   it("registers with the inspection service upon initialization", () => {
     const container = new TestContainer()
 
@@ -21,7 +19,7 @@ describe("ExtensionInspectorService", () => {
       registerInspector: registerInspectorFn,
     })
 
-    const urlInspector = container.bind(ExtensionInspectorService)
+    const urlInspector = container.bind(URLInspectorService)
 
     expect(registerInspectorFn).toHaveBeenCalledOnce()
     expect(registerInspectorFn).toHaveBeenCalledWith(urlInspector)
@@ -30,57 +28,55 @@ describe("ExtensionInspectorService", () => {
   describe("getInspectorFor", () => {
     it("should return an inspector result when localhost is in URL and extension is not available", () => {
       const container = new TestContainer()
-      const urlInspector = container.bind(ExtensionInspectorService)
+      const urlInspector = container.bind(URLInspectorService)
 
-      const req = ref({
+      const req = {
         ...getDefaultRESTRequest(),
         endpoint: "http://localhost:8000/api/data",
-      })
+      }
 
-      const result = urlInspector.getInspections(req)
+      const result = urlInspector.getInspectorFor(req)
 
-      expect(result.value).toContainEqual(
+      expect(result).toContainEqual(
         expect.objectContaining({ id: "url", isApplicable: true })
       )
     })
 
     it("should not return an inspector result when localhost is not in URL", () => {
       const container = new TestContainer()
+      const urlInspector = container.bind(URLInspectorService)
 
-      container.bindMock(ExtensionInterceptorService, {
+      const req = {
-        extensionStatus: ref("unknown-origin" as const),
-      })
-
-      const urlInspector = container.bind(ExtensionInspectorService)
-
-      const req = ref({
         ...getDefaultRESTRequest(),
         endpoint: "http://example.com/api/data",
-      })
+      }
 
-      const result = urlInspector.getInspections(req)
+      const result = urlInspector.getInspectorFor(req)
 
-      expect(result.value).toHaveLength(0)
+      expect(result).toHaveLength(0)
     })
 
     it("should add the correct text to the results when extension is not installed", () => {
-      const container = new TestContainer()
+      vi.mock("~/newstore/HoppExtension", async () => {
+        const { BehaviorSubject }: any = await vi.importActual("rxjs")
 
-      container.bindMock(ExtensionInterceptorService, {
+        return {
-        extensionStatus: ref("waiting" as const),
+          __esModule: true,
+          extensionStatus$: new BehaviorSubject("waiting"),
+        }
       })
+      const container = new TestContainer()
+      const urlInspector = container.bind(URLInspectorService)
 
-      const urlInspector = container.bind(ExtensionInspectorService)
+      const req = {
-
-      const req = ref({
         ...getDefaultRESTRequest(),
         endpoint: "http://localhost:8000/api/data",
-      })
+      }
 
-      const result = urlInspector.getInspections(req)
+      const result = urlInspector.getInspectorFor(req)
 
-      expect(result.value).toHaveLength(1)
+      expect(result).toHaveLength(1)
-      expect(result.value[0]).toMatchObject({
+      expect(result[0]).toMatchObject({
         text: { type: "text", text: "inspections.url.extension_not_installed" },
       })
     })

packages/hoppscotch-common/src/services/inspection/inspectors/environment.inspector.ts

@@ -6,13 +6,11 @@ import {
   InspectorResult,
 } from ".."
 import { Service } from "dioc"
-import { Ref, markRaw } from "vue"
+import { Ref, markRaw, ref } from "vue"
 import IconPlusCircle from "~icons/lucide/plus-circle"
 import { HoppRESTRequest } from "@hoppscotch/data"
-import { aggregateEnvs$ } from "~/newstore/environments"
+import { getAggregateEnvs } from "~/newstore/environments"
 import { invokeAction } from "~/helpers/actions"
-import { computed } from "vue"
-import { useStreamStatic } from "~/composables/stream"
 
 const HOPP_ENVIRONMENT_REGEX = /(<<[a-zA-Z0-9-_]+>>)/g
 
@@ -36,10 +34,6 @@ export class EnvironmentInspectorService extends Service implements Inspector {
 
   private readonly inspection = this.bind(InspectionService)
 
-  private aggregateEnvs = useStreamStatic(aggregateEnvs$, [], () => {
-    /* noop */
-  })[0]
-
   constructor() {
     super()
 
@@ -55,11 +49,11 @@ export class EnvironmentInspectorService extends Service implements Inspector {
    */
   private validateEnvironmentVariables = (
     target: any[],
+    results: Ref<InspectorResult[]>,
     locations: InspectorLocation
   ) => {
-    const newErrors: InspectorResult[] = []
+    const env = getAggregateEnvs()
-
+    const envKeys = env.map((e) => e.key)
-    const envKeys = this.aggregateEnvs.value.map((e) => e.key)
 
     target.forEach((element, index) => {
       if (isENVInString(element)) {
@@ -89,7 +83,7 @@ export class EnvironmentInspectorService extends Service implements Inspector {
               }
             }
             if (!envKeys.includes(formattedExEnv)) {
-              newErrors.push({
+              results.value.push({
                 id: "environment",
                 text: {
                   type: "text",
@@ -102,8 +96,8 @@ export class EnvironmentInspectorService extends Service implements Inspector {
                   text: this.t("inspections.environment.add_environment"),
                   apply: () => {
                     invokeAction("modals.environment.add", {
-                      envName: formattedExEnv,
+                      envName: "test",
-                      variableName: "",
+                      variableName: formattedExEnv,
                     })
                   },
                 },
@@ -120,61 +114,54 @@ export class EnvironmentInspectorService extends Service implements Inspector {
         }
       }
     })
-
-    return newErrors
   }
 
-  getInspections(req: Readonly<Ref<HoppRESTRequest>>) {
+  /**
-    return computed(() => {
+   * Returns the inspector results for the request
-      const results: InspectorResult[] = []
+   * It checks if any env is used in the request ie, url, headers, params
+   * and checks if the env is defined in the environment using the validateEnvironmentVariables function
+   * @param req The request to inspect
+   * @returns The inspector results
+   */
+  getInspectorFor(req: HoppRESTRequest): InspectorResult[] {
+    const results = ref<InspectorResult[]>([])
 
-      const headers = req.value.headers
+    const headers = req.headers
 
-      const params = req.value.params
+    const params = req.params
 
-      results.push(
+    this.validateEnvironmentVariables([req.endpoint], results, {
-        ...this.validateEnvironmentVariables([req.value.endpoint], {
+      type: "url",
-          type: "url",
-        })
-      )
-
-      const headerKeys = Object.values(headers).map((header) => header.key)
-
-      results.push(
-        ...this.validateEnvironmentVariables(headerKeys, {
-          type: "header",
-          position: "key",
-        })
-      )
-
-      const headerValues = Object.values(headers).map((header) => header.value)
-
-      results.push(
-        ...this.validateEnvironmentVariables(headerValues, {
-          type: "header",
-          position: "value",
-        })
-      )
-
-      const paramsKeys = Object.values(params).map((param) => param.key)
-
-      results.push(
-        ...this.validateEnvironmentVariables(paramsKeys, {
-          type: "parameter",
-          position: "key",
-        })
-      )
-
-      const paramsValues = Object.values(params).map((param) => param.value)
-
-      results.push(
-        ...this.validateEnvironmentVariables(paramsValues, {
-          type: "parameter",
-          position: "value",
-        })
-      )
-
-      return results
     })
+
+    const headerKeys = Object.values(headers).map((header) => header.key)
+
+    this.validateEnvironmentVariables(headerKeys, results, {
+      type: "header",
+      position: "key",
+    })
+
+    const headerValues = Object.values(headers).map((header) => header.value)
+
+    this.validateEnvironmentVariables(headerValues, results, {
+      type: "header",
+      position: "value",
+    })
+
+    const paramsKeys = Object.values(params).map((param) => param.key)
+
+    this.validateEnvironmentVariables(paramsKeys, results, {
+      type: "parameter",
+      position: "key",
+    })
+
+    const paramsValues = Object.values(params).map((param) => param.value)
+
+    this.validateEnvironmentVariables(paramsValues, results, {
+      type: "parameter",
+      position: "value",
+    })
+
+    return results.value
   }
 }

packages/hoppscotch-common/src/services/inspection/inspectors/header.inspector.ts

@@ -2,7 +2,7 @@ import { Service } from "dioc"
 import { InspectionService, Inspector, InspectorResult } from ".."
 import { getI18n } from "~/modules/i18n"
 import { HoppRESTRequest } from "@hoppscotch/data"
-import { Ref, computed, markRaw } from "vue"
+import { markRaw, ref } from "vue"
 import IconAlertTriangle from "~icons/lucide/alert-triangle"
 
 /**
@@ -26,50 +26,53 @@ export class HeaderInspectorService extends Service implements Inspector {
     this.inspection.registerInspector(this)
   }
 
-  private cookiesCheck(headerKey: string) {
+  /**
-    const cookieKeywords = ["Cookie", "Set-Cookie", "Cookie2", "Set-Cookie2"]
+   * Checks if the header contains cookies
+   * @param req The request to inspect
+   * @returns The inspector results
+   */
+  getInspectorFor(req: HoppRESTRequest): InspectorResult[] {
+    const results = ref<InspectorResult[]>([])
 
-    return cookieKeywords.includes(headerKey)
+    const cookiesCheck = (headerKey: string) => {
-  }
+      const cookieKeywords = ["Cookie", "Set-Cookie", "Cookie2", "Set-Cookie2"]
 
-  getInspections(req: Readonly<Ref<HoppRESTRequest>>) {
+      return cookieKeywords.includes(headerKey)
-    return computed(() => {
+    }
-      const results: InspectorResult[] = []
 
-      const headers = req.value.headers
+    const headers = req.headers
 
-      const headerKeys = Object.values(headers).map((header) => header.key)
+    const headerKeys = Object.values(headers).map((header) => header.key)
 
-      const isContainCookies = headerKeys.includes("Cookie")
+    const isContainCookies = headerKeys.includes("Cookie")
 
-      if (isContainCookies) {
+    if (isContainCookies) {
-        headerKeys.forEach((headerKey, index) => {
+      headerKeys.forEach((headerKey, index) => {
-          if (this.cookiesCheck(headerKey)) {
+        if (cookiesCheck(headerKey)) {
-            results.push({
+          results.value.push({
-              id: "header",
+            id: "header",
-              icon: markRaw(IconAlertTriangle),
+            icon: markRaw(IconAlertTriangle),
-              text: {
+            text: {
-                type: "text",
+              type: "text",
-                text: this.t("inspections.header.cookie"),
+              text: this.t("inspections.header.cookie"),
-              },
+            },
-              severity: 2,
+            severity: 2,
-              isApplicable: true,
+            isApplicable: true,
-              locations: {
+            locations: {
-                type: "header",
+              type: "header",
-                position: "key",
+              position: "key",
-                key: headerKey,
+              key: headerKey,
-                index: index,
+              index: index,
-              },
+            },
-              doc: {
+            doc: {
-                text: this.t("action.learn_more"),
+              text: this.t("action.learn_more"),
-                link: "https://docs.hoppscotch.io/",
+              link: "https://docs.hoppscotch.io/",
-              },
+            },
-            })
+          })
-          }
+        }
-        })
+      })
-      }
+    }
 
-      return results
+    return results.value
-    })
   }
 }

packages/hoppscotch-common/src/services/inspection/inspectors/response.inspector.ts

@@ -2,11 +2,9 @@ import { Service } from "dioc"
 import { InspectionService, Inspector, InspectorResult } from ".."
 import { getI18n } from "~/modules/i18n"
 import { HoppRESTRequest } from "@hoppscotch/data"
-import { markRaw } from "vue"
+import { markRaw, ref } from "vue"
 import IconAlertTriangle from "~icons/lucide/alert-triangle"
 import { HoppRESTResponse } from "~/helpers/types/HoppRESTResponse"
-import { Ref } from "vue"
-import { computed } from "vue"
 
 /**
  * This inspector is responsible for inspecting the response of a request.
@@ -29,50 +27,47 @@ export class ResponseInspectorService extends Service implements Inspector {
     this.inspection.registerInspector(this)
   }
 
-  getInspections(
+  getInspectorFor(
-    _req: Readonly<Ref<HoppRESTRequest>>,
+    req: HoppRESTRequest,
-    res: Readonly<Ref<HoppRESTResponse | null | undefined>>
+    res: HoppRESTResponse | undefined
-  ) {
+  ): InspectorResult[] {
-    return computed(() => {
+    const results = ref<InspectorResult[]>([])
-      const results: InspectorResult[] = []
+    if (!res) return results.value
-      if (!res.value) return results
 
-      const hasErrors =
+    const hasErrors = res && (res.type !== "success" || res.statusCode !== 200)
-        res && (res.value.type !== "success" || res.value.statusCode !== 200)
 
-      let text: string | undefined = undefined
+    let text
 
-      if (res.value.type === "network_fail" && !navigator.onLine) {
+    if (res.type === "network_fail") {
-        text = this.t("inspections.response.network_error")
+      text = this.t("inspections.response.network_error")
-      } else if (res.value.type === "fail") {
+    } else if (res.type === "fail") {
-        text = this.t("inspections.response.default_error")
+      text = this.t("inspections.response.default_error")
-      } else if (res.value.type === "success" && res.value.statusCode === 404) {
+    } else if (res.type === "success" && res.statusCode === 404) {
-        text = this.t("inspections.response.404_error")
+      text = this.t("inspections.response.404_error")
-      } else if (res.value.type === "success" && res.value.statusCode === 401) {
+    } else if (res.type === "success" && res.statusCode === 401) {
-        text = this.t("inspections.response.401_error")
+      text = this.t("inspections.response.401_error")
-      }
+    }
 
-      if (hasErrors && text) {
+    if (hasErrors && text) {
-        results.push({
+      results.value.push({
-          id: "url",
+        id: "url",
-          icon: markRaw(IconAlertTriangle),
+        icon: markRaw(IconAlertTriangle),
-          text: {
+        text: {
-            type: "text",
+          type: "text",
-            text: text,
+          text: text,
-          },
+        },
-          severity: 2,
+        severity: 2,
-          isApplicable: true,
+        isApplicable: true,
-          locations: {
+        locations: {
-            type: "response",
+          type: "response",
-          },
+        },
-          doc: {
+        doc: {
-            text: this.t("action.learn_more"),
+          text: this.t("action.learn_more"),
-            link: "https://docs.hoppscotch.io/",
+          link: "https://docs.hoppscotch.io/",
-          },
+        },
-        })
+      })
-      }
+    }
 
-      return results
+    return results.value
-    })
   }
 }

packages/hoppscotch-common/src/services/inspection/inspectors/url.inspector.ts

@@ -0,0 +1,96 @@
+import { Service } from "dioc"
+import { InspectionService, Inspector, InspectorResult } from ".."
+import { getI18n } from "~/modules/i18n"
+import { HoppRESTRequest } from "@hoppscotch/data"
+import { computed, markRaw, ref } from "vue"
+import IconAlertTriangle from "~icons/lucide/alert-triangle"
+import { useReadonlyStream } from "~/composables/stream"
+import { extensionStatus$ } from "~/newstore/HoppExtension"
+import { useSetting } from "~/composables/settings"
+import { applySetting, toggleSetting } from "~/newstore/settings"
+
+/**
+ * This inspector is responsible for inspecting the URL of a request.
+ * It checks if the URL contains localhost and if the extension is installed.
+ * It also provides an action to enable the extension.
+ *
+ * NOTE: Initializing this service registers it as a inspector with the Inspection Service.
+ */
+export class URLInspectorService extends Service implements Inspector {
+  public static readonly ID = "URL_INSPECTOR_SERVICE"
+
+  private t = getI18n()
+
+  public readonly inspectorID = "url"
+
+  private readonly inspection = this.bind(InspectionService)
+
+  constructor() {
+    super()
+
+    this.inspection.registerInspector(this)
+  }
+
+  getInspectorFor(req: HoppRESTRequest): InspectorResult[] {
+    const PROXY_ENABLED = useSetting("PROXY_ENABLED")
+
+    const currentExtensionStatus = useReadonlyStream(extensionStatus$, null)
+
+    const isExtensionInstalled = computed(() => {
+      return currentExtensionStatus.value === "available"
+    })
+    const EXTENSIONS_ENABLED = useSetting("EXTENSIONS_ENABLED")
+
+    const results = ref<InspectorResult[]>([])
+
+    const url = req.endpoint
+
+    const isContainLocalhost = url.includes("localhost")
+
+    if (
+      isContainLocalhost &&
+      (!EXTENSIONS_ENABLED.value || !isExtensionInstalled.value)
+    ) {
+      let text
+
+      if (!isExtensionInstalled.value) {
+        if (currentExtensionStatus.value === "unknown-origin") {
+          text = this.t("inspections.url.extension_unknown_origin")
+        } else {
+          text = this.t("inspections.url.extension_not_installed")
+        }
+      } else if (!EXTENSIONS_ENABLED.value) {
+        text = this.t("inspections.url.extention_not_enabled")
+      } else {
+        text = this.t("inspections.url.localhost")
+      }
+
+      results.value.push({
+        id: "url",
+        icon: markRaw(IconAlertTriangle),
+        text: {
+          type: "text",
+          text: text,
+        },
+        action: {
+          text: this.t("inspections.url.extention_enable_action"),
+          apply: () => {
+            applySetting("EXTENSIONS_ENABLED", true)
+            if (PROXY_ENABLED.value) toggleSetting("PROXY_ENABLED")
+          },
+        },
+        severity: 2,
+        isApplicable: true,
+        locations: {
+          type: "url",
+        },
+        doc: {
+          text: this.t("action.learn_more"),
+          link: "https://docs.hoppscotch.io/",
+        },
+      })
+    }
+
+    return results.value
+  }
+}

packages/hoppscotch-common/src/services/spotlight/searchers/base/static.searcher.ts

@@ -91,9 +91,8 @@ export abstract class StaticSpotlightSearcherService<
   private async addDocsToSearchIndex() {
     this.loading.value = true
 
-    this.minisearch = new MiniSearch({
+    this.minisearch.removeAll()
-      fields: this.opts.searchFields as string[],
+    this.minisearch.vacuum()
-    })
 
     await this.minisearch.addAllAsync(
       Object.entries(this._documents).map(([id, doc]) => ({

packages/hoppscotch-common/src/services/spotlight/searchers/environment.searcher.ts

@@ -45,11 +45,8 @@ import {
   setSelectedEnvironmentIndex,
 } from "~/newstore/environments"
 
-import IconCheckCircle from "~/components/app/spotlight/entry/IconSelected.vue"
-import IconCircle from "~icons/lucide/circle"
-
 type Doc = {
-  text: string | string[]
+  text: string
   alternates: string[]
   icon: object | Component
   excludeFromSearch?: boolean
@@ -91,61 +88,40 @@ export class EnvironmentsSpotlightSearcherService extends StaticSpotlightSearche
 
   private documents: Record<string, Doc> = reactive({
     new_environment: {
-      text: [
+      text: this.t("spotlight.environments.new"),
-        this.t("spotlight.environments.title"),
-        this.t("spotlight.environments.new"),
-      ],
       alternates: ["new", "environment"],
       icon: markRaw(IconLayers),
     },
     new_environment_variable: {
-      text: [
+      text: this.t("spotlight.environments.new_variable"),
-        this.t("spotlight.environments.title"),
-        this.t("spotlight.environments.new_variable"),
-      ],
       alternates: ["new", "environment", "variable"],
       icon: markRaw(IconLayers),
     },
     edit_selected_env: {
-      text: [
+      text: this.t("spotlight.environments.edit"),
-        this.t("spotlight.environments.title"),
-        this.t("spotlight.environments.edit"),
-      ],
       alternates: ["edit", "environment"],
       icon: markRaw(IconEdit),
       excludeFromSearch: computed(() => !this.hasSelectedEnv.value),
     },
     delete_selected_env: {
-      text: [
+      text: this.t("spotlight.environments.delete"),
-        this.t("spotlight.environments.title"),
-        this.t("spotlight.environments.delete"),
-      ],
       alternates: ["delete", "environment"],
       icon: markRaw(IconTrash2),
       excludeFromSearch: computed(() => !this.hasSelectedEnv.value),
     },
     duplicate_selected_env: {
-      text: [
+      text: this.t("spotlight.environments.duplicate"),
-        this.t("spotlight.environments.title"),
-        this.t("spotlight.environments.duplicate"),
-      ],
       alternates: ["duplicate", "environment"],
       icon: markRaw(IconCopy),
       excludeFromSearch: computed(() => !this.hasSelectedEnv.value),
     },
     edit_global_env: {
-      text: [
+      text: this.t("spotlight.environments.edit_global"),
-        this.t("spotlight.environments.title"),
-        this.t("spotlight.environments.edit_global"),
-      ],
       alternates: ["edit", "global", "environment"],
       icon: markRaw(IconEdit),
     },
     duplicate_global_env: {
-      text: [
+      text: this.t("spotlight.environments.duplicate_global"),
-        this.t("spotlight.environments.title"),
-        this.t("spotlight.environments.duplicate_global"),
-      ],
       alternates: ["duplicate", "global", "environment"],
       icon: markRaw(IconCopy),
     },
@@ -269,16 +245,6 @@ export class SwitchEnvSpotlightSearcherService
     this.spotlight.registerSearcher(this)
   }
 
-  private selectedEnvIndex = useStreamStatic(
-    selectedEnvironmentIndex$,
-    {
-      type: "NO_ENV_SELECTED",
-    },
-    () => {
-      /* noop */
-    }
-  )[0]
-
   private environmentSearchable = useStreamStatic(
     activeActions$.pipe(
       map((actions) => actions.includes("modals.environment.add"))
@@ -296,25 +262,16 @@ export class SwitchEnvSpotlightSearcherService
     const results = ref<SpotlightSearcherResult[]>([])
 
     const minisearch = new MiniSearch({
-      fields: ["name", "alternates"],
+      fields: ["name"],
       storeFields: ["name"],
     })
 
     if (this.environmentSearchable.value) {
       minisearch.addAll(
         environmentsStore.value.environments.map((entry, index) => {
-          let id = `environment-${index}`
-
-          if (
-            this.selectedEnvIndex.value?.type === "MY_ENV" &&
-            this.selectedEnvIndex.value.index === index
-          ) {
-            id += "-selected"
-          }
           return {
-            id,
+            id: `environment-${index}`,
             name: entry.name,
-            alternates: ["environment", "change", entry.name],
           }
         })
       )
@@ -341,9 +298,7 @@ export class SwitchEnvSpotlightSearcherService
             .map((x) => {
               return {
                 id: x.id,
-                icon: markRaw(
+                icon: markRaw(IconLayers),
-                  x.id.endsWith("-selected") ? IconCheckCircle : IconCircle
-                ),
                 score: x.score,
                 text: {
                   type: "text",

packages/hoppscotch-common/src/services/spotlight/searchers/general.searcher.ts

@@ -9,17 +9,17 @@ import {
 
 import IconLinkedIn from "~icons/brands/linkedin"
 import IconTwitter from "~icons/brands/twitter"
-import IconDiscord from "~icons/brands/discord"
-import IconGitHub from "~icons/lucide/github"
 import IconBook from "~icons/lucide/book"
+import IconDiscord from "~icons/lucide/link"
+import IconGitHub from "~icons/lucide/github"
 import IconLifeBuoy from "~icons/lucide/life-buoy"
+import IconMessageCircle from "~icons/lucide/message-circle"
 import IconZap from "~icons/lucide/zap"
 
 type Doc = {
   text: string | string[]
   alternates: string[]
   icon: object | Component
-  action: () => void
 }
 
 /**
@@ -43,48 +43,41 @@ export class GeneralSpotlightSearcherService extends StaticSpotlightSearcherServ
       text: this.t("spotlight.general.help_menu"),
       alternates: ["help", "hoppscotch"],
       icon: markRaw(IconLifeBuoy),
-      action() {
+    },
-        invokeAction("modals.support.toggle")
+    chat_with_support: {
-      },
+      text: this.t("spotlight.general.chat"),
+      alternates: ["chat", "support", "hoppscotch"],
+      icon: markRaw(IconMessageCircle),
     },
     open_docs: {
       text: this.t("spotlight.general.open_docs"),
       alternates: ["docs", "documentation", "hoppscotch"],
       icon: markRaw(IconBook),
-      action: () => this.openURL("https://docs.hoppscotch.io"),
     },
     open_keybindings: {
       text: this.t("spotlight.general.open_keybindings"),
       alternates: ["key", "shortcuts", "binding"],
       icon: markRaw(IconZap),
-      action() {
-        invokeAction("flyouts.keybinds.toggle")
-      },
     },
-    open_github: {
+    link_github: {
-      text: this.t("spotlight.general.open_github"),
+      text: [this.t("spotlight.general.social"), "GitHub"],
-      alternates: ["repository", "github", "documentation", "hoppscotch"],
+      alternates: ["social", "github", "link"],
       icon: markRaw(IconGitHub),
-      action: () => this.openURL("https://hoppscotch.io/github"),
     },
     link_twitter: {
       text: [this.t("spotlight.general.social"), "Twitter"],
       alternates: ["social", "twitter", "link"],
       icon: markRaw(IconTwitter),
-      action: () => this.openURL("https://twitter.com/hoppscotch_io"),
     },
     link_discord: {
       text: [this.t("spotlight.general.social"), "Discord"],
       alternates: ["social", "discord", "link"],
       icon: markRaw(IconDiscord),
-      action: () => this.openURL("https://hoppscotch.io/discord"),
     },
     link_linkedin: {
       text: [this.t("spotlight.general.social"), "LinkedIn"],
       alternates: ["social", "linkedin", "link"],
       icon: markRaw(IconLinkedIn),
-      action: () =>
-        this.openURL("https://www.linkedin.com/company/hoppscotch/"),
     },
   })
 
@@ -117,11 +110,31 @@ export class GeneralSpotlightSearcherService extends StaticSpotlightSearcherServ
   }
 
   public onDocSelected(id: string): void {
-    this.documents[id]?.action()
+    switch (id) {
-  }
+      case "open_help":
-
+        invokeAction("modals.support.toggle")
-  public addCustomEntries(docs: Record<string, Doc>) {
+        break
-    this.documents = { ...this.documents, ...docs }
+      case "chat_with_support":
-    this.setDocuments(this.documents)
+        invokeAction("flyouts.chat.open")
+        break
+      case "open_docs":
+        this.openURL("https://docs.hoppscotch.io")
+        break
+      case "open_keybindings":
+        invokeAction("flyouts.keybinds.toggle")
+        break
+      case "link_github":
+        this.openURL("https://hoppscotch.io/github")
+        break
+      case "link_twitter":
+        this.openURL("https://twitter.com/hoppscotch_io")
+        break
+      case "link_discord":
+        this.openURL("https://hoppscotch.io/discord")
+        break
+      case "link_linkedin":
+        this.openURL("https://www.linkedin.com/company/hoppscotch/")
+        break
+    }
   }
 }

packages/hoppscotch-common/src/services/spotlight/searchers/request.searcher.ts

@@ -1,5 +1,5 @@
 import { Component, computed, markRaw, reactive } from "vue"
-import { invokeAction, isActionBound } from "~/helpers/actions"
+import { invokeAction } from "~/helpers/actions"
 import { getI18n } from "~/modules/i18n"
 import { SpotlightSearcherResult, SpotlightService } from ".."
 import {
@@ -19,7 +19,6 @@ import IconRename from "~icons/lucide/file-edit"
 import IconPlay from "~icons/lucide/play"
 import IconRotateCCW from "~icons/lucide/rotate-ccw"
 import IconSave from "~icons/lucide/save"
-import { GQLOptionTabs } from "~/components/graphql/RequestOptions.vue"
 
 type Doc = {
   text: string | string[]
@@ -47,51 +46,39 @@ export class RequestSpotlightSearcherService extends StaticSpotlightSearcherServ
   private route = useRoute()
   private isRESTPage = computed(() => this.route.name === "index")
   private isGQLPage = computed(() => this.route.name === "graphql")
-  private isRESTOrGQLPage = computed(
-    () => this.isRESTPage.value || this.isGQLPage.value
-  )
-  private isGQLConnectBound = isActionBound("gql.connect")
-  private isGQLDisconnectBound = isActionBound("gql.disconnect")
 
   private documents: Record<string, Doc> = reactive({
     send_request: {
       text: this.t("shortcut.request.send_request"),
       alternates: ["request", "send"],
       icon: markRaw(IconPlay),
-      excludeFromSearch: computed(() => !this.isRESTOrGQLPage.value),
+      excludeFromSearch: computed(
-    },
+        () => !this.isRESTPage.value ?? !this.isGQLPage.value
-    gql_connect: {
+      ),
-      text: [this.t("navigation.graphql"), this.t("spotlight.graphql.connect")],
-      alternates: ["connect", "server", "graphql"],
-      icon: markRaw(IconPlay),
-      excludeFromSearch: computed(() => !this.isGQLConnectBound.value),
-    },
-    gql_disconnect: {
-      text: [
-        this.t("navigation.graphql"),
-        this.t("spotlight.graphql.disconnect"),
-      ],
-      alternates: ["disconnect", "stop", "graphql"],
-      icon: markRaw(IconPlay),
-      excludeFromSearch: computed(() => !this.isGQLDisconnectBound.value),
     },
     save_to_collections: {
       text: this.t("spotlight.request.save_as_new"),
       alternates: ["save", "collections"],
       icon: markRaw(IconSave),
-      excludeFromSearch: computed(() => !this.isRESTOrGQLPage.value),
+      excludeFromSearch: computed(
+        () => !this.isRESTPage.value ?? !this.isGQLPage.value
+      ),
     },
     save_request: {
       text: this.t("shortcut.request.save_request"),
       alternates: ["save", "request"],
       icon: markRaw(IconSave),
-      excludeFromSearch: computed(() => !this.isRESTOrGQLPage.value),
+      excludeFromSearch: computed(
+        () => !this.isRESTPage.value ?? !this.isGQLPage.value
+      ),
     },
     rename_request: {
       text: this.t("shortcut.request.rename"),
       alternates: ["rename", "request"],
       icon: markRaw(IconRename),
-      excludeFromSearch: computed(() => !this.isRESTOrGQLPage.value),
+      excludeFromSearch: computed(
+        () => !this.isRESTPage.value ?? !this.isGQLPage.value
+      ),
     },
     copy_request_link: {
       text: this.t("shortcut.request.copy_request_link"),
@@ -103,7 +90,7 @@ export class RequestSpotlightSearcherService extends StaticSpotlightSearcherServ
       text: this.t("shortcut.request.reset_request"),
       alternates: ["reset", "request"],
       icon: markRaw(IconRotateCCW),
-      excludeFromSearch: computed(() => !this.isRESTOrGQLPage.value),
+      excludeFromSearch: computed(() => !this.isRESTPage.value),
     },
     import_curl: {
       text: this.t("shortcut.request.import_curl"),
@@ -156,7 +143,9 @@ export class RequestSpotlightSearcherService extends StaticSpotlightSearcherServ
       ],
       alternates: ["parameters", "tab"],
       icon: markRaw(IconWindow),
-      excludeFromSearch: computed(() => !this.isRESTOrGQLPage.value),
+      excludeFromSearch: computed(
+        () => !this.isRESTPage.value ?? !this.isGQLPage.value
+      ),
     },
     tab_body: {
       text: [
@@ -165,7 +154,9 @@ export class RequestSpotlightSearcherService extends StaticSpotlightSearcherServ
       ],
       alternates: ["body", "tab"],
       icon: markRaw(IconWindow),
-      excludeFromSearch: computed(() => !this.isRESTOrGQLPage.value),
+      excludeFromSearch: computed(
+        () => !this.isRESTPage.value ?? !this.isGQLPage.value
+      ),
     },
     tab_headers: {
       text: [
@@ -174,7 +165,9 @@ export class RequestSpotlightSearcherService extends StaticSpotlightSearcherServ
       ],
       alternates: ["headers", "tab"],
       icon: markRaw(IconWindow),
-      excludeFromSearch: computed(() => !this.isRESTOrGQLPage.value),
+      excludeFromSearch: computed(
+        () => !this.isRESTPage.value ?? !this.isGQLPage.value
+      ),
     },
     tab_authorization: {
       text: [
@@ -183,7 +176,9 @@ export class RequestSpotlightSearcherService extends StaticSpotlightSearcherServ
       ],
       alternates: ["authorization", "tab"],
       icon: markRaw(IconWindow),
-      excludeFromSearch: computed(() => !this.isRESTOrGQLPage.value),
+      excludeFromSearch: computed(
+        () => !this.isRESTPage.value ?? !this.isGQLPage.value
+      ),
     },
     tab_pre_request_script: {
       text: [
@@ -203,24 +198,6 @@ export class RequestSpotlightSearcherService extends StaticSpotlightSearcherServ
       icon: markRaw(IconWindow),
       excludeFromSearch: computed(() => !this.isRESTPage.value),
     },
-    tab_query: {
-      text: [
-        this.t("spotlight.request.switch_to"),
-        this.t("spotlight.request.tab_query"),
-      ],
-      alternates: ["query", "tab"],
-      icon: markRaw(IconWindow),
-      excludeFromSearch: computed(() => !this.isGQLPage.value),
-    },
-    tab_variables: {
-      text: [
-        this.t("spotlight.request.switch_to"),
-        this.t("spotlight.request.tab_variables"),
-      ],
-      alternates: ["variables", "tab"],
-      icon: markRaw(IconWindow),
-      excludeFromSearch: computed(() => !this.isGQLPage.value),
-    },
   })
 
   constructor() {
@@ -247,7 +224,7 @@ export class RequestSpotlightSearcherService extends StaticSpotlightSearcherServ
     }
   }
 
-  private openRequestTab(tab: RequestOptionTabs | GQLOptionTabs): void {
+  private openRequestTab(tab: RequestOptionTabs): void {
     invokeAction("request.open-tab", {
       tab,
     })
@@ -258,12 +235,6 @@ export class RequestSpotlightSearcherService extends StaticSpotlightSearcherServ
       case "send_request":
         invokeAction("request.send-cancel")
         break
-      case "gql_connect":
-        invokeAction("gql.connect")
-        break
-      case "gql_disconnect":
-        invokeAction("gql.disconnect")
-        break
       case "save_to_collections":
         invokeAction("request.save-as", {
           requestType: "rest",
@@ -274,7 +245,7 @@ export class RequestSpotlightSearcherService extends StaticSpotlightSearcherServ
         invokeAction("request.save")
         break
       case "rename_request":
-        invokeAction("request.rename")
+        invokeAction("rest.request.rename")
         break
       case "copy_request_link":
         invokeAction("request.copy-link")
@@ -321,12 +292,6 @@ export class RequestSpotlightSearcherService extends StaticSpotlightSearcherServ
       case "tab_tests":
         this.openRequestTab("tests")
         break
-      case "tab_query":
-        this.openRequestTab("query")
-        break
-      case "tab_variables":
-        this.openRequestTab("variables")
-        break
     }
   }
 }

packages/hoppscotch-common/src/services/spotlight/searchers/response.searcher.ts

@@ -1,5 +1,5 @@
 import { Component, computed, markRaw, reactive } from "vue"
-import { invokeAction, isActionBound } from "~/helpers/actions"
+import { activeActions$, invokeAction } from "~/helpers/actions"
 import { getI18n } from "~/modules/i18n"
 import { SpotlightSearcherResult, SpotlightService } from ".."
 import {
@@ -9,6 +9,8 @@ import {
 
 import IconDownload from "~icons/lucide/download"
 import IconCopy from "~icons/lucide/copy"
+import { map } from "rxjs"
+import { useStreamStatic } from "~/composables/stream"
 
 type Doc = {
   text: string
@@ -33,11 +35,23 @@ export class ResponseSpotlightSearcherService extends StaticSpotlightSearcherSer
 
   private readonly spotlight = this.bind(SpotlightService)
 
-  private copyResponseActionEnabled = isActionBound("response.copy")
+  private copyResponseActionEnabled = useStreamStatic(
+    activeActions$.pipe(map((actions) => actions.includes("response.copy"))),
+    activeActions$.value.includes("response.copy"),
+    () => {
+      /* noop */
+    }
+  )[0]
 
-  private downloadResponseActionEnabled = isActionBound(
+  private downloadResponseActionEnabled = useStreamStatic(
-    "response.file.download"
+    activeActions$.pipe(
-  )
+      map((actions) => actions.includes("response.file.download"))
+    ),
+    activeActions$.value.includes("response.file.download"),
+    () => {
+      /* noop */
+    }
+  )[0]
 
   private documents: Record<string, Doc> = reactive({
     copy_response: {

packages/hoppscotch-common/src/services/spotlight/searchers/settings.searcher.ts

@@ -14,11 +14,11 @@ import IconGlobe from "~icons/lucide/globe"
 import IconMonitor from "~icons/lucide/monitor"
 import IconMoon from "~icons/lucide/moon"
 import IconSun from "~icons/lucide/sun"
-import IconCircle from "~icons/lucide/circle"
+import IconType from "~icons/lucide/type"
-import IconCheckCircle from "~icons/lucide/check-circle"
 
 type Doc = {
   text: string | string[]
+  excludeFromSearch?: boolean
   alternates: string[]
   icon: object | Component
 }
@@ -35,7 +35,6 @@ export class SettingsSpotlightSearcherService extends StaticSpotlightSearcherSer
   private t = getI18n()
 
   private activeFontSize = useSetting("FONT_SIZE")
-  private activeTheme = useSetting("BG_COLOR")
 
   public readonly searcherID = "settings"
   public searcherSectionTitle = this.t("navigation.settings")
@@ -49,11 +48,7 @@ export class SettingsSpotlightSearcherService extends StaticSpotlightSearcherSer
         this.t("spotlight.settings.theme.system"),
       ],
       alternates: ["theme"],
-      icon: computed(() =>
+      icon: markRaw(IconMonitor),
-        this.activeTheme.value === "system"
-          ? markRaw(IconCheckCircle)
-          : markRaw(IconMonitor)
-      ),
     },
     theme_light: {
       text: [
@@ -61,11 +56,7 @@ export class SettingsSpotlightSearcherService extends StaticSpotlightSearcherSer
         this.t("spotlight.settings.theme.light"),
       ],
       alternates: ["theme"],
-      icon: computed(() =>
+      icon: markRaw(IconSun),
-        this.activeTheme.value === "light"
-          ? markRaw(IconCheckCircle)
-          : markRaw(IconSun)
-      ),
     },
     theme_dark: {
       text: [
@@ -73,11 +64,7 @@ export class SettingsSpotlightSearcherService extends StaticSpotlightSearcherSer
         this.t("spotlight.settings.theme.dark"),
       ],
       alternates: ["theme"],
-      icon: computed(() =>
+      icon: markRaw(IconCloud),
-        this.activeTheme.value === "dark"
-          ? markRaw(IconCheckCircle)
-          : markRaw(IconCloud)
-      ),
     },
     theme_black: {
       text: [
@@ -85,11 +72,7 @@ export class SettingsSpotlightSearcherService extends StaticSpotlightSearcherSer
         this.t("spotlight.settings.theme.black"),
       ],
       alternates: ["theme"],
-      icon: computed(() =>
+      icon: markRaw(IconMoon),
-        this.activeTheme.value === "black"
-          ? markRaw(IconCheckCircle)
-          : markRaw(IconMoon)
-      ),
     },
     font_size_sm: {
       text: [
@@ -99,51 +82,42 @@ export class SettingsSpotlightSearcherService extends StaticSpotlightSearcherSer
       onClick: () => {
         console.log("clicked")
       },
+      excludeFromSearch: computed(() => this.activeFontSize.value === "small"),
       alternates: [
         "font size",
         "change font size",
         "change font",
         "increase font",
       ],
-      icon: computed(() =>
+      icon: markRaw(IconType),
-        this.activeFontSize.value === "small"
-          ? markRaw(IconCheckCircle)
-          : markRaw(IconCircle)
-      ),
     },
     font_size_md: {
       text: [
         this.t("settings.font_size"),
         this.t("spotlight.settings.font.size_md"),
       ],
+      excludeFromSearch: computed(() => this.activeFontSize.value === "medium"),
       alternates: [
         "font size",
         "change font size",
         "change font",
         "increase font",
       ],
-      icon: computed(() =>
+      icon: markRaw(IconType),
-        this.activeFontSize.value === "medium"
-          ? markRaw(IconCheckCircle)
-          : markRaw(IconCircle)
-      ),
     },
     font_size_lg: {
       text: [
         this.t("settings.font_size"),
         this.t("spotlight.settings.font.size_lg"),
       ],
+      excludeFromSearch: computed(() => this.activeFontSize.value === "large"),
       alternates: [
         "font size",
         "change font size",
         "change font",
         "increase font",
       ],
-      icon: computed(() =>
+      icon: markRaw(IconType),
-        this.activeFontSize.value === "large"
-          ? markRaw(IconCheckCircle)
-          : markRaw(IconCircle)
-      ),
     },
     change_lang: {
       text: [

packages/hoppscotch-common/src/services/spotlight/searchers/tab.searcher.ts

@@ -7,16 +7,19 @@ import {
 } from "./base/static.searcher"
 
 import { useRoute } from "vue-router"
-import IconCopy from "~icons/lucide/copy"
+import { getDefaultRESTRequest } from "~/helpers/rest/default"
-import IconCopyPlus from "~icons/lucide/copy-plus"
+import {
-import IconXCircle from "~icons/lucide/x-circle"
+  closeOtherTabs,
-import IconXSquare from "~icons/lucide/x-square"
+  closeTab,
+  createNewTab,
+  currentTabID,
+  getActiveTabs,
+} from "~/helpers/rest/tab"
+import IconWindow from "~icons/lucide/app-window"
 import { invokeAction } from "~/helpers/actions"
-import { getActiveTabs as getRESTActiveTabs } from "~/helpers/rest/tab"
-import { getActiveTabs as getGQLActiveTabs } from "~/helpers/graphql/tab"
 
 type Doc = {
-  text: string | string[]
+  text: string
   alternates: string[]
   icon: object | Component
   excludeFromSearch?: boolean
@@ -40,49 +43,36 @@ export class TabSpotlightSearcherService extends StaticSpotlightSearcherService<
 
   private route = useRoute()
   private showAction = computed(
-    () => this.route.name === "index" || this.route.name === "graphql"
+    () => this.route.name === "index" ?? this.route.name === "graphql"
-  )
-  private gqlActiveTabs = getGQLActiveTabs()
-  private restActiveTabs = getRESTActiveTabs()
-  private isOnlyTab = computed(() =>
-    this.route.name === "graphql"
-      ? this.gqlActiveTabs.value.length === 1
-      : this.restActiveTabs.value.length === 1
   )
 
   private documents: Record<string, Doc> = reactive({
     duplicate_tab: {
-      text: [this.t("spotlight.tab.title"), this.t("spotlight.tab.duplicate")],
+      text: this.t("spotlight.tab.duplicate"),
       alternates: ["tab", "duplicate", "duplicate tab"],
-      icon: markRaw(IconCopy),
+      icon: markRaw(IconWindow),
       excludeFromSearch: computed(() => !this.showAction.value),
     },
     close_current_tab: {
-      text: [
+      text: this.t("spotlight.tab.close_current"),
-        this.t("spotlight.tab.title"),
-        this.t("spotlight.tab.close_current"),
-      ],
       alternates: ["tab", "close", "close tab"],
-      icon: markRaw(IconXCircle),
+      icon: markRaw(IconWindow),
       excludeFromSearch: computed(
-        () => !this.showAction.value || this.isOnlyTab.value
+        () => !this.showAction.value ?? getActiveTabs().value.length === 1
       ),
     },
     close_other_tabs: {
-      text: [
+      text: this.t("spotlight.tab.close_others"),
-        this.t("spotlight.tab.title"),
-        this.t("spotlight.tab.close_others"),
-      ],
       alternates: ["tab", "close", "close all"],
-      icon: markRaw(IconXSquare),
+      icon: markRaw(IconWindow),
       excludeFromSearch: computed(
-        () => !this.showAction.value || this.isOnlyTab.value
+        () => !this.showAction.value ?? getActiveTabs().value.length < 2
       ),
     },
     open_new_tab: {
-      text: [this.t("spotlight.tab.title"), this.t("spotlight.tab.new_tab")],
+      text: this.t("spotlight.tab.new_tab"),
       alternates: ["tab", "new", "open tab"],
-      icon: markRaw(IconCopyPlus),
+      icon: markRaw(IconWindow),
       excludeFromSearch: computed(() => !this.showAction.value),
     },
   })
@@ -112,9 +102,16 @@ export class TabSpotlightSearcherService extends StaticSpotlightSearcherService<
   }
 
   public onDocSelected(id: string): void {
-    if (id === "duplicate_tab") invokeAction("tab.duplicate-tab", {})
+    if (id === "duplicate_tab")
-    if (id === "close_current_tab") invokeAction("tab.close-current")
+      invokeAction("request.duplicate-tab", {
-    if (id === "close_other_tabs") invokeAction("tab.close-other")
+        tabID: currentTabID.value,
-    if (id === "open_new_tab") invokeAction("tab.open-new")
+      })
+    if (id === "close_current_tab") closeTab(currentTabID.value)
+    if (id === "close_other_tabs") closeOtherTabs(currentTabID.value)
+    if (id === "open_new_tab")
+      createNewTab({
+        request: getDefaultRESTRequest(),
+        isDirty: false,
+      })
   }
 }

packages/hoppscotch-selfhost-web/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@hoppscotch/selfhost-web",
   "private": true,
-  "version": "2023.8.0",
+  "version": "2023.4.8",
   "type": "module",
   "scripts": {
     "dev:vite": "vite",
@@ -28,8 +28,8 @@
     "@fontsource-variable/roboto-mono": "^5.0.9",
     "@hoppscotch/common": "workspace:^",
     "@hoppscotch/data": "workspace:^",
-    "@import-meta-env/unplugin": "^0.4.8",
     "axios": "^1.4.0",
+    "@import-meta-env/unplugin": "^0.4.8",
     "buffer": "^6.0.3",
     "fp-ts": "^2.16.1",
     "process": "^0.11.10",
@@ -65,7 +65,6 @@
     "unplugin-icons": "^0.16.5",
     "unplugin-vue-components": "^0.25.1",
     "vite": "^4.4.9",
-    "vite-plugin-fonts": "^0.6.0",
     "vite-plugin-html-config": "^1.0.11",
     "vite-plugin-inspect": "^0.7.38",
     "vite-plugin-pages": "^0.31.0",
@@ -76,6 +75,7 @@
     "vite-plugin-windicss": "^1.9.1",
     "vitest": "^0.34.2",
     "vue-tsc": "^1.8.8",
+    "vite-plugin-fonts": "^0.6.0",
     "windicss": "^3.5.6"
   }
 }

packages/hoppscotch-selfhost-web/src/main.ts

@@ -7,16 +7,9 @@ import { def as historyDef } from "./platform/history/history.platform"
 import { def as tabStateDef } from "./platform/tabState/tabState.platform"
 import { browserInterceptor } from "@hoppscotch/common/platform/std/interceptors/browser"
 import { proxyInterceptor } from "@hoppscotch/common/platform/std/interceptors/proxy"
-import { ExtensionInspectorService } from "@hoppscotch/common/platform/std/inspections/extension.inspector"
 import { ExtensionInterceptorService } from "@hoppscotch/common/platform/std/interceptors/extension"
-import { stdFooterItems } from "@hoppscotch/common/platform/std/ui/footerItem"
-import { stdSupportOptionItems } from "@hoppscotch/common/platform/std/ui/supportOptionsItem"
 
 createHoppApp("#app", {
-  ui: {
-    additionalFooterMenuItems: stdFooterItems,
-    additionalSupportOptionsMenuItems: stdSupportOptionItems,
-  },
   auth: authDef,
   sync: {
     environments: environmentsDef,
@@ -33,9 +26,6 @@ createHoppApp("#app", {
       { type: "service", service: ExtensionInterceptorService },
     ],
   },
-  additionalInspectors: [
-    { type: "service", service: ExtensionInspectorService },
-  ],
   platformFeatureFlags: {
     exportAsGIST: false,
   },

packages/hoppscotch-sh-admin/index.html

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en" data-font-size="medium">
+<html lang="en" data-font-size="large">
 
 <head>
   <script>
@@ -17,4 +17,4 @@
   <script type="module" src="/src/main.ts"></script>
 </body>
 
-</html>
+</html>

packages/hoppscotch-sh-admin/package.json

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

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

@@ -1,12 +1,44 @@
 // 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 {
+    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'];
+    HoppButtonPrimary: typeof import('@hoppscotch/ui')['HoppButtonPrimary'];
+    HoppButtonSecondary: typeof import('@hoppscotch/ui')['HoppButtonSecondary'];
+    HoppSmartAnchor: typeof import('@hoppscotch/ui')['HoppSmartAnchor'];
+    HoppSmartAutoComplete: typeof import('@hoppscotch/ui')['HoppSmartAutoComplete'];
+    HoppSmartConfirmModal: typeof import('@hoppscotch/ui')['HoppSmartConfirmModal'];
+    HoppSmartInput: typeof import('@hoppscotch/ui')['HoppSmartInput'];
+    HoppSmartItem: typeof import('@hoppscotch/ui')['HoppSmartItem'];
+    HoppSmartModal: typeof import('@hoppscotch/ui')['HoppSmartModal'];
+    HoppSmartPicture: typeof import('@hoppscotch/ui')['HoppSmartPicture'];
+    HoppSmartSpinner: typeof import('@hoppscotch/ui')['HoppSmartSpinner'];
+    HoppSmartTab: typeof import('@hoppscotch/ui')['HoppSmartTab'];
+    IconLucideArrowLeft: typeof import('~icons/lucide/arrow-left')['default'];
+    IconLucideChevronDown: typeof import('~icons/lucide/chevron-down')['default'];
+    IconLucideHelpCircle: typeof import('~icons/lucide/help-circle')['default'];
+    IconLucideInbox: typeof import('~icons/lucide/inbox')['default'];
+    IconLucideUser: typeof import('~icons/lucide/user')['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'];
+    TeamsTable: typeof import('./components/teams/Table.vue')['default'];
+    Tippy: typeof import('vue-tippy')['Tippy'];
+    UsersInviteModal: typeof import('./components/users/InviteModal.vue')['default'];
+    UsersTable: typeof import('./components/users/Table.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']
@@ -17,15 +49,9 @@ declare module '@vue/runtime-core' {
     HoppButtonPrimary: typeof import('@hoppscotch/ui')['HoppButtonPrimary']
     HoppButtonSecondary: typeof import('@hoppscotch/ui')['HoppButtonSecondary']
     HoppSmartAnchor: typeof import('@hoppscotch/ui')['HoppSmartAnchor']
-    HoppSmartAutoComplete: typeof import('@hoppscotch/ui')['HoppSmartAutoComplete']
     HoppSmartConfirmModal: typeof import('@hoppscotch/ui')['HoppSmartConfirmModal']
-    HoppSmartInput: typeof import('@hoppscotch/ui')['HoppSmartInput']
     HoppSmartItem: typeof import('@hoppscotch/ui')['HoppSmartItem']
-    HoppSmartModal: typeof import('@hoppscotch/ui')['HoppSmartModal']
     HoppSmartPicture: typeof import('@hoppscotch/ui')['HoppSmartPicture']
-    HoppSmartSpinner: typeof import('@hoppscotch/ui')['HoppSmartSpinner']
-    IconLucideArrowLeft: typeof import('~icons/lucide/arrow-left')['default']
-    IconLucideChevronDown: typeof import('~icons/lucide/chevron-down')['default']
     IconLucideInbox: typeof import('~icons/lucide/inbox')['default']
     TeamsAdd: typeof import('./components/teams/Add.vue')['default']
     TeamsDetails: typeof import('./components/teams/Details.vue')['default']
@@ -37,5 +63,4 @@ declare module '@vue/runtime-core' {
     UsersInviteModal: typeof import('./components/users/InviteModal.vue')['default']
     UsersTable: typeof import('./components/users/Table.vue')['default']
   }
-
 }

packages/hoppscotch-sh-admin/src/pages/users/invited.vue

@@ -44,8 +44,8 @@
                 :key="index"
                 class="text-secondaryDark hover:bg-zinc-800 hover:cursor-pointer rounded-xl"
               >
-                <td class="py-2 px-3 max-w-36">
+                <td class="py-2 px-3 max-w-30">
-                  <div class="flex">
+                  <div>
                     <span class="truncate">
                       {{ user?.adminUid }}
                     </span>
@@ -56,12 +56,10 @@
                     {{ user?.adminEmail }}
                   </span>
                 </td>
-                <td class="py-2 px-3 max-w-52">
+                <td class="py-2 px-3">
-                  <div class="flex">
+                  <span>
-                    <span class="truncate">
+                    {{ user?.inviteeEmail }}
-                      {{ user?.inviteeEmail }}
+                  </span>
-                    </span>
-                  </div>
                 </td>
                 <td class="py-2 px-3">
                   <div class="flex items-center">

prod.Dockerfile

@@ -18,11 +18,11 @@ RUN pnpm exec prisma generate
 RUN pnpm run build
 # Remove the env file to avoid backend copying it in and using it
 RUN rm "../../.env"
-ENV PRODUCTION="false"
+ENV PRODUCTION="true"
 ENV PORT=3170
 ENV APP_PORT=${PORT}
 ENV DB_URL=${DATABASE_URL}
-CMD ["pnpm", "run", "start:dev"]
+CMD ["pnpm", "run", "start:prod"]
 EXPOSE 3170
 
 FROM base_builder as fe_builder