Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion core-web/libs/dotcms-models/src/lib/shared-models.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down
27 changes: 14 additions & 13 deletions core-web/libs/portlets/edit-ema/portlet/src/lib/shared/mocks.ts
Original file line number Diff line number Diff line change
@@ -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 = {
Expand Down Expand Up @@ -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
})
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
3 changes: 3 additions & 0 deletions dotCMS/src/main/resources/dotmarketing-config.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down