Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Configure Pull Request Preview #1552

Merged
merged 6 commits into from
Jul 10, 2024
Merged

Configure Pull Request Preview #1552

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
65cc6b9
infra: make distribution's location adjustable
Jul 9, 2024
4843124
infra: correct action configs
Jul 9, 2024
2191098
fix: generate plugin path based on distribution's location
Jul 9, 2024
2eb8505
ref: increase readability
Jul 10, 2024
1f4358d
fix: plugin id in tests because of adjustable distribution location
Jul 10, 2024
fbcfa32
ref: remove .only of test
Jul 10, 2024
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
11 changes: 8 additions & 3 deletions .github/workflows/pr-preview.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
name: Deploy PR previews


on:
pull_request:
types:
Expand All @@ -8,9 +9,11 @@ on:
- synchronize
- closed
paths:
- "packages/openscd/**"
- "packages/**"

concurrency: preview-${{ github.ref }}
env:
PR_NUMBER: ${{ github.event.number }}

jobs:
deploy-preview:
Expand All @@ -25,9 +28,11 @@ jobs:
run: |
npm i @nx/nx-linux-x64-gnu
npm clean-install
npm run-script build
PUBLIC_URL=open-scd/pr-preview/pr-$PR_NUMBER npm run-script build

- name: Deploy preview
uses: rossjrw/pr-preview-action@v1
with:
source-dir: packages/openscd/dist
source-dir: packages/distribution/build
umbrella-dir: pr-preview

38 changes: 27 additions & 11 deletions packages/distribution/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,36 @@

<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0, viewport-fit=cover" />
<meta name="viewport"
content="width=device-width, initial-scale=1.0, viewport-fit=cover" />
<meta name="Description"
content="Open Substation Communication Designer is a bottom-up system configuration tool for projects described using IEC 61850-6 Edition 2 or greater.">
content="Open Substation Communication Designer is a bottom-up system configuration tool for projects described using IEC 61850-6 Edition 2 or greater.">
<base href="/">

<!-- Original URL from Google: https://fonts.googleapis.com/css2?family=Roboto+Mono:wght@300&family=Roboto:wght@300;400;500&display=swap -->
<link href="public/google/fonts/roboto-v27.css" rel="stylesheet">
<link href="public/google/fonts/roboto-mono-v13.css" rel="stylesheet">
<link href="%PUBLIC_URL%/public/google/fonts/roboto-v27.css"
rel="stylesheet">
<link href="%PUBLIC_URL%/public/google/fonts/roboto-mono-v13.css"
rel="stylesheet">
<!-- Original URL from Google: https://fonts.googleapis.com/css?family=Material+Icons+Outlined&display=block -->
<link href="public/google/icons/material-icons-outlined.css" rel="stylesheet">
<link href="public/css/normalize.css" rel="stylesheet">
<link rel="manifest" href="manifest.json">
<link rel="icon" type="image/png" sizes="16x16" href="public/favicon-16x16.png">
<link rel="icon" type="image/png" sizes="32x32" href="public/favicon-32x32.png">
<link rel="icon" type="image/png" sizes="192x192" href="public/icon-192x192.png">
<link href="%PUBLIC_URL%/public/google/icons/material-icons-outlined.css"
rel="stylesheet">
<link href="%PUBLIC_URL%/public/css/normalize.css"
rel="stylesheet">
<link rel="manifest"
href="%PUBLIC_URL%/manifest.json">
<link rel="icon"
type="image/png"
sizes="16x16"
href="%PUBLIC_URL%/public/favicon-16x16.png">
<link rel="icon"
type="image/png"
sizes="32x32"
href="%PUBLIC_URL%/public/favicon-32x32.png">
<link rel="icon"
type="image/png"
sizes="192x192"
href="%PUBLIC_URL%/public/icon-192x192.png">

