Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id C3ED5200BB3 for ; Wed, 19 Oct 2016 05:27:31 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id C2669160AE5; Wed, 19 Oct 2016 03:27:31 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 3EC12160AF7 for ; Wed, 19 Oct 2016 05:27:30 +0200 (CEST) Received: (qmail 35479 invoked by uid 500); 19 Oct 2016 03:27:29 -0000 Mailing-List: contact commits-help@eagle.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@eagle.incubator.apache.org Delivered-To: mailing list commits@eagle.incubator.apache.org Received: (qmail 35470 invoked by uid 99); 19 Oct 2016 03:27:29 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 19 Oct 2016 03:27:29 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id EB1ED18068A for ; Wed, 19 Oct 2016 03:27:28 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -6.219 X-Spam-Level: X-Spam-Status: No, score=-6.219 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-2.999] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id MWy-m1jrMu9f for ; Wed, 19 Oct 2016 03:27:22 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with SMTP id 740265FC2E for ; Wed, 19 Oct 2016 03:27:17 +0000 (UTC) Received: (qmail 33047 invoked by uid 99); 19 Oct 2016 03:27:17 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 19 Oct 2016 03:27:17 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 41250DFE60; Wed, 19 Oct 2016 03:27:17 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: hao@apache.org To: commits@eagle.incubator.apache.org Date: Wed, 19 Oct 2016 03:27:33 -0000 Message-Id: <4b4361872d534888adb6bf53ec5ffd9b@git.apache.org> In-Reply-To: <679f7884b2ff4acc87cbf4e51a1de5db@git.apache.org> References: <679f7884b2ff4acc87cbf4e51a1de5db@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [18/50] incubator-eagle git commit: [EAGLE-604] Support view/editing application configuration after installed archived-at: Wed, 19 Oct 2016 03:27:32 -0000 [EAGLE-604] Support view/editing application configuration after installed Support view/editing application configuration after installed Author: zombieJ Closes #500 from zombieJ/EAGLE-604. Project: http://git-wip-us.apache.org/repos/asf/incubator-eagle/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-eagle/commit/1d0f9f5b Tree: http://git-wip-us.apache.org/repos/asf/incubator-eagle/tree/1d0f9f5b Diff: http://git-wip-us.apache.org/repos/asf/incubator-eagle/diff/1d0f9f5b Branch: refs/heads/master Commit: 1d0f9f5b03acefbfb9af97a83ca19ad3d02d638a Parents: 4dfb528 Author: zombieJ Authored: Thu Oct 13 16:13:08 2016 +0800 Committer: zombieJ Committed: Thu Oct 13 16:13:08 2016 +0800 ---------------------------------------------------------------------- .../webapp/app/dev/partials/alert/main.html | 63 ++++---- .../app/dev/partials/alert/policyDetail.html | 40 ++--- .../app/dev/partials/alert/streamList.html | 47 ++++++ .../app/dev/partials/integration/main.html | 1 - .../app/dev/partials/integration/site.html | 145 +++++++++++++++++-- .../dev/partials/integration/streamList.html | 52 ------- .../src/main/webapp/app/dev/public/js/app.js | 14 +- .../src/main/webapp/app/dev/public/js/common.js | 18 ++- .../webapp/app/dev/public/js/ctrls/alertCtrl.js | 19 +++ .../app/dev/public/js/ctrls/alertEditCtrl.js | 5 +- .../app/dev/public/js/ctrls/integrationCtrl.js | 135 ++++++++++++----- .../src/main/webapp/app/dev/public/js/index.js | 9 +- .../dev/public/js/services/applicationSrv.js | 4 + .../app/dev/public/js/services/pageSrv.js | 6 +- 14 files changed, 386 insertions(+), 172 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/1d0f9f5b/eagle-server/src/main/webapp/app/dev/partials/alert/main.html ---------------------------------------------------------------------- diff --git a/eagle-server/src/main/webapp/app/dev/partials/alert/main.html b/eagle-server/src/main/webapp/app/dev/partials/alert/main.html index 2e062a8..2e14db9 100644 --- a/eagle-server/src/main/webapp/app/dev/partials/alert/main.html +++ b/eagle-server/src/main/webapp/app/dev/partials/alert/main.html @@ -1,29 +1,34 @@ - - -
- -
-
-
-
- + + +
+ +
+
+
+
+ http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/1d0f9f5b/eagle-server/src/main/webapp/app/dev/partials/alert/policyDetail.html ---------------------------------------------------------------------- diff --git a/eagle-server/src/main/webapp/app/dev/partials/alert/policyDetail.html b/eagle-server/src/main/webapp/app/dev/partials/alert/policyDetail.html index b04a8a8..7ec5f39 100644 --- a/eagle-server/src/main/webapp/app/dev/partials/alert/policyDetail.html +++ b/eagle-server/src/main/webapp/app/dev/partials/alert/policyDetail.html @@ -18,7 +18,8 @@
-
+
@@ -61,26 +62,29 @@ - - - - - - - -
Definition
{{policy.definition.value}}
Partition -
    -
  • - [{{partition.type}}] - {{partition.streamId}}: - {{partition.columns.join(", ")}} -
    • -
