fix(content drive): Redirects to content search after closing edit dialog (dotCMS#33726)

## Summary

This PR fixes the issue where Content Drive redirects to the old content
search page after closing the edit content dialog. The fix ensures
proper navigation back to Content Drive with the correct context
preserved.


https://github.com/user-attachments/assets/81d5cb2b-0c36-45d2-9584-983dd70eccfd


**Key Changes:**

- **Content Drive Navigation**: Implemented redirect logic in
`DotContentletWrapperComponent` to detect Content Drive context (via
`CD_` query parameters) and navigate back to Content Drive instead of
old content search
- **Query Parameter Mapping**: Added bidirectional parameter mapping
utilities (`mapParamsFromEditContentlet` and `mapQueryParamsToCDParams`)
to handle Content Drive context across edit flows
- **Navigation Service Updates**: Enhanced
`DotContentDriveNavigationService` to include Content Drive query
parameters when navigating to old content editor
- **Router Service Enhancement**: Updated
`DotRouterService.gotoPortlet()` to support `queryParams` option for
preserving navigation context
- **Localization**: Added "Root" folder label translation for better UX
- **Search Fixes**: Fixed special character handling in search with
proper Lucene escaping (dash, plus, etc.)
- **Content Type Field**: Improved `linkedSignal` behavior to prevent
unnecessary updates before content types are loaded

Closes dotCMS#33722, dotCMS#33528

Author: zJaaal

core-web/apps/dotcms-ui/src/app/view/components/dot-contentlet-editor/components/dot-contentlet-wrapper/dot-contentlet-wrapper.component.spec.ts

@@ -201,6 +201,37 @@ describe('DotContentletWrapperComponent', () => {
                 expect(dotRouterService.goToEditPage).not.toHaveBeenCalled();
             });
 
+            it('should close the dialog and navigate to content-drive when CD query params exist', () => {
+                const contentDriveParams = {
+                    folderId: '123',
+                    path: '/images'
+                };
+
+                Object.defineProperty(dotRouterService, 'currentPortlet', {
+                    value: {
+                        url: '/test?CD_folderId=123&CD_path=/images',
+                        id: '123'
+                    },
+                    writable: true
+                });
+
+                jest.spyOn(dotRouterService, 'gotoPortlet');
+
+                dotIframeDialog.triggerEventHandler('custom', {
+                    detail: {
+                        name: 'close'
+                    }
+                });
+
+                expect(dotAddContentletService.clear).toHaveBeenCalledTimes(1);
+                expect(component.header).toBe('');
+                expect(component.custom.emit).toHaveBeenCalledTimes(1);
+                expect(component.shutdown.emit).toHaveBeenCalledTimes(1);
+                expect(dotRouterService.gotoPortlet).toHaveBeenCalledWith('content-drive', {
+                    queryParams: contentDriveParams
+                });
+            });
+
             it('should called goToEdit', () => {
                 dotIframeDialog.triggerEventHandler('custom', {
                     detail: {

core-web/apps/dotcms-ui/src/app/view/components/dot-contentlet-editor/components/dot-contentlet-wrapper/dot-contentlet-wrapper.component.ts

@@ -8,6 +8,7 @@ import {
     DotRouterService,
     DotIframeService
 } from '@dotcms/data-access';
+import { mapParamsFromEditContentlet } from '@dotcms/utils';
 
 import { DotContentletEditorService } from '../../services/dot-contentlet-editor.service';
 
@@ -150,6 +151,19 @@ export class DotContentletWrapperComponent {
         this.isContentletModified = false;
         this.header = '';
         this.shutdown.emit();
+
+        const searchParams = new URL(
+            this.dotRouterService.currentPortlet.url,
+            window.location.origin
+        ).searchParams;
+
+        const contentDriveParams = mapParamsFromEditContentlet(searchParams);
+
+        if (Object.keys(contentDriveParams).length) {
+            this.dotRouterService.gotoPortlet('content-drive', {
+                queryParams: contentDriveParams
+            });
+        }
     }
 
     /**

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

@@ -40,9 +40,11 @@ class RouterMock {
         return this._events.asObservable();
     }
 
-    getCurrentNavigation() {
+    getCurrentNavigation(): { finalUrl: { queryParams: { [key: string]: string } } } | null {
         return {
-            finalUrl: {}
+            finalUrl: {
+                queryParams: {}
+            }
         };
     }
 
@@ -61,7 +63,7 @@ class ActivatedRouteMock {
 
 describe('DotRouterService', () => {
     let service: DotRouterService;
-    let router;
+    let router: InstanceType<typeof RouterMock>;
 
     beforeEach(waitForAsync(() => {
         const testbed = TestBed.configureTestingModule({
@@ -84,7 +86,7 @@ describe('DotRouterService', () => {
         });
 
         service = testbed.inject(DotRouterService);
-        router = testbed.inject(Router);
+        router = testbed.inject(Router) as unknown as InstanceType<typeof RouterMock>;
     }));
 
     it('should set current url value', () => {
@@ -250,7 +252,10 @@ describe('DotRouterService', () => {
 
     it('should got to porlet by URL', () => {
         service.gotoPortlet('/c/test');
-        expect(router.createUrlTree).toHaveBeenCalledWith(['/c/test'], { queryParamsHandling: '' });
+        expect(router.createUrlTree).toHaveBeenCalledWith(['/c/test'], {
+            queryParamsHandling: '',
+            queryParams: {}
+        });
         expect(router.navigateByUrl).toHaveBeenCalledWith(['/c/test'], { replaceUrl: false });
     });
 
@@ -260,13 +265,36 @@ describe('DotRouterService', () => {
             replaceUrl: false
         });
         expect(router.createUrlTree).toHaveBeenCalledWith(['/c/test?filter="Blog"'], {
-            queryParamsHandling: 'preserve'
+            queryParamsHandling: 'preserve',
+            queryParams: {}
         });
         expect(router.navigateByUrl).toHaveBeenCalledWith(['/c/test?filter="Blog"'], {
             replaceUrl: false
         });
     });
 
+    it('should go to porlet by URL with queryParams', () => {
+        const queryParams = {
+            folderId: '123',
+            path: '/images'
+        };
+
+        service.gotoPortlet('/c/content-drive', {
+            queryParams
+        });
+
+        expect(router.createUrlTree).toHaveBeenCalledWith(['/c/content-drive'], {
+            queryParamsHandling: '',
+            queryParams: {
+                folderId: '123',
+                path: '/images'
+            }
+        });
+        expect(router.navigateByUrl).toHaveBeenCalledWith(['/c/content-drive'], {
+            replaceUrl: false
+        });
+    });
+
     it('should return the correct  Portlet Id', () => {
         expect(service.getPortletId('#/c/content?test=value')).toBe('content');
         expect(service.getPortletId('/c/add/content?fds=ds')).toBe('content');

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

@@ -338,8 +338,15 @@ export class DotRouterService {
      * @memberof DotRouterService
      */
     gotoPortlet(link: string, navigateToPorletOptions?: DotNavigateToOptions): Promise<boolean> {
-        const { replaceUrl = false, queryParamsHandling = '' } = navigateToPorletOptions || {};
-        const url = this.router.createUrlTree([link], { queryParamsHandling });
+        const {
+            replaceUrl = false,
+            queryParamsHandling = '',
+            queryParams = {}
+        } = navigateToPorletOptions || {};
+        const url = this.router.createUrlTree([link], {
+            queryParamsHandling,
+            queryParams
+        });
 
         return this.router.navigateByUrl(url, { replaceUrl });
     }

core-web/libs/dotcms-models/src/lib/navigation/navigate-to-options.model.ts

@@ -3,4 +3,5 @@ import { QueryParamsHandling } from '@angular/router';
 export interface DotNavigateToOptions {
     replaceUrl?: boolean;
     queryParamsHandling?: QueryParamsHandling;
+    queryParams?: Record<string, string>;
 }

core-web/libs/portlets/dot-content-drive/portlet/src/lib/components/dot-content-drive-sidebar/dot-content-drive-sidebar.component.spec.ts

@@ -13,14 +13,14 @@ import {
     DotContentDriveUploadFiles,
     DotTreeFolderComponent,
     DotFolderTreeNodeItem,
-    DotContentDriveMoveItems
+    DotContentDriveMoveItems,
+    ALL_FOLDER
 } from '@dotcms/portlets/content-drive/ui';
 import { GlobalStore } from '@dotcms/store';
 
 import { DotContentDriveSidebarComponent } from './dot-content-drive-sidebar.component';
 
 import { DotContentDriveStore } from '../../store/dot-content-drive.store';
-import { ALL_FOLDER } from '../../utils/tree-folder.utils';
 
 describe('DotContentDriveSidebarComponent', () => {
     let spectator: Spectator<DotContentDriveSidebarComponent>;

core-web/libs/portlets/dot-content-drive/portlet/src/lib/components/dot-content-drive-sidebar/dot-content-drive-sidebar.component.ts

@@ -10,6 +10,7 @@ import {
 import { TreeNodeCollapseEvent, TreeNodeExpandEvent, TreeNodeSelectEvent } from 'primeng/tree';
 
 import {
+    ALL_FOLDER,
     DotContentDriveMoveItems,
     DotContentDriveUploadFiles,
     DotTreeFolderComponent
@@ -95,7 +96,7 @@ export class DotContentDriveSidebarComponent {
     protected onNodeCollapse(event: TreeNodeCollapseEvent): void {
         const { node } = event;
 
-        if (node.key === 'ALL_FOLDER') {
+        if (node.key === ALL_FOLDER.key) {
             node.expanded = true;
             return;
         }

core-web/libs/portlets/dot-content-drive/portlet/src/lib/components/dot-content-drive-toolbar/components/dot-content-drive-content-type-field/dot-content-drive-content-type-field.component.spec.ts

@@ -551,6 +551,13 @@ describe('DotContentDriveContentTypeFieldComponent', () => {
 
     describe('Content Type Selection & Store Integration', () => {
         beforeEach(() => {
+            // Populate the state with content types so onChange can work
+            patchState(spectator.component.$state, {
+                contentTypes: MOCK_CONTENT_TYPES.filter(
+                    (ct) => ct.baseType !== DotCMSBaseTypesContentTypes.FORM && !ct.system
+                )
+            });
+
             // Set up component with pre-selected content types for testing
             spectator.component.$selectedContentTypes.set([
                 MOCK_CONTENT_TYPES[0], // blog

core-web/libs/portlets/dot-content-drive/portlet/src/lib/components/dot-content-drive-toolbar/components/dot-content-drive-content-type-field/dot-content-drive-content-type-field.component.ts

@@ -64,22 +64,29 @@ export class DotContentDriveContentTypeFieldComponent implements OnInit {
         contentTypes: []
     });
 
-    readonly $selectedContentTypes = linkedSignal<DotCMSContentType[]>(() => {
-        const contentTypesParam = this.#store.getFilterValue('contentType') as string[];
+    readonly $selectedContentTypes = linkedSignal<DotCMSContentType[]>(
+        () => {
+            const contentTypesParam = this.#store.getFilterValue('contentType') as string[];
 
-        if (!contentTypesParam) {
-            return [];
-        }
+            if (!contentTypesParam) {
+                return [];
+            }
 
-        const contentType = this.$state.contentTypes();
+            const contentType = this.$state.contentTypes();
 
-        // Get contentTypes using the contentTypesParam
-        const contentTypes = contentType.filter((item) =>
-            contentTypesParam.includes(item.variable)
-        );
+            // Get contentTypes using the contentTypesParam
+            const contentTypes = contentType.filter((item) =>
+                contentTypesParam.includes(item.variable)
+            );
 
-        return contentTypes ?? [];
-    });
+            return contentTypes ?? [];
+        },
+        {
+            // It will only trigger changes when we have content types to check for.
+            equal: (a, b) =>
+                !this.$state.contentTypes().length || (a?.length === b?.length && a === b)
+        }
+    );
 
     /**
      * Maps the ensured content types to a string
@@ -165,6 +172,11 @@ export class DotContentDriveContentTypeFieldComponent implements OnInit {
     protected onChange() {
         const value = this.$selectedContentTypes();
 
+        // If there is no content types, don't update the store
+        if (!this.$state.contentTypes().length) {
+            return;
+        }
+
         if (value?.length) {
             this.#store.patchFilters({
                 contentType: value.map((item) => item.variable)

core-web/libs/portlets/dot-content-drive/portlet/src/lib/components/dot-content-drive-toolbar/components/dot-content-drive-search-input/dot-content-drive-search-input.component.spec.ts

@@ -13,10 +13,11 @@ import { IconFieldModule } from 'primeng/iconfield';
 import { InputIconModule } from 'primeng/inputicon';
 import { InputTextModule } from 'primeng/inputtext';
 
+import { ALL_FOLDER } from '@dotcms/portlets/content-drive/ui';
+
 import { DotContentDriveSearchInputComponent } from './dot-content-drive-search-input.component';
 
 import { DotContentDriveStore } from '../../../../store/dot-content-drive.store';
-import { ALL_FOLDER } from '../../../../utils/tree-folder.utils';
 
 describe('DotContentDriveSearchInputComponent', () => {
     let spectator: Spectator<DotContentDriveSearchInputComponent>;