fix: shortcode screen stuck when invalid link

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

.github/workflows/ui.yml

@@ -0,0 +1,42 @@
+name: Deploy to Netlify (ui)
+
+on:
+  push:
+    branches: [main]
+    # run this workflow only if an update is made to the ui package
+    paths:
+      - "packages/hoppscotch-ui/**"
+  workflow_dispatch:
+
+jobs:
+  deploy:
+    name: Deploy
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Setup environment
+        run: mv .env.example .env
+
+      - name: Setup pnpm
+        uses: pnpm/action-setup@v2.2.4
+        with:
+          version: 8
+          run_install: true
+
+      - name: Setup node
+        uses: actions/setup-node@v3
+        with:
+          node-version: ${{ matrix.node }}
+          cache: pnpm
+
+      - name: Build site
+        run: pnpm run generate-ui
+
+      # Deploy the ui site with netlify-cli
+      - name: Deploy to Netlify (ui)
+        run: npx netlify-cli deploy --dir=packages/hoppscotch-ui/.histoire/dist --prod
+        env:
+          NETLIFY_SITE_ID: ${{ secrets.NETLIFY_UI_SITE_ID }}
+          NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}

package.json

@@ -11,7 +11,7 @@
     "dev": "pnpm -r do-dev",
     "gen-gql": "cross-env GQL_SCHEMA_EMIT_LOCATION='../../../gql-gen/backend-schema.gql' pnpm -r generate-gql-sdl",
     "generate": "pnpm -r do-build-prod",
-    "start": "http-server packages/hoppscotch-web/dist -p 3000",
+    "start": "http-server packages/hoppscotch-selfhost-web/dist -p 3000",
     "lint": "pnpm -r do-lint",
     "typecheck": "pnpm -r do-typecheck",
     "lintfix": "pnpm -r do-lintfix",

packages/hoppscotch-backend/package.json

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

packages/hoppscotch-backend/src/main.ts

@@ -9,7 +9,6 @@ import { emitGQLSchemaFile } from './gql-schema';
 async function bootstrap() {
   console.log(`Running in production: ${process.env.PRODUCTION}`);
   console.log(`Port: ${process.env.PORT}`);
-  console.log(`Database: ${process.env.DATABASE_URL}`);
 
   const app = await NestFactory.create(AppModule);
 

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

@@ -126,7 +126,7 @@ export class TeamInvitationService {
             template: 'team-invitation',
             variables: {
               invitee: creator.displayName ?? 'A Hoppscotch User',
-              action_url: `https://hoppscotch.io/join-team?id=${invitation.id}`,
+              action_url: `${process.env.VITE_BASE_URL}/join-team?id=${invitation.id}`,
               invite_team_name: team.name,
             },
           }),

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

@@ -32,7 +32,7 @@ export class TeamInviteViewerGuard implements CanActivate {
       // Get user
       TE.bindW('user', ({ gqlCtx }) =>
         pipe(
-          O.fromNullable(gqlCtx.getContext<{ user?: User }>().user),
+          O.fromNullable(gqlCtx.getContext().req.user),
           TE.fromOption(() => BUG_AUTH_NO_USER_CTX),
         ),
       ),

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

@@ -33,7 +33,7 @@ export class TeamInviteeGuard implements CanActivate {
       // Get user
       TE.bindW('user', ({ gqlCtx }) =>
         pipe(
-          O.fromNullable(gqlCtx.getContext<{ user?: User }>().user),
+          O.fromNullable(gqlCtx.getContext().req.user),
           TE.fromOption(() => BUG_AUTH_NO_USER_CTX),
         ),
       ),

packages/hoppscotch-common/locales/af.json

@@ -432,6 +432,7 @@
     "view_my_links": "View my links"
   },
   "response": {
+    "audio": "Audio",
     "body": "Reaksie liggaam",
     "filter_response_body": "Filter JSON response body (uses JSONPath syntax)",
     "headers": "Opskrifte",
@@ -445,6 +446,7 @@
     "status": "Status",
     "time": "Tyd",
     "title": "Reaksie",
+    "video": "Video",
     "waiting_for_connection": "wag vir verbinding",
     "xml": "XML"
   },

packages/hoppscotch-common/locales/ar.json

@@ -432,6 +432,7 @@
     "view_my_links": "View my links"
   },
   "response": {
+    "audio": "Audio",
     "body": "هيئة الاستجابة",
     "filter_response_body": "Filter JSON response body (uses JSONPath syntax)",
     "headers": "الرؤوس",
@@ -445,6 +446,7 @@
     "status": "حالة",
     "time": "وقت",
     "title": "إجابة",
+    "video": "Video",
     "waiting_for_connection": "في انتظار الاتصال",
     "xml": "XML"
   },

packages/hoppscotch-common/locales/ca.json

@@ -432,6 +432,7 @@
     "view_my_links": "Visualitzar els meus enllaços"
   },
   "response": {
+    "audio": "Audio",
     "body": "Cos de resposta",
     "filter_response_body": "Filtrar el cos de la resposta JSON (utilitza la sintaxi JSONPath)",
     "headers": "Capçaleres",
@@ -445,6 +446,7 @@
     "status": "Estat",
     "time": "Temps",
     "title": "Resposta",
+    "video": "Video",
     "waiting_for_connection": "esperant la connexió",
     "xml": "XML"
   },

packages/hoppscotch-common/locales/cn.json

@@ -432,6 +432,7 @@
     "view_my_links": "查看我的链接"
   },
   "response": {
+    "audio": "Audio",
     "body": "响应体",
     "filter_response_body": "筛选JSON响应本体（使用JSONPath语法）",
     "headers": "响应头",
@@ -445,6 +446,7 @@
     "status": "状态",
     "time": "时间",
     "title": "响应",
+    "video": "Video",
     "waiting_for_connection": "等待连接",
     "xml": "XML"
   },

packages/hoppscotch-common/locales/cs.json

@@ -432,6 +432,7 @@
     "view_my_links": "View my links"
   },
   "response": {
+    "audio": "Audio",
     "body": "Odpovědní orgán",
     "filter_response_body": "Filter JSON response body (uses JSONPath syntax)",
     "headers": "Záhlaví",
@@ -445,6 +446,7 @@
     "status": "Postavení",
     "time": "Čas",
     "title": "Odezva",
+    "video": "Video",
     "waiting_for_connection": "čekání na připojení",
     "xml": "XML"
   },

packages/hoppscotch-common/locales/da.json

@@ -432,6 +432,7 @@
     "view_my_links": "View my links"
   },
   "response": {
+    "audio": "Audio",
     "body": "Svarorgan",
     "filter_response_body": "Filter JSON response body (uses JSONPath syntax)",
     "headers": "Overskrifter",
@@ -445,6 +446,7 @@
     "status": "Status",
     "time": "Tid",
     "title": "Respons",
+    "video": "Video",
     "waiting_for_connection": "venter på forbindelse",
     "xml": "XML"
   },

packages/hoppscotch-common/locales/de.json

