Merge branch 'master' into issue-27393-edit-content-expose-editableAs…

…Text-even-if-not-present

.github/workflows/maven-release-process.yml

@@ -18,6 +18,11 @@ on:
         type: boolean
         default: false
         required: false
+      update_plugins:
+        description: 'Update Plugins'
+        type: boolean
+        default: false
+        required: false
 env:
   JAVA_VERSION: 11
   JAVA_DISTRO: temurin
@@ -81,6 +86,36 @@ jobs:
           echo "is_lts=${is_lts}" >> $GITHUB_OUTPUT
           echo "date=$(/bin/date -u "+%Y-%m")" >> $GITHUB_OUTPUT
 
+      - name: Set Release Version
+        id: set-release-version
+        run: |
+          release_version=${{ steps.set-common-vars.outputs.release_version }}
+          release_branch=${{ steps.set-common-vars.outputs.release_branch }}
+          
+          git reset --hard ${{ steps.set-common-vars.outputs.release_commit }}
+          
+          ./mvnw -ntp \
+            ${JVM_TEST_MAVEN_OPTS} \
+            versions:set \
+            versions:commit \
+            -DnewVersion=${release_version} \
+            -DprocessAllModules=true
+          
+          ./mvnw -ntp \
+            ${JVM_TEST_MAVEN_OPTS} \
+            versions:set-property \
+            versions:commit \
+            -Dproperty=tika.api.version \
+            -DnewVersion=${release_version} \
+            --file independent-projects/pom.xml
+          
+          git status
+          git commit -a -m "🏁 Publishing release version [${release_version}]"
+          git push https://${{ secrets.CI_MACHINE_USER }}:${{ secrets.CI_MACHINE_TOKEN }}@github.com/${GITHUB_REPOSITORY}
+          
+          release_commit=$(git log -1 --pretty=%H)
+          echo "release_commit=${release_commit}" >> $GITHUB_OUTPUT
+
       - name: Create Release Tag
         run: |
           release_tag=${{ steps.set-common-vars.outputs.release_tag }}
@@ -104,7 +139,6 @@ jobs:
             fi
           fi
 
-          git reset --hard ${{ steps.set-common-vars.outputs.release_commit }}
           if [[ "${release_branch}" != 'master' && ${is_lts_trunk} == 'false' ]]; then
             git checkout -b ${release_branch}
             git push origin ${release_branch}
@@ -116,34 +150,6 @@ jobs:
           java-version: ${{ env.JAVA_VERSION }}
           distribution: ${{ env.JAVA_DISTRO }}
 
-      - name: Set Release Version
-        id: set-release-version
-        run: |
-          release_version=${{ steps.set-common-vars.outputs.release_version }}
-          release_branch=${{ steps.set-common-vars.outputs.release_branch }}
-          
-          ./mvnw -ntp \
-            ${JVM_TEST_MAVEN_OPTS} \
-            versions:set \
-            versions:commit \
-            -DnewVersion=${release_version} \
-            -DprocessAllModules=true
-          
-          ./mvnw -ntp \
-            ${JVM_TEST_MAVEN_OPTS} \
-            versions:set-property \
-            versions:commit \
-            -Dproperty=tika.api.version \
-            -DnewVersion=${release_version} \
-            --file independent-projects/pom.xml
-          
-          git status
-          git commit -a -m "🏁 Publishing release version [${release_version}]"
-          git push https://${{ secrets.CI_MACHINE_USER }}:${{ secrets.CI_MACHINE_TOKEN }}@github.com/${GITHUB_REPOSITORY}
-          
-          release_commit=$(git log -1 --pretty=%H)
-          echo "release_commit=${release_commit}" >> $GITHUB_OUTPUT
-
       - name: Build Core
         run: |
           mkdir -p ${DOCKER_BUILD_CONTEXT}
@@ -289,8 +295,8 @@ jobs:
       - name: maven-settings-xml-action
         uses: whelk-io/maven-settings-xml-action@v20
         with:
-          repositories: '[{ "id": "dotcms-libs-local", "name": "DotCMS libs Release", "url": "https://repo.dotcms.com/artifactory/libs-release" }]'
-          servers: '[{ "id": "dotcms-libs-local", "username": "${{ secrets.EE_REPO_USERNAME }}", "password": "${{ secrets.EE_REPO_PASSWORD }}" }]'
+          repositories: '[{ "id": "dotcms-libs", "name": "DotCMS libs Release", "url": "https://repo.dotcms.com/artifactory/libs-release" }]'
+          servers: '[{ "id": "dotcms-libs", "username": "${{ secrets.EE_REPO_USERNAME }}", "password": "${{ secrets.EE_REPO_PASSWORD }}" }]'
 
       - name: Configure AWS Credentials
         uses: aws-actions/configure-aws-credentials@v1
@@ -309,19 +315,6 @@ jobs:
             deploy \
             --file dotCMS/pom.xml
 