<title>OpenSCD</title>
</head>
Expand All @@ -33,7 +48,8 @@
}
};
</script>
<script type="module" src="./main.js"></script>
<script type="module"
src="%PUBLIC_URL%/main.js"></script>
<script>
if ('serviceWorker' in navigator)
navigator.serviceWorker.register('/sw.js');
Expand Down
3 changes: 3 additions & 0 deletions packages/distribution/snowpack.config.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,7 @@ export default {
'@openscd/open-scd': '../openscd/',
'@openscd/plugins': '../plugins/',
},
buildOptions: {
baseUrl: process.env.PUBLIC_URL || '/',
},
};
60 changes: 30 additions & 30 deletions packages/openscd/src/plugins.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,105 +1,105 @@
export const officialPlugins = [
{
name: 'IED',
src: '/plugins/src/editors/IED.js',
src: location.href+'plugins/src/editors/IED.js',
icon: 'developer_board',
default: true,
kind: 'editor',
},
{
name: 'Substation',
src: '/plugins/src/editors/Substation.js',
src: location.href+'plugins/src/editors/Substation.js',
icon: 'margin',
default: true,
kind: 'editor',
},
{
name: 'Single Line Diagram',
src: '/plugins/src/editors/SingleLineDiagram.js',
src: location.href+'plugins/src/editors/SingleLineDiagram.js',
icon: 'edit',
default: false,
kind: 'editor',
},
{
name: 'Subscriber Message Binding (GOOSE)',
src: '/plugins/src/editors/GooseSubscriberMessageBinding.js',
src: location.href+'plugins/src/editors/GooseSubscriberMessageBinding.js',
icon: 'link',
default: false,
kind: 'editor',
},
{
name: 'Subscriber Data Binding (GOOSE)',
src: '/plugins/src/editors/GooseSubscriberDataBinding.js',
src: location.href+'plugins/src/editors/GooseSubscriberDataBinding.js',
icon: 'link',
default: false,
kind: 'editor',
},
{
name: 'Subscriber Later Binding (GOOSE)',
src: '/plugins/src/editors/GooseSubscriberLaterBinding.js',
src: location.href+'plugins/src/editors/GooseSubscriberLaterBinding.js',
icon: 'link',
default: true,
kind: 'editor',
},
{
name: 'Subscriber Message Binding (SMV)',
src: '/plugins/src/editors/SMVSubscriberMessageBinding.js',
src: location.href+'plugins/src/editors/SMVSubscriberMessageBinding.js',
icon: 'link',
default: false,
kind: 'editor',
},
{
name: 'Subscriber Data Binding (SMV)',
src: '/plugins/src/editors/SMVSubscriberDataBinding.js',
src: location.href+'plugins/src/editors/SMVSubscriberDataBinding.js',
icon: 'link',
default: false,
kind: 'editor',
},
{
name: 'Subscriber Later Binding (SMV)',
src: '/plugins/src/editors/SMVSubscriberLaterBinding.js',
src: location.href+'plugins/src/editors/SMVSubscriberLaterBinding.js',
icon: 'link',
default: true,
kind: 'editor',
},
{
name: 'Communication',
src: '/plugins/src/editors/Communication.js',
src: location.href+'plugins/src/editors/Communication.js',
icon: 'settings_ethernet',
default: true,
kind: 'editor',
},
{
name: '104',
src: '/plugins/src/editors/Protocol104.js',
src: location.href+'plugins/src/editors/Protocol104.js',
icon: 'settings_ethernet',
default: false,
kind: 'editor',
},
{
name: 'Templates',
src: '/plugins/src/editors/Templates.js',
src: location.href+'plugins/src/editors/Templates.js',
icon: 'copy_all',
default: true,
kind: 'editor',
},
{
name: 'Publisher',
src: '/plugins/src/editors/Publisher.js',
src: location.href+'plugins/src/editors/Publisher.js',
icon: 'publish',
default: false,
kind: 'editor',
},
{
name: 'Cleanup',
src: '/plugins/src/editors/Cleanup.js',
src: location.href+'plugins/src/editors/Cleanup.js',
icon: 'cleaning_services',
default: false,
kind: 'editor',
},
{
name: 'Open project',
src: '/plugins/src/menu/OpenProject.js',
src: location.href+'plugins/src/menu/OpenProject.js',
icon: 'folder_open',
default: true,
kind: 'menu',
Expand All @@ -108,7 +108,7 @@ export const officialPlugins = [
},
{
name: 'New project',
src: '/plugins/src/menu/NewProject.js',
src: location.href+'plugins/src/menu/NewProject.js',
icon: 'create_new_folder',
default: true,
kind: 'menu',
Expand All @@ -117,7 +117,7 @@ export const officialPlugins = [
},
{
name: 'Save project',
src: '/plugins/src/menu/SaveProject.js',
src: location.href+'plugins/src/menu/SaveProject.js',
icon: 'save',
default: true,
kind: 'menu',
Expand All @@ -126,21 +126,21 @@ export const officialPlugins = [
},
{
name: 'Validate Schema',
src: '/plugins/src/validators/ValidateSchema.js',
src: location.href+'plugins/src/validators/ValidateSchema.js',
icon: 'rule_folder',
default: true,
kind: 'validator',
},
{
name: 'Validate Templates',
src: '/plugins/src/validators/ValidateTemplates.js',
src: location.href+'plugins/src/validators/ValidateTemplates.js',
icon: 'rule_folder',
default: true,
kind: 'validator',
},
{
name: 'Import IEDs',
src: '/plugins/src/menu/ImportIEDs.js',
src: location.href+'plugins/src/menu/ImportIEDs.js',
icon: 'snippet_folder',
default: true,
kind: 'menu',
Expand All @@ -149,7 +149,7 @@ export const officialPlugins = [
},
{
name: 'Create Virtual IED',
src: '/plugins/src/menu/VirtualTemplateIED.js',
src: location.href+'plugins/src/menu/VirtualTemplateIED.js',
icon: 'developer_board',
default: false,
kind: 'menu',
Expand All @@ -158,31 +158,31 @@ export const officialPlugins = [
},
{
name: 'Subscriber Update',
src: '/plugins/src/menu/SubscriberInfo.js',
src: location.href+'plugins/src/menu/SubscriberInfo.js',
default: true,
kind: 'menu',
requireDoc: true,
position: 'middle',
},
{
name: 'Update desc (ABB)',
src: '/plugins/src/menu/UpdateDescriptionABB.js',
src: location.href+'plugins/src/menu/UpdateDescriptionABB.js',
default: false,
kind: 'menu',
requireDoc: true,
position: 'middle',
},
{
name: 'Update desc (SEL)',
src: '/plugins/src/menu/UpdateDescriptionSEL.js',
src: location.href+'plugins/src/menu/UpdateDescriptionSEL.js',
default: false,
kind: 'menu',
requireDoc: true,
position: 'middle',
},
{
name: 'Merge Project',
src: '/plugins/src/menu/Merge.js',
src: location.href+'plugins/src/menu/Merge.js',
icon: 'merge_type',
default: true,
kind: 'menu',
Expand All @@ -191,7 +191,7 @@ export const officialPlugins = [
},
{
name: 'Update Substation',
src: '/plugins/src/menu/UpdateSubstation.js',
src: location.href+'plugins/src/menu/UpdateSubstation.js',
icon: 'merge_type',
default: true,
kind: 'menu',
Expand All @@ -200,7 +200,7 @@ export const officialPlugins = [
},
{
name: 'Compare IED',
src: '/plugins/src/menu/CompareIED.js',
src: location.href+'plugins/src/menu/CompareIED.js',
icon: 'compare_arrows',
default: true,
kind: 'menu',
Expand All @@ -209,7 +209,7 @@ export const officialPlugins = [
},
{
name: 'Show SCL History',
src: '/plugins/src/menu/SclHistory.js',
src: location.href+'plugins/src/menu/SclHistory.js',
icon: 'history_toggle_off',
default: true,
kind: 'menu',
Expand All @@ -218,7 +218,7 @@ export const officialPlugins = [
},
{
name: 'Help',
src: '/plugins/src/menu/Help.js',
src: location.href+'plugins/src/menu/Help.js',
icon: 'help',
default: true,
kind: 'menu',
Expand All @@ -227,7 +227,7 @@ export const officialPlugins = [
},
{
name: 'Export Communication Section',
src: '/plugins/src/menu/ExportCommunication.js',
src: location.href+'plugins/src/menu/ExportCommunication.js',
icon: 'sim_card_download',
default: false,
kind: 'menu',
Expand Down
Loading