Skip to content

Gk development 3.0 #721

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kassahungb wants to merge 6 commits into
base: springBoot3x
Choose a base branch
from
Open

Gk development 3.0 #721

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
036830f
Add the services to the Service Information page’s service dropdown.
kassahungb Jun 17, 2026
bdb6f5a
Merge branch 'development_3.0' into gk_development_3.0
kassahungb Jun 17, 2026
546b440
Merge pull request #719 from ncats/awmisc_test_ngx_schema_form_v2.14.1
narchana Jun 17, 2026
16696f9
Merge branch 'development_3.0' into springBoot3x
kassahungb Jun 18, 2026
68f3086
Merge branch 'springBoot3x' into gk_development_3.0
kassahungb Jun 18, 2026
9d27f6d
Add the services to the Service status page’s service dropdown 2.
kassahungb Jun 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 14 additions & 3 deletions src/app/core/admin/admin.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,21 @@ export class AdminService extends BaseHttpService {
return this.http.get< ScheduledJob >(job).pipe(retry(2), catchError(err => throwError(err)));
}

public getEnvironmentHealth(serviceContext:string): Observable< any > {
//const url = `${(this.configService.configData && this.configService.configData.apiBaseUrl) || '/' }api/v1/`;
let url = `${(this.configService.configData && this.configService.configData.apiBaseUrl) || '/' }api/v1/health/info`;
url = url.replace('/api/v1/health/info', `/service/`+ serviceContext + `/api/v1/health/info`);

public getEnvironmentHealth(): Observable< any > {
const url = `${(this.configService.configData && this.configService.configData.apiBaseUrl) || '/' }api/v1/`;
return this.http.get< any >(`${url}health/info`);
const result = this.http.get< any >(url, { observe: 'response' }).pipe(
catchError((error: HttpErrorResponse) => {
return of(error);
}));


//http://localhost:8081/ginas/app/service/clinical-trials/api/v1/health/info

// const url = `${(this.configService.configData && this.configService.configData.apiBaseUrl) || '/' }api/v1/`;
return result;

}

Expand Down
240 changes: 130 additions & 110 deletions src/app/core/admin/cache-summary/cache-summary.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,127 +1,147 @@
<div class = "cache-container" *ngIf = "health">
<div class = "data-column">
<mat-card>
<mat-card-title> Runtime Environment</mat-card-title>
<div class="cache-data">
<div class="name">Epoch</div>
<div class="value">{{health.epoch | date: 'medium'}}</div>
</div>

<div class="cache-data">
<div class="name">Uptime</div>
<div class="value">{{runtime}}</div>
</div>
<!-- <div *ngIf="loading === false"> -->
<div>
<mat-form-field>
<!-- example select box __GK__ -->
<mat-label>Service</mat-label>
<mat-select [(ngModel)]="currentService" (selectionChange)="onServiceSelectionChange($event)">
<mat-option *ngFor="let option of services" [value]="option">
{{option}}
</mat-option>
</mat-select>
</mat-form-field>
</div>

<div class="cache-data">
<div class="name">Server</div>
<div class="value">{{health.hostname}}</div>
</div>
<div class="cache-data">
<div class="name">Available Processors</div>
<div class="value">{{health.runtime.availableProcessors}}</div>
</div>
<div class="cache-data">
<div class="name">Free Memory</div>
<div class="value">{{health.runtime.freeMemory/(1024*1024) | number : '1.1-1'}} Mb</div>
</div>
<div *ngIf="isError">
<mat-card><p>Error Loading Health Information</p></mat-card>
</div>

<div class="cache-data">
<div class="name">Total Memory</div>
<div class="value">{{health.runtime.totalMemory/(1024*1024) | number : '1.1-1'}} Mb</div>
</div>
<div class="cache-container" *ngIf="health">
<div class="data-column">
<mat-card>
<mat-card-title> Runtime Environment test</mat-card-title>
<div class="cache-data">
<div class="name">Epoch</div>
<div class="value">{{health.epoch | date: 'medium'}}</div>
</div>

<div class="cache-data">
<div class="name">Max Memory</div>
<div class="value">{{health.runtime.maxMemory/(1024*1024) | number : '1.1-1'}} Mb</div>
</div>
<div class="cache-data">
<div class="name">Uptime</div>
<div class="value">{{runtime}}</div>
</div>

<div class="cache-data">
<div class="name">JRE Version</div>
<div class="value">{{health.javaVersion}}</div>
</div>
<div class="cache-data">
<div class="name">Server</div>
<div class="value">{{health.hostname}}</div>
</div>
<div class="cache-data">
<div class="name">Available Processors</div>
<div class="value">{{health.runtime.availableProcessors}}</div>
</div>
<div class="cache-data">
<div class="name">Free Memory</div>
<div class="value">{{health.runtime.freeMemory/(1024*1024) | number : '1.1-1'}} Mb</div>
</div>

<div class="cache-data">
<div class="name">Number of Threads</div>
<div class="value">{{health.threads}}</div>
</div>
<div class="cache-data">
<div class="name">Total Memory</div>
<div class="value">{{health.runtime.totalMemory/(1024*1024) | number : '1.1-1'}} Mb</div>
</div>

<div class="cache-data">
<div class="name">Number of Running Threads</div>
<div class="value">{{health.runningThreads}}</div>
</div>
<div class="cache-data">
<div class="name">Max Memory</div>
<div class="value">{{health.runtime.maxMemory/(1024*1024) | number : '1.1-1'}} Mb</div>
</div>

<div class="cache-data">
<div class="name"></div>
<div class="value"></div>
</div>
</mat-card>
</div>
<div class="cache-data">
<div class="name">JRE Version</div>
<div class="value">{{health.javaVersion}}</div>
</div>

<div class="cache-data">
<div class="name">Number of Threads</div>
<div class="value">{{health.threads}}</div>
</div>

<div class="cache-data">
<div class="name">Number of Running Threads</div>
<div class="value">{{health.runningThreads}}</div>
</div>

<div class="cache-data">
<div class="name"></div>
<div class="value"></div>
</div>
</mat-card>
</div>

<div class = "data-column">
<mat-card >
<div class="data-column">
<mat-card>
<mat-card-title> Cache Configuration</mat-card-title>
<div class="cache-data">
<div class="name">Max Cache Elements</div>
<div class="value">{{health.cacheInfo.maxCacheElements}}</div>
</div>
<div class="cache-data">
<div class="cache-data">
<div class="name">Max Cache Elements</div>
<div class="value">{{health.cacheInfo.maxCacheElements}}</div>
</div>
<div class="cache-data">
<div class="name">Max Evictable Cache Elements</div>
<div class="value">{{health.cacheInfo.maxNotEvictableCacheElements}}</div>
</div>
<div class="cache-data">
</div>
<div class="cache-data">
<div class="name">Time to Live (seconds)</div>
<div class="value">{{health.cacheInfo.timeToLive}}</div>
</div>
<div class="cache-data">
</div>
<div class="cache-data">
<div class="name">Time to Idle (seconds)</div>
<div class="value">{{health.cacheInfo.timeToIdle}}</div>
</div>
</mat-card>
</div>
<div class = "database-table-container">
<mat-card>
<mat-card-title>Database Information</mat-card-title>
<div class = "database-table">
<table mat-table [dataSource]="health.databaseInformation">
<ng-container matColumnDef="database">
<th mat-header-cell *matHeaderCellDef> Database </th>
<td mat-cell *matCellDef="let db"> {{db.database}} </td>
</ng-container>
<ng-container matColumnDef="driver">
<th mat-header-cell *matHeaderCellDef> Driver </th>
<td mat-cell *matCellDef="let db"> {{db.driver}} </td>
</ng-container>
<ng-container matColumnDef="product">
<th mat-header-cell *matHeaderCellDef> Product </th>
<td mat-cell *matCellDef="let db"> {{db.product}} </td>
</ng-container>
<ng-container matColumnDef="latency">
<th mat-header-cell *matHeaderCellDef> Latency </th>
<td mat-cell *matCellDef="let db"> {{db.latency}} ms</td>
</ng-container>
<ng-container matColumnDef="connected">
<th mat-header-cell *matHeaderCellDef> Connected </th>
<td mat-cell *matCellDef="let db"> {{db.connected}} </td>
</ng-container>
<ng-container matColumnDef="max">
<th mat-header-cell *matHeaderCellDef> Max Connections </th>
<td mat-cell *matCellDef="let db"> {{db.maxConnectionPool ? db.maxConnectionPool : 'N/A'}} </td>
</ng-container>
<ng-container matColumnDef="active">
<th mat-header-cell *matHeaderCellDef> Active Connections </th>
<td mat-cell *matCellDef="let db"> {{db.activeConnection ? db.activeConnection : 'N/A'}} </td>
</ng-container>
<ng-container matColumnDef="usage">
<th mat-header-cell *matHeaderCellDef>Connection Usage </th>
<td mat-cell *matCellDef="let db">
{{ db.activeConnection && db.maxConnectionPool ?
(100-((db.maxConnectionPool - db.activeConnection) / db.maxConnectionPool * 100) | number : '1.1-2') + '%' : 'N/A'
}} </td>
</ng-container>
<tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
<tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr>
</table>
</div>
</mat-card>
</div>
<div class="database-table-container">
<mat-card>
<mat-card-title>Database Information</mat-card-title>
<div class="database-table">
<table mat-table [dataSource]="health.databaseInformation">
<ng-container matColumnDef="database">
<th mat-header-cell *matHeaderCellDef> Database </th>
<td mat-cell *matCellDef="let db"> {{db.database}} </td>
</ng-container>
<ng-container matColumnDef="driver">
<th mat-header-cell *matHeaderCellDef> Driver </th>
<td mat-cell *matCellDef="let db"> {{db.driver}} </td>
</ng-container>
<ng-container matColumnDef="product">
<th mat-header-cell *matHeaderCellDef> Product </th>
<td mat-cell *matCellDef="let db"> {{db.product}} </td>
</ng-container>
<ng-container matColumnDef="latency">
<th mat-header-cell *matHeaderCellDef> Latency </th>
<td mat-cell *matCellDef="let db"> {{db.latency}} ms</td>
</ng-container>
<ng-container matColumnDef="connected">
<th mat-header-cell *matHeaderCellDef> Connected </th>
<td mat-cell *matCellDef="let db"> {{db.connected}} </td>
</ng-container>
<ng-container matColumnDef="max">
<th mat-header-cell *matHeaderCellDef> Max Connections </th>
<td mat-cell *matCellDef="let db"> {{db.maxConnectionPool ? db.maxConnectionPool : 'N/A'}} </td>
</ng-container>
<ng-container matColumnDef="active">
<th mat-header-cell *matHeaderCellDef> Active Connections </th>
<td mat-cell *matCellDef="let db"> {{db.activeConnection ? db.activeConnection : 'N/A'}} </td>
</ng-container>
<ng-container matColumnDef="usage">
<th mat-header-cell *matHeaderCellDef>Connection Usage </th>
<td mat-cell *matCellDef="let db">
{{ db.activeConnection && db.maxConnectionPool ?
(100-((db.maxConnectionPool - db.activeConnection) / db.maxConnectionPool * 100) | number :
'1.1-2') + '%' : 'N/A'
}} </td>
</ng-container>
<tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
<tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr>
</table>
</div>
</mat-card>


</div>
</mat-card>
</div>
</div>
Loading
Loading