From faf2597f757c81bfad23a39f07155a911d39bf17 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Mon, 26 Mar 2012 11:58:26 -0700
Subject: [PATCH] cloudstack 3.0 UI - service provider detail view - show
 service provider info instead of physical network info. [reviewed-by: Brian]

---
 ui/scripts/system.js | 73 ++++++++++++++++++++++++++++++--------------
 1 file changed, 50 insertions(+), 23 deletions(-)

diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index e6611e7bf7a..5d7ed4d6c25 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -61,9 +61,9 @@
   
 
   var zoneObjs, podObjs, clusterObjs, domainObjs, networkOfferingObjs, physicalNetworkObjs;
-  var selectedClusterObj, selectedZoneObj, selectedPublicNetworkObj, selectedManagementNetworkObj, selectedPhysicalNetworkObj, selectedGuestNetworkObj;
-  var naasStatusMap = {};
-  var nspMap = {};
+  var selectedClusterObj, selectedZoneObj, selectedPublicNetworkObj, selectedManagementNetworkObj, selectedPhysicalNetworkObj, selectedGuestNetworkObj; 
+  var nspMap = {}; //from listNetworkServiceProviders API 
+	var networkProviderData = []; //for service providers listView (hardcoding, not from listNetworkServiceProviders API) 
 	
   var getTrafficType = function(physicalNetwork, typeID) {
     var trafficType = {};
@@ -316,7 +316,7 @@
             }
           });
 				
-					var networkProviderData = [
+					networkProviderData = [
 						{
 							id: 'netscaler',
 							name: 'NetScaler',
@@ -2367,7 +2367,7 @@
             }
           },
 
-          // NetScaler list view
+          // NetScaler provider detail view
           netscaler: {
             type: 'detailView',
             id: 'netscalerProviders',
@@ -2381,12 +2381,19 @@
                     name: { label: 'label.name' }
                   },
                   {
-                    id: { label: 'label.id' }
+									  state: { label: 'label.state' }                    
                   }
                 ],
-                dataProvider: function(args) {
+                dataProvider: function(args) {								 
+									var providerObj;
+									$(networkProviderData).each(function(){										
+										if(this.id == "netscaler") {
+											providerObj = this;
+											return false; //break each loop
+										}												
+									});		
                   args.response.success({
-                    data: selectedPhysicalNetworkObj,
+                    data: providerObj,
                     actionFilter: networkProviderActionFilter('netscaler')
                   });
                 }
@@ -2594,6 +2601,7 @@
             }
           },
 
+					//f5 provider detail view
           f5: {
             type: 'detailView',
             id: 'f5Providers',
@@ -2607,12 +2615,19 @@
                     name: { label: 'label.name' }
                   },
                   {
-                    id: { label: 'label.id' }
+									  state: { label: 'label.state' }                    
                   }
                 ],
-                dataProvider: function(args) {
+                dataProvider: function(args) {								  
+									var providerObj;
+									$(networkProviderData).each(function(){										
+										if(this.id == "f5") {
+											providerObj = this;
+											return false; //break each loop
+										}											
+									});		
                   args.response.success({
-                    data: selectedPhysicalNetworkObj,
+                    data: providerObj,
                     actionFilter: networkProviderActionFilter('f5')
                   });
                 }
@@ -2818,7 +2833,7 @@
             }
           },
 
-          // SRX list view
+          // SRX provider detail view
           srx: {
             type: 'detailView',
             id: 'srxProviders',
@@ -2832,12 +2847,19 @@
                     name: { label: 'label.name' }
                   },
                   {
-                    id: { label: 'label.id' }
+									  state: { label: 'label.state' }                    
                   }
                 ],
-                dataProvider: function(args) {
+                dataProvider: function(args) {								  
+									var providerObj;
+									$(networkProviderData).each(function(){										
+										if(this.id == "srx") {
+											providerObj = this;
+											return false; //break each loop
+										}											
+									});																	
                   args.response.success({
-                    data: selectedPhysicalNetworkObj,
+                    data: providerObj,
                     actionFilter: networkProviderActionFilter('srx')
                   });
                 }
@@ -3058,7 +3080,7 @@
             }
           },
 
-          // Security groups provider
+          // Security groups provider list view
           securityGroups: {
             id: 'securityGroup-providers',
             label: 'Security Groups',
@@ -3072,23 +3094,28 @@
                     name: { label: 'label.name' }
                   },
                   {
-                    state: { label: 'label.state' },
-                    id: { label: 'label.id' },
-                    physicalnetworkid: { label: 'label.physical.network.ID' }
+                    state: { label: 'label.state' }                                     
                   }
                 ],
-                dataProvider: function(args) {
+                dataProvider: function(args) {								  
+									var providerObj;
+									$(networkProviderData).each(function(){										
+										if(this.id == "securityGroups") {
+											providerObj = this;
+											return false; //break each loop
+										}												
+									});									
                   args.response.success({
                     actionFilter: function(args) {
-                      var allowedActions = [];
-                      var jsonObj = nspMap["securityGroups"];
+                      var allowedActions = [];											
+                      var jsonObj = providerObj;
                       if(jsonObj.state == "Enabled")
                         allowedActions.push("disable");
                       else if(jsonObj.state == "Disabled")
                         allowedActions.push("enable");
                       return allowedActions;
                     },
-                    data: nspMap["securityGroups"]
+                    data: providerObj
                   });
                 }
               }