@@ -432,6 +432,7 @@
     "view_my_links": "View my links"
   },
   "response": {
+    "audio": "Audio",
     "body": "Antworttext",
     "filter_response_body": "Filter JSON response body (uses JSONPath syntax)",
     "headers": "Header",
@@ -445,6 +446,7 @@
     "status": "Status",
     "time": "Zeit",
     "title": "Antwort",
+    "video": "Video",
     "waiting_for_connection": "auf Verbindung warten",
     "xml": "XML"
   },

packages/hoppscotch-common/locales/el.json

@@ -432,6 +432,7 @@
     "view_my_links": "Προβολή των links μου"
   },
   "response": {
+    "audio": "Audio",
     "body": "Σώμα απόκρισης",
     "filter_response_body": "Filter JSON response body (uses JSONPath syntax)",
     "headers": "Κεφαλίδες",
@@ -445,6 +446,7 @@
     "status": "Κατάσταση",
     "time": "χρόνος",
     "title": "Απάντηση",
+    "video": "Video",
     "waiting_for_connection": "περιμένοντας τη σύνδεση",
     "xml": "XML"
   },

packages/hoppscotch-common/locales/es.json

@@ -432,6 +432,7 @@
     "view_my_links": "Ver mis enlaces"
   },
   "response": {
+    "audio": "Audio",
     "body": "Cuerpo de respuesta",
     "filter_response_body": "Filtrar el cuerpo de la respuesta JSON (utiliza la sintaxis JSONPath)",
     "headers": "Encabezados",
@@ -445,6 +446,7 @@
     "status": "Estado",
     "time": "Tiempo",
     "title": "Respuesta",
+    "video": "Video",
     "waiting_for_connection": "esperando la conexión",
     "xml": "XML"
   },

packages/hoppscotch-common/locales/fi.json

@@ -432,6 +432,7 @@
     "view_my_links": "View my links"
   },
   "response": {
+    "audio": "Audio",
     "body": "Vastauselin",
     "filter_response_body": "Filter JSON response body (uses JSONPath syntax)",
     "headers": "Otsikot",
@@ -445,6 +446,7 @@
     "status": "Tila",
     "time": "Aika",
     "title": "Vastaus",
+    "video": "Video",
     "waiting_for_connection": "yhteyttä odotellessa",
     "xml": "XML"
   },

packages/hoppscotch-common/locales/fr.json

@@ -432,6 +432,7 @@
     "view_my_links": "Voir mes liens"
   },
   "response": {
+    "audio": "Audio",
     "body": "Corps de réponse",
     "filter_response_body": "Filter JSON response body (uses JSONPath syntax)",
     "headers": "En-têtes",
@@ -445,6 +446,7 @@
     "status": "Statut",
     "time": "Temps",
     "title": "Réponse",
+    "video": "Video",
     "waiting_for_connection": "En attente de connexion",
     "xml": "XML"
   },

packages/hoppscotch-common/locales/he.json

@@ -432,6 +432,7 @@
     "view_my_links": "View my links"
   },
   "response": {
+    "audio": "Audio",
     "body": "גוף תגובה",
     "filter_response_body": "Filter JSON response body (uses JSONPath syntax)",
     "headers": "כותרות",
@@ -445,6 +446,7 @@
     "status": "סטָטוּס",
     "time": "זְמַן",
     "title": "תְגוּבָה",
+    "video": "Video",
     "waiting_for_connection": "מחכה לחיבור",
     "xml": "XML"
   },

packages/hoppscotch-common/locales/hi.json

@@ -433,6 +433,7 @@
     "view_my_links": "मेरे लिंक देखें"
   },
   "response": {
+    "audio": "Audio",
     "body": "प्रतिक्रिया निकाय",
     "filter_response_body": "फ़िल्टर JSON रिस्पांस बॉडी (JSONPATH सिंटैक्स का उपयोग करता है)",
     "headers": "हेडर",
@@ -446,6 +447,7 @@
     "status": "दर्जा",
     "time": "समय",
     "title": "जवाब",
+    "video": "Video",
     "waiting_for_connection": "जुडने के लिए इंतजार",
     "xml": "एक्सएमएल"
   },

packages/hoppscotch-common/locales/hu.json

@@ -432,6 +432,7 @@
     "view_my_links": "View my links"
   },
   "response": {
+    "audio": "Audio",
     "body": "Válasz törzse",
     "filter_response_body": "Filter JSON response body (uses JSONPath syntax)",
     "headers": "Fejlécek",
@@ -445,6 +446,7 @@
     "status": "Állapot",
     "time": "Idő",
     "title": "Válasz",
+    "video": "Video",
     "waiting_for_connection": "várakozás kapcsolódásra",
     "xml": "XML"
   },

packages/hoppscotch-common/locales/id.json

@@ -432,6 +432,7 @@
     "view_my_links": "Lihat tautan saya"
   },
   "response": {
+    "audio": "Audio",
     "body": "Response Body",
     "filter_response_body": "Filter body respons JSON (menggunakan sintaks JSONPath)",
     "headers": "Headers",
@@ -445,6 +446,7 @@
     "status": "Status",
     "time": "Waktu",
     "title": "Response",
+    "video": "Video",
     "waiting_for_connection": "Menunggu koneksi",
     "xml": "XML"
   },

packages/hoppscotch-common/locales/it.json

@@ -432,6 +432,7 @@
     "view_my_links": "View my links"
   },
   "response": {
+    "audio": "Audio",
     "body": "Corpo della risposta",
     "filter_response_body": "Filter JSON response body (uses JSONPath syntax)",
     "headers": "Intestazioni",
@@ -445,6 +446,7 @@
     "status": "Stato",
     "time": "Tempo impiegato",
     "title": "Risposta",
+    "video": "Video",
     "waiting_for_connection": "In attesa di connessione",
     "xml": "XML"
   },

packages/hoppscotch-common/locales/ja.json

@@ -432,6 +432,7 @@
     "view_my_links": "自分のリンクを見る"
   },
   "response": {
+    "audio": "Audio",
     "body": "レスポンスボディ",
     "filter_response_body": "JSONレスポンスボディをフィルタ (JSONPathシンタックスを使用)",
     "headers": "ヘッダー",
@@ -445,6 +446,7 @@
     "status": "ステータス",
     "time": "時間",
     "title": "レスポンス",
+    "video": "Video",
     "waiting_for_connection": "接続を待っています",
     "xml": "XML"
   },

packages/hoppscotch-common/locales/ko.json

@@ -432,6 +432,7 @@
     "view_my_links": "내 링크 보기"
   },
   "response": {
+    "audio": "Audio",
     "body": "응답 본문",
     "filter_response_body": "Filter JSON response body (uses JSONPath syntax)",
     "headers": "헤더",
@@ -445,6 +446,7 @@
     "status": "상태",
     "time": "시간",
     "title": "제목",
+    "video": "Video",
     "waiting_for_connection": "연결 대기 중",
     "xml": "XML"
   },

packages/hoppscotch-common/locales/nl.json

