From 3906c8c3eabedd522879b7cc6f3d8d1b5b1c2ab4 Mon Sep 17 00:00:00 2001 From: Durgesh1988 Date: Fri, 16 Sep 2016 12:14:43 +0530 Subject: [PATCH 1/2] 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 3a1458765eb1ef02b77279fca92ca6b1fb4ba7b6 Mon Sep 17 00:00:00 2001 From: Durgesh1988 Date: Fri, 16 Sep 2016 12:34:53 +0530 Subject: [PATCH 2/2] 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(){