chore: update variable names

.env.example

@@ -13,7 +13,6 @@ SESSION_SECRET='add some secret here'
 # Hoppscotch App Domain Config
 REDIRECT_URL="http://localhost:3000"
 WHITELISTED_ORIGINS = "http://localhost:3170,http://localhost:3000,http://localhost:3100"
-ALLOWED_AUTH_PROVIDERS = GOOGLE,GITHUB,MICROSOFT,EMAIL
 
 # Google Auth Config
 GOOGLE_CLIENT_ID="************************************************"
@@ -32,7 +31,6 @@ MICROSOFT_CLIENT_ID="************************************************"
 MICROSOFT_CLIENT_SECRET="************************************************"
 MICROSOFT_CALLBACK_URL="http://localhost:3170/v1/auth/microsoft/callback"
 MICROSOFT_SCOPE="user.read"
-MICROSOFT_TENANT="common"
 
 # Mailer config
 MAILER_SMTP_URL="smtps://user@domain.com:pass@smtp.domain.com"

packages/dioc/.gitignore

@@ -1,24 +0,0 @@
-# Logs
-logs
-*.log
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-pnpm-debug.log*
-lerna-debug.log*
-
-node_modules
-dist
-dist-ssr
-*.local
-
-# Editor directories and files
-.vscode/*
-!.vscode/extensions.json
-.idea
-.DS_Store
-*.suo
-*.ntvs*
-*.njsproj
-*.sln
-*.sw?

packages/dioc/README.md

@@ -1,141 +0,0 @@
-# dioc
-
-A small and lightweight dependency injection / inversion of control system.
-
-### About
-
-`dioc` is a really simple **DI/IOC** system where you write services (which are singletons per container) that can depend on each other and emit events that can be listened upon.
-
-### Demo
-
-```ts
-import { Service, Container } from "dioc"
-
-// Here is a simple service, which you can define by extending the Service class
-// and providing an ID static field (of type string)
-export class PersistenceService extends Service {
-  // This should be unique for each container
-  public static ID = "PERSISTENCE_SERVICE"
-
-  public read(key: string): string | undefined {
-    // ...
-  }
-
-  public write(key: string, value: string) {
-    // ...
-  }
-}
-
-type TodoServiceEvent =
-  | { type: "TODO_CREATED"; index: number }
-  | { type: "TODO_DELETED"; index: number }
-
-// Services have a built in event system
-// Define the generic argument to say what are the possible emitted values
-export class TodoService extends Service<TodoServiceEvent> {
-  public static ID = "TODO_SERVICE"
-
-  // Inject persistence service into this service
-  private readonly persistence = this.bind(PersistenceService)
-
-  public todos = []
-
-  // Service constructors cannot have arguments
-  constructor() {
-    super()
-
-    this.todos = JSON.parse(this.persistence.read("todos") ?? "[]")
-  }
-
-  public addTodo(text: string) {
-    // ...
-
-    // You can access services via the bound fields
-    this.persistence.write("todos", JSON.stringify(this.todos))
-
-    // This is how you emit an event
-    this.emit({
-      type: "TODO_CREATED",
-      index,
-    })
-  }
-
-  public removeTodo(index: number) {
-    // ...
-
-    this.emit({
-      type: "TODO_DELETED",
-      index,
-    })
-  }
-}
-
-// Services need a container to run in
-const container = new Container()
-
-// You can initialize and get services using Container#bind
-// It will automatically initialize the service (and its dependencies)
-const todoService = container.bind(TodoService) // Returns an instance of TodoService
-```
-
-### Demo (Unit Test)
-
-`dioc/testing` contains `TestContainer` which lets you bind mocked services to the container.
-
-```ts
-import { TestContainer } from "dioc/testing"
-import { TodoService, PersistenceService } from "./demo.ts" // The above demo code snippet
-import { describe, it, expect, vi } from "vitest"
-
-describe("TodoService", () => {
-  it("addTodo writes to persistence", () => {
-    const container = new TestContainer()
-
-    const writeFn = vi.fn()
-
-    // The first parameter is the service to mock and the second parameter
-    // is the mocked service fields and functions
-    container.bindMock(PersistenceService, {
-      read: () => undefined, // Not really important for this test
-      write: writeFn,
-    })
-
-    // the peristence service bind in TodoService will now use the
-    // above defined mocked implementation
-    const todoService = container.bind(TodoService)
-
-    todoService.addTodo("sup")
-
-    expect(writeFn).toHaveBeenCalledOnce()
-    expect(writeFn).toHaveBeenCalledWith("todos", JSON.stringify(["sup"]))
-  })
-})
-```
-
-### Demo (Vue)
-
-`dioc/vue` contains a Vue Plugin and a `useService` composable that allows Vue components to use the defined services.
-
-In the app entry point:
-
-```ts
-import { createApp } from "vue"
-import { diocPlugin } from "dioc/vue"
-
-const app = createApp()
-
-app.use(diocPlugin, {
-  container: new Container(), // You can pass in the container you want to provide to the components here
-})
-```
-
-In your Vue components:
-
-```vue
-<script setup>
-import { TodoService } from "./demo.ts" // The above demo
-import { useService } from "dioc/vue"
-
-const todoService = useService(TodoService) // Returns an instance of the TodoService class
-</script>
-```

packages/dioc/index.d.ts

@@ -1,2 +0,0 @@
-export { default } from "./dist/main.d.ts"
-export * from "./dist/main.d.ts"

packages/dioc/lib/container.ts

@@ -1,147 +0,0 @@
-import { Service } from "./service"
-import { Observable, Subject } from 'rxjs'
-
-/**
- * Stores the current container instance in the current operating context.
- *
- * NOTE: This should not be used outside of dioc library code
- */
-export let currentContainer: Container | null = null
-
-/**
- * The events emitted by the container
- *
- * `SERVICE_BIND` - emitted when a service is bound to the container directly or as a dependency to another service
- * `SERVICE_INIT` - emitted when a service is initialized
- */
-export type ContainerEvent =
-  | {
-    type: 'SERVICE_BIND';
-
-    /** The Service ID of the service being bounded (the dependency) */
-    boundeeID: string;
-
-    /**
-     * The Service ID of the bounder that is binding the boundee (the dependent)
-     *
-     * NOTE: This will be undefined if the service is bound directly to the container
-     */
-    bounderID: string | undefined
-  }
-  | {
-    type: 'SERVICE_INIT';
-
-    /** The Service ID of the service being initialized */
-    serviceID: string
-  }
-
-/**
- * The dependency injection container, allows for services to be initialized and maintains the dependency trees.
- */
-export class Container {
-  /** Used during the `bind` operation to detect circular dependencies */
-  private bindStack: string[] = []
-
-  /** The map of bound services to their IDs */
-  protected boundMap = new Map<string, Service<unknown>>()
-
-  /** The RxJS observable representing the event stream */
-  protected event$ = new Subject<ContainerEvent>()
-
-  /**
-   * Returns whether a container has the given service bound
-   * @param service The service to check for
-   */
-  public hasBound<
-    T extends typeof Service<any> & { ID: string }
-  >(service: T): boolean {
-    return this.boundMap.has(service.ID)
-  }
-
-  /**
-   * Returns the service bound to the container with the given ID or if not found, undefined.
-   *
-   * NOTE: This is an advanced method and should not be used as much as possible.
-   *
-   * @param serviceID The ID of the service to get
-   */
-  public getBoundServiceWithID(serviceID: string): Service<unknown> | undefined {
-    return this.boundMap.get(serviceID)
-  }
-
-  /**
-   * Binds a service to the container. This is equivalent to marking a service as a dependency.
-   * @param service The class reference of a service to bind
-   * @param bounder The class reference of the service that is binding the service (if bound directly to the container, this should be undefined)
-   */
-  public bind<T extends typeof Service<any> & { ID: string }>(
-    service: T,
-    bounder: ((typeof Service<T>) & { ID: string }) | undefined = undefined
-  ): InstanceType<T> {
-    // We need to store the current container in a variable so that we can restore it after the bind operation
-    const oldCurrentContainer = currentContainer;
-    currentContainer = this;
-
-    // If the service is already bound, return the existing instance
-    if (this.hasBound(service)) {
-      this.event$.next({
-        type: 'SERVICE_BIND',
-        boundeeID: service.ID,
-        bounderID: bounder?.ID // Return the bounder ID if it is defined, else assume its the container
-      })
-
-      return this.boundMap.get(service.ID) as InstanceType<T> // Casted as InstanceType<T> because service IDs and types are expected to match
-    }
-
-    // Detect circular dependency and throw error
-    if (this.bindStack.findIndex((serviceID) => serviceID === service.ID) !== -1) {
-      const circularServices = `${this.bindStack.join(' -> ')} -> ${service.ID}`
-
-      throw new Error(`Circular dependency detected.\nChain: ${circularServices}`)
-    }
-
-    // Push the service ID onto the bind stack to detect circular dependencies
-    this.bindStack.push(service.ID)
-
-    // Initialize the service and emit events
-
-    // NOTE: We need to cast the service to any as TypeScript thinks that the service is abstract
-    const instance: Service<any> = new (service as any)()
-
-    this.boundMap.set(service.ID, instance)
-
-    this.bindStack.pop()
-
-    this.event$.next({
-      type: 'SERVICE_INIT',
-      serviceID: service.ID,
-    })
-
-    this.event$.next({
-      type: 'SERVICE_BIND',
-      boundeeID: service.ID,
-      bounderID: bounder?.ID
-    })
-
-
-    // Restore the current container
-    currentContainer = oldCurrentContainer;
-
-    // We expect the return type to match the service definition
-    return instance as InstanceType<T>
-  }
-
-  /**
-   * Returns an iterator of the currently bound service IDs and their instances
-   */
-  public getBoundServices(): IterableIterator<[string, Service<any>]> {
-    return this.boundMap.entries()
-  }
-
-  /**
-   * Returns the public container event stream
-   */
-  public getEventStream(): Observable<ContainerEvent> {
-    return this.event$.asObservable()
-  }
-}

packages/dioc/lib/main.ts

@@ -1,2 +0,0 @@
-export * from "./container"
-export * from "./service"

packages/dioc/lib/service.ts

@@ -1,65 +0,0 @@
-import { Observable, Subject } from 'rxjs'
-import { Container, currentContainer } from './container'
-
-/**
- * A Dioc service that can bound to a container and can bind dependency services.
- *
- * NOTE: Services cannot have a constructor that takes arguments.
- *
- * @template EventDef The type of events that can be emitted by the service. These will be accessible by event streams
- */
-export abstract class Service<EventDef = {}> {
-
-  /**
-   * The internal event stream of the service
-   */
-  private event$ = new Subject<EventDef>()
-
-  /** The container the service is bound to */
-  #container: Container
-
-  constructor() {
-    if (!currentContainer) {
-      throw new Error(
-        `Tried to initialize service with no container (ID: ${ (this.constructor as any).ID })`
-      )
-    }
-
-    this.#container = currentContainer
-  }
-
-  /**
-   * Binds a dependency service into this service.
-   * @param service The class reference of the service to bind
-   */
-  protected bind<T extends typeof Service<any> & { ID: string }>(service: T): InstanceType<T> {
-    if (!currentContainer) {
-      throw new Error('No currentContainer defined.')
-    }
-
-    return currentContainer.bind(service, this.constructor as typeof Service<any> & { ID: string })
-  }
-
-  /**
-   * Returns the container the service is bound to
-   */
-  protected getContainer(): Container {
-    return this.#container
-  }
-
-  /**
-   * Emits an event on the service's event stream
-   * @param event The event to emit
-   */
-  protected emit(event: EventDef) {
-    this.event$.next(event)
-  }
-
-  /**
-   * Returns the event stream of the service
-   */
-  public getEventStream(): Observable<EventDef> {
-
-    return this.event$.asObservable()
-  }
-}

packages/dioc/lib/testing.ts

@@ -1,33 +0,0 @@
-import { Container, Service } from "./main";
-
-/**
- * A container that can be used for writing tests, contains additional methods
- * for binding suitable for writing tests. (see `bindMock`).
- */
-export class TestContainer extends Container {
-
-  /**
-   * Binds a mock service to the container.
-   *
-   * @param service
-   * @param mock
-   */
-  public bindMock<
-    T extends typeof Service<any> & { ID: string },
-    U extends Partial<InstanceType<T>>
-  >(service: T, mock: U): U {
-    if (this.boundMap.has(service.ID)) {
-      throw new Error(`Service '${service.ID}' already bound to container. Did you already call bindMock on this ?`)
-    }
-
-    this.boundMap.set(service.ID, mock as any)
-
-    this.event$.next({
-      type: "SERVICE_BIND",
-      boundeeID: service.ID,
-      bounderID: undefined,
-    })
-
-    return mock
-  }
-}

packages/dioc/lib/vue.ts

@@ -1,34 +0,0 @@
-import { Plugin, inject } from "vue"
-import { Container } from "./container"
-import { Service } from "./service"
-
-const VUE_CONTAINER_KEY = Symbol()
-
-// TODO: Some Vue version issue with plugin generics is breaking type checking
-/**
- * The Vue Dioc Plugin, this allows the composables to work and access the container
- *
- * NOTE: Make sure you add `vue` as dependency to be able to use this plugin (duh)
- */
-export const diocPlugin: Plugin = {
-  install(app, { container }) {
-    app.provide(VUE_CONTAINER_KEY, container)
-  }
-}
-
-/**
- * A composable that binds a service to a Vue Component
- *
- * @param service The class reference of the service to bind
- */
-export function useService<
-  T extends typeof Service<any> & { ID: string }
->(service: T): InstanceType<T> {
-  const container = inject(VUE_CONTAINER_KEY) as Container | undefined | null
-
-  if (!container) {
-    throw new Error("Container not found, did you forget to install the dioc plugin?")
-  }
-
-  return container.bind(service)
-}

packages/dioc/package.json

@@ -1,54 +0,0 @@
-{
-  "name": "dioc",
-  "private": true,
-  "version": "0.1.0",
-  "type": "module",
-  "files": [
-    "dist",
-    "index.d.ts"
-  ],
-  "main": "./dist/counter.umd.cjs",
-  "module": "./dist/counter.js",
-  "types": "./index.d.ts",
-  "exports": {
-    ".": {
-      "types": "./dist/main.d.ts",
-      "require": "./dist/index.cjs",
-      "import": "./dist/index.js"
-    },
-    "./vue": {
-      "types": "./dist/vue.d.ts",
-      "require": "./dist/vue.cjs",
-      "import": "./dist/vue.js"
-    },
-    "./testing": {
-      "types": "./dist/testing.d.ts",
-      "require": "./dist/testing.cjs",
-      "import": "./dist/testing.js"
-    }
-  },
-  "scripts": {
-    "dev": "vite",
-    "build": "vite build && tsc --emitDeclarationOnly",
-    "prepare": "pnpm run build",
-    "test": "vitest run",
-    "do-test": "pnpm run test",
-    "test:watch": "vitest"
-  },
-  "devDependencies": {
-    "typescript": "^4.9.4",
-    "vite": "^4.0.4",
-    "vitest": "^0.29.3"
-  },
-  "dependencies": {
-    "rxjs": "^7.8.1"
-  },
-  "peerDependencies": {
-    "vue": "^3.2.25"
-  },
-  "peerDependenciesMeta": {
-    "vue": {
-      "optional": true
-    }
-  }
-}

packages/dioc/test/container.spec.ts

@@ -1,262 +0,0 @@
-import { it, expect, describe, vi } from "vitest"
-import { Service } from "../lib/service"
-import { Container, currentContainer, ContainerEvent } from "../lib/container"
-
-class TestServiceA extends Service {
-  public static ID = "TestServiceA"
-}
-
-class TestServiceB extends Service {
-  public static ID = "TestServiceB"
-
-  // Marked public to allow for testing
-  public readonly serviceA = this.bind(TestServiceA)
-}
-
-describe("Container", () => {
-  describe("getBoundServiceWithID", () => {
-    it("returns the service instance if it is bound to the container", () => {
-      const container = new Container()
-
-      const service = container.bind(TestServiceA)
-
-      expect(container.getBoundServiceWithID(TestServiceA.ID)).toBe(service)
-    })
-
-    it("returns undefined if the service is not bound to the container", () => {
-      const container = new Container()
-
-      expect(container.getBoundServiceWithID(TestServiceA.ID)).toBeUndefined()
-    })
-  })
-
-  describe("bind", () => {
-    it("correctly binds the service to it", () => {
-      const container = new Container()
-
-      const service = container.bind(TestServiceA)
-
-      // @ts-expect-error getContainer is defined as a protected property, but we are leveraging it here to check
-      expect(service.getContainer()).toBe(container)
-    })
-
-    it("after bind, the current container is set back to its previous value", () => {
-      const originalValue = currentContainer
-
-      const container = new Container()
-      container.bind(TestServiceA)
-
-      expect(currentContainer).toBe(originalValue)
-    })
-
-    it("dependent services are registered in the same container", () => {
-      const container = new Container()
-
-      const serviceB = container.bind(TestServiceB)
-
-      // @ts-expect-error getContainer is defined as a protected property, but we are leveraging it here to check
-      expect(serviceB.serviceA.getContainer()).toBe(container)
-    })
-
-    it("binding an already initialized service returns the initialized instance (services are singletons)", () => {
-      const container = new Container()
-
-      const serviceA = container.bind(TestServiceA)
-      const serviceA2 = container.bind(TestServiceA)
-
-      expect(serviceA).toBe(serviceA2)
-    })
-
-    it("binding a service which is a dependency of another service returns the same instance created from the dependency resolution (services are singletons)", () => {
-      const container = new Container()
-
-      const serviceB = container.bind(TestServiceB)
-      const serviceA = container.bind(TestServiceA)
-
-      expect(serviceB.serviceA).toBe(serviceA)
-    })
-
-    it("binding an initialized service as a dependency returns the same instance", () => {
-      const container = new Container()
-
-      const serviceA = container.bind(TestServiceA)
-      const serviceB = container.bind(TestServiceB)
-
-      expect(serviceB.serviceA).toBe(serviceA)
-    })
-
-    it("container emits an init event when an uninitialized service is initialized via bind and event only called once", () => {
-      const container = new Container()
-
-      const serviceFunc = vi.fn<
-        [ContainerEvent & { type: "SERVICE_INIT" }],
-        void
-      >()
-
-      container.getEventStream().subscribe((ev) => {
-        if (ev.type === "SERVICE_INIT") {
-          serviceFunc(ev)
-        }
-      })
-
-      const instance = container.bind(TestServiceA)
-
-      expect(serviceFunc).toHaveBeenCalledOnce()
-      expect(serviceFunc).toHaveBeenCalledWith(<ContainerEvent>{
-        type: "SERVICE_INIT",
-        serviceID: TestServiceA.ID,
-      })
-    })
-
-    it("the bind event emitted has an undefined bounderID when the service is bound directly to the container", () => {
-      const container = new Container()
-
-      const serviceFunc = vi.fn<
-        [ContainerEvent & { type: "SERVICE_BIND" }],
-        void
-      >()
-
-      container.getEventStream().subscribe((ev) => {
-        if (ev.type === "SERVICE_BIND") {
-          serviceFunc(ev)
-        }
-      })
-
-      container.bind(TestServiceA)
-
-      expect(serviceFunc).toHaveBeenCalledOnce()
-      expect(serviceFunc).toHaveBeenCalledWith(<ContainerEvent>{
-        type: "SERVICE_BIND",
-        boundeeID: TestServiceA.ID,
-        bounderID: undefined,
-      })
-    })
-
-    it("the bind event emitted has the correct bounderID when the service is bound to another service", () => {
-      const container = new Container()
-
-      const serviceFunc = vi.fn<
-        [ContainerEvent & { type: "SERVICE_BIND" }],
-        void
-      >()
-
-      container.getEventStream().subscribe((ev) => {
-        // We only care about the bind event of TestServiceA
-        if (ev.type === "SERVICE_BIND" && ev.boundeeID === TestServiceA.ID) {
-          serviceFunc(ev)
-        }
-      })
-
-      container.bind(TestServiceB)
-
-      expect(serviceFunc).toHaveBeenCalledOnce()
-      expect(serviceFunc).toHaveBeenCalledWith(<ContainerEvent>{
-        type: "SERVICE_BIND",
-        boundeeID: TestServiceA.ID,
-        bounderID: TestServiceB.ID,
-      })
-    })
-  })
-
-  describe("hasBound", () => {
-    it("returns true if the given service is bound to the container", () => {
-      const container = new Container()
-
-      container.bind(TestServiceA)
-
-      expect(container.hasBound(TestServiceA)).toEqual(true)
-    })
-
-    it("returns false if the given service is not bound to the container", () => {
-      const container = new Container()
-
-      expect(container.hasBound(TestServiceA)).toEqual(false)
-    })
-
-    it("returns true when the service is bound because it is a dependency of another service", () => {
-      const container = new Container()
-
-      container.bind(TestServiceB)
-
-      expect(container.hasBound(TestServiceA)).toEqual(true)
-    })
-  })
-
-  describe("getEventStream", () => {
-    it("returns an observable which emits events correctly when services are initialized", () => {
-      const container = new Container()
-
-      const serviceFunc = vi.fn<
-        [ContainerEvent & { type: "SERVICE_INIT" }],
-        void
-      >()
-
-      container.getEventStream().subscribe((ev) => {
-        if (ev.type === "SERVICE_INIT") {
-          serviceFunc(ev)
-        }
-      })
-
-      container.bind(TestServiceB)
-
-      expect(serviceFunc).toHaveBeenCalledTimes(2)
-      expect(serviceFunc).toHaveBeenNthCalledWith(1, <ContainerEvent>{
-        type: "SERVICE_INIT",
-        serviceID: TestServiceA.ID,
-      })
-      expect(serviceFunc).toHaveBeenNthCalledWith(2, <ContainerEvent>{
-        type: "SERVICE_INIT",
-        serviceID: TestServiceB.ID,
-      })
-    })
-
-    it("returns an observable which emits events correctly when services are bound", () => {
-      const container = new Container()
-
-      const serviceFunc = vi.fn<
-        [ContainerEvent & { type: "SERVICE_BIND" }],
-        void
-      >()
-
-      container.getEventStream().subscribe((ev) => {
-        if (ev.type === "SERVICE_BIND") {
-          serviceFunc(ev)
-        }
-      })
-
-      container.bind(TestServiceB)
-
-      expect(serviceFunc).toHaveBeenCalledTimes(2)
-      expect(serviceFunc).toHaveBeenNthCalledWith(1, <ContainerEvent>{
-        type: "SERVICE_BIND",
-        boundeeID: TestServiceA.ID,
-        bounderID: TestServiceB.ID,
-      })
-      expect(serviceFunc).toHaveBeenNthCalledWith(2, <ContainerEvent>{
-        type: "SERVICE_BIND",
-        boundeeID: TestServiceB.ID,
-        bounderID: undefined,
-      })
-    })
-  })
-
-  describe("getBoundServices", () => {
-    it("returns an iterator over all services bound to the container in the format [service id, service instance]", () => {
-      const container = new Container()
-
-      const instanceB = container.bind(TestServiceB)
-      const instanceA = instanceB.serviceA
-
-      expect(Array.from(container.getBoundServices())).toEqual([
-        [TestServiceA.ID, instanceA],
-        [TestServiceB.ID, instanceB],
-      ])
-    })
-
-    it("returns an empty iterator if no services are bound", () => {
-      const container = new Container()
-
-      expect(Array.from(container.getBoundServices())).toEqual([])
-    })
-  })
-})

packages/dioc/test/service.spec.ts

@@ -1,66 +0,0 @@
-import { describe, expect, it, vi } from "vitest"
-import { Service, Container } from "../lib/main"
-
-class TestServiceA extends Service {
-  public static ID = "TestServiceA"
-}
-
-class TestServiceB extends Service<"test"> {
-  public static ID = "TestServiceB"
-
-  // Marked public to allow for testing
-  public readonly serviceA = this.bind(TestServiceA)
-
-  public emitTestEvent() {
-    this.emit("test")
-  }
-}
-
-describe("Service", () => {
-  describe("constructor", () => {
-    it("throws an error if the service is initialized without a container", () => {
-      expect(() => new TestServiceA()).toThrowError(
-        "Tried to initialize service with no container (ID: TestServiceA)"
-      )
-    })
-  })
-
-  describe("bind", () => {
-    it("correctly binds the dependency service using the container", () => {
-      const container = new Container()
-
-      const serviceA = container.bind(TestServiceA)
-
-      const serviceB = container.bind(TestServiceB)
-      expect(serviceB.serviceA).toBe(serviceA)
-    })
-  })
-
-  describe("getContainer", () => {
-    it("returns the container the service is bound to", () => {
-      const container = new Container()
-
-      const serviceA = container.bind(TestServiceA)
-
-      // @ts-expect-error getContainer is a protected member, we are just using it to help with testing
-      expect(serviceA.getContainer()).toBe(container)
-    })
-  })
-
-  describe("getEventStream", () => {
-    it("returns the valid event stream of the service", () => {
-      const container = new Container()
-
-      const serviceB = container.bind(TestServiceB)
-
-      const serviceFunc = vi.fn()
-
-      serviceB.getEventStream().subscribe(serviceFunc)
-
-      serviceB.emitTestEvent()
-
-      expect(serviceFunc).toHaveBeenCalledOnce()
-      expect(serviceFunc).toHaveBeenCalledWith("test")
-    })
-  })
-})

packages/dioc/test/test-container.spec.ts

@@ -1,92 +0,0 @@
-import { describe, expect, it, vi } from "vitest"
-import { TestContainer } from "../lib/testing"
-import { Service } from "../lib/service"
-import { ContainerEvent } from "../lib/container"
-
-class TestServiceA extends Service {
-  public static ID = "TestServiceA"
-
-  public test() {
-    return "real"
-  }
-}
-
-class TestServiceB extends Service {
-  public static ID = "TestServiceB"
-
-  // declared public to help with testing
-  public readonly serviceA = this.bind(TestServiceA)
-
-  public test() {
-    return this.serviceA.test()
-  }
-}
-
-describe("TestContainer", () => {
-  describe("bindMock", () => {
-    it("returns the fake service defined", () => {
-      const container = new TestContainer()
-
-      const fakeService = {
-        test: () => "fake",
-      }
-
-      const result = container.bindMock(TestServiceA, fakeService)
-
-      expect(result).toBe(fakeService)
-    })
-
-    it("new services bound to the container get the mock service", () => {
-      const container = new TestContainer()
-
-      const fakeServiceA = {
-        test: () => "fake",
-      }
-
-      container.bindMock(TestServiceA, fakeServiceA)
-
-      const serviceB = container.bind(TestServiceB)
-
-      expect(serviceB.serviceA).toBe(fakeServiceA)
-    })
-
-    it("container emits SERVICE_BIND event", () => {
-      const container = new TestContainer()
-
-      const fakeServiceA = {
-        test: () => "fake",
-      }
-
-      const serviceFunc = vi.fn<[ContainerEvent, void]>()
-
-      container.getEventStream().subscribe((ev) => {
-        serviceFunc(ev)
-      })
-
-      container.bindMock(TestServiceA, fakeServiceA)
-
-      expect(serviceFunc).toHaveBeenCalledOnce()
-      expect(serviceFunc).toHaveBeenCalledWith(<ContainerEvent>{
-        type: "SERVICE_BIND",
-        boundeeID: TestServiceA.ID,
-        bounderID: undefined,
-      })
-    })
-
-    it("throws if service already bound", () => {
-      const container = new TestContainer()
-
-      const fakeServiceA = {
-        test: () => "fake",
-      }
-
-      container.bindMock(TestServiceA, fakeServiceA)
-
-      expect(() => {
-        container.bindMock(TestServiceA, fakeServiceA)
-      }).toThrowError(
-        "Service 'TestServiceA' already bound to container. Did you already call bindMock on this ?"
-      )
-    })
-  })
-})

packages/dioc/testing.d.ts

@@ -1,2 +0,0 @@
-export { default } from "./dist/testing.d.ts"
-export * from "./dist/testing.d.ts"

packages/dioc/tsconfig.json

@@ -1,21 +0,0 @@
-{
-  "compilerOptions": {
-    "target": "ESNext",
-    "useDefineForClassFields": true,
-    "module": "ESNext",
-    "lib": ["ESNext", "DOM"],
-    "moduleResolution": "Node",
-    "strict": true,
-    "declaration": true,
-    "sourceMap": true,
-    "outDir": "dist",
-    "resolveJsonModule": true,
-    "isolatedModules": true,
-    "esModuleInterop": true,
-    "noUnusedLocals": true,
-    "noUnusedParameters": true,
-    "noImplicitReturns": true,
-    "skipLibCheck": true
-  },
-  "include": ["lib"]
-}

packages/dioc/vite.config.ts