-
+
+ + 
{{policy.definition.value}}
+ + +
    +
  • + [{{partition.type}}] + {{partition.streamId}}: + {{partition.columns.join(", ")}} +
    • +
  • + No partition +
    • +
+
+

+ No publisher configured +

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/1d0f9f5b/eagle-server/src/main/webapp/app/dev/partials/alert/streamList.html ---------------------------------------------------------------------- diff --git a/eagle-server/src/main/webapp/app/dev/partials/alert/streamList.html b/eagle-server/src/main/webapp/app/dev/partials/alert/streamList.html new file mode 100644 index 0000000..79f15a6 --- /dev/null +++ b/eagle-server/src/main/webapp/app/dev/partials/alert/streamList.html @@ -0,0 +1,47 @@ + + +
+
+
+ + + + + + + + + + + + + + + + +
StreamProvider (App)SiteSchema
{{item.streamId}}{{item.appType}}{{item.siteId}} +
    +
  • + {{column.name}}: + {{column.type}} +
    • +
+
+
+
http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/1d0f9f5b/eagle-server/src/main/webapp/app/dev/partials/integration/main.html ---------------------------------------------------------------------- diff --git a/eagle-server/src/main/webapp/app/dev/partials/integration/main.html b/eagle-server/src/main/webapp/app/dev/partials/integration/main.html index daea22e..3a063d7 100644 --- a/eagle-server/src/main/webapp/app/dev/partials/integration/main.html +++ b/eagle-server/src/main/webapp/app/dev/partials/integration/main.html @@ -20,7 +20,6 @@
http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/1d0f9f5b/eagle-server/src/main/webapp/app/dev/partials/integration/site.html ---------------------------------------------------------------------- diff --git a/eagle-server/src/main/webapp/app/dev/partials/integration/site.html b/eagle-server/src/main/webapp/app/dev/partials/integration/site.html index 4c118dc..e320c48 100644 --- a/eagle-server/src/main/webapp/app/dev/partials/integration/site.html +++ b/eagle-server/src/main/webapp/app/dev/partials/integration/site.html @@ -17,17 +17,33 @@ -->
-

- Site must install at least one application to start up. -

-

- No application started. -

+ + +
+ + +
+
+ + +
+ + + + ( Site must install at least one application to start up.) + + + ( No application started.) + - + @@ -48,9 +64,24 @@
App + Refresh + Name + + Status Version Description
- - - + + + + + +
@@ -75,11 +106,80 @@
-
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Application Name{{application.name}}Type{{application.type}}
Application Id{{tmpApp.appId}}UUID{{tmpApp.uuid}}
Mode{{tmpApp.mode}}Status{{tmpApp.status}}
View Path{{application.viewPath}}Version{{application.version}}
Jar Path{{tmpApp.jarPath || application.jarPath}}
Application Class{{application.appClass}}
Provider Class{{application.providerClass}}
Description{{application.description}}
Dependencies +
    +
  • + {{Application.findProvider(dep.type).name}} + ({{dep.type}}) +
    • +
+
Configuration +
    +
  • + {{key}}: + {{value}} +
    • +
+
+
+ 

 					

 					

@@ -106,11 +206,28 @@
 			

 			

 				
 				

-					

+					

+						
+						
    
+							
  • 
