From 8b34fdd33e6c978e852f1831639efef6b8ae105c Mon Sep 17 00:00:00 2001 From: Rahat Ali Date: Tue, 8 Sep 2015 21:13:18 +0500 Subject: [PATCH 1/3] 2.4 ui issues --- .../incl/trustmanager/configureMetadataFiltersPanel.xhtml | 4 ++-- .../WEB-INF/incl/trustmanager/trustRelationshipForm.xhtml | 4 ++-- server/src/main/webapp/attribute/attributeInventory.xhtml | 5 +++-- server/src/main/webapp/resources/js/dashboard.js | 7 ++++++- .../src/main/webapp/resources/ox/selectScopeDialog.xhtml | 4 ++-- 5 files changed, 15 insertions(+), 9 deletions(-) diff --git a/server/src/main/webapp/WEB-INF/incl/trustmanager/configureMetadataFiltersPanel.xhtml b/server/src/main/webapp/WEB-INF/incl/trustmanager/configureMetadataFiltersPanel.xhtml index 58dc22eef..7ebdd333d 100644 --- a/server/src/main/webapp/WEB-INF/incl/trustmanager/configureMetadataFiltersPanel.xhtml +++ b/server/src/main/webapp/WEB-INF/incl/trustmanager/configureMetadataFiltersPanel.xhtml @@ -55,8 +55,8 @@
- - + +
diff --git a/server/src/main/webapp/WEB-INF/incl/trustmanager/trustRelationshipForm.xhtml b/server/src/main/webapp/WEB-INF/incl/trustmanager/trustRelationshipForm.xhtml index 8f8d63a0d..d9a170906 100644 --- a/server/src/main/webapp/WEB-INF/incl/trustmanager/trustRelationshipForm.xhtml +++ b/server/src/main/webapp/WEB-INF/incl/trustmanager/trustRelationshipForm.xhtml @@ -185,7 +185,7 @@ + rendered="#{((_trustRelationship.spMetaDataSourceType.value eq 'file') and (not empty _trustRelationship.url) or (_trustRelationship.spMetaDataSourceType.value eq 'generate'))}"> URL Configure specific RelyingParty + > + @@ -35,7 +36,7 @@ + styleClass="label label-success" render="attributesFormId" style="margin-left:5px;padding:6px;" /> @@ -45,7 +46,7 @@ - +
diff --git a/server/src/main/webapp/resources/js/dashboard.js b/server/src/main/webapp/resources/js/dashboard.js index d60e463a5..7c3bcb7e1 100644 --- a/server/src/main/webapp/resources/js/dashboard.js +++ b/server/src/main/webapp/resources/js/dashboard.js @@ -6,11 +6,13 @@ $(function () { //----------------------- //- Dashboard > Authentication Requests Chart - //----------------------- + try{ // Get context with jQuery - using jQuery's .get() method. var authenticationRequestsChartCanvas = $("#authenticationRequestsChart").get(0).getContext("2d"); // This will get the first returned node in the jQuery collection. var authenticationRequestsChart = new Chart(authenticationRequestsChartCanvas); + var authChartData = JSON.parse($("#authenticationChartJson").val()); console.log("authentication chart data"); @@ -86,5 +88,8 @@ $(function () { //Create the line chart authenticationRequestsChart.Line(authenticationRequestsChartData, authenticationRequestsChartOptions); - + }catch(error){ + console.log(error); + } + }); \ No newline at end of file diff --git a/server/src/main/webapp/resources/ox/selectScopeDialog.xhtml b/server/src/main/webapp/resources/ox/selectScopeDialog.xhtml index c10b82090..52e7df041 100644 --- a/server/src/main/webapp/resources/ox/selectScopeDialog.xhtml +++ b/server/src/main/webapp/resources/ox/selectScopeDialog.xhtml @@ -32,7 +32,7 @@ - + @@ -40,7 +40,7 @@ - + From f774cb211fd5a9b1374ce405108d605458128439 Mon Sep 17 00:00:00 2001 From: Rahat Ali Date: Sun, 13 Sep 2015 11:17:29 +0500 Subject: [PATCH 2/3] Remove Federation Hosting Select Box #100 --- .../webapp/WEB-INF/incl/organization/organizationForm.xhtml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/src/main/webapp/WEB-INF/incl/organization/organizationForm.xhtml b/server/src/main/webapp/WEB-INF/incl/organization/organizationForm.xhtml index 5095f7c89..d640e8e92 100644 --- a/server/src/main/webapp/WEB-INF/incl/organization/organizationForm.xhtml +++ b/server/src/main/webapp/WEB-INF/incl/organization/organizationForm.xhtml @@ -121,7 +121,7 @@ - Federation Hosting - + --> From 867935e8d9a656aeb0f22137b847eb141d6a9350 Mon Sep 17 00:00:00 2001 From: Rahat Ali Date: Mon, 14 Sep 2015 15:17:34 +0500 Subject: [PATCH 3/3] cache metrics 112 --- .../org/gluu/oxtrust/service/MetricService.java | 16 +++++++++++++--- server/src/main/resources/ehcache.xml | 7 +++++++ 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/server/src/main/java/org/gluu/oxtrust/service/MetricService.java b/server/src/main/java/org/gluu/oxtrust/service/MetricService.java index 395bea89e..41373e370 100644 --- a/server/src/main/java/org/gluu/oxtrust/service/MetricService.java +++ b/server/src/main/java/org/gluu/oxtrust/service/MetricService.java @@ -18,6 +18,8 @@ import org.gluu.oxtrust.ldap.service.ApplianceService; import org.gluu.oxtrust.ldap.service.OrganizationService; import org.gluu.oxtrust.model.AuthenticationChartDto; +import org.gluu.oxtrust.model.GluuOrganization; +import org.gluu.oxtrust.util.OxTrustConstants; import org.jboss.seam.Component; import org.jboss.seam.ScopeType; import org.jboss.seam.annotations.AutoCreate; @@ -29,6 +31,7 @@ import org.xdi.model.ApplicationType; import org.xdi.model.metric.MetricType; import org.xdi.model.metric.ldap.MetricEntry; +import org.xdi.service.CacheService; /** * Store and retrieve metric @@ -48,7 +51,10 @@ public class MetricService extends org.xdi.service.metric.MetricService { @Logger private Log log; - + + @In + private CacheService cacheService; + @In private ApplianceService applianceService; @@ -60,8 +66,12 @@ public class MetricService extends org.xdi.service.metric.MetricService { public AuthenticationChartDto genereateAuthenticationChartDto(int countDays) { AuthenticationChartDto authenticationChartDto = new AuthenticationChartDto(); - - Map> entries = findAuthenticationMetrics(-countDays); + String key = OxTrustConstants.CACHE_METRICS_KEY; + Map> entries = (Map>) cacheService.get(OxTrustConstants.CACHE_METRICS_NAME, key); + if (entries== null) { + entries = findAuthenticationMetrics(-countDays); + cacheService.put(OxTrustConstants.CACHE_METRICS_NAME, key, entries); + } String []labels = new String[countDays]; Map successStats = calculateStatistics(countDays, entries.get(MetricType.OXAUTH_USER_AUTHENTICATION_SUCCESS)); diff --git a/server/src/main/resources/ehcache.xml b/server/src/main/resources/ehcache.xml index edad07a74..241fde1db 100644 --- a/server/src/main/resources/ehcache.xml +++ b/server/src/main/resources/ehcache.xml @@ -122,4 +122,11 @@ timeToLiveSeconds="60" memoryStoreEvictionPolicy="LRU"/> + \ No newline at end of file