Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 0 additions & 61 deletions .babelrc.json

This file was deleted.

11 changes: 4 additions & 7 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"features": {
"ghcr.io/devcontainers/features/node:1": {
"version": "lts",
"pnpm": "latest"
"pnpmVersion": "latest"
}
},
"customizations": {
Expand All @@ -14,16 +14,13 @@
"editor.tabSize": 2
},
"extensions": [
"dbaeumer.vscode-eslint"
"denoland.vscode-deno"
]
}
},
"mounts": [
"source=${localEnv:HOME}/.gitconfig,target=/home/node/.gitconfig,type=bind,consistency=cached",
"source=${localEnv:HOME}/.ssh,target=/home/node/.ssh,type=bind,consistency=cached"
],
"postCreateCommand": "pnpm install",
"containerEnv": {
"npm_config_store_dir": "/home/node/.local/share/pnpm/store"
}
}
"onCreateCommand": "curl -fsSL https://deno.land/x/install/install.sh | sh -s -- --yes && . \"/home/node/.deno/env\""
}
8 changes: 0 additions & 8 deletions .eslintignore

This file was deleted.

22 changes: 0 additions & 22 deletions .eslintrc.js

This file was deleted.

46 changes: 18 additions & 28 deletions .github/workflows/subworkflow-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,74 +66,64 @@ jobs:
- name: Export Version Tag
id: version_tag
run: |
tag=$(git tag --merged HEAD --sort=-version:refname -l "[0-9]*.[0-9]*.[0-9]*" -l "v[0-9]*.[0-9]*.[0-9]*" | head -n 1);
tag=$(git tag --merged HEAD --sort=-version:refname -l "[0-9]*.[0-9]*.[0-9]*" -l "v[0-9]*.[0-9]*.[0-9]*" | head -n 1);
echo version=$([ -z "$tag" ] && echo "0.0.0" || echo "${tag#v}") >> $GITHUB_OUTPUT;

- name: Lint, Test, Build, and Tag
id: package
uses: devcontainers/ci@8bf61b26e9c3a98f69cb6ce2f88d24ff59b785c6 #v0.3
env:
LABELS: "${{ steps.extract_labels.outputs.labels }}"
VERSION: "${{ steps.version_tag.outputs.version }}"
PUSH_TAG: "${{ inputs.push-tag }}"
RUN_LINT: "${{ inputs.run-lint }}"
RUN_TESTS: "${{ inputs.run-tests }}"
SENTRY_AUTH_TOKEN: "${{ secrets.SENTRY_AUTH_TOKEN }}"
SENTRY_ORG: "${{ secrets.SENTRY_ORG }}"
SENTRY_PROJECT: "${{ secrets.SENTRY_PROJECT }}"
with:
env: |
LABELS
VERSION
PUSH_TAG
RUN_LINT
RUN_TESTS
SENTRY_AUTH_TOKEN
SENTRY_ORG
SENTRY_PROJECT
runCmd: |
set -e

# Lint
if [ "$RUN_LINT" = true ]; then
pnpm run lint
pnpm tsc --noemit
deno fmt --check
deno lint
deno check --doc-only *.md
fi

# Test
if [ "$RUN_TESTS" = true ]; then
pnpm test:coverage
deno task test
fi

# Tag
MILESTONE=$(echo "$LABELS" | grep -E 'major-version|minor-version' | head -1)
VERSION_NEW=$(pnpm run bumpManifestVer "$MILESTONE" "$VERSION" | tail -n 1)
pnpm prettier --write manifest.json
git tag -a $VERSION_NEW -m "Version $VERSION_NEW"

# Build
if [ "$PUSH_TAG" != "true" ]; then
## Disable Sentry Release if not pushing
export SENTRY_DISABLED="true"
MILESTONE=$(echo "$LABELS" | grep -E 'major-version|minor-version' | head -1)
if [ -z "$MILESTONE" ]; then
MILESTONE="patch-version"
fi
pnpm run build
DENO_MILESTONE=$(echo "$MILESTONE" | sed 's/-version//g')
VERSION_NEW=$(pnpm dlx semver@7.5.4 $VERSION --increment $DENO_MILESTONE | tail -n 1)
jq --arg version "$VERSION_NEW" '.version = $version' manifest.json > manifest.json.tmp && mv manifest.json.tmp manifest.json
deno task build

echo "New version: $VERSION_NEW"
git tag -a $VERSION_NEW -m "Version $VERSION_NEW"

# Push
if [ "$PUSH_TAG" = "true" ]; then
## Push the tag for git
git push origin $VERSION_NEW
fi

- name: Package app zip
working-directory: dist
run: |
cp ../manifest.json .
rm **/*.js.map || echo "No source maps to remove"
zip -rq ../app.zip *

- name: Upload package
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
with:
name: app-package
path: |
app.zip
manifest.json
retention-days: 7
retention-days: 7
2 changes: 1 addition & 1 deletion .github/workflows/subworkflow-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -83,4 +83,4 @@ jobs:
-H "Content-Type: application/json" \
-H "x-api-key: ${{ secrets.APP_REGISTRY_KEY }}" \
-d '{"repositoryUrl": "'${{ inputs.server_url }}/${{ inputs.repository }}'"}' \
https://apps.deskpro-service.com/release
https://apps.deskpro-service.com/release
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,10 @@ dist
build
dist-ssr
*.local
.vite
/coverage
.pnpm-store
app.zip

# Sentry Config File
.env.sentry-build-plugin
2 changes: 0 additions & 2 deletions .npmrc

This file was deleted.

4 changes: 2 additions & 2 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
"type": "node",
"request": "launch",
"name": "Launch Server",
"runtimeExecutable": "pnpm",
"runtimeExecutable": "deno",
"runtimeArgs": ["start"],
"skipFiles": ["<node_internals>/**"],
"console": "integratedTerminal"
}
]
}
}
6 changes: 3 additions & 3 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"tasks": [
{
"type": "shell",
"command": "pnpm build:package",
"command": "deno task build",
"group": {
"kind": "build",
"isDefault": true
Expand All @@ -13,7 +13,7 @@
},
{
"type": "shell",
"command": "pnpm test",
"command": "deno task test",
"group": {
"kind": "test",
"isDefault": true
Expand All @@ -22,4 +22,4 @@
"label": "pnpm: test"
}
]
}
}
12 changes: 8 additions & 4 deletions DESCRIPTION.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
# IFrame

Embed an IFrame in the global and ticket component so you can display any website or web app.
Embed an IFrame in the global and ticket component so you can display any
website or web app.

With our App, you can easily embed external content into the deskpro website, streamlining your user's browsing experience.
With our App, you can easily embed external content into the deskpro website,
streamlining your user's browsing experience.

Whether you're looking to display a map, a video, or any other web page, our IFrame App has got you covered.
Whether you're looking to display a map, a video, or any other web page, our
IFrame App has got you covered.

_Some URLs do not support being accessed via an iframe, so when you get the error "website refused to connect", it means it can't be loaded in an iframe._
_Some URLs do not support being accessed via an iframe, so when you get the
error "website refused to connect", it means it can't be loaded in an iframe._
25 changes: 12 additions & 13 deletions LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,21 +1,20 @@
MIT License

Copyright (c) 2024 Deskpro
Copyright (c) 2025 Deskpro

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
the Software without restriction, including without limitation the rights to
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
the Software, and to permit persons to whom the Software is furnished to do so,
subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
Loading
Loading