KEYCLOAK-1542 - rewrote showing info from providers to be generic

forms/common-themes/src/main/resources/theme/base/admin/resources/js/app.js

@@ -1112,7 +1112,13 @@ module.config([ '$routeProvider', function($routeProvider) {
             controller : 'AuthenticationConfigCreateCtrl'
         })
         .when('/server-info', {
-            templateUrl : resourceUrl + '/partials/server-info.html'
+            templateUrl : resourceUrl + '/partials/server-info.html',
+            resolve : {
+            	serverInfoPage : function(ServerInfoPageLoader) {
+                return ServerInfoPageLoader();
+            	}
+            },
+            controller : 'ServerInfoPageCtrl'
         })
         .when('/logout', {
             templateUrl : resourceUrl + '/partials/home.html',

forms/common-themes/src/main/resources/theme/base/admin/resources/js/controllers/realm.js

@@ -113,6 +113,13 @@ module.controller('HomeCtrl', function(Realm, Auth, $location) {
     });
 });
 
+module.controller('ServerInfoPageCtrl', function($scope, ServerInfoPage) {
+		$scope.serverInfoPage = ServerInfoPage.get();
+    $scope.serverInfoPageUpdate = function() {
+        $scope.serverInfoPage = ServerInfoPage.get();
+    };
+});
+
 module.controller('RealmListCtrl', function($scope, Realm, Current) {
     $scope.realms = Realm.query();
     Current.realms = $scope.realms;

forms/common-themes/src/main/resources/theme/base/admin/resources/js/loaders.js

@@ -39,6 +39,10 @@ module.factory('ServerInfoLoader', function(Loader, ServerInfo, $q) {
     return Loader.get(ServerInfo);
 });
 
+module.factory('ServerInfoPageLoader', function(Loader, ServerInfoPage, $q) {
+  return Loader.get(ServerInfoPage);
+});
+
 module.factory('RealmLoader', function(Loader, Realm, $route, $q) {
 	return Loader.get(Realm, function() {
 		return {

forms/common-themes/src/main/resources/theme/base/admin/resources/js/services.js

@@ -205,6 +205,9 @@ module.factory('ServerInfo', function($resource) {
     return $resource(authUrl + '/admin/serverinfo');
 });
 
+module.factory('ServerInfoPage', function($resource) {
+  return $resource(authUrl + '/admin/serverinfopage');
+});
 
 
 module.factory('ClientProtocolMapper', function($resource) {

forms/common-themes/src/main/resources/theme/base/admin/resources/partials/server-info.html

@@ -4,15 +4,15 @@
   <table class="table table-striped table-bordered">
     <tr>
         <td width="20%">Keycloak Version</td>
-        <td>{{serverInfo.version}}</td>
+        <td>{{serverInfoPage.version}}</td>
     </tr>
     <tr>
         <td>Server Time</td>
-        <td>{{serverInfo.serverTime}} (<a style="cursor: pointer" data-ng-click="serverInfoUpdate()">update</a>)</td>
+        <td>{{serverInfoPage.serverTime}} (<a style="cursor: pointer" data-ng-click="serverInfoPageUpdate()">update</a>)</td>
     </tr>
     <tr>
         <td>Server Uptime</td>
-        <td>{{serverInfo.serverUptime}}</td>
+        <td>{{serverInfoPage.serverUptime}}</td>
     </tr>
   </table>
 
@@ -22,15 +22,15 @@
 	    <table class="table table-striped table-bordered" style="margin-top: 0px;">
 	        <tr>
 	            <td width="20%">Total Memory</td>
-	            <td>{{serverInfo.memoryInfo.totalFormated}}</td>
+	            <td>{{serverInfoPage.memoryInfo.totalFormated}}</td>
 	        </tr>
 	        <tr>
 	            <td>Free Memory</td>
-	            <td>{{serverInfo.memoryInfo.freeFormated}} ({{serverInfo.memoryInfo.freePercentage}}%)</td>
+	            <td>{{serverInfoPage.memoryInfo.freeFormated}} ({{serverInfoPage.memoryInfo.freePercentage}}%)</td>
 	        </tr>
 	        <tr>
 	            <td>Used Memory</td>
-	            <td>{{serverInfo.memoryInfo.usedFormated}}</td>
+	            <td>{{serverInfoPage.memoryInfo.usedFormated}}</td>
 	        </tr>
 	   	</table>
 		</div>
@@ -42,109 +42,73 @@
         <table class="table table-striped table-bordered" style="margin-top: 0px;">
         <tr>
             <td width="20%">Current Working Directory</td>
-            <td>{{serverInfo.systemInfo.userDir}}</td>
+            <td>{{serverInfoPage.systemInfo.userDir}}</td>
         </tr>
         <tr>
             <td>Java Version</td>
-            <td>{{serverInfo.systemInfo.javaVersion}}</td>
+            <td>{{serverInfoPage.systemInfo.javaVersion}}</td>
         </tr>
         <tr>
             <td>Java Vendor</td>
-            <td>{{serverInfo.systemInfo.javaVendor}}</td>
+            <td>{{serverInfoPage.systemInfo.javaVendor}}</td>
         </tr>
         <tr>
             <td>Java Runtime</td>
-            <td>{{serverInfo.systemInfo.javaRuntime}}</td>
+            <td>{{serverInfoPage.systemInfo.javaRuntime}}</td>
         </tr>
         <tr>
             <td>Java VM</td>
-            <td>{{serverInfo.systemInfo.javaVm}}</td>
+            <td>{{serverInfoPage.systemInfo.javaVm}}</td>
         </tr>
         <tr>
             <td>Java VM Version</td>
-            <td>{{serverInfo.systemInfo.javaVmVersion}}</td>
+            <td>{{serverInfoPage.systemInfo.javaVmVersion}}</td>
         </tr>
         <tr>
             <td>Java Home</td>
-            <td>{{serverInfo.systemInfo.javaHome}}</td>
+            <td>{{serverInfoPage.systemInfo.javaHome}}</td>
         </tr>
         <tr>
             <td>User Name</td>
-            <td>{{serverInfo.systemInfo.userName}}</td>
+            <td>{{serverInfoPage.systemInfo.userName}}</td>
         </tr>
         <tr>
             <td>User Timezone</td>
-            <td>{{serverInfo.systemInfo.userTimezone}}</td>
+            <td>{{serverInfoPage.systemInfo.userTimezone}}</td>
         </tr>
         <tr>
             <td>User Locale</td>
-            <td>{{serverInfo.systemInfo.userLocale}}</td>
+            <td>{{serverInfoPage.systemInfo.userLocale}}</td>
         </tr>
         <tr>
             <td>System Encoding</td>
-            <td>{{serverInfo.systemInfo.fileEncoding}}</td>
+            <td>{{serverInfoPage.systemInfo.fileEncoding}}</td>
         </tr>
         <tr>
             <td>Operating System</td>
-            <td>{{serverInfo.systemInfo.osName}} {{serverInfo.systemInfo.osVersion}}</td>
+            <td>{{serverInfoPage.systemInfo.osName}} {{serverInfoPage.systemInfo.osVersion}}</td>
         </tr>
         <tr>
             <td>OS Architecture</td>
-            <td>{{serverInfo.systemInfo.osArchitecture}}</td>
+            <td>{{serverInfoPage.systemInfo.osArchitecture}}</td>
         </tr>
         </table>
         </div>
     </fieldset>    
 
    	
-    <fieldset ng-show="serverInfo.jpaInfo">
+    <fieldset ng-show="serverInfoPage.jpaInfo">
         <legend collapsed>Database Info</legend>
         <div class="form-group">
         <table class="table table-striped table-bordered" style="margin-top: 0px;">
-    			<tr>
-            <td width="20%">Database URL</td>
-            <td>{{serverInfo.jpaInfo.jdbcUrl}}</td>
-        	</tr>
-        	<tr>
-            <td>Database User</td>
-            <td>{{serverInfo.jpaInfo.databaseUser}}</td>
-        	</tr>    
-        	<tr>
-            <td>Database Type</td>
-            <td>{{serverInfo.jpaInfo.databaseProduct}}</td>
-        	</tr>
-        	<tr>
-            <td>Database Driver</td>
-            <td>{{serverInfo.jpaInfo.databaseDriver}}</td>
+        	<tr ng-repeat="(key, value) in serverInfoPage.jpaInfo">
+            <td width="20%">{{key}}</td>
+            <td>{{value}}</td>
         	</tr>
         </table>
         </div>
     </fieldset>    
 
-    <fieldset ng-show="serverInfo.mongoDbInfo">
-        <legend collapsed>Mongo DB Info</legend>
-        <div class="form-group">
-        <table class="table table-striped table-bordered" style="margin-top: 0px;">
-    			<tr width="20%">
-            <td>Address</td>
-            <td>{{serverInfo.mongoDbInfo.address}}</td>
-        	</tr>
-        	<tr>
-            <td>Database</td>
-            <td>{{serverInfo.mongoDbInfo.database}}</td>
-        	</tr>
-        	<tr>
-            <td>User</td>
-            <td>{{serverInfo.mongoDbInfo.user}}</td>
-        	</tr>    
-        	<tr>
-            <td>Driver Version</td>
-            <td>{{serverInfo.mongoDbInfo.driverVersion}}</td>
-        	</tr>
-        </table>
-        </div>
-    </fieldset>    
-   	   	
     <fieldset>
         <legend collapsed>Providers</legend>
 
@@ -160,11 +124,23 @@
                 </tr>
                 </thead>
                 <tbody>
-                <tr data-ng-repeat="spi in (serverInfo.providers | filter:{internal:false} | orderBy:'name')">
+                <tr data-ng-repeat="spi in (serverInfoPage.providers | filter:{internal:false} | orderBy:'name')">
                     <td>{{spi.name}}</td>
                     <td>
-                        <div data-ng-repeat="provider in (spi.implementations | orderBy:'toString()')">
-                            {{provider}}
+                        <div data-ng-repeat="provider in (spi.implementations | orderBy:'name')">
+                            {{provider.name}}
+                            <span ng-show="provider.operationalInfo">
+                            	<button type="button" class="btn btn-default btn-xs" ng-click="collapseRep = !collapseRep">
+                                <span class="glyphicon glyphicon-plus" data-ng-show="!collapseRep"></span>
+                                <span class="glyphicon glyphicon-minus" data-ng-show="collapseRep"></span>
+                              </button>
+	                            <table ng-show="collapseRep" class="table table-striped table-bordered" style="margin-top: 0px;">
+											        	<tr ng-repeat="(key, value) in provider.operationalInfo">
+											            <td width="20%">{{key}}</td>
+											            <td>{{value}}</td>
+											        	</tr>
+											        </table>
+										        </span>
                         </div>
                     </td>
                 </tr>
@@ -184,11 +160,23 @@
                 </tr>
                 </thead>
                 <tbody>
-                <tr data-ng-repeat="spi in (serverInfo.providers | filter:{internal:true} | orderBy:'name')">
+                <tr data-ng-repeat="spi in (serverInfoPage.providers | filter:{internal:true} | orderBy:'name')">
                     <td>{{spi.name}}</td>
                     <td>
-                        <div data-ng-repeat="provider in (spi.implementations | orderBy:'toString()')">
-                            {{provider}}
+                        <div data-ng-repeat="provider in (spi.implementations | orderBy:'name')">
+                            {{provider.name}}
+                            <span ng-show="provider.operationalInfo">
+                            	<button type="button" class="btn btn-default btn-xs" ng-click="collapseRep = !collapseRep">
+                                <span class="glyphicon glyphicon-plus" data-ng-show="!collapseRep"></span>
+                                <span class="glyphicon glyphicon-minus" data-ng-show="collapseRep"></span>
+                              </button>
+	                            <table ng-show="collapseRep" class="table table-striped table-bordered" style="margin-top: 0px;">
+											        	<tr ng-repeat="(key, value) in provider.operationalInfo">
+											            <td width="20%">{{key}}</td>
+											            <td>{{value}}</td>
+											        	</tr>
+											        </table>
+										        </span>
                         </div>
                     </td>
                 </tr>