From 4720c7c897570de776e75fb4f0b2a3781e5a32eb Mon Sep 17 00:00:00 2001 From: erickgonzalez Date: Tue, 27 Feb 2024 08:47:42 -0600 Subject: [PATCH] #26853 include in 23.10.24 --- core-web/libs/block-editor/src/lib/block-editor.module.ts | 1 + .../ai-content-prompt/ai-content-prompt.component.ts | 1 - .../lib/extensions/ai-image-prompt/ai-image-prompt.store.ts | 1 + .../dot-edit-content-field.component.spec.ts | 3 ++- 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/core-web/libs/block-editor/src/lib/block-editor.module.ts b/core-web/libs/block-editor/src/lib/block-editor.module.ts index 2d9c01c8a22a..936e05d26171 100644 --- a/core-web/libs/block-editor/src/lib/block-editor.module.ts +++ b/core-web/libs/block-editor/src/lib/block-editor.module.ts @@ -5,6 +5,7 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms'; // DotCMS JS import { ConfirmationService } from 'primeng/api'; import { ConfirmDialogModule } from 'primeng/confirmdialog'; + import { DotMessageService } from '@dotcms/data-access'; import { LoggerService, StringUtils } from '@dotcms/dotcms-js'; import { DotFieldRequiredDirective, DotMessagePipe } from '@dotcms/ui'; diff --git a/core-web/libs/block-editor/src/lib/extensions/ai-content-prompt/ai-content-prompt.component.ts b/core-web/libs/block-editor/src/lib/extensions/ai-content-prompt/ai-content-prompt.component.ts index c943403dbabc..3729e34aed5d 100644 --- a/core-web/libs/block-editor/src/lib/extensions/ai-content-prompt/ai-content-prompt.component.ts +++ b/core-web/libs/block-editor/src/lib/extensions/ai-content-prompt/ai-content-prompt.component.ts @@ -16,7 +16,6 @@ import { ConfirmationService } from 'primeng/api'; import { filter, takeUntil } from 'rxjs/operators'; import { DotMessageService } from '@dotcms/data-access'; - import { ComponentStatus } from '@dotcms/dotcms-models'; import { AiContentPromptState, AiContentPromptStore } from './store/ai-content-prompt.store'; diff --git a/core-web/libs/block-editor/src/lib/extensions/ai-image-prompt/ai-image-prompt.store.ts b/core-web/libs/block-editor/src/lib/extensions/ai-image-prompt/ai-image-prompt.store.ts index 4544e9c371d2..0ea418aa3405 100644 --- a/core-web/libs/block-editor/src/lib/extensions/ai-image-prompt/ai-image-prompt.store.ts +++ b/core-web/libs/block-editor/src/lib/extensions/ai-image-prompt/ai-image-prompt.store.ts @@ -120,6 +120,7 @@ export class DotAiImagePromptStore extends ComponentStore { this.patchState({ status: ComponentStatus.IDLE, error }); + return of(null); } ) diff --git a/core-web/libs/edit-content/src/lib/components/dot-edit-content-field/dot-edit-content-field.component.spec.ts b/core-web/libs/edit-content/src/lib/components/dot-edit-content-field/dot-edit-content-field.component.spec.ts index 96b6e32b9ae6..b5cdb1afe593 100644 --- a/core-web/libs/edit-content/src/lib/components/dot-edit-content-field/dot-edit-content-field.component.spec.ts +++ b/core-web/libs/edit-content/src/lib/components/dot-edit-content-field/dot-edit-content-field.component.spec.ts @@ -4,11 +4,12 @@ import { byTestId, createComponentFactory, mockProvider, Spectator } from '@ngne import { ControlContainer, FormGroupDirective } from '@angular/forms'; import { By } from '@angular/platform-browser'; +import { ConfirmationService } from 'primeng/api'; + import { DotMessageService } from '@dotcms/data-access'; import { DotEditContentFieldComponent } from './dot-edit-content-field.component'; import { FIELD_TYPES, FIELD_TYPES_COMPONENTS } from './utils'; -import { ConfirmationService } from 'primeng/api'; import { FIELDS_MOCK, createFormGroupDirectiveMock } from '../../utils/mocks';