@@ -432,6 +432,7 @@
     "view_my_links": "View my links"
   },
   "response": {
+    "audio": "Audio",
     "body": "Reactie inhoud",
     "filter_response_body": "Filter JSON response body (uses JSONPath syntax)",
     "headers": "Headers",
@@ -445,6 +446,7 @@
     "status": "Status",
     "time": "Tijd",
     "title": "Antwoord",
+    "video": "Video",
     "waiting_for_connection": "wachten op verbinding",
     "xml": "XML"
   },

packages/hoppscotch-common/locales/no.json

@@ -432,6 +432,7 @@
     "view_my_links": "View my links"
   },
   "response": {
+    "audio": "Audio",
     "body": "Svarkropp",
     "filter_response_body": "Filter JSON response body (uses JSONPath syntax)",
     "headers": "Overskrifter",
@@ -445,6 +446,7 @@
     "status": "Status",
     "time": "Tid",
     "title": "Respons",
+    "video": "Video",
     "waiting_for_connection": "venter på tilkobling",
     "xml": "XML"
   },

packages/hoppscotch-common/locales/pl.json

@@ -432,6 +432,7 @@
     "view_my_links": "View my links"
   },
   "response": {
+    "audio": "Audio",
     "body": "Ciało odpowiedzi",
     "filter_response_body": "Filter JSON response body (uses JSONPath syntax)",
     "headers": "Nagłówki",
@@ -445,6 +446,7 @@
     "status": "Status",
     "time": "Czas",
     "title": "Odpowiedź",
+    "video": "Video",
     "waiting_for_connection": "oczekiwanie na połączenie",
     "xml": "XML"
   },

packages/hoppscotch-common/locales/pt-br.json

@@ -432,6 +432,7 @@
     "view_my_links": "View my links"
   },
   "response": {
+    "audio": "Audio",
     "body": "Corpo de Resposta",
     "filter_response_body": "Filter JSON response body (uses JSONPath syntax)",
     "headers": "Cabeçalhos",
@@ -445,6 +446,7 @@
     "status": "Status",
     "time": "Tempo",
     "title": "Resposta",
+    "video": "Video",
     "waiting_for_connection": "aguardando conexão",
     "xml": "XML"
   },

packages/hoppscotch-common/locales/pt.json

@@ -432,6 +432,7 @@
     "view_my_links": "View my links"
   },
   "response": {
+    "audio": "Audio",
     "body": "Corpo de Resposta",
     "filter_response_body": "Filter JSON response body (uses JSONPath syntax)",
     "headers": "Cabeçalhos",
@@ -445,6 +446,7 @@
     "status": "Status",
     "time": "Tempo",
     "title": "Resposta",
+    "video": "Video",
     "waiting_for_connection": "aguardando conexão",
     "xml": "XML"
   },

packages/hoppscotch-common/locales/ro.json

@@ -432,6 +432,7 @@
     "view_my_links": "Vizualizare link-uri"
   },
   "response": {
+    "audio": "Audio",
     "body": "Corpul de răspuns",
     "filter_response_body": "Filtrează corpul răspunsului JSON (folosește sintaxa JSONPath)",
     "headers": "Anteturi",
@@ -445,6 +446,7 @@
     "status": "Stare",
     "time": "Timp",
     "title": "Raspuns",
+    "video": "Video",
     "waiting_for_connection": "Așteptând conexiunea",
     "xml": "XML"
   },

packages/hoppscotch-common/locales/ru.json

@@ -432,6 +432,7 @@
     "view_my_links": "View my links"
   },
   "response": {
+    "audio": "Audio",
     "body": "Тело ответа",
     "filter_response_body": "Filter JSON response body (uses JSONPath syntax)",
     "headers": "Заголовки",
@@ -445,6 +446,7 @@
     "status": "Статус",
     "time": "Время",
     "title": "Ответ",
+    "video": "Video",
     "waiting_for_connection": "Ожидание соединения",
     "xml": "XML"
   },

packages/hoppscotch-common/locales/sr.json

@@ -432,6 +432,7 @@
     "view_my_links": "View my links"
   },
   "response": {
+    "audio": "Audio",
     "body": "Тело за одговор",
     "filter_response_body": "Filter JSON response body (uses JSONPath syntax)",
     "headers": "Заглавља",
@@ -445,6 +446,7 @@
     "status": "Статус",
     "time": "време",
     "title": "Одговор",
+    "video": "Video",
     "waiting_for_connection": "чека везу",
     "xml": "КСМЛ"
   },

packages/hoppscotch-common/locales/sv.json

@@ -432,6 +432,7 @@
     "view_my_links": "View my links"
   },
   "response": {
+    "audio": "Audio",
     "body": "Svarskommitté",
     "filter_response_body": "Filter JSON response body (uses JSONPath syntax)",
     "headers": "Rubriker",
@@ -445,6 +446,7 @@
     "status": "Status",
     "time": "Tid",
     "title": "Svar",
+    "video": "Video",
     "waiting_for_connection": "väntar på anslutning",
     "xml": "XML"
   },

packages/hoppscotch-common/locales/tr.json

@@ -122,7 +122,7 @@
     "edit": "Koleksiyonu düzenle",
     "invalid_name": "Lütfen koleksiyon için geçerli bir ad girin",
     "invalid_root_move": "Collection already in the root",
-    "moved": "Moved Successfully",
+    "moved": "Başarıyla taşındı",
     "my_collections": "Koleksiyonlarım",
     "name": "Yeni Koleksiyonum",
     "name_length_insufficient": "Koleksiyon adı en az 3 karakter uzunluğunda olmalıdır",
@@ -147,7 +147,7 @@
     "remove_team": "Bu takımı silmek istediğinizden emin misiniz?",
     "remove_telemetry": "Telemetriden çıkmak istediğinizden emin misiniz?",
     "request_change": "Are you sure you want to discard current request, unsaved changes will be lost.",
-    "save_unsaved_tab": "Do you want to save changes made in this tab?",
+    "save_unsaved_tab": "Bu sekmede yapılan değişiklikleri kaydetmek istiyor musunuz?",
     "sync": "Bu çalışma alanını senkronize etmek istediğinizden emin misiniz?"
   },
   "count": {
@@ -368,9 +368,9 @@
   },
   "profile": {
     "app_settings": "Uygulama ayarları",
-    "default_hopp_displayname": "Unnamed User",
-    "editor": "Düzenleyici",
-    "editor_description": "Editors can add, edit, and delete requests.",
+    "default_hopp_displayname": "Adsız Kullanıcı",
+    "editor": "Editör",
+    "editor_description": "Editörler istekleri ekleyebilir, düzenleyebilir ve silebilir.",
     "email_verification_mail": "Doğrulama bağlantısı e-postanıza gönderildi. E-postanızı doğrulamak için gelen bağlantıya tıklayınız.",
     "no_permission": "Bu eylemi gerçekleştirmek için gerekli yetkiniz yok.",
     "owner": "Kurucu",
@@ -432,6 +432,7 @@
     "view_my_links": "View my links"
   },
   "response": {
+    "audio": "Audio",
     "body": "Yanıt gövdesi",
     "filter_response_body": "Filter JSON response body (uses JSONPath syntax)",
     "headers": "Başlıklar",
@@ -445,6 +446,7 @@
     "status": "Durum",
     "time": "Zaman",
     "title": "Cevap",
+    "video": "Video",
     "waiting_for_connection": "Bağlantı için bekleniyor",
     "xml": "XML"
   },