+								[ Installed ]
+								[
+									Require
+								]
+								{{Application.findProvider(dep.type).name}}
+								({{dep.type}})
+							
    • 
+						

+
+						
+						

+					

+					

 						

 							
 							
-			
-				
-					
-					
-					
-					
-					
-				
-			
-			
-				
-					
-					
-					
-					
-					
-				
-			
-		
StreamProvider (App)SiteSchemaActions
{{item.streamId}}{{item.appType}}{{item.siteId}}
-						
    
-							
  • 
-								{{column.name}}:
-								{{column.type}}
-							
    • 
-						

-							
-						
-						
-					

-	

-


http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/1d0f9f5b/eagle-server/src/main/webapp/app/dev/public/js/app.js
----------------------------------------------------------------------
diff --git a/eagle-server/src/main/webapp/app/dev/public/js/app.js b/eagle-server/src/main/webapp/app/dev/public/js/app.js
index fb40ed4..cdb705c 100644
--- a/eagle-server/src/main/webapp/app/dev/public/js/app.js
+++ b/eagle-server/src/main/webapp/app/dev/public/js/app.js
@@ -103,6 +103,12 @@ var app = {};
 					controller: "policyListCtrl",
 					resolve: routeResolve()
 				})
+				.state('alert.streamList', {
+					url: "streamList",
+					templateUrl: "partials/alert/streamList.html?_=" + window._TRS(),
+					controller: "alertStreamListCtrl",
+					resolve: routeResolve()
+				})
 				.state('alert.policyCreate', {
 					url: "policyCreate",
 					templateUrl: "partials/alert/policyEdit.html?_=" + window._TRS(),
@@ -122,6 +128,7 @@ var app = {};
 					controller: "policyDetailCtrl",
 					resolve: routeResolve()
 				})
+
 				// =============================== Integration ==============================
 				.state('integration', {
 					abstract: true,
@@ -148,12 +155,7 @@ var app = {};
 					controller: "integrationApplicationListCtrl",
 					resolve: routeResolve({ application: false })
 				})
-				.state('integration.streamList', {
-					url: "streamList",
-					templateUrl: "partials/integration/streamList.html?_=" + window._TRS(),
-					controller: "integrationStreamListCtrl",
-					resolve: routeResolve()
-				})
+
 				// ================================== Site ==================================
 				.state('site', {
 					url: "/site/:siteId",

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/1d0f9f5b/eagle-server/src/main/webapp/app/dev/public/js/common.js
----------------------------------------------------------------------
diff --git a/eagle-server/src/main/webapp/app/dev/public/js/common.js b/eagle-server/src/main/webapp/app/dev/public/js/common.js
index 0e9cc7c..7d41371 100644
--- a/eagle-server/src/main/webapp/app/dev/public/js/common.js
+++ b/eagle-server/src/main/webapp/app/dev/public/js/common.js
@@ -97,15 +97,17 @@
 	};
 
 	common.parseJSON = function (str, defaultVal) {
-		try {
-			str = (str + "").trim();
-			if(Number(str).toString() === str) throw "Number format";
-			return JSON.parse(str);
-		} catch(err) {
-			if(defaultVal === undefined) {
-				console.warn("Can't parse JSON: " + str);
-			}
+		if(str && Number(str).toString() !== str) {
+			try {
+				str = (str + "").trim();
+				return JSON.parse(str);
+			} catch(err) {}
+		}
+
+		if(arguments.length === 1) {
+			console.warn("Can't parse JSON: " + str);
 		}
+
 		return defaultVal === undefined ? null : defaultVal;
 	};
 

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/1d0f9f5b/eagle-server/src/main/webapp/app/dev/public/js/ctrls/alertCtrl.js
----------------------------------------------------------------------
diff --git a/eagle-server/src/main/webapp/app/dev/public/js/ctrls/alertCtrl.js b/eagle-server/src/main/webapp/app/dev/public/js/ctrls/alertCtrl.js
index b5eba07..eeea083 100644
--- a/eagle-server/src/main/webapp/app/dev/public/js/ctrls/alertCtrl.js
+++ b/eagle-server/src/main/webapp/app/dev/public/js/ctrls/alertCtrl.js
@@ -58,6 +58,25 @@
 	});
 
 	// ======================================================================================
