Merge pull request #10368 from qmonmert/angularsignalapp

Angular: uses Signal
jhipster · Jul 23, 2024 · a6472b1 · a6472b1
2 parents 92b26b0 + ce484c5
commit a6472b1
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 15 deletions.
diff --git a/...ster/lite/generator/client/angular/security/oauth2/domain/AngularOauth2ModuleFactory.java b/...ster/lite/generator/client/angular/security/oauth2/domain/AngularOauth2ModuleFactory.java
@@ -73,7 +73,7 @@ public class AngularOauth2ModuleFactory {
     import { Oauth2AuthService } from './auth/oauth2-auth.service';
     """;
 
-  private static final ElementReplacer APPNAME_NEEDLE = lineAfterRegex("appName = '';");
+  private static final ElementReplacer APPNAME_NEEDLE = lineAfterRegex("appName = signal\\(''\\);");
 
   private static final String INJECT_OAUTH2_AUTH_SERVICE =
     """
@@ -87,10 +87,10 @@ public class AngularOauth2ModuleFactory {
 
   private static final String INJECT_IMPORT =
     """
-    import { Component, inject, OnInit } from '@angular/core';
+    import { Component, inject, OnInit, signal } from '@angular/core';
     """;
 
-  private static final ElementReplacer INJECT_NEEDLE = text("import { Component, OnInit } from '@angular/core';");
+  private static final ElementReplacer INJECT_NEEDLE = text("import { Component, OnInit, signal } from '@angular/core';");
 
   private static final ElementReplacer BEFORE_EACH_NEEDLE = lineAfterRegex("comp = fixture.componentInstance;");
 
@@ -173,7 +173,7 @@ public JHipsterModule buildModule(JHipsterModuleProperties properties) {
           .add(fileStart(), LOGIN_IMPORT)
           .add(INJECT_NEEDLE, INJECT_IMPORT)
           .add(APPNAME_NEEDLE, INJECT_OAUTH2_AUTH_SERVICE)
-          .add(lineAfterRegex("this.appName = '" + properties.projectBaseName().name() + "';"), INIT_AUTHENTICATION)
+          .add(lineAfterRegex("this.appName.set\\('" + properties.projectBaseName().name() + "'\\);"), INIT_AUTHENTICATION)
           .and()
         .in(path("src/main/webapp/app/app.component.spec.ts"))
           .add(fileStart(), TEST_IMPORTS)

diff --git a/...n/resources/generator/client/angular/core/src/main/webapp/app/app.component.html.mustache b/...n/resources/generator/client/angular/core/src/main/webapp/app/app.component.html.mustache
@@ -5,7 +5,7 @@
   <mat-menu #menu="matMenu">
     <!-- jhipster-needle-angular-menu -->
   </mat-menu>
-  <span>{{ appName }}</span>
+  <span>{{ appName() }}</span>
   <span class="toolbar-spacer"></span>
   <img alt="Angular logo" class="angular-logo" ngSrc="content/images/AngularLogo.svg" width="50" height="50" priority />
   <span class="space-separator" id="menu-space-separator"></span>
@@ -23,7 +23,7 @@
 <router-outlet></router-outlet>
 
 <div id="footer">
-  <h1>{{ appName }}: Angular + TypeScript</h1>
+  <h1>{{ appName() }}: Angular + TypeScript</h1>
   <p>
     Recommended IDE setup:
     <a href="https://code.visualstudio.com/" target="_blank" rel="noopener">VSCode</a>

diff --git a/...esources/generator/client/angular/core/src/main/webapp/app/app.component.spec.ts.mustache b/...esources/generator/client/angular/core/src/main/webapp/app/app.component.spec.ts.mustache
@@ -24,7 +24,7 @@ describe('App Component', () => {
       fixture.detectChanges();
 
       // THEN
-      expect(comp.appName).toEqual('{{baseName}}');
+      expect(comp.appName()).toEqual('{{baseName}}');
     });
   });
 });
diff --git a/...ain/resources/generator/client/angular/core/src/main/webapp/app/app.component.ts.mustache b/...ain/resources/generator/client/angular/core/src/main/webapp/app/app.component.ts.mustache
@@ -1,4 +1,4 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, signal } from '@angular/core';
 import { CommonModule, NgOptimizedImage } from '@angular/common';
 import { RouterModule } from '@angular/router';
 
@@ -15,9 +15,9 @@ import { MatMenuModule } from '@angular/material/menu';
   styleUrl: './app.component.css',
 })
 export class AppComponent implements OnInit {
-  appName = '';
+  appName = signal('');
 
   ngOnInit(): void {
-    this.appName = '{{baseName}}';
+    this.appName.set('{{baseName}}');
   }
 }
diff --git a/...ava/tech/jhipster/lite/generator/client/angular/core/domain/AngularModuleFactoryTest.java b/...ava/tech/jhipster/lite/generator/client/angular/core/domain/AngularModuleFactoryTest.java
@@ -71,7 +71,7 @@ void shouldCreateAngularModule() {
       )
       .and()
       .hasFile("src/main/webapp/app/app.component.ts")
-      .containing("this.appName = 'jhiTest'")
+      .containing("this.appName.set('jhiTest')")
       .and()
       .hasPrefixedFiles(
         "",

diff --git a/src/test/resources/projects/angular/app.component.spec.ts b/src/test/resources/projects/angular/app.component.spec.ts
@@ -25,7 +25,7 @@ describe('App Component', () => {
       fixture.detectChanges();
 
       // THEN
-      expect(comp.appName).toEqual('test');
+      expect(comp.appName()).toEqual('test');
     });
   });
 });
diff --git a/src/test/resources/projects/angular/app.component.ts b/src/test/resources/projects/angular/app.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, signal } from '@angular/core';
 import { CommonModule, NgOptimizedImage } from '@angular/common';
 import { RouterModule } from '@angular/router';
 
@@ -15,9 +15,9 @@ import { MatMenuModule } from '@angular/material/menu';
   styleUrl: './app.component.css',
 })
 export class AppComponent implements OnInit {
-  appName = '';
+  appName = signal('');
 
   ngOnInit(): void {
-    this.appName = 'jhipster';
+    this.appName.set('jhipster');
   }
 }