receiving the system information from the system hosting the management application rather than the client information

Author: janniclas

app/controllers/SystemInfo.scala renamed to app/controllers/SystemInfoController.scala

@@ -38,23 +38,23 @@
 
  object HostName {
    def apply(host: Option[String]): String = {
-    var hostname = InetAddress.getLocalHost().getHostName()
+    val hostname = InetAddress.getLocalHost().getHostName()
     hostname
    }
  }
 
  object PlatformName {
    def apply(platform: Option[String]): String = {
-     var os = "os.name";
-     var version = "os.version";
-     var osVersion = System.getProperty(os) + " " + System.getProperty(version)
+     val os = "os.name";
+     val version = "os.version";
+     val osVersion = System.getProperty(os) + " " + System.getProperty(version)
      osVersion
    }
  }
 
  object ScalaVersion {
    def apply(browser: Option[String]): String = {
-     var scalaVersion = PlayVersion.current
+     val scalaVersion = PlayVersion.current
      scalaVersion
    }
  }

app/models/SysInfo.sc

@@ -27,7 +27,6 @@
     "core-js": "^2.5.4",
     "font-awesome": "^4.7.0",
     "jquery": "^3.3.1",
-    "ngx-device-detector": "^1.3.3",
     "popper.js": "^1.14.4",
     "rxjs": "^6.2.2",
     "rxjs-compat": "^6.2.2",

client/package.json

@@ -20,9 +20,10 @@ import {Inject, Injectable, Optional} from '@angular/core';
 import {HttpClient, HttpHeaders, HttpParams} from '@angular/common/http';
 import {Observable} from 'rxjs';
 import {Configuration} from '../configuration';
-import {BASE_PATH, INSTANCES, NUMBER_OF_INSTANCES} from '../variables';
+import {BASE_PATH, INSTANCES, NUMBER_OF_INSTANCES, SYS_INFO} from '../variables';
 import {CustomHttpUrlEncodingCodec} from '../encoder';
 import {Instance} from '..';
+import {SysInfo} from "../model/sysInfo";
 
 
 @Injectable({
@@ -46,6 +47,21 @@ export class ApiService {
     }
   }
 
+  public getSysInfo(reportProgress: boolean = false): Observable<SysInfo> {
+    let headers = this.defaultHeaders;
+
+    // to determine the Accept header
+    const httpHeaderAccepts: string[] = [
+      'application/json'
+    ];
+    const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+    if (httpHeaderAcceptSelected !== undefined) {
+      headers = headers.set('Accept', httpHeaderAcceptSelected);
+    }
+    return this.httpClient.get<SysInfo>(`${this.basePath}${SYS_INFO}`,
+      {headers: headers, observe: 'body', reportProgress: reportProgress});
+    }
+
   /**
    * Find number of running instances
    * How many instances per type are running
@@ -68,7 +84,7 @@ export class ApiService {
     return this.get(INSTANCES, componentType);
   }
 
-  private get(endpoint: string, componentType, observe: any = 'body', reportProgress: boolean = false ): any {
+  private get(endpoint: string, componentType: string, observe: any = 'body', reportProgress: boolean = false ): any {
     if (componentType === null || componentType === undefined) {
       throw new Error('Required parameter componentType was null or undefined when calling getInstanceNumber.');
     }

client/src/app/api/api/api.service.ts

@@ -0,0 +1,24 @@
+/*
+ * Copyright (C) 2018 The Delphi Team.
+ * See the LICENCE file distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * 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
+ *
+ * http://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.
+ */
+
+export interface SysInfo {
+  javaVersion: string;
+  hostName: string;
+  platformName: string;
+  scalaVersion: string;
+}

client/src/app/api/model/sysInfo.ts

@@ -3,14 +3,14 @@
  * See the LICENCE file distributed with this work for additional
  * information regarding copyright ownership.
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * 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
  *
  * http://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,
+ * 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.
@@ -19,11 +19,12 @@
 import { InjectionToken } from '@angular/core';
 
 export const BASE_PATH = new InjectionToken<string>('basePath');
-export const INSTANCES = "/api/instances"
-export const NUMBER_OF_INSTANCES = "/api/numberOfInstances"
+export const INSTANCES = '/api/instances';
+export const SYS_INFO = '/api/systemInfo';
+export const NUMBER_OF_INSTANCES = '/api/numberOfInstances';
 export const COLLECTION_FORMATS = {
     'csv': ',',
     'tsv': '   ',
     'ssv': ' ',
     'pipes': '|'
-}
+};

client/src/app/api/variables.ts

@@ -21,17 +21,29 @@ <h5>System Information</h5>
      <div class="floatStyle">
          <table class="tableAlign">
           <tr>
-            <td>Browser: </td>
+            <td>Scala Version: </td>
             <td class="valueBox">
-                {{deviceInfo.browser}}
+                {{sysInfo.scalaVersion}}
             </td>            
           </tr>
           <tr>
-            <td>Client Platform: </td>
+            <td>JVM Version: </td>
             <td class="valueBox">
-               {{deviceInfo.os}}
+               {{sysInfo.javaVersion}}
             </td>            
           </tr>
+           <tr>
+             <td>Platform: </td>
+             <td class="valueBox">
+               {{sysInfo.platformName}}
+             </td>
+           </tr>
+           <tr>
+             <td>Host Name: </td>
+             <td class="valueBox">
+               {{sysInfo.hostName}}
+             </td>
+           </tr>
         </table>
      </div>
 </div>

client/src/app/dashboard/status-card/status-card.component.html

@@ -17,7 +17,8 @@
  */
 
 import { Component, OnInit } from '@angular/core';
-import { DeviceDetectorService } from 'ngx-device-detector';
+import { ApiService } from '../../api';
+import {SysInfo} from '../../api/model/sysInfo';
 
 @Component({
   selector: 'app-statuscard',
@@ -26,17 +27,20 @@ import { DeviceDetectorService } from 'ngx-device-detector';
 })
 
 export class StatusCardComponent implements OnInit {
-  public deviceInfo = null;
 
-  constructor(private deviceService: DeviceDetectorService) {
-    this.infoFunction();
-  }
+  sysInfo: SysInfo;
 
-  infoFunction() {
-    this.deviceInfo = this.deviceService.getDeviceInfo();
+  constructor( private apiService: ApiService) {
+    this.sysInfo = { hostName: 'no server connection',
+                    javaVersion: 'no server connection',
+                    platformName: 'no server connection',
+                    scalaVersion: 'no server connection' };
   }
 
   ngOnInit() {
+    this.apiService.getSysInfo().subscribe((sysInfo) => {
+      this.sysInfo = sysInfo;
+    });
   }
 
 }