@@ -1,16 +0,0 @@
-import { defineConfig } from 'vite'
-
-export default defineConfig({
-  build: {
-    lib: {
-      entry: {
-        index: './lib/main.ts',
-        vue: './lib/vue.ts',
-        testing: './lib/testing.ts',
-      },
-    },
-    rollupOptions: {
-      external: ['vue'],
-    }
-  },
-})

packages/dioc/vitest.config.ts

@@ -1,7 +0,0 @@
-import { defineConfig } from "vitest/config"
-
-export default defineConfig({
-  test: {
-
-  }
-})

packages/dioc/vue.d.ts

@@ -1,2 +0,0 @@
-export { default } from "./dist/vue.d.ts"
-export * from "./dist/vue.d.ts"

packages/hoppscotch-backend/package.json

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

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

@@ -411,23 +411,6 @@ export class AdminResolver {
     return deletedTeam.right;
   }
 
-  @Mutation(() => Boolean, {
-    description: 'Revoke a team Invite by Invite ID',
-  })
-  @UseGuards(GqlAuthGuard, GqlAdminGuard)
-  async revokeTeamInviteByAdmin(
-    @Args({
-      name: 'inviteID',
-      description: 'Team Invite ID',
-      type: () => ID,
-    })
-    inviteID: string,
-  ): Promise<boolean> {
-    const invite = await this.adminService.revokeTeamInviteByID(inviteID);
-    if (E.isLeft(invite)) throwErr(invite.left);
-    return true;
-  }
-
   /* Subscriptions */
 
   @Subscription(() => InvitedUser, {

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

@@ -11,7 +11,6 @@ import {
   INVALID_EMAIL,
   ONLY_ONE_ADMIN_ACCOUNT,
   TEAM_INVITE_ALREADY_MEMBER,
-  TEAM_INVITE_NO_INVITE_FOUND,
   USER_ALREADY_INVITED,
   USER_IS_ADMIN,
   USER_NOT_FOUND,
@@ -182,7 +181,7 @@ export class AdminService {
    * @returns an array team invitations
    */
   async pendingInvitationCountInTeam(teamID: string) {
-    const invitations = await this.teamInvitationService.getTeamInvitations(
+    const invitations = await this.teamInvitationService.getAllTeamInvitations(
       teamID,
     );
 
@@ -258,7 +257,7 @@ export class AdminService {
       if (E.isRight(userInvitation)) {
         await this.teamInvitationService.revokeInvitation(
           userInvitation.right.id,
-        );
+        )();
       }
 
       return E.right(addedUser.right);
@@ -417,19 +416,4 @@ export class AdminService {
     if (E.isLeft(team)) return E.left(team.left);
     return E.right(team.right);
   }
-
-  /**
-   * Revoke a team invite by ID
-   * @param inviteID Team Invite ID
-   * @returns an Either of boolean or error
-   */
-  async revokeTeamInviteByID(inviteID: string) {
-    const teamInvite = await this.teamInvitationService.revokeInvitation(
-      inviteID,
-    );
-
-    if (E.isLeft(teamInvite)) return E.left(teamInvite.left);
-
-    return E.right(teamInvite.right);
-  }
 }

packages/hoppscotch-backend/src/auth/auth.controller.ts

@@ -2,9 +2,9 @@ import {
   Body,
   Controller,
   Get,
-  InternalServerErrorException,
   Post,
   Query,
+  Req,
   Request,
   Res,
   UseGuards,
@@ -19,18 +19,12 @@ import { JwtAuthGuard } from './guards/jwt-auth.guard';
 import { GqlUser } from 'src/decorators/gql-user.decorator';
 import { AuthUser } from 'src/types/AuthUser';
 import { RTCookie } from 'src/decorators/rt-cookie.decorator';
-import {
+import { authCookieHandler, throwHTTPErr } from './helper';
-  AuthProvider,
-  authCookieHandler,
-  authProviderCheck,
-  throwHTTPErr,
-} from './helper';
 import { GoogleSSOGuard } from './guards/google-sso.guard';
 import { GithubSSOGuard } from './guards/github-sso.guard';
 import { MicrosoftSSOGuard } from './guards/microsoft-sso-.guard';
 import { ThrottlerBehindProxyGuard } from 'src/guards/throttler-behind-proxy.guard';
 import { SkipThrottle } from '@nestjs/throttler';
-import { AUTH_PROVIDER_NOT_SPECIFIED } from 'src/errors';
 
 @UseGuards(ThrottlerBehindProxyGuard)
 @Controller({ path: 'auth', version: '1' })
@@ -45,9 +39,6 @@ export class AuthController {
     @Body() authData: SignInMagicDto,
     @Query('origin') origin: string,
   ) {
-    if (!authProviderCheck(AuthProvider.EMAIL))
-      throwHTTPErr({ message: AUTH_PROVIDER_NOT_SPECIFIED, statusCode: 404 });
-
     const deviceIdToken = await this.authService.signInMagicLink(
       authData.email,
       origin,

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

@@ -11,7 +11,6 @@ import { RTJwtStrategy } from './strategies/rt-jwt.strategy';
 import { GoogleStrategy } from './strategies/google.strategy';
 import { GithubStrategy } from './strategies/github.strategy';
 import { MicrosoftStrategy } from './strategies/microsoft.strategy';
-import { AuthProvider, authProviderCheck } from './helper';
 
 @Module({
   imports: [
@@ -27,9 +26,9 @@ import { AuthProvider, authProviderCheck } from './helper';
     AuthService,
     JwtStrategy,
     RTJwtStrategy,
-    ...(authProviderCheck(AuthProvider.GOOGLE) ? [GoogleStrategy] : []),
+    GoogleStrategy,
-    ...(authProviderCheck(AuthProvider.GITHUB) ? [GithubStrategy] : []),
+    GithubStrategy,
-    ...(authProviderCheck(AuthProvider.MICROSOFT) ? [MicrosoftStrategy] : []),
+    MicrosoftStrategy,
   ],
   controllers: [AuthController],
 })

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

@@ -228,7 +228,7 @@ export class AuthService {
         url = process.env.VITE_BASE_URL;
     }
 
-    await this.mailerService.sendEmail(email, {
+    await this.mailerService.sendAuthEmail(email, {
       template: 'code-your-own',
       variables: {
         inviteeEmail: email,

packages/hoppscotch-backend/src/auth/guards/github-sso.guard.ts

@@ -1,20 +1,8 @@
-import { CanActivate, ExecutionContext, Injectable } from '@nestjs/common';
+import { ExecutionContext, Injectable } from '@nestjs/common';
 import { AuthGuard } from '@nestjs/passport';
-import { AuthProvider, authProviderCheck, throwHTTPErr } from '../helper';
-import { Observable } from 'rxjs';
-import { AUTH_PROVIDER_NOT_SPECIFIED } from 'src/errors';
 
 @Injectable()
-export class GithubSSOGuard extends AuthGuard('github') implements CanActivate {
+export class GithubSSOGuard extends AuthGuard('github') {
-  canActivate(
-    context: ExecutionContext,
-  ): boolean | Promise<boolean> | Observable<boolean> {
-    if (!authProviderCheck(AuthProvider.GITHUB))
-      throwHTTPErr({ message: AUTH_PROVIDER_NOT_SPECIFIED, statusCode: 404 });
-
-    return super.canActivate(context);
-  }
-
   getAuthenticateOptions(context: ExecutionContext) {
     const req = context.switchToHttp().getRequest();
 

packages/hoppscotch-backend/src/auth/guards/google-sso.guard.ts

@@ -1,20 +1,8 @@
-import { CanActivate, ExecutionContext, Injectable } from '@nestjs/common';
+import { ExecutionContext, Injectable } from '@nestjs/common';
 import { AuthGuard } from '@nestjs/passport';
-import { AuthProvider, authProviderCheck, throwHTTPErr } from '../helper';
-import { Observable } from 'rxjs';
-import { AUTH_PROVIDER_NOT_SPECIFIED } from 'src/errors';
 
 @Injectable()
-export class GoogleSSOGuard extends AuthGuard('google') implements CanActivate {
+export class GoogleSSOGuard extends AuthGuard('google') {
-  canActivate(
-    context: ExecutionContext,
-  ): boolean | Promise<boolean> | Observable<boolean> {
-    if (!authProviderCheck(AuthProvider.GOOGLE))
-      throwHTTPErr({ message: AUTH_PROVIDER_NOT_SPECIFIED, statusCode: 404 });
-
-    return super.canActivate(context);
-  }
-
   getAuthenticateOptions(context: ExecutionContext) {
     const req = context.switchToHttp().getRequest();
 

packages/hoppscotch-backend/src/auth/guards/microsoft-sso-.guard.ts

@@ -1,26 +1,8 @@
-import { CanActivate, ExecutionContext, Injectable } from '@nestjs/common';
+import { ExecutionContext, Injectable } from '@nestjs/common';
 import { AuthGuard } from '@nestjs/passport';
-import { AuthProvider, authProviderCheck, throwHTTPErr } from '../helper';
-import { Observable } from 'rxjs';
-import { AUTH_PROVIDER_NOT_SPECIFIED } from 'src/errors';
 
 @Injectable()
-export class MicrosoftSSOGuard
+export class MicrosoftSSOGuard extends AuthGuard('microsoft') {
-  extends AuthGuard('microsoft')
-  implements CanActivate
-{
-  canActivate(
-    context: ExecutionContext,
-  ): boolean | Promise<boolean> | Observable<boolean> {
-    if (!authProviderCheck(AuthProvider.MICROSOFT))
-      throwHTTPErr({
-        message: AUTH_PROVIDER_NOT_SPECIFIED,
-        statusCode: 404,
-      });
-
-    return super.canActivate(context);
-  }
-
   getAuthenticateOptions(context: ExecutionContext) {
     const req = context.switchToHttp().getRequest();
 

packages/hoppscotch-backend/src/auth/helper.ts

@@ -1,11 +1,10 @@
-import { HttpException, HttpStatus } from '@nestjs/common';
+import { ForbiddenException, HttpException, HttpStatus } from '@nestjs/common';
 import { DateTime } from 'luxon';
 import { AuthError } from 'src/types/AuthError';
 import { AuthTokens } from 'src/types/AuthTokens';
 import { Response } from 'express';
 import * as cookie from 'cookie';
-import { AUTH_PROVIDER_NOT_SPECIFIED, COOKIES_NOT_FOUND } from 'src/errors';
+import { COOKIES_NOT_FOUND } from 'src/errors';
-import { throwErr } from 'src/utils';
 
 enum AuthTokenType {
   ACCESS_TOKEN = 'access_token',
@@ -17,13 +16,6 @@ export enum Origin {
   APP = 'app',
 }
 
-export enum AuthProvider {
-  GOOGLE = 'GOOGLE',
-  GITHUB = 'GITHUB',
-  MICROSOFT = 'MICROSOFT',
-  EMAIL = 'EMAIL',
-}
-
 /**
  * This function allows throw to be used as an expression
  * @param errMessage Message present in the error message
@@ -105,25 +97,3 @@ export const subscriptionContextCookieParser = (rawCookies: string) => {
     refresh_token: cookies[AuthTokenType.REFRESH_TOKEN],
   };
 };
-
-/**
- * Check to see if given auth provider is present in the ALLOWED_AUTH_PROVIDERS env variable
- *
- * @param provider Provider we want to check the presence of
- * @returns Boolean if provider specified is present or not
- */
-export function authProviderCheck(provider: string) {
-  if (!provider) {
-    throwErr(AUTH_PROVIDER_NOT_SPECIFIED);
-  }
-
-  const envVariables = process.env.ALLOWED_AUTH_PROVIDERS
-    ? process.env.ALLOWED_AUTH_PROVIDERS.split(',').map((provider) =>
-        provider.trim().toUpperCase(),
-      )
-    : [];
-
-  if (!envVariables.includes(provider.toUpperCase())) return false;
-
-  return true;
-}

packages/hoppscotch-backend/src/auth/strategies/microsoft.strategy.ts

@@ -17,7 +17,7 @@ export class MicrosoftStrategy extends PassportStrategy(Strategy) {
       clientSecret: process.env.MICROSOFT_CLIENT_SECRET,
       callbackURL: process.env.MICROSOFT_CALLBACK_URL,
       scope: [process.env.MICROSOFT_SCOPE],
-      tenant: process.env.MICROSOFT_TENANT,
+      passReqToCallback: true,
       store: true,
     });
   }

packages/hoppscotch-backend/src/errors.ts

@@ -22,30 +22,6 @@ export const AUTH_FAIL = 'auth/fail';
  */
 export const JSON_INVALID = 'json_invalid';
 
-/**
- * Auth Provider not specified
- * (Auth)
- */
-export const AUTH_PROVIDER_NOT_SPECIFIED = 'auth/provider_not_specified';
-
-/**
- * Environment variable "ALLOWED_AUTH_PROVIDERS" is not present in .env file
- */
-export const ENV_NOT_FOUND_KEY_AUTH_PROVIDERS =
-  '"ALLOWED_AUTH_PROVIDERS" is not present in .env file';
-
-/**
- * Environment variable "ALLOWED_AUTH_PROVIDERS" is empty in .env file
- */
-export const ENV_EMPTY_AUTH_PROVIDERS =
-  '"ALLOWED_AUTH_PROVIDERS" is empty in .env file';
-
-/**
- * Environment variable "ALLOWED_AUTH_PROVIDERS" contains unsupported provider in .env file
- */
-export const ENV_NOT_SUPPORT_AUTH_PROVIDERS =
-  '"ALLOWED_AUTH_PROVIDERS" contains an unsupported auth provider in .env file';
-
 /**
  * Tried to delete a user data document from fb firestore but failed.
  * (FirebaseService)
@@ -336,13 +312,6 @@ export const SHORTCODE_ALREADY_EXISTS = 'shortcode/already_exists' as const;
  */
 export const TEAM_ENVIRONMENT_NOT_FOUND = 'team_environment/not_found' as const;
 
-/**
- * Invalid TEAM ENVIRONMENT name
- * (TeamEnvironmentsService)
- */
-export const TEAM_ENVIRONMENT_SHORT_NAME =
-  'team_environment/short_name' as const;
-
 /**
  * The user is not a member of the team of the given environment
  * (GqlTeamEnvTeamGuard)

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

@@ -5,6 +5,7 @@ import {
   UserMagicLinkMailDescription,
 } from './MailDescriptions';
 import { throwErr } from 'src/utils';
+import * as TE from 'fp-ts/TaskEither';
 import { EMAIL_FAILED } from 'src/errors';
 import { MailerService as NestMailerService } from '@nestjs-modules/mailer';
 
@@ -34,14 +35,33 @@ export class MailerService {
 
   /**
    * Sends an email to the given email address given a mail description
-   * @param to Receiver's email id
+   * @param to The email address to be sent to (NOTE: this is not validated)
    * @param mailDesc Definition of what email to be sent
-   * @returns Response if email was send successfully or not
    */
-  async sendEmail(
+  sendMail(
     to: string,
     mailDesc: MailDescription | UserMagicLinkMailDescription,
   ) {
+    return TE.tryCatch(
+      async () => {
+        await this.nestMailerService.sendMail({
+          to,
+          template: mailDesc.template,
+          subject: this.resolveSubjectForMailDesc(mailDesc),
+          context: mailDesc.variables,
+        });
+      },
+      () => EMAIL_FAILED,
+    );
+  }
+
+  /**
+   *
+   * @param to Receiver's email id
+   * @param mailDesc Details of email to be sent for Magic-Link auth
+   * @returns Response if email was send successfully or not
+   */
+  async sendAuthEmail(to: string, mailDesc: UserMagicLinkMailDescription) {
     try {
       await this.nestMailerService.sendMail({
         to,

packages/hoppscotch-backend/src/main.ts

@@ -5,14 +5,11 @@ import * as cookieParser from 'cookie-parser';
 import { VersioningType } from '@nestjs/common';
 import * as session from 'express-session';
 import { emitGQLSchemaFile } from './gql-schema';
-import { checkEnvironmentAuthProvider } from './utils';
 
 async function bootstrap() {
   console.log(`Running in production: ${process.env.PRODUCTION}`);
   console.log(`Port: ${process.env.PORT}`);
 
-  checkEnvironmentAuthProvider();
-
   const app = await NestFactory.create(AppModule);
 
   app.use(

packages/hoppscotch-backend/src/team-environments/gql-team-env-team.guard.ts

@@ -1,5 +1,15 @@
 import { CanActivate, ExecutionContext, Injectable } from '@nestjs/common';
 import { Reflector } from '@nestjs/core';
+import * as TE from 'fp-ts/TaskEither';
+import * as O from 'fp-ts/Option';
+import * as S from 'fp-ts/string';
+import { pipe } from 'fp-ts/function';
+import {
+  getAnnotatedRequiredRoles,
+  getGqlArg,
+  getUserFromGQLContext,
+  throwErr,
+} from 'src/utils';
 import { TeamEnvironmentsService } from './team-environments.service';
 import {
   BUG_AUTH_NO_USER_CTX,
@@ -9,10 +19,6 @@ import {
   TEAM_ENVIRONMENT_NOT_FOUND,
 } from 'src/errors';
 import { TeamService } from 'src/team/team.service';
-import { GqlExecutionContext } from '@nestjs/graphql';
-import * as E from 'fp-ts/Either';
-import { TeamMemberRole } from '@prisma/client';
-import { throwErr } from 'src/utils';
 
 /**
  * A guard which checks whether the caller of a GQL Operation
@@ -27,31 +33,50 @@ export class GqlTeamEnvTeamGuard implements CanActivate {
     private readonly teamService: TeamService,
   ) {}
 
-  async canActivate(context: ExecutionContext): Promise<boolean> {
+  canActivate(context: ExecutionContext): Promise<boolean> {
-    const requireRoles = this.reflector.get<TeamMemberRole[]>(
+    return pipe(
-      'requiresTeamRole',
+      TE.Do,
-      context.getHandler(),
-    );
-    if (!requireRoles) throw new Error(BUG_TEAM_ENV_GUARD_NO_REQUIRE_ROLES);
 
-    const gqlExecCtx = GqlExecutionContext.create(context);
+      TE.bindW('requiredRoles', () =>
+        pipe(
+          getAnnotatedRequiredRoles(this.reflector, context),
+          TE.fromOption(() => BUG_TEAM_ENV_GUARD_NO_REQUIRE_ROLES),
+        ),
+      ),
 
-    const { user } = gqlExecCtx.getContext().req;
+      TE.bindW('user', () =>
-    if (user == undefined) throw new Error(BUG_AUTH_NO_USER_CTX);
+        pipe(
+          getUserFromGQLContext(context),
+          TE.fromOption(() => BUG_AUTH_NO_USER_CTX),
+        ),
+      ),
 
-    const { id } = gqlExecCtx.getArgs<{ id: string }>();
+      TE.bindW('envID', () =>
-    if (!id) throwErr(BUG_TEAM_ENV_GUARD_NO_ENV_ID);
+        pipe(
+          getGqlArg('id', context),
+          O.fromPredicate(S.isString),
+          TE.fromOption(() => BUG_TEAM_ENV_GUARD_NO_ENV_ID),
+        ),
+      ),
 
-    const teamEnvironment =
+      TE.bindW('membership', ({ envID, user }) =>
-      await this.teamEnvironmentService.getTeamEnvironment(id);
+        pipe(
-    if (E.isLeft(teamEnvironment)) throwErr(TEAM_ENVIRONMENT_NOT_FOUND);
+          this.teamEnvironmentService.getTeamEnvironment(envID),
+          TE.fromTaskOption(() => TEAM_ENVIRONMENT_NOT_FOUND),
+          TE.chainW((env) =>
+            pipe(
+              this.teamService.getTeamMemberTE(env.teamID, user.uid),
+              TE.mapLeft(() => TEAM_ENVIRONMENT_NOT_TEAM_MEMBER),
+            ),
+          ),
+        ),
+      ),
 
-    const member = await this.teamService.getTeamMember(
+      TE.map(({ membership, requiredRoles }) =>
-      teamEnvironment.right.teamID,
+        requiredRoles.includes(membership.role),
-      user.uid,
+      ),
-    );
-    if (!member) throwErr(TEAM_ENVIRONMENT_NOT_TEAM_MEMBER);
 
-    return requireRoles.includes(member.role);
+      TE.getOrElse(throwErr),
+    )();
   }
 }

packages/hoppscotch-backend/src/team-environments/input-type.args.ts

@@ -1,41 +0,0 @@
-import { ArgsType, Field, ID } from '@nestjs/graphql';
-
-@ArgsType()
-export class CreateTeamEnvironmentArgs {
-  @Field({
-    name: 'name',
-    description: 'Name of the Team Environment',
-  })
-  name: string;
-
-  @Field(() => ID, {
-    name: 'teamID',
-    description: 'ID of the Team',
-  })
-  teamID: string;
-
-  @Field({
-    name: 'variables',
-    description: 'JSON string of the variables object',
-  })
-  variables: string;
-}
-
-@ArgsType()
-export class UpdateTeamEnvironmentArgs {
-  @Field(() => ID, {
-    name: 'id',
-    description: 'ID of the Team Environment',
-  })
-  id: string;
-  @Field({
-    name: 'name',
-    description: 'Name of the Team Environment',
-  })
-  name: string;
-  @Field({
-    name: 'variables',
-    description: 'JSON string of the variables object',
-  })
-  variables: string;
-}

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

@@ -13,11 +13,6 @@ import { throwErr } from 'src/utils';
 import { GqlTeamEnvTeamGuard } from './gql-team-env-team.guard';
 import { TeamEnvironment } from './team-environments.model';
 import { TeamEnvironmentsService } from './team-environments.service';
-import * as E from 'fp-ts/Either';
-import {
-  CreateTeamEnvironmentArgs,
-  UpdateTeamEnvironmentArgs,
-} from './input-type.args';
 
 @UseGuards(GqlThrottlerGuard)
 @Resolver(() => 'TeamEnvironment')
@@ -34,18 +29,29 @@ export class TeamEnvironmentsResolver {
   })
   @UseGuards(GqlAuthGuard, GqlTeamMemberGuard)
   @RequiresTeamRole(TeamMemberRole.OWNER, TeamMemberRole.EDITOR)
-  async createTeamEnvironment(
+  createTeamEnvironment(
-    @Args() args: CreateTeamEnvironmentArgs,
+    @Args({
+      name: 'name',
+      description: 'Name of the Team Environment',
+    })
+    name: string,
+    @Args({
+      name: 'teamID',
+      description: 'ID of the Team',
+      type: () => ID,
+    })
+    teamID: string,
+    @Args({
+      name: 'variables',
+      description: 'JSON string of the variables object',
+    })
+    variables: string,
   ): Promise<TeamEnvironment> {
-    const teamEnvironment =
+    return this.teamEnvironmentsService.createTeamEnvironment(
-      await this.teamEnvironmentsService.createTeamEnvironment(
+      name,
-        args.name,
+      teamID,
-        args.teamID,
+      variables,
-        args.variables,
+    )();
-      );
-
-    if (E.isLeft(teamEnvironment)) throwErr(teamEnvironment.left);
-    return teamEnvironment.right;
   }
 
   @Mutation(() => Boolean, {
@@ -53,7 +59,7 @@ export class TeamEnvironmentsResolver {
   })
   @UseGuards(GqlAuthGuard, GqlTeamEnvTeamGuard)
   @RequiresTeamRole(TeamMemberRole.OWNER, TeamMemberRole.EDITOR)
-  async deleteTeamEnvironment(
+  deleteTeamEnvironment(
     @Args({
       name: 'id',
       description: 'ID of the Team Environment',
@@ -61,12 +67,10 @@ export class TeamEnvironmentsResolver {
     })
     id: string,
   ): Promise<boolean> {
-    const isDeleted = await this.teamEnvironmentsService.deleteTeamEnvironment(
+    return pipe(
-      id,
+      this.teamEnvironmentsService.deleteTeamEnvironment(id),
-    );
+      TE.getOrElse(throwErr),
-
+    )();
-    if (E.isLeft(isDeleted)) throwErr(isDeleted.left);
-    return isDeleted.right;
   }
 
   @Mutation(() => TeamEnvironment, {
@@ -75,19 +79,28 @@ export class TeamEnvironmentsResolver {
   })
   @UseGuards(GqlAuthGuard, GqlTeamEnvTeamGuard)
   @RequiresTeamRole(TeamMemberRole.OWNER, TeamMemberRole.EDITOR)
-  async updateTeamEnvironment(
+  updateTeamEnvironment(
-    @Args()
+    @Args({
-    args: UpdateTeamEnvironmentArgs,
+      name: 'id',
+      description: 'ID of the Team Environment',
+      type: () => ID,
+    })
+    id: string,
+    @Args({
+      name: 'name',
+      description: 'Name of the Team Environment',
+    })
+    name: string,
+    @Args({
+      name: 'variables',
+      description: 'JSON string of the variables object',
+    })
+    variables: string,
   ): Promise<TeamEnvironment> {
-    const updatedTeamEnvironment =
+    return pipe(
-      await this.teamEnvironmentsService.updateTeamEnvironment(
+      this.teamEnvironmentsService.updateTeamEnvironment(id, name, variables),
-        args.id,
+      TE.getOrElse(throwErr),
-        args.name,
+    )();
-        args.variables,
-      );
-
-    if (E.isLeft(updatedTeamEnvironment)) throwErr(updatedTeamEnvironment.left);
-    return updatedTeamEnvironment.right;
   }
 
   @Mutation(() => TeamEnvironment, {
@@ -95,7 +108,7 @@ export class TeamEnvironmentsResolver {
   })
   @UseGuards(GqlAuthGuard, GqlTeamEnvTeamGuard)
   @RequiresTeamRole(TeamMemberRole.OWNER, TeamMemberRole.EDITOR)
-  async deleteAllVariablesFromTeamEnvironment(
+  deleteAllVariablesFromTeamEnvironment(
     @Args({
       name: 'id',
       description: 'ID of the Team Environment',
@@ -103,13 +116,10 @@ export class TeamEnvironmentsResolver {
     })
     id: string,
   ): Promise<TeamEnvironment> {
-    const teamEnvironment =
+    return pipe(
-      await this.teamEnvironmentsService.deleteAllVariablesFromTeamEnvironment(
+      this.teamEnvironmentsService.deleteAllVariablesFromTeamEnvironment(id),
-        id,
+      TE.getOrElse(throwErr),
-      );
+    )();
-
-    if (E.isLeft(teamEnvironment)) throwErr(teamEnvironment.left);
-    return teamEnvironment.right;
   }
 
   @Mutation(() => TeamEnvironment, {
@@ -117,7 +127,7 @@ export class TeamEnvironmentsResolver {
   })
   @UseGuards(GqlAuthGuard, GqlTeamEnvTeamGuard)
   @RequiresTeamRole(TeamMemberRole.OWNER, TeamMemberRole.EDITOR)
-  async createDuplicateEnvironment(
+  createDuplicateEnvironment(
     @Args({
       name: 'id',
       description: 'ID of the Team Environment',
@@ -125,12 +135,10 @@ export class TeamEnvironmentsResolver {
     })
     id: string,
   ): Promise<TeamEnvironment> {
-    const res = await this.teamEnvironmentsService.createDuplicateEnvironment(
+    return pipe(
-      id,
+      this.teamEnvironmentsService.createDuplicateEnvironment(id),
-    );
+      TE.getOrElse(throwErr),
-
+    )();
-    if (E.isLeft(res)) throwErr(res.left);
-    return res.right;
   }
 
   /* Subscriptions */

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

@@ -2,11 +2,7 @@ import { mockDeep, mockReset } from 'jest-mock-extended';
 import { PrismaService } from 'src/prisma/prisma.service';
 import { TeamEnvironment } from './team-environments.model';
 import { TeamEnvironmentsService } from './team-environments.service';
-import {
+import { TEAM_ENVIRONMENT_NOT_FOUND } from 'src/errors';
-  JSON_INVALID,
-  TEAM_ENVIRONMENT_NOT_FOUND,
-  TEAM_ENVIRONMENT_SHORT_NAME,
-} from 'src/errors';
 
 const mockPrisma = mockDeep<PrismaService>();
 
@@ -35,81 +31,125 @@ beforeEach(() => {
 
 describe('TeamEnvironmentsService', () => {
   describe('getTeamEnvironment', () => {
-    test('should successfully return a TeamEnvironment with valid ID', async () => {
+    test('queries the db with the id', async () => {
-      mockPrisma.teamEnvironment.findFirstOrThrow.mockResolvedValueOnce(
+      mockPrisma.teamEnvironment.findFirst.mockResolvedValue(teamEnvironment);
-        teamEnvironment,
-      );
 
-      const result = await teamEnvironmentsService.getTeamEnvironment(
+      await teamEnvironmentsService.getTeamEnvironment('123')();
-        teamEnvironment.id,
+
+      expect(mockPrisma.teamEnvironment.findFirst).toHaveBeenCalledWith(
+        expect.objectContaining({
+          where: {
+            id: '123',
+          },
+        }),
       );
-      expect(result).toEqualRight(teamEnvironment);
     });
 
-    test('should throw TEAM_ENVIRONMENT_NOT_FOUND with invalid ID', async () => {
+    test('requests prisma to reject the query promise if not found', async () => {
-      mockPrisma.teamEnvironment.findFirstOrThrow.mockRejectedValueOnce(
+      mockPrisma.teamEnvironment.findFirst.mockResolvedValue(teamEnvironment);
-        'RejectOnNotFound',
-      );
 
-      const result = await teamEnvironmentsService.getTeamEnvironment(
+      await teamEnvironmentsService.getTeamEnvironment('123')();
-        teamEnvironment.id,
+
+      expect(mockPrisma.teamEnvironment.findFirst).toHaveBeenCalledWith(
+        expect.objectContaining({
+          rejectOnNotFound: true,
+        }),
       );
-      expect(result).toEqualLeft(TEAM_ENVIRONMENT_NOT_FOUND);
+    });
+
+    test('should return a Some of the correct environment if exists', async () => {
+      mockPrisma.teamEnvironment.findFirst.mockResolvedValue(teamEnvironment);
+
+      const result = await teamEnvironmentsService.getTeamEnvironment('123')();
+
+      expect(result).toEqualSome(teamEnvironment);
+    });
+
+    test('should return a None if the environment does not exist', async () => {
+      mockPrisma.teamEnvironment.findFirst.mockRejectedValue('NotFoundError');
+
+      const result = await teamEnvironmentsService.getTeamEnvironment('123')();
+
+      expect(result).toBeNone();
     });
   });
-
   describe('createTeamEnvironment', () => {
-    test('should successfully create and return a new team environment given valid inputs', async () => {
+    test('should create and return a new team environment given a valid name,variable and team ID', async () => {
       mockPrisma.teamEnvironment.create.mockResolvedValue(teamEnvironment);
 
       const result = await teamEnvironmentsService.createTeamEnvironment(
         teamEnvironment.name,
         teamEnvironment.teamID,
         JSON.stringify(teamEnvironment.variables),
-      );
+      )();
 
-      expect(result).toEqualRight({
+      expect(result).toEqual(<TeamEnvironment>{
-        ...teamEnvironment,
+        id: teamEnvironment.id,
+        name: teamEnvironment.name,
+        teamID: teamEnvironment.teamID,
         variables: JSON.stringify(teamEnvironment.variables),
       });
     });
 
-    test('should throw TEAM_ENVIRONMENT_SHORT_NAME if input TeamEnvironment name is invalid', async () => {
+    test('should reject if given team ID is invalid', async () => {
-      const result = await teamEnvironmentsService.createTeamEnvironment(
+      mockPrisma.teamEnvironment.create.mockRejectedValue(null as any);
-        '12',
-        teamEnvironment.teamID,
-        JSON.stringify(teamEnvironment.variables),
-      );
 
-      expect(result).toEqualLeft(TEAM_ENVIRONMENT_SHORT_NAME);
+      await expect(
+        teamEnvironmentsService.createTeamEnvironment(
+          teamEnvironment.name,
+          'invalidteamid',
+          JSON.stringify(teamEnvironment.variables),
+        ),
+      ).rejects.toBeDefined();
+    });
+
+    test('should reject if provided team environment name is not a string', async () => {
+      mockPrisma.teamEnvironment.create.mockRejectedValue(null as any);
+
+      await expect(
+        teamEnvironmentsService.createTeamEnvironment(
+          null as any,
+          teamEnvironment.teamID,
+          JSON.stringify(teamEnvironment.variables),
+        ),
+      ).rejects.toBeDefined();
+    });
+
+    test('should reject if provided variable is not a string', async () => {
+      mockPrisma.teamEnvironment.create.mockRejectedValue(null as any);
+
+      await expect(
+        teamEnvironmentsService.createTeamEnvironment(
+          teamEnvironment.name,
+          teamEnvironment.teamID,
+          null as any,
+        ),
+      ).rejects.toBeDefined();
     });
 
     test('should send pubsub message to "team_environment/<teamID>/created" if team environment is created successfully', async () => {
-      mockPrisma.teamEnvironment.create.mockResolvedValue(teamEnvironment);
+      mockPrisma.teamEnvironment.create.mockResolvedValueOnce(teamEnvironment);
 
       const result = await teamEnvironmentsService.createTeamEnvironment(
         teamEnvironment.name,
         teamEnvironment.teamID,
         JSON.stringify(teamEnvironment.variables),
-      );
+      )();
 
       expect(mockPubSub.publish).toHaveBeenCalledWith(
         `team_environment/${teamEnvironment.teamID}/created`,
-        {
+        result,
-          ...teamEnvironment,
-          variables: JSON.stringify(teamEnvironment.variables),
-        },
       );
     });
   });
 
   describe('deleteTeamEnvironment', () => {
-    test('should successfully delete a TeamEnvironment with a valid ID', async () => {
+    test('should resolve to true given a valid team environment ID', async () => {
       mockPrisma.teamEnvironment.delete.mockResolvedValueOnce(teamEnvironment);
 
       const result = await teamEnvironmentsService.deleteTeamEnvironment(
         teamEnvironment.id,
-      );
+      )();
 
       expect(result).toEqualRight(true);
     });
@@ -119,7 +159,7 @@ describe('TeamEnvironmentsService', () => {
 
       const result = await teamEnvironmentsService.deleteTeamEnvironment(
         'invalidid',
-      );
+      )();
 
       expect(result).toEqualLeft(TEAM_ENVIRONMENT_NOT_FOUND);
     });
@@ -129,7 +169,7 @@ describe('TeamEnvironmentsService', () => {
 
       const result = await teamEnvironmentsService.deleteTeamEnvironment(
         teamEnvironment.id,
-      );
+      )();
 
       expect(mockPubSub.publish).toHaveBeenCalledWith(
         `team_environment/${teamEnvironment.teamID}/deleted`,
@@ -142,7 +182,7 @@ describe('TeamEnvironmentsService', () => {
   });
 
   describe('updateVariablesInTeamEnvironment', () => {
-    test('should successfully add new variable to a team environment', async () => {
+    test('should add new variable to a team environment', async () => {
       mockPrisma.teamEnvironment.update.mockResolvedValueOnce({
         ...teamEnvironment,
         variables: [{ key: 'value' }],
@@ -152,7 +192,7 @@ describe('TeamEnvironmentsService', () => {
         teamEnvironment.id,
         teamEnvironment.name,
         JSON.stringify([{ key: 'value' }]),
-      );
+      )();
 
       expect(result).toEqualRight(<TeamEnvironment>{
         ...teamEnvironment,
@@ -160,7 +200,7 @@ describe('TeamEnvironmentsService', () => {
       });
     });
 
-    test('should successfully add new variable to already existing list of variables in a team environment', async () => {
+    test('should add new variable to already existing list of variables in a team environment', async () => {
       mockPrisma.teamEnvironment.update.mockResolvedValueOnce({
         ...teamEnvironment,
         variables: [{ key: 'value' }, { key_2: 'value_2' }],
@@ -170,7 +210,7 @@ describe('TeamEnvironmentsService', () => {
         teamEnvironment.id,
         teamEnvironment.name,
         JSON.stringify([{ key: 'value' }, { key_2: 'value_2' }]),
-      );
+      )();
 
       expect(result).toEqualRight(<TeamEnvironment>{
         ...teamEnvironment,
@@ -178,7 +218,7 @@ describe('TeamEnvironmentsService', () => {
       });
     });
 
-    test('should successfully edit existing variables in a team environment', async () => {
+    test('should edit existing variables in a team environment', async () => {
       mockPrisma.teamEnvironment.update.mockResolvedValueOnce({
         ...teamEnvironment,
         variables: [{ key: '1234' }],
@@ -188,7 +228,7 @@ describe('TeamEnvironmentsService', () => {
         teamEnvironment.id,
         teamEnvironment.name,
         JSON.stringify([{ key: '1234' }]),
-      );
+      )();
 
       expect(result).toEqualRight(<TeamEnvironment>{
         ...teamEnvironment,
@@ -196,7 +236,22 @@ describe('TeamEnvironmentsService', () => {
       });
     });
 
-    test('should successfully edit name of an existing team environment', async () => {
+    test('should delete existing variable in a team environment', async () => {
+      mockPrisma.teamEnvironment.update.mockResolvedValueOnce(teamEnvironment);
+
+      const result = await teamEnvironmentsService.updateTeamEnvironment(
+        teamEnvironment.id,
+        teamEnvironment.name,
+        JSON.stringify([{}]),
+      )();
+
+      expect(result).toEqualRight(<TeamEnvironment>{
+        ...teamEnvironment,
+        variables: JSON.stringify([{}]),
+      });
+    });
+
+    test('should edit name of an existing team environment', async () => {
       mockPrisma.teamEnvironment.update.mockResolvedValueOnce({
         ...teamEnvironment,
         variables: [{ key: '123' }],
@@ -206,7 +261,7 @@ describe('TeamEnvironmentsService', () => {
         teamEnvironment.id,
         teamEnvironment.name,
         JSON.stringify([{ key: '123' }]),
-      );
+      )();
 
       expect(result).toEqualRight(<TeamEnvironment>{
         ...teamEnvironment,
@@ -214,24 +269,14 @@ describe('TeamEnvironmentsService', () => {
       });
     });
 
-    test('should throw TEAM_ENVIRONMENT_SHORT_NAME if input TeamEnvironment name is invalid', async () => {
+    test('should reject to TEAM_ENVIRONMMENT_NOT_FOUND if provided id is invalid', async () => {
-      const result = await teamEnvironmentsService.updateTeamEnvironment(
-        teamEnvironment.id,
-        '12',
-        JSON.stringify([{ key: 'value' }]),
-      );
-
-      expect(result).toEqualLeft(TEAM_ENVIRONMENT_SHORT_NAME);
-    });
-
-    test('should throw TEAM_ENVIRONMMENT_NOT_FOUND if provided id is invalid', async () => {
       mockPrisma.teamEnvironment.update.mockRejectedValue('RecordNotFound');
 
       const result = await teamEnvironmentsService.updateTeamEnvironment(
         'invalidid',
         teamEnvironment.name,
         JSON.stringify(teamEnvironment.variables),
-      );
+      )();
 
       expect(result).toEqualLeft(TEAM_ENVIRONMENT_NOT_FOUND);
     });
@@ -243,7 +288,7 @@ describe('TeamEnvironmentsService', () => {
         teamEnvironment.id,
         teamEnvironment.name,
         JSON.stringify([{ key: 'value' }]),
-      );
+      )();
 
       expect(mockPubSub.publish).toHaveBeenCalledWith(
         `team_environment/${teamEnvironment.teamID}/updated`,
@@ -256,13 +301,13 @@ describe('TeamEnvironmentsService', () => {
   });
 
   describe('deleteAllVariablesFromTeamEnvironment', () => {
-    test('should successfully delete all variables in a team environment', async () => {
+    test('should delete all variables in a team environment', async () => {
       mockPrisma.teamEnvironment.update.mockResolvedValueOnce(teamEnvironment);
 
       const result =
         await teamEnvironmentsService.deleteAllVariablesFromTeamEnvironment(
           teamEnvironment.id,
-        );
+        )();
 
       expect(result).toEqualRight(<TeamEnvironment>{
         ...teamEnvironment,
@@ -270,13 +315,13 @@ describe('TeamEnvironmentsService', () => {
       });
     });
 
-    test('should throw TEAM_ENVIRONMMENT_NOT_FOUND if provided id is invalid', async () => {
+    test('should reject to TEAM_ENVIRONMMENT_NOT_FOUND if provided id is invalid', async () => {
       mockPrisma.teamEnvironment.update.mockRejectedValue('RecordNotFound');
 
       const result =
         await teamEnvironmentsService.deleteAllVariablesFromTeamEnvironment(
           'invalidid',
-        );
+        )();
 
       expect(result).toEqualLeft(TEAM_ENVIRONMENT_NOT_FOUND);
     });
@@ -287,7 +332,7 @@ describe('TeamEnvironmentsService', () => {
       const result =
         await teamEnvironmentsService.deleteAllVariablesFromTeamEnvironment(
           teamEnvironment.id,
-        );
+        )();
 
       expect(mockPubSub.publish).toHaveBeenCalledWith(
         `team_environment/${teamEnvironment.teamID}/updated`,
@@ -300,7 +345,7 @@ describe('TeamEnvironmentsService', () => {
   });
 
   describe('createDuplicateEnvironment', () => {
-    test('should successfully duplicate an existing team environment', async () => {
+    test('should duplicate an existing team environment', async () => {
       mockPrisma.teamEnvironment.findFirst.mockResolvedValueOnce(
         teamEnvironment,
       );
@@ -312,21 +357,21 @@ describe('TeamEnvironmentsService', () => {
 
       const result = await teamEnvironmentsService.createDuplicateEnvironment(
         teamEnvironment.id,
-      );
+      )();
 
       expect(result).toEqualRight(<TeamEnvironment>{
-        id: 'newid',
         ...teamEnvironment,
+        id: 'newid',
         variables: JSON.stringify(teamEnvironment.variables),
       });
     });
 
-    test('should throw TEAM_ENVIRONMMENT_NOT_FOUND if provided id is invalid', async () => {
+    test('should reject to TEAM_ENVIRONMMENT_NOT_FOUND if provided id is invalid', async () => {
       mockPrisma.teamEnvironment.findFirst.mockRejectedValue('NotFoundError');
 
       const result = await teamEnvironmentsService.createDuplicateEnvironment(
         teamEnvironment.id,
-      );
+      )();
 
       expect(result).toEqualLeft(TEAM_ENVIRONMENT_NOT_FOUND);
     });
@@ -343,13 +388,13 @@ describe('TeamEnvironmentsService', () => {
 
       const result = await teamEnvironmentsService.createDuplicateEnvironment(
         teamEnvironment.id,
-      );
+      )();
 
       expect(mockPubSub.publish).toHaveBeenCalledWith(
         `team_environment/${teamEnvironment.teamID}/created`,
         {
-          id: 'newid',
           ...teamEnvironment,
+          id: 'newid',
           variables: JSON.stringify([{}]),
         },
       );

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

@@ -1,14 +1,15 @@
 import { Injectable } from '@nestjs/common';
-import { TeamEnvironment as DBTeamEnvironment, Prisma } from '@prisma/client';
+import { pipe } from 'fp-ts/function';
+import * as T from 'fp-ts/Task';
+import * as TO from 'fp-ts/TaskOption';
+import * as TE from 'fp-ts/TaskEither';
+import * as A from 'fp-ts/Array';
+import { Prisma } from '@prisma/client';
 import { PrismaService } from 'src/prisma/prisma.service';
 import { PubSubService } from 'src/pubsub/pubsub.service';
 import { TeamEnvironment } from './team-environments.model';
-import {
+import { TEAM_ENVIRONMENT_NOT_FOUND } from 'src/errors';
-  TEAM_ENVIRONMENT_NOT_FOUND,
+
-  TEAM_ENVIRONMENT_SHORT_NAME,
-} from 'src/errors';
-import * as E from 'fp-ts/Either';
-import { isValidLength } from 'src/utils';
 @Injectable()
 export class TeamEnvironmentsService {
   constructor(
@@ -16,218 +17,219 @@ export class TeamEnvironmentsService {
     private readonly pubsub: PubSubService,
   ) {}
 
-  TITLE_LENGTH = 3;
+  getTeamEnvironment(id: string) {
-
+    return TO.tryCatch(() =>
-  /**
+      this.prisma.teamEnvironment.findFirst({
-   * TeamEnvironments are saved in the DB in the following way
+        where: { id },
-   * [{ key: value }, { key: value },....]
-   *
-   */
-
-  /**
-   * Typecast a database TeamEnvironment to a TeamEnvironment model
-   * @param teamEnvironment database TeamEnvironment
-   * @returns TeamEnvironment model
-   */
-  private cast(teamEnvironment: DBTeamEnvironment): TeamEnvironment {
-    return {
-      id: teamEnvironment.id,
-      name: teamEnvironment.name,
-      teamID: teamEnvironment.teamID,
-      variables: JSON.stringify(teamEnvironment.variables),
-    };
-  }
-
-  /**
-   * Get details of a TeamEnvironment.
-   *
-   * @param id TeamEnvironment ID
-   * @returns Either of a TeamEnvironment or error message
-   */
-  async getTeamEnvironment(id: string) {
-    try {
-      const teamEnvironment =
-        await this.prisma.teamEnvironment.findFirstOrThrow({
-          where: { id },
-        });
-      return E.right(teamEnvironment);
-    } catch (error) {
-      return E.left(TEAM_ENVIRONMENT_NOT_FOUND);
-    }
-  }
-
-  /**
-   *  Create a new TeamEnvironment.
-   *
-   * @param name name of new TeamEnvironment
-   * @param teamID teamID of new TeamEnvironment
-   * @param variables JSONified string of contents of new TeamEnvironment
-   * @returns Either of a TeamEnvironment or error message
-   */
-  async createTeamEnvironment(name: string, teamID: string, variables: string) {
-    const isTitleValid = isValidLength(name, this.TITLE_LENGTH);
-    if (!isTitleValid) return E.left(TEAM_ENVIRONMENT_SHORT_NAME);
-
-    const result = await this.prisma.teamEnvironment.create({
-      data: {
-        name: name,
-        teamID: teamID,
-        variables: JSON.parse(variables),
-      },
-    });
-
-    const createdTeamEnvironment = this.cast(result);
-
-    this.pubsub.publish(
-      `team_environment/${createdTeamEnvironment.teamID}/created`,
-      createdTeamEnvironment,
-    );
-
-    return E.right(createdTeamEnvironment);
-  }
-
-  /**
-   * Delete a TeamEnvironment.
-   *
-   * @param id TeamEnvironment ID
-   * @returns Either of boolean or error message
-   */
-  async deleteTeamEnvironment(id: string) {
-    try {
-      const result = await this.prisma.teamEnvironment.delete({
-        where: {
-          id: id,
-        },
-      });
-
-      const deletedTeamEnvironment = this.cast(result);
-
-      this.pubsub.publish(
-        `team_environment/${deletedTeamEnvironment.teamID}/deleted`,
-        deletedTeamEnvironment,
-      );
-
-      return E.right(true);
-    } catch (error) {
-      return E.left(TEAM_ENVIRONMENT_NOT_FOUND);
-    }
-  }
-
-  /**
-   * Update a TeamEnvironment.
-   *
-   * @param id TeamEnvironment ID
-   * @param name TeamEnvironment name
-   * @param variables JSONified string of contents of new TeamEnvironment
-   * @returns Either of a TeamEnvironment or error message
-   */
-  async updateTeamEnvironment(id: string, name: string, variables: string) {
-    try {
-      const isTitleValid = isValidLength(name, this.TITLE_LENGTH);
-      if (!isTitleValid) return E.left(TEAM_ENVIRONMENT_SHORT_NAME);
-
-      const result = await this.prisma.teamEnvironment.update({
-        where: { id: id },
-        data: {
-          name,
-          variables: JSON.parse(variables),
-        },
-      });
-
-      const updatedTeamEnvironment = this.cast(result);
-
-      this.pubsub.publish(
-        `team_environment/${updatedTeamEnvironment.teamID}/updated`,
-        updatedTeamEnvironment,
-      );
-
-      return E.right(updatedTeamEnvironment);
-    } catch (error) {
-      return E.left(TEAM_ENVIRONMENT_NOT_FOUND);
-    }
-  }
-
-  /**
-   * Clear contents of a TeamEnvironment.
-   *
-   * @param id TeamEnvironment ID
-   * @returns Either of a TeamEnvironment or error message
-   */
-  async deleteAllVariablesFromTeamEnvironment(id: string) {
-    try {
-      const result = await this.prisma.teamEnvironment.update({
-        where: { id: id },
-        data: {
-          variables: [],
-        },
-      });
-
-      const teamEnvironment = this.cast(result);
-
-      this.pubsub.publish(
-        `team_environment/${teamEnvironment.teamID}/updated`,
-        teamEnvironment,
-      );
-
-      return E.right(teamEnvironment);
-    } catch (error) {
-      return E.left(TEAM_ENVIRONMENT_NOT_FOUND);
-    }
-  }
-
-  /**
-   * Create a duplicate of a existing TeamEnvironment.
-   *
-   * @param id TeamEnvironment ID
-   * @returns Either of a TeamEnvironment or error message
-   */
-  async createDuplicateEnvironment(id: string) {
-    try {
-      const environment = await this.prisma.teamEnvironment.findFirst({
-        where: {
-          id: id,
-        },
         rejectOnNotFound: true,
-      });
+      }),
-
+    );
-      const result = await this.prisma.teamEnvironment.create({
-        data: {
-          name: environment.name,
-          teamID: environment.teamID,
-          variables: environment.variables as Prisma.JsonArray,
-        },
-      });
-
-      const duplicatedTeamEnvironment = this.cast(result);
-
-      this.pubsub.publish(
-        `team_environment/${duplicatedTeamEnvironment.teamID}/created`,
-        duplicatedTeamEnvironment,
-      );
-
-      return E.right(duplicatedTeamEnvironment);
-    } catch (error) {
-      return E.left(TEAM_ENVIRONMENT_NOT_FOUND);
-    }
   }
 
-  /**
+  createTeamEnvironment(name: string, teamID: string, variables: string) {
-   * Fetch all TeamEnvironments of a team.
+    return pipe(
-   *
+      () =>
-   * @param teamID teamID of new TeamEnvironment
+        this.prisma.teamEnvironment.create({
-   * @returns List of TeamEnvironments
+          data: {
-   */
+            name: name,
-  async fetchAllTeamEnvironments(teamID: string) {
+            teamID: teamID,
-    const result = await this.prisma.teamEnvironment.findMany({
+            variables: JSON.parse(variables),
-      where: {
+          },
-        teamID: teamID,
+        }),
-      },
+      T.chainFirst(
-    });
+        (environment) => () =>
-    const teamEnvironments = result.map((item) => {
+          this.pubsub.publish(
-      return this.cast(item);
+            `team_environment/${environment.teamID}/created`,
-    });
+            <TeamEnvironment>{
+              id: environment.id,
+              name: environment.name,
+              teamID: environment.teamID,
+              variables: JSON.stringify(environment.variables),
+            },
+          ),
+      ),
+      T.map((data) => {
+        return <TeamEnvironment>{
+          id: data.id,
+          name: data.name,
+          teamID: data.teamID,
+          variables: JSON.stringify(data.variables),
+        };
+      }),
+    );
+  }
 
-    return teamEnvironments;
+  deleteTeamEnvironment(id: string) {
+    return pipe(
+      TE.tryCatch(
+        () =>
+          this.prisma.teamEnvironment.delete({
+            where: {
+              id: id,
+            },
+          }),
+        () => TEAM_ENVIRONMENT_NOT_FOUND,
+      ),
+      TE.chainFirst((environment) =>
+        TE.fromTask(() =>
+          this.pubsub.publish(
+            `team_environment/${environment.teamID}/deleted`,
+            <TeamEnvironment>{
+              id: environment.id,
+              name: environment.name,
+              teamID: environment.teamID,
+              variables: JSON.stringify(environment.variables),
+            },
+          ),
+        ),
+      ),
+      TE.map((data) => true),
+    );
+  }
+
+  updateTeamEnvironment(id: string, name: string, variables: string) {
+    return pipe(
+      TE.tryCatch(
+        () =>
+          this.prisma.teamEnvironment.update({
+            where: { id: id },
+            data: {
+              name,
+              variables: JSON.parse(variables),
+            },
+          }),
+        () => TEAM_ENVIRONMENT_NOT_FOUND,
+      ),
+      TE.chainFirst((environment) =>
+        TE.fromTask(() =>
+          this.pubsub.publish(
+            `team_environment/${environment.teamID}/updated`,
+            <TeamEnvironment>{
+              id: environment.id,
+              name: environment.name,
+              teamID: environment.teamID,
+              variables: JSON.stringify(environment.variables),
+            },
+          ),
+        ),
+      ),
+      TE.map(
+        (environment) =>
+          <TeamEnvironment>{
+            id: environment.id,
+            name: environment.name,
+            teamID: environment.teamID,
+            variables: JSON.stringify(environment.variables),
+          },
+      ),
+    );
+  }
+
+  deleteAllVariablesFromTeamEnvironment(id: string) {
+    return pipe(
+      TE.tryCatch(
+        () =>
+          this.prisma.teamEnvironment.update({
+            where: { id: id },
+            data: {
+              variables: [],
+            },
+          }),
+        () => TEAM_ENVIRONMENT_NOT_FOUND,
+      ),
+      TE.chainFirst((environment) =>
+        TE.fromTask(() =>
+          this.pubsub.publish(
+            `team_environment/${environment.teamID}/updated`,
+            <TeamEnvironment>{
+              id: environment.id,
+              name: environment.name,
+              teamID: environment.teamID,
+              variables: JSON.stringify(environment.variables),
+            },
+          ),
+        ),
+      ),
+      TE.map(
+        (environment) =>
+          <TeamEnvironment>{
+            id: environment.id,
+            name: environment.name,
+            teamID: environment.teamID,
+            variables: JSON.stringify(environment.variables),
+          },
+      ),
+    );
+  }
+
+  createDuplicateEnvironment(id: string) {
+    return pipe(
+      TE.tryCatch(
+        () =>
+          this.prisma.teamEnvironment.findFirst({
+            where: {
+              id: id,
+            },
+            rejectOnNotFound: true,
+          }),
+        () => TEAM_ENVIRONMENT_NOT_FOUND,
+      ),
+      TE.chain((environment) =>
+        TE.fromTask(() =>
+          this.prisma.teamEnvironment.create({
+            data: {
+              name: environment.name,
+              teamID: environment.teamID,
+              variables: environment.variables as Prisma.JsonArray,
+            },
+          }),
+        ),
+      ),
+      TE.chainFirst((environment) =>
+        TE.fromTask(() =>
+          this.pubsub.publish(
+            `team_environment/${environment.teamID}/created`,
+            <TeamEnvironment>{
+              id: environment.id,
+              name: environment.name,
+              teamID: environment.teamID,
+              variables: JSON.stringify(environment.variables),
+            },
+          ),
+        ),
+      ),
+      TE.map(
+        (environment) =>
+          <TeamEnvironment>{
+            id: environment.id,
+            name: environment.name,
+            teamID: environment.teamID,
+            variables: JSON.stringify(environment.variables),
+          },
+      ),
+    );
+  }
+
+  fetchAllTeamEnvironments(teamID: string) {
+    return pipe(
+      () =>
+        this.prisma.teamEnvironment.findMany({
+          where: {
+            teamID: teamID,
+          },
+        }),
+      T.map(
+        A.map(
+          (environment) =>
+            <TeamEnvironment>{
+              id: environment.id,
+              name: environment.name,
+              teamID: environment.teamID,
+              variables: JSON.stringify(environment.variables),
+            },
+        ),
+      ),
+    );
   }
 
   /**

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

@@ -11,6 +11,6 @@ export class TeamEnvsTeamResolver {
     description: 'Returns all Team Environments for the given Team',
   })
   teamEnvironments(@Parent() team: Team): Promise<TeamEnvironment[]> {
-    return this.teamEnvironmentService.fetchAllTeamEnvironments(team.id);
+    return this.teamEnvironmentService.fetchAllTeamEnvironments(team.id)();
   }
 }

packages/hoppscotch-backend/src/team-invitation/input-type.args.ts

@@ -1,20 +0,0 @@
-import { ArgsType, Field, ID } from '@nestjs/graphql';
-import { TeamMemberRole } from 'src/team/team.model';
-
-@ArgsType()
-export class CreateTeamInvitationArgs {
-  @Field(() => ID, {
-    name: 'teamID',
-    description: 'ID of the Team ID to invite from',
-  })
-  teamID: string;
-
-  @Field({ name: 'inviteeEmail', description: 'Email of the user to invite' })
-  inviteeEmail: string;
-
-  @Field(() => TeamMemberRole, {
-    name: 'inviteeRole',
-    description: 'Role to be given to the user',
-  })
-  inviteeRole: TeamMemberRole;
-}

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

@@ -12,10 +12,15 @@ import { TeamInvitation } from './team-invitation.model';
 import { TeamInvitationService } from './team-invitation.service';
 import { pipe } from 'fp-ts/function';
 import * as TE from 'fp-ts/TaskEither';
-import * as E from 'fp-ts/Either';
 import * as O from 'fp-ts/Option';
 import { Team, TeamMember, TeamMemberRole } from 'src/team/team.model';
-import { TEAM_INVITE_NO_INVITE_FOUND, USER_NOT_FOUND } from 'src/errors';
+import { EmailCodec } from 'src/types/Email';
+import {
+  INVALID_EMAIL,
+  TEAM_INVITE_EMAIL_DO_NOT_MATCH,
+  TEAM_INVITE_NO_INVITE_FOUND,
+  USER_NOT_FOUND,
+} from 'src/errors';
 import { GqlUser } from 'src/decorators/gql-user.decorator';
 import { User } from 'src/user/user.model';
 import { UseGuards } from '@nestjs/common';
@@ -31,8 +36,6 @@ import { UserService } from 'src/user/user.service';
 import { PubSubService } from 'src/pubsub/pubsub.service';
 import { GqlThrottlerGuard } from 'src/guards/gql-throttler.guard';
 import { SkipThrottle } from '@nestjs/throttler';
-import { AuthUser } from 'src/types/AuthUser';
-import { CreateTeamInvitationArgs } from './input-type.args';
 
 @UseGuards(GqlThrottlerGuard)
 @Resolver(() => TeamInvitation)
@@ -76,8 +79,8 @@ export class TeamInvitationResolver {
       'Gets the Team Invitation with the given ID, or null if not exists',
   })
   @UseGuards(GqlAuthGuard, TeamInviteViewerGuard)
-  async teamInvitation(
+  teamInvitation(
-    @GqlUser() user: AuthUser,
+    @GqlUser() user: User,
     @Args({
       name: 'inviteID',
       description: 'ID of the Team Invitation to lookup',
@@ -85,11 +88,17 @@ export class TeamInvitationResolver {
     })
     inviteID: string,
   ): Promise<TeamInvitation> {
-    const teamInvitation = await this.teamInvitationService.getInvitation(
+    return pipe(
-      inviteID,
+      this.teamInvitationService.getInvitation(inviteID),
-    );
+      TE.fromTaskOption(() => TEAM_INVITE_NO_INVITE_FOUND),
-    if (O.isNone(teamInvitation)) throwErr(TEAM_INVITE_NO_INVITE_FOUND);
+      TE.chainW(
-    return teamInvitation.value;
+        TE.fromPredicate(
+          (a) => a.inviteeEmail.toLowerCase() === user.email?.toLowerCase(),
+          () => TEAM_INVITE_EMAIL_DO_NOT_MATCH,
+        ),
+      ),
+      TE.getOrElse(throwErr),
+    )();
   }
 
   @Mutation(() => TeamInvitation, {
@@ -97,19 +106,56 @@ export class TeamInvitationResolver {
   })
   @UseGuards(GqlAuthGuard, GqlTeamMemberGuard)
   @RequiresTeamRole(TeamMemberRole.OWNER)
-  async createTeamInvitation(
+  createTeamInvitation(
-    @GqlUser() user: AuthUser,
+    @GqlUser()
-    @Args() args: CreateTeamInvitationArgs,
+    user: User,
-  ): Promise<TeamInvitation> {
-    const teamInvitation = await this.teamInvitationService.createInvitation(
-      user,
-      args.teamID,
-      args.inviteeEmail,
-      args.inviteeRole,
-    );
 
-    if (E.isLeft(teamInvitation)) throwErr(teamInvitation.left);
+    @Args({
-    return teamInvitation.right;
+      name: 'teamID',
+      description: 'ID of the Team ID to invite from',
+      type: () => ID,
+    })
+    teamID: string,
+    @Args({
+      name: 'inviteeEmail',
+      description: 'Email of the user to invite',
+    })
+    inviteeEmail: string,
+    @Args({
+      name: 'inviteeRole',
+      type: () => TeamMemberRole,
+      description: 'Role to be given to the user',
+    })
+    inviteeRole: TeamMemberRole,
+  ): Promise<TeamInvitation> {
+    return pipe(
+      TE.Do,
+
+      // Validate email
+      TE.bindW('email', () =>
+        pipe(
+          EmailCodec.decode(inviteeEmail),
+          TE.fromEither,
+          TE.mapLeft(() => INVALID_EMAIL),
+        ),
+      ),
+
+      // Validate and get Team
+      TE.bindW('team', () => this.teamService.getTeamWithIDTE(teamID)),
+
+      // Create team
+      TE.chainW(({ email, team }) =>
+        this.teamInvitationService.createInvitation(
+          user,
+          team,
+          email,
+          inviteeRole,
+        ),
+      ),
+
+      // If failed, throw err (so the message is passed) else return value
+      TE.getOrElse(throwErr),
+    )();
   }
 
   @Mutation(() => Boolean, {
@@ -117,7 +163,7 @@ export class TeamInvitationResolver {
   })
   @UseGuards(GqlAuthGuard, TeamInviteTeamOwnerGuard)
   @RequiresTeamRole(TeamMemberRole.OWNER)
-  async revokeTeamInvitation(
+  revokeTeamInvitation(
     @Args({
       name: 'inviteID',
       type: () => ID,
@@ -125,19 +171,19 @@ export class TeamInvitationResolver {
     })
     inviteID: string,
   ): Promise<true> {
-    const isRevoked = await this.teamInvitationService.revokeInvitation(
+    return pipe(
-      inviteID,
+      this.teamInvitationService.revokeInvitation(inviteID),
-    );
+      TE.map(() => true as const),
-    if (E.isLeft(isRevoked)) throwErr(isRevoked.left);
+      TE.getOrElse(throwErr),
-    return true;
+    )();
   }
 
   @Mutation(() => TeamMember, {
     description: 'Accept an Invitation',
   })
   @UseGuards(GqlAuthGuard, TeamInviteeGuard)
-  async acceptTeamInvitation(
+  acceptTeamInvitation(
-    @GqlUser() user: AuthUser,
+    @GqlUser() user: User,
     @Args({
       name: 'inviteID',
       type: () => ID,
@@ -145,12 +191,10 @@ export class TeamInvitationResolver {
     })
     inviteID: string,
   ): Promise<TeamMember> {
-    const teamMember = await this.teamInvitationService.acceptInvitation(
+    return pipe(
-      inviteID,
+      this.teamInvitationService.acceptInvitation(inviteID, user),
-      user,
+      TE.getOrElse(throwErr),
-    );
+    )();
-    if (E.isLeft(teamMember)) throwErr(teamMember.left);
-    return teamMember.right;
   }
 
   // Subscriptions

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

@@ -1,25 +1,27 @@
 import { Injectable } from '@nestjs/common';
+import * as T from 'fp-ts/Task';
 import * as O from 'fp-ts/Option';
+import * as TO from 'fp-ts/TaskOption';
+import * as TE from 'fp-ts/TaskEither';
 import * as E from 'fp-ts/Either';
+import { pipe, flow, constVoid } from 'fp-ts/function';
 import { PrismaService } from 'src/prisma/prisma.service';
-import { TeamInvitation as DBTeamInvitation } from '@prisma/client';
+import { Team, TeamMemberRole } from 'src/team/team.model';
-import { TeamMember, TeamMemberRole } from 'src/team/team.model';
+import { Email } from 'src/types/Email';
+import { User } from 'src/user/user.model';
 import { TeamService } from 'src/team/team.service';
 import {
   INVALID_EMAIL,
-  TEAM_INVALID_ID,
   TEAM_INVITE_ALREADY_MEMBER,
   TEAM_INVITE_EMAIL_DO_NOT_MATCH,
   TEAM_INVITE_MEMBER_HAS_INVITE,
   TEAM_INVITE_NO_INVITE_FOUND,
-  TEAM_MEMBER_NOT_FOUND,
 } from 'src/errors';
 import { TeamInvitation } from './team-invitation.model';
 import { MailerService } from 'src/mailer/mailer.service';
 import { UserService } from 'src/user/user.service';
 import { PubSubService } from 'src/pubsub/pubsub.service';
 import { validateEmail } from '../utils';
-import { AuthUser } from 'src/types/AuthUser';
 
 @Injectable()
 export class TeamInvitationService {
@@ -30,37 +32,38 @@ export class TeamInvitationService {
     private readonly mailerService: MailerService,
 
     private readonly pubsub: PubSubService,
-  ) {}
+  ) {
-
+    this.getInvitation = this.getInvitation.bind(this);
-  /**
-   * Cast a DBTeamInvitation to a TeamInvitation
-   * @param dbTeamInvitation database TeamInvitation
-   * @returns TeamInvitation model
-   */
-  cast(dbTeamInvitation: DBTeamInvitation): TeamInvitation {
-    return {
-      ...dbTeamInvitation,
-      inviteeRole: TeamMemberRole[dbTeamInvitation.inviteeRole],
-    };
   }
 
-  /**
+  getInvitation(inviteID: string): TO.TaskOption<TeamInvitation> {
-   * Get the team invite
+    return pipe(
-   * @param inviteID invite id
+      () =>
-   * @returns an Option of team invitation or none
+        this.prisma.teamInvitation.findUnique({
-   */
+          where: {
-  async getInvitation(inviteID: string) {
+            id: inviteID,
-    try {
+          },
-      const dbInvitation = await this.prisma.teamInvitation.findUniqueOrThrow({
+        }),
-        where: {
+      TO.fromTask,
-          id: inviteID,
+      TO.chain(flow(O.fromNullable, TO.fromOption)),
-        },
+      TO.map((x) => x as TeamInvitation),
-      });
+    );
+  }
 
-      return O.some(this.cast(dbInvitation));
+  getInvitationWithEmail(email: Email, team: Team) {
-    } catch (e) {
+    return pipe(
-      return O.none;
+      () =>
-    }
+        this.prisma.teamInvitation.findUnique({
+          where: {
+            teamID_inviteeEmail: {
+              inviteeEmail: email,
+              teamID: team.id,
+            },
+          },
+        }),
+      TO.fromTask,
+      TO.chain(flow(O.fromNullable, TO.fromOption)),
+    );
   }
 
   /**
@@ -89,162 +92,211 @@ export class TeamInvitationService {
     }
   }
 
-  /**
+  createInvitation(
-   * Create a team invitation
+    creator: User,
-   * @param creator creator of the invitation
+    team: Team,
-   * @param teamID team id
+    inviteeEmail: Email,
-   * @param inviteeEmail invitee email
-   * @param inviteeRole invitee role
-   * @returns an Either of team invitation or error message
-   */
-  async createInvitation(
-    creator: AuthUser,
-    teamID: string,
-    inviteeEmail: string,
     inviteeRole: TeamMemberRole,
   ) {
-    // validate email
+    return pipe(
-    const isEmailValid = validateEmail(inviteeEmail);
+      // Perform all validation checks
-    if (!isEmailValid) return E.left(INVALID_EMAIL);
+      TE.sequenceArray([
+        // creator should be a TeamMember
+        pipe(
+          this.teamService.getTeamMemberTE(team.id, creator.uid),
+          TE.map(constVoid),
+        ),
 
-    // team ID should valid
+        // Invitee should not be a team member
-    const team = await this.teamService.getTeamWithID(teamID);
+        pipe(
-    if (!team) return E.left(TEAM_INVALID_ID);
+          async () => await this.userService.findUserByEmail(inviteeEmail),
+          TO.foldW(
+            () => TE.right(undefined), // If no user, short circuit to completion
+            (user) =>
+              pipe(
+                // If user is found, check if team member
+                this.teamService.getTeamMemberTE(team.id, user.uid),
+                TE.foldW(
+                  () => TE.right(undefined), // Not team-member, this is good
+                  () => TE.left(TEAM_INVITE_ALREADY_MEMBER), // Is team member, not good
+                ),
+              ),
+          ),
+          TE.map(constVoid),
+        ),
 
-    // invitation creator should be a TeamMember
+        // Should not have an existing invite
-    const isTeamMember = await this.teamService.getTeamMember(
+        pipe(
-      team.id,
+          this.getInvitationWithEmail(inviteeEmail, team),
-      creator.uid,
+          TE.fromTaskOption(() => null),
+          TE.swap,
+          TE.map(constVoid),
+          TE.mapLeft(() => TEAM_INVITE_MEMBER_HAS_INVITE),
+        ),
+      ]),
+
+      // Create the invitation
+      TE.chainTaskK(
+        () => () =>
+          this.prisma.teamInvitation.create({
+            data: {
+              teamID: team.id,
+              inviteeEmail,
+              inviteeRole,
+              creatorUid: creator.uid,
+            },
+          }),
+      ),
+
+      // Send email, this is a side effect
+      TE.chainFirstTaskK((invitation) =>
+        pipe(
+          this.mailerService.sendMail(inviteeEmail, {
+            template: 'team-invitation',
+            variables: {
+              invitee: creator.displayName ?? 'A Hoppscotch User',
+              action_url: `${process.env.VITE_BASE_URL}/join-team?id=${invitation.id}`,
+              invite_team_name: team.name,
+            },
+          }),
+
+          TE.getOrElseW(() => T.of(undefined)), // This value doesn't matter as we don't mind the return value (chainFirst) as long as the task completes
+        ),
+      ),
+
+      // Send PubSub topic
+      TE.chainFirstTaskK((invitation) =>
+        TE.fromTask(async () => {
+          const inv: TeamInvitation = {
+            id: invitation.id,
+            teamID: invitation.teamID,
+            creatorUid: invitation.creatorUid,
+            inviteeEmail: invitation.inviteeEmail,
+            inviteeRole: TeamMemberRole[invitation.inviteeRole],
+          };
+
+          this.pubsub.publish(`team/${inv.teamID}/invite_added`, inv);
+        }),
+      ),
+
+      // Map to model type
+      TE.map((x) => x as TeamInvitation),
     );
-    if (!isTeamMember) return E.left(TEAM_MEMBER_NOT_FOUND);
+  }
 
-    // Checking to see if the invitee is already part of the team or not
+  revokeInvitation(inviteID: string) {
-    const inviteeUser = await this.userService.findUserByEmail(inviteeEmail);
+    return pipe(
-    if (O.isSome(inviteeUser)) {
+      // Make sure invite exists
-      // invitee should not already a member
+      this.getInvitation(inviteID),
-      const isTeamMember = await this.teamService.getTeamMember(
+      TE.fromTaskOption(() => TEAM_INVITE_NO_INVITE_FOUND),
-        team.id,
-        inviteeUser.value.uid,
-      );
-      if (isTeamMember) return E.left(TEAM_INVITE_ALREADY_MEMBER);
-    }
 
-    // check invitee already invited earlier or not
+      // Delete team invitation
-    const teamInvitation = await this.getTeamInviteByEmailAndTeamID(
+      TE.chainTaskK(
-      inviteeEmail,
+        () => () =>
-      team.id,
+          this.prisma.teamInvitation.delete({
+            where: {
+              id: inviteID,
+            },
+          }),
+      ),
+
+      // Emit Pubsub Event
+      TE.chainFirst((invitation) =>
+        TE.fromTask(() =>
+          this.pubsub.publish(
+            `team/${invitation.teamID}/invite_removed`,
+            invitation.id,
+          ),
+        ),
+      ),
+
+      // We are not returning anything
+      TE.map(constVoid),
     );
-    if (E.isRight(teamInvitation)) return E.left(TEAM_INVITE_MEMBER_HAS_INVITE);
+  }
 
-    // create the invitation
+  getAllInvitationsInTeam(team: Team) {
-    const dbInvitation = await this.prisma.teamInvitation.create({
+    return pipe(
-      data: {
+      () =>
-        teamID: team.id,
+        this.prisma.teamInvitation.findMany({
-        inviteeEmail,
+          where: {
-        inviteeRole,
+            teamID: team.id,
-        creatorUid: creator.uid,
+          },
-      },
+        }),
-    });
+      T.map((x) => x as TeamInvitation[]),
+    );
+  }
 
-    await this.mailerService.sendEmail(inviteeEmail, {
+  acceptInvitation(inviteID: string, acceptedBy: User) {
-      template: 'team-invitation',
+    return pipe(
-      variables: {
+      TE.Do,
-        invitee: creator.displayName ?? 'A Hoppscotch User',
-        action_url: `${process.env.VITE_BASE_URL}/join-team?id=${dbInvitation.id}`,
-        invite_team_name: team.name,
-      },
-    });
 
-    const invitation = this.cast(dbInvitation);
+      // First get the invitation
-    this.pubsub.publish(`team/${invitation.teamID}/invite_added`, invitation);
+      TE.bindW('invitation', () =>
+        pipe(
+          this.getInvitation(inviteID),
+          TE.fromTaskOption(() => TEAM_INVITE_NO_INVITE_FOUND),
+        ),
+      ),
 
-    return E.right(invitation);
+      // Validation checks
+      TE.chainFirstW(({ invitation }) =>
+        TE.sequenceArray([
+          // Make sure the invited user is not part of the team
+          pipe(
+            this.teamService.getTeamMemberTE(invitation.teamID, acceptedBy.uid),
+            TE.swap,
+            TE.bimap(
+              () => TEAM_INVITE_ALREADY_MEMBER,
+              constVoid, // The return type is ignored
+            ),
+          ),
+
+          // Make sure the invited user and accepting user has the same email
+          pipe(
+            undefined,
+            TE.fromPredicate(
+              (a) => acceptedBy.email === invitation.inviteeEmail,
+              () => TEAM_INVITE_EMAIL_DO_NOT_MATCH,
+            ),
+          ),
+        ]),
+      ),
+
+      // Add the team member
+      // TODO: Somehow bring subscriptions to this ?
+      TE.bindW('teamMember', ({ invitation }) =>
+        pipe(
+          TE.tryCatch(
+            () =>
+              this.teamService.addMemberToTeam(
+                invitation.teamID,
+                acceptedBy.uid,
+                invitation.inviteeRole,
+              ),
+            () => TEAM_INVITE_ALREADY_MEMBER, // Can only fail if Team Member already exists, which we checked, but due to async lets assert that here too
+          ),
+        ),
+      ),
+
+      TE.chainFirstW(({ invitation }) => this.revokeInvitation(invitation.id)),
+
+      TE.map(({ teamMember }) => teamMember),
+    );
   }
 
   /**
-   * Revoke a team invitation
+   * Fetch the count invitations for a given team.
-   * @param inviteID invite id
-   * @returns an Either of true or error message
-   */
-  async revokeInvitation(inviteID: string) {
-    // check if the invite exists
-    const invitation = await this.getInvitation(inviteID);
-    if (O.isNone(invitation)) return E.left(TEAM_INVITE_NO_INVITE_FOUND);
-
-    // delete the invite
-    await this.prisma.teamInvitation.delete({
-      where: {
-        id: inviteID,
-      },
-    });
-
-    this.pubsub.publish(
-      `team/${invitation.value.teamID}/invite_removed`,
-      invitation.value.id,
-    );
-
-    return E.right(true);
-  }
-
-  /**
-   * Accept a team invitation
-   * @param inviteID invite id
-   * @param acceptedBy user who accepted the invitation
-   * @returns an Either of team member or error message
-   */
-  async acceptInvitation(inviteID: string, acceptedBy: AuthUser) {
-    // check if the invite exists
-    const invitation = await this.getInvitation(inviteID);
-    if (O.isNone(invitation)) return E.left(TEAM_INVITE_NO_INVITE_FOUND);
-
-    // make sure the user is not already a member of the team
-    const teamMemberInvitee = await this.teamService.getTeamMember(
-      invitation.value.teamID,
-      acceptedBy.uid,
-    );
-    if (teamMemberInvitee) return E.left(TEAM_INVITE_ALREADY_MEMBER);
-
-    // make sure the user is the same as the invitee
-    if (
-      acceptedBy.email.toLowerCase() !==
-      invitation.value.inviteeEmail.toLowerCase()
-    )
-      return E.left(TEAM_INVITE_EMAIL_DO_NOT_MATCH);
-
-    // add the user to the team
-    let teamMember: TeamMember;
-    try {
-      teamMember = await this.teamService.addMemberToTeam(
-        invitation.value.teamID,
-        acceptedBy.uid,
-        invitation.value.inviteeRole,
-      );
-    } catch (e) {
-      return E.left(TEAM_INVITE_ALREADY_MEMBER);
-    }
-
-    // delete the invite
-    await this.revokeInvitation(inviteID);
-
-    return E.right(teamMember);
-  }
-
-  /**
-   * Fetch all team invitations for a given team.
    * @param teamID team id
-   * @returns array of team invitations for a team
+   * @returns a count team invitations for a team
    */
-  async getTeamInvitations(teamID: string) {
+  async getAllTeamInvitations(teamID: string) {
-    const dbInvitations = await this.prisma.teamInvitation.findMany({
+    const invitations = await this.prisma.teamInvitation.findMany({
       where: {
         teamID: teamID,
       },
     });
 
-    const invitations: TeamInvitation[] = dbInvitations.map((dbInvitation) =>
-      this.cast(dbInvitation),
-    );
-
     return invitations;
   }
 }

packages/hoppscotch-backend/src/team-invitation/team-invite-team-owner.guard.ts

@@ -1,21 +1,21 @@
 import { CanActivate, ExecutionContext, Injectable } from '@nestjs/common';
+import { pipe } from 'fp-ts/function';
 import { TeamService } from 'src/team/team.service';
 import { TeamInvitationService } from './team-invitation.service';
 import * as O from 'fp-ts/Option';
+import * as T from 'fp-ts/Task';
+import * as TE from 'fp-ts/TaskEither';
 import { GqlExecutionContext } from '@nestjs/graphql';
 import {
   BUG_AUTH_NO_USER_CTX,
   BUG_TEAM_INVITE_NO_INVITE_ID,
   TEAM_INVITE_NO_INVITE_FOUND,
-  TEAM_MEMBER_NOT_FOUND,
   TEAM_NOT_REQUIRED_ROLE,
 } from 'src/errors';
+import { User } from 'src/user/user.model';
 import { throwErr } from 'src/utils';
 import { TeamMemberRole } from 'src/team/team.model';
 
-/**
- * This guard only allows team owner to execute the resolver
- */
 @Injectable()
 export class TeamInviteTeamOwnerGuard implements CanActivate {
   constructor(
@@ -24,30 +24,48 @@ export class TeamInviteTeamOwnerGuard implements CanActivate {
   ) {}
 
   async canActivate(context: ExecutionContext): Promise<boolean> {
-    // Get GQL context
+    return pipe(
-    const gqlExecCtx = GqlExecutionContext.create(context);
+      TE.Do,
 
-    // Get user
+      TE.bindW('gqlCtx', () => TE.of(GqlExecutionContext.create(context))),
-    const { user } = gqlExecCtx.getContext().req;
-    if (!user) throwErr(BUG_AUTH_NO_USER_CTX);
 
-    // Get the invite
+      // Get the invite
-    const { inviteID } = gqlExecCtx.getArgs<{ inviteID: string }>();
+      TE.bindW('invite', ({ gqlCtx }) =>
-    if (!inviteID) throwErr(BUG_TEAM_INVITE_NO_INVITE_ID);
+        pipe(
+          O.fromNullable(gqlCtx.getArgs<{ inviteID?: string }>().inviteID),
+          TE.fromOption(() => BUG_TEAM_INVITE_NO_INVITE_ID),
+          TE.chainW((inviteID) =>
+            pipe(
+              this.teamInviteService.getInvitation(inviteID),
+              TE.fromTaskOption(() => TEAM_INVITE_NO_INVITE_FOUND),
+            ),
+          ),
+        ),
+      ),
 
-    const invitation = await this.teamInviteService.getInvitation(inviteID);
+      TE.bindW('user', ({ gqlCtx }) =>
-    if (O.isNone(invitation)) throwErr(TEAM_INVITE_NO_INVITE_FOUND);
+        pipe(
+          gqlCtx.getContext().req.user,
+          O.fromNullable,
+          TE.fromOption(() => BUG_AUTH_NO_USER_CTX),
+        ),
+      ),
 
-    // Fetch team member details of this user
+      TE.bindW('userMember', ({ invite, user }) =>
-    const teamMember = await this.teamService.getTeamMember(
+        this.teamService.getTeamMemberTE(invite.teamID, user.uid),
-      invitation.value.teamID,
+      ),
-      user.uid,
-    );
 
-    if (!teamMember) throwErr(TEAM_MEMBER_NOT_FOUND);
+      TE.chainW(
-    if (teamMember.role !== TeamMemberRole.OWNER)
+        TE.fromPredicate(
-      throwErr(TEAM_NOT_REQUIRED_ROLE);
+          ({ userMember }) => userMember.role === TeamMemberRole.OWNER,
+          () => TEAM_NOT_REQUIRED_ROLE,
+        ),
+      ),
 
-    return true;
+      TE.fold(
+        (err) => throwErr(err),
+        () => T.of(true),
+      ),
+    )();
   }
 }

packages/hoppscotch-backend/src/team-invitation/team-invite-viewer.guard.ts

@@ -1,23 +1,20 @@
 import { CanActivate, ExecutionContext, Injectable } from '@nestjs/common';
 import { TeamInvitationService } from './team-invitation.service';
+import { pipe, flow } from 'fp-ts/function';
+import * as TE from 'fp-ts/TaskEither';
+import * as T from 'fp-ts/Task';
 import * as O from 'fp-ts/Option';
 import { GqlExecutionContext } from '@nestjs/graphql';
 import {
   BUG_AUTH_NO_USER_CTX,
   BUG_TEAM_INVITE_NO_INVITE_ID,
+  TEAM_INVITE_NOT_VALID_VIEWER,
   TEAM_INVITE_NO_INVITE_FOUND,
-  TEAM_MEMBER_NOT_FOUND,
 } from 'src/errors';
+import { User } from 'src/user/user.model';
 import { throwErr } from 'src/utils';
 import { TeamService } from 'src/team/team.service';
 
-/**
- * This guard only allows user to execute the resolver
- * 1. If user is invitee, allow
- * 2. Or else, if user is team member, allow
- *
- * TLDR: Allow if user is invitee or team member
- */
 @Injectable()
 export class TeamInviteViewerGuard implements CanActivate {
   constructor(
@@ -26,32 +23,50 @@ export class TeamInviteViewerGuard implements CanActivate {
   ) {}
 
   async canActivate(context: ExecutionContext): Promise<boolean> {
-    // Get GQL context
+    return pipe(
-    const gqlExecCtx = GqlExecutionContext.create(context);
+      TE.Do,
 
-    // Get user
+      // Get GQL Context
-    const { user } = gqlExecCtx.getContext().req;
+      TE.bindW('gqlCtx', () => TE.of(GqlExecutionContext.create(context))),
-    if (!user) throwErr(BUG_AUTH_NO_USER_CTX);
 
-    // Get the invite
+      // Get user
-    const { inviteID } = gqlExecCtx.getArgs<{ inviteID: string }>();
+      TE.bindW('user', ({ gqlCtx }) =>
-    if (!inviteID) throwErr(BUG_TEAM_INVITE_NO_INVITE_ID);
+        pipe(
+          O.fromNullable(gqlCtx.getContext().req.user),
+          TE.fromOption(() => BUG_AUTH_NO_USER_CTX),
+        ),
+      ),
 
-    const invitation = await this.teamInviteService.getInvitation(inviteID);
+      // Get the invite
-    if (O.isNone(invitation)) throwErr(TEAM_INVITE_NO_INVITE_FOUND);
+      TE.bindW('invite', ({ gqlCtx }) =>
+        pipe(
+          O.fromNullable(gqlCtx.getArgs<{ inviteID?: string }>().inviteID),
+          TE.fromOption(() => BUG_TEAM_INVITE_NO_INVITE_ID),
+          TE.chainW(
+            flow(
+              this.teamInviteService.getInvitation,
+              TE.fromTaskOption(() => TEAM_INVITE_NO_INVITE_FOUND),
+            ),
+          ),
+        ),
+      ),
 
-    // Check if the user and the invite email match, else if user is a team member
+      // Check if the user and the invite email match, else if we can resolver the user as a team member
-    if (
+      // any better solution ?
-      user.email?.toLowerCase() !== invitation.value.inviteeEmail.toLowerCase()
+      TE.chainW(({ user, invite }) =>
-    ) {
+        user.email?.toLowerCase() === invite.inviteeEmail.toLowerCase()
-      const teamMember = await this.teamService.getTeamMember(
+          ? TE.of(true)
-        invitation.value.teamID,
+          : pipe(
-        user.uid,
+              this.teamService.getTeamMemberTE(invite.teamID, user.uid),
-      );
+              TE.map(() => true),
+            ),
+      ),
 
-      if (!teamMember) throwErr(TEAM_MEMBER_NOT_FOUND);
+      TE.mapLeft((e) =>
-    }
+        e === 'team/member_not_found' ? TEAM_INVITE_NOT_VALID_VIEWER : e,
+      ),
 
-    return true;
+      TE.fold(throwErr, () => T.of(true)),
+    )();
   }
 }

packages/hoppscotch-backend/src/team-invitation/team-invitee.guard.ts

@@ -1,7 +1,11 @@
 import { CanActivate, ExecutionContext, Injectable } from '@nestjs/common';
 import { TeamInvitationService } from './team-invitation.service';
+import { pipe, flow } from 'fp-ts/function';
 import * as O from 'fp-ts/Option';
+import * as T from 'fp-ts/Task';
+import * as TE from 'fp-ts/TaskEither';
 import { GqlExecutionContext } from '@nestjs/graphql';
+import { User } from 'src/user/user.model';
 import {
   BUG_AUTH_NO_USER_CTX,
   BUG_TEAM_INVITE_NO_INVITE_ID,
@@ -20,26 +24,44 @@ export class TeamInviteeGuard implements CanActivate {
   constructor(private readonly teamInviteService: TeamInvitationService) {}
 
   async canActivate(context: ExecutionContext): Promise<boolean> {
-    // Get GQL Context
+    return pipe(
-    const gqlExecCtx = GqlExecutionContext.create(context);
+      TE.Do,
 
-    // Get user
+      // Get execution context
-    const { user } = gqlExecCtx.getContext().req;
+      TE.bindW('gqlCtx', () => TE.of(GqlExecutionContext.create(context))),
-    if (!user) throwErr(BUG_AUTH_NO_USER_CTX);
 
-    // Get the invite
+      // Get user
-    const { inviteID } = gqlExecCtx.getArgs<{ inviteID: string }>();
+      TE.bindW('user', ({ gqlCtx }) =>
-    if (!inviteID) throwErr(BUG_TEAM_INVITE_NO_INVITE_ID);
+        pipe(
+          O.fromNullable(gqlCtx.getContext().req.user),
+          TE.fromOption(() => BUG_AUTH_NO_USER_CTX),
+        ),
+      ),
 
-    const invitation = await this.teamInviteService.getInvitation(inviteID);
+      // Get invite
-    if (O.isNone(invitation)) throwErr(TEAM_INVITE_NO_INVITE_FOUND);
+      TE.bindW('invite', ({ gqlCtx }) =>
+        pipe(
+          O.fromNullable(gqlCtx.getArgs<{ inviteID?: string }>().inviteID),
+          TE.fromOption(() => BUG_TEAM_INVITE_NO_INVITE_ID),
+          TE.chainW(
+            flow(
+              this.teamInviteService.getInvitation,
+              TE.fromTaskOption(() => TEAM_INVITE_NO_INVITE_FOUND),
+            ),
+          ),
+        ),
+      ),
 
-    if (
+      // Check if the emails match
-      user.email.toLowerCase() !== invitation.value.inviteeEmail.toLowerCase()
+      TE.chainW(
-    ) {
+        TE.fromPredicate(
-      throwErr(TEAM_INVITE_EMAIL_DO_NOT_MATCH);
+          ({ user, invite }) => user.email === invite.inviteeEmail,
-    }
+          () => TEAM_INVITE_EMAIL_DO_NOT_MATCH,
+        ),
+      ),
 
-    return true;
+      // Fold it to a promise
+      TE.fold(throwErr, () => T.of(true)),
+    )();
   }
 }

packages/hoppscotch-backend/src/team-invitation/team-teaminvite-ext.resolver.ts

@@ -12,6 +12,6 @@ export class TeamTeamInviteExtResolver {
     complexity: 10,
   })
   teamInvitations(@Parent() team: Team): Promise<TeamInvitation[]> {
-    return this.teamInviteService.getTeamInvitations(team.id);
+    return this.teamInviteService.getAllInvitationsInTeam(team)();
   }
 }

packages/hoppscotch-backend/src/utils.ts

@@ -9,8 +9,7 @@ import * as E from 'fp-ts/Either';
 import * as A from 'fp-ts/Array';
 import { TeamMemberRole } from './team/team.model';
 import { User } from './user/user.model';
-import { ENV_EMPTY_AUTH_PROVIDERS, ENV_NOT_FOUND_KEY_AUTH_PROVIDERS, ENV_NOT_SUPPORT_AUTH_PROVIDERS, JSON_INVALID } from './errors';
+import { JSON_INVALID } from './errors';
-import { AuthProvider } from './auth/helper';
 
 /**
  * A workaround to throw an exception in an expression.
@@ -153,31 +152,3 @@ export function isValidLength(title: string, length: number) {
 
   return true;
 }
-
-/**
- * This function is called by bootstrap() in main.ts
- *  It checks if the "ALLOWED_AUTH_PROVIDERS" environment variable is properly set or not.
- * If not, it throws an error.
- */
-export function checkEnvironmentAuthProvider() {
-  if (!process.env.hasOwnProperty('ALLOWED_AUTH_PROVIDERS')) {
-    throw new Error(ENV_NOT_FOUND_KEY_AUTH_PROVIDERS);
-  }
-
-  if (process.env.ALLOWED_AUTH_PROVIDERS === '') {
-    throw new Error(ENV_EMPTY_AUTH_PROVIDERS);
-  }
-
-  const givenAuthProviders = process.env.ALLOWED_AUTH_PROVIDERS.split(',').map(
-    (provider) => provider.toLocaleUpperCase(),
-  );
-  const supportedAuthProviders = Object.values(AuthProvider).map(
-    (provider: string) => provider.toLocaleUpperCase(),
-  );
-
-  for (const givenAuthProvider of givenAuthProviders) {
-    if (!supportedAuthProviders.includes(givenAuthProvider)) {
-      throw new Error(ENV_NOT_SUPPORT_AUTH_PROVIDERS);
-    }
-  }
-}

packages/hoppscotch-common/.eslintrc.js

@@ -6,6 +6,7 @@ module.exports = {
   env: {
     browser: true,
     node: true,
+    jest: true,
   },
   parserOptions: {
     sourceType: "module",

packages/hoppscotch-common/assets/icons/star-off.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="currentColor" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-star"><polygon points="12 2 15.09 8.26 22 9.27 17 14.14 18.18 21.02 12 17.77 5.82 21.02 7 14.14 2 9.27 8.91 8.26 12 2"/></svg>

packages/hoppscotch-common/assets/scss/styles.scss

@@ -4,7 +4,6 @@
   @apply after:backface-hidden;
   @apply selection:bg-accentDark;
   @apply selection:text-accentContrast;
-  @apply overscroll-none;
 }
 
 :root {

packages/hoppscotch-common/locales/en.json

@@ -4,7 +4,6 @@
     "cancel": "Cancel",
     "choose_file": "Choose a file",
     "clear": "Clear",
-    "clear_history": "Clear All History",
     "clear_all": "Clear all",
     "close": "Close",
     "connect": "Connect",
@@ -151,11 +150,6 @@
     "save_unsaved_tab": "Do you want to save changes made in this tab?",
     "sync": "Would you like to restore your workspace from cloud? This will discard your local progress."
   },
-  "context_menu": {
-    "set_environment_variable": "Set as variable",
-    "add_parameter": "Add to parameter",
-    "open_link_in_new_tab": "Open link in new tab"
-  },
   "count": {
     "header": "Header {count}",
     "message": "Message {count}",
@@ -179,7 +173,6 @@
     "folder": "Folder is empty",
     "headers": "This request does not have any headers",
     "history": "History is empty",
-    "history_suggestions": "History does not have any matching entries",
     "invites": "Invite list is empty",
     "members": "Team is empty",
     "parameters": "This request does not have any parameters",
@@ -200,23 +193,16 @@
     "created": "Environment created",
     "deleted": "Environment deletion",
     "edit": "Edit Environment",
-    "global": "Global",
     "invalid_name": "Please provide a name for the environment",
     "my_environments": "My Environments",
-    "name": "Name",
     "nested_overflow": "nested environment variables are limited to 10 levels",
     "new": "New Environment",
     "no_environment": "No environment",
     "no_environment_description": "No environments were selected. Choose what to do with the following variables.",
-    "replace_with_variable": "Replace with variable",
-    "scope": "Scope",
     "select": "Select environment",
-    "set_as_environment": "Set as environment",
     "team_environments": "Team Environments",
     "title": "Environments",
     "updated": "Environment updated",
-    "value": "Value",
-    "variable": "Variable",
     "variable_list": "Variable List"
   },
   "error": {
@@ -596,11 +582,6 @@
     "log": "Log",
     "url": "URL"
   },
-  "spotlight": {
-    "section": {
-      "user": "User"
-    }
-  },
   "sse": {
     "event_type": "Event type",
     "log": "Log",

packages/hoppscotch-common/package.json

@@ -1,11 +1,9 @@
 {
   "name": "@hoppscotch/common",
   "private": true,
-  "version": "2023.4.7",
+  "version": "2023.4.6",
   "scripts": {
     "dev": "pnpm exec npm-run-all -p -l dev:*",
-    "test": "vitest --run",
-    "test:watch": "vitest",
     "dev:vite": "vite",
     "dev:gql-codegen": "graphql-codegen --require dotenv/config --config gql-codegen.yml --watch dotenv_config_path=\"../../.env\"",
     "lint": "eslint src --ext .ts,.js,.vue --ignore-path .gitignore .",
@@ -15,7 +13,6 @@
     "preview": "vite preview",
     "gql-codegen": "graphql-codegen --require dotenv/config --config gql-codegen.yml dotenv_config_path=\"../../.env\"",
     "postinstall": "pnpm run gql-codegen",
-    "do-test": "pnpm run test",
     "do-lint": "pnpm run prod-lint",
     "do-typecheck": "pnpm run lint",
     "do-lintfix": "pnpm run lintfix"
@@ -46,12 +43,11 @@
     "@urql/exchange-auth": "^0.1.7",
     "@urql/exchange-graphcache": "^4.4.3",
     "@vitejs/plugin-legacy": "^2.3.0",
-    "@vueuse/core": "^8.9.4",
+    "@vueuse/core": "^8.7.5",
     "@vueuse/head": "^0.7.9",
     "acorn-walk": "^8.2.0",
     "axios": "^0.21.4",
     "buffer": "^6.0.3",
-    "dioc": "workspace:^",
     "esprima": "^4.0.1",
     "events": "^3.3.0",
     "fp-ts": "^2.12.1",
@@ -67,7 +63,6 @@
     "jsonpath-plus": "^7.0.0",
     "lodash-es": "^4.17.21",
     "lossless-json": "^2.0.8",
-    "minisearch": "^6.1.0",
     "nprogress": "^0.2.0",
     "paho-mqtt": "^1.1.0",
     "path": "^0.12.7",
@@ -89,6 +84,7 @@
     "util": "^0.12.4",
     "uuid": "^8.3.2",
     "vue": "^3.2.25",
+    "vue-github-button": "^3.0.3",
     "vue-i18n": "^9.2.2",
     "vue-pdf-embed": "^1.1.4",
     "vue-router": "^4.0.16",
@@ -110,9 +106,8 @@
     "@graphql-codegen/typescript-urql-graphcache": "^2.3.1",
     "@graphql-codegen/urql-introspection": "^2.2.0",
     "@graphql-typed-document-node/core": "^3.1.1",
-    "@iconify-json/lucide": "^1.1.109",
+    "@iconify-json/lucide": "^1.1.40",
     "@intlify/vite-plugin-vue-i18n": "^7.0.0",
-    "@relmify/jest-fp-ts": "^2.1.1",
     "@rushstack/eslint-patch": "^1.1.4",
     "@types/js-yaml": "^4.0.5",
     "@types/lodash-es": "^4.17.6",
@@ -147,11 +142,10 @@
     "vite-plugin-html-config": "^1.0.10",
     "vite-plugin-inspect": "^0.7.4",
     "vite-plugin-pages": "^0.26.0",
-    "vite-plugin-pages-sitemap": "^1.4.5",
+    "vite-plugin-pages-sitemap": "^1.4.0",
     "vite-plugin-pwa": "^0.13.1",
     "vite-plugin-vue-layouts": "^0.7.0",
     "vite-plugin-windicss": "^1.8.8",
-    "vitest": "^0.32.2",
     "vue-tsc": "^0.38.2",
     "windicss": "^3.5.6"
   }

packages/hoppscotch-common/src/components.d.ts

@@ -9,24 +9,22 @@ declare module '@vue/runtime-core' {
   export interface GlobalComponents {
     AppActionHandler: typeof import('./components/app/ActionHandler.vue')['default']
     AppAnnouncement: typeof import('./components/app/Announcement.vue')['default']
-    AppContextMenu: typeof import('./components/app/ContextMenu.vue')['default']
     AppDeveloperOptions: typeof import('./components/app/DeveloperOptions.vue')['default']
     AppFooter: typeof import('./components/app/Footer.vue')['default']
+    AppFuse: typeof import('./components/app/Fuse.vue')['default']
     AppGitHubStarButton: typeof import('./components/app/GitHubStarButton.vue')['default']
     AppHeader: typeof import('./components/app/Header.vue')['default']
     AppInterceptor: typeof import('./components/app/Interceptor.vue')['default']
     AppLogo: typeof import('./components/app/Logo.vue')['default']
     AppOptions: typeof import('./components/app/Options.vue')['default']
     AppPaneLayout: typeof import('./components/app/PaneLayout.vue')['default']
+    AppPowerSearch: typeof import('./components/app/PowerSearch.vue')['default']
+    AppPowerSearchEntry: typeof import('./components/app/PowerSearchEntry.vue')['default']
     AppShare: typeof import('./components/app/Share.vue')['default']
     AppShortcuts: typeof import('./components/app/Shortcuts.vue')['default']
     AppShortcutsEntry: typeof import('./components/app/ShortcutsEntry.vue')['default']
     AppShortcutsPrompt: typeof import('./components/app/ShortcutsPrompt.vue')['default']
     AppSidenav: typeof import('./components/app/Sidenav.vue')['default']
-    AppSpotlight: typeof import('./components/app/spotlight/index.vue')['default']
-    AppSpotlightEntry: typeof import('./components/app/spotlight/Entry.vue')['default']
-    AppSpotlightEntryGQLHistory: typeof import('./components/app/spotlight/entry/GQLHistory.vue')['default']
-    AppSpotlightEntryRESTHistory: typeof import('./components/app/spotlight/entry/RESTHistory.vue')['default']
     AppSupport: typeof import('./components/app/Support.vue')['default']
     ButtonPrimary: typeof import('./../../hoppscotch-ui/src/components/button/Primary.vue')['default']
     ButtonSecondary: typeof import('./../../hoppscotch-ui/src/components/button/Secondary.vue')['default']
@@ -55,7 +53,6 @@ declare module '@vue/runtime-core' {
     CollectionsSaveRequest: typeof import('./components/collections/SaveRequest.vue')['default']
     CollectionsTeamCollections: typeof import('./components/collections/TeamCollections.vue')['default']
     Environments: typeof import('./components/environments/index.vue')['default']
-    EnvironmentsAdd: typeof import('./components/environments/Add.vue')['default']
     EnvironmentsImportExport: typeof import('./components/environments/ImportExport.vue')['default']
     EnvironmentsMy: typeof import('./components/environments/my/index.vue')['default']
     EnvironmentsMyDetails: typeof import('./components/environments/my/Details.vue')['default']
@@ -134,7 +131,6 @@ declare module '@vue/runtime-core' {
     IconLucideLayers: typeof import('~icons/lucide/layers')['default']
     IconLucideListEnd: typeof import('~icons/lucide/list-end')['default']
     IconLucideMinus: typeof import('~icons/lucide/minus')['default']
-    IconLucideRss: typeof import('~icons/lucide/rss')['default']
     IconLucideSearch: typeof import('~icons/lucide/search')['default']
     IconLucideUsers: typeof import('~icons/lucide/users')['default']
     LensesHeadersRenderer: typeof import('./components/lenses/HeadersRenderer.vue')['default']
@@ -172,7 +168,6 @@ declare module '@vue/runtime-core' {
     SmartLink: typeof import('./../../hoppscotch-ui/src/components/smart/Link.vue')['default']
     SmartModal: typeof import('./../../hoppscotch-ui/src/components/smart/Modal.vue')['default']
     SmartPicture: typeof import('./../../hoppscotch-ui/src/components/smart/Picture.vue')['default']
-    SmartPlaceholder: typeof import('./../../hoppscotch-ui/src/components/smart/Placeholder.vue')['default']
     SmartProgressRing: typeof import('./../../hoppscotch-ui/src/components/smart/ProgressRing.vue')['default']
     SmartRadio: typeof import('./../../hoppscotch-ui/src/components/smart/Radio.vue')['default']
     SmartRadioGroup: typeof import('./../../hoppscotch-ui/src/components/smart/RadioGroup.vue')['default']

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

@@ -1,76 +0,0 @@
-<template>
-  <div
-    ref="contextMenuRef"
-    class="fixed bg-popover shadow-lg transform translate-y-8 border border-dividerDark p-2 rounded"
-    :style="`top: ${position.top}px; left: ${position.left}px; z-index: 1000;`"
-  >
-    <div v-if="contextMenuOptions" class="flex flex-col">
-      <div
-        v-for="option in contextMenuOptions"
-        :key="option.id"
-        class="flex flex-col space-y-2"
-      >
-        <HoppSmartItem
-          v-if="option.text.type === 'text' && option.text"
-          :icon="option.icon"
-          :label="option.text.text"
-          @click="handleClick(option)"
-        />
-        <component
-          :is="option.text.component"
-          v-else-if="option.text.type === 'custom'"
-        />
-      </div>
-    </div>
-  </div>
-</template>
-
-<script lang="ts" setup>
-import { onClickOutside } from "@vueuse/core"
-import { useService } from "dioc/vue"
-import { ref, watch } from "vue"
-import { ContextMenuResult, ContextMenuService } from "~/services/context-menu"
-import { EnvironmentMenuService } from "~/services/context-menu/menu/environment.menu"
-import { ParameterMenuService } from "~/services/context-menu/menu/parameter.menu"
-import { URLMenuService } from "~/services/context-menu/menu/url.menu"
-
-const props = defineProps<{
-  show: boolean
-  position: { top: number; left: number }
-  text: string | null
-}>()
-
-const emit = defineEmits<{
-  (e: "hide-modal"): void
-}>()
-
-const contextMenuRef = ref<any | null>(null)
-
-const contextMenuOptions = ref<ContextMenuResult[]>([])
-
-onClickOutside(contextMenuRef, () => {
-  emit("hide-modal")
-})
-
-const contextMenuService = useService(ContextMenuService)
-
-useService(EnvironmentMenuService)
-useService(ParameterMenuService)
-useService(URLMenuService)
-
-const handleClick = (option: { action: () => void }) => {
-  option.action()
-  emit("hide-modal")
-}
-
-watch(
-  () => [props.show, props.text],
-  (val) => {
-    if (val && props.text) {
-      const options = contextMenuService.getMenuFor(props.text)
-      contextMenuOptions.value = options
-    }
-  },
-  { immediate: true }
-)
-</script>

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

@@ -152,7 +152,7 @@
           v-tippy="{ theme: 'tooltip', allowHTML: true }"
           :title="`${t(
             'app.shortcuts'
-          )} <kbd>${getSpecialKey()}</kbd><kbd>/</kbd>`"
+          )} <kbd>${getSpecialKey()}</kbd><kbd>K</kbd>`"
           :icon="IconZap"
           @click="invokeAction('flyouts.keybinds.toggle')"
         />

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

@@ -0,0 +1,70 @@
+<template>
+  <div key="outputHash" class="flex flex-col flex-1 overflow-auto">
+    <div class="flex flex-col">
+      <AppPowerSearchEntry
+        v-for="(shortcut, shortcutIndex) in searchResults"
+        :key="`shortcut-${shortcutIndex}`"
+        :active="shortcutIndex === selectedEntry"
+        :shortcut="shortcut.item"
+        @action="emit('action', shortcut.item.action)"
+        @mouseover="selectedEntry = shortcutIndex"
+      />
+    </div>
+    <div
+      v-if="searchResults.length === 0"
+      class="flex flex-col items-center justify-center p-4 text-secondaryLight"
+    >
+      <icon-lucide-search class="pb-2 opacity-75 svg-icons" />
+      <span class="my-2 text-center">
+        {{ t("state.nothing_found") }} "{{ search }}"
+      </span>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { computed, onUnmounted, onMounted } from "vue"
+import Fuse from "fuse.js"
+import { useArrowKeysNavigation } from "~/helpers/powerSearchNavigation"
+import { HoppAction } from "~/helpers/actions"
+import { useI18n } from "@composables/i18n"
+
+const t = useI18n()
+
+const props = defineProps<{
+  input: Record<string, any>[]
+  search: string
+}>()
+
+const emit = defineEmits<{
+  (e: "action", action: HoppAction): void
+}>()
+
+const options = {
+  keys: ["keys", "label", "action", "tags"],
+}
+
+const fuse = new Fuse(props.input, options)
+
+const searchResults = computed(() => fuse.search(props.search))
+
+const searchResultsItems = computed(() =>
+  searchResults.value.map((searchResult) => searchResult.item)
+)
+
+const emitSearchAction = (action: HoppAction) => emit("action", action)
+
+const { bindArrowKeysListeners, unbindArrowKeysListeners, selectedEntry } =
+  useArrowKeysNavigation(searchResultsItems, {
+    onEnter: emitSearchAction,
+    stopPropagation: true,
+  })
+
+onMounted(() => {
+  bindArrowKeysListeners()
+})
+
+onUnmounted(() => {
+  unbindArrowKeysListeners()
+})
+</script>

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

@@ -15,21 +15,16 @@
           :label="t('app.name')"
           to="/"
         />
+        <!-- <AppGitHubStarButton class="mt-1.5 transition" /> -->
       </div>
-      <div class="inline-flex items-center justify-center flex-1 space-x-2">
+      <div class="inline-flex items-center space-x-2">
-        <button
+        <HoppButtonSecondary
-          class="flex flex-1 items-center justify-between px-2 py-1 bg-primaryDark transition text-secondaryLight cursor-text rounded border border-dividerDark max-w-xs hover:border-dividerDark hover:bg-primaryLight hover:text-secondary focus-visible:border-dividerDark focus-visible:bg-primaryLight focus-visible:text-secondary"
+          v-tippy="{ theme: 'tooltip', allowHTML: true }"
+          :title="`${t('app.search')} <kbd>/</kbd>`"
+          :icon="IconSearch"
+          class="rounded hover:bg-primaryDark focus-visible:bg-primaryDark"
           @click="invokeAction('modals.search.toggle')"
-        >
+        />
-          <span class="inline-flex flex-1 items-center">
-            <icon-lucide-search class="mr-2 svg-icons" />
-            {{ t("app.search") }}
-          </span>
-          <span class="flex">
-            <kbd class="shortcut-key">{{ getPlatformSpecialKey() }}</kbd>
-            <kbd class="shortcut-key">K</kbd>
-          </span>
-        </button>
         <HoppButtonSecondary
           v-if="showInstallButton"
           v-tippy="{ theme: 'tooltip' }"
@@ -47,8 +42,6 @@
           class="rounded hover:bg-primaryDark focus-visible:bg-primaryDark"
           @click="invokeAction('modals.support.toggle')"
         />
-      </div>
-      <div class="inline-flex items-center justify-end flex-1 space-x-2">
         <div
           v-if="currentUser === null"
           class="inline-flex items-center space-x-2"
@@ -243,17 +236,17 @@ import IconDownload from "~icons/lucide/download"
 import IconUploadCloud from "~icons/lucide/upload-cloud"
 import IconUserPlus from "~icons/lucide/user-plus"
 import IconLifeBuoy from "~icons/lucide/life-buoy"
+import IconSearch from "~icons/lucide/search"
 import { breakpointsTailwind, useBreakpoints, useNetwork } from "@vueuse/core"
 import { pwaDefferedPrompt, installPWA } from "@modules/pwa"
 import { platform } from "~/platform"
 import { useI18n } from "@composables/i18n"
 import { useReadonlyStream } from "@composables/stream"
-import { defineActionHandler, invokeAction } from "@helpers/actions"
+import { invokeAction } from "@helpers/actions"
 import { workspaceStatus$, updateWorkspaceTeamName } from "~/newstore/workspace"
 import TeamListAdapter from "~/helpers/teams/TeamListAdapter"
 import { onLoggedIn } from "~/composables/auth"
 import { GetMyTeamsQuery } from "~/helpers/backend/graphql"
-import { getPlatformSpecialKey } from "~/helpers/platformutils"
 
 const t = useI18n()
 
@@ -381,12 +374,4 @@ const profile = ref<any | null>(null)
 const settings = ref<any | null>(null)
 const logout = ref<any | null>(null)
 const accountActions = ref<any | null>(null)
-
-defineActionHandler(
-  "user.login",
-  () => {
-    invokeAction("modals.login.toggle")
-  },
-  computed(() => !currentUser.value)
-)
 </script>

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

@@ -0,0 +1,122 @@
+<template>
+  <HoppSmartModal
+    v-if="show"
+    styles="sm:max-w-lg"
+    full-width
+    @close="emit('hide-modal')"
+  >
+    <template #body>
+      <div class="flex flex-col border-b transition border-dividerLight">
+        <input
+          id="command"
+          v-model="search"
+          v-focus
+          type="text"
+          autocomplete="off"
+          name="command"
+          :placeholder="`${t('app.type_a_command_search')}`"
+          class="flex flex-shrink-0 p-6 text-base bg-transparent text-secondaryDark"
+        />
+        <div
+          class="flex flex-shrink-0 text-tiny text-secondaryLight px-4 pb-4 justify-between whitespace-nowrap overflow-auto <sm:hidden"
+        >
+          <div class="flex items-center">
+            <kbd class="shortcut-key">↑</kbd>
+            <kbd class="shortcut-key">↓</kbd>
+            <span class="ml-2 truncate">
+              {{ t("action.to_navigate") }}
+            </span>
+            <kbd class="shortcut-key">↩</kbd>
+            <span class="ml-2 truncate">
+              {{ t("action.to_select") }}
+            </span>
+          </div>
+          <div class="flex items-center">
+            <kbd class="shortcut-key">ESC</kbd>
+            <span class="ml-2 truncate">
+              {{ t("action.to_close") }}
+            </span>
+          </div>
+        </div>
+      </div>
+      <AppFuse
+        v-if="search && show"
+        :input="fuse"
+        :search="search"
+        @action="runAction"
+      />
+      <div
+        v-else
+        class="flex flex-col flex-1 overflow-auto space-y-4 divide-y divide-dividerLight"
+      >
+        <div
+          v-for="(map, mapIndex) in mappings"
+          :key="`map-${mapIndex}`"
+          class="flex flex-col"
+        >
+          <h5 class="px-6 py-2 my-2 text-secondaryLight">
+            {{ t(map.section) }}
+          </h5>
+          <AppPowerSearchEntry
+            v-for="(shortcut, shortcutIndex) in map.shortcuts"
+            :key="`map-${mapIndex}-shortcut-${shortcutIndex}`"
+            :shortcut="shortcut"
+            :active="shortcutsItems.indexOf(shortcut) === selectedEntry"
+            @action="runAction"
+            @mouseover="selectedEntry = shortcutsItems.indexOf(shortcut)"
+          />
+        </div>
+      </div>
+    </template>
+  </HoppSmartModal>
+</template>
+
+<script setup lang="ts">
+import { ref, computed, watch } from "vue"
+import { HoppAction, invokeAction } from "~/helpers/actions"
+import { spotlight as mappings, fuse } from "@helpers/shortcuts"
+import { useArrowKeysNavigation } from "~/helpers/powerSearchNavigation"
+import { useI18n } from "@composables/i18n"
+
+const t = useI18n()
+
+const props = defineProps<{
+  show: boolean
+}>()
+
+const emit = defineEmits<{
+  (e: "hide-modal"): void
+}>()
+
+const search = ref("")
+
+const hideModal = () => {
+  search.value = ""
+  emit("hide-modal")
+}
+
+const runAction = (command: HoppAction) => {
+  invokeAction(command)
+  hideModal()
+}
+
+const shortcutsItems = computed(() =>
+  mappings.reduce(
+    (shortcuts, section) => [...shortcuts, ...section.shortcuts],
+    []
+  )
+)
+
+const { bindArrowKeysListeners, unbindArrowKeysListeners, selectedEntry } =
+  useArrowKeysNavigation(shortcutsItems, {
+    onEnter: runAction,
+  })
+
+watch(
+  () => props.show,
+  (show) => {
+    if (show) bindArrowKeysListeners()
+    else unbindArrowKeysListeners()
+  }
+)
+</script>

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

@@ -0,0 +1,68 @@
+<template>
+  <button
+    class="flex items-center flex-1 px-6 py-3 font-medium transition cursor-pointer search-entry focus:outline-none"
+    :class="{ active: active }"
+    tabindex="-1"
+    @click="emit('action', shortcut.action)"
+    @keydown.enter="emit('action', shortcut.action)"
+  >
+    <component
+      :is="shortcut.icon"
+      class="mr-4 transition opacity-50 svg-icons"
+      :class="{ 'opacity-100 text-secondaryDark': active }"
+    />
+    <span
+      class="flex flex-1 mr-4 transition"
+      :class="{ 'text-secondaryDark': active }"
+    >
+      {{ t(shortcut.label) }}
+    </span>
+    <kbd
+      v-for="(key, keyIndex) in shortcut.keys"
+      :key="`key-${String(keyIndex)}`"
+      class="shortcut-key"
+    >
+      {{ key }}
+    </kbd>
+  </button>
+</template>
+
+<script setup lang="ts">
+import type { Component } from "vue"
+import { useI18n } from "@composables/i18n"
+
+const t = useI18n()
+
+defineProps<{
+  shortcut: {
+    label: string
+    keys: string[]
+    action: string
+    icon: object | Component
+  }
+  active: boolean
+}>()
+
+const emit = defineEmits<{
+  (e: "action", action: string): void
+}>()
+</script>
+
+<style lang="scss" scoped>
+.search-entry {
+  @apply relative;
+  @apply after:absolute;
+  @apply after:top-0;
+  @apply after:left-0;
+  @apply after:bottom-0;
+  @apply after:bg-transparent;
+  @apply after:z-2;
+  @apply after:w-0.5;
+  @apply after:content-DEFAULT;
+
+  &.active {
+    @apply bg-primaryLight;
+    @apply after:bg-accentLight;
+  }
+}
+</style>

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

@@ -14,17 +14,10 @@
           />
         </div>
       </div>
-      <div class="flex flex-col divide-y divide-dividerLight">
+      <div v-if="filterText" class="flex flex-col divide-y divide-dividerLight">
-        <HoppSmartPlaceholder
-          v-if="isEmpty(shortcutsResults)"
-          :text="`${t('state.nothing_found')} ‟${filterText}”`"
-        >
-          <icon-lucide-search class="pb-2 opacity-75 svg-icons" />
-        </HoppSmartPlaceholder>
         <details
-          v-for="(sectionResults, sectionTitle) in shortcutsResults"
+          v-for="(map, mapIndex) in searchResults"
-          v-else
+          :key="`map-${mapIndex}`"
-          :key="`section-${sectionTitle}`"
           class="flex flex-col"
           open
         >
@@ -35,28 +28,62 @@
             <span
               class="font-semibold truncate capitalize-first text-secondaryDark"
             >
-              {{ sectionTitle }}
+              {{ t(map.item.section) }}
             </span>
           </summary>
           <div class="flex flex-col px-6 pb-4 space-y-2">
             <AppShortcutsEntry
-              v-for="(shortcut, index) in sectionResults"
+              v-for="(shortcut, index) in map.item.shortcuts"
               :key="`shortcut-${index}`"
               :shortcut="shortcut"
             />
           </div>
         </details>
+        <div
+          v-if="searchResults.length === 0"
+          class="flex flex-col items-center justify-center p-4 text-secondaryLight"
+        >
+          <icon-lucide-search class="pb-2 opacity-75 svg-icons" />
+          <span class="my-2 text-center">
+            {{ t("state.nothing_found") }} "{{ filterText }}"
+          </span>
+        </div>
+      </div>
+      <div v-else class="flex flex-col divide-y divide-dividerLight">
+        <details
+          v-for="(map, mapIndex) in mappings"
+          :key="`map-${mapIndex}`"
+          class="flex flex-col"
+          open
+        >
+          <summary
+            class="flex items-center flex-1 min-w-0 px-6 py-4 font-semibold transition cursor-pointer focus:outline-none text-secondaryLight hover:text-secondaryDark"
+          >
+            <icon-lucide-chevron-right class="mr-2 indicator" />
+            <span
+              class="font-semibold truncate capitalize-first text-secondaryDark"
+            >
+              {{ t(map.section) }}
+            </span>
+          </summary>
+          <div class="flex flex-col px-6 pb-4 space-y-2">
+            <AppShortcutsEntry
+              v-for="(shortcut, shortcutIndex) in map.shortcuts"
+              :key="`map-${mapIndex}-shortcut-${shortcutIndex}`"
+              :shortcut="shortcut"
+            />
+          </div>
+        </details>
       </div>
     </template>
   </HoppSmartSlideOver>
 </template>
 
 <script setup lang="ts">
-import { computed, onBeforeMount, ref } from "vue"
+import { computed, ref } from "vue"
-import { ShortcutDef, getShortcuts } from "~/helpers/shortcuts"
+import Fuse from "fuse.js"
-import MiniSearch from "minisearch"
+import mappings from "~/helpers/shortcuts"
 import { useI18n } from "@composables/i18n"
-import { groupBy, isEmpty } from "lodash-es"
 
 const t = useI18n()
 
@@ -64,33 +91,15 @@ defineProps<{
   show: boolean
 }>()
 
-const minisearch = new MiniSearch({
+const options = {
-  fields: ["label", "keys", "section"],
+  keys: ["shortcuts.label"],
-  idField: "label",
+}
-  storeFields: ["label", "keys", "section"],
-  searchOptions: {
-    fuzzy: true,
-    prefix: true,
-  },
-})
 
-const shortcuts = getShortcuts(t)
+const fuse = new Fuse(mappings, options)
-
-onBeforeMount(() => {
-  minisearch.addAllAsync(shortcuts)
-})
 
 const filterText = ref("")
 
-const shortcutsResults = computed(() => {
+const searchResults = computed(() => fuse.search(filterText.value))
-  // If there are no search text, return all the shortcuts
-  const results =
-    filterText.value.length > 0
-      ? minisearch.search(filterText.value)
-      : shortcuts
-
-  return groupBy(results, "section") as Record<string, ShortcutDef[]>
-})
 
 const emit = defineEmits<{
   (e: "close"): void

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

@@ -1,7 +1,7 @@
 <template>
   <div class="flex items-center py-1">
     <span class="flex flex-1 mr-4">
-      {{ shortcut.label }}
+      {{ t(shortcut.label) }}
     </span>
     <kbd
       v-for="(key, index) in shortcut.keys"
@@ -14,9 +14,14 @@
 </template>
 
 <script setup lang="ts">
-import { ShortcutDef } from "~/helpers/shortcuts"
+import { useI18n } from "@composables/i18n"
+
+const t = useI18n()
 
 defineProps<{
-  shortcut: ShortcutDef
+  shortcut: {
+    label: string
+    keys: string[]
+  }
 }>()
 </script>

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

@@ -22,11 +22,10 @@
         </div>
         <div class="flex">
           <kbd class="shortcut-key">{{ getSpecialKey() }}</kbd>
-          <kbd class="shortcut-key">/</kbd>
+          <kbd class="shortcut-key">K</kbd>
         </div>
         <div class="flex">
-          <kbd class="shortcut-key">{{ getSpecialKey() }}</kbd>
+          <kbd class="shortcut-key">/</kbd>
-          <kbd class="shortcut-key">K</kbd>
         </div>
         <div class="flex">
           <kbd class="shortcut-key">?</kbd>

packages/hoppscotch-common/src/components/app/spotlight/Entry.vue

@@ -1,122 +0,0 @@
-<template>
-  <button
-    ref="el"
-    class="flex items-center flex-1 px-6 py-4 font-medium space-x-4 transition cursor-pointer relative search-entry focus:outline-none"
-    :class="{ 'active bg-primaryLight text-secondaryDark': active }"
-    tabindex="-1"
-    @click="emit('action')"
-    @keydown.enter="emit('action')"
-  >
-    <component
-      :is="entry.icon"
-      class="opacity-50 svg-icons"
-      :class="{ 'opacity-100': active }"
-    />
-    <template
-      v-if="entry.text.type === 'text' && typeof entry.text.text === 'string'"
-    >
-      <span class="block truncate">
-        {{ entry.text.text }}
-      </span>
-    </template>
-    <template
-      v-else-if="entry.text.type === 'text' && Array.isArray(entry.text.text)"
-    >
-      <template
-        v-for="(labelPart, labelPartIndex) in entry.text.text"
-        :key="`label-${labelPart}-${labelPartIndex}`"
-      >
-        <span class="block truncate">
-          {{ labelPart }}
-        </span>
-        <icon-lucide-chevron-right
-          v-if="labelPartIndex < entry.text.text.length - 1"
-          class="flex flex-shrink-0"
-        />
-      </template>
-    </template>
-    <template v-else-if="entry.text.type === 'custom'">
-      <span class="block truncate">
-        <component
-          :is="entry.text.component"
-          v-bind="entry.text.componentProps"
-        />
-      </span>
-    </template>
-    <span v-if="formattedShortcutKeys" class="block truncate">
-      <kbd
-        v-for="(key, keyIndex) in formattedShortcutKeys"
-        :key="`key-${String(keyIndex)}`"
-        class="shortcut-key"
-      >
-        {{ key }}
-      </kbd>
-    </span>
-  </button>
-</template>
-
-<script lang="ts">
-import { getPlatformSpecialKey } from "~/helpers/platformutils"
-import { SpotlightSearcherResult } from "~/services/spotlight"
-
-const SPECIAL_KEY_CHARS: Record<string, string> = {
-  ctrl: getPlatformSpecialKey(),
-  alt: getPlatformAlternateKey(),
-  up: "↑",
-  down: "↓",
-  enter: "↩",
-}
-</script>
-
-<script setup lang="ts">
-import { computed, watch, ref } from "vue"
-import { capitalize } from "lodash-es"
-import { getPlatformAlternateKey } from "~/helpers/platformutils"
-
-const el = ref<HTMLElement>()
-
-const props = defineProps<{
-  entry: SpotlightSearcherResult
-  active: boolean
-}>()
-
-const formattedShortcutKeys = computed(() =>
-  props.entry.meta?.keyboardShortcut?.map((key) => {
-    return SPECIAL_KEY_CHARS[key] ?? capitalize(key)
-  })
-)
-
-const emit = defineEmits<{
-  (e: "action"): void
-}>()
-
-watch(
-  () => props.active,
-  (active) => {
-    if (active) {
-      el.value?.scrollIntoView({
-        behavior: "smooth",
-        block: "nearest",
-        inline: "nearest",
-      })
-    }
-  }
-)
-</script>
-
-<style lang="scss" scoped>
-.search-entry {
-  @apply after:absolute;
-  @apply after:top-0;
-  @apply after:left-0;
-  @apply after:bottom-0;
-  @apply after:bg-transparent;
-  @apply after:z-2;
-  @apply after:w-0.5;
-  @apply after:content-DEFAULT;
-
-  &.active {
-    @apply after:bg-accentLight;
-  }
-}
-</style>

packages/hoppscotch-common/src/components/app/spotlight/entry/GQLHistory.vue

@@ -1,30 +0,0 @@
-<template>
-  <span class="flex flex-1 items-center space-x-2">
-    <span class="block truncate">
-      {{ dateTimeText }}
-    </span>
-    <icon-lucide-chevron-right class="flex flex-shrink-0" />
-    <span class="block truncate">
-      {{ historyEntry.request.url }}
-    </span>
-    <span
-      class="font-semibold truncate text-tiny flex flex-shrink-0 border border-dividerDark rounded-md px-1"
-    >
-      {{ historyEntry.request.query.split("\n")[0] }}
-    </span>
-  </span>
-</template>
-
-<script setup lang="ts">
-import { computed } from "vue"
-import { shortDateTime } from "~/helpers/utils/date"
-import { GQLHistoryEntry } from "~/newstore/history"
-
-const props = defineProps<{
-  historyEntry: GQLHistoryEntry
-}>()
-
-const dateTimeText = computed(() =>
-  shortDateTime(props.historyEntry.updatedOn!)
-)
-</script>

packages/hoppscotch-common/src/components/app/spotlight/entry/RESTHistory.vue

@@ -1,43 +0,0 @@
-<template>
-  <span class="flex flex-1 items-center space-x-2">
-    <span class="block truncate">
-      {{ dateTimeText }}
-    </span>
-    <icon-lucide-chevron-right class="flex flex-shrink-0" />
-    <span
-      class="font-semibold truncate text-tiny flex flex-shrink-0 border border-dividerDark rounded-md px-1"
-      :class="entryStatus.className"
-    >
-      {{ historyEntry.request.method }}
-    </span>
-    <span class="block truncate">
-      {{ historyEntry.request.endpoint }}
-    </span>
-  </span>
-</template>
-
-<script setup lang="ts">
-import { computed } from "vue"
-import findStatusGroup from "~/helpers/findStatusGroup"
-import { shortDateTime } from "~/helpers/utils/date"
-import { RESTHistoryEntry } from "~/newstore/history"
-
-const props = defineProps<{
-  historyEntry: RESTHistoryEntry
-}>()
-
-const dateTimeText = computed(() =>
-  shortDateTime(props.historyEntry.updatedOn!)
-)
-
-const entryStatus = computed(() => {
-  const foundStatusGroup = findStatusGroup(
-    props.historyEntry.responseMeta.statusCode
-  )
-  return (
-    foundStatusGroup || {
-      className: "",
-    }
-  )
-})
-</script>

packages/hoppscotch-common/src/components/app/spotlight/index.vue

@@ -1,238 +0,0 @@
-<template>
-  <HoppSmartModal
-    v-if="show"
-    styles="sm:max-w-lg"
-    full-width
-    @close="emit('hide-modal')"
-  >
-    <template #body>
-      <div class="flex flex-col border-b transition border-divider">
-        <div class="flex items-center">
-          <input
-            id="command"
-            v-model="search"
-            v-focus
-            type="text"
-            autocomplete="off"
-            name="command"
-            :placeholder="`${t('app.type_a_command_search')}`"
-            class="flex flex-1 text-base bg-transparent text-secondaryDark px-6 py-5"
-          />
-          <HoppSmartSpinner v-if="searchSession?.loading" class="mr-6" />
-        </div>
-      </div>
-      <div
-        v-if="searchSession && search.length > 0"
-        class="flex flex-col flex-1 overflow-y-auto border-b border-divider divide-y divide-dividerLight"
-      >
-        <div
-          v-for="([sectionID, sectionResult], sectionIndex) in scoredResults"
-          :key="`section-${sectionID}`"
-          class="flex flex-col"
-        >
-          <h5
-            class="px-6 py-2 bg-primaryContrast z-10 text-secondaryLight sticky top-0"
-          >
-            {{ sectionResult.title }}
-          </h5>
-          <AppSpotlightEntry
-            v-for="(result, entryIndex) in sectionResult.results"
-            :key="`result-${result.id}`"
-            :entry="result"
-            :active="isEqual(selectedEntry, [sectionIndex, entryIndex])"
-            @mouseover="selectedEntry = [sectionIndex, entryIndex]"
-            @action="runAction(sectionID, result)"
-          />
-        </div>
-        <HoppSmartPlaceholder
-          v-if="search.length > 0 && scoredResults.length === 0"
-          :text="`${t('state.nothing_found')} ‟${search}”`"
-        >
-          <template #icon>
-            <icon-lucide-search class="pb-2 opacity-75 svg-icons" />
-          </template>
-          <HoppButtonSecondary
-            :label="t('action.clear')"
-            outline
-            @click="search = ''"
-          />
-        </HoppSmartPlaceholder>
-      </div>
-      <div
-        class="flex flex-shrink-0 text-tiny text-secondaryLight p-4 justify-between whitespace-nowrap overflow-auto <sm:hidden"
-      >
-        <div class="flex items-center">
-          <kbd class="shortcut-key">↑</kbd>
-          <kbd class="shortcut-key">↓</kbd>
-          <span class="mx-2 truncate">
-            {{ t("action.to_navigate") }}
-          </span>
-          <kbd class="shortcut-key">↩</kbd>
-          <span class="ml-2 truncate">
-            {{ t("action.to_select") }}
-          </span>
-        </div>
-        <div class="flex items-center">
-          <kbd class="shortcut-key">ESC</kbd>
-          <span class="ml-2 truncate">
-            {{ t("action.to_close") }}
-          </span>
-        </div>
-      </div>
-    </template>
-  </HoppSmartModal>
-</template>
-
-<script setup lang="ts">
-import { ref, computed, watch } from "vue"
-import { useService } from "dioc/vue"
-import { useI18n } from "@composables/i18n"
-import {
-  SpotlightService,
-  SpotlightSearchState,
-  SpotlightSearcherResult,
-} from "~/services/spotlight"
-import { isEqual } from "lodash-es"
-import { HistorySpotlightSearcherService } from "~/services/spotlight/searchers/history.searcher"
-import { UserSpotlightSearcherService } from "~/services/spotlight/searchers/user.searcher"
-
-const t = useI18n()
-
-const props = defineProps<{
-  show: boolean
-}>()
-
-const emit = defineEmits<{
-  (e: "hide-modal"): void
-}>()
-
-const spotlightService = useService(SpotlightService)
-
-useService(HistorySpotlightSearcherService)
-useService(UserSpotlightSearcherService)
-
-const search = ref("")
-
-const searchSession = ref<SpotlightSearchState>()
-const stopSearchSession = ref<() => void>()
-
-const scoredResults = computed(() =>
-  Object.entries(searchSession.value?.results ?? {}).sort(
-    ([, sectionA], [, sectionB]) => sectionB.avgScore - sectionA.avgScore
-  )
-)
-
-const { selectedEntry } = newUseArrowKeysForNavigation()
-
-watch(
-  () => props.show,
-  (show) => {
-    search.value = ""
-
-    if (show) {
-      const [session, onSessionEnd] =
-        spotlightService.createSearchSession(search)
-
-      searchSession.value = session.value
-      stopSearchSession.value = onSessionEnd
-    } else {
-      stopSearchSession.value?.()
-      stopSearchSession.value = undefined
-      searchSession.value = undefined
-    }
-  }
-)
-
-function runAction(searcherID: string, result: SpotlightSearcherResult) {
-  spotlightService.selectSearchResult(searcherID, result)
-  emit("hide-modal")
-}
-
-function newUseArrowKeysForNavigation() {
-  const selectedEntry = ref<[number, number]>([0, 0]) // [sectionIndex, entryIndex]
-
-  watch(search, () => {
-    selectedEntry.value = [0, 0]
-  })
-
-  const onArrowDown = () => {
-    // If no entries, do nothing
-    if (scoredResults.value.length === 0) return
-
-    const [sectionIndex, entryIndex] = selectedEntry.value
-
-    const [, section] = scoredResults.value[sectionIndex]
-
-    if (entryIndex < section.results.length - 1) {
-      selectedEntry.value = [sectionIndex, entryIndex + 1]
-    } else if (sectionIndex < scoredResults.value.length - 1) {
-      selectedEntry.value = [sectionIndex + 1, 0]
-    } else {
-      selectedEntry.value = [0, 0]
-    }
-  }
-
-  const onArrowUp = () => {
-    // If no entries, do nothing
-    if (scoredResults.value.length === 0) return
-
-    const [sectionIndex, entryIndex] = selectedEntry.value
-
-    if (entryIndex > 0) {
-      selectedEntry.value = [sectionIndex, entryIndex - 1]
-    } else if (sectionIndex > 0) {
-      const [, section] = scoredResults.value[sectionIndex - 1]
-      selectedEntry.value = [sectionIndex - 1, section.results.length - 1]
-    } else {
-      selectedEntry.value = [
-        scoredResults.value.length - 1,
-        scoredResults.value[scoredResults.value.length - 1][1].results.length -
-          1,
-      ]
-    }
-  }
-
-  const onEnter = () => {
-    // If no entries, do nothing
-    if (scoredResults.value.length === 0) return
-
-    const [sectionIndex, entryIndex] = selectedEntry.value
-    const [sectionID, section] = scoredResults.value[sectionIndex]
-    const result = section.results[entryIndex]
-
-    runAction(sectionID, result)
-  }
-
-  function handleKeyPress(e: KeyboardEvent) {
-    if (e.key === "ArrowUp") {
-      e.preventDefault()
-      e.stopPropagation()
-
-      onArrowUp()
-    } else if (e.key === "ArrowDown") {
-      e.preventDefault()
-      e.stopPropagation()
-
-      onArrowDown()
-    } else if (e.key === "Enter") {
-      e.preventDefault()
-      e.stopPropagation()
-
-      onEnter()
-    }
-  }
-
-  watch(
-    () => props.show,
-    (show) => {
-      if (show) {
-        window.addEventListener("keydown", handleKeyPress)
-      } else {
-        window.removeEventListener("keydown", handleKeyPress)
-      }
-    }
-  )
-
-  return { selectedEntry }
-}
-</script>

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

@@ -193,7 +193,7 @@ import IconTrash2 from "~icons/lucide/trash-2"
 import IconEdit from "~icons/lucide/edit"
 import IconFolder from "~icons/lucide/folder"
 import IconFolderOpen from "~icons/lucide/folder-open"
-import { ref, computed, watch } from "vue"
+import { PropType, ref, computed, watch } from "vue"
 import { HoppCollection, HoppRESTRequest } from "@hoppscotch/data"
 import { useI18n } from "@composables/i18n"
 import { TippyComponent } from "vue-tippy"
@@ -209,36 +209,67 @@ type FolderType = "collection" | "folder"
 
 const t = useI18n()
 
-const props = withDefaults(
+const props = defineProps({
-  defineProps<{
+  id: {
-    id: string
+    type: String,
-    parentID?: string | null
+    default: "",
-    data: HoppCollection<HoppRESTRequest> | TeamCollection
+    required: true,
-    /**
+  },
-     * Collection component can be used for both collections and folders.
+  parentID: {
-     * folderType is used to determine which one it is.
+    type: String as PropType<string | null>,
-     */
+    default: null,
-    collectionsType: CollectionType
+    required: false,
-    folderType: FolderType
+  },
-    isOpen: boolean
+  data: {
-    isSelected?: boolean | null
+    type: Object as PropType<HoppCollection<HoppRESTRequest> | TeamCollection>,
-    exportLoading?: boolean
+    default: () => ({}),
-    hasNoTeamAccess?: boolean
+    required: true,
-    collectionMoveLoading?: string[]
+  },
-    isLastItem?: boolean
+  collectionsType: {
-  }>(),
+    type: String as PropType<CollectionType>,
-  {
+    default: "my-collections",
-    id: "",
+    required: true,
-    parentID: null,
+  },
-    collectionsType: "my-collections",
+  /**
-    folderType: "collection",
+   * Collection component can be used for both collections and folders.
-    isOpen: false,
+   * folderType is used to determine which one it is.
-    isSelected: false,
+   */
-    exportLoading: false,
+  folderType: {
-    hasNoTeamAccess: false,
+    type: String as PropType<FolderType>,
-    isLastItem: false,
+    default: "collection",
-  }
+    required: true,
-)
+  },
+  isOpen: {
+    type: Boolean,
+    default: false,
+    required: true,
+  },
+  isSelected: {
+    type: Boolean as PropType<boolean | null>,
+    default: false,
+    required: false,
+  },
+  exportLoading: {
+    type: Boolean,
+    default: false,
+    required: false,
+  },
+  hasNoTeamAccess: {
+    type: Boolean,
+    default: false,
+    required: false,
+  },
+  collectionMoveLoading: {
+    type: Array as PropType<string[]>,
+    default: () => [],
+    required: false,
+  },
+  isLastItem: {
+    type: Boolean,
+    default: false,
+    required: false,
+  },
+})
 
 const emit = defineEmits<{
   (event: "toggle-children"): void
@@ -417,13 +448,8 @@ const notSameDestination = computed(() => {
 })
 
 const isCollLoading = computed(() => {
-  const { collectionMoveLoading } = props
+  if (props.collectionMoveLoading.length > 0 && props.data.id) {
-  if (
+    return props.collectionMoveLoading.includes(props.data.id)
-    collectionMoveLoading &&
-    collectionMoveLoading.length > 0 &&
-    props.data.id
-  ) {
-    return collectionMoveLoading.includes(props.data.id)
   } else {
     return false
   }

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

@@ -284,14 +284,6 @@ const importerAction = async (stepResults: StepReturnValue[]) => {
           emit("import-to-teams", result)
         } else {
           appendRESTCollections(result)
-
-          platform.analytics?.logEvent({
-            type: "HOPP_IMPORT_COLLECTION",
-            importer: importerModule.value!.name,
-            platform: "rest",
-            workspaceType: "personal",
-          })
-
           fileImported()
         }
       }

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

@@ -1,5 +1,5 @@
 <template>
-  <div class="flex flex-col flex-1">
+  <div class="flex flex-col flex-1 bg-primaryContrast">
     <div
       class="sticky z-10 flex justify-between flex-1 border-b bg-primary border-dividerLight"
       :style="
@@ -243,33 +243,49 @@
           />
         </template>
         <template #emptyNode="{ node }">
-          <HoppSmartPlaceholder
+          <div
             v-if="filterText.length !== 0 && filteredCollections.length === 0"
-            :text="`${t('state.nothing_found')} ‟${filterText}”`"
+            class="flex flex-col items-center justify-center p-4 text-secondaryLight"
           >
-            <template #icon>
+            <icon-lucide-search class="pb-2 opacity-75 svg-icons" />
-              <icon-lucide-search class="pb-2 opacity-75 svg-icons" />
+            <span class="my-2 text-center">
-            </template>
+              {{ t("state.nothing_found") }} "{{ filterText }}"
-          </HoppSmartPlaceholder>
+            </span>
-          <HoppSmartPlaceholder
+          </div>
-            v-else-if="node === null"
+          <div v-else-if="node === null">
-            :src="`/images/states/${colorMode.value}/pack.svg`"
+            <div
-            :alt="`${t('empty.collections')}`"
+              class="flex flex-col items-center justify-center p-4 text-secondaryLight"
-            :text="t('empty.collections')"
+            >
-          >
+              <img
-            <HoppButtonSecondary
+                :src="`/images/states/${colorMode.value}/pack.svg`"
-              :label="t('add.new')"
+                loading="lazy"
-              filled
+                class="inline-flex flex-col object-contain object-center w-16 h-16 mb-4"
-              outline
+                :alt="`${t('empty.collections')}`"
-              @click="emit('display-modal-add')"
+              />
-            />
+              <span class="pb-4 text-center">
-          </HoppSmartPlaceholder>
+                {{ t("empty.collections") }}
-          <HoppSmartPlaceholder
+              </span>
+              <HoppButtonSecondary
+                :label="t('add.new')"
+                filled
+                outline
+                @click="emit('display-modal-add')"
+              />
+            </div>
+          </div>
+          <div
             v-else-if="node.data.type === 'collections'"
-            :src="`/images/states/${colorMode.value}/pack.svg`"
+            class="flex flex-col items-center justify-center p-4 text-secondaryLight"
-            :alt="`${t('empty.collections')}`"
-            :text="t('empty.collections')"
           >
+            <img
+              :src="`/images/states/${colorMode.value}/pack.svg`"
+              loading="lazy"
+              class="inline-flex flex-col object-contain object-center w-16 h-16 mb-4"
+              :alt="`${t('empty.collection')}`"
+            />
+            <span class="pb-4 text-center">
+              {{ t("empty.collection") }}
+            </span>
             <HoppButtonSecondary
               :label="t('add.new')"
               filled
@@ -282,14 +298,21 @@
                   })
               "
             />
-          </HoppSmartPlaceholder>
+          </div>
-          <HoppSmartPlaceholder
+          <div
             v-else-if="node.data.type === 'folders'"
-            :src="`/images/states/${colorMode.value}/pack.svg`"
+            class="flex flex-col items-center justify-center p-4 text-secondaryLight"
-            :alt="`${t('empty.folder')}`"
-            :text="t('empty.folder')"
           >
-          </HoppSmartPlaceholder>
+            <img
+              :src="`/images/states/${colorMode.value}/pack.svg`"
+              loading="lazy"
+              class="inline-flex flex-col object-contain object-center w-16 h-16 mb-4"
+              :alt="`${t('empty.folder')}`"
+            />
+            <span class="text-center">
+              {{ t("empty.folder") }}
+            </span>
+          </div>
         </template>
       </SmartTree>
     </div>

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

@@ -89,7 +89,6 @@ import {
 import { GQLError } from "~/helpers/backend/GQLClient"
 import { computedWithControl } from "@vueuse/core"
 import { currentActiveTab } from "~/helpers/rest/tab"
-import { platform } from "~/platform"
 
 const t = useI18n()
 const toast = useToast()
@@ -224,13 +223,6 @@ const saveRequestAs = async () => {
       },
     }
 
-    platform.analytics?.logEvent({
-      type: "HOPP_SAVE_REQUEST",
-      createdNow: true,
-      platform: "rest",
-      workspaceType: "personal",
-    })
-
     requestSaved()
   } else if (picked.value.pickedType === "my-folder") {
     if (!isHoppRESTRequest(requestUpdated))
@@ -251,13 +243,6 @@ const saveRequestAs = async () => {
       },
     }
 
-    platform.analytics?.logEvent({
-      type: "HOPP_SAVE_REQUEST",
-      createdNow: true,
-      platform: "rest",
-      workspaceType: "personal",
-    })
-
     requestSaved()
   } else if (picked.value.pickedType === "my-request") {
     if (!isHoppRESTRequest(requestUpdated))
@@ -279,38 +264,17 @@ const saveRequestAs = async () => {
       },
     }
 
-    platform.analytics?.logEvent({
-      type: "HOPP_SAVE_REQUEST",
-      createdNow: false,
-      platform: "rest",
-      workspaceType: "personal",
-    })
-
     requestSaved()
   } else if (picked.value.pickedType === "teams-collection") {
     if (!isHoppRESTRequest(requestUpdated))
       throw new Error("requestUpdated is not a REST Request")
 
     updateTeamCollectionOrFolder(picked.value.collectionID, requestUpdated)
-
-    platform.analytics?.logEvent({
-      type: "HOPP_SAVE_REQUEST",
-      createdNow: true,
-      platform: "rest",
-      workspaceType: "team",
-    })
   } else if (picked.value.pickedType === "teams-folder") {
     if (!isHoppRESTRequest(requestUpdated))
       throw new Error("requestUpdated is not a REST Request")
 
     updateTeamCollectionOrFolder(picked.value.folderID, requestUpdated)
-
-    platform.analytics?.logEvent({
-      type: "HOPP_SAVE_REQUEST",
-      createdNow: true,
-      platform: "rest",
-      workspaceType: "team",
-    })
   } else if (picked.value.pickedType === "teams-request") {
     if (!isHoppRESTRequest(requestUpdated))
       throw new Error("requestUpdated is not a REST Request")
@@ -328,13 +292,6 @@ const saveRequestAs = async () => {
       title: requestUpdated.name,
     }
 
-    platform.analytics?.logEvent({
-      type: "HOPP_SAVE_REQUEST",
-      createdNow: false,
-      platform: "rest",
-      workspaceType: "team",
-    })
-
     pipe(
       updateTeamRequest(picked.value.requestID, data),
       TE.match(
@@ -356,13 +313,6 @@ const saveRequestAs = async () => {
       requestUpdated as HoppGQLRequest
     )
 
-    platform.analytics?.logEvent({
-      type: "HOPP_SAVE_REQUEST",
-      createdNow: false,
-      platform: "gql",
-      workspaceType: "team",
-    })
-
     requestSaved()
   } else if (picked.value.pickedType === "gql-my-folder") {
     // TODO: Check for GQL request ?
@@ -371,13 +321,6 @@ const saveRequestAs = async () => {
       requestUpdated as HoppGQLRequest
     )
 
-    platform.analytics?.logEvent({
-      type: "HOPP_SAVE_REQUEST",
-      createdNow: true,
-      platform: "gql",
-      workspaceType: "team",
-    })
-
     requestSaved()
   } else if (picked.value.pickedType === "gql-my-collection") {
     // TODO: Check for GQL request ?
@@ -386,13 +329,6 @@ const saveRequestAs = async () => {
       requestUpdated as HoppGQLRequest
     )
 
-    platform.analytics?.logEvent({
-      type: "HOPP_SAVE_REQUEST",
-      createdNow: true,
-      platform: "gql",
-      workspaceType: "team",
-    })
-
     requestSaved()
   }
 }

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

@@ -1,5 +1,5 @@
 <template>
-  <div class="flex flex-col flex-1">
+  <div class="flex flex-col flex-1 bg-primaryContrast">
     <div
       class="sticky z-10 flex justify-between flex-1 border-b bg-primary border-dividerLight"
       :style="
@@ -262,53 +262,67 @@
         </template>
         <template #emptyNode="{ node }">
           <div v-if="node === null">
-            <div @drop="(e) => e.stopPropagation()">
+            <div
-              <HoppSmartPlaceholder
+              class="flex flex-col items-center justify-center p-4 text-secondaryLight"
+              @drop="(e) => e.stopPropagation()"
+            >
+              <img
                 :src="`/images/states/${colorMode.value}/pack.svg`"
-                :alt="`${t('empty.collections')}`"
+                loading="lazy"
-                :text="t('empty.collections')"
+                class="inline-flex flex-col object-contain object-center w-16 h-16 mb-4"
-              >
+                :alt="`${t('empty.collection')}`"
-                <HoppButtonSecondary
+              />
-                  v-if="hasNoTeamAccess"
+              <span class="pb-4 text-center">
-                  v-tippy="{ theme: 'tooltip' }"
+                {{ t("empty.collections") }}
-                  disabled
+              </span>
-                  filled
+              <HoppButtonSecondary
-                  outline
+                v-if="hasNoTeamAccess"
-                  :title="t('team.no_access')"
+                v-tippy="{ theme: 'tooltip' }"
-                  :label="t('action.new')"
+                disabled
-                />
+                filled
-                <HoppButtonSecondary
+                outline
-                  v-else
+                :title="t('team.no_access')"
-                  :icon="IconPlus"
+                :label="t('action.new')"
-                  :label="t('action.new')"
+              />
-                  filled
+              <HoppButtonSecondary
-                  outline
+                v-else
-                  @click="emit('display-modal-add')"
+                :icon="IconPlus"
-                />
+                :label="t('action.new')"
-              </HoppSmartPlaceholder>
+                filled
+                outline
+                @click="emit('display-modal-add')"
+              />
             </div>
           </div>
           <div
             v-else-if="node.data.type === 'collections'"
+            class="flex flex-col items-center justify-center p-4 text-secondaryLight"
             @drop="(e) => e.stopPropagation()"
           >
-            <HoppSmartPlaceholder
+            <img
               :src="`/images/states/${colorMode.value}/pack.svg`"
-              :alt="`${t('empty.collections')}`"
+              loading="lazy"
-              :text="t('empty.collections')"
+              class="inline-flex flex-col object-contain object-center w-16 h-16 mb-4"
-            >
+              :alt="`${t('empty.collection')}`"
-            </HoppSmartPlaceholder>
+            />
+            <span class="pb-4 text-center">
+              {{ t("empty.collections") }}
+            </span>
           </div>
           <div
             v-else-if="node.data.type === 'folders'"
+            class="flex flex-col items-center justify-center p-4 text-secondaryLight"
             @drop="(e) => e.stopPropagation()"
           >
-            <HoppSmartPlaceholder
+            <img
               :src="`/images/states/${colorMode.value}/pack.svg`"
+              loading="lazy"
+              class="inline-flex flex-col object-contain object-center w-16 h-16 mb-4"
               :alt="`${t('empty.folder')}`"
-              :text="t('empty.folder')"
+            />
-            >
+            <span class="text-center">
-            </HoppSmartPlaceholder>
+              {{ t("empty.folder") }}
+            </span>
           </div>
         </template>
       </SmartTree>

packages/hoppscotch-common/src/components/collections/graphql/Add.vue

@@ -46,7 +46,6 @@ import { useToast } from "@composables/toast"
 import { useI18n } from "@composables/i18n"
 import { HoppGQLRequest, makeCollection } from "@hoppscotch/data"
 import { addGraphqlCollection } from "~/newstore/collections"
-import { platform } from "~/platform"
 
 export default defineComponent({
   props: {
@@ -80,13 +79,6 @@ export default defineComponent({
       )
 
       this.hideModal()
-
-      platform.analytics?.logEvent({
-        type: "HOPP_CREATE_COLLECTION",
-        isRootCollection: true,
-        platform: "gql",
-        workspaceType: "personal",
-      })
     },
     hideModal() {
       this.name = null

packages/hoppscotch-common/src/components/collections/graphql/Collection.vue

@@ -171,14 +171,21 @@
           @duplicate-request="$emit('duplicate-request', $event)"
           @select="$emit('select', $event)"
         />
-        <HoppSmartPlaceholder
+        <div
           v-if="
             collection.folders.length === 0 && collection.requests.length === 0
           "
-          :src="`/images/states/${colorMode.value}/pack.svg`"
+          class="flex flex-col items-center justify-center p-4 text-secondaryLight"
-          :alt="`${t('empty.collection')}`"
-          :text="t('empty.collection')"
         >
+          <img
+            :src="`/images/states/${colorMode.value}/pack.svg`"
+            loading="lazy"
+            class="inline-flex flex-col object-contain object-center w-16 h-16 mb-4"
+            :alt="`${t('empty.collection')}`"
+          />
+          <span class="pb-4 text-center">
+            {{ t("empty.collection") }}
+          </span>
           <HoppButtonSecondary
             :label="t('add.new')"
             filled
@@ -189,7 +196,7 @@
               })
             "
           />
-        </HoppSmartPlaceholder>
+        </div>
       </div>
     </div>
     <HoppSmartConfirmModal

packages/hoppscotch-common/src/components/collections/graphql/Folder.vue

@@ -160,19 +160,25 @@
           @duplicate-request="emit('duplicate-request', $event)"
           @select="emit('select', $event)"
         />
-
+        <div
-        <HoppSmartPlaceholder
           v-if="
             folder.folders &&
             folder.folders.length === 0 &&
             folder.requests &&
             folder.requests.length === 0
           "
-          :src="`/images/states/${colorMode.value}/pack.svg`"
+          class="flex flex-col items-center justify-center p-4 text-secondaryLight"
-          :alt="`${t('empty.folder')}`"
-          :text="t('empty.folder')"
         >
-        </HoppSmartPlaceholder>
+          <img
+            :src="`/images/states/${colorMode.value}/pack.svg`"
+            loading="lazy"
+            class="inline-flex flex-col object-contain object-center w-16 h-16 mb-4"
+            :alt="`${t('empty.folder')}`"
+          />
+          <span class="text-center">
+            {{ t("empty.folder") }}
+          </span>
+        </div>
       </div>
     </div>
     <HoppSmartConfirmModal

packages/hoppscotch-common/src/components/collections/graphql/ImportExport.vue

@@ -244,14 +244,6 @@ const importFromJSON = () => {
       return
     }
     appendGraphqlCollections(collections)
-
-    platform.analytics?.logEvent({
-      type: "HOPP_IMPORT_COLLECTION",
-      importer: "json",
-      workspaceType: "personal",
-      platform: "gql",
-    })
-
     fileImported()
   }
   reader.readAsText(inputChooseFileToImportFrom.value.files[0])
@@ -265,12 +257,6 @@ const exportJSON = () => {
   const url = URL.createObjectURL(file)
   a.href = url
 
-  platform?.analytics?.logEvent({
-    type: "HOPP_EXPORT_COLLECTION",
-    exporter: "json",
-    platform: "gql",
-  })
-
   // TODO: get uri from meta
   a.download = `${url.split("/").pop()!.split("#")[0].split("?")[0]}.json`
   document.body.appendChild(a)

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

@@ -60,27 +60,35 @@
         @select="$emit('select', $event)"
       />
     </div>
-    <HoppSmartPlaceholder
+    <div
       v-if="collections.length === 0"
-      :src="`/images/states/${colorMode.value}/pack.svg`"
+      class="flex flex-col items-center justify-center p-4 text-secondaryLight"
-      :alt="`${t('empty.collections')}`"
-      :text="t('empty.collections')"
     >
+      <img
+        :src="`/images/states/${colorMode.value}/pack.svg`"
+        loading="lazy"
+        class="inline-flex flex-col object-contain object-center w-16 h-16 my-4"
+        :alt="t('empty.collections')"
+      />
+      <span class="pb-4 text-center">
+        {{ t("empty.collections") }}
+      </span>
       <HoppButtonSecondary
         :label="t('add.new')"
         filled
         outline
         @click="displayModalAdd(true)"
       />
-    </HoppSmartPlaceholder>
+    </div>
-    <HoppSmartPlaceholder
+    <div
       v-if="!(filteredCollections.length !== 0 || collections.length === 0)"
-      :text="`${t('state.nothing_found')} ‟${filterText}”`"
+      class="flex flex-col items-center justify-center p-4 text-secondaryLight"
     >
-      <template #icon>
+      <icon-lucide-search class="pb-2 opacity-75 svg-icons" />
-        <icon-lucide-search class="pb-2 opacity-75 svg-icons" />
+      <span class="my-2 text-center">
-      </template>
+        {{ t("state.nothing_found") }} "{{ filterText }}"
-    </HoppSmartPlaceholder>
+      </span>
+    </div>
     <CollectionsGraphqlAdd
       :show="showModalAdd"
       @hide-modal="displayModalAdd(false)"
@@ -145,7 +153,6 @@ import IconArchive from "~icons/lucide/archive"
 import { useI18n } from "@composables/i18n"
 import { useReadonlyStream } from "@composables/stream"
 import { useColorMode } from "@composables/theming"
-import { platform } from "~/platform"
 
 export default defineComponent({
   props: {
@@ -278,13 +285,6 @@ export default defineComponent({
         response: "",
       })
 
-      platform.analytics?.logEvent({
-        type: "HOPP_SAVE_REQUEST",
-        platform: "gql",
-        createdNow: true,
-        workspaceType: "personal",
-      })
-
       this.displayModalAddRequest(false)
     },
     addRequest(payload) {
@@ -294,14 +294,6 @@ export default defineComponent({
     },
     onAddFolder({ name, path }) {
       addGraphqlFolder(name, path)
-
-      platform.analytics?.logEvent({
-        type: "HOPP_CREATE_COLLECTION",
-        isRootCollection: false,
-        platform: "gql",
-        workspaceType: "personal",
-      })
-
       this.displayModalAddFolder(false)
     },
     addFolder(payload) {

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

@@ -599,25 +599,11 @@ const addNewRootCollection = (name: string) => {
       })
     )
 
-    platform.analytics?.logEvent({
-      type: "HOPP_CREATE_COLLECTION",
-      platform: "rest",
-      workspaceType: "personal",
-      isRootCollection: true,
-    })
-
     displayModalAdd(false)
   } else if (hasTeamWriteAccess.value) {
     if (!collectionsType.value.selectedTeam) return
     modalLoadingState.value = true
 
-    platform.analytics?.logEvent({
-      type: "HOPP_CREATE_COLLECTION",
-      platform: "rest",
-      workspaceType: "team",
-      isRootCollection: true,
-    })
-
     pipe(
       createNewRootCollection(name, collectionsType.value.selectedTeam.id),
       TE.match(
@@ -666,13 +652,6 @@ const onAddRequest = (requestName: string) => {
       },
     })
 
-    platform.analytics?.logEvent({
-      type: "HOPP_SAVE_REQUEST",
-      workspaceType: "personal",
-      createdNow: true,
-      platform: "rest",
-    })
-
     displayModalAddRequest(false)
   } else if (hasTeamWriteAccess.value) {
     const folder = editingFolder.value
@@ -688,13 +667,6 @@ const onAddRequest = (requestName: string) => {
       title: requestName,
     }
 
-    platform.analytics?.logEvent({
-      type: "HOPP_SAVE_REQUEST",
-      workspaceType: "team",
-      platform: "rest",
-      createdNow: true,
-    })
-
     pipe(
       createRequestInCollection(folder.id, data),
       TE.match(
@@ -740,14 +712,6 @@ const onAddFolder = (folderName: string) => {
   if (collectionsType.value.type === "my-collections") {
     if (!path) return
     addRESTFolder(folderName, path)
-
-    platform.analytics?.logEvent({
-      type: "HOPP_CREATE_COLLECTION",
-      workspaceType: "personal",
-      isRootCollection: false,
-      platform: "rest",
-    })
-
     displayModalAddFolder(false)
   } else if (hasTeamWriteAccess.value) {
     const folder = editingFolder.value
@@ -755,13 +719,6 @@ const onAddFolder = (folderName: string) => {
 
     modalLoadingState.value = true
 
-    platform.analytics?.logEvent({
-      type: "HOPP_CREATE_COLLECTION",
-      workspaceType: "personal",
-      isRootCollection: false,
-      platform: "rest",
-    })
-
     pipe(
       createChildCollection(folderName, folder.id),
       TE.match(
@@ -1927,12 +1884,6 @@ const exportData = async (
 }
 
 const exportJSONCollection = async () => {
-  platform.analytics?.logEvent({
-    type: "HOPP_EXPORT_COLLECTION",
-    exporter: "json",
-    platform: "rest",
-  })
-
   await getJSONCollection()
 
   initializeDownloadCollection(collectionJSON.value, null)
@@ -1944,12 +1895,6 @@ const createCollectionGist = async () => {
     return
   }
 
-  platform.analytics?.logEvent({
-    type: "HOPP_EXPORT_COLLECTION",
-    exporter: "gist",
-    platform: "rest",
-  })
-
   creatingGistCollection.value = true
   await getJSONCollection()
 
@@ -1980,12 +1925,6 @@ const importToTeams = async (collection: HoppCollection<HoppRESTRequest>[]) => {
 
   importingMyCollections.value = true
 
-  platform.analytics?.logEvent({
-    type: "HOPP_EXPORT_COLLECTION",
-    exporter: "import-to-teams",
-    platform: "rest",
-  })
-
   pipe(
     importJSONToTeam(
       JSON.stringify(collection),

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

@@ -1,208 +0,0 @@
-<template>
-  <HoppSmartModal
-    v-if="show"
-    :title="t('environment.set_as_environment')"
-    @close="hideModal"
-  >
-    <template #body>
-      <div class="flex space-y-4 flex-1 flex-col">
-        <div class="flex items-center space-x-8 ml-2">
-          <label for="name" class="font-semibold min-w-10">{{
-            t("environment.name")
-          }}</label>
-          <input
-            v-model="name"
-            type="text"
-            :placeholder="t('environment.variable')"
-            class="input"
-          />
-        </div>
-        <div class="flex items-center space-x-8 ml-2">
-          <label for="value" class="font-semibold min-w-10">{{
-            t("environment.value")
-          }}</label>
-          <input type="text" :value="value" class="input" />
-        </div>
-        <div class="flex items-center space-x-8 ml-2">
-          <label for="scope" class="font-semibold min-w-10">
-            {{ t("environment.scope") }}
-          </label>
-          <div
-            class="relative flex flex-1 flex-col border border-divider rounded focus-visible:border-dividerDark"
-          >
-            <EnvironmentsSelector v-model="scope" :is-scope-selector="true" />
-          </div>
-        </div>
-        <div v-if="replaceWithVariable" class="flex space-x-2 mt-3">
-          <div class="min-w-18" />
-          <HoppSmartCheckbox
-            :on="replaceWithVariable"
-            title="t('environment.replace_with_variable'))"
-            @change="replaceWithVariable = !replaceWithVariable"
-          />
-          <label for="replaceWithVariable">
-            {{ t("environment.replace_with_variable") }}</label
-          >
-        </div>
-      </div>
-    </template>
-    <template #footer>
-      <span class="flex space-x-2">
-        <HoppButtonPrimary
-          :label="t('action.save')"
-          outline
-          @click="addEnvironment"
-        />
-        <HoppButtonSecondary
-          :label="t('action.cancel')"
-          outline
-          filled
-          @click="hideModal"
-        />
-      </span>
-    </template>
-  </HoppSmartModal>
-</template>
-
-<script lang="ts" setup>
-import { Environment } from "@hoppscotch/data"
-import { ref, watch } from "vue"
-import { useI18n } from "~/composables/i18n"
-import { useToast } from "~/composables/toast"
-import { GQLError } from "~/helpers/backend/GQLClient"
-import { TeamEnvironment } from "~/helpers/teams/TeamEnvironment"
-import {
-  addEnvironmentVariable,
-  addGlobalEnvVariable,
-} from "~/newstore/environments"
-import * as TE from "fp-ts/TaskEither"
-import { pipe } from "fp-ts/function"
-import { updateTeamEnvironment } from "~/helpers/backend/mutations/TeamEnvironment"
-import { currentActiveTab } from "~/helpers/rest/tab"
-
-const t = useI18n()
-const toast = useToast()
-
-const props = defineProps<{
-  show: boolean
-  position: { top: number; left: number }
-  name: string
-  value: string
-  replaceWithVariable: boolean
-}>()
-
-const emit = defineEmits<{
-  (e: "hide-modal"): void
-}>()
-
-const hideModal = () => {
-  emit("hide-modal")
-}
-
-watch(
-  () => props.show,
-  (newVal) => {
-    if (!newVal) {
-      scope.value = {
-        type: "global",
-      }
-      name.value = ""
-      replaceWithVariable.value = false
-    }
-  }
-)
-
-type Scope =
-  | {
-      type: "global"
-    }
-  | {
-      type: "my-environment"
-      environment: Environment
-      index: number
-    }
-  | {
-      type: "team-environment"
-      environment: TeamEnvironment
-    }
-
-const scope = ref<Scope>({
-  type: "global",
-})
-
-const replaceWithVariable = ref(false)
-
-const name = ref("")
-
-const addEnvironment = async () => {
-  if (!name.value) {
-    toast.error(`${t("environment.invalid_name")}`)
-    return
-  }
-  if (scope.value.type === "global") {
-    addGlobalEnvVariable({
-      key: name.value,
-      value: props.value,
-    })
-    toast.success(`${t("environment.updated")}`)
-  } else if (scope.value.type === "my-environment") {
-    addEnvironmentVariable(scope.value.index, {
-      key: name.value,
-      value: props.value,
-    })
-    toast.success(`${t("environment.updated")}`)
-  } else {
-    const newVariables = [
-      ...scope.value.environment.environment.variables,
-      {
-        key: name.value,
-        value: props.value,
-      },
-    ]
-    await pipe(
-      updateTeamEnvironment(
-        JSON.stringify(newVariables),
-        scope.value.environment.id,
-        scope.value.environment.environment.name
-      ),
-      TE.match(
-        (err: GQLError<string>) => {
-          console.error(err)
-          toast.error(`${getErrorMessage(err)}`)
-        },
-        () => {
-          hideModal()
-          toast.success(`${t("environment.updated")}`)
-        }
-      )
-    )()
-  }
-  if (replaceWithVariable.value) {
-    //replace the current tab endpoint with the variable name with << and >>
-    const variableName = `<<${name.value}>>`
-    //replace the currenttab endpoint containing the value in the text with variablename
-    currentActiveTab.value.document.request.endpoint =
-      currentActiveTab.value.document.request.endpoint.replace(
-        props.value,
-        variableName
-      )
-  }
-
-  hideModal()
-}
-
-const getErrorMessage = (err: GQLError<string>) => {
-  if (err.type === "network_error") {
-    return t("error.network_error")
-  } else {
-    switch (err.error) {
-      case "team_environment/not_found":
-        return t("team_environment.not_found")
-      case "Forbidden resource":
-        return t("profile.no_permission")
-      default:
-        return t("error.something_went_wrong")
-    }
-  }
-}
-</script>

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

@@ -190,12 +190,6 @@ const createEnvironmentGist = async () => {
     )
 
     toast.success(t("export.gist_created").toString())
-
-    platform.analytics?.logEvent({
-      type: "HOPP_EXPORT_ENVIRONMENT",
-      platform: "rest",
-    })
-
     window.open(res.data.html_url)
   } catch (e) {
     toast.error(t("error.something_went_wrong").toString())
@@ -255,13 +249,6 @@ const openDialogChooseFileToImportFrom = () => {
 
 const importToTeams = async (content: Environment[]) => {
   loading.value = true
-
-  platform.analytics?.logEvent({
-    type: "HOPP_IMPORT_ENVIRONMENT",
-    platform: "rest",
-    workspaceType: "team",
-  })
-
   for (const [i, env] of content.entries()) {
     if (i === content.length - 1) {
       await pipe(
@@ -314,12 +301,6 @@ const importFromJSON = () => {
     return
   }
 
-  platform.analytics?.logEvent({
-    type: "HOPP_IMPORT_ENVIRONMENT",
-    platform: "rest",
-    workspaceType: "personal",
-  })
-
   const reader = new FileReader()
 
   reader.onload = ({ target }) => {
@@ -371,7 +352,6 @@ const importFromPostman = ({
   const environment: Environment = { name, variables: [] }
   values.forEach(({ key, value }) => environment.variables.push({ key, value }))
   const environments = [environment]
-
   importFromHoppscotch(environments)
 }
 

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

@@ -8,7 +8,7 @@
     <span
       v-tippy="{ theme: 'tooltip' }"
       :title="`${t('environment.select')}`"
-      class="bg-transparent select-wrapper"
+      class="bg-transparent border-b border-dividerLight select-wrapper"
     >
       <HoppButtonSecondary
         :icon="IconLayers"
@@ -22,7 +22,6 @@
         class="flex-1 !justify-start pr-8 rounded-none"
       />
     </span>
-
     <template #content="{ hide }">
       <div
         ref="tippyActions"
@@ -32,7 +31,6 @@
         @keyup.escape="hide()"
       >
         <HoppSmartItem
-          v-if="!isScopeSelector"
           :label="`${t('environment.no_environment')}`"
           :info-icon="
             selectedEnvironmentIndex.type === 'NO_ENV_SELECTED'
@@ -49,21 +47,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-10 top-0 bg-primary"
@@ -78,25 +61,29 @@
               :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_ENV', index: index }
-                    type: 'my-environment',
-                    environment: gen,
-                  })
                   hide()
                 }
               "
             />
-            <HoppSmartPlaceholder
+            <div
               v-if="myEnvironments.length === 0"
-              :src="`/images/states/${colorMode.value}/blockchain.svg`"
+              class="flex flex-col items-center justify-center text-secondaryLight"
-              :alt="`${t('empty.environments')}`"
-              :text="t('empty.environments')"
             >
-            </HoppSmartPlaceholder>
+              <img
+                :src="`/images/states/${colorMode.value}/blockchain.svg`"
+                loading="lazy"
+                class="inline-flex flex-col object-contain object-center w-16 h-16 mb-2"
+                :alt="`${t('empty.environments')}`"
+              />
+              <span class="pb-2 text-center">
+                {{ t("empty.environments") }}
+              </span>
+            </div>
           </HoppSmartTab>
           <HoppSmartTab
             :id="'team-environments'"
@@ -116,26 +103,36 @@
                 :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()
                   }
                 "
               />
-
+              <div
-              <HoppSmartPlaceholder
                 v-if="teamEnvironmentList.length === 0"
-                :src="`/images/states/${colorMode.value}/blockchain.svg`"
+                class="flex flex-col items-center justify-center text-secondaryLight"
-                :alt="`${t('empty.environments')}`"
-                :text="t('empty.environments')"
               >
-              </HoppSmartPlaceholder>
+                <img
+                  :src="`/images/states/${colorMode.value}/blockchain.svg`"
+                  loading="lazy"
+                  class="inline-flex flex-col object-contain object-center w-16 h-16 mb-2"
+                  :alt="`${t('empty.environments')}`"
+                />
+                <span class="pb-2 text-center">
+                  {{ t("empty.environments") }}
+                </span>
+              </div>
             </div>
             <div
               v-if="!teamListLoading && teamAdapterError"
@@ -152,10 +149,9 @@
 </template>
 
 <script lang="ts" setup>
-import { computed, onMounted, ref, watch } from "vue"
+import { computed, ref, watch } from "vue"
 import IconCheck from "~icons/lucide/check"
 import IconLayers from "~icons/lucide/layers"
-import IconGlobe from "~icons/lucide/globe"
 import { TippyComponent } from "vue-tippy"
 import { useI18n } from "~/composables/i18n"
 import { GQLError } from "~/helpers/backend/GQLClient"
@@ -173,31 +169,6 @@ import TeamListAdapter from "~/helpers/teams/TeamListAdapter"
 import { useLocalState } from "~/newstore/localstate"
 import { onLoggedIn } from "~/composables/auth"
 import { GetMyTeamsQuery } from "~/helpers/backend/graphql"
-import { TeamEnvironment } from "~/helpers/teams/TeamEnvironment"
-import { Environment } from "@hoppscotch/data"
-
-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")
@@ -212,39 +183,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)
@@ -279,152 +217,63 @@ watch(
   }
 )
 
-const handleEnvironmentChange = (
+// TeamList-Adapter
-  index: number,
+const teamListAdapter = new TeamListAdapter(true)
-  env?:
+const myTeams = useReadonlyStream(teamListAdapter.teamList$, null)
-    | {
+const teamListFetched = ref(false)
-        type: "my-environment"
+const REMEMBERED_TEAM_ID = useLocalState("REMEMBERED_TEAM_ID")
-        environment: Environment
+
-      }
+onLoggedIn(() => {
-    | {
+  !teamListAdapter.isInitialized && teamListAdapter.initialize()
-        type: "team-environment"
+})
-        environment: TeamEnvironment
+
-      }
+const switchToTeamWorkspace = (team: GetMyTeamsQuery["myTeams"][number]) => {
-) => {
+  REMEMBERED_TEAM_ID.value = team.id
-  if (props.isScopeSelector && env) {
+  changeWorkspace({
-    if (env.type === "my-environment") {
+    teamID: team.id,
-      emit("update:modelValue", {
+    teamName: team.name,
-        type: "my-environment",
+    type: "team",
-        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) => {
+watch(
-  if (props.isScopeSelector) {
+  () => myTeams.value,
-    if (props.modelValue?.type === "my-environment") {
+  (newTeams) => {
-      return props.modelValue.index === id
+    if (newTeams && !teamListFetched.value) {
-    } else if (props.modelValue?.type === "team-environment") {
+      teamListFetched.value = true
-      return (
+      if (REMEMBERED_TEAM_ID.value) {
-        props.modelValue?.type === "team-environment" &&
+        const team = newTeams.find((t) => t.id === REMEMBERED_TEAM_ID.value)
-        props.modelValue.environment &&
+        if (team) switchToTeamWorkspace(team)
-        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 selectedEnv = computed(() => {
-  if (props.isScopeSelector) {
+  if (selectedEnvironmentIndex.value.type === "MY_ENV") {
-    if (props.modelValue?.type === "my-environment") {
+    return {
-      return {
+      type: "MY_ENV",
-        type: "MY_ENV",
+      index: selectedEnvironmentIndex.value.index,
-        index: props.modelValue.index,
+      name: myEnvironments.value[selectedEnvironmentIndex.value.index].name,
-        name: props.modelValue.environment?.name,
+    }
-      }
+  } else if (selectedEnvironmentIndex.value.type === "TEAM_ENV") {
-    } else if (props.modelValue?.type === "team-environment") {
+    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,
-      }
-    } else {
-      return { type: "global", name: "Global" }
-    }
-  } else {
-    if (selectedEnvironmentIndex.value.type === "MY_ENV") {
-      return {
-        type: "MY_ENV",
-        index: selectedEnvironmentIndex.value.index,
-        name: myEnvironments.value[selectedEnvironmentIndex.value.index].name,
-      }
-    } 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,
-        }
-      } 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

@@ -26,13 +26,6 @@
       :editing-variable-name="editingVariableName"
       @hide-modal="displayModalEdit(false)"
     />
-    <EnvironmentsAdd
-      :show="showModalNew"
-      :name="editingVariableName"
-      :value="editingVariableValue"
-      :position="position"
-      @hide-modal="displayModalNew(false)"
-    />
   </div>
 </template>
 
@@ -168,18 +161,10 @@ watch(
   }
 )
 
-const showModalNew = ref(false)
 const showModalDetails = ref(false)
 const action = ref<"new" | "edit">("edit")
 const editingEnvironmentIndex = ref<"Global" | null>(null)
 const editingVariableName = ref("")
-const editingVariableValue = ref("")
-
-const position = ref({ top: 0, left: 0 })
-
-const displayModalNew = (shouldDisplay: boolean) => {
-  showModalNew.value = shouldDisplay
-}
 
 const displayModalEdit = (shouldDisplay: boolean) => {
   action.value = "edit"
@@ -248,10 +233,4 @@ watch(
   },
   { deep: true }
 )
-
-defineActionHandler("modals.environment.add", ({ envName, variableName }) => {
-  editingVariableName.value = envName
-  editingVariableValue.value = variableName
-  displayModalNew(true)
-})
 </script>

packages/hoppscotch-common/src/components/environments/my/Details.vue

@@ -79,19 +79,26 @@
               />
             </div>
           </div>
-          <HoppSmartPlaceholder
+          <div
             v-if="vars.length === 0"
-            :src="`/images/states/${colorMode.value}/blockchain.svg`"
+            class="flex flex-col items-center justify-center p-4 text-secondaryLight"
-            :alt="`${t('empty.environments')}`"
-            :text="t('empty.environments')"
           >
+            <img
+              :src="`/images/states/${colorMode.value}/blockchain.svg`"
+              loading="lazy"
+              class="inline-flex flex-col object-contain object-center w-16 h-16 my-4"
+              :alt="`${t('empty.environments')}`"
+            />
+            <span class="pb-4 text-center">
+              {{ t("empty.environments") }}
+            </span>
             <HoppButtonSecondary
               :label="`${t('add.new')}`"
               filled
               class="mb-4"
               @click="addEnvironmentVariable"
             />
-          </HoppSmartPlaceholder>
+          </div>
         </div>
       </div>
     </template>
@@ -141,7 +148,6 @@ import { useToast } from "@composables/toast"
 import { useReadonlyStream } from "@composables/stream"
 import { useColorMode } from "@composables/theming"
 import { environmentsStore } from "~/newstore/environments"
-import { platform } from "~/platform"
 
 type EnvironmentVariable = {
   id: number
@@ -305,11 +311,6 @@ const saveEnvironment = () => {
       index: envList.value.length - 1,
     })
     toast.success(`${t("environment.created")}`)
-
-    platform.analytics?.logEvent({
-      type: "HOPP_CREATE_ENVIRONMENT",
-      workspaceType: "personal",
-    })
   } else if (props.editingEnvironmentIndex === "Global") {
     // Editing the Global environment
     setGlobalEnvVariables(environmentUpdated.variables)

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

@@ -32,12 +32,19 @@
       :environment="environment"
       @edit-environment="editEnvironment(index)"
     />
-    <HoppSmartPlaceholder
+    <div
       v-if="environments.length === 0"
-      :src="`/images/states/${colorMode.value}/blockchain.svg`"
+      class="flex flex-col items-center justify-center p-4 text-secondaryLight"
-      :alt="`${t('empty.environments')}`"
-      :text="t('empty.environments')"
     >
+      <img
+        :src="`/images/states/${colorMode.value}/blockchain.svg`"
+        loading="lazy"
+        class="inline-flex flex-col object-contain object-center w-16 h-16 my-4"
+        :alt="`${t('empty.environments')}`"
+      />
+      <span class="pb-4 text-center">
+        {{ t("empty.environments") }}
+      </span>
       <HoppButtonSecondary
         :label="`${t('add.new')}`"
         filled
@@ -45,7 +52,7 @@
         class="mb-4"
         @click="displayModalAdd(true)"
       />
-    </HoppSmartPlaceholder>
+    </div>
     <EnvironmentsMyDetails
       :show="showModalDetails"
       :action="action"

packages/hoppscotch-common/src/components/environments/teams/Details.vue

@@ -83,12 +83,19 @@
               />
             </div>
           </div>
-          <HoppSmartPlaceholder
+          <div
             v-if="vars.length === 0"
-            :src="`/images/states/${colorMode.value}/blockchain.svg`"
+            class="flex flex-col items-center justify-center p-4 text-secondaryLight"
-            :alt="`${t('empty.environments')}`"
-            :text="t('empty.environments')"
           >
+            <img
+              :src="`/images/states/${colorMode.value}/blockchain.svg`"
+              loading="lazy"
+              class="inline-flex flex-col object-contain object-center w-16 h-16 my-4"
+              :alt="`${t('empty.environments')}`"
+            />
+            <span class="pb-4 text-center">
+              {{ t("empty.environments") }}
+            </span>
             <HoppButtonSecondary
               v-if="isViewer"
               disabled
@@ -103,7 +110,7 @@
               class="mb-4"
               @click="addEnvironmentVariable"
             />
-          </HoppSmartPlaceholder>
+          </div>
         </div>
       </div>
     </template>
@@ -149,7 +156,6 @@ import IconTrash from "~icons/lucide/trash"
 import IconTrash2 from "~icons/lucide/trash-2"
 import IconDone from "~icons/lucide/check"
 import IconPlus from "~icons/lucide/plus"
-import { platform } from "~/platform"
 
 type EnvironmentVariable = {
   id: number
@@ -288,11 +294,6 @@ const saveEnvironment = async () => {
   )
 
   if (props.action === "new") {
-    platform.analytics?.logEvent({
-      type: "HOPP_CREATE_ENVIRONMENT",
-      workspaceType: "team",
-    })
-
     await pipe(
       createTeamEnvironment(
         JSON.stringify(filterdVariables),

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

@@ -43,12 +43,19 @@
         />
       </div>
     </div>
-    <HoppSmartPlaceholder
+    <div
       v-if="!loading && teamEnvironments.length === 0 && !adapterError"
-      :src="`/images/states/${colorMode.value}/blockchain.svg`"
+      class="flex flex-col items-center justify-center p-4 text-secondaryLight"
-      :alt="`${t('empty.environments')}`"
-      :text="t('empty.environments')"
     >
+      <img
+        :src="`/images/states/${colorMode.value}/blockchain.svg`"
+        loading="lazy"
+        class="inline-flex flex-col object-contain object-center w-16 h-16 my-4"
+        :alt="`${t('empty.environments')}`"
+      />
+      <span class="pb-4 text-center">
+        {{ t("empty.environments") }}
+      </span>
       <HoppButtonSecondary
         v-if="team === undefined || team.myRole === 'VIEWER'"
         v-tippy="{ theme: 'tooltip' }"
@@ -67,7 +74,7 @@
         class="mb-4"
         @click="displayModalAdd(true)"
       />
-    </HoppSmartPlaceholder>
+    </div>
     <div v-else-if="!loading">
       <EnvironmentsTeamsEnvironment
         v-for="(environment, index) in JSON.parse(

packages/hoppscotch-common/src/components/firebase/Logout.vue

@@ -1,12 +1,12 @@
 <template>
-  <div class="flex" @click="openLogoutModal()">
+  <div class="flex" @click="OpenLogoutModal()">
     <HoppSmartItem
       ref="logoutItem"
       :icon="IconLogOut"
       :label="`${t('auth.logout')}`"
       :outline="outline"
       :shortcut="shortcut"
-      @click="openLogoutModal()"
+      @click="OpenLogoutModal()"
     />
     <HoppSmartConfirmModal
       :show="confirmLogout"
@@ -23,7 +23,6 @@ import IconLogOut from "~icons/lucide/log-out"
 import { useToast } from "@composables/toast"
 import { useI18n } from "@composables/i18n"
 import { platform } from "~/platform"
-import { defineActionHandler } from "~/helpers/actions"
 
 defineProps({
   outline: {
@@ -56,12 +55,8 @@ const logout = async () => {
   }
 }
 
-const openLogoutModal = () => {
+const OpenLogoutModal = () => {
   emit("confirm-logout")
   confirmLogout.value = true
 }
-
-defineActionHandler("user.logout", () => {
-  openLogoutModal()
-})
 </script>

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

@@ -114,12 +114,19 @@
         />
       </div>
     </div>
-    <HoppSmartPlaceholder
+    <div
       v-if="authType === 'none'"
-      :src="`/images/states/${colorMode.value}/login.svg`"
+      class="flex flex-col items-center justify-center p-4 text-secondaryLight"
-      :alt="`${t('empty.authorization')}`"
-      :text="t('empty.authorization')"
     >
+      <img
+        :src="`/images/states/${colorMode.value}/login.svg`"
+        loading="lazy"
+        class="inline-flex flex-col object-contain object-center w-16 h-16 my-4"
+        :alt="`${t('empty.authorization')}`"
+      />
+      <span class="pb-4 text-center">
+        {{ t("empty.authorization") }}
+      </span>
       <HoppButtonSecondary
         outline
         :label="t('app.documentation')"
@@ -129,21 +136,21 @@
         reverse
         class="mb-4"
       />
-    </HoppSmartPlaceholder>
+    </div>
     <div v-else class="flex flex-1 border-b border-dividerLight">
       <div class="w-2/3 border-r border-dividerLight">
         <div v-if="authType === 'basic'">
           <div class="flex flex-1 border-b border-dividerLight">
             <SmartEnvInput
+              :environmentHighlights="false"
               v-model="basicUsername"
-              :environment-highlights="false"
               :placeholder="t('authorization.username')"
             />
           </div>
           <div class="flex flex-1 border-b border-dividerLight">
             <SmartEnvInput
+              :environmentHighlights="false"
               v-model="basicPassword"
-              :environment-highlights="false"
               :placeholder="t('authorization.password')"
             />
           </div>
@@ -151,8 +158,8 @@
         <div v-if="authType === 'bearer'">
           <div class="flex flex-1 border-b border-dividerLight">
             <SmartEnvInput
+              :environmentHighlights="false"
               v-model="bearerToken"
-              :environment-highlights="false"
               placeholder="Token"
             />
           </div>
@@ -160,8 +167,8 @@
         <div v-if="authType === 'oauth-2'">
           <div class="flex flex-1 border-b border-dividerLight">
             <SmartEnvInput
+              :environmentHighlights="false"
               v-model="oauth2Token"
-              :environment-highlights="false"
               placeholder="Token"
             />
           </div>
@@ -170,15 +177,15 @@
         <div v-if="authType === 'api-key'">
           <div class="flex flex-1 border-b border-dividerLight">
             <SmartEnvInput
+              :environmentHighlights="false"
               v-model="apiKey"
-              :environment-highlights="false"
               placeholder="Key"
             />
           </div>
           <div class="flex flex-1 border-b border-dividerLight">
             <SmartEnvInput
+              :environmentHighlights="false"
               v-model="apiValue"
-              :environment-highlights="false"
               placeholder="Value"
             />
           </div>

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

@@ -59,8 +59,7 @@ const onConnectClick = () => {
   if (!connected.value) {
     props.conn.connect(url.value, headers.value as any, auth.value)
 
-    platform.analytics?.logEvent({
+    platform.analytics?.logHoppRequestRunToAnalytics({
-      type: "HOPP_REQUEST_RUN",
       platform: "graphql-schema",
       strategy: getCurrentStrategyID(),
     })

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

@@ -289,12 +289,19 @@
               </div>
             </template>
           </draggable>
-          <HoppSmartPlaceholder
+          <div
             v-if="workingHeaders.length === 0"
-            :src="`/images/states/${colorMode.value}/add_category.svg`"
+            class="flex flex-col items-center justify-center p-4 text-secondaryLight"
-            :alt="`${t('empty.headers')}`"
-            :text="t('empty.headers')"
           >
+            <img
+              :src="`/images/states/${colorMode.value}/add_category.svg`"
+              loading="lazy"
+              class="inline-flex flex-col object-contain object-center w-16 h-16 my-4"
+              :alt="`${t('empty.headers')}`"
+            />
+            <span class="pb-4 text-center">
+              {{ t("empty.headers") }}
+            </span>
             <HoppButtonSecondary
               :label="`${t('add.new')}`"
               filled
@@ -302,7 +309,7 @@
               class="mb-4"
               @click="addHeader"
             />
-          </HoppSmartPlaceholder>
+          </div>
         </div>
       </HoppSmartTab>
       <HoppSmartTab :id="'authorization'" :label="`${t('tab.authorization')}`">
@@ -741,8 +748,7 @@ const runQuery = async () => {
     console.error(e)
   }
 
-  platform.analytics?.logEvent({
+  platform.analytics?.logHoppRequestRunToAnalytics({
-    type: "HOPP_REQUEST_RUN",
     platform: "graphql-query",
     strategy: getCurrentStrategyID(),
   })

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

@@ -1,13 +1,12 @@
 <template>
   <div class="flex flex-col flex-1 overflow-auto whitespace-nowrap">
-    <HoppSmartPlaceholder
+    <div
       v-if="responseString === 'loading'"
-      :text="t('state.loading')"
+      class="flex flex-col items-center justify-center p-4 text-secondaryLight"
     >
-      <template #icon>
+      <HoppSmartSpinner class="my-4" />
-        <HoppSmartSpinner class="my-4" />
+      <span class="text-secondaryLight">{{ t("state.loading") }}</span>
-      </template>
+    </div>
-    </HoppSmartPlaceholder>
     <div v-else-if="responseString" class="flex flex-col flex-1">
       <div
         class="sticky top-0 z-10 flex items-center justify-between flex-shrink-0 pl-4 overflow-x-auto border-b bg-primary border-dividerLight"

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

@@ -24,18 +24,25 @@
       :icon="IconBookOpen"
       :label="`${t('tab.documentation')}`"
     >
-      <HoppSmartPlaceholder
+      <div
         v-if="
           queryFields.length === 0 &&
           mutationFields.length === 0 &&
           subscriptionFields.length === 0 &&
           graphqlTypes.length === 0
         "
-        :src="`/images/states/${colorMode.value}/add_comment.svg`"
+        class="flex flex-col items-center justify-center p-4 text-secondaryLight"
-        :alt="`${t('empty.documentation')}`"
-        :text="t('empty.documentation')"
       >
-      </HoppSmartPlaceholder>
+        <img
+          :src="`/images/states/${colorMode.value}/add_comment.svg`"
+          loading="lazy"
+          class="inline-flex flex-col object-contain object-center w-16 h-16 my-4"
+          :alt="`${t('empty.documentation')}`"
+        />
+        <span class="mb-4 text-center">
+          {{ t("empty.documentation") }}
+        </span>
+      </div>
       <div v-else>
         <div
           class="sticky top-0 z-10 flex flex-shrink-0 overflow-x-auto bg-primary"
@@ -165,13 +172,20 @@
         ref="schemaEditor"
         class="flex flex-col flex-1"
       ></div>
-      <HoppSmartPlaceholder
+      <div
         v-else
-        :src="`/images/states/${colorMode.value}/blockchain.svg`"
+        class="flex flex-col items-center justify-center p-4 text-secondaryLight"
-        :alt="`${t('empty.schema')}`"
-        :text="t('empty.schema')"
       >
-      </HoppSmartPlaceholder>
+        <img
+          :src="`/images/states/${colorMode.value}/blockchain.svg`"
+          loading="lazy"
+          class="inline-flex flex-col object-contain object-center w-16 h-16 my-4"
+          :alt="`${t('empty.schema')}`"
+        />
+        <span class="mb-4 text-center">
+          {{ t("empty.schema") }}
+        </span>
+      </div>
     </HoppSmartTab>
   </HoppSmartTabs>
 </template>

packages/hoppscotch-common/src/components/history/graphql/Card.vue

@@ -63,7 +63,7 @@ import { GQLHistoryEntry } from "~/newstore/history"
 import { shortDateTime } from "~/helpers/utils/date"
 
 import IconStar from "~icons/lucide/star"
-import IconStarOff from "~icons/hopp/star-off"
+import IconStarOff from "~icons/lucide/star-off"
 import IconTrash from "~icons/lucide/trash"
 import IconMinimize2 from "~icons/lucide/minimize-2"
 import IconMaximize2 from "~icons/lucide/maximize-2"

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

@@ -72,11 +72,9 @@
           class="flex items-center justify-between flex-1 min-w-0 transition cursor-pointer focus:outline-none text-secondaryLight text-tiny group"
         >
           <span
-            class="inline-flex items-center justify-center px-4 py-2 transition group-hover:text-secondary truncate"
+            class="inline-flex items-center justify-center px-4 py-2 transition group-hover:text-secondary"
           >
-            <icon-lucide-chevron-right
+            <icon-lucide-chevron-right class="mr-2 indicator" />
-              class="mr-2 indicator flex flex-shrink-0"
-            />
             <span
               :class="[
                 { 'capitalize-first': groupSelection === 'TIME' },
@@ -108,23 +106,31 @@
         />
       </details>
     </div>
-    <HoppSmartPlaceholder
+    <div
       v-if="history.length === 0"
-      :src="`/images/states/${colorMode.value}/history.svg`"
+      class="flex flex-col items-center justify-center p-4 text-secondaryLight"
-      :alt="`${t('empty.history')}`"
-      :text="t('empty.history')"
     >
-    </HoppSmartPlaceholder>
+      <img
-    <HoppSmartPlaceholder
+        :src="`/images/states/${colorMode.value}/history.svg`"
+        loading="lazy"
+        class="inline-flex flex-col object-contain object-center w-16 h-16 my-4"
+        :alt="`${t('empty.history')}`"
+      />
+      <span class="mb-4 text-center">
+        {{ t("empty.history") }}
+      </span>
+    </div>
+    <div
       v-else-if="
         Object.keys(filteredHistoryGroups).length === 0 ||
         filteredHistory.length === 0
       "
-      :text="`${t('state.nothing_found')} ‟${filterText || filterSelection}”`"
+      class="flex flex-col items-center justify-center p-4 text-secondaryLight"
     >
-      <template #icon>
+      <icon-lucide-search class="pb-2 opacity-75 svg-icons" />
-        <icon-lucide-search class="pb-2 opacity-75 svg-icons" />
+      <span class="mt-2 mb-4 text-center">
-      </template>
+        {{ t("state.nothing_found") }} "{{ filterText || filterSelection }}"
+      </span>
       <HoppButtonSecondary
         :label="t('action.clear')"
         outline
@@ -135,7 +141,7 @@
           }
         "
       />
-    </HoppSmartPlaceholder>
+    </div>
     <HoppSmartConfirmModal
       :show="confirmRemove"
       :title="`${t('confirm.remove_history')}`"
@@ -176,7 +182,6 @@ import {
 import HistoryRestCard from "./rest/Card.vue"
 import HistoryGraphqlCard from "./graphql/Card.vue"
 import { createNewTab } from "~/helpers/rest/tab"
-import { defineActionHandler } from "~/helpers/actions"
 
 type HistoryEntry = GQLHistoryEntry | RESTHistoryEntry
 
@@ -330,8 +335,4 @@ const toggleStar = (entry: HistoryEntry) => {
     toggleRESTHistoryEntryStar(entry as RESTHistoryEntry)
   else toggleGraphqlHistoryEntryStar(entry as GQLHistoryEntry)
 }
-
-defineActionHandler("history.clear", () => {
-  confirmRemove.value = true
-})
 </script>

packages/hoppscotch-common/src/components/history/rest/Card.vue

@@ -55,7 +55,7 @@ import { RESTHistoryEntry } from "~/newstore/history"
 import { shortDateTime } from "~/helpers/utils/date"
 
 import IconStar from "~icons/lucide/star"
-import IconStarOff from "~icons/hopp/star-off"
+import IconStarOff from "~icons/lucide/star-off"
 import IconTrash from "~icons/lucide/trash"
 
 const props = defineProps<{

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

@@ -113,12 +113,17 @@
         />
       </div>
     </div>
-    <HoppSmartPlaceholder
+    <div
       v-if="auth.authType === 'none'"
-      :src="`/images/states/${colorMode.value}/login.svg`"
+      class="flex flex-col items-center justify-center p-4 text-secondaryLight"
-      :alt="`${t('empty.authorization')}`"
-      :text="t('empty.authorization')"
     >
+      <img
+        :src="`/images/states/${colorMode.value}/login.svg`"
+        loading="lazy"
+        class="inline-flex flex-col object-contain object-center w-16 h-16 my-4"
+        :alt="`${t('empty.authorization')}`"
+      />
+      <span class="pb-4 text-center">{{ t("empty.authorization") }}</span>
       <HoppButtonSecondary
         outline
         :label="t('app.documentation')"
@@ -128,7 +133,7 @@
         reverse
         class="mb-4"
       />
-    </HoppSmartPlaceholder>
+    </div>
     <div v-else class="flex flex-1 border-b border-dividerLight">
       <div class="w-2/3 border-r border-dividerLight">
         <div v-if="auth.authType === 'basic'">

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

@@ -102,12 +102,17 @@
       v-model="body"
     />
     <HttpRawBody v-else-if="body.contentType !== null" v-model="body" />
-    <HoppSmartPlaceholder
+    <div
       v-if="body.contentType == null"
-      :src="`/images/states/${colorMode.value}/upload_single_file.svg`"
+      class="flex flex-col items-center justify-center p-4 text-secondaryLight"
-      :alt="`${t('empty.body')}`"
-      :text="t('empty.body')"
     >
+      <img
+        :src="`/images/states/${colorMode.value}/upload_single_file.svg`"
+        loading="lazy"
+        class="inline-flex flex-col object-contain object-center w-16 h-16 my-4"
+        :alt="`${t('empty.body')}`"
+      />
+      <span class="pb-4 text-center">{{ t("empty.body") }}</span>
       <HoppButtonSecondary
         outline
         :label="`${t('app.documentation')}`"
@@ -117,7 +122,7 @@
         reverse
         class="mb-4"
       />
-    </HoppSmartPlaceholder>
+    </div>
   </div>
 </template>
 

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

@@ -152,12 +152,17 @@
       </template>
     </draggable>
 
-    <HoppSmartPlaceholder
+    <div
       v-if="workingParams.length === 0"
-      :src="`/images/states/${colorMode.value}/upload_single_file.svg`"
+      class="flex flex-col items-center justify-center p-4 text-secondaryLight"
-      :alt="`${t('empty.body')}`"
-      :text="t('empty.body')"
     >
+      <img
+        :src="`/images/states/${colorMode.value}/upload_single_file.svg`"
+        loading="lazy"
+        class="inline-flex flex-col object-contain object-center w-16 h-16 my-4"
+        :alt="`${t('empty.body')}`"
+      />
+      <span class="pb-4 text-center">{{ t("empty.body") }}</span>
       <HoppButtonSecondary
         :label="`${t('add.new')}`"
         filled
@@ -165,7 +170,7 @@
         class="mb-4"
         @click="addBodyParam"
       />
-    </HoppSmartPlaceholder>
+    </div>
   </div>
 </template>
 

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

@@ -56,19 +56,20 @@
                     }
                   "
                 />
-                <HoppSmartPlaceholder
+                <div
                   v-if="
                     !(
                       filteredCodegenDefinitions.length !== 0 ||
                       CodegenDefinitions.length === 0
                     )
                   "
-                  :text="`${t('state.nothing_found')} ‟${searchQuery}”`"
+                  class="flex flex-col items-center justify-center p-4 text-secondaryLight"
                 >
-                  <template #icon>
+                  <icon-lucide-search class="pb-2 opacity-75 svg-icons" />
-                    <icon-lucide-search class="pb-2 opacity-75 svg-icons" />
+                  <span class="my-2 text-center">
-                  </template>
+                    {{ t("state.nothing_found") }} "{{ searchQuery }}"
-                </HoppSmartPlaceholder>
+                  </span>
+                </div>
               </div>
             </div>
           </template>
@@ -164,7 +165,6 @@ import IconCheck from "~icons/lucide/check"
 import IconWrapText from "~icons/lucide/wrap-text"
 import { currentActiveTab } from "~/helpers/rest/tab"
 import cloneDeep from "lodash-es/cloneDeep"
-import { platform } from "~/platform"
 
 const t = useI18n()
 
@@ -248,10 +248,6 @@ watch(
   (goingToShow) => {
     if (goingToShow) {
       request.value = cloneDeep(currentActiveTab.value.document.request)
-
-      platform.analytics?.logEvent({
-        type: "HOPP_REST_CODEGEN_OPENED",
-      })
     }
   }
 )

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

@@ -202,12 +202,17 @@
           </div>
         </template>
       </draggable>
-      <HoppSmartPlaceholder
+      <div
         v-if="workingHeaders.length === 0"
-        :src="`/images/states/${colorMode.value}/add_category.svg`"
+        class="flex flex-col items-center justify-center p-4 text-secondaryLight"
-        :alt="`${t('empty.headers')}`"
-        :text="t('empty.headers')"
       >
+        <img
+          :src="`/images/states/${colorMode.value}/add_category.svg`"
+          loading="lazy"
+          class="inline-flex flex-col object-contain object-center w-16 h-16 my-4"
+          :alt="`${t('empty.headers')}`"
+        />
+        <span class="pb-4 text-center">{{ t("empty.headers") }}</span>
         <HoppButtonSecondary
           filled
           :label="`${t('add.new')}`"
@@ -215,7 +220,7 @@
           class="mb-4"
           @click="addHeader"
         />
-      </HoppSmartPlaceholder>
+      </div>
     </div>
   </div>
 </template>
@@ -333,7 +338,7 @@ watch(workingHeaders, (headersList) => {
 
 // Sync logic between headers and working/bulk headers
 watch(
-  () => request.value.headers,
+  request.value.headers,
   (newHeadersList) => {
     // Sync should overwrite working headers
     const filteredWorkingHeaders = pipe(

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

@@ -94,7 +94,6 @@ import IconClipboard from "~icons/lucide/clipboard"
 import IconCheck from "~icons/lucide/check"
 import IconTrash2 from "~icons/lucide/trash-2"
 import { currentActiveTab } from "~/helpers/rest/tab"
-import { platform } from "~/platform"
 
 const t = useI18n()
 
@@ -145,10 +144,6 @@ const handleImport = () => {
   try {
     const req = parseCurlToHoppRESTReq(text)
 
-    platform.analytics?.logEvent({
-      type: "HOPP_REST_IMPORT_CURL",
-    })
-
     currentActiveTab.value.document.request = req
   } catch (e) {
     console.error(e)

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

@@ -145,12 +145,18 @@
           </div>
         </template>
       </draggable>
-      <HoppSmartPlaceholder
+
+      <div
         v-if="workingParams.length === 0"
-        :src="`/images/states/${colorMode.value}/add_files.svg`"
+        class="flex flex-col items-center justify-center p-4 text-secondaryLight"
-        :alt="`${t('empty.parameters')}`"
-        :text="t('empty.parameters')"
       >
+        <img
+          :src="`/images/states/${colorMode.value}/add_files.svg`"
+          loading="lazy"
+          class="inline-flex flex-col object-contain object-center w-16 h-16 my-4"
+          :alt="`${t('empty.parameters')}`"
+        />
+        <span class="pb-4 text-center">{{ t("empty.parameters") }}</span>
         <HoppButtonSecondary
           :label="`${t('add.new')}`"
           :icon="IconPlus"
@@ -158,7 +164,7 @@
           class="mb-4"
           @click="addParam"
         />
-      </HoppSmartPlaceholder>
+      </div>
     </div>
   </div>
 </template>