-      - name: Push Distro
-        run: |
-          target_dir=./dotCMS/target
-          distro_file=dotcms_${{ needs.prepare-release.outputs.release_version }}.zip
-          mv ${target_dir}/dotcms-core-${{ needs.prepare-release.outputs.release_version }}.zip ${target_dir}/${distro_file}
-
-          aws s3 cp \
-            ${target_dir}/${distro_file} \
-            s3://static.dotcms.com/versions/${{ needs.prepare-release.outputs.release_version }}/${distro_file}
-        env:
-          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
-          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-
       - name: Generate/Push Javadoc
         run: |
           ./mvnw -ntp \
@@ -365,7 +358,7 @@ jobs:
           release_branch=release-${release_version}
           
           remote=$(git ls-remote --heads https://github.com/dotCMS/plugin-seeds.git ${release_branch} | wc -l | tr -d '[:space:]')
-          if [[ "${remote}" == '1' && "${release_branch}" == 'master' ]]; then
+          if [[ "${remote}" == '1' && "${release_branch}" != 'master' ]]; then
             echo "Release branch ${release_branch} already exists, removing it"
             git push origin :${release_branch}
           fi
@@ -380,9 +373,8 @@ jobs:
           
           git status
           git commit -a -m "Updating dotcms version to ${release_version}"
-          git commit --allow-empty -m "Publish Release ${release_version}"
-          git pull origin ${release_branch}
           git push https://${{ secrets.CI_MACHINE_USER }}:${{ secrets.CI_MACHINE_TOKEN }}@github.com/${GITHUB_REPOSITORY_OWNER}/plugin-seeds.git
+        if: github.event.inputs.update_plugins == 'true'
 
   build-push-image:
     name: Build/Push Image
@@ -409,6 +401,7 @@ jobs:
         uses: actions/checkout@v3
         with:
           ref: ${{ needs.prepare-release.outputs.release_branch }}
+          token: ${{ secrets.CI_MACHINE_TOKEN }}
 
       - name: Set Next Version
         run: |
@@ -475,5 +468,5 @@ jobs:
           MSG_MINIMAL: true
           SLACK_FOOTER: ""
           SLACK_ICON: https://avatars.slack-edge.com/temp/2021-12-08/2830145934625_e4e464d502865ff576e4.png
-          SLACK_MESSAGE: "<!channel> This automated script is excited to announce the release of a new version of dotCMS `${{ needs.prepare-release.outputs.release_version }}` :rocket:\n:docker: Produced images: [${{ needs.build-push-image.outputs.tags }}]"
+          SLACK_MESSAGE: "<!channel> This automated script is excited to announce the release of a new version of dotCMS `${{ needs.prepare-release.outputs.release_version }}` :rocket:\n:docker: Produced images: [${{ needs.build-push-image.outputs.formatted_tags }}]"
         if: success()

bom/application/pom.xml

@@ -13,7 +13,7 @@
 
     <properties>
         <aws-java-sdk.version>1.12.488</aws-java-sdk.version>
-        <twelvemonkeys.version>3.7.1</twelvemonkeys.version>
+        <twelvemonkeys.version>3.10.1</twelvemonkeys.version>
         <swagger.version>2.2.0</swagger.version>
         <bytebuddy.version>1.12.6</bytebuddy.version>
         <batik.version>1.16</batik.version>
@@ -23,6 +23,7 @@
         <glowroot.version>0.13.1</glowroot.version>
         <jackson.version>2.13.4</jackson.version>
         <jersey.version>2.22.1</jersey.version>
+        <graalvm.version>22.3.3</graalvm.version>
         <dotcms.tika-api.version>2023.09.8</dotcms.tika-api.version>
     </properties>
     <dependencyManagement>
@@ -1523,6 +1524,22 @@
                 <version>2.6</version>
             </dependency>
 
+            <!-- Graalvm Js Engine -->
+            <dependency>
+                <groupId>org.graalvm.sdk</groupId>
+                <artifactId>graal-sdk</artifactId>
+                <version>${graalvm.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.graalvm.js</groupId>
+                <artifactId>js</artifactId>
+                <version>${graalvm.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.graalvm.js</groupId>
+                <artifactId>js-scriptengine</artifactId>
+                <version>${graalvm.version}</version>
+            </dependency>
 
         </dependencies>
     </dependencyManagement>

core-web/apps/dotcms-ui/src/app/portlets/dot-apps/dot-apps-list/dot-apps-card/dot-apps-card.component.html

@@ -4,24 +4,11 @@
     }"
     (click)="actionFired.emit(app.key)">
     <p-header>
-        <p-avatar
-            *ngIf="app.configurationsCount"
-            [image]="app.iconUrl"
-            [text]="app.name"
-            size="large"
-            dotAvatar></p-avatar>
-        <p-avatar
-            *ngIf="!app.configurationsCount"
-            [image]="app.iconUrl"
-            [text]="app.name"
-            size="large"
-            dotAvatar></p-avatar>
+        <p-avatar [image]="app.iconUrl" [text]="app.name" size="large" dotAvatar></p-avatar>
         <div class="dot-apps-card__label-container">
-            <span class="dot-apps-card__name">
-                {{ app.name }}
-            </span>
-            <span class="dot-apps-card__configurations"
-                >{{
+            <span class="dot-apps-card__name">{{ app.name }}</span>
+            <span class="dot-apps-card__configurations">
+                {{
                     app.configurationsCount
                         ? app.configurationsCount + ' ' + ('apps.configurations' | dm)
                         : ('apps.no.configurations' | dm)

core-web/apps/dotcms-ui/src/app/portlets/dot-apps/dot-apps-list/dot-apps-list.component.scss

@@ -5,6 +5,10 @@
     height: 100%;
 }
 
+:host ::ng-deep dot-portlet-box {
+    height: 100%;
+}
+
 .dot-apps__header {
     border-bottom: 1px solid $color-palette-gray-200;
     display: flex;
@@ -44,13 +48,15 @@
     grid-gap: $spacing-4;
     grid-template-columns: repeat(auto-fill, minmax(23.42rem, 1fr));
     padding: $spacing-4;
+    overflow: auto;
 }
 
 .dot-apps__container {
+    display: flex;
+    flex-direction: column;
+    height: 100%;
+    overflow-y: hidden;
     background-color: $white;
     box-shadow: $shadow-m;
-    overflow-y: auto;
     padding-top: $spacing-4;
-    width: 100%;
-    height: 100%;
 }

core-web/apps/dotcms-ui/src/app/view/components/dot-toolbar/components/dot-toolbar-announcements/dot-toolbar-announcements.component.html

@@ -23,19 +23,21 @@ <h5 class="announcements__title">{{ 'announcements' | dm }}</h5>
 
 <div class="announcements__container">
     <i class="pi pi-external-link"></i>
-    <a class="announcements__link" [href]="linkToDotCms" data-testId="announcement_link">{{
-        'announcements_show_all' | dm
+    <a class="announcements__link" [href]="linkToDotCms()" data-testId="announcement_link">{{
+        'announcements.show.all' | dm
     }}</a>
 </div>
 
-<h5 class="announcements__title">{{ 'announcements_knowledge_center' | dm }}</h5>
+<h5 class="announcements__title">{{ 'announcements.knowledge.center' | dm }}</h5>
 <div class="announcements__about">
-    <a *ngFor="let link of knowledgeCenterLinks" [href]="link.url" target="_blank">{{
-        link.label
-    }}</a>
+    @for (item of knowledgeCenterLinks(); track item.id;) {
+    <a [href]="item.url" target="_blank" rel="noopener">{{ item.label }}</a>
+    }
 </div>
 
-<h5 class="announcements__title">{{ 'announcements_knowledge_contact_us' | dm }}</h5>
+<h5 class="announcements__title">{{ 'announcements.knowledge.contact.us' | dm }}</h5>
 <div class="announcements__about">
-    <a *ngFor="let link of contactLinks" [href]="link.url" target="_blank">{{ link.label }}</a>
+    @for (item of contactLinks(); track item.id;) {
+    <a [href]="item.url" target="_blank" rel="noopener">{{ item.label }}</a>
+    }
 </div>

core-web/apps/dotcms-ui/src/app/view/components/dot-toolbar/components/dot-toolbar-announcements/dot-toolbar-announcements.component.spec.ts

@@ -6,6 +6,7 @@ import { HttpClient } from '@angular/common/http';
 import { HttpClientTestingModule } from '@angular/common/http/testing';
 
 import { DotMessageService } from '@dotcms/data-access';
+import { SiteService, SiteServiceMock } from '@dotcms/dotcms-js';
 import { DotMessagePipe } from '@dotcms/ui';
 import { MockDotMessageService } from '@dotcms/utils-testing';
 
@@ -16,11 +17,16 @@ describe('DotToolbarAnnouncementsComponent', () => {
 
     const messageServiceMock = new MockDotMessageService({
         announcements: 'Announcements',
-        announcements_show_all: 'Show All',
-        announcements_knowledge_center: 'Knowledge Center',
-        announcements_knowledge_contact_us: 'Contact Us'
+        'announcements.show.all': 'Show All',
+        'announcements.knowledge.center': 'Knowledge Center',
+        'announcements.knowledge.contact.us': 'Contact Us',
+        'announcements.contact.customer.support': 'Customer Support',
+        'announcements.contact.professional.services': 'Professional Services',
+        'announcements.knowledge.center.documentation': 'Documentation',
+        'announcements.knowledge.center.blog': 'Blog',
+        'announcements.knowledge.center.forum': 'User Forums'
     });
-
+    const siteServiceMock = new SiteServiceMock();
     const createComponent = createComponentFactory({
         component: DotToolbarAnnouncementsComponent,
         providers: [
@@ -40,7 +46,11 @@ describe('DotToolbarAnnouncementsComponent', () => {
                 )
             }),
             DotMessagePipe,
-            { provide: DotMessageService, useValue: messageServiceMock }
+            { provide: DotMessageService, useValue: messageServiceMock },
+            {
+                provide: SiteService,
+                useValue: siteServiceMock
+            }
         ],
         imports: [NgForOf, NgClass, DotMessagePipe, HttpClientTestingModule]
     });