generator-jhipster 8.0.0-beta.3 → 8.0.0-rc.1

package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-cache/metrics-cache.component.html.ejs

@@ -16,21 +16,21 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-<h3 id="cacheMetrics" <%= jhiPrefix %>Translate="metrics.cache.title"><%- getWebappTranslation('metrics.cache.title') %></h3>
+<h3 id="cacheMetrics" <%= jhiPrefix %>Translate="metrics.cache.title">__jhiTransformTranslate__('metrics.cache.title')</h3>
 
 <div class="table-responsive" *ngIf="!updating && cacheMetrics">
   <table class="table table-striped" aria-describedby="cacheMetrics">
     <thead>
       <tr>
-        <th scope="col" <%= jhiPrefix %>Translate="metrics.cache.cachename"><%- getWebappTranslation('metrics.cache.cachename') %></th>
-        <th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.cache.hits"><%- getWebappTranslation('metrics.cache.hits') %></th>
-        <th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.cache.misses"><%- getWebappTranslation('metrics.cache.misses') %></th>
-        <th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.cache.gets"><%- getWebappTranslation('metrics.cache.gets') %></th>
-        <th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.cache.puts"><%- getWebappTranslation('metrics.cache.puts') %></th>
-        <th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.cache.removals"><%- getWebappTranslation('metrics.cache.removals') %></th>
-        <th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.cache.evictions"><%- getWebappTranslation('metrics.cache.evictions') %></th>
-        <th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.cache.hitPercent"><%- getWebappTranslation('metrics.cache.hitPercent') %></th>
-        <th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.cache.missPercent"><%- getWebappTranslation('metrics.cache.missPercent') %></th>
+        <th scope="col" <%= jhiPrefix %>Translate="metrics.cache.cachename">__jhiTransformTranslate__('metrics.cache.cachename')</th>
+        <th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.cache.hits">__jhiTransformTranslate__('metrics.cache.hits')</th>
+        <th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.cache.misses">__jhiTransformTranslate__('metrics.cache.misses')</th>
+        <th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.cache.gets">__jhiTransformTranslate__('metrics.cache.gets')</th>
+        <th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.cache.puts">__jhiTransformTranslate__('metrics.cache.puts')</th>
+        <th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.cache.removals">__jhiTransformTranslate__('metrics.cache.removals')</th>
+        <th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.cache.evictions">__jhiTransformTranslate__('metrics.cache.evictions')</th>
+        <th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.cache.hitPercent">__jhiTransformTranslate__('metrics.cache.hitPercent')</th>
+        <th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.cache.missPercent">__jhiTransformTranslate__('metrics.cache.missPercent')</th>
       </tr>
     </thead>
     <tbody>

package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-datasource/metrics-datasource.component.html.ejs

@@ -16,24 +16,24 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-<h3 id="datasourceMetrics" <%= jhiPrefix %>Translate="metrics.datasource.title"><%- getWebappTranslation('metrics.datasource.title') %></h3>
+<h3 id="datasourceMetrics" <%= jhiPrefix %>Translate="metrics.datasource.title">__jhiTransformTranslate__('metrics.datasource.title')</h3>
 
 <div class="table-responsive" *ngIf="!updating && datasourceMetrics">
   <table class="table table-striped" aria-describedby="datasourceMetrics">
     <thead>
       <tr>
         <th scope="col">
