Merge branch 'main' into feature/identifier-base-type-data-model

wezell · web-flow · commit eb9913dadfc7 · 2026-04-02T11:20:42.000-04:00
diff --git a/.github/workflows/WORKFLOW_ARCHITECTURE.md b/.github/workflows/WORKFLOW_ARCHITECTURE.md
@@ -727,13 +727,13 @@ Navigate to: https://github.com/dotCMS/core/actions → **"-6 Release Process"**
 
 ### Optional Configurations
 
-| Option | Default | Purpose |
-|--------|---------|---------|
-| **Deploy Artifact** | ✅ Enabled | Deploy to Artifactory (repo.dotcms.com)<br/>**Required for successful release** |
-| **Update Plugins** | ✅ Enabled | Triggers plugin-seeds repo update<br/>**Note**: Currently requires manual execution at [plugin-seeds/release-target.yml](https://github.com/dotCMS/plugin-seeds/actions/workflows/release-target.yml) |
-| **Upload Javadocs** | ✅ Enabled | Generate and upload to S3 static bucket<br/>Creates HTML documentation bundle |
-| **Update GitHub Labels** | ✅ Enabled | Replaces "Next Release" with "Release vX.X.X"<br/>Enables filtering issues by release |
-| **Notify Slack** | ✅ Enabled | Posts announcement to general channel<br/>Can disable for testing |
+| Option | Default | Purpose                                                                                                                                                                                                                                   |
+|--------|---------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| **Deploy Artifact** | ✅ Enabled | Deploy to Artifactory (repo.dotcms.com)<br/>**Required for successful release**                                                                                                                                                           |
+| **Update Plugins** | ✅ Enabled | Triggers plugin-examples repo update<br/>**Note**: Currently requires manual execution at [dotcms-community/plugin-examples/release-target.yml](https://github.com/dotcms-community/plugin-examples/actions/workflows/release-target.yml) |
+| **Upload Javadocs** | ✅ Enabled | Generate and upload to S3 static bucket<br/>Creates HTML documentation bundle                                                                                                                                                             |
+| **Update GitHub Labels** | ✅ Enabled | Replaces "Next Release" with "Release vX.X.X"<br/>Enables filtering issues by release                                                                                                                                                     |
+| **Notify Slack** | ✅ Enabled | Posts announcement to general channel<br/>Can disable for testing                                                                                                                                                                         |
 
 ### Process Overview
 
@@ -1055,4 +1055,3 @@ Our CI/CD architecture delivers significant benefits over traditional monolithic
 **Last Updated**: December 2024  
 **Maintained By**: dotCMS DevOps Team  
 **Questions?** Contact #guild-dev-pipeline on Slack
-
diff --git a/.github/workflows/cicd_comp_release-phase.yml b/.github/workflows/cicd_comp_release-phase.yml
@@ -219,7 +219,7 @@ jobs:
             -H "Accept: application/vnd.github+json" \
             -H "Authorization: Bearer ${CI_MACHINE_TOKEN}" \
             -H "X-GitHub-Api-Version: 2022-11-28" \
-            https://api.github.com/repos/dotCMS/plugin-seeds/dispatches \
+            https://api.github.com/repos/dotcms-community/plugin-examples/dispatches \
             -d "{\"event_type\": \"on-plugins-release\", \"client_payload\": {\"release_version\": \"${release_version}\"}}" \
             -w "\n%{http_code}" \
             -s)
@@ -284,4 +284,4 @@ jobs:
       new_label: 'Release : ${{ inputs.release_version }}'
       rename_label: 'Next Release'
     secrets:
-      CI_MACHINE_TOKEN: ${{ secrets.CI_MACHINE_TOKEN }}
+      CI_MACHINE_TOKEN: ${{ secrets.CI_MACHINE_TOKEN }}
diff --git a/.github/workflows/legacy-release_maven-release-process.yml b/.github/workflows/legacy-release_maven-release-process.yml
@@ -357,7 +357,7 @@ jobs:
             -H "Accept: application/vnd.github+json" \
             -H "Authorization: Bearer ${{ secrets.CI_MACHINE_TOKEN }}" \
             -H "X-GitHub-Api-Version: 2022-11-28" \
-            https://api.github.com/repos/dotCMS/plugin-seeds/dispatches \
+            https://api.github.com/repos/dotcms-community/plugin-examples/dispatches \
             -d "{\"event_type\": \"on-plugins-release\", \"client_payload\": {\"release_version\": \"$release_version\"}}" \
             -w "\n%{http_code}" \
             -s)
