Merge remote-tracking branch 'origin/main' into issue-30367-Implement…

…-Abandoned-Job-Detection-and-Recovery

core-web/apps/dotcdn/src/app/dotcdn.component.store.ts

@@ -1,4 +1,5 @@
-import { ComponentStore, tapResponse } from '@ngrx/component-store';
+import { ComponentStore } from '@ngrx/component-store';
+import { tapResponse } from '@ngrx/operators';
 import { Observable, of } from 'rxjs';
 
 import { Injectable } from '@angular/core';

core-web/apps/dotcms-ui/proxy-dev.conf.mjs

@@ -24,6 +24,8 @@ export default [
         pathRewrite: {
             '^/assets/manifest.json': '/dotAdmin/assets/manifest.json',
             '^/assets/monaco-editor/min': '/dotAdmin/assets/monaco-editor/min',
+            '^/assets/edit-ema': '/dotAdmin/assets/edit-ema',
+            '^/assets/seo': '/dotAdmin/assets/seo',
             '^/assets': '/dotAdmin',
             '^/tinymce': '/dotAdmin/tinymce'
         }

core-web/apps/dotcms-ui/src/app/portlets/dot-pages/dot-pages-store/dot-pages.store.ts

@@ -1,4 +1,5 @@
-import { ComponentStore, tapResponse } from '@ngrx/component-store';
+import { ComponentStore } from '@ngrx/component-store';
+import { tapResponse } from '@ngrx/operators';
 import { forkJoin, Observable, of } from 'rxjs';
 
 import { HttpErrorResponse } from '@angular/common/http';

core-web/apps/dotcms-ui/src/app/portlets/dot-templates/dot-template-create-edit/store/dot-template.store.ts

@@ -1,4 +1,5 @@
-import { ComponentStore, tapResponse } from '@ngrx/component-store';
+import { ComponentStore } from '@ngrx/component-store';
+import { tapResponse } from '@ngrx/operators';
 import { Observable, of, zip } from 'rxjs';
 
 import { HttpErrorResponse } from '@angular/common/http';

core-web/libs/block-editor/src/lib/extensions/ai-content-prompt/store/ai-content-prompt.store.ts

@@ -1,4 +1,5 @@
-import { ComponentStore, tapResponse } from '@ngrx/component-store';
+import { ComponentStore } from '@ngrx/component-store';
+import { tapResponse } from '@ngrx/operators';
 import { Observable } from 'rxjs';
 
 import { Injectable } from '@angular/core';

core-web/libs/block-editor/src/lib/extensions/asset-form/asset-form.extension.ts

@@ -143,7 +143,11 @@ export const BubbleAssetFormExtension = (viewContainerRef: ViewContainerRef) =>
                     ({ chain }) => {
                         return chain()
                             .command(({ tr }) => {
+                                preventClose = true;
                                 tr.setMeta(BUBBLE_ASSET_FORM_PLUGIN_KEY, { open: true, type });
+                                setTimeout(() => {
+                                    preventClose = false;
+                                }, 0);
 
                                 return true;
                             })

core-web/libs/block-editor/src/lib/extensions/bubble-link-form/bubble-link-form.component.ts

@@ -245,15 +245,22 @@ export class BubbleLinkFormComponent implements OnInit {
                     const { languageId } = contentlet;
                     contentlet.language = this.getContentletLanguage(languageId);
 
+                    // The URLs for urlContentMaps have this format: /content.<contentlet inode>
+                    // So we need to replace it with the actual URL which is stored in urlMap
+                    const cleanedContentlet = {
+                        ...contentlet,
+                        url: contentlet.URL_MAP_FOR_CONTENT ? contentlet.urlMap : contentlet.url
+                    };
+
                     return {
                         label: contentlet.title,
                         icon: 'contentlet/image',
                         data: {
-                            contentlet: contentlet
+                            contentlet: cleanedContentlet
                         },
                         command: () => {
                             this.onSelection({
-                                payload: contentlet,
+                                payload: cleanedContentlet,
                                 type: {
                                     name: 'dotContent'
                                 }

core-web/libs/data-access/src/lib/dot-experiments/dot-experiments.service.spec.ts

@@ -170,4 +170,11 @@ describe('DotExperimentsService', () => {
 
         expect(req.request.body['trafficProportion']).toEqual(newValue);
     });
+
+    it('should return an Observable of undefined when experimentId is undefined', (done) => {
+        spectator.service.getById(undefined).subscribe((result) => {
+            expect(result).toBeUndefined();
+            done();
+        });
+    });
 });

core-web/libs/data-access/src/lib/dot-experiments/dot-experiments.service.ts

@@ -1,9 +1,9 @@
-import { Observable } from 'rxjs';
+import { Observable, of } from 'rxjs';
 
 import { HttpClient } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 
-import { pluck } from 'rxjs/operators';
+import { catchError, pluck } from 'rxjs/operators';
 
 import { DotCMSResponse } from '@dotcms/dotcms-js';
 import {
@@ -83,13 +83,18 @@ export class DotExperimentsService {
     /**
      * Get details of an experiment
      * @param {string} experimentId
-     * @returns Observable<DotExperiment>
+     * @returns Observable<DotExperiment | undefined>
      * @memberof DotExperimentsService
      */
-    getById(experimentId: string): Observable<DotExperiment> {
+    getById(experimentId: string | undefined): Observable<DotExperiment | undefined> {
+        if (!experimentId) {
+            return of(undefined);
+        }
+
         return this.http
             .get<DotCMSResponseExperiment<DotExperiment>>(`${API_ENDPOINT}/${experimentId}`)
-            .pipe(pluck('entity'));
+            .pipe(pluck('entity'))
+            .pipe(catchError(() => of(undefined)));
     }
 
     /**

core-web/libs/edit-content/src/lib/components/dot-edit-content-form/dot-edit-content-form.component.spec.ts

@@ -5,7 +5,6 @@ import {
     Spectator,
     SpyObject
 } from '@ngneat/spectator/jest';
-import { patchState } from '@ngrx/signals';
 import { of } from 'rxjs';
 
 import { Validators } from '@angular/forms';
@@ -23,7 +22,6 @@ import {
     DotWorkflowsActionsService,
     DotWorkflowService
 } from '@dotcms/data-access';
-import { ComponentStatus } from '@dotcms/dotcms-models';
 import { DotWorkflowActionsComponent } from '@dotcms/ui';
 import { DotFormatDateServiceMock } from '@dotcms/utils-testing';
 
@@ -129,21 +127,6 @@ describe('DotFormComponent', () => {
             expect(component.form.get('modUserName')).toBeFalsy();
             expect(component.form.get('publishDate')).toBeFalsy();
         });
-
-        it('should disable the form when loading and enable it when not loading', () => {
-            spectator.detectChanges();
-
-            // // Initially, the form should be enabled
-            expect(component.form.enabled).toBe(true);
-
-            patchState(store, {
-                state: ComponentStatus.SAVING
-            });
-
-            spectator.flushEffects();
-
-            expect(component.form.enabled).toBe(false);
-        });
     });
 
     describe('New Content', () => {

core-web/libs/edit-content/src/lib/feature/edit-content/store/edit-content.store.ts

@@ -1,4 +1,4 @@
-import { tapResponse } from '@ngrx/component-store';
+import { tapResponse } from '@ngrx/operators';
 import {
     patchState,
     signalStore,
@@ -18,18 +18,18 @@ import { MessageService } from 'primeng/api';
 
 import { switchMap, tap } from 'rxjs/operators';
 
-import { DotCMSContentlet } from '@dotcms/angular';
 import {
     DotContentTypeService,
     DotFireActionOptions,
     DotHttpErrorManagerService,
+    DotMessageService,
     DotRenderMode,
     DotWorkflowActionsFireService,
-    DotWorkflowsActionsService,
-    DotMessageService
+    DotWorkflowsActionsService
 } from '@dotcms/data-access';
 import {
     ComponentStatus,
+    DotCMSContentlet,
     DotCMSContentType,
     DotCMSWorkflowAction,
     FeaturedFlags
@@ -65,7 +65,7 @@ const initialState: EditContentState = {
  * related to content editing and workflow actions.
  */
 export const DotEditContentStore = signalStore(
-    withState(initialState),
+    withState<EditContentState>(initialState),
     withComputed((store) => ({
         /**
          * Computed property that determines if the new content editor feature is enabled.
@@ -77,9 +77,13 @@ export const DotEditContentStore = signalStore(
          */
         isEnabledNewContentEditor: computed(() => {
             const contentType = store.contentType();
-            const metadata = contentType?.metadata;
+            if (!contentType?.metadata) {
+                return false;
+            }
 
-            return metadata?.[FeaturedFlags.FEATURE_FLAG_CONTENT_EDITOR2_ENABLED] === true;
+            return (
+                contentType.metadata[FeaturedFlags.FEATURE_FLAG_CONTENT_EDITOR2_ENABLED] === true
+            );
         }),
 
         /**

core-web/libs/edit-content/src/lib/feature/edit-content/store/features/information.feature.ts

@@ -1,4 +1,4 @@
-import { tapResponse } from '@ngrx/component-store';
+import { tapResponse } from '@ngrx/operators';
 import {
     patchState,
     signalStoreFeature,

core-web/libs/edit-content/src/lib/feature/edit-content/store/features/workflow.feature.ts

@@ -1,4 +1,4 @@
-import { tapResponse } from '@ngrx/component-store';
+import { tapResponse } from '@ngrx/operators';
 import {
     patchState,
     signalStoreFeature,

core-web/libs/edit-content/src/lib/fields/dot-edit-content-binary-field/components/dot-binary-field-url-mode/store/dot-binary-field-url-mode.store.ts

@@ -1,4 +1,5 @@
-import { ComponentStore, tapResponse } from '@ngrx/component-store';
+import { ComponentStore } from '@ngrx/component-store';
+import { tapResponse } from '@ngrx/operators';
 import { Observable, from } from 'rxjs';
 
 import { Injectable } from '@angular/core';

core-web/libs/edit-content/src/lib/fields/dot-edit-content-binary-field/store/binary-field.store.ts

@@ -1,4 +1,5 @@
-import { ComponentStore, tapResponse } from '@ngrx/component-store';
+import { ComponentStore } from '@ngrx/component-store';
+import { tapResponse } from '@ngrx/operators';
 import { from, Observable, of } from 'rxjs';
 
 import { HttpClient } from '@angular/common/http';

core-web/libs/edit-content/src/lib/fields/dot-edit-content-category-field/store/content-category-field.store.ts

@@ -1,4 +1,4 @@
-import { tapResponse } from '@ngrx/component-store';
+import { tapResponse } from '@ngrx/operators';
 import { patchState, signalStore, withComputed, withMethods, withState } from '@ngrx/signals';
 import { rxMethod } from '@ngrx/signals/rxjs-interop';
 import { pipe } from 'rxjs';

core-web/libs/edit-content/src/lib/fields/dot-edit-content-file-field/components/dot-form-import-url/store/form-import-url.store.ts

@@ -9,7 +9,7 @@ import { switchMap, tap } from 'rxjs/operators';
 
 import { ComponentStatus, DotHttpErrorResponse } from '@dotcms/dotcms-models';
 
-import { UploadedFile, UPLOAD_TYPE } from '../../../../../models/dot-edit-content-file.model';
+import { UPLOAD_TYPE, UploadedFile } from '../../../../../models/dot-edit-content-file.model';
 import { DotFileFieldUploadService } from '../../../services/upload-file/upload-file.service';
 
 export interface FormImportUrlState {
@@ -29,6 +29,7 @@ const initialState: FormImportUrlState = {
 };
 
 export const FormImportUrlStore = signalStore(
+    { protectedState: false }, // TODO: remove when the unit tests are fixed
     withState(initialState),
     withComputed((state) => ({
         isLoading: computed(() => state.status() === ComponentStatus.LOADING),

core-web/libs/edit-content/src/lib/fields/dot-edit-content-file-field/components/dot-select-existing-file/store/select-existing-file.store.ts

@@ -1,4 +1,4 @@
-import { tapResponse } from '@ngrx/component-store';
+import { tapResponse } from '@ngrx/operators';
 import { patchState, signalStore, withComputed, withMethods, withState } from '@ngrx/signals';
 import { rxMethod } from '@ngrx/signals/rxjs-interop';
 import { pipe } from 'rxjs';

core-web/libs/edit-content/src/lib/fields/dot-edit-content-file-field/store/file-field.store.ts

@@ -55,6 +55,7 @@ const initialState: FileFieldState = {
 };
 
 export const FileFieldStore = signalStore(
+    { protectedState: false }, // TODO: remove when the unit tests are fixed
     withState(initialState),
     withComputed(({ fileStatus }) => ({
         isInit: computed(() => {

core-web/libs/portlets/dot-analytics-search/portlet/src/lib/store/dot-analytics-search.store.ts

@@ -1,5 +1,5 @@
 import { JsonObject } from '@angular-devkit/core';
-import { tapResponse } from '@ngrx/component-store';
+import { tapResponse } from '@ngrx/operators';
 import { patchState, signalStore, withHooks, withMethods, withState } from '@ngrx/signals';
 import { rxMethod } from '@ngrx/signals/rxjs-interop';
 import { pipe } from 'rxjs';

core-web/libs/portlets/dot-experiments/portlet/src/lib/dot-experiments-configuration/store/dot-experiments-configuration-store.ts

@@ -1,4 +1,5 @@
-import { ComponentStore, tapResponse } from '@ngrx/component-store';
+import { ComponentStore } from '@ngrx/component-store';
+import { tapResponse } from '@ngrx/operators';
 import { Observable, throwError } from 'rxjs';
 
 import { HttpErrorResponse } from '@angular/common/http';

core-web/libs/portlets/dot-experiments/portlet/src/lib/dot-experiments-list/store/dot-experiments-list-store.ts

@@ -1,4 +1,5 @@
-import { ComponentStore, OnStateInit, tapResponse } from '@ngrx/component-store';
+import { ComponentStore, OnStateInit } from '@ngrx/component-store';
+import { tapResponse } from '@ngrx/operators';
 import { EMPTY, Observable, throwError } from 'rxjs';
 
 import { HttpErrorResponse } from '@angular/common/http';

core-web/libs/portlets/dot-experiments/portlet/src/lib/dot-experiments-reports/store/dot-experiments-reports-store.ts

@@ -1,4 +1,5 @@
-import { ComponentStore, tapResponse } from '@ngrx/component-store';
+import { ComponentStore } from '@ngrx/component-store';
+import { tapResponse } from '@ngrx/operators';
 import { ChartData } from 'chart.js';
 import { forkJoin, Observable, of } from 'rxjs';
 

core-web/libs/portlets/dot-locales/portlet/src/lib/dot-locales-list/store/dot-locales-list.store.ts

@@ -1,4 +1,5 @@
-import { ComponentStore, tapResponse } from '@ngrx/component-store';
+import { ComponentStore } from '@ngrx/component-store';
+import { tapResponse } from '@ngrx/operators';
 import { forkJoin } from 'rxjs';
 
 import { HttpErrorResponse } from '@angular/common/http';

core-web/libs/portlets/edit-ema/portlet/src/lib/components/dot-block-editor-sidebar/dot-block-editor-sidebar.component.html

@@ -11,7 +11,7 @@
             <dot-block-editor
                 [field]="contentlet.field"
                 [value]="contentlet.content"
-                [languageId]="contentlet.languageId"
+                [languageId]="contentlet.language"
                 (valueChange)="value.set($event)"
                 data-testId="dot-block-editor" />
         }

core-web/libs/portlets/edit-ema/portlet/src/lib/components/dot-block-editor-sidebar/dot-block-editor-sidebar.component.spec.ts

@@ -74,9 +74,12 @@ const messageServiceMock = new MockDotMessageService({
 const EVENT_DATA = {
     fieldName: 'testName',
     contentType: 'Blog',
-    language: '2',
+    language: 2,
     inode: 'testInode',
-    blockEditorContent: '{"field":"field value"}'
+    content: {
+        conent: [],
+        type: 'doc'
+    }
 };
 
 const contentTypeMock: DotCMSContentType = {
@@ -135,8 +138,8 @@ describe('DotBlockEditorSidebarComponent', () => {
         const blockEditor = spectator.query(DotBlockEditorComponent);
 
         expect(blockEditor.field).toEqual(BLOCK_EDITOR_FIELD);
-        expect(blockEditor.languageId).toBe(parseInt(EVENT_DATA.language));
-        expect(blockEditor.value).toEqual(JSON.parse(EVENT_DATA.blockEditorContent));
+        expect(blockEditor.languageId).toBe(EVENT_DATA.language);
+        expect(blockEditor.value).toEqual(EVENT_DATA.content);
         expect(dotContentTypeService.getContentType).toHaveBeenCalledWith('Blog');
     });