packages/hoppscotch-common/locales/tw.json

@@ -432,6 +432,7 @@
     "view_my_links": "檢視我的連結"
   },
   "response": {
+    "audio": "Audio",
     "body": "回應本體",
     "filter_response_body": "篩選 JSON 回應本體 (使用 JSONPath 語法)",
     "headers": "回應標頭",
@@ -445,6 +446,7 @@
     "status": "狀態",
     "time": "時間",
     "title": "回應",
+    "video": "Video",
     "waiting_for_connection": "等待連線",
     "xml": "XML"
   },

packages/hoppscotch-common/locales/uk.json

@@ -432,6 +432,7 @@
     "view_my_links": "Переглянути мої посилання"
   },
   "response": {
+    "audio": "Audio",
     "body": "Орган реагування",
     "filter_response_body": "Фільтр тіла відповідей JSON (використовує синтаксис JSONPath)",
     "headers": "Заголовки",
@@ -445,6 +446,7 @@
     "status": "Статус",
     "time": "Час",
     "title": "Відповідь",
+    "video": "Video",
     "waiting_for_connection": "очікування підключення",
     "xml": "XML"
   },

packages/hoppscotch-common/locales/vi.json

@@ -4,7 +4,7 @@
     "cancel": "Hủy bỏ",
     "choose_file": "Chọn một tệp",
     "clear": "Thông thoáng",
-    "clear_all": "Quet sạch tât cả",
+    "clear_all": "Quet sạch tất cả",
     "close": "Close",
     "connect": "Liên kết",
     "connecting": "Connecting",
@@ -432,6 +432,7 @@
     "view_my_links": "View my links"
   },
   "response": {
+    "audio": "Audio",
     "body": "Cơ quan phản hồi",
     "filter_response_body": "Filter JSON response body (uses JSONPath syntax)",
     "headers": "Tiêu đề",
@@ -445,6 +446,7 @@
     "status": "Tình trạng",
     "time": "Thời gian",
     "title": "Phản ứng",
+    "video": "Video",
     "waiting_for_connection": "Đang đợi kết nối",
     "xml": "XML"
   },

packages/hoppscotch-common/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@hoppscotch/common",
   "private": true,
