From c7684f414d8d2b9f4637c7d2d57dfc07fbe36918 Mon Sep 17 00:00:00 2001
From: Divakar Konakalla <divakar.konakalla@relevancelab.com>
Date: Wed, 8 Feb 2017 14:48:40 +0530
Subject: [PATCH] Added Default column for all monitors, done required changes
 to select default monitor everywhere.

---
 .../popups/blueprintLaunchParamsCtrl.js       |   6 ++
 .../instance/popups/InstanceImportByIpCtrl.js |   6 ++
 .../private/ajax/Settings/ProvidersList.html  | 101 ------------------
 .../htmls/private/ajax/Settings/chefSync.html |   3 +-
 .../ajax/Settings/monitoringServer.html       |  58 +++++++++-
 5 files changed, 70 insertions(+), 104 deletions(-)

diff --git a/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchParamsCtrl.js b/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchParamsCtrl.js
index ce0b302dd..d12a574f1 100644
--- a/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchParamsCtrl.js
+++ b/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchParamsCtrl.js
@@ -30,6 +30,12 @@
 			$scope.getMonitorList = function(orgId) {
 				workzoneServices.getMonitorList(orgId).then(function (response) {		
 			        $scope.monitorList = response.data;
+			        for(var i=0; i<$scope.monitorList.length; i++){
+			        	if($scope.monitorList[i].isDefault){
+			        		$scope.monitorId = $scope.monitorList[i]._id;
+			        		break;
+			        	}
+			        }
 				});
 			};
 			genericServices.getTreeNew().then(function (envData) {
diff --git a/client/cat3/src/partials/sections/dashboard/workzone/instance/popups/InstanceImportByIpCtrl.js b/client/cat3/src/partials/sections/dashboard/workzone/instance/popups/InstanceImportByIpCtrl.js
index 5ce3faf27..1172d5354 100644
--- a/client/cat3/src/partials/sections/dashboard/workzone/instance/popups/InstanceImportByIpCtrl.js
+++ b/client/cat3/src/partials/sections/dashboard/workzone/instance/popups/InstanceImportByIpCtrl.js
@@ -28,6 +28,12 @@
 	        var p = workzoneEnvironment.getEnvParams();
 	        workzoneServices.getMonitorList(p.org).then(function (response) {
 	        	$scope.monitorList = response.data;
+	        	for(var i=0; i<$scope.monitorList.length; i++){
+		        	if($scope.monitorList[i].isDefault){
+		        		$scope.monitorId = $scope.monitorList[i]._id;
+		        		break;
+		        	}
+		        }
 	        });
 			$scope.tagServerChecking = function() {
 				if($scope.tagServerCheck){
diff --git a/client/htmls/private/ajax/Settings/ProvidersList.html b/client/htmls/private/ajax/Settings/ProvidersList.html
index bc6351dc6..86f8690b0 100755
--- a/client/htmls/private/ajax/Settings/ProvidersList.html
+++ b/client/htmls/private/ajax/Settings/ProvidersList.html
@@ -49,9 +49,6 @@ <h5 class="widget-title" style="color:#4e5964;">
                                         <td datafield="orgName"></td>
                                         <td>
                                             <div class="btn-group">
-                                                <a class="btn btn-xs btn-info pull-left providerReport" href="#modalForProviderReport" data-backdrop="false" data-toggle="modal" title="Report">
-                                                    <i class="ace-icon fa fa-file-excel-o bigger-120"></i>
-                                                </a>
                                                 <!--<a class="btn btn-xs btn-info pull-left" title="Sync Instances">
                                                     <i class="ace-icon fa fa-refresh bigger-120"></i>
                                                 </a>-->
@@ -103,89 +100,6 @@ <h5 class="widget-title" style="color:#4e5964;">
     </div>
 </div>
 <!--modal for ItemList-->
-<div class="modal fade" id="modalForProviderReport" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true" data-backdrop="static" data-keyboard="false">
-    <div class="modal-dialog " style="">
-        <div class="modal-content">
-            <form role="form" id="providerReport">
-                <div class="modal-header">
-                    <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                    <h4 class="modal-title">Provider Report
-                    </h4>
-                </div>
-                <div class="modal-body">
-                    <div class="row form-row">
-                        <div class="col-md-3">
-                            <label for="metric">Metric:<span class="control-label redSpan">&nbsp;*</span></label>
-                        </div>
-                        <div class="col-md-9">
-                            <select id="metric" name="metric" class="required form-control width-100" style="vertical-align:central">
-                                <option value="cost">Cost</option>
-                                <option value="usage">Usage</option>
-                            </select>
-                        </div>
-                    </div>
-                    <div class="row form-row" id="rowReportType">
-                        <div class="col-md-3">
-                            <label for="type">Report Type:<span class="control-label redSpan">&nbsp;*</span></label>
-                        </div>
-                        <div class="col-md-9">
-                            <select id="type" name="type" class="form-control width-100" style="vertical-align:central">
-                                <option value="aggregate">Aggregate</option>
-                                <option value="trend">Trend</option>
-                            </select>
-                        </div>
-                    </div>
-                    <div class="row form-row" id="rowPeriod">
-                        <div class="col-md-3">
-                            <label for="period">Period<span class="control-label redSpan">&nbsp;*</span></label>
-                        </div>
-                        <div class="col-md-9">
-                            <select id="period" name="period" class="required form-control width-100" style="vertical-align:central">
-                                <!--<option value="hour">Hour</option>-->
-<!--                                <option value="day">Day</option>
-                                <option value="week">Week</option>-->
-                                <option value="month">Month</option>
-                                <!--<option value="year">Year</option>-->
-                            </select>
-                        </div>
-                    </div>
-                    <div class="row form-row" id="rowInterval">
-                        <div class="col-md-3">
-                            <label for="interval">Interval<span class="control-label redSpan">&nbsp;*</span></label>
-                        </div>
-                        <div class="col-md-9">
-                            <select id="interval" name="interval" class="required form-control width-100" style="vertical-align:central">
-                                <!--<option value="300">5 Min</option>-->
-                                <!-- <option value="3600">1 Hour</option>
-                                <option value="86400">1 Day</option> -->
-                            </select>
-                        </div>
-                    </div>
-                    <div class="row form-row" id="rowFromDate">
-                        <div class="col-md-3">
-                            <label for="fromTimeStamp">From Date:<span class="control-label redSpan">&nbsp;*</span></label>
-                        </div>
-                        <div class="col-md-9">
-                            <input name="fromTimeStamp" class="required form-control" id="fromTimeStamp" />
-                        </div>
-                    </div>
-                    <div class="row form-row">
-                        <div class="col-md-3">
-                            <label for="toTimeStamp">Till Date:<span class="control-label redSpan">&nbsp;*</span></label>
-                        </div>
-                        <div class="col-md-9">
-                            <input name="toTimeStamp" class="required form-control" id="toTimeStamp" />
-                        </div>
-                    </div>
-                </div>
-                <div class="modal-footer">
-                    <a class="btn btn-default" data-dismiss="modal"><i class="ace-icon fa fa-times bigger-110"></i>&nbsp;Close</a>
-                    <button type="submit" id="downloadReport" class="btn btn-primary" value="Download"><i class="ace-icon fa fa-check bigger-110"></i>&nbsp;Download</button>
-                </div>
-            </form>
-        </div>
-    </div>
-</div>
 
 <script>
     $(document).ready(function () {
@@ -207,23 +121,8 @@ <h4 class="modal-title">Provider Report
                 return item.name != thisName;
             });
         }
-        $(document).on("click", ".providerReport", function () {
-            providerId = $(this).data('providerid');
-        });
 
         //when the user closes the modal the form will be reset
-        $('#modalForProviderReport').on('hidden.bs.modal', function () {
-            $('#type').removeAttr('disabled');
-            $('#type').trigger('change');
-            $('#rowPeriod').slideDown();
-            $('#rowInterval').slideUp();
-            $('#rowFromDate').slideUp();
-            $("#interval option[value='3600']").remove();
-            $('#providerReport')[0].reset();
-            $('span.error').empty().hide();
-            return false;
-        });
-
         $('#metric').change(function () {
             var val = $(this).val();
             if (val === 'usage') {
diff --git a/client/htmls/private/ajax/Settings/chefSync.html b/client/htmls/private/ajax/Settings/chefSync.html
index 3d9029af8..c153113db 100755
--- a/client/htmls/private/ajax/Settings/chefSync.html
+++ b/client/htmls/private/ajax/Settings/chefSync.html
@@ -311,7 +311,8 @@ <h4 class="modal-title">Importing Nodes</h4>
             $.get('../monitors?filterBy=orgId:' + orgValue,function(data){
                 var str = ' <option value="null">None</option>';
                 for(var i=0;i<data.length;i++){
-                    str = str + '<option value="'+data[i]._id+'">'+data[i].name+'</option>';
+                    var selected = (data[i].isDefault)?' selected':'';
+                    str = str + '<option value="'+data[i]._id+'"'+selected+'>'+data[i].name+'</option>';
                 }
                 $('#monitorId').html(str);
             });
diff --git a/client/htmls/private/ajax/Settings/monitoringServer.html b/client/htmls/private/ajax/Settings/monitoringServer.html
index c6341a119..d63ad11f5 100644
--- a/client/htmls/private/ajax/Settings/monitoringServer.html
+++ b/client/htmls/private/ajax/Settings/monitoringServer.html
@@ -33,6 +33,7 @@ <h5 class="widget-title widgetColor">
                   <td>Protocol Type</td>
                   <td>Host</td>
                   <td>Port</td>
+                  <td>Default</td>
                   <td>Action</td>
                 </tr>
               </thead>
@@ -382,6 +383,13 @@ <h4 class="modal-title">
   var $monitorList = $('#monitorTable tbody');
   var $tr = $('<tr class="monitorItemRow"></tr>').attr('data-monitorId', monitorData._id).attr('data-type', monitorData.type).attr('transportProtocol-type', monitorData.parameters.transportProtocol).attr('orgId',monitorData.organization.id).attr('orgName',monitorData.organization.name);
   $tr.data('monitorData', monitorData);
+  var isDefault='';
+
+  if(monitorData.isDefault){
+    isDefault='Default';
+  } else {
+    isDefault='<span class="monitorIsDefault">Set as Default</span>';
+   }
 
   var $tdName = $('<td class="monitorName">' + monitorData.name + '</td>');
 
@@ -397,6 +405,8 @@ <h4 class="modal-title">
 
   var $tdProtocolPort = $('<td class="monitorProtocolPort">' + monitorData.parameters.transportProtocolParameters.port + '</td>');
 
+  var $tdIsDefault = $('<td id="isDefault">' + isDefault + '</td>');
+
   var $tdAction = $('<td/>');
 
   $tdAction.append('<div class="btn-group">').append('<div style="margin-left:14px;" class="btn-group"><button class="btn btn-danger pull-left btn-sg tableactionbutton globalMonitorRemove" data-placement="top" value="Remove" title="Delete"><i class="ace-icon fa fa-trash-o bigger-120"></i></button></div>');
@@ -432,6 +442,44 @@ <h4 class="modal-title">
   });*/
 
   //for deletion of track items from the table..
+  $tdIsDefault.click(function() {
+      var $this = $(this);
+      //var $tr = $this.parents('tr.monitorItemRow');
+      var monitorId = monitorData._id;
+      var orgId = monitorData.organization.id;
+      var monitorName = monitorData.name;
+      bootbox.confirm({
+          message: 'Do you want to set this Monitor Item as Default?',
+          title: monitorName,
+          callback: function(result) {
+              if (result) {
+                  $.ajax({
+                      url: '../monitors/' + monitorId + '/org/' + orgId + '/setdefault',
+                      method: 'PUT',
+                      success: function() {
+                        $monitorDatatable.clear().draw();
+                        getGlobalMonitorServers();
+                      },
+                      error: function(jxhr) {
+                          bootbox.alert(result);
+                          var msg = "Unable to Set as Default please try again later";
+                          if (jxhr.responseJSON && jxhr.responseJSON.message) {
+                              msg = jxhr.responseJSON.message;
+                          } else if (jxhr.responseText) {
+                              msg = jxhr.responseText;
+                          }
+                          bootbox.alert(msg);
+                      }
+                  });
+              } else {
+                  return;
+              }
+          }
+      });
+      return false;
+  });
+
+
   $tdAction.find('button.globalMonitorRemove').click(function() {
 
       var $this = $(this);
@@ -468,7 +516,7 @@ <h4 class="modal-title">
       return false;
   });
 
-  $tr.append($tdName).append($tdOrganization).append($tdServerType).append($tdServerURL).append($tdProtocolType).append($tdProtocolHost).append($tdProtocolPort).append($tdAction);
+  $tr.append($tdName).append($tdOrganization).append($tdServerType).append($tdServerURL).append($tdProtocolType).append($tdProtocolHost).append($tdProtocolPort).append($tdIsDefault).append($tdAction);
   $monitorList.append($tr);
   $monitorDatatable.row.add($tr).draw();
 };
@@ -688,4 +736,10 @@ <h4 class="modal-title">
     }
 });
 </script>
-                             
\ No newline at end of file
+
+<style>
+  .monitorIsDefault {
+    color: #005384;
+    cursor: pointer;
+  }
+</style>                             
\ No newline at end of file