Merge pull request #25690 from qmonmert/angularinputsignal

[Angular] Migrate Input to Signal Input
jhipster · Apr 1, 2024 · 3e5364a · 3e5364a
2 parents 4aa3396 + 473ef56
commit 3e5364a
Show file tree

Hide file tree

Showing 14 changed files with 98 additions and 98 deletions.
diff --git a/...mplates/src/main/webapp/app/admin/metrics/blocks/jvm-memory/jvm-memory.component.html.ejs b/...mplates/src/main/webapp/app/admin/metrics/blocks/jvm-memory/jvm-memory.component.html.ejs
@@ -18,9 +18,9 @@
 -%>
 <h4>__jhiTranslateTag__('metrics.jvm.memory.title')</h4>
 
-@if (!updating && jvmMemoryMetrics) {
+@if (!updating() && jvmMemoryMetrics()) {
 <div>
-  @for (entry of jvmMemoryMetrics | keyvalue; track $index) {
+  @for (entry of jvmMemoryMetrics() | keyvalue; track $index) {
   <div>
   @if (entry.value.max !== -1) {
     <span>

diff --git a/...templates/src/main/webapp/app/admin/metrics/blocks/jvm-memory/jvm-memory.component.ts.ejs b/...templates/src/main/webapp/app/admin/metrics/blocks/jvm-memory/jvm-memory.component.ts.ejs
@@ -16,7 +16,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-import { Component, Input } from '@angular/core';
+import { Component, input } from '@angular/core';
 
 import SharedModule from 'app/shared/shared.module';
 import { JvmMetrics } from 'app/admin/metrics/metrics.model';
@@ -31,10 +31,10 @@ export class JvmMemoryComponent {
   /**
    * object containing all jvm memory metrics
    */
-  @Input() jvmMemoryMetrics?: { [key: string]: JvmMetrics };
+  jvmMemoryMetrics = input<{ [key: string]: JvmMetrics }>();
 
   /**
    * boolean field saying if the metrics are in the process of being updated
    */
-  @Input() updating?: boolean;
+  updating = input<boolean>();
 }
diff --git a/...s/src/main/webapp/app/admin/metrics/blocks/metrics-cache/metrics-cache.component.html.ejs b/...s/src/main/webapp/app/admin/metrics/blocks/metrics-cache/metrics-cache.component.html.ejs
@@ -16,9 +16,9 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-<h3 id="cacheMetrics">__jhiTranslateTag__('metrics.cache.title')</h3>
+<h3 id="cacheMetrics()">__jhiTranslateTag__('metrics.cache.title')</h3>
 
-@if (!updating && cacheMetrics) {
+@if (!updating() && cacheMetrics()) {
 <div class="table-responsive">
   <table class="table table-striped" aria-describedby="cacheMetrics">
     <thead>
@@ -35,7 +35,7 @@
       </tr>
     </thead>
     <tbody>
-    @for (entry of cacheMetrics | keyvalue; track entry.key) {
+    @for (entry of cacheMetrics() | keyvalue; track entry.key) {
       <tr>
         <td>{{ entry.key }}</td>
         <td class="text-end">{{ entry.value['cache.gets.hit'] }}</td>

diff --git a/...tes/src/main/webapp/app/admin/metrics/blocks/metrics-cache/metrics-cache.component.ts.ejs b/...tes/src/main/webapp/app/admin/metrics/blocks/metrics-cache/metrics-cache.component.ts.ejs
@@ -16,7 +16,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
+import { ChangeDetectionStrategy, Component, input } from '@angular/core';
 
 import SharedModule from 'app/shared/shared.module';
 import { CacheMetrics } from 'app/admin/metrics/metrics.model';
@@ -33,12 +33,12 @@ export class MetricsCacheComponent {
   /**
    * object containing all cache related metrics
    */
-  @Input() cacheMetrics?: { [key: string]: CacheMetrics };
+  cacheMetrics = input<{ [key: string]: CacheMetrics }>();
 
   /**
    * boolean field saying if the metrics are in the process of being updated
    */
-  @Input() updating?: boolean;
+  updating = input<boolean>();
 
-  filterNaN = (input: number): number => filterNaN(input);
+  filterNaN = (n: number): number => filterNaN(n);
 }
diff --git a/.../webapp/app/admin/metrics/blocks/metrics-datasource/metrics-datasource.component.html.ejs b/.../webapp/app/admin/metrics/blocks/metrics-datasource/metrics-datasource.component.html.ejs
@@ -18,14 +18,14 @@
 -%>
 <h3 id="datasourceMetrics">__jhiTranslateTag__('metrics.datasource.title')</h3>
 
-@if (!updating && datasourceMetrics) {
+@if (!updating() && datasourceMetrics()) {
 <div class="table-responsive">
   <table class="table table-striped" aria-describedby="datasourceMetrics">
     <thead>
       <tr>
         <th scope="col">
-          <span>__jhiTranslateTag__('metrics.datasource.usage')</span> (active: {{ datasourceMetrics.active.value }},
-          min: {{ datasourceMetrics.min.value }}, max: {{ datasourceMetrics.max.value }}, idle: {{ datasourceMetrics.idle.value }})
+          <span>__jhiTranslateTag__('metrics.datasource.usage')</span> (active: {{ datasourceMetrics()!.active.value }},
+          min: {{ datasourceMetrics()!.min.value }}, max: {{ datasourceMetrics()!.max.value }}, idle: {{ datasourceMetrics()!.idle.value }})
         </th>
         <th scope="col" class="text-end">__jhiTranslateTag__('metrics.datasource.count')</th>
         <th scope="col" class="text-end">__jhiTranslateTag__('metrics.datasource.mean')</th>
@@ -40,36 +40,36 @@
     <tbody>
       <tr>
         <td>Acquire</td>
-        <td class="text-end">{{ datasourceMetrics.acquire.count }}</td>
-        <td class="text-end">{{ filterNaN(datasourceMetrics.acquire.mean) | number: '1.0-2' }}</td>
-        <td class="text-end">{{ datasourceMetrics.acquire['0.0'] | number: '1.0-3' }}</td>
-        <td class="text-end">{{ datasourceMetrics.acquire['0.5'] | number: '1.0-3' }}</td>
-        <td class="text-end">{{ datasourceMetrics.acquire['0.75'] | number: '1.0-3' }}</td>
-        <td class="text-end">{{ datasourceMetrics.acquire['0.95'] | number: '1.0-3' }}</td>
-        <td class="text-end">{{ datasourceMetrics.acquire['0.99'] | number: '1.0-3' }}</td>
-        <td class="text-end">{{ filterNaN(datasourceMetrics.acquire.max) | number: '1.0-2' }}</td>
+        <td class="text-end">{{ datasourceMetrics()!.acquire.count }}</td>
+        <td class="text-end">{{ filterNaN(datasourceMetrics()!.acquire.mean) | number: '1.0-2' }}</td>
+        <td class="text-end">{{ datasourceMetrics()!.acquire['0.0'] | number: '1.0-3' }}</td>
+        <td class="text-end">{{ datasourceMetrics()!.acquire['0.5'] | number: '1.0-3' }}</td>
+        <td class="text-end">{{ datasourceMetrics()!.acquire['0.75'] | number: '1.0-3' }}</td>
+        <td class="text-end">{{ datasourceMetrics()!.acquire['0.95'] | number: '1.0-3' }}</td>
+        <td class="text-end">{{ datasourceMetrics()!.acquire['0.99'] | number: '1.0-3' }}</td>
+        <td class="text-end">{{ filterNaN(datasourceMetrics()!.acquire.max) | number: '1.0-2' }}</td>
       </tr>
       <tr>
         <td>Creation</td>
-        <td class="text-end">{{ datasourceMetrics.creation.count }}</td>
-        <td class="text-end">{{ filterNaN(datasourceMetrics.creation.mean) | number: '1.0-2' }}</td>
-        <td class="text-end">{{ datasourceMetrics.creation['0.0'] | number: '1.0-3' }}</td>
-        <td class="text-end">{{ datasourceMetrics.creation['0.5'] | number: '1.0-3' }}</td>
-        <td class="text-end">{{ datasourceMetrics.creation['0.75'] | number: '1.0-3' }}</td>
-        <td class="text-end">{{ datasourceMetrics.creation['0.95'] | number: '1.0-3' }}</td>
-        <td class="text-end">{{ datasourceMetrics.creation['0.99'] | number: '1.0-3' }}</td>
-        <td class="text-end">{{ filterNaN(datasourceMetrics.creation.max) | number: '1.0-2' }}</td>
+        <td class="text-end">{{ datasourceMetrics()!.creation.count }}</td>
+        <td class="text-end">{{ filterNaN(datasourceMetrics()!.creation.mean) | number: '1.0-2' }}</td>
+        <td class="text-end">{{ datasourceMetrics()!.creation['0.0'] | number: '1.0-3' }}</td>
+        <td class="text-end">{{ datasourceMetrics()!.creation['0.5'] | number: '1.0-3' }}</td>
+        <td class="text-end">{{ datasourceMetrics()!.creation['0.75'] | number: '1.0-3' }}</td>
+        <td class="text-end">{{ datasourceMetrics()!.creation['0.95'] | number: '1.0-3' }}</td>
+        <td class="text-end">{{ datasourceMetrics()!.creation['0.99'] | number: '1.0-3' }}</td>
+        <td class="text-end">{{ filterNaN(datasourceMetrics()!.creation.max) | number: '1.0-2' }}</td>
       </tr>
       <tr>
         <td>Usage</td>
-        <td class="text-end">{{ datasourceMetrics.usage.count }}</td>
-        <td class="text-end">{{ filterNaN(datasourceMetrics.usage.mean) | number: '1.0-2' }}</td>
-        <td class="text-end">{{ datasourceMetrics.usage['0.0'] | number: '1.0-3' }}</td>
-        <td class="text-end">{{ datasourceMetrics.usage['0.5'] | number: '1.0-3' }}</td>
-        <td class="text-end">{{ datasourceMetrics.usage['0.75'] | number: '1.0-3' }}</td>
-        <td class="text-end">{{ datasourceMetrics.usage['0.95'] | number: '1.0-3' }}</td>
-        <td class="text-end">{{ datasourceMetrics.usage['0.99'] | number: '1.0-3' }}</td>
-        <td class="text-end">{{ filterNaN(datasourceMetrics.usage.max) | number: '1.0-2' }}</td>
+        <td class="text-end">{{ datasourceMetrics()!.usage.count }}</td>
+        <td class="text-end">{{ filterNaN(datasourceMetrics()!.usage.mean) | number: '1.0-2' }}</td>
+        <td class="text-end">{{ datasourceMetrics()!.usage['0.0'] | number: '1.0-3' }}</td>
+        <td class="text-end">{{ datasourceMetrics()!.usage['0.5'] | number: '1.0-3' }}</td>
+        <td class="text-end">{{ datasourceMetrics()!.usage['0.75'] | number: '1.0-3' }}</td>
+        <td class="text-end">{{ datasourceMetrics()!.usage['0.95'] | number: '1.0-3' }}</td>
+        <td class="text-end">{{ datasourceMetrics()!.usage['0.99'] | number: '1.0-3' }}</td>
+        <td class="text-end">{{ filterNaN(datasourceMetrics()!.usage.max) | number: '1.0-2' }}</td>
       </tr>
     </tbody>
   </table>

diff --git a/...in/webapp/app/admin/metrics/blocks/metrics-datasource/metrics-datasource.component.ts.ejs b/...in/webapp/app/admin/metrics/blocks/metrics-datasource/metrics-datasource.component.ts.ejs
@@ -16,7 +16,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
+import { ChangeDetectionStrategy, Component, input } from '@angular/core';
 
 import SharedModule from 'app/shared/shared.module';
 import { Databases } from 'app/admin/metrics/metrics.model';
@@ -33,12 +33,12 @@ export class MetricsDatasourceComponent {
   /**
    * object containing all datasource related metrics
    */
-  @Input() datasourceMetrics?: Databases;
+  datasourceMetrics = input<Databases>();
 
   /**
    * boolean field saying if the metrics are in the process of being updated
    */
-  @Input() updating?: boolean;
+  updating = input<boolean>();
 
-  filterNaN = (input: number): number => filterNaN(input);
+  filterNaN = (n: number): number => filterNaN(n);
 }
diff --git a/...n/metrics/blocks/metrics-endpoints-requests/metrics-endpoints-requests.component.html.ejs b/...n/metrics/blocks/metrics-endpoints-requests/metrics-endpoints-requests.component.html.ejs
@@ -18,7 +18,7 @@
 -%>
 <h3 id="endpointsRequestsMetrics">Endpoints requests (time in millisecond)</h3>
 
-@if (!updating && endpointsRequestsMetrics) {
+@if (!updating() && endpointsRequestsMetrics()) {
 <div class="table-responsive">
   <table class="table table-striped" aria-describedby="endpointsRequestsMetrics">
     <thead>
@@ -30,7 +30,7 @@
       </tr>
     </thead>
     <tbody>
-  @for (entry of endpointsRequestsMetrics | keyvalue; track entry.key) {
+  @for (entry of endpointsRequestsMetrics() | keyvalue; track entry.key) {
     @for (method of entry.value | keyvalue; track method.key) {
       <tr>
         <td>{{ method.key }}</td>

diff --git a/...min/metrics/blocks/metrics-endpoints-requests/metrics-endpoints-requests.component.ts.ejs b/...min/metrics/blocks/metrics-endpoints-requests/metrics-endpoints-requests.component.ts.ejs
@@ -16,7 +16,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-import { Component, Input } from '@angular/core';
+import { Component, input } from '@angular/core';
 
 import SharedModule from 'app/shared/shared.module';
 import { Services } from 'app/admin/metrics/metrics.model';
@@ -31,10 +31,10 @@ export class MetricsEndpointsRequestsComponent {
   /**
    * object containing service related metrics
    */
-  @Input() endpointsRequestsMetrics?: Services;
+  endpointsRequestsMetrics = input<Services>();
 
   /**
    * boolean field saying if the metrics are in the process of being updated
    */
-  @Input() updating?: boolean;
+  updating = input<boolean>();
 }
diff --git a/...admin/metrics/blocks/metrics-garbagecollector/metrics-garbagecollector.component.html.ejs b/...admin/metrics/blocks/metrics-garbagecollector/metrics-garbagecollector.component.html.ejs
@@ -20,23 +20,23 @@
 
 <div class="row">
   <div class="col-md-4">
-  @if (garbageCollectorMetrics) {
+  @if (garbageCollectorMetrics()) {
     <div>
       <span>
-        GC Live Data Size/GC Max Data Size ({{ garbageCollectorMetrics['jvm.gc.live.data.size'] / 1048576 | number: '1.0-0' }}M /
-        {{ garbageCollectorMetrics['jvm.gc.max.data.size'] / 1048576 | number: '1.0-0' }}M)
+        GC Live Data Size/GC Max Data Size ({{ garbageCollectorMetrics()!['jvm.gc.live.data.size'] / 1048576 | number: '1.0-0' }}M /
+        {{ garbageCollectorMetrics()!['jvm.gc.max.data.size'] / 1048576 | number: '1.0-0' }}M)
       </span>
 
       <ngb-progressbar
-        [max]="garbageCollectorMetrics['jvm.gc.max.data.size']"
-        [value]="garbageCollectorMetrics['jvm.gc.live.data.size']"
+        [max]="garbageCollectorMetrics()!['jvm.gc.max.data.size']"
+        [value]="garbageCollectorMetrics()!['jvm.gc.live.data.size']"
         [striped]="true"
         [animated]="false"
         type="success"
       >
         <span>
           {{
-            (100 * garbageCollectorMetrics['jvm.gc.live.data.size']) / garbageCollectorMetrics['jvm.gc.max.data.size'] | number: '1.0-2'
+            (100 * garbageCollectorMetrics()!['jvm.gc.live.data.size']) / garbageCollectorMetrics()!['jvm.gc.max.data.size'] | number: '1.0-2'
           }}%
         </span>
       </ngb-progressbar>
@@ -45,23 +45,23 @@
   </div>
 
   <div class="col-md-4">
-  @if (garbageCollectorMetrics) {
+  @if (garbageCollectorMetrics()) {
     <div>
       <span>
-        GC Memory Promoted/GC Memory Allocated ({{ garbageCollectorMetrics['jvm.gc.memory.promoted'] / 1048576 | number: '1.0-0' }}M /
-        {{ garbageCollectorMetrics['jvm.gc.memory.allocated'] / 1048576 | number: '1.0-0' }}M)
+        GC Memory Promoted/GC Memory Allocated ({{ garbageCollectorMetrics()!['jvm.gc.memory.promoted'] / 1048576 | number: '1.0-0' }}M /
+        {{ garbageCollectorMetrics()!['jvm.gc.memory.allocated'] / 1048576 | number: '1.0-0' }}M)
       </span>
 
       <ngb-progressbar
-        [max]="garbageCollectorMetrics['jvm.gc.memory.allocated']"
-        [value]="garbageCollectorMetrics['jvm.gc.memory.promoted']"
+        [max]="garbageCollectorMetrics()!['jvm.gc.memory.allocated']"
+        [value]="garbageCollectorMetrics()!['jvm.gc.memory.promoted']"
         [striped]="true"
         [animated]="false"
         type="success"
       >
         <span>
           {{
-            (100 * garbageCollectorMetrics['jvm.gc.memory.promoted']) / garbageCollectorMetrics['jvm.gc.memory.allocated']
+            (100 * garbageCollectorMetrics()!['jvm.gc.memory.promoted']) / garbageCollectorMetrics()!['jvm.gc.memory.allocated']
               | number: '1.0-2'
           }}%
         </span>
@@ -71,19 +71,19 @@
   </div>
 
   <div id="garbageCollectorMetrics" class="col-md-4">
-  @if (garbageCollectorMetrics) {
+  @if (garbageCollectorMetrics()) {
     <div class="row">
       <div class="col-md-9">Classes loaded</div>
-      <div class="col-md-3 text-end">{{ garbageCollectorMetrics.classesLoaded }}</div>
+      <div class="col-md-3 text-end">{{ garbageCollectorMetrics()!.classesLoaded }}</div>
     </div>
     <div class="row">
       <div class="col-md-9">Classes unloaded</div>
-      <div class="col-md-3 text-end">{{ garbageCollectorMetrics.classesUnloaded }}</div>
+      <div class="col-md-3 text-end">{{ garbageCollectorMetrics()!.classesUnloaded }}</div>
     </div>
   }
   </div>
 
-@if (!updating && garbageCollectorMetrics) {
+@if (!updating() && garbageCollectorMetrics()) {
   <div class="table-responsive">
     <table class="table table-striped" aria-describedby="garbageCollectorMetrics">
       <thead>
@@ -102,14 +102,14 @@
       <tbody>
         <tr>
           <td>jvm.gc.pause</td>
-          <td class="text-end">{{ garbageCollectorMetrics['jvm.gc.pause'].count }}</td>
-          <td class="text-end">{{ garbageCollectorMetrics['jvm.gc.pause'].mean | number: '1.0-3' }}</td>
-          <td class="text-end">{{ garbageCollectorMetrics['jvm.gc.pause']['0.0'] | number: '1.0-3' }}</td>
-          <td class="text-end">{{ garbageCollectorMetrics['jvm.gc.pause']['0.5'] | number: '1.0-3' }}</td>
-          <td class="text-end">{{ garbageCollectorMetrics['jvm.gc.pause']['0.75'] | number: '1.0-3' }}</td>
-          <td class="text-end">{{ garbageCollectorMetrics['jvm.gc.pause']['0.95'] | number: '1.0-3' }}</td>
-          <td class="text-end">{{ garbageCollectorMetrics['jvm.gc.pause']['0.99'] | number: '1.0-3' }}</td>
-          <td class="text-end">{{ garbageCollectorMetrics['jvm.gc.pause'].max | number: '1.0-3' }}</td>
+          <td class="text-end">{{ garbageCollectorMetrics()!['jvm.gc.pause'].count }}</td>
+          <td class="text-end">{{ garbageCollectorMetrics()!['jvm.gc.pause'].mean | number: '1.0-3' }}</td>
+          <td class="text-end">{{ garbageCollectorMetrics()!['jvm.gc.pause']['0.0'] | number: '1.0-3' }}</td>
+          <td class="text-end">{{ garbageCollectorMetrics()!['jvm.gc.pause']['0.5'] | number: '1.0-3' }}</td>
+          <td class="text-end">{{ garbageCollectorMetrics()!['jvm.gc.pause']['0.75'] | number: '1.0-3' }}</td>
+          <td class="text-end">{{ garbageCollectorMetrics()!['jvm.gc.pause']['0.95'] | number: '1.0-3' }}</td>
+          <td class="text-end">{{ garbageCollectorMetrics()!['jvm.gc.pause']['0.99'] | number: '1.0-3' }}</td>
+          <td class="text-end">{{ garbageCollectorMetrics()!['jvm.gc.pause'].max | number: '1.0-3' }}</td>
         </tr>
       </tbody>
     </table>

diff --git a/...p/admin/metrics/blocks/metrics-garbagecollector/metrics-garbagecollector.component.ts.ejs b/...p/admin/metrics/blocks/metrics-garbagecollector/metrics-garbagecollector.component.ts.ejs
@@ -16,7 +16,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-import { Component, Input } from '@angular/core';
+import { Component, input } from '@angular/core';
 
 import SharedModule from 'app/shared/shared.module';
 import { GarbageCollector } from 'app/admin/metrics/metrics.model';
@@ -31,10 +31,10 @@ export class MetricsGarbageCollectorComponent {
   /**
    * object containing garbage collector related metrics
    */
-  @Input() garbageCollectorMetrics?: GarbageCollector;
+  garbageCollectorMetrics = input<GarbageCollector>();
 
   /**
    * boolean field saying if the metrics are in the process of being updated
    */
-  @Input() updating?: boolean;
+  updating = input<boolean>();
 }
diff --git a/...c/main/webapp/app/admin/metrics/blocks/metrics-request/metrics-request.component.html.ejs b/...c/main/webapp/app/admin/metrics/blocks/metrics-request/metrics-request.component.html.ejs
@@ -18,7 +18,7 @@
 -%>
 <h3 id="requestMetrics">__jhiTranslateTag__('metrics.jvm.http.title')</h3>
 
-@if (!updating && requestMetrics) {
+@if (!updating() && requestMetrics()) {
 <table class="table table-striped" aria-describedby="requestMetrics">
   <thead>
     <tr>
@@ -29,11 +29,11 @@
     </tr>
   </thead>
   <tbody>
-  @for (entry of requestMetrics['percode'] | keyvalue; track entry.key) {
+  @for (entry of requestMetrics()!['percode'] | keyvalue; track entry.key) {
     <tr>
       <td>{{ entry.key }}</td>
       <td>
-        <ngb-progressbar [max]="requestMetrics['all'].count" [value]="entry.value.count" [striped]="true" [animated]="false" type="success">
+        <ngb-progressbar [max]="requestMetrics()!['all'].count" [value]="entry.value.count" [striped]="true" [animated]="false" type="success">
           <span>{{ entry.value.count }}</span>
         </ngb-progressbar>
       </td>