From 9dc3750ba3199bab0022c39193fb1998966f1241 Mon Sep 17 00:00:00 2001 From: Durgesh1988 Date: Thu, 15 Sep 2016 12:05:28 +0530 Subject: [PATCH 01/24] CAT-2333 Fixed --- client/htmls/private/ajax/Settings/CreateOrg.html | 2 +- server/app/routes/v1.0/routes_provider.js | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/client/htmls/private/ajax/Settings/CreateOrg.html b/client/htmls/private/ajax/Settings/CreateOrg.html index cc371df58..46b67c0dc 100755 --- a/client/htmls/private/ajax/Settings/CreateOrg.html +++ b/client/htmls/private/ajax/Settings/CreateOrg.html @@ -37,7 +37,7 @@

Create Organization

- + diff --git a/server/app/routes/v1.0/routes_provider.js b/server/app/routes/v1.0/routes_provider.js index c0cee7cde..cd0ab9175 100644 --- a/server/app/routes/v1.0/routes_provider.js +++ b/server/app/routes/v1.0/routes_provider.js @@ -2162,6 +2162,9 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) { var orgId = req.body.orgId; var s3BucketName=req.body.s3BucketName; var plannedCost=req.body.plannedCost; + if(plannedCost === null || plannedCost ===''){ + plannedCost=0.0; + } var isDefault = (req.body.isDefault === 'true') ? true : false; var hasDefaultProvider = false; @@ -2457,6 +2460,9 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) { var orgId = req.body.orgId; var s3BucketName = req.body.s3BucketName; var plannedCost = req.body.plannedCost; + if(plannedCost === null || plannedCost ===''){ + plannedCost=0.0; + } if (typeof providerId === 'undefined' || providerId.length === 0) { res.status(400).send("{Please Enter ProviderId.}"); return; From c417743204a07ca7890a31aaa24c405a56b0a637 Mon Sep 17 00:00:00 2001 From: Durgesh1988 Date: Thu, 15 Sep 2016 16:55:36 +0530 Subject: [PATCH 02/24] CAT-2333/CAT-2335/CAT-2334 Fixed --- .../private/ajax/Settings/providerSync.html | 34 +++++++++++++++-- client/htmls/private/js/settingscommon.js | 4 +- client/htmls/public/instanceLog.html | 2 +- client/htmls/public/js/awsCapacity.js | 37 +++++++++++++++---- server/app/model/classes/instance/instance.js | 20 +++++----- .../unassigned-instances.js | 12 +++--- .../unmanaged-instance/unmanaged-instance.js | 14 +++---- .../app/routes/v1.0/routes_cloudformation.js | 2 +- server/app/services/instanceService.js | 6 ++- 9 files changed, 94 insertions(+), 37 deletions(-) diff --git a/client/htmls/private/ajax/Settings/providerSync.html b/client/htmls/private/ajax/Settings/providerSync.html index bfb4727f6..48a1e19a7 100644 --- a/client/htmls/private/ajax/Settings/providerSync.html +++ b/client/htmls/private/ajax/Settings/providerSync.html @@ -780,7 +780,19 @@

Importing Instances

"columns": [ {"data": "platformId","orderable" : true }, {"data": "hardware.os","orderable" : false }, - {"data": "instanceIP","orderable" : true }, + {"data": "instanceIP","orderable" : true, + "render":function(data, type, full, meta) { + if(full.instanceIP === null){ + if(full.privateIpAddress === null){ + return '-'; + }else{ + return full.privateIpAddress; + } + }else{ + return full.instanceIP; + } + } + }, {"data": "","orderable" : true, "render":function(data, type, full, meta) { return full.region?full.region:full.providerData?full.providerData.region:'-'; @@ -1697,7 +1709,15 @@

Importing Instances

{"data": "os","orderable" : false }, {"data": "","orderable" : true, "render":function(data, type, full, meta) { - return full.ip !== null ? full.ip:full.privateIpAddress; + if(full.ip === null){ + if(full.privateIpAddress === null){ + return '-'; + }else{ + return full.privateIpAddress; + } + }else{ + return full.ip; + } } }, {"data": "","orderable" : true, @@ -1866,7 +1886,15 @@

Importing Instances

{"data": "os","orderable" : false }, {"data": "","orderable" : true, "render":function(data, type, full, meta) { - return full.ip !== null ? full.ip:full.privateIpAddress; + if(full.ip === null){ + if(full.privateIpAddress === null){ + return '-'; + }else{ + return full.privateIpAddress; + } + }else{ + return full.ip; + } } }, {"data": "state","orderable" : true }, diff --git a/client/htmls/private/js/settingscommon.js b/client/htmls/private/js/settingscommon.js index 2a258ad94..72feb9ac4 100755 --- a/client/htmls/private/js/settingscommon.js +++ b/client/htmls/private/js/settingscommon.js @@ -3441,11 +3441,11 @@ function isFormValid(formid) { currCtrl.focus(); } - if (!/[!@#$%^&*]/.test(str)) { + /*if (!/[!@#$%^&*]/.test(str)) { isValid = false; errormessageforInput(currCtrl.attr('id'), "Atleast a special char is required."); currCtrl.focus(); - } + }*/ } break; diff --git a/client/htmls/public/instanceLog.html b/client/htmls/public/instanceLog.html index dc1892ac7..4f13795fe 100644 --- a/client/htmls/public/instanceLog.html +++ b/client/htmls/public/instanceLog.html @@ -280,7 +280,7 @@
+
@@ -91,9 +92,10 @@

0

+
diff --git a/client/htmls/public/js/awsCapacity.js b/client/htmls/public/js/awsCapacity.js index d887a8374..8f9d086bf 100644 --- a/client/htmls/public/js/awsCapacity.js +++ b/client/htmls/public/js/awsCapacity.js @@ -59,6 +59,7 @@ $(document).ready(function() { if (data.length === 0) { $('.providerValues').addClass('hidden'); $('.noProviderView').show(); + $('#instanceActionListLoader').hide(); } else { for (var i = 0; i < data.length; i++) { $('.noProviderView').hide(); diff --git a/client/htmls/public/js/dashboard.js b/client/htmls/public/js/dashboard.js index 0c53d2c9d..ae27f9fa1 100644 --- a/client/htmls/public/js/dashboard.js +++ b/client/htmls/public/js/dashboard.js @@ -195,6 +195,7 @@ $(document).ready(function () { } } else { $('.noProviderView').show(); + $('#totalProviders').append(totalcountproviders); } }).fail(function () { diff --git a/seed/mongodump/devops_new/tracks.bson b/seed/mongodump/devops_new/tracks.bson index 31d5fa4b72bb7805ce981da49fe2d256a041aa4d..e52c2e2faa6c6e2bee30bf7ff922f02de64ec1c8 100644 GIT binary patch delta 170 zcmZ3=@sDFeEhCdC)8u+aLyjAa3=GT$3>PNvV9aAon5@p^&3(Jo;%@WYO#YSYRVUY? z@Kq*XX7Wuz$SX528#9D4FfcIXCFZ6whyYoR;lT>di3N$tnI)A9L8%4#MI{VOrA0Xm ol0ZrQg3_d%%w+w<@?w}8y^NCF90vCI%oK)jguzOawV8hb01y#5_W%F@ delta 81 zcmeyzv6N#&EhEz&#>w@Jh8*>b3=GT$4CRw|Fy=9`PgZC0=H9i6RW`NkY{(St;>oor S{G!R1nS7Dt3n#ZQ{{jFXksLq( From 3906c8c3eabedd522879b7cc6f3d8d1b5b1c2ab4 Mon Sep 17 00:00:00 2001 From: Durgesh1988 Date: Fri, 16 Sep 2016 12:14:43 +0530 Subject: [PATCH 06/24] CAT-2338/CAT-2339/CAT-2340 Fixed --- .../private/ajax/Settings/providerSync.html | 188 ++++++++++++------ client/htmls/public/js/awsCapacity.js | 14 +- 2 files changed, 135 insertions(+), 67 deletions(-) diff --git a/client/htmls/private/ajax/Settings/providerSync.html b/client/htmls/private/ajax/Settings/providerSync.html index 48a1e19a7..ea69239fb 100644 --- a/client/htmls/private/ajax/Settings/providerSync.html +++ b/client/htmls/private/ajax/Settings/providerSync.html @@ -1127,9 +1127,13 @@

Importing Instances

var tagsProjSelectedVal = $projecttagsList.val(); var tagsenvSelectedVal = $envtagsList.val(); var tagsbgSelectedVal = $bgtagsList.val(); - if((tagsbgSelectedVal === tagsProjSelectedVal) - || (tagsbgSelectedVal === tagsenvSelectedVal) - || (tagsProjSelectedVal === tagsenvSelectedVal)){ + if(tagsbgSelectedVal === '' && tagsProjSelectedVal === '' && tagsenvSelectedVal === ''){ + bootbox.alert("Please select at-least one value for catalyst entity mapping"); + return false; + } + if((tagsbgSelectedVal !== '' && tagsbgSelectedVal === tagsProjSelectedVal) + || (tagsenvSelectedVal !== '' && tagsenvSelectedVal === tagsbgSelectedVal) + || (tagsProjSelectedVal !== '' && tagsProjSelectedVal === tagsenvSelectedVal)){ bootbox.alert("Tag name cannot be same to create catalyst entity mapping"); return false; } @@ -1328,7 +1332,10 @@

Importing Instances

var bgmappingcatalystEntityId = $tr.attr('id'); var mappingbgSelectTagName = $tr.find('.mappingbgSelectId :selected').val(); var mappingbgName = $tr.find('.mappingbgName').text(); - + if(mappingbgSelectTagName === '' && $('#mappingBgTable tbody tr').length === 1){ + bootbox.alert('Please select a value for updating Catalyst Business Group Tag'); + return false; + } var objbgMapping = {}; objbgMapping["catalystEntityId"] = bgmappingcatalystEntityId; objbgMapping["catalystEntityName"] = mappingbgName; @@ -1336,28 +1343,40 @@

Importing Instances

bgMappingObj.catalystEntityMapping.push(objbgMapping); if(counter == $('#mappingBgTable tbody tr').length){ - $.ajax({ - url: '/providers/'+urlproviderId+'/tag-mappings/bgName', - data: JSON.stringify(bgMappingObj), - type: 'PATCH', - contentType: "application/json", - success: function(data) { - $('#spanbgMappingSaveId').fadeIn(); - $('#spanbgMappingSaveId').html('Saved successfully'); - $('#spanbgMappingSaveId').delay(2000).fadeOut(); - }, - error: function(jqxhr) { - var msg = " "; - if (jxhr.responseJSON && jxhr.responseJSON.message) { - msg = jxhr.responseJSON.message; - } else if (jxhr.responseText) { - msg = jxhr.responseText; - } - $('#spanbgMappingSaveId').fadeIn(); - $('#spanbgMappingSaveId').html(msg); - $('#spanbgMappingSaveId').delay(2000).fadeOut(); + var checkBgNull = bgMappingObj.catalystEntityMapping; + var checkNullFlag = true; + for(var i = 0; i < checkBgNull.length;i++){ + if(checkBgNull[i].tagValue !== ''){ + checkNullFlag = false; } - }); + } + if(checkNullFlag){ + bootbox.alert('Please select at-lease one value for updating Catalyst Business Group Tag'); + return false; + }else { + $.ajax({ + url: '/providers/' + urlproviderId + '/tag-mappings/bgName', + data: JSON.stringify(bgMappingObj), + type: 'PATCH', + contentType: "application/json", + success: function (data) { + $('#spanbgMappingSaveId').fadeIn(); + $('#spanbgMappingSaveId').html('Saved successfully'); + $('#spanbgMappingSaveId').delay(2000).fadeOut(); + }, + error: function (jqxhr) { + var msg = " "; + if (jxhr.responseJSON && jxhr.responseJSON.message) { + msg = jxhr.responseJSON.message; + } else if (jxhr.responseText) { + msg = jxhr.responseText; + } + $('#spanbgMappingSaveId').fadeIn(); + $('#spanbgMappingSaveId').html(msg); + $('#spanbgMappingSaveId').delay(2000).fadeOut(); + } + }); + } } }); }); @@ -1373,7 +1392,10 @@

Importing Instances

var projmappingcatalystEntityId = $tr.attr('id'); var mappingprojectSelectTagName = $tr.find('.mappingprojectSelectId :selected').val(); var mappingprojectName = $tr.find('.mappingprojectName').text(); - + if(mappingprojectSelectTagName === '' && $('#mappingprojectTable tbody tr').length === 1){ + bootbox.alert('Please select a value for updating Catalyst Project Tag'); + return false; + } var objprojectMapping = {}; objprojectMapping["catalystEntityId"] = projmappingcatalystEntityId; objprojectMapping["catalystEntityName"] = mappingprojectName; @@ -1382,19 +1404,31 @@

Importing Instances

projectMappingObj.catalystEntityMapping.push(objprojectMapping); if(counter == $('#mappingprojectTable tbody tr').length){ - $.ajax({ - url: '/providers/'+urlproviderId+'/tag-mappings/project', - data: JSON.stringify(projectMappingObj), - type: 'PATCH', - contentType: "application/json", - success: function(data) { - $('#spanprojectMappingSaveId').fadeIn(); - $('#spanprojectMappingSaveId').html('Saved successfully'); - $('#spanprojectMappingSaveId').delay(2000).fadeOut(); - }, - error: function(jqxhr) { + var checkProjectNull = projectMappingObj.catalystEntityMapping; + var checkNullFlag = true; + for(var i = 0; i < checkProjectNull.length;i++){ + if(checkProjectNull[i].tagValue !== ''){ + checkNullFlag = false; } - }); + } + if(checkNullFlag){ + bootbox.alert('Please select at-lease one value for updating Catalyst Project Tag'); + return false; + }else { + $.ajax({ + url: '/providers/' + urlproviderId + '/tag-mappings/project', + data: JSON.stringify(projectMappingObj), + type: 'PATCH', + contentType: "application/json", + success: function (data) { + $('#spanprojectMappingSaveId').fadeIn(); + $('#spanprojectMappingSaveId').html('Saved successfully'); + $('#spanprojectMappingSaveId').delay(2000).fadeOut(); + }, + error: function (jqxhr) { + } + }); + } } }); }); @@ -1412,7 +1446,10 @@

Importing Instances

var envmappingcatalystEntityId = $tr.attr('id'); var mappingenvSelectTagName = $tr.find('.mappingenvSelectId :selected').val(); var mappingenvName = $tr.find('.mappingenvName').text(); - + if(mappingenvSelectTagName === '' && $('#mappingenvTable tbody tr').length === 1){ + bootbox.alert('Please select a value for updating Catalyst Environment Tag'); + return false; + } var objenvMapping = {}; objenvMapping["catalystEntityId"] = envmappingcatalystEntityId; objenvMapping["catalystEntityName"] = mappingenvName; @@ -1420,28 +1457,40 @@

Importing Instances

envMappingObj.catalystEntityMapping.push(objenvMapping); if(counter == $('#mappingenvTable tbody tr').length){ - $.ajax({ - url: '/providers/'+urlproviderId+'/tag-mappings/environment', - data: JSON.stringify(envMappingObj), - type: 'PATCH', - contentType: "application/json", - success: function(data) { - $('#spanenvMappingSaveId').fadeIn(); - $('#spanenvMappingSaveId').html('Saved successfully'); - $('#spanenvMappingSaveId').delay(2000).fadeOut(); - }, - error: function(jqxhr) { - var msg = " "; - if (jxhr.responseJSON && jxhr.responseJSON.message) { - msg = jxhr.responseJSON.message; - } else if (jxhr.responseText) { - msg = jxhr.responseText; - } - $('#spanenvMappingSaveId').fadeIn(); - $('#spanenvMappingSaveId').html(msg); - $('#spanenvMappingSaveId').delay(2000).fadeOut(); + var checkEnvNull = envMappingObj.catalystEntityMapping; + var checkNullFlag = true; + for(var i = 0; i < checkEnvNull.length;i++){ + if(checkEnvNull[i].tagValue !== ''){ + checkNullFlag = false; } - }); + } + if(checkNullFlag){ + bootbox.alert('Please select at-lease one value for updating Catalyst Environment Tag'); + return false; + }else { + $.ajax({ + url: '/providers/' + urlproviderId + '/tag-mappings/environment', + data: JSON.stringify(envMappingObj), + type: 'PATCH', + contentType: "application/json", + success: function (data) { + $('#spanenvMappingSaveId').fadeIn(); + $('#spanenvMappingSaveId').html('Saved successfully'); + $('#spanenvMappingSaveId').delay(2000).fadeOut(); + }, + error: function (jqxhr) { + var msg = " "; + if (jxhr.responseJSON && jxhr.responseJSON.message) { + msg = jxhr.responseJSON.message; + } else if (jxhr.responseText) { + msg = jxhr.responseText; + } + $('#spanenvMappingSaveId').fadeIn(); + $('#spanenvMappingSaveId').html(msg); + $('#spanenvMappingSaveId').delay(2000).fadeOut(); + } + }); + } } }); }); @@ -1958,6 +2007,13 @@

Importing Instances

var bgTagName = $(this).find('.bgTagName').val(); updateUniqueInstanceTagsObj["id"] = instanceId; updateUniqueInstanceTagsObj["tags"] = {}; + if((typeof projectTagsMapName === 'undefined' || projectTagsMapName === '' || projectTagsMapName === null) && + (typeof envTagsMapName === 'undefined' || envTagsMapName === '' || envTagsMapName === null) && + (typeof bgTagsMapName === 'undefined' || bgTagsMapName === '' || bgTagsMapName === null)){ + bootbox.alert("Please configure tag-mapping for updating tags"); + return false; + } + return false; if(projectTagName === '' && envTagName === '' && bgTagName ===''){ bootbox.alert("Please update tag value in any text-box corresponding to selected check-box for updating tags"); return false; @@ -2016,6 +2072,12 @@

Importing Instances

var bgTagName = $(this).find('.bgTagName').val(); updateUniqueBucketTagsObj["id"] = resourceId; updateUniqueBucketTagsObj["tags"] = {}; + if((projectTagsMapName === 'undefined' || projectTagsMapName === '' || projectTagsMapName === null) && + (envTagsMapName === 'undefined' || envTagsMapName === '' || envTagsMapName === null) && + (bgTagsMapName === 'undefined' || bgTagsMapName === '' || bgTagsMapName === null)){ + bootbox.alert("Please configure tag-mapping for updating tags"); + return false; + } if(projectTagName === '' && envTagName === '' && bgTagName ===''){ bootbox.alert("Please update tag value in any text-box corresponding to selected check-box for updating tags"); return false; @@ -2072,6 +2134,12 @@

Importing Instances

var bgTagName = $(this).find('.bgTagName').val(); updateUniqueDBTagsObj["id"] = resourceId; updateUniqueDBTagsObj["tags"] = {}; + if((projectTagsMapName === 'undefined' || projectTagsMapName === '' || projectTagsMapName === null) && + (envTagsMapName === 'undefined' || envTagsMapName === '' || envTagsMapName === null) && + (bgTagsMapName === 'undefined' || bgTagsMapName === '' || bgTagsMapName === null)){ + bootbox.alert("Please configure tag-mapping for updating tags"); + return false; + } if(projectTagName === '' && envTagName === '' && bgTagName ===''){ bootbox.alert("Please update tag value in any text-box corresponding to selected check-box for updating tags"); return false; diff --git a/client/htmls/public/js/awsCapacity.js b/client/htmls/public/js/awsCapacity.js index d887a8374..4f4e9666d 100644 --- a/client/htmls/public/js/awsCapacity.js +++ b/client/htmls/public/js/awsCapacity.js @@ -351,7 +351,7 @@ $(document).ready(function() { envProjectMappingObject['bgName'] = objtagName; } } - getUnassignedInstancesWithTagMapping(envProjectMappingObject,urlManagedNoProvider); + getUnassignedInstancesWithTagMapping(envProjectMappingObject,urlManagedNoProvider,true); } }).fail(function(jxhr) { var msg = "Tag mappings not loaded as behaved unexpectedly."; @@ -364,11 +364,11 @@ $(document).ready(function() { }); } else { urlManagedProvider = "../tracked-instances?category=unassigned&filterBy=orgId:" + orgId; - getUnassignedInstancesWithTagMapping(envProjectMappingObject,urlManagedProvider); + getUnassignedInstancesWithTagMapping(envProjectMappingObject,urlManagedProvider,false); } } - function getUnassignedInstancesWithTagMapping(envProjectMappingObject,url){ + function getUnassignedInstancesWithTagMapping(envProjectMappingObject,url,hideColumn){ $('.footer').removeClass('hidden'); $('#instanceUnassignedTable').DataTable({ "processing": true, @@ -405,7 +405,7 @@ $(document).ready(function() { "data": "state", "orderable": true }, - {"data": "" ,"orderable" : false, + {"data": "" ,"orderable" : false,"visible" : hideColumn, "render": function(data, type, full) { if(full.tags && envProjectMappingObject.bgName && full.tags[envProjectMappingObject.bgName]) { var tagValue = full.tags[envProjectMappingObject.bgName]; @@ -415,7 +415,7 @@ $(document).ready(function() { } } }, - {"data": "" ,"orderable" : false, + {"data": "" ,"orderable" : false,"visible" : hideColumn, "render": function(data, type, full) { if(full.tags && envProjectMappingObject.project && full.tags[envProjectMappingObject.project]) { var tagValue = full.tags[envProjectMappingObject.project]; @@ -425,7 +425,7 @@ $(document).ready(function() { } } }, - {"data": "" ,"orderable" : false, + {"data": "" ,"orderable" : false,"visible" : hideColumn, "render": function(data, type, full) { if(full.tags && envProjectMappingObject.environment && full.tags[envProjectMappingObject.environment]) { var tagValue = full.tags[envProjectMappingObject.environment]; @@ -437,7 +437,7 @@ $(document).ready(function() { }, { "data": "platformId", - "orderable": false, + "orderable": false,"visible" : hideColumn, "render": function(data, type, full, meta) { if (full.platformId) { return ''; From e65d0fa77392eec75b89b64b11d0793ec04efae4 Mon Sep 17 00:00:00 2001 From: srikanthv02 Date: Fri, 16 Sep 2016 12:20:55 +0530 Subject: [PATCH 07/24] Highlighting the selected box for capacity dashboard --- client/htmls/public/awsCapacity.html | 6 +++--- client/htmls/public/css/capacity.css | 5 +++++ client/htmls/public/js/awsCapacity.js | 12 +++++++++--- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/client/htmls/public/awsCapacity.html b/client/htmls/public/awsCapacity.html index 322700dc0..eae443bb0 100644 --- a/client/htmls/public/awsCapacity.html +++ b/client/htmls/public/awsCapacity.html @@ -51,7 +51,7 @@

0

-
+

0

Total
No. of Managed Instances

@@ -65,7 +65,7 @@

0

-
+

0

Total
No. of Assigned Instances

@@ -79,7 +79,7 @@

0

-
+

0

Total
No. of UnAssigned Instances

diff --git a/client/htmls/public/css/capacity.css b/client/htmls/public/css/capacity.css index 9fceadeb6..b074d2d29 100644 --- a/client/htmls/public/css/capacity.css +++ b/client/htmls/public/css/capacity.css @@ -75,3 +75,8 @@ #instanceUnAssignedContainer { min-height: 280px; } + +.selectComponent { + border: 5px solid #396ea2; + margin-top: -5px; +} diff --git a/client/htmls/public/js/awsCapacity.js b/client/htmls/public/js/awsCapacity.js index 8f9d086bf..949bdcdfd 100644 --- a/client/htmls/public/js/awsCapacity.js +++ b/client/htmls/public/js/awsCapacity.js @@ -195,7 +195,9 @@ $(document).ready(function() { } $('#totalManagedInstancesMoreInfo').on('click', function() { - //$(this).css('box-shadow', '10px 10px 5px #888'); + $('.unassignedBox').removeClass('selectComponent'); + $('.assignedBox').removeClass('selectComponent'); + $('.totalBox').addClass('selectComponent'); loadAllManagedInstances(); $('#instanceTableContainer').show(); $('#instanceAssignedContainer').hide(); @@ -203,7 +205,9 @@ $(document).ready(function() { }); $('#totalUnManagedInstancesMoreInfo').on('click', function() { - //$(this).css('box-shadow', '10px 10px 5px #888'); + $('.unassignedBox').removeClass('selectComponent'); + $('.totalBox').removeClass('selectComponent'); + $('.assignedBox').addClass('selectComponent'); loadAllUnManagedInstances(); $('#instanceTableContainer').hide(); $('#instanceUnAssignedContainer').hide(); @@ -211,7 +215,9 @@ $(document).ready(function() { }); $('#totalUnAssignedInstancesMoreInfo').on('click', function() { - //$(this).addClass('shadow'); + $('.totalBox').removeClass('selectComponent'); + $('.assignedBox').removeClass('selectComponent'); + $('.unassignedBox').addClass('selectComponent'); getUnassignedInstancesWithProjectAndEnv(); $('#instanceTableContainer').hide(); $('#instanceAssignedContainer').hide(); From 2cdb3133704b76ae1ec884fe7d68c493accf816c Mon Sep 17 00:00:00 2001 From: srikanthv02 Date: Fri, 16 Sep 2016 12:23:21 +0530 Subject: [PATCH 08/24] Clearing the selected box --- client/htmls/public/js/awsCapacity.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/client/htmls/public/js/awsCapacity.js b/client/htmls/public/js/awsCapacity.js index 949bdcdfd..2124bdee3 100644 --- a/client/htmls/public/js/awsCapacity.js +++ b/client/htmls/public/js/awsCapacity.js @@ -22,6 +22,9 @@ $(document).ready(function() { $('#instanceAssignedContainer').hide(); $('#instanceUnAssignedContainer').hide(); $('.footer').addClass('hidden'); + $('.unassignedBox').removeClass('selectComponent'); + $('.assignedBox').removeClass('selectComponent'); + $('.totalBox').removeClass('selectComponent'); } $("#refreshBtn").click(function() { From 3a1458765eb1ef02b77279fca92ca6b1fb4ba7b6 Mon Sep 17 00:00:00 2001 From: Durgesh1988 Date: Fri, 16 Sep 2016 12:34:53 +0530 Subject: [PATCH 09/24] CAT-2338/CAT-2339/CAT-2340 Fixed --- client/htmls/private/ajax/Settings/providerSync.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/client/htmls/private/ajax/Settings/providerSync.html b/client/htmls/private/ajax/Settings/providerSync.html index ea69239fb..52fd4cadd 100644 --- a/client/htmls/private/ajax/Settings/providerSync.html +++ b/client/htmls/private/ajax/Settings/providerSync.html @@ -1071,7 +1071,6 @@

Importing Instances

//For project catalystEntityType $mappingprojectDatatable.clear().draw(); var $tbody = $('#mappingprojectTable tbody').empty(); - for(var j = 0; j < catalystEntityTypeListPassed.length; j++){ //For Table var $tr = $(''); @@ -1102,6 +1101,8 @@

Importing Instances

} } } + }else{ + $('.btnprojectMappingSave').attr('disabled',true); } //For environment catalystEntityType if(objcatalystEntityType == catalystEntityEnvName){ @@ -1110,7 +1111,6 @@

Importing Instances

} }, error: function(jxhr) { - } }); @@ -1276,7 +1276,7 @@

Importing Instances

} } }).fail(function(jxhr) { - + $('.btnenvMappingSave').attr('disabled',true); }); } @@ -1317,7 +1317,7 @@

Importing Instances

} } }).fail(function(jxhr) { - + $('.btnbgMappingSave').attr('disabled',true); }); } $('.btnbgMappingSave').on('click',function(){ From 232f0f272673be934ebfc1f63265fb00fa0d2569 Mon Sep 17 00:00:00 2001 From: srikanthv02 Date: Fri, 16 Sep 2016 13:20:12 +0530 Subject: [PATCH 10/24] Added tooltip for cost and usage in aws reports --- client/htmls/public/Dashboard.html | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/client/htmls/public/Dashboard.html b/client/htmls/public/Dashboard.html index 5e3d4fecf..ce895f0cb 100644 --- a/client/htmls/public/Dashboard.html +++ b/client/htmls/public/Dashboard.html @@ -236,8 +236,12 @@

IP Address Region Status - Cost - Avg. Cpu Usage + Cost + + + Avg. Cpu Usage + + @@ -270,8 +274,12 @@

IP Address Region Status - Cost - Avg. Cpu Usage + Cost + + + Avg. Cpu Usage + + @@ -301,8 +309,12 @@

IP Address Region Status - Cost - Avg. Cpu Usage + Cost + + + Avg. Cpu Usage + + From 3b21e8cd12d93c0581bf2b731b16c7b5c922e436 Mon Sep 17 00:00:00 2001 From: Durgesh1988 Date: Fri, 16 Sep 2016 14:46:33 +0530 Subject: [PATCH 11/24] CAT-2338/CAT-2339/CAT-2340 Fixed --- .../model/setting-wizard/setting-wizard.js | 23 +++++++++-- server/app/routes/v1.0/routes_d4dMasters.js | 40 ++++++++++++++++++- 2 files changed, 58 insertions(+), 5 deletions(-) diff --git a/server/app/model/setting-wizard/setting-wizard.js b/server/app/model/setting-wizard/setting-wizard.js index 81c4467a8..2d513daa1 100644 --- a/server/app/model/setting-wizard/setting-wizard.js +++ b/server/app/model/setting-wizard/setting-wizard.js @@ -17,6 +17,7 @@ var logger = require('_pr/logger')(module); var mongoose = require('mongoose'); +var ObjectId = require('mongoose').Types.ObjectId; var Schema = mongoose.Schema; @@ -52,22 +53,38 @@ SettingWizardSchema.statics.createSettingWizard = function createSettingWizard(s callback(err, null); return; } - logger.debug("Creating setting-Wizard: ", JSON.stringify(settingWizardDetails)); callback(null, settingWizardDetails); return; }); }; +SettingWizardSchema.statics.updateSettingWizard = function updateSettingWizard(settingWizard, callback) { + this.update({ + _id: new ObjectId(settingWizard._id) + }, { + $set: settingWizard + }, { + upsert: false + },function(err, data) { + if (err) { + logger.debug("Got error while updating setting-Wizard: ", err); + callback(err, null); + return; + } + callback(null, data); + return; + }); +}; + SettingWizardSchema.statics.getSettingWizardByOrgId = function getSettingWizardByOrgId(orgId, callback) { - this.find({ + this.findOne({ orgId:orgId }, function(err, settingWizardDetails) { if (err) { logger.debug("Got error while fetching getSettingWizardByOrgId: ", err); callback(err, null); } - logger.debug("Got setting-Wizard: ", JSON.stringify(settingWizardDetails)); callback(null, settingWizardDetails); }); }; diff --git a/server/app/routes/v1.0/routes_d4dMasters.js b/server/app/routes/v1.0/routes_d4dMasters.js index 84519eec5..321a00ff2 100755 --- a/server/app/routes/v1.0/routes_d4dMasters.js +++ b/server/app/routes/v1.0/routes_d4dMasters.js @@ -2557,8 +2557,27 @@ module.exports.setRoutes = function(app, sessionVerification) { res.send(500); return; } - res.send(200); - return; + settingWizard.getSettingWizardByOrgId(bodyJson['orgname_rowid'],function(err,settingWizards){ + if(err){ + logger.error('Hit getting setting wizard error', err); + res.send(500); + return; + } + var settingWizardSteps = appConfig.settingWizardSteps; + settingWizards.currentStep.nestedSteps[2].isCompleted =true; + settingWizards.previousStep = settingWizards.currentStep; + settingWizards.currentStep =settingWizards.nextStep; + settingWizards.nextStep =settingWizardSteps[3]; + settingWizard.updateSettingWizard(settingWizards,function(err,data){ + if(err){ + logger.error('Hit getting setting wizard error', err); + res.send(500); + return; + } + res.send(200); + return; + }); + }) }); } else if (req.params.id === '26') { bodyJson['groupid'] = JSON.parse(bodyJson['groupid']); @@ -2583,6 +2602,23 @@ module.exports.setRoutes = function(app, sessionVerification) { } logger.debug('New Master Saved'); logger.debug(req.params.fileinputs == 'null'); + if(req.params.id === '2'){ + settingWizard.getSettingWizardByOrgId(bodyJson['orgname_rowid'],function(err,settingWizards){ + if(err){ + logger.error('Hit getting setting wizard error', err); + res.send(500); + return; + } + settingWizards.currentStep.nestedSteps[1].isCompleted =true; + settingWizard.updateSettingWizard(settingWizards,function(err,data){ + if(err){ + logger.error('Hit getting setting wizard error', err); + res.send(500); + return; + } + }); + }) + } logger.debug('New record folderpath: % rowid %s FLD["folderpath"]:', folderpath, newrowid, folderpath); if (!folderpath) { if (FLD["folderpath"] == undefined) //folderpath issue fix From 27df0252b23b7c9ac27904ad9bfe24b1a86d92f1 Mon Sep 17 00:00:00 2001 From: Durgesh1988 Date: Fri, 16 Sep 2016 16:43:11 +0530 Subject: [PATCH 12/24] CAT-2335/CAT-2336 Fixed --- .../ajax/Settings/CreateProviders.html | 4 +- .../private/ajax/Settings/providerSync.html | 9 +++- client/htmls/public/js/awsCapacity.js | 6 +++ .../AWSRDSS3ProviderSync.js | 51 ++++++++++-------- .../cronjobs/provider-sync/AWSProviderSync.js | 53 ++++++++++--------- 5 files changed, 73 insertions(+), 50 deletions(-) diff --git a/client/htmls/private/ajax/Settings/CreateProviders.html b/client/htmls/private/ajax/Settings/CreateProviders.html index c677ead19..810efca2f 100755 --- a/client/htmls/private/ajax/Settings/CreateProviders.html +++ b/client/htmls/private/ajax/Settings/CreateProviders.html @@ -222,11 +222,11 @@

- + - +
diff --git a/client/htmls/private/ajax/Settings/providerSync.html b/client/htmls/private/ajax/Settings/providerSync.html index 52fd4cadd..fd25800de 100644 --- a/client/htmls/private/ajax/Settings/providerSync.html +++ b/client/htmls/private/ajax/Settings/providerSync.html @@ -1055,6 +1055,11 @@

Importing Instances

var catalystEntityProjName = $('#projectnameLabelId').attr('catalystEntitytype'); var catalystEntityEnvName = $('#envnameLabelId').attr('catalystEntitytype'); var catalystEntityBgName = $('#bgNameLabelId').attr('catalystEntitytype'); + if(tagsListSelected.length > 0){ + $('.btnprojectMappingSave').attr('disabled',false); + }else{ + $('.btnprojectMappingSave').attr('disabled',true); + } for(var i=0;iImporting Instances

$bgtagsList.val(objtagName); } if(objcatalystEntityType == catalystEntityProjName){ + $('.btnprojectMappingSave').attr('disabled',false); $projecttagsList.val(objtagName); //For Mapping tab..... //For project catalystEntityType @@ -1244,6 +1250,7 @@

Importing Instances

$.get('/providers/'+urlproviderId+'/tag-mappings/environment', function(data) { if(data){ + $('.btnenvMappingSave').attr('disabled',false); var $tbody = $('#mappingenvTable tbody').empty(); for(var i = 0; i < envList.length; i++){ //For Table @@ -1285,6 +1292,7 @@

Importing Instances

$.get('/providers/'+urlproviderId+'/tag-mappings/bgName', function(data) { if(data){ + $('.btnbgMappingSave').attr('disabled',false); var $tbody = $('#mappingBgTable tbody').empty(); for(var i = 0; i < bgList.length; i++){ //For Table @@ -2013,7 +2021,6 @@

Importing Instances

bootbox.alert("Please configure tag-mapping for updating tags"); return false; } - return false; if(projectTagName === '' && envTagName === '' && bgTagName ===''){ bootbox.alert("Please update tag value in any text-box corresponding to selected check-box for updating tags"); return false; diff --git a/client/htmls/public/js/awsCapacity.js b/client/htmls/public/js/awsCapacity.js index 4f4e9666d..07e0b8e97 100644 --- a/client/htmls/public/js/awsCapacity.js +++ b/client/htmls/public/js/awsCapacity.js @@ -480,6 +480,12 @@ $(document).ready(function() { } updateUniqueInstanceTagsObj["id"] = instanceId; updateUniqueInstanceTagsObj["tags"] = {}; + if((projectTagsMapName === 'undefined' || projectTagsMapName === '' || projectTagsMapName === null) && + (envTagsMapName === 'undefined' || envTagsMapName === '' || envTagsMapName === null) && + (bgTagsMapName === 'undefined' || bgTagsMapName === '' || bgTagsMapName === null)){ + toastr.error("Please configure tag-mapping for updating tags"); + return false; + } if(projectTagName === '' && envTagName === '' && bgTagName ===''){ toastr.error("Please update tag value in any text-box corresponding to selected check-box for updating tags"); return false; diff --git a/server/app/cronjobs/provider-rds-s3-sync/AWSRDSS3ProviderSync.js b/server/app/cronjobs/provider-rds-s3-sync/AWSRDSS3ProviderSync.js index 30efbed80..65ae33759 100644 --- a/server/app/cronjobs/provider-rds-s3-sync/AWSRDSS3ProviderSync.js +++ b/server/app/cronjobs/provider-rds-s3-sync/AWSRDSS3ProviderSync.js @@ -307,36 +307,41 @@ function tagMappingForResources(resources,provider,next){ var catalystProjectName = null; var catalystEnvironmentId = null; var catalystEnvironmentName = null; - var catalystBgtId = null; + var catalystBgId = null; var catalystBgName = null; var assignmentFound = false; - if ((bgTag || projectTag || environmentTag) && (resources[j].isDeleted === false) - && ((bgTag.name in resources[j].tags) || (projectTag.name in resources[j].tags) || (environmentTag.name in resources[j].tags))) { - for (var y = 0; y < bgTag.catalystEntityMapping.length; y++) { - if (bgTag.catalystEntityMapping[y].tagValue !== '' && resources[j].tags[bgTag.name] !== '' && - bgTag.catalystEntityMapping[y].tagValue === resources[j].tags[bgTag.name]) { - catalystBgtId = bgTag.catalystEntityMapping[y].catalystEntityId; - catalystBgName = bgTag.catalystEntityMapping[y].catalystEntityName; - break; + if ((bgTag !== null || projectTag !== null || environmentTag !== null) && (resources[j].isDeleted === false)){ + if(bgTag !== null && bgTag.name in resources[j].tags) { + for (var y = 0; y < bgTag.catalystEntityMapping.length; y++) { + if (bgTag.catalystEntityMapping[y].tagValue !== '' && resources[j].tags[bgTag.name] !== '' + && bgTag.catalystEntityMapping[y].tagValue === resources[j].tags[bgTag.name]) { + catalystBgId = bgTag.catalystEntityMapping[y].catalystEntityId; + catalystBgName = bgTag.catalystEntityMapping[y].catalystEntityName; + break; + } } } - for (var y = 0; y < projectTag.catalystEntityMapping.length; y++) { - if (projectTag.catalystEntityMapping[y].tagValue !== '' && resources[j].tags[projectTag.name] !== '' && - projectTag.catalystEntityMapping[y].tagValue === resources[j].tags[projectTag.name]) { - catalystProjectId = projectTag.catalystEntityMapping[y].catalystEntityId; - catalystProjectName = projectTag.catalystEntityMapping[y].catalystEntityName; - break; + if(projectTag !== null && projectTag.name in resources[j].tags) { + for (var y = 0; y < projectTag.catalystEntityMapping.length; y++) { + if (projectTag.catalystEntityMapping[y].tagValue !== '' && resources[j].tags[projectTag.name] !== '' && + projectTag.catalystEntityMapping[y].tagValue === resources[j].tags[projectTag.name]) { + catalystProjectId = projectTag.catalystEntityMapping[y].catalystEntityId; + catalystProjectName = projectTag.catalystEntityMapping[y].catalystEntityName; + break; + } } } - for (var y = 0; y < environmentTag.catalystEntityMapping.length; y++) { - if (environmentTag.catalystEntityMapping[y].tagValue !== '' && resources[j].tags[environmentTag.name] !== '' && - environmentTag.catalystEntityMapping[y].tagValue === resources[j].tags[environmentTag.name]) { - catalystEnvironmentId = environmentTag.catalystEntityMapping[y].catalystEntityId; - catalystEnvironmentName = environmentTag.catalystEntityMapping[y].catalystEntityName; - break; + if(environmentTag !== null && environmentTag.name in resources[j].tags) { + for (var y = 0; y < environmentTag.catalystEntityMapping.length; y++) { + if (environmentTag.catalystEntityMapping[y].tagValue !== '' && resources[j].tags[environmentTag.name] !== '' && + environmentTag.catalystEntityMapping[y].tagValue === resources[j].tags[environmentTag.name]) { + catalystEnvironmentId = environmentTag.catalystEntityMapping[y].catalystEntityId; + catalystEnvironmentName = environmentTag.catalystEntityMapping[y].catalystEntityName; + break; + } } } - if (catalystProjectId || catalystEnvironmentId || catalystBgtId) { + if (catalystBgId !== null || catalystProjectId !== null || catalystEnvironmentId !== null) { assignmentFound = true; } if (assignmentFound === true) { @@ -344,7 +349,7 @@ function tagMappingForResources(resources,provider,next){ var masterDetails = { orgId: resources[j].masterDetails.orgId, orgName: resources[j].masterDetails.orgName, - bgId: catalystBgtId, + bgId: catalystBgId, bgName: catalystBgName, projectId: catalystProjectId, projectName: catalystProjectName, diff --git a/server/app/cronjobs/provider-sync/AWSProviderSync.js b/server/app/cronjobs/provider-sync/AWSProviderSync.js index 062c046a9..39affbfcc 100644 --- a/server/app/cronjobs/provider-sync/AWSProviderSync.js +++ b/server/app/cronjobs/provider-sync/AWSProviderSync.js @@ -225,33 +225,38 @@ function tagMappingForInstances(instances,provider,next){ var catalystBgName = null; var assignmentFound = false; if(instance.tags) { - if ((bgTag || projectTag || environmentTag) && (instance.isDeleted === false) - && ((bgTag.name in instance.tags) || (projectTag.name in instance.tags) || (environmentTag.name in instance.tags))) { - for (var y = 0; y < bgTag.catalystEntityMapping.length; y++) { - if (bgTag.catalystEntityMapping[y].tagValue !== '' && instance.tags[bgTag.name] !== '' - && bgTag.catalystEntityMapping[y].tagValue === instance.tags[bgTag.name]) { - catalystBgId = bgTag.catalystEntityMapping[y].catalystEntityId; - catalystBgName = bgTag.catalystEntityMapping[y].catalystEntityName; - break; + if ((bgTag !== null || projectTag !== null || environmentTag !== null) && (instance.isDeleted === false)){ + if(bgTag !== null && bgTag.name in instance.tags) { + for (var y = 0; y < bgTag.catalystEntityMapping.length; y++) { + if (bgTag.catalystEntityMapping[y].tagValue !== '' && instance.tags[bgTag.name] !== '' + && bgTag.catalystEntityMapping[y].tagValue === instance.tags[bgTag.name]) { + catalystBgId = bgTag.catalystEntityMapping[y].catalystEntityId; + catalystBgName = bgTag.catalystEntityMapping[y].catalystEntityName; + break; + } } } - for (var y = 0; y < projectTag.catalystEntityMapping.length; y++) { - if (projectTag.catalystEntityMapping[y].tagValue !== '' && instance.tags[projectTag.name] !== '' && - projectTag.catalystEntityMapping[y].tagValue === instance.tags[projectTag.name]) { - catalystProjectId = projectTag.catalystEntityMapping[y].catalystEntityId; - catalystProjectName = projectTag.catalystEntityMapping[y].catalystEntityName; - break; + if(projectTag !== null && projectTag.name in instance.tags) { + for (var y = 0; y < projectTag.catalystEntityMapping.length; y++) { + if (projectTag.catalystEntityMapping[y].tagValue !== '' && instance.tags[projectTag.name] !== '' && + projectTag.catalystEntityMapping[y].tagValue === instance.tags[projectTag.name]) { + catalystProjectId = projectTag.catalystEntityMapping[y].catalystEntityId; + catalystProjectName = projectTag.catalystEntityMapping[y].catalystEntityName; + break; + } } } - for (var y = 0; y < environmentTag.catalystEntityMapping.length; y++) { - if (environmentTag.catalystEntityMapping[y].tagValue !== '' && instance.tags[environmentTag.name] !== '' && - environmentTag.catalystEntityMapping[y].tagValue === instance.tags[environmentTag.name]) { - catalystEnvironmentId = environmentTag.catalystEntityMapping[y].catalystEntityId; - catalystEnvironmentName = environmentTag.catalystEntityMapping[y].catalystEntityName; - break; + if(environmentTag !== null && environmentTag.name in instance.tags) { + for (var y = 0; y < environmentTag.catalystEntityMapping.length; y++) { + if (environmentTag.catalystEntityMapping[y].tagValue !== '' && instance.tags[environmentTag.name] !== '' && + environmentTag.catalystEntityMapping[y].tagValue === instance.tags[environmentTag.name]) { + catalystEnvironmentId = environmentTag.catalystEntityMapping[y].catalystEntityId; + catalystEnvironmentName = environmentTag.catalystEntityMapping[y].catalystEntityName; + break; + } } } - if (catalystBgId || catalystProjectId || catalystEnvironmentId) { + if (catalystBgId !== null || catalystProjectId !== null || catalystEnvironmentId !== null) { assignmentFound = true; } if (assignmentFound === true) { @@ -277,9 +282,9 @@ function tagMappingForInstances(instances,provider,next){ ip: instance.ip, os: instance.os, state: instance.state, - subnetId: instance.SubnetId, - vpcId: instance.VpcId, - privateIpAddress: instance.PrivateIpAddress, + subnetId: instance.subnetId, + vpcId: instance.vpcId, + privateIpAddress: instance.privateIpAddress, tags: instance.tags, } assignedInstanceList.push(assignedInstanceObj); From a79dec5f5249e5b4b47288d4fc056aeb51df9108 Mon Sep 17 00:00:00 2001 From: srikanthv02 Date: Fri, 16 Sep 2016 17:04:53 +0530 Subject: [PATCH 13/24] Y label added for CPU utilization and alert removed --- client/htmls/public/js/dashboard.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/htmls/public/js/dashboard.js b/client/htmls/public/js/dashboard.js index ae27f9fa1..ea03f3268 100644 --- a/client/htmls/public/js/dashboard.js +++ b/client/htmls/public/js/dashboard.js @@ -567,7 +567,7 @@ $(document).ready(function () { data: data.CPUUtilization.dataPoints, xkey: 'toTime', ykeys: ['average'], - yLabelFormat: function (y) { return y.toFixed(2); }, + yLabelFormat: function (y) { return y.toFixed(2)+data.CPUUtilization.symbol; }, dateFormat: function (x) { return new Date(x).toString(); }, labels: ['Utilization'], lineColors: ['#3c8dbc'], From 890fc7ab78324f974d01c4ce2e0c3bdb440df547 Mon Sep 17 00:00:00 2001 From: Karthik K N Date: Fri, 16 Sep 2016 17:15:45 +0530 Subject: [PATCH 14/24] CPU utilization usage metric symbol updated --- server/install.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/install.js b/server/install.js index 370278b28..867d3b355 100755 --- a/server/install.js +++ b/server/install.js @@ -200,7 +200,7 @@ function getDefaultsConfig() { }, cwMetricsDisplayUnits: { - CPUUtilization: 'Percent', + CPUUtilization: '%', DiskReadOps: 'Count', DiskWriteOps: 'Count', DiskReadBytes: 'MB', From bf400eb9ed67149caa774786bea08f6df03fcc59 Mon Sep 17 00:00:00 2001 From: Durgesh1988 Date: Fri, 16 Sep 2016 18:07:28 +0530 Subject: [PATCH 15/24] CAT-2332/CAT-2341 fixed --- .../private/ajax/Settings/providerSync.html | 34 +++++++++---------- client/htmls/public/js/awsCapacity.js | 18 +++++----- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/client/htmls/private/ajax/Settings/providerSync.html b/client/htmls/private/ajax/Settings/providerSync.html index fd25800de..145a830a4 100644 --- a/client/htmls/private/ajax/Settings/providerSync.html +++ b/client/htmls/private/ajax/Settings/providerSync.html @@ -783,10 +783,10 @@

Importing Instances

{"data": "instanceIP","orderable" : true, "render":function(data, type, full, meta) { if(full.instanceIP === null){ - if(full.privateIpAddress === null){ - return '-'; - }else{ + if(full.privateIpAddress && full.privateIpAddress !== null){ return full.privateIpAddress; + }else{ + return '-'; } }else{ return full.instanceIP; @@ -1055,11 +1055,11 @@

Importing Instances

var catalystEntityProjName = $('#projectnameLabelId').attr('catalystEntitytype'); var catalystEntityEnvName = $('#envnameLabelId').attr('catalystEntitytype'); var catalystEntityBgName = $('#bgNameLabelId').attr('catalystEntitytype'); - if(tagsListSelected.length > 0){ + /*if(tagsListSelected.length > 0){ $('.btnprojectMappingSave').attr('disabled',false); }else{ $('.btnprojectMappingSave').attr('disabled',true); - } + }*/ for(var i=0;iImporting Instances

$bgtagsList.val(objtagName); } if(objcatalystEntityType == catalystEntityProjName){ - $('.btnprojectMappingSave').attr('disabled',false); + //$('.btnprojectMappingSave').attr('disabled',false); $projecttagsList.val(objtagName); //For Mapping tab..... //For project catalystEntityType @@ -1108,7 +1108,7 @@

Importing Instances

} } }else{ - $('.btnprojectMappingSave').attr('disabled',true); + //$('.btnprojectMappingSave').attr('disabled',true); } //For environment catalystEntityType if(objcatalystEntityType == catalystEntityEnvName){ @@ -1250,7 +1250,7 @@

Importing Instances

$.get('/providers/'+urlproviderId+'/tag-mappings/environment', function(data) { if(data){ - $('.btnenvMappingSave').attr('disabled',false); + // $('.btnenvMappingSave').attr('disabled',false); var $tbody = $('#mappingenvTable tbody').empty(); for(var i = 0; i < envList.length; i++){ //For Table @@ -1283,7 +1283,7 @@

Importing Instances

} } }).fail(function(jxhr) { - $('.btnenvMappingSave').attr('disabled',true); + // $('.btnenvMappingSave').attr('disabled',true); }); } @@ -1292,7 +1292,7 @@

Importing Instances

$.get('/providers/'+urlproviderId+'/tag-mappings/bgName', function(data) { if(data){ - $('.btnbgMappingSave').attr('disabled',false); + ///$('.btnbgMappingSave').attr('disabled',false); var $tbody = $('#mappingBgTable tbody').empty(); for(var i = 0; i < bgList.length; i++){ //For Table @@ -1325,7 +1325,7 @@

Importing Instances

} } }).fail(function(jxhr) { - $('.btnbgMappingSave').attr('disabled',true); + /// $('.btnbgMappingSave').attr('disabled',true); }); } $('.btnbgMappingSave').on('click',function(){ @@ -1767,10 +1767,10 @@

Importing Instances

{"data": "","orderable" : true, "render":function(data, type, full, meta) { if(full.ip === null){ - if(full.privateIpAddress === null){ - return '-'; - }else{ + if(full.privateIpAddress && full.privateIpAddress !== null){ return full.privateIpAddress; + }else{ + return '-'; } }else{ return full.ip; @@ -1944,10 +1944,10 @@

Importing Instances

{"data": "","orderable" : true, "render":function(data, type, full, meta) { if(full.ip === null){ - if(full.privateIpAddress === null){ - return '-'; - }else{ + if(full.privateIpAddress && full.privateIpAddress !== null){ return full.privateIpAddress; + }else{ + return '-'; } }else{ return full.ip; diff --git a/client/htmls/public/js/awsCapacity.js b/client/htmls/public/js/awsCapacity.js index 1a78e9422..4397b0852 100644 --- a/client/htmls/public/js/awsCapacity.js +++ b/client/htmls/public/js/awsCapacity.js @@ -268,10 +268,10 @@ $(document).ready(function() { "orderable": true, "render":function(data, type, full, meta) { if(full.instanceIP === null){ - if(full.privateIpAddress === null){ - return '-'; - }else{ + if(full.privateIpAddress && full.privateIpAddress !== null){ return full.privateIpAddress; + }else{ + return '-'; } }else{ return full.instanceIP; @@ -325,10 +325,10 @@ $(document).ready(function() { "orderable": true, "render": function(data, type, full,meta) { if(full.ip === null){ - if(full.privateIpAddress === null){ - return '-'; - }else{ + if(full.privateIpAddress && full.privateIpAddress !== null){ return full.privateIpAddress; + }else{ + return '-'; } }else{ return full.ip; @@ -402,10 +402,10 @@ $(document).ready(function() { "orderable": true, "render":function(data, type, full, meta) { if(full.ip === null){ - if(full.privateIpAddress === null){ - return '-'; - }else{ + if(full.privateIpAddress && full.privateIpAddress !== null){ return full.privateIpAddress; + }else{ + return '-'; } }else{ return full.ip; From 2fadd6f1c3dbd25c7177316e632ec58b0076dcb7 Mon Sep 17 00:00:00 2001 From: Durgesh1988 Date: Fri, 16 Sep 2016 18:12:04 +0530 Subject: [PATCH 16/24] CAT-2332/CAT-2341 fixed --- client/htmls/private/ajax/Settings/providerSync.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/client/htmls/private/ajax/Settings/providerSync.html b/client/htmls/private/ajax/Settings/providerSync.html index 145a830a4..4644195ef 100644 --- a/client/htmls/private/ajax/Settings/providerSync.html +++ b/client/htmls/private/ajax/Settings/providerSync.html @@ -1107,9 +1107,9 @@

Importing Instances

} } } - }else{ - //$('.btnprojectMappingSave').attr('disabled',true); - } + }/*else{ + $('.btnprojectMappingSave').attr('disabled',true); + }*/ //For environment catalystEntityType if(objcatalystEntityType == catalystEntityEnvName){ $envtagsList.val(objtagName); From 65a9303d8eb7b9e34cf5b0c7ea86cf017d66ce8f Mon Sep 17 00:00:00 2001 From: Durgesh1988 Date: Sun, 18 Sep 2016 10:46:27 +0530 Subject: [PATCH 17/24] Setting Wizard Implementation --- .../private/ajax/Settings/Dashboard.html | 340 ++++++++++-------- .../htmls/private/ajax/Settings/bgWizard.html | 152 ++++++++ .../ajax/Settings/configManagementWizard.html | 287 +++++++++++++++ .../private/ajax/Settings/envWizard.html | 235 ++++++++++++ .../private/ajax/Settings/settingsWizard.html | 201 ++--------- .../model/setting-wizard/setting-wizard.js | 11 +- server/app/routes/v1.0/routes_d4dMasters.js | 14 +- .../app/routes/v1.0/routes_setting_wizard.js | 6 +- server/install.js | 11 +- 9 files changed, 914 insertions(+), 343 deletions(-) create mode 100644 client/htmls/private/ajax/Settings/bgWizard.html create mode 100644 client/htmls/private/ajax/Settings/configManagementWizard.html create mode 100644 client/htmls/private/ajax/Settings/envWizard.html diff --git a/client/htmls/private/ajax/Settings/Dashboard.html b/client/htmls/private/ajax/Settings/Dashboard.html index ce51aaae5..aae2b83b6 100755 --- a/client/htmls/private/ajax/Settings/Dashboard.html +++ b/client/htmls/private/ajax/Settings/Dashboard.html @@ -1,162 +1,196 @@
-

-
Setup & Configuration Wizard
-

-
-
-
- Start
-

Introduction

-
-
- 1
-

Org Configuration

-
-
- 2
-

Chef Configuration

-
-
- 3
-

Provider Configuration

-
-
- 4
-

Repositories

-
-
- 5
-

Security Access Control

-
-
- 6
-

Telemetry

-
-
- 7
-

CMDB Configuration

-
-
-
-
-
-
+

+
Setup & Configuration Wizard
+

+
+
+
+ Start
+

Introduction

+
+
+ 1
+

Org Configuration

+
+
+ 2
+

Config Management

+
+
+ 3
+

Provider Configuration

+
+
+ 4
+

Devops Roles

+
+
+ 6
+

Track

+
+
+ 7
+

CMDB Configuration

+
+
+
+
+
+
\ No newline at end of file diff --git a/client/htmls/private/ajax/Settings/bgWizard.html b/client/htmls/private/ajax/Settings/bgWizard.html new file mode 100644 index 000000000..e7e464658 --- /dev/null +++ b/client/htmls/private/ajax/Settings/bgWizard.html @@ -0,0 +1,152 @@ + +
+
+
+

Create Business Group

+
+
+
+
+
+
+ + +
+
+ + +
+
+
+
+
+
+
+ +
+
+ + + + \ No newline at end of file diff --git a/client/htmls/private/ajax/Settings/configManagementWizard.html b/client/htmls/private/ajax/Settings/configManagementWizard.html new file mode 100644 index 000000000..9ce54816f --- /dev/null +++ b/client/htmls/private/ajax/Settings/configManagementWizard.html @@ -0,0 +1,287 @@ + + + + +
    +
  • Chef Server
    • +
  • Environments
    • +
+ +
+
+
+
+

New Configuration Management

+
+
+
+
+
+ +
+ + +
+
+ + +
+
+
+ + +
+
+ + +
+
+ +
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+
+
+
+
+ +
+
+
+ + \ No newline at end of file diff --git a/client/htmls/private/ajax/Settings/envWizard.html b/client/htmls/private/ajax/Settings/envWizard.html new file mode 100644 index 000000000..6a4d16065 --- /dev/null +++ b/client/htmls/private/ajax/Settings/envWizard.html @@ -0,0 +1,235 @@ +
+
+
+
+

Create Environment

+
+
+
+
+
+ +
+
+ + +
+
+ + +
+
+ + Add + +
+ + +
+ +
+
+
+
+ +
+
+
+
+
+
+ +
+
+
+ + + \ No newline at end of file diff --git a/client/htmls/private/ajax/Settings/settingsWizard.html b/client/htmls/private/ajax/Settings/settingsWizard.html index 5d8340ec1..6beb5aebe 100644 --- a/client/htmls/private/ajax/Settings/settingsWizard.html +++ b/client/htmls/private/ajax/Settings/settingsWizard.html @@ -108,142 +108,44 @@
  • Create Project
    • - -
    -
    -
    -

    Create Organization

    -
    -
    -
    -
    -
    -
    -
    - - -
    -
    - - -
    -
    - +
    + +
    +
    +

    Create Organization

    +
    +
    +
    +
    +
    +
    +
    + + +
    +
    + + +
    +
    + - + - + +
    -
    - - - - - -
    -
    -
    -

    Create Business Group

    +
    +
    -
    -
    -
    -
    -
    - - -
    -
    - - -
    -
    -
    -
    -
    -
    - - - - - - - - - + +