-          <span <%= jhiPrefix %>Translate="metrics.datasource.usage"><%- getWebappTranslation('metrics.datasource.usage') %></span> (active: {{ datasourceMetrics.active.value }},
+          <span <%= jhiPrefix %>Translate="metrics.datasource.usage">__jhiTransformTranslate__('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" <%= jhiPrefix %>Translate="metrics.datasource.count"><%- getWebappTranslation('metrics.datasource.count') %></th>
-        <th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.datasource.mean"><%- getWebappTranslation('metrics.datasource.mean') %></th>
-        <th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.servicesstats.table.min"><%- getWebappTranslation('metrics.servicesstats.table.min') %></th>
-        <th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.servicesstats.table.p50"><%- getWebappTranslation('metrics.servicesstats.table.p50') %></th>
-        <th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.servicesstats.table.p75"><%- getWebappTranslation('metrics.servicesstats.table.p75') %></th>
-        <th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.servicesstats.table.p95"><%- getWebappTranslation('metrics.servicesstats.table.p95') %></th>
-        <th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.servicesstats.table.p99"><%- getWebappTranslation('metrics.servicesstats.table.p99') %></th>
-        <th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.datasource.max"><%- getWebappTranslation('metrics.datasource.max') %></th>
+        <th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.datasource.count">__jhiTransformTranslate__('metrics.datasource.count')</th>
+        <th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.datasource.mean">__jhiTransformTranslate__('metrics.datasource.mean')</th>
+        <th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.servicesstats.table.min">__jhiTransformTranslate__('metrics.servicesstats.table.min')</th>
+        <th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.servicesstats.table.p50">__jhiTransformTranslate__('metrics.servicesstats.table.p50')</th>
+        <th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.servicesstats.table.p75">__jhiTransformTranslate__('metrics.servicesstats.table.p75')</th>
+        <th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.servicesstats.table.p95">__jhiTransformTranslate__('metrics.servicesstats.table.p95')</th>
+        <th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.servicesstats.table.p99">__jhiTransformTranslate__('metrics.servicesstats.table.p99')</th>
+        <th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.datasource.max">__jhiTransformTranslate__('metrics.datasource.max')</th>
       </tr>
     </thead>
     <tbody>

package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-garbagecollector/metrics-garbagecollector.component.html.ejs

@@ -16,7 +16,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-<h3 id="garbageCollectorMetrics" <%= jhiPrefix %>Translate="metrics.jvm.gc.title"><%- getWebappTranslation('metrics.jvm.gc.title') %></h3>
+<h3 id="garbageCollectorMetrics" <%= jhiPrefix %>Translate="metrics.jvm.gc.title">__jhiTransformTranslate__('metrics.jvm.gc.title')</h3>
 
 <div class="row">
   <div class="col-md-4">
@@ -82,14 +82,14 @@
       <thead>
         <tr>
           <th scope="col"></th>
-          <th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.servicesstats.table.count"><%- getWebappTranslation('metrics.servicesstats.table.count') %></th>
-          <th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.servicesstats.table.mean"><%- getWebappTranslation('metrics.servicesstats.table.mean') %></th>
-          <th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.servicesstats.table.min"><%- getWebappTranslation('metrics.servicesstats.table.min') %></th>
-          <th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.servicesstats.table.p50"><%- getWebappTranslation('metrics.servicesstats.table.p50') %></th>
-          <th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.servicesstats.table.p75"><%- getWebappTranslation('metrics.servicesstats.table.p75') %></th>
-          <th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.servicesstats.table.p95"><%- getWebappTranslation('metrics.servicesstats.table.p95') %></th>
-          <th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.servicesstats.table.p99"><%- getWebappTranslation('metrics.servicesstats.table.p99') %></th>
-          <th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.servicesstats.table.max"><%- getWebappTranslation('metrics.servicesstats.table.max') %></th>
+          <th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.servicesstats.table.count">__jhiTransformTranslate__('metrics.servicesstats.table.count')</th>
+          <th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.servicesstats.table.mean">__jhiTransformTranslate__('metrics.servicesstats.table.mean')</th>
+          <th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.servicesstats.table.min">__jhiTransformTranslate__('metrics.servicesstats.table.min')</th>
+          <th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.servicesstats.table.p50">__jhiTransformTranslate__('metrics.servicesstats.table.p50')</th>
+          <th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.servicesstats.table.p75">__jhiTransformTranslate__('metrics.servicesstats.table.p75')</th>
+          <th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.servicesstats.table.p95">__jhiTransformTranslate__('metrics.servicesstats.table.p95')</th>
+          <th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.servicesstats.table.p99">__jhiTransformTranslate__('metrics.servicesstats.table.p99')</th>
+          <th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.servicesstats.table.max">__jhiTransformTranslate__('metrics.servicesstats.table.max')</th>
         </tr>
       </thead>
       <tbody>

package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-modal-threads/metrics-modal-threads.component.html.ejs

@@ -17,7 +17,7 @@
  limitations under the License.
 -%>
 <div class="modal-header">
-  <h4 class="modal-title" <%= jhiPrefix %>Translate="metrics.jvm.threads.dump.title"><%- getWebappTranslation('metrics.jvm.threads.dump.title') %></h4>
+  <h4 class="modal-title" <%= jhiPrefix %>Translate="metrics.jvm.threads.dump.title">__jhiTransformTranslate__('metrics.jvm.threads.dump.title')</h4>
 
   <button type="button" class="btn-close" (click)="dismiss()">&times;</button>
 </div>
@@ -57,8 +57,8 @@
       &nbsp;{{ thread.threadName }} (ID {{ thread.threadId }})
 
       <a (click)="thread.showThreadDump = !thread.showThreadDump" href="javascript:void(0);">
-        <span [hidden]="thread.showThreadDump" <%= jhiPrefix %>Translate="metrics.jvm.threads.dump.show"><%- getWebappTranslation('metrics.jvm.threads.dump.show') %></span>
-        <span [hidden]="!thread.showThreadDump" <%= jhiPrefix %>Translate="metrics.jvm.threads.dump.hide"><%- getWebappTranslation('metrics.jvm.threads.dump.hide') %></span>
+        <span [hidden]="thread.showThreadDump" <%= jhiPrefix %>Translate="metrics.jvm.threads.dump.show">__jhiTransformTranslate__('metrics.jvm.threads.dump.show')</span>
+        <span [hidden]="!thread.showThreadDump" <%= jhiPrefix %>Translate="metrics.jvm.threads.dump.hide">__jhiTransformTranslate__('metrics.jvm.threads.dump.hide')</span>
       </a>
     </h6>
 
@@ -74,11 +74,11 @@
       <caption>Threads dump: {{ thread.threadName }}</caption>
       <thead>
         <tr>
-          <th scope="col" <%= jhiPrefix %>Translate="metrics.jvm.threads.dump.blockedtime"><%- getWebappTranslation('metrics.jvm.threads.dump.blockedtime') %></th>
-          <th scope="col" <%= jhiPrefix %>Translate="metrics.jvm.threads.dump.blockedcount"><%- getWebappTranslation('metrics.jvm.threads.dump.blockedcount') %></th>
-          <th scope="col" <%= jhiPrefix %>Translate="metrics.jvm.threads.dump.waitedtime"><%- getWebappTranslation('metrics.jvm.threads.dump.waitedtime') %></th>
-          <th scope="col" <%= jhiPrefix %>Translate="metrics.jvm.threads.dump.waitedcount"><%- getWebappTranslation('metrics.jvm.threads.dump.waitedcount') %></th>
-          <th scope="col" <%= jhiPrefix %>Translate="metrics.jvm.threads.dump.lockname"><%- getWebappTranslation('metrics.jvm.threads.dump.lockname') %></th>
+          <th scope="col" <%= jhiPrefix %>Translate="metrics.jvm.threads.dump.blockedtime">__jhiTransformTranslate__('metrics.jvm.threads.dump.blockedtime')</th>
+          <th scope="col" <%= jhiPrefix %>Translate="metrics.jvm.threads.dump.blockedcount">__jhiTransformTranslate__('metrics.jvm.threads.dump.blockedcount')</th>
+          <th scope="col" <%= jhiPrefix %>Translate="metrics.jvm.threads.dump.waitedtime">__jhiTransformTranslate__('metrics.jvm.threads.dump.waitedtime')</th>
+          <th scope="col" <%= jhiPrefix %>Translate="metrics.jvm.threads.dump.waitedcount">__jhiTransformTranslate__('metrics.jvm.threads.dump.waitedcount')</th>
+          <th scope="col" <%= jhiPrefix %>Translate="metrics.jvm.threads.dump.lockname">__jhiTransformTranslate__('metrics.jvm.threads.dump.lockname')</th>
         </tr>
       </thead>
       <tbody>

package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-modal-threads/metrics-modal-threads.component.spec.ts.ejs

@@ -0,0 +1,350 @@
+<%#
+ Copyright 2013-2023 the original author or authors from the JHipster project.
+
+ This file is part of the JHipster project, see https://www.jhipster.tech/
+ for more information.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-%>
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { HttpClientTestingModule } from '@angular/common/http/testing';
+import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
+
+import { MetricsModalThreadsComponent } from './metrics-modal-threads.component';
+import { ThreadState } from '../../metrics.model';
+
+describe('MetricsModalThreadsComponent', () => {
+  let comp: MetricsModalThreadsComponent;
+  let fixture: ComponentFixture<MetricsModalThreadsComponent>;
+  let mockActiveModal: NgbActiveModal;
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      imports: [HttpClientTestingModule, MetricsModalThreadsComponent],
+      providers: [NgbActiveModal],
+    })
+      .overrideTemplate(MetricsModalThreadsComponent, '')
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(MetricsModalThreadsComponent);
+    comp = fixture.componentInstance;
+    mockActiveModal = TestBed.inject(NgbActiveModal);
+  });
+
+  describe('ngOnInit', () => {
+    it('should count threads on init', () => {
+      // GIVEN
+      comp.threads = [
+        { 
+            threadName: '',
+            threadId: 1,
+            blockedTime: 1,
+            blockedCount: 1,
+            waitedTime: 1,
+            waitedCount: 1,
+            lockName: 'lock1',
+            lockOwnerId: 1,
+            lockOwnerName: 'lock1',
+            daemon: true,
+            inNative: true,
+            suspended: true,
+            threadState: ThreadState.Blocked,
+            priority: 1,
+            stackTrace: [],
+            lockedMonitors: [],
+            lockedSynchronizers: [],
+            lockInfo: null
+        },
+        { 
+            threadName: '',
+            threadId: 2,
+            blockedTime: 2,
+            blockedCount: 2,
+            waitedTime: 2,
+            waitedCount: 2,
+            lockName: 'lock2',
+            lockOwnerId: 2,
+            lockOwnerName: 'lock2',
+            daemon: false,
+            inNative: false,
+            suspended: false,
+            threadState: ThreadState.Runnable,
+            priority: 2,
+            stackTrace: [],
+            lockedMonitors: [],
+            lockedSynchronizers: [],
+            lockInfo: null
+        },
+        { 
+            threadName: '',
+            threadId: 3,
+            blockedTime: 3,
+            blockedCount: 3,
+            waitedTime: 3,
+            waitedCount: 3,
+            lockName: 'lock3',
+            lockOwnerId: 3,
+            lockOwnerName: 'lock3',
+            daemon: false,
+            inNative: false,
+            suspended: false,
+            threadState: ThreadState.TimedWaiting,
+            priority: 3,
+            stackTrace: [],
+            lockedMonitors: [],
+            lockedSynchronizers: [],
+            lockInfo: null
+        },
+        { 
+            threadName: '',
+            threadId: 4,
+            blockedTime: 4,
+            blockedCount: 4,
+            waitedTime: 4,
+            waitedCount: 4,
+            lockName: 'lock4',
+            lockOwnerId: 4,
+            lockOwnerName: 'lock4',
+            daemon: false,
+            inNative: false,
+            suspended: false,
+            threadState: ThreadState.Waiting,
+            priority: 4,
+            stackTrace: [],
+            lockedMonitors: [],
+            lockedSynchronizers: [],
+            lockInfo: null
+        }
+      ];
+
+      // WHEN
+      comp.ngOnInit();
+
+      // THEN
+      expect(comp.threadDumpRunnable).toEqual(1);
+      expect(comp.threadDumpWaiting).toEqual(1);
+      expect(comp.threadDumpTimedWaiting).toEqual(1);
+      expect(comp.threadDumpBlocked).toEqual(1);
+      expect(comp.threadDumpAll).toEqual(4);
+    });
+  });
+
+  describe('getBadgeClass', () => {
+    it('should return a success badge class for runnable thread state', () => {
+      // GIVEN
+      const threadState = ThreadState.Runnable;
+
+      // WHEN
+      const badgeClass = comp.getBadgeClass(threadState);
+
+      // THEN
+      expect(badgeClass).toEqual('bg-success');
+    });
+
+    it('should return an info badge class for waiting thread state', () => {
+      // GIVEN
+      const threadState = ThreadState.Waiting;
+
+      // WHEN
+      const badgeClass = comp.getBadgeClass(threadState);
+
+      // THEN
+      expect(badgeClass).toEqual('bg-info');
+    });
+
+    it('should return a warning badge class for time waiting thread state', () => {
+      // GIVEN
+      const threadState = ThreadState.TimedWaiting;
+
+      // WHEN
+      const badgeClass = comp.getBadgeClass(threadState);
+
+      // THEN
+      expect(badgeClass).toEqual('bg-warning');
+    });
+
+    it('should return a danger badge class for blocked thread state', () => {
+      // GIVEN
+      const threadState = ThreadState.Blocked;
+
+      // WHEN
+      const badgeClass = comp.getBadgeClass(threadState);
+
+      // THEN
+      expect(badgeClass).toEqual('bg-danger');
+    });
+
+    it('should return an empty string for others threads', () => {
+      // GIVEN
+      const threadState = ThreadState.New;
+
+      // WHEN
+      const badgeClass = comp.getBadgeClass(threadState);
+
+      // THEN
+      expect(badgeClass).toEqual('');
+    });
+  });
+
+  describe('getThreads', () => {
+    it('should return blocked threads', () => {
+      // GIVEN
+      const thread1 = { 
+        threadName: '',
+        threadId: 1,
+        blockedTime: 1,
+        blockedCount: 1,
+        waitedTime: 1,
+        waitedCount: 1,
+        lockName: 'lock1',
+        lockOwnerId: 1,
+        lockOwnerName: 'lock1',
+        daemon: true,
+        inNative: true,
+        suspended: true,
+        threadState: ThreadState.Blocked,
+        priority: 1,
+        stackTrace: [],
+        lockedMonitors: [],
+        lockedSynchronizers: [],
+        lockInfo: null
+      };
+      const thread2 = { 
+        threadName: '',
+        threadId: 2,
+        blockedTime: 2,
+        blockedCount: 2,
+        waitedTime: 2,
+        waitedCount: 2,
+        lockName: 'lock2',
+        lockOwnerId: 1,
+        lockOwnerName: 'lock2',
+        daemon: false,
+        inNative: false,
+        suspended: false,
+        threadState: ThreadState.Runnable,
+        priority: 2,
+        stackTrace: [],
+        lockedMonitors: [],
+        lockedSynchronizers: [],
+        lockInfo: null
+      };
+      comp.threads = [
+        thread1,
+        thread2
+      ];
+      comp.threadStateFilter = ThreadState.Blocked;
+
+      // WHEN
+      const threadsFiltered = comp.getThreads();
+
+      // THEN
+      expect(threadsFiltered).toEqual([thread1]);
+    });
+
+    it('should return an empty array of threads', () => {
+      // GIVEN
+      comp.threads = [];
+      comp.threadStateFilter = ThreadState.Blocked;
+
+      // WHEN
+      const threadsFiltered = comp.getThreads();
+
+      // THEN
+      expect(threadsFiltered).toEqual([]);
+    });
+
+    it('should return all threads if there is no filter', () => {
+      // GIVEN
+      const thread1 = { 
+        threadName: '',
+        threadId: 1,
+        blockedTime: 1,
+        blockedCount: 1,
+        waitedTime: 1,
+        waitedCount: 1,
+        lockName: 'lock1',
+        lockOwnerId: 1,
+        lockOwnerName: 'lock1',
+        daemon: true,
+        inNative: true,
+        suspended: true,
+        threadState: ThreadState.Blocked,
+        priority: 1,
+        stackTrace: [],
+        lockedMonitors: [],
+        lockedSynchronizers: [],
+        lockInfo: null
+      };
+      const thread2 = { 
+        threadName: '',
+        threadId: 2,
+        blockedTime: 2,
+        blockedCount: 2,
+        waitedTime: 2,
+        waitedCount: 2,
+        lockName: 'lock2',
+        lockOwnerId: 1,
+        lockOwnerName: 'lock2',
+        daemon: false,
+        inNative: false,
+        suspended: false,
+        threadState: ThreadState.Runnable,
+        priority: 2,
+        stackTrace: [],
+        lockedMonitors: [],
+        lockedSynchronizers: [],
+        lockInfo: null
+      };
+      comp.threads = [
+        thread1,
+        thread2
+      ];
+      comp.threadStateFilter = undefined;
+
+      // WHEN
+      const threadsFiltered = comp.getThreads();
+
+      // THEN
+      expect(threadsFiltered).toEqual(comp.threads);
+    });
+
+    it('should return an empty array if there are no threads to filter', () => {
+      // GIVEN
+      comp.threads = undefined
+      comp.threadStateFilter = ThreadState.Blocked;
+
+      // WHEN
+      const threadsFiltered = comp.getThreads();
+
+      // THEN
+      expect(threadsFiltered).toEqual([]);
+    });
+  });
+
+  describe('dismiss', () => {
+    it('should call dismiss function for modal on dismiss', () => {
+      // GIVEN
+      jest.spyOn(mockActiveModal, 'dismiss').mockReturnValue(undefined);
+
+      // WHEN
+      comp.dismiss();
+
+      // THEN
+      expect(mockActiveModal.dismiss).toHaveBeenCalled();
+    });
+  });
+
+});

