diff --git a/.github/workflows/demo-build.yml b/.github/workflows/demo-build.yml index cd46f8f2fb8..cc40a89581d 100644 --- a/.github/workflows/demo-build.yml +++ b/.github/workflows/demo-build.yml @@ -115,7 +115,7 @@ jobs: with: name: 'tsbadge' icon: typescript - label: 'TS Errors' + label: 'Errors' status: ${{ steps.pr-checks.outputs.ts-errors }} color: blue github_token: ${{ secrets.GITHUB_TOKEN }} @@ -126,7 +126,7 @@ jobs: with: name: 'lintbadge' icon: codecov - label: 'Lint' + label: 'Status' status: 'Errors: ${{ steps.pr-checks.outputs.lint-errors }}, Warnings: ${{ steps.pr-checks.outputs.lint-warnings }}' color: purple github_token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/demo-pr-links.yml b/.github/workflows/demo-pr-links.yml index 8e780632a3c..728d70f3e7c 100644 --- a/.github/workflows/demo-pr-links.yml +++ b/.github/workflows/demo-pr-links.yml @@ -24,4 +24,4 @@ jobs: Catalogue: https://${{github.event.pull_request.head.repo.owner.login}}.github.io/ramp4-pcar4/${{github.head_ref}}/demos/index-all.html Samples: https://${{github.event.pull_request.head.repo.owner.login}}.github.io/ramp4-pcar4/${{github.head_ref}}/demos/index-samples.html - ![](https://byob.yarr.is/ramp4-pcar4/ramp4-pcar4/tsbadge-${{github.head_ref}}) ![](https://byob.yarr.is/ramp4-pcar4/ramp4-pcar4/lintbadge-${{github.head_ref}}) + ![](https://byob.yarr.is/ramp4-pcar4/ramp4-pcar4/tsbadge-${{ github.event.pull_request.head.repo.owner.login }}-${{ github.head_ref }}) ![](https://byob.yarr.is/ramp4-pcar4/ramp4-pcar4/lintbadge-${{ github.event.pull_request.head.repo.owner.login }}-${{ github.head_ref }}) diff --git a/.github/workflows/pr-checks.yml b/.github/workflows/pr-checks.yml index 037cac338bf..16612a0bb65 100644 --- a/.github/workflows/pr-checks.yml +++ b/.github/workflows/pr-checks.yml @@ -1,5 +1,5 @@ on: - pull_request: + pull_request_target: types: [opened, synchronize] jobs: @@ -37,9 +37,9 @@ jobs: if: always() uses: RubbaBoy/BYOB@v1.3.0 with: - name: 'tsbadge-${{github.head_ref}}' + name: 'tsbadge-${{ github.event.pull_request.head.repo.owner.login }}-${{ github.head_ref }}' icon: typescript - label: 'TS Errors' + label: 'Errors (PR)' status: ${{ steps.pr-checks.outputs.ts-errors }} color: blue github_token: ${{ secrets.GITHUB_TOKEN }} @@ -48,9 +48,9 @@ jobs: if: always() uses: RubbaBoy/BYOB@v1.3.0 with: - name: 'lintbadge-${{github.head_ref}}' + name: 'lintbadge-${{ github.event.pull_request.head.repo.owner.login }}-${{ github.head_ref }}' icon: codecov - label: 'Lint' + label: 'Status (PR)' status: 'Errors: ${{ steps.pr-checks.outputs.lint-errors }}, Warnings: ${{ steps.pr-checks.outputs.lint-warnings }}' color: purple github_token: ${{ secrets.GITHUB_TOKEN }} diff --git a/demos/enhanced-scripts/000-template.js b/demos/enhanced-scripts/000-template.js index 3de8fdfc723..f304714bd84 100644 --- a/demos/enhanced-scripts/000-template.js +++ b/demos/enhanced-scripts/000-template.js @@ -33,14 +33,18 @@ addLegendLang(legendConfig, langKey) */ -const runPreTest = (config, options, utils) => { +// All available params: +// const runPreTest = (config, options, utils) => { +const runPreTest = (config, options) => { // Do any config setup & options setup here, if any return { config, options }; }; -const runPostTest = (instance, utils) => { - // Do any test steps on the instantiated instnace, if any +// All available params: +// const runPostTest = (instance, utils) => { +const runPostTest = () => { + // Do any test steps on the instantiated instance, if any }; export { runPreTest, runPostTest }; diff --git a/demos/enhanced-scripts/001-happy.js b/demos/enhanced-scripts/001-happy.js index 5bb17001921..5689b4aeafd 100644 --- a/demos/enhanced-scripts/001-happy.js +++ b/demos/enhanced-scripts/001-happy.js @@ -18,7 +18,7 @@ const runPreTest = (config, options, utils) => { return { config, options }; }; -const runPostTest = (instance, utils) => { +const runPostTest = () => { // Not used in this test }; diff --git a/demos/enhanced-scripts/002-simple-empty.js b/demos/enhanced-scripts/002-simple-empty.js index a1968fc5c5b..8731e5ae61c 100644 --- a/demos/enhanced-scripts/002-simple-empty.js +++ b/demos/enhanced-scripts/002-simple-empty.js @@ -3,7 +3,7 @@ Test 02: An empty map. - Just adds legend text to make it look not broken */ -const runPreTest = (config, options, utils) => { +const runPreTest = (config, options) => { config.configs.en.fixtures.legend.root.children.push({ infoType: 'text', content: 'I start with no layers' @@ -17,7 +17,7 @@ const runPreTest = (config, options, utils) => { return { config, options }; }; -const runPostTest = (instance, utils) => { +const runPostTest = () => { // Do any test steps on the instantiated instnace, if any }; diff --git a/demos/enhanced-scripts/003-simple-feature.js b/demos/enhanced-scripts/003-simple-feature.js index 54bc1e5d4db..5931f82cfc1 100644 --- a/demos/enhanced-scripts/003-simple-feature.js +++ b/demos/enhanced-scripts/003-simple-feature.js @@ -22,7 +22,7 @@ const runPreTest = (config, options, utils) => { return { config, options }; }; -const runPostTest = (instance, utils) => { +const runPostTest = () => { // Not used in this test }; diff --git a/demos/enhanced-scripts/004-simple-mil.js b/demos/enhanced-scripts/004-simple-mil.js index 530c3472a88..7eec4a6447c 100644 --- a/demos/enhanced-scripts/004-simple-mil.js +++ b/demos/enhanced-scripts/004-simple-mil.js @@ -25,7 +25,7 @@ const runPreTest = (config, options, utils) => { return { config, options }; }; -const runPostTest = (instance, utils) => { +const runPostTest = () => { // Not used in this test }; diff --git a/demos/enhanced-scripts/005-simple-file.js b/demos/enhanced-scripts/005-simple-file.js index ecb35b7a690..e90889f66a9 100644 --- a/demos/enhanced-scripts/005-simple-file.js +++ b/demos/enhanced-scripts/005-simple-file.js @@ -56,7 +56,7 @@ const runPreTest = (config, options, utils) => { return { config, options }; }; -const runPostTest = (instance, utils) => { +const runPostTest = () => { // Not used in this test }; diff --git a/demos/enhanced-scripts/006-simple-data.js b/demos/enhanced-scripts/006-simple-data.js index 51d432cc43e..a6d75cab539 100644 --- a/demos/enhanced-scripts/006-simple-data.js +++ b/demos/enhanced-scripts/006-simple-data.js @@ -32,7 +32,7 @@ const runPreTest = (config, options, utils) => { return { config, options }; }; -const runPostTest = (instance, utils) => { +const runPostTest = instance => { instance.$element.component('Tasty-Template', { props: ['identifyData'], template: ` diff --git a/demos/enhanced-scripts/007-main-classic.js b/demos/enhanced-scripts/007-main-classic.js index fcc4cfa69f9..a3b7de1ee0f 100644 --- a/demos/enhanced-scripts/007-main-classic.js +++ b/demos/enhanced-scripts/007-main-classic.js @@ -200,7 +200,7 @@ const runPreTest = (config, options, utils) => { return { config, options }; }; -const runPostTest = (instance, utils) => { +const runPostTest = instance => { // template with our friend Rick. instance.$element.component('WFSLayer-Custom', { props: ['identifyData'], diff --git a/demos/enhanced-scripts/008-projection-party.js b/demos/enhanced-scripts/008-projection-party.js index 012059646bd..61fa1f1f7c3 100644 --- a/demos/enhanced-scripts/008-projection-party.js +++ b/demos/enhanced-scripts/008-projection-party.js @@ -71,7 +71,7 @@ const runPreTest = (config, options, utils) => { return { config, options }; }; -const runPostTest = (instance, utils) => { +const runPostTest = () => { // Not used in this test }; diff --git a/demos/enhanced-scripts/009-custom-panels.js b/demos/enhanced-scripts/009-custom-panels.js index a9661715ab7..6bbcff7c6dd 100644 --- a/demos/enhanced-scripts/009-custom-panels.js +++ b/demos/enhanced-scripts/009-custom-panels.js @@ -20,7 +20,7 @@ const runPreTest = (config, options, utils) => { return { config, options }; }; -const runPostTest = (instance, utils) => { +const runPostTest = instance => { instance.fixture.isLoaded('basemap').then(() => { const bm = instance.fixture.get('basemap'); bm.persist = false; diff --git a/demos/enhanced-scripts/010-identify-priority.js b/demos/enhanced-scripts/010-identify-priority.js index d692bf3e958..c16272098a1 100644 --- a/demos/enhanced-scripts/010-identify-priority.js +++ b/demos/enhanced-scripts/010-identify-priority.js @@ -69,7 +69,7 @@ const runPreTest = (config, options, utils) => { return { config, options }; }; -const runPostTest = (instance, utils) => { +const runPostTest = () => { // Nothing for this test }; diff --git a/demos/qa-scripts/001-simple-empty.js b/demos/qa-scripts/001-simple-empty.js index 3cd4cdc9a07..663392d908a 100644 --- a/demos/qa-scripts/001-simple-empty.js +++ b/demos/qa-scripts/001-simple-empty.js @@ -5,7 +5,7 @@ Test 01: An empty map. QA TEST SCRIPT. Don't modify without chatting with QA first. */ -const runPreTest = (config, options, utils) => { +const runPreTest = (config, options) => { config.configs.en.fixtures.legend.root.children.push({ infoType: 'text', content: 'I start with no layers' @@ -19,7 +19,7 @@ const runPreTest = (config, options, utils) => { return { config, options }; }; -const runPostTest = (instance, utils) => { +const runPostTest = () => { // Do any test steps on the instantiated instnace, if any }; diff --git a/demos/qa-scripts/002-custom-renderer.js b/demos/qa-scripts/002-custom-renderer.js index 8dab40fcaf3..7a50f2ea2f2 100644 --- a/demos/qa-scripts/002-custom-renderer.js +++ b/demos/qa-scripts/002-custom-renderer.js @@ -561,7 +561,7 @@ const runPreTest = (config, options, utils) => { return { config, options }; }; -const runPostTest = (instance, utils) => { +const runPostTest = () => { // Not used in this test }; diff --git a/demos/starter-scripts/sample-fixtures/diligord/diligord-fixture.js b/demos/starter-scripts/sample-fixtures/diligord/diligord-fixture.js index c7b1b51bdc3..0a7fe4cf8c0 100644 --- a/demos/starter-scripts/sample-fixtures/diligord/diligord-fixture.js +++ b/demos/starter-scripts/sample-fixtures/diligord/diligord-fixture.js @@ -7,9 +7,6 @@ import { h, markRaw, resolveComponent } from 'vue'; export class DiligordFixture { added() { // `this.id` and `this.$iApi` and `this.$vApp` are automatically made available on this object - this.id; - this.$iApi; - this.$vApp; // Diligord Fixture creates a simple panel with a single screen with two header controls (pin and close), // and increment button and an input field (bound to the panel title) in the content slot diff --git a/demos/starter-scripts/sample-fixtures/funtimes/screen.vue b/demos/starter-scripts/sample-fixtures/funtimes/screen.vue index 6a1c813d6eb..194a1dcafee 100644 --- a/demos/starter-scripts/sample-fixtures/funtimes/screen.vue +++ b/demos/starter-scripts/sample-fixtures/funtimes/screen.vue @@ -2,7 +2,7 @@ @@ -10,7 +10,7 @@