Skip to content
Open
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
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,9 @@ import {
DotMessageService
} from '@dotcms/data-access';
import { DotCMSContentType, DotMessageSeverity, DotMessageType } from '@dotcms/dotcms-models';
import { StyleEditorFieldSchema, StyleEditorFormSchema } from '@dotcms/types/internal';
import { DotMessagePipe } from '@dotcms/ui';
import {
StyleEditorField,
StyleEditorFieldSchema,
StyleEditorFormSchema,
defineStyleEditorSchema,
styleEditorField
} from '@dotcms/uve';
import { StyleEditorField, defineStyleEditorSchema, styleEditorField } from '@dotcms/uve/internal';

import { DotStyleEditorSectionComponent } from './dot-style-editor-section.component';
import {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import { SelectModule } from 'primeng/select';
import { SelectButtonModule } from 'primeng/selectbutton';

import { DotMessageService } from '@dotcms/data-access';
import { StyleEditorFieldType } from '@dotcms/types/internal';
import { DotMessagePipe } from '@dotcms/ui';
import { StyleEditorFieldType } from '@dotcms/uve';

import { BuilderField, BuilderOption, FIELD_TYPE_OPTIONS, toLabelIdentifier } from './models';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { StyleEditorFieldType } from '@dotcms/uve';
import { StyleEditorFieldType } from '@dotcms/types/internal';

export interface BuilderOption {
label: string;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { ControlContainer, ReactiveFormsModule } from '@angular/forms';

import { Checkbox } from 'primeng/checkbox';

import { StyleEditorFieldSchema, StyleEditorRadioOptionObject } from '@dotcms/uve';
import { StyleEditorFieldSchema, StyleEditorRadioOptionObject } from '@dotcms/types/internal';

@Component({
selector: 'dot-uve-style-editor-field-checkbox-group',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { Component, input, inject, computed } from '@angular/core';
import { Component, computed, inject, input } from '@angular/core';
import { ControlContainer, ReactiveFormsModule } from '@angular/forms';

import { Select } from 'primeng/select';

import { StyleEditorFieldSchema, StyleEditorRadioOptionObject } from '@dotcms/uve';
import { StyleEditorFieldSchema, StyleEditorRadioOptionObject } from '@dotcms/types/internal';

@Component({
selector: 'dot-uve-style-editor-field-dropdown',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { Component, input, inject } from '@angular/core';
import { Component, inject, input } from '@angular/core';
import { ControlContainer, ReactiveFormsModule } from '@angular/forms';

import { InputTextModule } from 'primeng/inputtext';

import { StyleEditorFieldSchema } from '@dotcms/types/internal';
import { DotMessagePipe } from '@dotcms/ui';
import { StyleEditorFieldSchema } from '@dotcms/uve';

@Component({
selector: 'dot-uve-style-editor-field-input',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { Component, input, inject, computed } from '@angular/core';
import { Component, computed, inject, input } from '@angular/core';
import { ControlContainer, ReactiveFormsModule } from '@angular/forms';

import { RadioButtonModule } from 'primeng/radiobutton';

import { StyleEditorFieldSchema, StyleEditorRadioOptionObject } from '@dotcms/uve';
import { StyleEditorFieldSchema, StyleEditorRadioOptionObject } from '@dotcms/types/internal';

@Component({
selector: 'dot-uve-style-editor-field-radio',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import { debounce, distinctUntilChanged, filter, map, mergeMap, tap } from 'rxjs

import { DotMessageService } from '@dotcms/data-access';
import { StyleEditorProperties } from '@dotcms/types';
import { StyleEditorFormSchema } from '@dotcms/uve';
import { StyleEditorFormSchema } from '@dotcms/types/internal';

import { UveStyleEditorFieldCheckboxGroupComponent } from './components/uve-style-editor-field-checkbox-group/uve-style-editor-field-checkbox-group.component';
import { UveStyleEditorFieldDropdownComponent } from './components/uve-style-editor-field-dropdown/uve-style-editor-field-dropdown.component';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ import { AbstractControl, FormBuilder, FormControl, FormGroup } from '@angular/f

import { StyleEditorProperties } from '@dotcms/types';
import {
StyleEditorCheckboxDefaultValue,
StyleEditorFieldSchema,
StyleEditorFormSchema,
StyleEditorSectionSchema
} from '@dotcms/uve';
} from '@dotcms/types/internal';
import { StyleEditorCheckboxDefaultValue } from '@dotcms/uve/internal';

import { STYLE_EDITOR_FIELD_TYPES } from '../../../../../../shared/consts';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,9 @@ import {
} from '@dotcms/dotcms-models';
import { DotResultsSeoToolComponent } from '@dotcms/portlets/dot-ema/ui';
import { DotCMSPage, DotCMSURLContentMap, DotCMSUVEAction, UVE_MODE } from '@dotcms/types';
import { __DOTCMS_UVE_EVENT__ } from '@dotcms/types/internal';
import { StyleEditorFormSchema, __DOTCMS_UVE_EVENT__ } from '@dotcms/types/internal';
import { DotCopyContentModalService, DotMessagePipe } from '@dotcms/ui';
import { WINDOW, isEqual } from '@dotcms/utils';
import { StyleEditorFormSchema } from '@dotcms/uve';
import { getContentletsInContainer } from '@dotcms/uve/internal';

import { DotUveContentletQuickEditComponent } from './components/dot-uve-contentlet-quick-edit/dot-uve-contentlet-quick-edit.component';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { tapResponse } from '@ngrx/operators';
import { Observable, of } from 'rxjs';

import { Injectable, inject } from '@angular/core';
import { inject, Injectable } from '@angular/core';

import { MessageService } from 'primeng/api';

Expand All @@ -14,9 +14,8 @@ import {
DotCMSInlineEditingType,
DotCMSUVEAction
} from '@dotcms/types';
import { __DOTCMS_UVE_EVENT__ } from '@dotcms/types/internal';
import { __DOTCMS_UVE_EVENT__, StyleEditorFormSchema } from '@dotcms/types/internal';
import { DotCopyContentModalService } from '@dotcms/ui';
import { StyleEditorFormSchema } from '@dotcms/uve';

import { DotBlockEditorSidebarComponent } from '../../components/dot-block-editor-sidebar/dot-block-editor-sidebar.component';
import { DotEmaDialogComponent } from '../../components/dot-ema-dialog/dot-ema-dialog.component';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { DotDeviceListItem, FeaturedFlags } from '@dotcms/dotcms-models';
import { DotCMSViewAsPersona } from '@dotcms/types';
import { StyleEditorFieldType } from '@dotcms/uve';
import { StyleEditorFieldType } from '@dotcms/types/internal';

import { CommonErrors } from './enums';
import { CommonErrorsInfo } from './models';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { DotDeviceListItem, SeoMetaTags, SeoMetaTagsResult } from '@dotcms/dotcms-models';
import { DotCMSViewAsPersona } from '@dotcms/types';
import { StyleEditorFormSchema } from '@dotcms/uve';
import { StyleEditorFormSchema } from '@dotcms/types/internal';

import {
Container,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import {
SeoMetaTagsResult
} from '@dotcms/dotcms-models';
import { UVE_MODE } from '@dotcms/types';
import { StyleEditorFormSchema } from '@dotcms/types/internal';
import { WINDOW } from '@dotcms/utils';
import { StyleEditorFormSchema } from '@dotcms/uve';

import { PageData, PageDataContainer, ReloadEditorContent } from './models';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,27 +7,33 @@ import { take } from 'rxjs/operators';
import { DotPropertiesService } from '@dotcms/data-access';
import { FeaturedFlags } from '@dotcms/dotcms-models';

import { WithFlagsState } from './models';
import { UVEFlags, WithFlagsState } from './models';

import { UVEState } from '../../models';

/**
*
* @description This feature is used to handle the fetch of flags
* @description Loads feature flags from configuration, then forces `FEATURE_FLAG_UVE_STYLE_EDITOR` to `true`.
* @export
* @return {*}
*/
export function withFlags(flags: FeaturedFlags[]) {
export function withFlags(featureFlagKeys: FeaturedFlags[]) {
return signalStoreFeature(
{ state: type<UVEState>() },
withState<WithFlagsState>({ flags: {} }),
withHooks({
onInit: (store) => {
const propertiesService = inject(DotPropertiesService);

propertiesService
.getFeatureFlags(flags)
.getFeatureFlags(featureFlagKeys)
.pipe(take(1))
.subscribe((flags) => {
.subscribe((fetchedFlags) => {
// TODO: Remove this, only harcoded until the PR that fix is merged
const flags: UVEFlags = { ...(fetchedFlags as unknown as UVEFlags) };

flags[FeaturedFlags.FEATURE_FLAG_UVE_STYLE_EDITOR] = true;

patchState(store, { flags });
});
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {
SeoMetaTagsResult
} from '@dotcms/dotcms-models';
import { DotCMSPage } from '@dotcms/types';
import { StyleEditorFormSchema } from '@dotcms/uve';
import { StyleEditorFormSchema } from '@dotcms/types/internal';

import { UVEFlags } from './features/flags/models';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import {
DotCMSExtendedPageResponse
} from '@dotcms/types';
import { createUVESubscription, getUVEState, initUVE, updateNavigation } from '@dotcms/uve';
import { registerStyleEditorSchemas } from '@dotcms/uve/internal';

@Injectable({
providedIn: 'root'
Expand Down Expand Up @@ -82,6 +83,10 @@ export class DotCMSEditablePageService {
updateNavigation(pageURI);
}

if (response?.styleEditorSchemas?.length) {
registerStyleEditorSchemas(response.styleEditorSchemas);
}

const unsubscribeUVEChanges = this.#listenUVEChanges();

return this.#response$.pipe(
Expand Down
Loading
Loading