Merge pull request #45 from orbinson/update-changelog-and-format-files

.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

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 <kbd>enter</kbd> when using arrow keys: [#43](https://github.com/orbinson/aem-groovy-console/issues/43)
+
 ## [19.0.3] - 2023-02-21
 
 ### Fixed

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
    <dependency>
      <groupId>be.orbinson.aem</groupId>
      <artifactId>aem-groovy-console-all</artifactId>
-     <version>18.0.0</version>
+     <version>19.0.3</version>
      <type>zip</type>
    </dependency>
    ```

all/pom.xml

@@ -32,7 +32,7 @@
                 <artifactId>filevault-package-maven-plugin</artifactId>
                 <extensions>true</extensions>
                 <configuration>
-                    <group>${package.group}</group>
+                    <group>${project.artifactId}</group>
                     <packageType>container</packageType>
                     <properties>
                         <cloudManagerTarget>all</cloudManagerTarget>

pom.xml

@@ -95,7 +95,12 @@
         <aem.version>6.5.10</aem.version>
         <groovy.version>4.0.9</groovy.version>
 
-        <package.group>aem-groovy-console</package.group>
+        <!-- SonarCloud -->
+        <sonar.organization>orbinson</sonar.organization>
+        <sonar.projectKey>${sonar.organization}_${project.artifactId}</sonar.projectKey>
+        <sonar.host.url>https://sonarcloud.io</sonar.host.url>
+
+        <!-- AEM -->
         <vault.password>admin</vault.password>
     </properties>
 

ui.apps.aem/pom.xml

@@ -20,7 +20,7 @@
                 <artifactId>filevault-package-maven-plugin</artifactId>
                 <extensions>true</extensions>
                 <configuration>
-                    <group>${package.group}</group>
+                    <group>${project.artifactId}</group>
                     <name>aem-groovy-console-ui.apps.aem</name>
                     <packageType>application</packageType>
                     <accessControlHandling>merge</accessControlHandling>

ui.apps/pom.xml

@@ -20,7 +20,7 @@
                 <artifactId>filevault-package-maven-plugin</artifactId>
                 <extensions>true</extensions>
                 <configuration>
-                    <group>${package.group}</group>
+                    <group>${project.artifactId}</group>
                     <name>aem-groovy-console-ui.apps</name>
                     <packageType>application</packageType>
                     <accessControlHandling>merge</accessControlHandling>

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 '';

ui.content/pom.xml

@@ -20,7 +20,7 @@
                 <artifactId>filevault-package-maven-plugin</artifactId>
                 <extensions>true</extensions>
                 <configuration>
-                    <group>${package.group}</group>
+                    <group>${project.artifactId}</group>
                     <name>aem-groovy-console-ui.content</name>
                     <packageType>content</packageType>
                     <accessControlHandling>merge</accessControlHandling>