package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-request/metrics-request.component.html.ejs

@@ -16,15 +16,15 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-<h3 id="requestMetrics" <%= jhiPrefix %>Translate="metrics.jvm.http.title"><%- getWebappTranslation('metrics.jvm.http.title') %></h3>
+<h3 id="requestMetrics" <%= jhiPrefix %>Translate="metrics.jvm.http.title">__jhiTransformTranslate__('metrics.jvm.http.title')</h3>
 
 <table class="table table-striped" *ngIf="!updating && requestMetrics" aria-describedby="requestMetrics">
   <thead>
     <tr>
-      <th scope="col" <%= jhiPrefix %>Translate="metrics.jvm.http.table.code"><%- getWebappTranslation('metrics.jvm.http.table.code') %></th>
-      <th scope="col" <%= jhiPrefix %>Translate="metrics.jvm.http.table.count"><%- getWebappTranslation('metrics.jvm.http.table.count') %></th>
-      <th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.jvm.http.table.mean"><%- getWebappTranslation('metrics.jvm.http.table.mean') %></th>
-      <th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.jvm.http.table.max"><%- getWebappTranslation('metrics.jvm.http.table.max') %></th>
+      <th scope="col" <%= jhiPrefix %>Translate="metrics.jvm.http.table.code">__jhiTransformTranslate__('metrics.jvm.http.table.code')</th>
+      <th scope="col" <%= jhiPrefix %>Translate="metrics.jvm.http.table.count">__jhiTransformTranslate__('metrics.jvm.http.table.count')</th>
+      <th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.jvm.http.table.mean">__jhiTransformTranslate__('metrics.jvm.http.table.mean')</th>
+      <th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.jvm.http.table.max">__jhiTransformTranslate__('metrics.jvm.http.table.max')</th>
     </tr>
   </thead>
   <tbody>

