Skip to content

Commit 8ca4c7e

Browse files
committed
chore: remove RxJS 7 migration plan and clean up unused DotPropertiesService references
1 parent 146f161 commit 8ca4c7e

3 files changed

Lines changed: 3 additions & 29 deletions

File tree

.cursor/plans/rxjs_7_migration_plan_c65e7afc.plan.md

Lines changed: 0 additions & 8 deletions
This file was deleted.

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import {
2121
DotMessageDisplayService,
2222
DotPageTypesService,
2323
DotPageWorkflowsActionsService,
24-
DotPropertiesService,
2524
DotRenderMode,
2625
DotRouterService,
2726
DotWizardService,
@@ -141,7 +140,6 @@ describe('DotPageStore', () => {
141140
let dotHttpErrorManagerService: DotHttpErrorManagerService;
142141
let dotFavoritePageService: DotFavoritePageService;
143142
let dotLocalstorageService: DotLocalstorageService;
144-
let dotPropertiesService: DotPropertiesService;
145143
let dotPushPublishDialogService: DotPushPublishDialogService;
146144

147145
beforeEach(() => {
@@ -163,7 +161,6 @@ describe('DotPageStore', () => {
163161
StringUtils,
164162
DotFavoritePageService,
165163
DotLocalstorageService,
166-
DotPropertiesService,
167164
DotPushPublishDialogService,
168165
{ provide: DialogService, useClass: DialogServiceMock },
169166
{ provide: DotcmsEventsService, useClass: DotcmsEventsServiceMock },
@@ -196,14 +193,11 @@ describe('DotPageStore', () => {
196193
dotWorkflowActionsFireService = TestBed.inject(DotWorkflowActionsFireService);
197194
dotFavoritePageService = TestBed.inject(DotFavoritePageService);
198195
dotLocalstorageService = TestBed.inject(DotLocalstorageService);
199-
dotPropertiesService = TestBed.inject(DotPropertiesService);
200196
dotPushPublishDialogService = TestBed.inject(DotPushPublishDialogService);
201197

202198
jest.spyOn(dialogService, 'open');
203199
jest.spyOn(dotHttpErrorManagerService, 'handle');
204200
jest.spyOn(dotLocalstorageService, 'getItem').mockReturnValue(`true`);
205-
jest.spyOn(dotPropertiesService, 'getKey').mockReturnValue(of('*'));
206-
jest.spyOn(dotPropertiesService, 'getFeatureFlag').mockReturnValue(of(false));
207201

208202
dotPageStore.setInitialStateData(5);
209203
dotPageStore.setKeyword('test');

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

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ import {
2323
DotMessageService,
2424
DotPageTypesService,
2525
DotPageWorkflowsActionsService,
26-
DotPropertiesService,
2726
DotRenderMode,
2827
DotRouterService,
2928
DotWorkflowActionsFireService,
@@ -45,7 +44,6 @@ import {
4544
DotLanguage,
4645
DotPermissionsType,
4746
ESContent,
48-
FeaturedFlags,
4947
PermissionsType,
5048
UserPermissions
5149
} from '@dotcms/dotcms-models';
@@ -154,7 +152,6 @@ export class DotPageStore extends ComponentStore<DotPagesState> {
154152
private siteService = inject(SiteService);
155153
private dotFavoritePageService = inject(DotFavoritePageService);
156154
private dotLocalstorageService = inject(DotLocalstorageService);
157-
private dotPropertiesService = inject(DotPropertiesService);
158155

159156
readonly getStatus$ = this.select((state) => state?.pages?.status || ComponentStatus.INIT);
160157

@@ -508,13 +505,7 @@ export class DotPageStore extends ComponentStore<DotPagesState> {
508505
.getEnvironments()
509506
.pipe(map((environments: DotEnvironment[]) => !!environments.length)),
510507
this.getSessionStorageFilterParams(),
511-
this.getLocalStorageFavoritePanelParams(),
512-
this.dotPropertiesService.getFeatureFlag(
513-
FeaturedFlags.FEATURE_FLAG_CONTENT_EDITOR2_ENABLED
514-
),
515-
this.dotPropertiesService
516-
.getKey(FeaturedFlags.FEATURE_FLAG_CONTENT_EDITOR2_CONTENT_TYPE)
517-
.pipe(map((contentTypes) => contentTypes.split(',')))
508+
this.getLocalStorageFavoritePanelParams()
518509
])
519510
.pipe(
520511
take(1),
@@ -526,18 +517,15 @@ export class DotPageStore extends ComponentStore<DotPagesState> {
526517
isEnterprise,
527518
environments,
528519
filterParams,
529-
collapsedParam,
530-
,
520+
collapsedParam
531521
]: [
532522
ESContent,
533523
DotCurrentUser,
534524
DotLanguage[],
535525
boolean,
536526
boolean,
537527
DotSessionStorageFilter,
538-
boolean,
539-
boolean,
540-
string[]
528+
boolean
541529
]) => {
542530
return this.dotCurrentUser
543531
.getUserPermissions(

0 commit comments

Comments
 (0)