+	// =                                       Stream                                       =
+	// ======================================================================================
+	eagleControllers.controller('alertStreamListCtrl', function ($scope, $wrapState, PageConfig, Application) {
+		PageConfig.title = "Alert";
+		PageConfig.subTitle = "Streams";
+
+		$scope.streamList = $.map(Application.list, function (app) {
+			return (app.streams || []).map(function (stream) {
+				return {
+					streamId: stream.streamId,
+					appType: app.descriptor.type,
+					siteId: app.site.siteId,
+					schema: stream.schema
+				};
+			});
+		});
+	});
+
+	// ======================================================================================
 	// =                                       Policy                                       =
 	// ======================================================================================
 	eagleControllers.controller('policyListCtrl', function ($scope, $wrapState, PageConfig, Entity, UI) {

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/1d0f9f5b/eagle-server/src/main/webapp/app/dev/public/js/ctrls/alertEditCtrl.js
----------------------------------------------------------------------
diff --git a/eagle-server/src/main/webapp/app/dev/public/js/ctrls/alertEditCtrl.js b/eagle-server/src/main/webapp/app/dev/public/js/ctrls/alertEditCtrl.js
index 3e9d13e..3bcd8d8 100644
--- a/eagle-server/src/main/webapp/app/dev/public/js/ctrls/alertEditCtrl.js
+++ b/eagle-server/src/main/webapp/app/dev/public/js/ctrls/alertEditCtrl.js
@@ -281,9 +281,10 @@
 			common.deferred.all(publisherPromiseList.concat(policyPromise)).then(function () {
 				$.dialog({
 					title: "Done",
-					content: "Click confirm to go to the policy detail page."
+					content: "Close dialog to go to the policy detail page."
+				}, function () {
+					$wrapState.go("policyDetail", {name: $scope.policy.name});
 				});
-				$wrapState.go("policyDetail", {name: $scope.policy.name});
 			}, function (failedList) {
 				$.dialog({
 					title: "OPS",

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/1d0f9f5b/eagle-server/src/main/webapp/app/dev/public/js/ctrls/integrationCtrl.js
----------------------------------------------------------------------
diff --git a/eagle-server/src/main/webapp/app/dev/public/js/ctrls/integrationCtrl.js b/eagle-server/src/main/webapp/app/dev/public/js/ctrls/integrationCtrl.js
index 8674df3..ca6c92e 100644
--- a/eagle-server/src/main/webapp/app/dev/public/js/ctrls/integrationCtrl.js
+++ b/eagle-server/src/main/webapp/app/dev/public/js/ctrls/integrationCtrl.js
@@ -62,7 +62,7 @@
 		};
 	});
 
-	eagleControllers.controller('integrationSiteCtrl', function ($sce, $scope, $wrapState, PageConfig, Entity, UI, Site, Application) {
+	eagleControllers.controller('integrationSiteCtrl', function ($sce, $scope, $wrapState, $interval, PageConfig, Entity, UI, Site, Application) {
 		PageConfig.title = "Site";
 		PageConfig.subTitle = $wrapState.param.id;
 
@@ -77,6 +77,9 @@
 			});
 			return;
 		}
+		console.log("[Site]", $scope.site);
+
+		$scope.siteName = $scope.site.siteId + ($scope.site.siteName ? "(" + $scope.site.siteName + ")" : "");
 
 		// Map applications
 		function mapApplications() {
@@ -94,9 +97,9 @@
 		mapApplications();
 
 		// Application refresh
-		function refreshApplications() {
+		var refreshApplications = $scope.refreshApplications = function() {
 			Application.reload().getPromise().then(mapApplications);
-		}
+		};
 
 		// Application status class
 		$scope.getAppStatusClass = function (application) {
@@ -124,6 +127,9 @@
 
 		// Application detail
 		$scope.showAppDetail = function (application) {
+			$("a[data-id='introTab']").click();
+
+			$scope.tmpApp = application;
 			application = application.origin;
 			var docs = application.docs || {install: "", uninstall: ""};
 			$scope.application = application;
@@ -167,11 +173,12 @@
 
 		$scope.removeField = function (field) {
 			$scope.tmpAppConfigFields = common.array.remove(field, $scope.tmpAppConfigFields);
+			delete $scope.tmpApp.configuration[field.name];
 		};
 
 		$scope.checkFields = function () {
 			var pass = true;
-			var config = common.getValueByPath($scope, ["tmpApp", "configuration"]);
+			var config = common.getValueByPath($scope, ["tmpApp", "configuration"], {});
 			$.each($scope.tmpAppConfigFields, function (i, field) {
 				if(field.required && !config[field.name]) {
 					pass = false;
@@ -184,38 +191,86 @@
 		$scope.installAppConfirm = function () {
 			$scope.installLock = true;
 
-			Entity.create("apps/install", $scope.tmpApp)._then(function () {
-				refreshApplications();
-				$("#installMDL").modal("hide");
-			}, function (res) {
-				$.dialog({
-					title: "OPS",
-					content: res.data.message
+			var uuid = $scope.tmpApp.uuid;
+			delete $scope.tmpApp.uuid;
+
+			if(uuid) {
+				Entity.create("apps/" + uuid, $scope.tmpApp)._then(function () {
+					refreshApplications();
+					$("#installMDL").modal("hide");
+				}, function (res) {
+					$.dialog({
+						title: "OPS",
+						content: res.data.message
+					});
+					$scope.installLock = false;
 				});
-				$scope.installLock = false;
-			});
+			} else {
+				Entity.create("apps/install", $scope.tmpApp)._then(function () {
+					refreshApplications();
+					$("#installMDL").modal("hide");
+				}, function (res) {
+					$.dialog({
+						title: "OPS",
+						content: res.data.message
+					});
+					$scope.installLock = false;
+				});
+			}
 		};
 
 		// Install application
-		$scope.installApp = function (application) {
+		$scope.installApp = function (application, entity) {
+			entity = entity || {};
 			application = application.origin;
 			$scope.installLock = false;
 			$scope.application = application;
 			$scope.tmpApp = {
-				siteId: $scope.site.siteId,
-				appType: application.type,
 				mode: "CLUSTER",
 				jarPath: application.jarPath,
 				configuration: {}
 			};
 
-			$scope.tmpAppConfigFields = common.getValueByPath(application, "configuration.properties", []);
-			$.each($scope.tmpAppConfigFields, function (i, field) {
+			if(!entity.uuid) {
+				common.merge($scope.tmpApp, {
+					siteId: $scope.site.siteId,
+					appType: application.type
+				});
+			}
+
+			var fields = $scope.tmpAppConfigFields = common.getValueByPath(application, "configuration.properties", []).concat();
+
+			$.each(fields, function (i, field) {
 				$scope.tmpApp.configuration[field.name] = field.value;
 			});
 
+			// Fill miss field of entity
+			common.merge($scope.tmpApp, entity);
+			$.each(entity.configuration || {}, function (key) {
+				if(!common.array.find(key, fields, ["name"])) {
+					fields.push({
+						name: key,
+						_customize: true,
+						required: true
+					});
+				}
+			});
+
+			// Dependencies check
+			var missDep = false;
+			$.each(application.dependencies, function (i, dep) {
+				if(!Application.find(dep.type, $scope.site.siteId)[0]) {
+					missDep = true;
+					return false;
+				}
+			});
+
 			$("#installMDL").modal();
-			$("a[data-id='configTab']").click();
+			if(missDep) {
+				$("a[data-id='guideTab']").click();
+			} else {
+				$("a[data-id='configTab']").click();
+			}
 		};
 
 		// Uninstall application
@@ -229,6 +284,9 @@
 			});
 		};
 
+		// ================================================================
+		// =                          Management                          =
+		// ================================================================
 		// Start application
 		$scope.startApp = function (application) {
 			Entity.post("apps/start", { uuid: application.uuid })._then(function () {
@@ -242,6 +300,26 @@
 				refreshApplications();
 			});
 		};
+
+		$scope.editApp = function (application) {
+			var type = application.descriptor.type;
+			var provider = Application.findProvider(type);
+
+			$scope.installApp({origin: provider}, {
+				mode: application.mode,
+				jarPath: application.jarPath,
+				uuid: application.uuid,
+				configuration: $.extend({}, application.configuration)
+			});
+		};
+
+		// ================================================================
+		// =                             Sync                             =
+		// ================================================================
+		var refreshInterval = $interval(refreshApplications, 1000 * 60);
+		$scope.$on('$destroy', function() {
+			$interval.cancel(refreshInterval);
+		});
 	});
 
 	// ======================================================================================
@@ -259,23 +337,4 @@
 			$("#appMDL").modal();
 		};
 	});
-
-	// ======================================================================================
-	// =                                       Stream                                       =
-	// ======================================================================================
-	eagleControllers.controller('integrationStreamListCtrl', function ($scope, $wrapState, PageConfig, Application) {
-		PageConfig.title = "Integration";
-		PageConfig.subTitle = "Streams";
-
-		$scope.streamList = $.map(Application.list, function (app) {
-			return (app.streams || []).map(function (stream) {
-				return {
-					streamId: stream.streamId,
-					appType: app.descriptor.type,
-					siteId: app.site.siteId,
-					schema: stream.schema
-				};
-			});
-		});
-	});
 }());

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/1d0f9f5b/eagle-server/src/main/webapp/app/dev/public/js/index.js
----------------------------------------------------------------------
diff --git a/eagle-server/src/main/webapp/app/dev/public/js/index.js b/eagle-server/src/main/webapp/app/dev/public/js/index.js
index 906479f..633832e 100644
--- a/eagle-server/src/main/webapp/app/dev/public/js/index.js
+++ b/eagle-server/src/main/webapp/app/dev/public/js/index.js
@@ -26,7 +26,7 @@
 	var _app = {};
 	if(localStorage) {
 		_host = localStorage.getItem("host") || "";
-		_app = common.parseJSON(localStorage.getItem("app") || "") || {};
+		_app = common.parseJSON(localStorage.getItem("app"), {});
 	}
 
 	window._host = function (host) {
@@ -51,6 +51,13 @@
 		return _app;
 	};
 
+	window._app.clear = function () {
+		if(localStorage) {
+			_app = {};
+			localStorage.removeItem("app");
+		}
+	};
+
 	// ======================================================================================
 	// =                                      Register                                      =
 	// ======================================================================================

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/1d0f9f5b/eagle-server/src/main/webapp/app/dev/public/js/services/applicationSrv.js
----------------------------------------------------------------------
diff --git a/eagle-server/src/main/webapp/app/dev/public/js/services/applicationSrv.js b/eagle-server/src/main/webapp/app/dev/public/js/services/applicationSrv.js
index fac44f9..31c6fb6 100644
--- a/eagle-server/src/main/webapp/app/dev/public/js/services/applicationSrv.js
+++ b/eagle-server/src/main/webapp/app/dev/public/js/services/applicationSrv.js
@@ -57,6 +57,10 @@
 			});
 		});
 
+		Application.findProvider = function (type) {
+			return common.array.find(type, Application.providerList, ["type"]);
+		};
+
 		Application.getPromise = function () {
 			return Application.list._promise.then(function() {
 				return Application;

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/1d0f9f5b/eagle-server/src/main/webapp/app/dev/public/js/services/pageSrv.js
----------------------------------------------------------------------
diff --git a/eagle-server/src/main/webapp/app/dev/public/js/services/pageSrv.js b/eagle-server/src/main/webapp/app/dev/public/js/services/pageSrv.js
index 732f820..04e3b77 100644
--- a/eagle-server/src/main/webapp/app/dev/public/js/services/pageSrv.js
+++ b/eagle-server/src/main/webapp/app/dev/public/js/services/pageSrv.js
@@ -49,15 +49,15 @@
 		]},*/
 		{name: "Alert", icon: "bell", list: [
 			{name: "Explore Alerts", path: "#/alert/"},
-			{name: "Manage Policies", path: "#/alert/policyList"},
+			{name: "Policies", path: "#/alert/policyList"},
+			{name: "Streams", path: "#/alert/streamList"},
 			{name: "Define Policy", path: "#/alert/policyCreate"}
 		]}
 	];
 	var adminPortalList = [
 		{name: "Integration", icon: "puzzle-piece", list: [
 			{name: "Sites", path: "#/integration/siteList"},
-			{name: "Applications", path: "#/integration/applicationList"},
-			{name: "Streams", path: "#/integration/streamList"}
+			{name: "Applications", path: "#/integration/applicationList"}
 		]}
 	];