package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/metrics.component.html.ejs

@@ -18,14 +18,14 @@
 -%>
 <div>
   <h2>
-    <span id="metrics-page-heading" <%= jhiPrefix %>Translate="metrics.title" data-cy="metricsPageHeading"><%- getWebappTranslation('metrics.title') %></span>
+    <span id="metrics-page-heading" <%= jhiPrefix %>Translate="metrics.title" data-cy="metricsPageHeading">__jhiTransformTranslate__('metrics.title')</span>
 
     <button class="btn btn-primary float-end" (click)="refresh()">
-      <fa-icon icon="sync"></fa-icon> <span <%= jhiPrefix %>Translate="metrics.refresh.button"><%- getWebappTranslation('metrics["refresh.button"]') %></span>
+      <fa-icon icon="sync"></fa-icon> <span <%= jhiPrefix %>Translate="metrics.refresh.button">__jhiTransformTranslate__('metrics["refresh.button"]')</span>
     </button>
   </h2>
 
-  <h3 <%= jhiPrefix %>Translate="metrics.jvm.title"><%- getWebappTranslation('metrics.jvm.title') %></h3>
+  <h3 <%= jhiPrefix %>Translate="metrics.jvm.title">__jhiTransformTranslate__('metrics.jvm.title')</h3>
 
   <div class="row" *ngIf="metrics && !updatingMetrics">
     <<%= jhiPrefixDashed %>-jvm-memory class="col-md-4" [updating]="updatingMetrics" [jvmMemoryMetrics]="metrics.jvm"></<%= jhiPrefixDashed %>-jvm-memory>
@@ -41,7 +41,7 @@
     [garbageCollectorMetrics]="metrics.garbageCollector"
   ></<%= jhiPrefixDashed %>-metrics-garbagecollector>
 
-  <div class="well well-lg" *ngIf="updatingMetrics" <%= jhiPrefix %>Translate="metrics.updating"><%- getWebappTranslation('metrics.updating') %></div>
+  <div class="well well-lg" *ngIf="updatingMetrics" <%= jhiPrefix %>Translate="metrics.updating">__jhiTransformTranslate__('metrics.updating')</div>
 
   <<%= jhiPrefixDashed %>-metrics-request
     *ngIf="metrics && metricsKeyExists('http.server.requests')"