[ACS-8959] Introduce new takeUntilDestroyed operator where possible

Alfresco · Nov 18, 2024 · cde9555 · cde9555
1 parent db73509
commit cde9555
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 12 deletions.
diff --git a/lib/content-services/src/lib/content-metadata/services/property-groups-translator.service.ts b/lib/content-services/src/lib/content-metadata/services/property-groups-translator.service.ts
@@ -56,10 +56,11 @@ export class PropertyGroupTranslatorService {
     private userPreferenceService = inject(UserPreferencesService);
     private appConfig = inject(AppConfigService);
     private logService = inject(LogService);
-    private injector = inject(Injector);
 
     valueSeparator: string;
 
+    private readonly injector = inject(Injector);
+
     constructor() {
         this.valueSeparator = this.appConfig.get<string>('content-metadata.multi-value-pipe-separator');
     }

diff --git a/lib/content-services/src/lib/document-list/components/document-list.component.spec.ts b/lib/content-services/src/lib/document-list/components/document-list.component.spec.ts
@@ -30,7 +30,16 @@ import {
 import { FavoritePaging, FavoritePagingList, Node, NodeEntry, NodePaging } from '@alfresco/js-api';
 import { HarnessLoader } from '@angular/cdk/testing';
 import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed';
-import { Component, CUSTOM_ELEMENTS_SCHEMA, QueryList, SimpleChange, SimpleChanges, ViewChild } from '@angular/core';
+import {
+    Component,
+    CUSTOM_ELEMENTS_SCHEMA,
+    Injector,
+    QueryList,
+    runInInjectionContext,
+    SimpleChange,
+    SimpleChanges,
+    ViewChild
+} from '@angular/core';
 import { ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing';
 import { MatProgressSpinnerHarness } from '@angular/material/progress-spinner/testing';
 import { By } from '@angular/platform-browser';
@@ -84,6 +93,7 @@ describe('DocumentList', () => {
     let spyFolder: any;
     let spyFolderNode: any;
     let authenticationService: AuthenticationService;
+    let injector: Injector;
 
     beforeEach(() => {
         TestBed.configureTestingModule({
@@ -106,6 +116,7 @@ describe('DocumentList', () => {
         contentService = TestBed.inject(ContentService);
         appConfigService = TestBed.inject(AppConfigService);
         authenticationService = TestBed.inject(AuthenticationService);
+        injector = TestBed.inject(Injector);
 
         spyFolder = spyOn(documentListService, 'getFolder').and.returnValue(of({ list: {} }));
         spyFolderNode = spyOn(documentListService, 'getFolderNode').and.returnValue(of(new NodeEntry({ entry: new Node() })));
@@ -1126,7 +1137,9 @@ describe('DocumentList', () => {
 
     it('should display [empty folder] template ', () => {
         fixture.detectChanges();
-        documentList.dataTable = new DataTableComponent(null, null, matIconRegistryMock, domSanitizerMock);
+        runInInjectionContext(injector, () => {
+            documentList.dataTable = new DataTableComponent(null, null, matIconRegistryMock, domSanitizerMock);
+        })
         expect(documentList.dataTable).toBeDefined();
         expect(fixture.debugElement.query(By.css('adf-empty-list'))).not.toBeNull();
     });
@@ -1145,7 +1158,9 @@ describe('DocumentList', () => {
     });
 
     it('should empty folder NOT show the pagination', () => {
-        documentList.dataTable = new DataTableComponent(null, null, matIconRegistryMock, domSanitizerMock);
+        runInInjectionContext(injector, () => {
+            documentList.dataTable = new DataTableComponent(null, null, matIconRegistryMock, domSanitizerMock);
+        })
 
         expect(documentList.isEmpty()).toBeTruthy();
         expect(element.querySelector('alfresco-pagination')).toBe(null);

diff --git a/...rocess-services-cloud/src/lib/task/task-list/components/base-task-list-cloud.component.ts b/...rocess-services-cloud/src/lib/task/task-list/components/base-task-list-cloud.component.ts
@@ -55,11 +55,11 @@ import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 
 @Directive()
 // eslint-disable-next-line @angular-eslint/directive-class-suffix
-// eslint-disable-next-line @typescript-eslint/brace-style
 export abstract class BaseTaskListCloudComponent<T = unknown>
     extends DataTableSchema<T>
-    implements OnChanges, AfterContentInit, PaginatedComponent, OnInit
-{
+// eslint-disable-next-line @typescript-eslint/brace-style
+    implements OnChanges, AfterContentInit, PaginatedComponent, OnInit {
+
     @ContentChild(CustomEmptyContentTemplateDirective)
     emptyCustomContent: CustomEmptyContentTemplateDirective;
 

diff --git a/lib/process-services/src/lib/task-list/components/task-details/task-details.component.ts b/lib/process-services/src/lib/task-list/components/task-details/task-details.component.ts
@@ -210,11 +210,11 @@ export class TaskDetailsComponent implements OnInit, OnChanges {
     private peopleSearchObserver: Observer<LightUserRepresentation[]>;
 
     constructor(
-        private taskListService: TaskListService,
-        private peopleProcessService: PeopleProcessService,
-        private cardViewUpdateService: CardViewUpdateService,
-        private dialog: MatDialog,
-        private destroyRef: DestroyRef
+        private readonly taskListService: TaskListService,
+        private readonly peopleProcessService: PeopleProcessService,
+        private readonly cardViewUpdateService: CardViewUpdateService,
+        private readonly dialog: MatDialog,
+        private readonly destroyRef: DestroyRef
     ) {}
 
     ngOnInit() {