Skip to content

Open-Source API Development Ecosystem • https://hoppscotch.io • Offline, On-Prem & Cloud • Web, Desktop & CLI • Open-Source Alternative to Postman, Insomnia

fix: shortcode resolution screen is stuck on invalid shortcodes (#3142)

Nivedin24894e05dcf6
diff --git a/.github/workflows/ui.yml b/.github/workflows/ui.yml
new file mode 100644
index 000000000..cc82cd954
--- /dev/null
+++ b/.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/[email protected]
+ 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 }}
diff --git a/packages/hoppscotch-common/src/pages/r/_id.vue b/packages/hoppscotch-common/src/pages/r/_id.vue
index 64b917981..70155ce0b 100644
--- a/packages/hoppscotch-common/src/pages/r/_id.vue
+++ b/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({