Skip to content

Commit

Permalink
fix: shortcode resolution screen is stuck on invalid shortcodes (hopp…
Browse files Browse the repository at this point in the history
…scotch#3142)

Co-authored-by: Andrew Bastin <[email protected]>
  • Loading branch information
nivedin and AndrewBastin authored Jun 19, 2023
1 parent 84b0c30 commit 24894e0
Show file tree
Hide file tree
Showing 2 changed files with 55 additions and 0 deletions.
42 changes: 42 additions & 0 deletions .github/workflows/ui.yml
Original file line number Diff line number Diff line change
@@ -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 }}
13 changes: 13 additions & 0 deletions packages/hoppscotch-common/src/pages/r/_id.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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({
Expand Down

0 comments on commit 24894e0

Please sign in to comment.