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
28 changes: 28 additions & 0 deletions core-web/.verdaccio/config.yml
Comment thread
KevinDavilaDotCMS marked this conversation as resolved.
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
# path to a directory with all packages
storage: ../tmp/local-registry/storage

# a list of other known repositories we can talk to
uplinks:
npmjs:
url: https://dotcms-npm.b-cdn.net/
maxage: 60m

packages:
'**':
# give all users (including non-authenticated users) full access
# because it is a local registry
access: $all
publish: $all
unpublish: $all

# if package is not available locally, proxy requests to npm registry
proxy: npmjs

# log settings
logs:
type: stdout
format: pretty
level: warn

publish:
allow_offline: true # set offline to true to allow publish offline
2 changes: 1 addition & 1 deletion core-web/libs/edit-content/src/lib/utils/functions.util.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {
DotLanguage,
UI_STORAGE_KEY
} from '@dotcms/dotcms-models';
import { UVE_MODE } from '@dotcms/uve/types';
import { UVE_MODE } from '@dotcms/types';

import {
CALENDAR_FIELD_TYPES,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { ActivatedRoute, Router } from '@angular/router';
import { MessageService } from 'primeng/api';
import { Toast } from 'primeng/toast';

import { UVE_MODE } from '@dotcms/uve/types';
import { UVE_MODE } from '@dotcms/types';

import { DotExperimentsShellComponent } from './dot-experiments-shell.component';
import { DotExperimentsStore } from './store/dot-experiments.store';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ import {
SiteService
} from '@dotcms/dotcms-js';
import { DotPageToolsSeoComponent } from '@dotcms/portlets/dot-ema/ui';
import { UVE_MODE } from '@dotcms/types';
import { DotNotLicenseComponent } from '@dotcms/ui';
import { WINDOW } from '@dotcms/utils';
import {
Expand All @@ -41,7 +42,6 @@ import {
DotcmsEventsServiceMock,
SiteServiceMock
} from '@dotcms/utils-testing';
import { UVE_MODE } from '@dotcms/uve/types';

import { EditEmaNavigationBarComponent } from './components/edit-ema-navigation-bar/edit-ema-navigation-bar.component';
import { DotEmaShellComponent } from './dot-ema-shell.component';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ import {
} from '@dotcms/data-access';
import { SiteService } from '@dotcms/dotcms-js';
import { DotPageToolsSeoComponent } from '@dotcms/portlets/dot-ema/ui';
import { UVE_MODE } from '@dotcms/types';
import { DotInfoPageComponent, DotNotLicenseComponent } from '@dotcms/ui';
import { WINDOW } from '@dotcms/utils';
import { UVE_MODE } from '@dotcms/uve/types';

import { EditEmaNavigationBarComponent } from './components/edit-ema-navigation-bar/edit-ema-navigation-bar.component';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { createComponentFactory, Spectator } from '@ngneat/spectator/jest';
import { signal } from '@angular/core';

import { DotAnalyticsTrackerService, DotMessageService } from '@dotcms/data-access';
import { UVE_MODE } from '@dotcms/uve/types';
import { UVE_MODE } from '@dotcms/types';

import { DotEditorModeSelectorComponent } from './dot-editor-mode-selector.component';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import { MenuModule } from 'primeng/menu';
import { TooltipModule } from 'primeng/tooltip';

import { DotAnalyticsTrackerService } from '@dotcms/data-access';
import { UVE_MODE } from '@dotcms/types';
import { DotMessagePipe } from '@dotcms/ui';
import { UVE_MODE } from '@dotcms/uve/types';

import { UVEStore } from '../../../../../store/dot-uve.store';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@ import {
DotWorkflowsActionsService
} from '@dotcms/data-access';
import { LoginService } from '@dotcms/dotcms-js';
import { UVE_MODE } from '@dotcms/types';
import {
DotExperimentsServiceMock,
DotLanguagesServiceMock,
DotLicenseServiceMock,
getRunningExperimentMock,
mockDotDevices
} from '@dotcms/utils-testing';
import { UVE_MODE } from '@dotcms/uve/types';

import { DotEditorModeSelectorComponent } from './components/dot-editor-mode-selector/dot-editor-mode-selector.component';
import { DotEmaBookmarksComponent } from './components/dot-ema-bookmarks/dot-ema-bookmarks.component';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ import {
DotDeviceListItem,
DotCMSContentlet
} from '@dotcms/dotcms-models';
import { UVE_MODE } from '@dotcms/types';
import { DotMessagePipe } from '@dotcms/ui';
import { UVE_MODE } from '@dotcms/uve/types';

import { DotEditorModeSelectorComponent } from './components/dot-editor-mode-selector/dot-editor-mode-selector.component';
import { DotEmaBookmarksComponent } from './components/dot-ema-bookmarks/dot-ema-bookmarks.component';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ import {
} from '@dotcms/dotcms-js';
import { DotCMSContentlet, DEFAULT_VARIANT_ID, DotCMSTempFile } from '@dotcms/dotcms-models';
import { DotResultsSeoToolComponent } from '@dotcms/portlets/dot-ema/ui';
import { UVE_MODE } from '@dotcms/types';
import { DotCopyContentModalService, ModelCopyContentResponse, SafeUrlPipe } from '@dotcms/ui';
import { WINDOW } from '@dotcms/utils';
import {
Expand All @@ -79,7 +80,6 @@ import {
DotPersonalizeServiceMock,
MockDotHttpErrorManagerService
} from '@dotcms/utils-testing';
import { UVE_MODE } from '@dotcms/uve/types';

import { DotUvePageVersionNotFoundComponent } from './components/dot-uve-page-version-not-found/dot-uve-page-version-not-found.component';
import { DotEmaRunningExperimentComponent } from './components/dot-uve-toolbar/components/dot-ema-running-experiment/dot-ema-running-experiment.component';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@ import {
SeoMetaTags
} from '@dotcms/dotcms-models';
import { DotResultsSeoToolComponent } from '@dotcms/portlets/dot-ema/ui';
import { __DOTCMS_UVE_EVENT__ } from '@dotcms/types/internal';
import { SafeUrlPipe, DotSpinnerModule, DotCopyContentModalService } from '@dotcms/ui';
import { isEqual, WINDOW } from '@dotcms/utils';
import { __DOTCMS_UVE_EVENT__ } from '@dotcms/uve/internal';

import { DotUvePageVersionNotFoundComponent } from './components/dot-uve-page-version-not-found/dot-uve-page-version-not-found.component';
import { DotUveToolbarComponent } from './components/dot-uve-toolbar/dot-uve-toolbar.component';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { createHttpFactory, HttpMethod, SpectatorHttp } from '@ngneat/spectator';

import { UVE_MODE } from '@dotcms/uve/types';
import { UVE_MODE } from '@dotcms/types';

import { DotPageApiService } from './dot-page-api.service';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import {
DotTemplate,
VanityUrl
} from '@dotcms/dotcms-models';
import { UVE_MODE } from '@dotcms/uve/types';
import { DotCMSGraphQLPageResponse, UVE_MODE } from '@dotcms/types';

import { PERSONA_KEY } from '../shared/consts';
import { DotPage, DotPageAssetParams, SavePagePayload } from '../shared/models';
Expand Down Expand Up @@ -199,7 +199,7 @@ export class DotPageApiService {
return this.http.post<{ data }>('/api/v1/graphql', { query, variables }, { headers }).pipe(
pluck('data'),
map(({ page, ...content }) => {
const pageEntity = graphqlToPageEntity({ page });
const pageEntity = graphqlToPageEntity({ page } as DotCMSGraphQLPageResponse);

return {
page: pageEntity,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import {
DotWorkflowsActionsService
} from '@dotcms/data-access';
import { LoginService } from '@dotcms/dotcms-js';
import { UVE_MODE } from '@dotcms/types';
import { WINDOW } from '@dotcms/utils';
import {
MockDotMessageService,
Expand All @@ -32,7 +33,6 @@ import {
CurrentUserDataMock,
mockLanguageArray
} from '@dotcms/utils-testing';
import { UVE_MODE } from '@dotcms/uve/types';

import { UVEStore } from './dot-uve.store';
import { Orientation } from './models';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { patchState, signalStore, withComputed, withMethods, withState } from '@

import { computed, untracked } from '@angular/core';

import { UVE_MODE } from '@dotcms/uve/types';
import { UVE_MODE } from '@dotcms/types';

import { withSave } from './features/editor/save/withSave';
import { withEditor } from './features/editor/withEditor';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import { of } from 'rxjs';
import { ActivatedRoute, Router } from '@angular/router';

import { DEFAULT_VARIANT_ID, DEFAULT_VARIANT_NAME } from '@dotcms/dotcms-models';
import { UVE_MODE } from '@dotcms/types';
import { getRunningExperimentMock, mockDotDevices } from '@dotcms/utils-testing';
import { UVE_MODE } from '@dotcms/uve/types';

import { withUVEToolbar } from './withUVEToolbar';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import {
DotExperimentStatus,
SeoMetaTagsResult
} from '@dotcms/dotcms-models';
import { UVE_MODE } from '@dotcms/uve/types';
import { UVE_MODE } from '@dotcms/types';

import { DEFAULT_DEVICE, DEFAULT_PERSONA } from '../../../../shared/consts';
import { UVE_STATUS } from '../../../../shared/enums';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import { of } from 'rxjs';
import { ActivatedRoute, Router } from '@angular/router';

import { DEFAULT_VARIANT_ID, DotDeviceListItem } from '@dotcms/dotcms-models';
import { UVE_MODE } from '@dotcms/types';
import { WINDOW } from '@dotcms/utils';
import { mockDotDevices, seoOGTagsMock } from '@dotcms/utils-testing';
import { UVE_MODE } from '@dotcms/uve/types';

import { withEditor } from './withEditor';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import {
import { computed, inject, untracked } from '@angular/core';

import { DotTreeNode, SeoMetaTags } from '@dotcms/dotcms-models';
import { UVE_MODE } from '@dotcms/types';
import { WINDOW } from '@dotcms/utils';
import { UVE_MODE } from '@dotcms/uve/types';

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

export interface AnalyticsUVEModeChange {
toMode: UVE_MODE;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { provideHttpClientTesting } from '@angular/common/http/testing';

import { DotAnalyticsTrackerService } from '@dotcms/data-access';
import { EVENT_TYPES } from '@dotcms/dotcms-models';
import { UVE_MODE } from '@dotcms/uve/types';
import { UVE_MODE } from '@dotcms/types';

import { withTrack } from './withTrack';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { Params } from '@angular/router';

import { CurrentUser } from '@dotcms/dotcms-js';
import { DotDevice, DotExperiment, DotExperimentStatus } from '@dotcms/dotcms-models';
import { UVE_MODE } from '@dotcms/uve/types';
import { UVE_MODE } from '@dotcms/types';

import {
deleteContentletFromContainer,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { AsyncPipe, NgComponentOutlet } from '@angular/common';
import { ChangeDetectionStrategy, Component, computed, Input } from '@angular/core';

import { Contentlet, ContentNode } from '@dotcms/uve/types';
import { Contentlet, BlockEditorNode } from '@dotcms/types';

import { DynamicComponentEntity } from '../../../models';
import { CustomRenderer } from '../dotcms-block-editor-renderer.component';
Expand Down Expand Up @@ -31,7 +31,7 @@ export class DotDefaultContentBlock {
})
export class DotContentletBlock {
@Input() customRenderers: CustomRenderer | undefined;
@Input() attrs: ContentNode['attrs'];
@Input() attrs: BlockEditorNode['attrs'];

contentComponent: DynamicComponentEntity | undefined;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { ChangeDetectionStrategy, Component, computed, Input } from '@angular/core';

import { ContentNode } from '@dotcms/uve/types';
import { BlockEditorNode } from '@dotcms/types';

@Component({
selector: 'dotcms-block-editor-renderer-image',
Expand All @@ -11,7 +11,7 @@ import { ContentNode } from '@dotcms/uve/types';
changeDetection: ChangeDetectionStrategy.OnPush
})
export class DotImageBlock {
@Input() attrs!: ContentNode['attrs'];
@Input() attrs!: BlockEditorNode['attrs'];

protected readonly $srcURL = computed(() => this.attrs?.['src']);
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { NgComponentOutlet } from '@angular/common';
import { Component, Input } from '@angular/core';

import { ContentNode } from '@dotcms/uve/types';
import { BlockEditorNode } from '@dotcms/types';

import { DotCMSBlockEditorItemComponent } from '../item/dotcms-block-editor-item.component';
@Component({
Expand Down Expand Up @@ -48,6 +48,6 @@ import { DotCMSBlockEditorItemComponent } from '../item/dotcms-block-editor-item
`
})
export class DotTableBlock {
@Input() content: ContentNode[] | undefined;
@Input() content: BlockEditorNode[] | undefined;
blockEditorItem = DotCMSBlockEditorItemComponent;
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { ChangeDetectionStrategy, Component, computed, Input } from '@angular/core';

import { Mark } from '@dotcms/uve/types';
import { BlockEditorMark } from '@dotcms/types';

@Component({
selector: 'dotcms-block-editor-renderer-paragraph',
Expand Down Expand Up @@ -63,7 +63,7 @@ export class DotHeadingBlock {
}

interface TextBlockProps {
marks?: Mark[];
marks?: BlockEditorMark[];
text?: string;
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { ChangeDetectionStrategy, Component, computed, Input } from '@angular/core';

import { ContentNode } from '@dotcms/uve/types';
import { BlockEditorNode } from '@dotcms/types';

@Component({
selector: 'dotcms-block-editor-renderer-video',
Expand All @@ -22,7 +22,7 @@ import { ContentNode } from '@dotcms/uve/types';
`
})
export class DotVideoBlock {
@Input() attrs!: ContentNode['attrs'];
@Input() attrs!: BlockEditorNode['attrs'];

protected readonly $srcURL = computed(() => this.attrs?.['src']);

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { createComponentFactory, Spectator } from '@ngneat/spectator/jest';

import { BlockEditorContent, UVE_MODE } from '@dotcms/types';
import { BlockEditorState } from '@dotcms/types/internal';
import { getUVEState } from '@dotcms/uve';
import { BlockEditorState } from '@dotcms/uve/internal';
import { Block, UVE_MODE } from '@dotcms/uve/types';

import { DotCMSBlockEditorRendererComponent } from './dotcms-block-editor-renderer.component';
import { DotCMSBlockEditorItemComponent } from './item/dotcms-block-editor-item.component';
Expand All @@ -26,7 +26,7 @@ describe('DotCMSBlockEditorRendererComponent', () => {
let spectator: Spectator<DotCMSBlockEditorRendererComponent>;
let component: DotCMSBlockEditorRendererComponent;

const mockValidBlock: Block = {
const mockValidBlock: BlockEditorContent = {
type: 'doc',
content: [
{
Expand All @@ -44,7 +44,7 @@ describe('DotCMSBlockEditorRendererComponent', () => {
]
};

const mockInvalidBlock: Block = {
const mockInvalidBlock: BlockEditorContent = {
type: 'invalid',
content: []
};
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import { Component, Input, signal } from '@angular/core';

import { UVE_MODE, BlockEditorContent } from '@dotcms/types';
import { BlockEditorState } from '@dotcms/types/internal';
import { getUVEState } from '@dotcms/uve';
import { BlockEditorState, isValidBlocks } from '@dotcms/uve/internal';
import { UVE_MODE, Block } from '@dotcms/uve/types';
import { isValidBlocks } from '@dotcms/uve/internal';

import { DotCMSBlockEditorItemComponent } from './item/dotcms-block-editor-item.component';

Expand Down Expand Up @@ -40,7 +41,7 @@ export type CustomRenderer = Record<string, DynamicComponentEntity>;
imports: [DotCMSBlockEditorItemComponent]
})
export class DotCMSBlockEditorRendererComponent {
@Input() blocks!: Block;
@Input() blocks!: BlockEditorContent;
@Input() customRenderers: CustomRenderer | undefined;

$blockEditorState = signal<BlockEditorState>({ error: null });
Expand Down
Loading