From b5588d91d95ea268af01c24e10247f4dfd91fb0c Mon Sep 17 00:00:00 2001 From: Kevin Date: Tue, 24 Feb 2026 12:14:28 -0500 Subject: [PATCH] Implemented new FF Style Editor for traditional pages --- .../dotcms-models/src/lib/shared-models.ts | 3 ++- .../edit-ema/portlet/src/lib/shared/consts.ts | 3 ++- .../edit-ema/portlet/src/lib/shared/mocks.ts | 27 ++++++++++--------- .../dotcms/featureflag/FeatureFlagName.java | 2 ++ .../api/v1/system/ConfigurationResource.java | 2 +- .../resources/dotmarketing-config.properties | 3 +++ 6 files changed, 24 insertions(+), 16 deletions(-) diff --git a/core-web/libs/dotcms-models/src/lib/shared-models.ts b/core-web/libs/dotcms-models/src/lib/shared-models.ts index 702427377c58..cb8f90b1005b 100644 --- a/core-web/libs/dotcms-models/src/lib/shared-models.ts +++ b/core-web/libs/dotcms-models/src/lib/shared-models.ts @@ -31,7 +31,8 @@ export const enum FeaturedFlags { FEATURE_FLAG_NEW_EDIT_PAGE = 'FEATURE_FLAG_NEW_EDIT_PAGE', FEATURE_FLAG_UVE_PREVIEW_MODE = 'FEATURE_FLAG_UVE_PREVIEW_MODE', FEATURE_FLAG_UVE_TOGGLE_LOCK = 'FEATURE_FLAG_UVE_TOGGLE_LOCK', - FEATURE_FLAG_UVE_STYLE_EDITOR = 'FEATURE_FLAG_UVE_STYLE_EDITOR' + FEATURE_FLAG_UVE_STYLE_EDITOR = 'FEATURE_FLAG_UVE_STYLE_EDITOR', + FEATURE_FLAG_UVE_STYLE_EDITOR_FOR_TRADITIONAL_PAGES = 'FEATURE_FLAG_UVE_STYLE_EDITOR_FOR_TRADITIONAL_PAGES' } export const enum DotConfigurationVariables { diff --git a/core-web/libs/portlets/edit-ema/portlet/src/lib/shared/consts.ts b/core-web/libs/portlets/edit-ema/portlet/src/lib/shared/consts.ts index a351df7a99b5..efcbf4f860a3 100644 --- a/core-web/libs/portlets/edit-ema/portlet/src/lib/shared/consts.ts +++ b/core-web/libs/portlets/edit-ema/portlet/src/lib/shared/consts.ts @@ -74,7 +74,8 @@ export const DEFAULT_PERSONA: DotCMSViewAsPersona = { // Add the Feature flags we want to fetch for UVE export const UVE_FEATURE_FLAGS = [ FeaturedFlags.FEATURE_FLAG_UVE_TOGGLE_LOCK, - FeaturedFlags.FEATURE_FLAG_UVE_STYLE_EDITOR + FeaturedFlags.FEATURE_FLAG_UVE_STYLE_EDITOR, + FeaturedFlags.FEATURE_FLAG_UVE_STYLE_EDITOR_FOR_TRADITIONAL_PAGES ]; export const DEFAULT_DEVICE: DotDeviceListItem = { diff --git a/core-web/libs/portlets/edit-ema/portlet/src/lib/shared/mocks.ts b/core-web/libs/portlets/edit-ema/portlet/src/lib/shared/mocks.ts index 67dd45cab6cc..564b4c6e87ad 100644 --- a/core-web/libs/portlets/edit-ema/portlet/src/lib/shared/mocks.ts +++ b/core-web/libs/portlets/edit-ema/portlet/src/lib/shared/mocks.ts @@ -1,35 +1,35 @@ import { of } from 'rxjs'; import { CurrentUser } from '@dotcms/dotcms-js'; -import { DEFAULT_VARIANT_ID, CONTAINER_SOURCE, FeaturedFlags } from '@dotcms/dotcms-models'; +import { CONTAINER_SOURCE, DEFAULT_VARIANT_ID, FeaturedFlags } from '@dotcms/dotcms-models'; import { + DotCMSContainer, + DotCMSContainerStructure, DotCMSLayout, + DotCMSPage, DotCMSPageAsset, - DotCMSSite, - DotCMSViewAsPersona, DotCMSPageAssetContainers, - DotCMSPage, + DotCMSSite, DotCMSTemplate, - DotCMSContainerStructure, - DotCMSContainer, + DotCMSURLContentMap, DotCMSVanityUrl, - DotCMSURLContentMap + DotCMSViewAsPersona } from '@dotcms/types'; import { - mockSites, + dotcmsContentletMock, + mockDotContainers, mockDotLayout, mockDotTemplate, - mockDotContainers, - dotcmsContentletMock + mockSites } from '@dotcms/utils-testing'; import { DEFAULT_PERSONA, PERSONA_KEY } from './consts'; import { ActionPayload, ClientData } from './models'; import { - EmaDragItem, + Container, ContentletArea, - Container + EmaDragItem } from '../edit-ema-editor/components/ema-page-dropzone/types'; export const HEADLESS_BASE_QUERY_PARAMS = { @@ -1043,7 +1043,8 @@ export const dotPropertiesServiceMock = { of({ [FeaturedFlags.FEATURE_FLAG_UVE_PREVIEW_MODE]: false, [FeaturedFlags.FEATURE_FLAG_UVE_TOGGLE_LOCK]: false, - [FeaturedFlags.FEATURE_FLAG_UVE_STYLE_EDITOR]: false + [FeaturedFlags.FEATURE_FLAG_UVE_STYLE_EDITOR]: false, + [FeaturedFlags.FEATURE_FLAG_UVE_STYLE_EDITOR_FOR_TRADITIONAL_PAGES]: false }) }; diff --git a/dotCMS/src/main/java/com/dotcms/featureflag/FeatureFlagName.java b/dotCMS/src/main/java/com/dotcms/featureflag/FeatureFlagName.java index bc7ff056b162..2ac841235253 100644 --- a/dotCMS/src/main/java/com/dotcms/featureflag/FeatureFlagName.java +++ b/dotCMS/src/main/java/com/dotcms/featureflag/FeatureFlagName.java @@ -48,6 +48,8 @@ public interface FeatureFlagName { String FEATURE_FLAG_UVE_STYLE_EDITOR = "FEATURE_FLAG_UVE_STYLE_EDITOR"; + String FEATURE_FLAG_UVE_STYLE_EDITOR_FOR_TRADITIONAL_PAGES = "FEATURE_FLAG_UVE_STYLE_EDITOR_FOR_TRADITIONAL_PAGES"; + // Open Search Related String FEATURE_FLAG_OPEN_SEARCH_WRITE = "FEATURE_FLAG_OPEN_SEARCH_WRITE"; diff --git a/dotCMS/src/main/java/com/dotcms/rest/api/v1/system/ConfigurationResource.java b/dotCMS/src/main/java/com/dotcms/rest/api/v1/system/ConfigurationResource.java index b5d2ddc4e13a..b5f38d9bf33c 100644 --- a/dotCMS/src/main/java/com/dotcms/rest/api/v1/system/ConfigurationResource.java +++ b/dotCMS/src/main/java/com/dotcms/rest/api/v1/system/ConfigurationResource.java @@ -71,7 +71,7 @@ public class ConfigurationResource implements Serializable { FeatureFlagName.FEATURE_FLAG_SEO_PAGE_TOOLS, FeatureFlagName.FEATURE_FLAG_EDIT_URL_CONTENT_MAP, "CONTENT_EDITOR2_ENABLED", "CONTENT_EDITOR2_CONTENT_TYPE", FeatureFlagName.FEATURE_FLAG_NEW_BINARY_FIELD, FeatureFlagName.FEATURE_FLAG_ANNOUNCEMENTS, FeatureFlagName.FEATURE_FLAG_NEW_EDIT_PAGE, FeatureFlagName.FEATURE_FLAG_UVE_PREVIEW_MODE, FeatureFlagName.FEATURE_FLAG_UVE_TOGGLE_LOCK, FeatureFlagName.FEATURE_FLAG_UVE_STYLE_EDITOR, - FeatureFlagName.FEATURE_FLAG_CONTENT_ANALYTICS_SHOW_ENGAGEMENT_DASHBOARD })); + FeatureFlagName.FEATURE_FLAG_CONTENT_ANALYTICS_SHOW_ENGAGEMENT_DASHBOARD, FeatureFlagName.FEATURE_FLAG_UVE_STYLE_EDITOR_FOR_TRADITIONAL_PAGES })); private boolean isOnBlackList(final String key) { diff --git a/dotCMS/src/main/resources/dotmarketing-config.properties b/dotCMS/src/main/resources/dotmarketing-config.properties index ca32fb962b53..bc7c41d0f21d 100644 --- a/dotCMS/src/main/resources/dotmarketing-config.properties +++ b/dotCMS/src/main/resources/dotmarketing-config.properties @@ -859,6 +859,9 @@ LOCALIZATION_ENHANCEMENTS_ENABLED=false ## UVE Toggle Lock FEATURE_FLAG_UVE_TOGGLE_LOCK=false +## UVE Style Editor for Traditional Pages +FEATURE_FLAG_UVE_STYLE_EDITOR_FOR_TRADITIONAL_PAGES=false + STARTER_BUILD_VERSION=${starter.deploy.version} ##LTS properties to show EOL message