-  "version": "2023.4.3",
+  "version": "2023.4.6",
   "scripts": {
     "dev": "pnpm exec npm-run-all -p -l dev:*",
     "dev:vite": "vite",

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

@@ -134,11 +134,13 @@ declare module '@vue/runtime-core' {
     IconLucideUsers: typeof import('~icons/lucide/users')['default']
     LensesHeadersRenderer: typeof import('./components/lenses/HeadersRenderer.vue')['default']
     LensesHeadersRendererEntry: typeof import('./components/lenses/HeadersRendererEntry.vue')['default']
+    LensesRenderersAudioLensRenderer: typeof import('./components/lenses/renderers/AudioLensRenderer.vue')['default']
     LensesRenderersHTMLLensRenderer: typeof import('./components/lenses/renderers/HTMLLensRenderer.vue')['default']
     LensesRenderersImageLensRenderer: typeof import('./components/lenses/renderers/ImageLensRenderer.vue')['default']
     LensesRenderersJSONLensRenderer: typeof import('./components/lenses/renderers/JSONLensRenderer.vue')['default']
     LensesRenderersPDFLensRenderer: typeof import('./components/lenses/renderers/PDFLensRenderer.vue')['default']
     LensesRenderersRawLensRenderer: typeof import('./components/lenses/renderers/RawLensRenderer.vue')['default']
+    LensesRenderersVideoLensRenderer: typeof import('./components/lenses/renderers/VideoLensRenderer.vue')['default']
     LensesRenderersXMLLensRenderer: typeof import('./components/lenses/renderers/XMLLensRenderer.vue')['default']
     LensesResponseBodyRenderer: typeof import('./components/lenses/ResponseBodyRenderer.vue')['default']
     ProfileShortcode: typeof import('./components/profile/Shortcode.vue')['default']

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

@@ -125,8 +125,8 @@
       @hide-modal="displayModalEditFolder(false)"
     />
     <CollectionsEditRequest
+      v-model="editingRequestName"
       :show="showModalEditRequest"
-      v-bind:model-value="editingRequest ? editingRequest.name : ''"
       :loading-state="modalLoadingState"
       @submit="updateEditingRequest"
       @hide-modal="displayModalEditRequest(false)"
@@ -157,7 +157,7 @@
 </template>
 
 <script setup lang="ts">
-import { computed, PropType, ref, watch } from "vue"
+import { computed, nextTick, PropType, ref, watch } from "vue"
 import { useToast } from "@composables/toast"
 import { useI18n } from "@composables/i18n"
 import { Picked } from "~/helpers/types/HoppPicked"
@@ -288,6 +288,7 @@ const editingFolder = ref<
 const editingFolderName = ref<string | null>(null)
 const editingFolderPath = ref<string | null>(null)
 const editingRequest = ref<HoppRESTRequest | null>(null)
+const editingRequestName = ref("")
 const editingRequestIndex = ref<number | null>(null)
 const editingRequestID = ref<string | null>(null)
 
@@ -860,6 +861,7 @@ const editRequest = (payload: {
 }) => {
   const { folderPath, requestIndex, request } = payload
   editingRequest.value = request
+  editingRequestName.value = request.name ?? ""
   if (collectionsType.value.type === "my-collections" && folderPath) {
     editingFolderPath.value = folderPath
     editingRequestIndex.value = parseInt(requestIndex)
@@ -893,6 +895,9 @@ const updateEditingRequest = (newName: string) => {
 
     if (possibleActiveTab) {
       possibleActiveTab.value.document.request.name = requestUpdated.name
+      nextTick(() => {
+        possibleActiveTab.value.document.isDirty = false
+      })
     }
 
     displayModalEditRequest(false)
@@ -931,6 +936,9 @@ const updateEditingRequest = (newName: string) => {
 
     if (possibleTab) {
       possibleTab.value.document.request.name = requestName
+      nextTick(() => {
+        possibleTab.value.document.isDirty = false
+      })
     }
   }
 }

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

@@ -11,13 +11,14 @@
       class="bg-transparent border-b border-dividerLight select-wrapper"
     >
       <HoppButtonSecondary
-        v-if="selectedEnv.type !== 'NO_ENV_SELECTED'"
-        :label="selectedEnv.name"
-        class="flex-1 !justify-start pr-8 rounded-none"
-      />
-      <HoppButtonSecondary
-        v-else
-        :label="`${t('environment.select')}`"
+        :icon="IconLayers"
+        :label="
+          mdAndLarger
+            ? selectedEnv.type !== 'NO_ENV_SELECTED'
+              ? selectedEnv.name
+              : `${t('environment.select')}`
+            : ''
+        "
         class="flex-1 !justify-start pr-8 rounded-none"
       />
     </span>
@@ -46,93 +47,149 @@
             }
           "
         />
-        <div v-if="environmentType === 'my-environments'" class="flex flex-col">
-          <hr v-if="myEnvironments.length > 0" />
-          <HoppSmartItem
-            v-for="(gen, index) in myEnvironments"
-            :key="`gen-${index}`"
-            :label="gen.name"
-            :info-icon="index === selectedEnv.index ? IconCheck : undefined"
-            :active-info-icon="index === selectedEnv.index"
-            @click="
-              () => {
-                selectedEnvironmentIndex = { type: 'MY_ENV', index: index }
-                hide()
-              }
-            "
-          />
-        </div>
-        <div v-else class="flex flex-col">
-          <div
-            v-if="teamEnvLoading"
-            class="flex flex-col items-center justify-center p-4"
+        <HoppSmartTabs
+          v-model="selectedEnvTab"
+          styles="sticky overflow-x-auto my-2 border border-divider rounded flex-shrink-0 z-10 top-0 bg-primary"
+          render-inactive-tabs
+        >
+          <HoppSmartTab
+            :id="'my-environments'"
+            :label="`${t('environment.my_environments')}`"
           >
-            <HoppSmartSpinner class="my-4" />
-            <span class="text-secondaryLight">{{ t("state.loading") }}</span>
-          </div>
-          <hr v-if="teamEnvironmentList.length > 0" />
-          <div v-if="isTeamSelected" class="flex flex-col">
             <HoppSmartItem
-              v-for="(gen, index) in teamEnvironmentList"
-              :key="`gen-team-${index}`"
-              :label="gen.environment.name"
-              :info-icon="
-                gen.id === selectedEnv.teamEnvID ? IconCheck : undefined
-              "
-              :active-info-icon="gen.id === selectedEnv.teamEnvID"
+              v-for="(gen, index) in myEnvironments"
+              :key="`gen-${index}`"
+              :icon="IconLayers"
+              :label="gen.name"
+              :info-icon="index === selectedEnv.index ? IconCheck : undefined"
+              :active-info-icon="index === selectedEnv.index"
               @click="
                 () => {
-                  selectedEnvironmentIndex = {
-                    type: 'TEAM_ENV',
-                    teamEnvID: gen.id,
-                    teamID: gen.teamID,
-                    environment: gen.environment,
-                  }
+                  selectedEnvironmentIndex = { type: 'MY_ENV', index: index }
                   hide()
                 }
               "
             />
-          </div>
-          <div
-            v-if="!teamEnvLoading && isAdapterError"
-            class="flex flex-col items-center py-4"
+            <div
+              v-if="myEnvironments.length === 0"
+              class="flex flex-col items-center justify-center text-secondaryLight"
+            >
+              <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'"
+            :label="`${t('environment.team_environments')}`"
+            :disabled="!isTeamSelected || workspace.type === 'personal'"
           >
-            <icon-lucide-help-circle class="mb-4 svg-icons" />
-            {{ errorMessage }}
-          </div>
-        </div>
+            <div
+              v-if="teamListLoading"
+              class="flex flex-col items-center justify-center p-4"
+            >
+              <HoppSmartSpinner class="my-4" />
+              <span class="text-secondaryLight">{{ t("state.loading") }}</span>
+            </div>
+            <div v-else-if="isTeamSelected" class="flex flex-col">
+              <HoppSmartItem
+                v-for="(gen, index) in teamEnvironmentList"
+                :key="`gen-team-${index}`"
+                :icon="IconLayers"
+                :label="gen.environment.name"
+                :info-icon="
+                  gen.id === selectedEnv.teamEnvID ? IconCheck : undefined
+                "
+                :active-info-icon="gen.id === selectedEnv.teamEnvID"
+                @click="
+                  () => {
+                    selectedEnvironmentIndex = {
+                      type: 'TEAM_ENV',
+                      teamEnvID: gen.id,
+                      teamID: gen.teamID,
+                      environment: gen.environment,
+                    }
+                    hide()
+                  }
+                "
+              />
+              <div
+                v-if="teamEnvironmentList.length === 0"
+                class="flex flex-col items-center justify-center text-secondaryLight"
+              >
+                <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"
+              class="flex flex-col items-center py-4"
+            >
+              <icon-lucide-help-circle class="mb-4 svg-icons" />
+              {{ getErrorMessage(teamAdapterError) }}
+            </div>
+          </HoppSmartTab>
+        </HoppSmartTabs>
       </div>
     </template>
   </tippy>
 </template>
 
 <script lang="ts" setup>
-import { computed, ref } from "vue"
+import { computed, ref, watch } from "vue"
 import IconCheck from "~icons/lucide/check"
+import IconLayers from "~icons/lucide/layers"
 import { TippyComponent } from "vue-tippy"
 import { useI18n } from "~/composables/i18n"
 import { GQLError } from "~/helpers/backend/GQLClient"
-import { Environment } from "@hoppscotch/data"
-import { TeamEnvironment } from "~/helpers/teams/TeamEnvironment"
-import { useStream } from "~/composables/stream"
+import { useReadonlyStream, useStream } from "~/composables/stream"
 import {
+  environments$,
   selectedEnvironmentIndex$,
   setSelectedEnvironmentIndex,
 } from "~/newstore/environments"
+import { changeWorkspace, workspaceStatus$ } from "~/newstore/workspace"
+import TeamEnvironmentAdapter from "~/helpers/teams/TeamEnvironmentAdapter"
+import { useColorMode } from "@composables/theming"
+import { breakpointsTailwind, useBreakpoints } from "@vueuse/core"
+import TeamListAdapter from "~/helpers/teams/TeamListAdapter"
+import { useLocalState } from "~/newstore/localstate"
+import { onLoggedIn } from "~/composables/auth"
+import { GetMyTeamsQuery } from "~/helpers/backend/graphql"
+
+const breakpoints = useBreakpoints(breakpointsTailwind)
+const mdAndLarger = breakpoints.greater("md")
 
 const t = useI18n()
 
+const colorMode = useColorMode()
+
 type EnvironmentType = "my-environments" | "team-environments"
 
-const props = defineProps<{
-  environmentType: EnvironmentType
-  myEnvironments: Environment[]
-  teamEnvironmentList: TeamEnvironment[]
-  teamEnvLoading: boolean
-  isAdapterError: boolean
-  errorMessage: GQLError<string>
-  isTeamSelected: boolean
-}>()
+const myEnvironments = useReadonlyStream(environments$, [])
+
+const workspace = useReadonlyStream(workspaceStatus$, { type: "personal" })
+
+const teamEnvListAdapter = new TeamEnvironmentAdapter(undefined)
+const teamListLoading = useReadonlyStream(teamEnvListAdapter.loading$, false)
+const teamAdapterError = useReadonlyStream(teamEnvListAdapter.error$, null)
+const teamEnvironmentList = useReadonlyStream(
+  teamEnvListAdapter.teamEnvironmentList$,
+  []
+)
 
 const selectedEnvironmentIndex = useStream(
   selectedEnvironmentIndex$,
@@ -140,15 +197,67 @@ const selectedEnvironmentIndex = useStream(
   setSelectedEnvironmentIndex
 )
 
+const isTeamSelected = computed(
+  () => workspace.value.type === "team" && workspace.value.teamID !== undefined
+)
+
+const selectedEnvTab = ref<EnvironmentType>("my-environments")
+
+watch(
+  () => workspace.value,
+  (newVal) => {
+    if (newVal.type === "personal") {
+      selectedEnvTab.value = "my-environments"
+    } else {
+      selectedEnvTab.value = "team-environments"
+      if (newVal.teamID) {
+        teamEnvListAdapter.changeTeamID(newVal.teamID)
+      }
+    }
+  }
+)
+
+// 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)
+      }
+    }
+  }
+)
+
 const selectedEnv = computed(() => {
   if (selectedEnvironmentIndex.value.type === "MY_ENV") {
     return {
       type: "MY_ENV",
       index: selectedEnvironmentIndex.value.index,
-      name: props.myEnvironments[selectedEnvironmentIndex.value.index].name,
+      name: myEnvironments.value[selectedEnvironmentIndex.value.index].name,
     }
   } else if (selectedEnvironmentIndex.value.type === "TEAM_ENV") {
-    const teamEnv = props.teamEnvironmentList.find(
+    const teamEnv = teamEnvironmentList.value.find(
       (env) =>
         env.id ===
         (selectedEnvironmentIndex.value.type === "TEAM_ENV" &&
@@ -170,4 +279,17 @@ const selectedEnv = computed(() => {
 
 // Template refs
 const tippyActions = ref<TippyComponent | null>(null)
+
+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")
+      default:
+        return t("error.something_went_wrong")
+    }
+  }
+}
 </script>

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

@@ -4,15 +4,6 @@
       class="sticky top-0 z-10 flex flex-col flex-shrink-0 overflow-x-auto bg-primary"
     >
       <WorkspaceCurrent :section="t('tab.environments')" />
-      <EnvironmentsSelector
-        :environment-type="environmentType.type"
-        :my-environments="myEnvironments"
-        :team-env-loading="loading"
-        :team-environment-list="teamEnvironmentList"
-        :is-adapter-error="adapterError !== null"
-        :error-message="adapterError ? getErrorMessage(adapterError) : ''"
-        :is-team-selected="environmentType.selectedTeam !== undefined"
-      />
       <EnvironmentsMyEnvironment
         environment-index="Global"
         :environment="globalEnvironment"
@@ -46,13 +37,11 @@ import { GetMyTeamsQuery } from "~/helpers/backend/graphql"
 import { useReadonlyStream, useStream } from "@composables/stream"
 import { useI18n } from "~/composables/i18n"
 import {
-  environments$,
   globalEnv$,
   selectedEnvironmentIndex$,
   setSelectedEnvironmentIndex,
 } from "~/newstore/environments"
 import TeamEnvironmentAdapter from "~/helpers/teams/TeamEnvironmentAdapter"
-import { GQLError } from "~/helpers/backend/GQLClient"
 import { defineActionHandler } from "~/helpers/actions"
 import { workspaceStatus$ } from "~/newstore/workspace"
 import TeamListAdapter from "~/helpers/teams/TeamListAdapter"
@@ -147,24 +136,19 @@ onLoggedIn(() => {
 
 const workspace = useReadonlyStream(workspaceStatus$, { type: "personal" })
 
-// Used to switch environment type and team when user switch workspace in the global workspace switcher
-// Check if there is a teamID in the workspace, if yes, switch to team environment and select the team
-// If there is no teamID, switch to my environment
+// Switch to my environments if workspace is personal and to team environments if workspace is team
+// also resets selected environment if workspace is personal and the previous selected environment was a team environment
 watch(workspace, (newWorkspace) => {
   if (newWorkspace.type === "personal") {
     switchToMyEnvironments()
-    setSelectedEnvironmentIndex({
-      type: "NO_ENV_SELECTED",
-    })
-  } else if (newWorkspace.type === "team") {
-    const team = myTeams.value?.find((t) => t.id === newWorkspace.teamID)
-    updateSelectedTeam(team)
-
     if (selectedEnvironmentIndex.value.type !== "MY_ENV") {
       setSelectedEnvironmentIndex({
         type: "NO_ENV_SELECTED",
       })
     }
+  } else if (newWorkspace.type === "team") {
+    const team = myTeams.value?.find((t) => t.id === newWorkspace.teamID)
+    updateSelectedTeam(team)
   }
 })
 
@@ -207,8 +191,6 @@ defineActionHandler(
   }
 )
 
-const myEnvironments = useReadonlyStream(environments$, [])
-
 const selectedEnvironmentIndex = useStream(
   selectedEnvironmentIndex$,
   { type: "NO_ENV_SELECTED" },
@@ -251,17 +233,4 @@ watch(
   },
   { deep: true }
 )
-
-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")
-      default:
-        return t("error.something_went_wrong")
-    }
-  }
-}
 </script>

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

@@ -165,8 +165,8 @@ const props = withDefaults(
   defineProps<{
     show: boolean
     action: "edit" | "new"
-    editingEnvironmentIndex: number | "Global" | null
-    editingVariableName: string | null
+    editingEnvironmentIndex?: number | "Global" | null
+    editingVariableName?: string | null
     envVars?: () => Environment["variables"]
   }>(),
   {

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

@@ -140,7 +140,7 @@ import * as A from "fp-ts/Array"
 import * as O from "fp-ts/Option"
 import * as TE from "fp-ts/TaskEither"
 import { flow, pipe } from "fp-ts/function"
-import { parseTemplateStringE } from "@hoppscotch/data"
+import { Environment, parseTemplateStringE } from "@hoppscotch/data"
 import { refAutoReset } from "@vueuse/core"
 import { clone } from "lodash-es"
 import { useToast } from "@composables/toast"
@@ -173,16 +173,20 @@ const props = withDefaults(
   defineProps<{
     show: boolean
     action: "edit" | "new"
-    editingEnvironment: TeamEnvironment | null
+    editingEnvironment?: TeamEnvironment | null
     editingTeamId: string | undefined
-    editingVariableName: string | null
-    isViewer: boolean
+    editingVariableName?: string | null
+    isViewer?: boolean
+    envVars?: () => Environment["variables"]
   }>(),
   {
     show: false,
     action: "edit",
     editingEnvironment: null,
     editingTeamId: "",
+    editingVariableName: null,
+    isViewer: false,
+    envVars: () => [],
   }
 )
 
@@ -226,10 +230,16 @@ watch(
   () => props.show,
   (show) => {
     if (show) {
-      if (props.editingEnvironment === null) {
+      if (props.action === "new") {
         name.value = null
-        vars.value = []
-      } else {
+        vars.value = pipe(
+          props.envVars() ?? [],
+          A.map((e: { key: string; value: string }) => ({
+            id: idTicker.value++,
+            env: clone(e),
+          }))
+        )
+      } else if (props.editingEnvironment !== null) {
         name.value = props.editingEnvironment.environment.name ?? null
         vars.value = pipe(
           props.editingEnvironment.environment.variables ?? [],

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

@@ -1,7 +1,7 @@
 <template>
   <div>
     <div
-      class="sticky z-10 flex justify-between flex-1 flex-shrink-0 overflow-x-auto border-b top-upperSecondaryStickyFold border-dividerLight bg-primary"
+      class="sticky z-10 flex justify-between flex-1 flex-shrink-0 overflow-x-auto border-b top-upperPrimaryStickyFold border-dividerLight bg-primary"
     >
       <HoppButtonSecondary
         v-if="team === undefined || team.myRole === 'VIEWER'"

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

@@ -217,6 +217,7 @@
       @hide-modal="showCodegenModal = false"
     />
     <CollectionsSaveRequest
+      v-if="showSaveRequestModal"
       mode="rest"
       :show="showSaveRequestModal"
       @hide-modal="showSaveRequestModal = false"

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

@@ -197,11 +197,20 @@
       />
     </div>
     <EnvironmentsMyDetails
-      :show="showModalDetails"
+      :show="showMyEnvironmentDetailsModal"
       action="new"
       :env-vars="getAdditionVars"
       @hide-modal="displayModalAdd(false)"
     />
+    <EnvironmentsTeamsDetails
+      :show="showTeamEnvironmentDetailsModal"
+      action="new"
+      :env-vars="getAdditionVars"
+      :editing-team-id="
+        workspace.type === 'team' ? workspace.teamID : undefined
+      "
+      @hide-modal="displayModalAdd(false)"
+    />
   </div>
 </template>
 
@@ -225,6 +234,7 @@ import IconClose from "~icons/lucide/x"
 
 import { useColorMode } from "~/composables/theming"
 import { useVModel } from "@vueuse/core"
+import { workspaceStatus$ } from "~/newstore/workspace"
 
 const props = defineProps<{
   modelValue: HoppTestResult | null | undefined
@@ -239,10 +249,15 @@ const testResults = useVModel(props, "modelValue", emit)
 const t = useI18n()
 const colorMode = useColorMode()
 
-const showModalDetails = ref(false)
+const workspace = useReadonlyStream(workspaceStatus$, { type: "personal" })
+
+const showMyEnvironmentDetailsModal = ref(false)
+const showTeamEnvironmentDetailsModal = ref(false)
 
 const displayModalAdd = (shouldDisplay: boolean) => {
-  showModalDetails.value = shouldDisplay
+  if (workspace.value.type === "personal")
+    showMyEnvironmentDetailsModal.value = shouldDisplay
+  else showTeamEnvironmentDetailsModal.value = shouldDisplay
 }
 
 /**

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

@@ -6,14 +6,18 @@ import { isJSONContentType } from "./utils/contenttypes"
  * Handles translations for all the hopp.io REST Shareable URL params
  */
 export function translateExtURLParams(
-  urlParams: Record<string, any>
+  urlParams: Record<string, any>,
+  initialReq?: HoppRESTRequest
 ): HoppRESTRequest {
-  if (urlParams.v) return parseV1ExtURL(urlParams)
-  else return parseV0ExtURL(urlParams)
+  if (urlParams.v) return parseV1ExtURL(urlParams, initialReq)
+  else return parseV0ExtURL(urlParams, initialReq)
 }
 
-function parseV0ExtURL(urlParams: Record<string, any>): HoppRESTRequest {
-  const resolvedReq = getDefaultRESTRequest()
+function parseV0ExtURL(
+  urlParams: Record<string, any>,
+  initialReq?: HoppRESTRequest
+): HoppRESTRequest {
+  const resolvedReq = initialReq ?? getDefaultRESTRequest()
 
   if (urlParams.method && typeof urlParams.method === "string") {
     resolvedReq.method = urlParams.method
@@ -89,8 +93,11 @@ function parseV0ExtURL(urlParams: Record<string, any>): HoppRESTRequest {
   return resolvedReq
 }
 
-function parseV1ExtURL(urlParams: Record<string, any>): HoppRESTRequest {
-  const resolvedReq = getDefaultRESTRequest()
+function parseV1ExtURL(
+  urlParams: Record<string, any>,
+  initialReq?: HoppRESTRequest
+): HoppRESTRequest {
+  const resolvedReq = initialReq ?? getDefaultRESTRequest()
 
   if (urlParams.headers && typeof urlParams.headers === "string") {
     resolvedReq.headers = JSON.parse(urlParams.headers)

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

@@ -0,0 +1,40 @@
+import { distinctUntilChanged, pluck } from "rxjs"
+import DispatchingStore, { defineDispatchers } from "./DispatchingStore"
+
+type SyncState = {
+  isInitialSync: boolean
+  shouldSync: boolean
+}
+
+type CurrentSyncingState = {
+  currentSyncingItem: SyncState
+}
+
+const initialState: CurrentSyncingState = {
+  currentSyncingItem: {
+    isInitialSync: false,
+    shouldSync: false,
+  },
+}
+
+const dispatchers = defineDispatchers({
+  changeCurrentSyncStatus(_, { syncItem }: { syncItem: SyncState }) {
+    return {
+      currentSyncingItem: syncItem,
+    }
+  },
+})
+
+export const currentSyncStore = new DispatchingStore(initialState, dispatchers)
+
+export const currentSyncingStatus$ = currentSyncStore.subject$.pipe(
+  pluck("currentSyncingItem"),
+  distinctUntilChanged()
+)
+
+export function changeCurrentSyncStatus(syncItem: SyncState) {
+  currentSyncStore.dispatch({
+    dispatcher: "changeCurrentSyncStatus",
+    payload: { syncItem },
+  })
+}

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

@@ -56,6 +56,9 @@
               @update:model-value="onTabUpdate"
             />
           </HoppSmartWindow>
+          <template #actions>
+            <EnvironmentsSelector class="h-full" />
+          </template>
         </HoppSmartWindows>
       </template>
       <template #sidebar>
@@ -63,8 +66,8 @@
       </template>
     </AppPaneLayout>
     <CollectionsEditRequest
-      :show="showRenamingReqNameModal"
       v-model="reqName"
+      :show="showRenamingReqNameModal"
       @submit="renameReqName"
       @hide-modal="showRenamingReqNameModal = false"
     />
@@ -76,15 +79,16 @@
       @resolve="onResolveConfirmSaveTab"
     />
     <CollectionsSaveRequest
+      v-if="savingRequest"
+      mode="rest"
       :show="savingRequest"
-      :mode="'rest'"
       @hide-modal="onSaveModalClose"
     />
   </div>
 </template>
 
 <script lang="ts" setup>
-import { ref, onMounted, onBeforeUnmount, watch, onBeforeMount } from "vue"
+import { ref, onMounted, onBeforeUnmount, onBeforeMount } from "vue"
 import { safelyExtractRESTRequest } from "@hoppscotch/data"
 import { translateExtURLParams } from "~/helpers/RESTExtURLParams"
 import { useRoute } from "vue-router"
@@ -120,6 +124,11 @@ import { useToast } from "~/composables/toast"
 import { PersistableRESTTabState } from "~/helpers/rest/tab"
 import { watchDebounced } from "@vueuse/core"
 import { oauthRedirect } from "~/helpers/oauth"
+import { useReadonlyStream } from "~/composables/stream"
+import {
+  changeCurrentSyncStatus,
+  currentSyncingStatus$,
+} from "~/newstore/syncing"
 
 const savingRequest = ref(false)
 const confirmingCloseForTabID = ref<string | null>(null)
@@ -131,7 +140,10 @@ const toast = useToast()
 
 const tabs = getActiveTabs()
 
-const confirmSync = ref(false)
+const confirmSync = useReadonlyStream(currentSyncingStatus$, {
+  isInitialSync: false,
+  shouldSync: true,
+})
 const tabStateForSync = ref<PersistableRESTTabState | null>(null)
 
 function bindRequestToURLParams() {
@@ -142,8 +154,11 @@ function bindRequestToURLParams() {
     // If query params are empty, or contains code or error param (these are from Oauth Redirect)
     // We skip URL params parsing
     if (Object.keys(query).length === 0 || query.code || query.error) return
+
+    const request = currentActiveTab.value.document.request
+
     currentActiveTab.value.document.request = safelyExtractRESTRequest(
-      translateExtURLParams(query),
+      translateExtURLParams(query, request),
       getDefaultRESTRequest()
     )
   })
@@ -226,29 +241,6 @@ const onSaveModalClose = () => {
   }
 }
 
-watch(confirmSync, (newValue) => {
-  if (newValue) {
-    toast.show(t("confirm.sync"), {
-      duration: 0,
-      action: [
-        {
-          text: `${t("action.yes")}`,
-          onClick: (_, toastObject) => {
-            syncTabState()
-            toastObject.goAway(0)
-          },
-        },
-        {
-          text: `${t("action.no")}`,
-          onClick: (_, toastObject) => {
-            toastObject.goAway(0)
-          },
-        },
-      ],
-    })
-  }
-})
-
 const syncTabState = () => {
   if (tabStateForSync.value) loadTabsFromPersistedState(tabStateForSync.value)
 }
@@ -287,6 +279,35 @@ function startTabStateSync(): Subscription {
   return sub
 }
 
+const showSyncToast = () => {
+  toast.show(t("confirm.sync"), {
+    duration: 0,
+    action: [
+      {
+        text: `${t("action.yes")}`,
+        onClick: (_, toastObject) => {
+          syncTabState()
+          changeCurrentSyncStatus({
+            isInitialSync: true,
+            shouldSync: true,
+          })
+          toastObject.goAway(0)
+        },
+      },
+      {
+        text: `${t("action.no")}`,
+        onClick: (_, toastObject) => {
+          changeCurrentSyncStatus({
+            isInitialSync: true,
+            shouldSync: false,
+          })
+          toastObject.goAway(0)
+        },
+      },
+    ],
+  })
+}
+
 function setupTabStateSync() {
   const route = useRoute()
 
@@ -302,9 +323,15 @@ function setupTabStateSync() {
       const tabStateFromSync =
         await platform.sync.tabState.loadTabStateFromSync()
 
-      if (tabStateFromSync) {
+      if (tabStateFromSync && !confirmSync.value.isInitialSync) {
         tabStateForSync.value = tabStateFromSync
-        confirmSync.value = true
+        showSyncToast()
+        // Have to set isInitialSync to true here because the toast is shown
+        // and the user does not click on any of the actions
+        changeCurrentSyncStatus({
+          isInitialSync: true,
+          shouldSync: false,
+        })
       }
     }
 

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

@@ -11,6 +11,14 @@
       <p class="mt-2 text-center">
         {{ t("error.invalid_link_description") }}
       </p>
+      <p class="mt-4">
+        <HoppButtonSecondary
+          to="/"
+          :icon="IconHome"
+          filled
+          :label="t('app.home')"
+        />
+      </p>
     </div>
     <div v-else class="flex flex-col items-center justify-center flex-1 p-4">
       <div
@@ -107,6 +115,11 @@ const addRequestToTab = () => {
   const data = shortcodeDetails.data
 
   if (E.isRight(data)) {
+    if (!data.right.shortcode?.request) {
+      invalidLink.value = true
+      return
+    }
+
     const request: unknown = JSON.parse(data.right.shortcode?.request as string)
 
     createNewTab({

packages/hoppscotch-selfhost-web/package.json

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

packages/hoppscotch-sh-admin/package.json

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

packages/hoppscotch-ui/src/components/smart/Windows.vue

@@ -100,7 +100,9 @@
         </div>
       </div>
 
-      <slot name="actions" />
+      <div v-if="hasActions" :class="mdAndLarger ? 'w-64' : 'w-16'">
+        <slot name="actions" />
+      </div>
 
       <input
         type="range"
@@ -111,10 +113,12 @@
         :class="{
           '!block': scrollThumb.show,
         }"
-        :style="{
-          '--thumb-width': scrollThumb.width + 'px',
-        }"
-        style="width: calc(100% - 3rem)"
+        :style="[
+          `--thumb-width: ${scrollThumb.width}px`,
+          `width: calc(100% - ${
+            hasActions ? (mdAndLarger ? '19rem' : '7rem') : '3rem'
+          })`,
+        ]"
         id="myRange"
       />
     </div>
@@ -140,8 +144,13 @@ import {
   inject,
   watch,
   nextTick,
+  useSlots,
 } from "vue"
-import { useElementSize } from "@vueuse/core"
+import {
+  breakpointsTailwind,
+  useBreakpoints,
+  useElementSize,
+} from "@vueuse/core"
 import type { Slot } from "vue"
 import draggable from "vuedraggable-es"
 import { HoppUIPluginOptions, HOPP_UI_OPTIONS } from "./../../index"
@@ -164,6 +173,9 @@ export type TabProvider = {
   removeTabEntry: (tabID: string) => void
 }
 
+const breakpoints = useBreakpoints(breakpointsTailwind)
+const mdAndLarger = breakpoints.greater("md")
+
 const { t } = inject<HoppUIPluginOptions>(HOPP_UI_OPTIONS) ?? {}
 
 const props = withDefaults(
@@ -191,6 +203,12 @@ const emit = defineEmits<{
   (e: "addTab"): void
 }>()
 
+const slots = useSlots()
+
+const hasActions = computed(() => {
+  return !!slots.actions
+})
+
 const throwError = (message: string): never => {
   throw new Error(message)
 }
@@ -338,8 +356,8 @@ watch(
         rootMargin: "0px",
         threshold: 1.0,
       })
-      observer.observe(element!)
 
+      if (element) observer.observe(element)
       element?.scrollIntoView({ behavior: "smooth", inline: "center" })
     })
   },