33073 rxjs from v6 to v7

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

@@ -6,7 +6,7 @@ import { inject, Injectable } from '@angular/core';
 
 import { SelectItem } from 'primeng/api';
 
-import { mergeMap, switchMapTo, tap } from 'rxjs/operators';
+import { mergeMap, switchMap, tap } from 'rxjs/operators';
 
 import {
     ChartData,
@@ -167,7 +167,7 @@ export class DotCDNStore extends ComponentStore<DotCDNState> {
         );
 
         return loading$.pipe(
-            switchMapTo(
+            switchMap(() =>
                 this.dotCdnService.purgeCache(urls).pipe(
                     tap(() => {
                         this.dispatchLoading({
@@ -188,7 +188,7 @@ export class DotCDNStore extends ComponentStore<DotCDNState> {
             })
         );
 
-        $loading.pipe(switchMapTo(this.dotCdnService.purgeCacheAll())).subscribe(() => {
+        $loading.pipe(switchMap(() => this.dotCdnService.purgeCacheAll())).subscribe(() => {
             this.dispatchLoading({
                 loadingState: LoadingState.LOADED,
                 loader: Loader.PURGE_PULL_ZONE

core-web/apps/dotcms-ui/src/app/api/services/dot-menu.service.ts

@@ -3,16 +3,7 @@ import { Observable } from 'rxjs';
 import { HttpClient } from '@angular/common/http';
 import { Injectable, inject } from '@angular/core';
 
-import {
-    defaultIfEmpty,
-    filter,
-    find,
-    map,
-    mergeMap,
-    pluck,
-    publishLast,
-    refCount
-} from 'rxjs/operators';
+import { defaultIfEmpty, filter, find, map, mergeMap, shareReplay } from 'rxjs/operators';
 
 import { DotCMSResponse, DotMenu, DotMenuItem } from '@dotcms/dotcms-models';
 
@@ -33,7 +24,7 @@ export class DotMenuService {
     getUrlById(id: string): Observable<string> {
         return this.getMenuItems().pipe(
             filter((res: DotMenuItem) => !res.angular && res.id === id),
-            pluck('url'),
+            map((res) => res?.url),
             defaultIfEmpty('')
         );
     }
@@ -69,9 +60,10 @@ export class DotMenuService {
      */
     loadMenu(force = false): Observable<DotMenu[]> {
         if (!this.menu$ || force) {
-            this.menu$ = this.http
-                .get<DotCMSResponse<DotMenu>>(this.urlMenus)
-                .pipe(publishLast(), refCount(), pluck('entity'));
+            this.menu$ = this.http.get<DotCMSResponse<DotMenu[]>>(this.urlMenus).pipe(
+                shareReplay({ bufferSize: 1, refCount: true }),
+                map((x) => x.entity)
+            );
         }
 
         return this.menu$;

core-web/apps/dotcms-ui/src/app/api/services/dynamic-route-initializer.service.spec.ts

@@ -104,7 +104,7 @@ describe('DynamicRouteInitializerService', () => {
     });
 
     it('should resolve to 0 on error', async () => {
-        (menuService.loadMenu as jest.Mock).mockReturnValue(throwError(new Error('fail')));
+        (menuService.loadMenu as jest.Mock).mockReturnValue(throwError(() => new Error('fail')));
 
         const count = await service.initialize();
 

core-web/apps/dotcms-ui/src/app/app.component.spec.ts

@@ -155,7 +155,7 @@ describe('AppComponent', () => {
 
         it('should use default colors when configuration fails to load', () => {
             const error = new Error('Failed to load configuration');
-            jest.spyOn(dotCmsConfigService, 'getConfig').mockReturnValue(throwError(error));
+            jest.spyOn(dotCmsConfigService, 'getConfig').mockReturnValue(throwError(() => error));
 
             fixture.detectChanges();
 
@@ -178,7 +178,9 @@ describe('AppComponent', () => {
 
         it('should handle configuration error gracefully (unauthenticated user)', () => {
             const httpError = { status: 401, message: 'Unauthorized' };
-            jest.spyOn(dotCmsConfigService, 'getConfig').mockReturnValue(throwError(httpError));
+            jest.spyOn(dotCmsConfigService, 'getConfig').mockReturnValue(
+                throwError(() => httpError)
+            );
 
             fixture.detectChanges();
 
@@ -199,7 +201,7 @@ describe('AppComponent', () => {
 
         it('should always set colors even when configuration fails', () => {
             jest.spyOn(dotCmsConfigService, 'getConfig').mockReturnValue(
-                throwError(new Error('Network error'))
+                throwError(() => new Error('Network error'))
             );
 
             // Mock querySelector to return null (edge case)

core-web/apps/dotcms-ui/src/app/portlets/dot-apps/components/dot-apps-configuration-detail/dot-apps-configuration-detail.component.ts

@@ -3,7 +3,7 @@ import { ActivatedRoute } from '@angular/router';
 
 import { ButtonModule } from 'primeng/button';
 
-import { pluck, take } from 'rxjs/operators';
+import { map, take } from 'rxjs/operators';
 
 import { DotAppsService, DotRouterService } from '@dotcms/data-access';
 import { DotApp, DotAppsSaveData, DotAppsSecret } from '@dotcms/dotcms-models';
@@ -39,13 +39,18 @@ export class DotAppsConfigurationDetailComponent implements OnInit {
     formValid = false;
 
     ngOnInit() {
-        this.route.data.pipe(pluck('data'), take(1)).subscribe((app: DotApp) => {
-            this.apps = app;
-            this.formFields = this.getSecrets(app.sites[0].secrets);
-            this.dynamicVariables = this.transformSecretsToKeyValue(
-                this.getSecrets(app.sites[0].secrets, true)
-            );
-        });
+        this.route.data
+            .pipe(
+                map((x) => x?.data),
+                take(1)
+            )
+            .subscribe((app: DotApp) => {
+                this.apps = app;
+                this.formFields = this.getSecrets(app.sites[0].secrets);
+                this.dynamicVariables = this.transformSecretsToKeyValue(
+                    this.getSecrets(app.sites[0].secrets, true)
+                );
+            });
     }
 
     /**

core-web/apps/dotcms-ui/src/app/portlets/dot-apps/components/dot-apps-configuration/dot-apps-configuration.component.ts

@@ -18,7 +18,7 @@ import { LazyLoadEvent } from 'primeng/api';
 import { ButtonModule } from 'primeng/button';
 import { InputTextModule } from 'primeng/inputtext';
 
-import { debounceTime, pluck, take } from 'rxjs/operators';
+import { debounceTime, map, take } from 'rxjs/operators';
 
 import {
     DotAlertConfirmService,
@@ -81,22 +81,27 @@ export class DotAppsConfigurationComponent implements OnInit, AfterViewInit {
     });
 
     ngOnInit() {
-        this.#route.data.pipe(pluck('data'), take(1)).subscribe((app: DotApp) => {
-            patchState(this.$state, {
-                app: {
-                    ...app,
-                    sites: []
-                }
-            });
+        this.#route.data
+            .pipe(
+                map((x) => x?.data),
+                take(1)
+            )
+            .subscribe((app: DotApp) => {
+                patchState(this.$state, {
+                    app: {
+                        ...app,
+                        sites: []
+                    }
+                });
 
-            // Initialize pagination after app data is available
-            this.paginationService.url = `v1/apps/${app.key}`;
-            this.paginationService.paginationPerPage = this.$paginationPerPage();
-            this.paginationService.sortField = 'name';
-            this.paginationService.setExtraParams('filter', '');
-            this.paginationService.sortOrder = 1;
-            this.loadData();
-        });
+                // Initialize pagination after app data is available
+                this.paginationService.url = `v1/apps/${app.key}`;
+                this.paginationService.paginationPerPage = this.$paginationPerPage();
+                this.paginationService.sortField = 'name';
+                this.paginationService.setExtraParams('filter', '');
+                this.paginationService.sortOrder = 1;
+                this.loadData();
+            });
     }
 
     ngAfterViewInit() {

core-web/apps/dotcms-ui/src/app/portlets/dot-apps/dot-apps-import-export-dialog/store/dot-apps-import-export-dialog.store.spec.ts

@@ -317,7 +317,7 @@ describe('DotAppsImportExportDialogStore', () => {
         it('should set error on import error', () => {
             spectator.service.openImport();
             dotAppsService.importConfiguration.mockReturnValue(
-                throwError(new Error('Network error'))
+                throwError(() => new Error('Network error'))
             );
 
             spectator.service.importConfiguration({

core-web/apps/dotcms-ui/src/app/portlets/dot-containers/container-list/store/dot-container-list.store.ts

@@ -5,7 +5,7 @@ import { ActivatedRoute } from '@angular/router';
 
 import { MenuItem } from 'primeng/api';
 
-import { pluck, switchMap, take, tap } from 'rxjs/operators';
+import { map, switchMap, take, tap } from 'rxjs/operators';
 
 import {
     DotAlertConfirmService,
@@ -79,7 +79,10 @@ export class DotContainerListStore extends ComponentStore<DotContainerListState>
 
                     this.paginatorService.setExtraParams('host', identifier);
 
-                    return this.route.data.pipe(pluck('dotContainerListResolverData'), take(1));
+                    return this.route.data.pipe(
+                        map((x) => x?.dotContainerListResolverData),
+                        take(1)
+                    );
                 })
             )
             .subscribe(([isEnterprise, hasEnvironments]: [boolean, boolean]) => {

core-web/apps/dotcms-ui/src/app/portlets/dot-containers/dot-container-create/dot-container-create.component.ts

@@ -3,7 +3,7 @@ import { ActivatedRoute } from '@angular/router';
 
 import { TabsModule } from 'primeng/tabs';
 
-import { pluck, take } from 'rxjs/operators';
+import { map, take } from 'rxjs/operators';
 
 import { DotRouterService } from '@dotcms/data-access';
 import { DotContainerEntity } from '@dotcms/dotcms-models';
@@ -38,7 +38,10 @@ export class DotContainerCreateComponent implements OnInit {
 
     ngOnInit() {
         this.activatedRoute.data
-            .pipe(pluck('container'), take(1))
+            .pipe(
+                map((x) => x?.container),
+                take(1)
+            )
             .subscribe((container: DotContainerEntity) => {
                 if (container?.container) this.containerId = container.container.identifier;
                 else this.dotRouterService.goToCreateContainer();

core-web/apps/dotcms-ui/src/app/portlets/dot-containers/dot-container-create/dot-container-properties/store/dot-container-properties.store.ts

@@ -5,7 +5,7 @@ import { HttpErrorResponse } from '@angular/common/http';
 import { Injectable, inject } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 
-import { catchError, filter, pluck, switchMap, take, tap } from 'rxjs/operators';
+import { catchError, filter, map, switchMap, take, tap } from 'rxjs/operators';
 
 import {
     DotContentTypeService,
@@ -61,7 +61,7 @@ export class DotContainerPropertiesStore extends ComponentStore<DotContainerProp
         });
         this.activatedRoute.data
             .pipe(
-                pluck('container'),
+                map((x) => x?.container),
                 take(1),
                 filter((containerEntity) => !!containerEntity)
             )

core-web/apps/dotcms-ui/src/app/portlets/dot-form-builder/dot-form-builder.component.ts

@@ -4,7 +4,7 @@ import { AsyncPipe } from '@angular/common';
 import { Component, OnInit, inject } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 
-import { pluck } from 'rxjs/operators';
+import { map } from 'rxjs/operators';
 
 import { DotNotLicenseComponent } from '@dotcms/ui';
 
@@ -22,6 +22,6 @@ export class DotFormBuilderComponent implements OnInit {
     haveLicense$: Observable<boolean>;
 
     ngOnInit() {
-        this.haveLicense$ = this.route.data.pipe(pluck('haveLicense'));
+        this.haveLicense$ = this.route.data.pipe(map((x) => x?.haveLicense));
     }
 }