[Angular] Use viewChild signal for HasAnyAuthorityDirective directive

jhipster · May 28, 2024 · 7868852 · 7868852
1 parent 1671c93
commit 7868852
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/...angular/templates/src/main/webapp/app/shared/auth/has-any-authority.directive.spec.ts.ejs b/...angular/templates/src/main/webapp/app/shared/auth/has-any-authority.directive.spec.ts.ejs
@@ -18,9 +18,10 @@
 -%>
 jest.mock('app/core/auth/account.service');
 
-import { Component, ElementRef, Signal, ViewChild, WritableSignal, signal } from '@angular/core';
+import { Component, ElementRef, WritableSignal, signal, viewChild } from '@angular/core';
+import { HttpClientTestingModule } from '@angular/common/http/testing';
 import { TestBed, waitForAsync } from '@angular/core/testing';
-import { Subject } from 'rxjs';
+import { TranslateModule } from '@ngx-translate/core';
 
 import { AccountService } from 'app/core/auth/account.service';
 import { Account } from 'app/core/auth/account.model';
@@ -31,8 +32,7 @@ import HasAnyAuthorityDirective from './has-any-authority.directive';
   template: ` <div *<%= jhiPrefix %>HasAnyAuthority="'ROLE_ADMIN'" #content></div> `,
 })
 class TestHasAnyAuthorityDirectiveComponent {
-  @ViewChild('content', { static: false })
-  content?: ElementRef;
+  content = viewChild<ElementRef>('content');
 }
 
 describe('HasAnyAuthorityDirective tests', () => {
@@ -41,7 +41,7 @@ describe('HasAnyAuthorityDirective tests', () => {
 
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
-      imports: [HasAnyAuthorityDirective],
+      imports: [HasAnyAuthorityDirective, HttpClientTestingModule, TranslateModule.forRoot()],
       declarations: [TestHasAnyAuthorityDirectiveComponent],
       providers: [AccountService],
     });
@@ -79,7 +79,7 @@ describe('HasAnyAuthorityDirective tests', () => {
       fixture.detectChanges();
 
       // THEN
-      expect(comp.content).toBeUndefined();
+      expect(comp.content()).toBeUndefined();
     });
   });
 
@@ -95,7 +95,7 @@ describe('HasAnyAuthorityDirective tests', () => {
       fixture.detectChanges();
 
       // THEN
-      expect(comp.content).toBeDefined();
+      expect(comp.content()).toBeDefined();
 
       // GIVEN
       currentAccount.set(null);
@@ -104,7 +104,7 @@ describe('HasAnyAuthorityDirective tests', () => {
       fixture.detectChanges();
 
       // THEN
-      expect(comp.content).toBeUndefined();
+      expect(comp.content()).toBeUndefined();
 
       // WHEN
       currentAccount.set({ activated: true, authorities: ['foo'] } as any);

diff --git a/...tors/angular/templates/src/main/webapp/app/shared/auth/has-any-authority.directive.ts.ejs b/...tors/angular/templates/src/main/webapp/app/shared/auth/has-any-authority.directive.ts.ejs
@@ -52,7 +52,7 @@ export default class HasAnyAuthorityDirective {
       } else {
         this.viewContainerRef.clear();
       }
-    });
+    }, { allowSignalWrites: true });
   }
 
   @Input()