diff --git a/.github/workflows/analyse.yml b/.github/workflows/analyse.yml new file mode 100644 index 00000000..cc4fc68c --- /dev/null +++ b/.github/workflows/analyse.yml @@ -0,0 +1,38 @@ +name: Build + +on: [push, pull_request] + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - name: Checkout code + uses: actions/checkout@v3 + + - name: Setup Java + uses: actions/setup-java@v3 + with: + distribution: 'zulu' + java-version: 11 + + - name: Cache local Maven repository + uses: actions/cache@v3 + with: + path: ~/.m2/repository + key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} + restore-keys: | + ${{ runner.os }}-maven- + + - name: Cache SonarCloud packages + uses: actions/cache@v3 + with: + path: ~/.sonar/cache + key: ${{ runner.os }}-sonar + restore-keys: ${{ runner.os }}-sonar + + - name: Build and analyze + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} + run: mvn -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar diff --git a/CHANGELOG.md b/CHANGELOG.md index a54397f5..169f6ed4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Add distribute method using Sling Content Distribution: [#39](https://github.com/orbinson/aem-groovy-console/issues/39) +### Fixed + +- Only insert service when searching after pressing enter when using arrow keys: [#43](https://github.com/orbinson/aem-groovy-console/issues/43) + ## [19.0.3] - 2023-02-21 ### Fixed diff --git a/README.md b/README.md index 4ed3f0f1..9a3370bb 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ project [aem-groovy-console](https://github.com/CID15/aem-groovy-console) ### Manual 1. Download the - console [aem-groovy-console-all](https://github.com/orbinson/aem-groovy-console/releases/download/18.0.0/aem-groovy-console-all-18.0.0.zip) + console [aem-groovy-console-all](https://github.com/orbinson/aem-groovy-console/releases/download/19.0.3/aem-groovy-console-all-19.0.3.zip) content package and install with [PackMgr](http://localhost:4502/crx/packmgr). For previous versions you can search on the [Maven Central repository](https://search.maven.org/search?q=a:aem-groovy-console). @@ -64,7 +64,7 @@ To deploy the Groovy Console as an embedded package you need to update your `pom be.orbinson.aem aem-groovy-console-all - 18.0.0 + 19.0.3 zip ``` diff --git a/all/pom.xml b/all/pom.xml index e9a78e0e..45ddcaa7 100644 --- a/all/pom.xml +++ b/all/pom.xml @@ -32,7 +32,7 @@ filevault-package-maven-plugin true - ${package.group} + ${project.artifactId} container all diff --git a/docs/assets/screenshot.png b/docs/assets/screenshot.png index dad9486e..afc1a44c 100644 Binary files a/docs/assets/screenshot.png and b/docs/assets/screenshot.png differ diff --git a/pom.xml b/pom.xml index fdc2de63..0139ca15 100644 --- a/pom.xml +++ b/pom.xml @@ -95,7 +95,12 @@ 6.5.10 4.0.9 - aem-groovy-console + + orbinson + ${sonar.organization}_${project.artifactId} + https://sonarcloud.io + + admin diff --git a/ui.apps.aem/pom.xml b/ui.apps.aem/pom.xml index 74e2b56c..79c92752 100644 --- a/ui.apps.aem/pom.xml +++ b/ui.apps.aem/pom.xml @@ -20,7 +20,7 @@ filevault-package-maven-plugin true - ${package.group} + ${project.artifactId} aem-groovy-console-ui.apps.aem application merge diff --git a/ui.apps/pom.xml b/ui.apps/pom.xml index 91de50b2..f1120bfb 100644 --- a/ui.apps/pom.xml +++ b/ui.apps/pom.xml @@ -20,7 +20,7 @@ filevault-package-maven-plugin true - ${package.group} + ${project.artifactId} aem-groovy-console-ui.apps application merge diff --git a/ui.apps/src/main/content/jcr_root/apps/groovyconsole/clientlibs/js/services.js b/ui.apps/src/main/content/jcr_root/apps/groovyconsole/clientlibs/js/services.js index 8b37446a..71e4b062 100644 --- a/ui.apps/src/main/content/jcr_root/apps/groovyconsole/clientlibs/js/services.js +++ b/ui.apps/src/main/content/jcr_root/apps/groovyconsole/clientlibs/js/services.js @@ -7,11 +7,11 @@ $(function () { scriptEditor.navigateFileEnd(); - if (scriptEditor.getCursorPosition().column > 0 ) { + if (scriptEditor.getCursorPosition().column > 0) { scriptEditor.insert('\n\n'); } - if((event.keyCode === 13 || event.which === 13)) { + if ((event.keyCode === 13 || event.which === 13)) { scriptEditor.insert(declaration); } return ''; diff --git a/ui.content/pom.xml b/ui.content/pom.xml index 8ff5ab26..6ddd8c69 100644 --- a/ui.content/pom.xml +++ b/ui.content/pom.xml @@ -20,7 +20,7 @@ filevault-package-maven-plugin true - ${package.group} + ${project.artifactId} aem-groovy-console-ui.content content merge