diff --git a/.github/workflows/maven-release-process.md b/.github/workflows/maven-release-process.md
@@ -46,7 +46,7 @@ This checkbox is enabled by default and the function is to deploy all the depend
 
 Update plugins (default enabled):
 
-Same thing here, by default is enabled and the function is to create a plugins version for the release that will be generated by the job. Currently this does not happen in an automated way, therefore this step should be manually run by executing the plugin-seeds repo workflow at [https://github.com/dotCMS/plugin-seeds/actions/workflows/release-target.yml](https://github.com/dotCMS/plugin-seeds/actions/workflows/release-target.yml) matching the same release version value.
+Same thing here, by default is enabled and the function is to create a plugins version for the release that will be generated by the job. Currently this does not happen in an automated way, therefore this step should be manually run by executing the plugin-examples repo workflow at [https://github.com/dotcms-community/plugin-examples/actions/workflows/release-target.yml](https://github.com/dotcms-community/plugin-examples/actions/workflows/release-target.yml) matching the same release version value.
 
   
 
@@ -74,4 +74,4 @@ This field is related to generating a notification in the general slack channel
   
 Finally once you set all the parameters, we are ready to release, just click on the “Run Workflow” button and it will start a process in the background in order to deploy everything and finally generate the release version. After some minutes, you will receive a notification on the general slack channel about the new version.  
   
-Also, you can track one by one all the stages and see more details about the process in the page redirected after firing the action.
+Also, you can track one by one all the stages and see more details about the process in the page redirected after firing the action.
diff --git a/core-web/libs/portlets/edit-ema/portlet/src/lib/edit-ema-editor/components/dot-uve-palette/components/dot-uve-palette-list/dot-uve-palette-list.component.ts b/core-web/libs/portlets/edit-ema/portlet/src/lib/edit-ema-editor/components/dot-uve-palette/components/dot-uve-palette-list/dot-uve-palette-list.component.ts
@@ -9,7 +9,6 @@ import {
     effect,
     inject,
     input,
-    linkedSignal,
     OnInit,
     signal,
     untracked,
@@ -132,6 +131,7 @@ export class DotUvePaletteListComponent implements OnInit {
     protected readonly $skipNextSearch = signal(false);
     protected readonly $contextMenuItems = signal<MenuItem[]>([]);
     protected readonly $isSearching = signal<boolean>(false);
+    protected readonly $shouldHideControls = signal<boolean>(true);
     protected readonly $siteId = this.#globalStore.currentSiteId;
     protected readonly $contenttypes = this.#paletteListStore.contenttypes;
     protected readonly $contentlets = this.#paletteListStore.contentlets;
@@ -146,11 +146,6 @@ export class DotUvePaletteListComponent implements OnInit {
     protected readonly $isFavoritesList = this.#paletteListStore.$isFavoritesList;
     protected readonly status$ = toObservable(this.#paletteListStore.status);
 
-    protected readonly $shouldHideControls = linkedSignal({
-        source: this.$contenttypes,
-        computation: (contenttypes) => contenttypes.length === 0
-    });
-
     /**
      * Computed signal to determine the start index for the pagination.
      * @returns The start index for the pagination.
@@ -292,7 +287,7 @@ export class DotUvePaletteListComponent implements OnInit {
      * Handles the selection of a content type to view its contentlets.
      * Store handles query building, filter reset, and page reset automatically.
      *
-     * @param contentTypeName - The name of the content type to drill into
+     * @param selectedContentType - The name of the content type to drill into
      */
     protected onSelectContentType(selectedContentType: string) {
         this.#paletteListStore.getContentlets({ ...EMPTY_SEARCH_PARAMS, selectedContentType });
@@ -421,6 +416,7 @@ export class DotUvePaletteListComponent implements OnInit {
      * @private
      */
     #updateControlsVisibility() {
+        this.$shouldHideControls.set(false);
         this.status$
             .pipe(
                 filter(
diff --git a/core-web/libs/portlets/edit-ema/portlet/src/lib/edit-ema-editor/components/dot-uve-palette/models.ts b/core-web/libs/portlets/edit-ema/portlet/src/lib/edit-ema-editor/components/dot-uve-palette/models.ts
@@ -153,6 +153,7 @@ export const DEFAULT_PER_PAGE = 30;
 
 /**
  * Base content types included in the Content tab.
+ * Filter excludes DotCMSBaseTypesContentTypes FORMs and HTMLPAGEs to keep the Palette UI focused on standard content.
  */
 export const BASETYPES_FOR_CONTENT = [
     DotCMSBaseTypesContentTypes.CONTENT,
diff --git a/core-web/libs/portlets/edit-ema/portlet/src/lib/services/inline-edit/inline-edit.service.spec.ts b/core-web/libs/portlets/edit-ema/portlet/src/lib/services/inline-edit/inline-edit.service.spec.ts
@@ -12,6 +12,30 @@ describe('InlineEditService', () => {
 
     beforeEach(() => (spectator = createService()));
 
+    it.each([
+        { mode: 'minimal', label: 'minimal' },
+        { mode: 'full', label: 'full' },
+        { mode: '', label: 'default (minimal)' }
+    ])('should pass convert_urls: false to tinymce.init ($label)', ({ mode }) => {
+        const initMock = jest.fn().mockResolvedValue([]);
+        const iframeWindow = {
+            tinymce: { init: initMock }
+        } as unknown as Window;
+
+        spectator.service.setIframeWindow(iframeWindow);
+        spectator.service.setTargetInlineMCEDataset({
+            inode: '1',
+            fieldName: 'body',
+            language: 'en',
+            mode
+        });
+
+        spectator.service.initEditor();
+
+        expect(initMock).toHaveBeenCalledTimes(1);
+        expect(initMock.mock.calls[0][0].convert_urls).toBe(false);
+    });
+
     it('should inject inline edit', () => {
         const iframe = document.createElement('iframe');
         document.body.appendChild(iframe);
diff --git a/core-web/libs/portlets/edit-ema/portlet/src/lib/services/inline-edit/inline-edit.service.ts b/core-web/libs/portlets/edit-ema/portlet/src/lib/services/inline-edit/inline-edit.service.ts
@@ -30,6 +30,19 @@ export const INLINE_CONTENT_STYLES = `
     }    
 `;
 
+/** Shared TinyMCE options for EMA inline editing (excluding per-instance `setup`). */
+export const INLINE_EDIT_TINYMCE_BASE_OPTIONS = {
+    menubar: false,
+    inline: true,
+    // Avoid rewriting root-relative URLs (e.g. /dA/...) to ../... on serialize; iframe base differs from site root.
+    convert_urls: false,
+    valid_styles: {
+        '*': 'font-size,font-family,color,text-decoration,text-align'
+    },
+    powerpaste_word_import: 'clean',
+    powerpaste_html_import: 'clean'
+} as const;
+
 @Injectable({
     providedIn: 'root'
 })
@@ -39,17 +52,11 @@ export class InlineEditService {
     private $inlineEditingTargetDataset = signal<InlineEditingContentletDataset | null>(null);
 
     private readonly DEFAULT_TINYMCE_CONFIG = {
-        menubar: false,
-        inline: true,
-        valid_styles: {
-            '*': 'font-size,font-family,color,text-decoration,text-align'
-        },
-        powerpaste_word_import: 'clean',
-        powerpaste_html_import: 'clean',
+        ...INLINE_EDIT_TINYMCE_BASE_OPTIONS,
         setup: this.#handleInlineEditEvents
     };
 
-    private readonly TINYCME_CONFIG = {
+    private readonly TINYMCE_CONFIG = {
         minimal: {
             plugins: ['link', 'autolink'],
             toolbar: 'bold italic underline | link',
@@ -162,7 +169,7 @@ export class InlineEditService {
 
         this.$iframeWindow()
             .tinymce.init({
-                ...this.TINYCME_CONFIG[dataset.mode || 'minimal'],
+                ...this.TINYMCE_CONFIG[dataset.mode || 'minimal'],
                 selector: dataSelector
             })
             .then(([ed]) => {
diff --git a/docs/README.txt b/docs/README.txt
@@ -3,8 +3,8 @@ for developers looking to begin developing plugins for dotCMS.
 
 Note: the samples has been moved to: 
 
-https://github.com/dotCMS/plugin-seeds
+https://github.com/dotcms-community/plugin-examples
 
 For other documentation, refer to:
 
-http://dotcms.com/
+http://dev.dotcms.com/
diff --git a/dotCMS/src/main/java/com/dotcms/contenttype/transform/contenttype/DetailPageTransformerImpl.java b/dotCMS/src/main/java/com/dotcms/contenttype/transform/contenttype/DetailPageTransformerImpl.java
@@ -1,6 +1,7 @@
 package com.dotcms.contenttype.transform.contenttype;
 
 import com.dotcms.api.web.HttpServletRequestThreadLocal;
+import com.dotcms.contenttype.model.type.BaseContentType;
 import com.dotcms.contenttype.model.type.ContentType;
 import com.dotcms.rest.api.v1.contenttype.ContentTypeHelper;
 import com.dotmarketing.beans.Host;
@@ -20,7 +21,6 @@
 
 public class DetailPageTransformerImpl implements DetailPageTransformer {
 
-    private static final String PAGE_SUBTYPE = "htmlpageasset";
 
     private final ContentType contentType;
     private final User user;
@@ -123,25 +123,26 @@ public Optional<String> idToUri() throws DotDataException, DotSecurityException
      * @throws IllegalArgumentException if the identifier is invalid.
      */
     private Optional<String> validateIdentifier(
-            String detailPage, Identifier foundDetailPageIdentifier) {
-
-        if (null != foundDetailPageIdentifier &&
-                foundDetailPageIdentifier.exists() &&
-                foundDetailPageIdentifier.getAssetSubType().equals(PAGE_SUBTYPE)) {
-            return Optional.of(foundDetailPageIdentifier.getId());
-        } else {
-            if (null != foundDetailPageIdentifier &&
-                    foundDetailPageIdentifier.exists() &&
-                    !foundDetailPageIdentifier.getAssetSubType().equals(PAGE_SUBTYPE)) {
-                throw new IllegalArgumentException(
-                        String.format("[%s] in Content Type [%s] is not a valid detail page.",
-                                detailPage, contentType.name()));
+            String detailPage, Identifier foundDetailPageIdentifier)
+            throws DotDataException, DotSecurityException {
+
+        if (null != foundDetailPageIdentifier && foundDetailPageIdentifier.exists()) {
+            final String assetSubType = foundDetailPageIdentifier.getAssetSubType();
+            if (UtilMethods.isSet(assetSubType)) {
+                final ContentType detailPageType = APILocator.getContentTypeAPI(
+                        APILocator.getUserAPI().getSystemUser()).find(assetSubType);
+                if (null != detailPageType && BaseContentType.HTMLPAGE == detailPageType.baseType()) {
+                    return Optional.of(foundDetailPageIdentifier.getId());
+                }
             }
-
             throw new IllegalArgumentException(
-                    String.format("Detail page [%s] in Content Type [%s] does not exist.",
+                    String.format("[%s] in Content Type [%s] is not a valid detail page.",
                             detailPage, contentType.name()));
         }
+
+        throw new IllegalArgumentException(
+                String.format("Detail page [%s] in Content Type [%s] does not exist.",
+                        detailPage, contentType.name()));
     }
 
 }
diff --git a/dotCMS/src/main/java/com/dotcms/rest/api/v1/content/ContentResource.java b/dotCMS/src/main/java/com/dotcms/rest/api/v1/content/ContentResource.java
@@ -412,7 +412,7 @@ public Response getContent(@Context HttpServletRequest request,
 
         if (-1 != depth) {
             ContentUtils.addRelationships(contentlet, user, mode,
-                    languageId, depth, request, response);
+                    contentlet.getLanguageId(), depth, request, response);
         }
         final String variant = contentlet.getVariantId();
         contentlet = new DotTransformerBuilder().contentResourceOptions(false).content(contentlet).build().hydrate().get(0);
diff --git a/dotCMS/src/main/java/com/dotcms/rest/api/v1/contenttype/ContentTypeResource.java b/dotCMS/src/main/java/com/dotcms/rest/api/v1/contenttype/ContentTypeResource.java
@@ -1911,6 +1911,8 @@ public final ResponseEntityPaginatedDataView getPagesContentTypes(@Context final
         //Curated list of varNames ensures they belong into the passed BaseTypes
         List<String> typeVarNames = contentTypes.stream()
                 .filter(contentType -> baseContentTypes.contains(contentType.baseType()))
+                // Excludes system contentTypes
+                .filter(contentType -> !contentType.system())
                 .map(ContentType::variable)
                 .collect(Collectors.toList());
 
diff --git a/dotCMS/src/main/webapp/ext/uve/dot-uve.js b/dotCMS/src/main/webapp/ext/uve/dot-uve.js
diff --git a/dotcms-integration/src/test/java/com/dotcms/MainSuite1b.java b/dotcms-integration/src/test/java/com/dotcms/MainSuite1b.java
diff --git a/dotcms-integration/src/test/java/com/dotcms/contenttype/transform/contenttype/DetailPageTransformerImplTest.java b/dotcms-integration/src/test/java/com/dotcms/contenttype/transform/contenttype/DetailPageTransformerImplTest.java
diff --git a/dotcms-integration/src/test/java/com/dotcms/rest/api/v1/content/ContentResourceIntegrationTest.java b/dotcms-integration/src/test/java/com/dotcms/rest/api/v1/content/ContentResourceIntegrationTest.java
diff --git a/dotcms-integration/src/test/java/com/dotcms/rest/api/v1/contenttype/ContentTypeResourceTest.java b/dotcms-integration/src/test/java/com/dotcms/rest/api/v1/contenttype/ContentTypeResourceTest.java
