Skip to content

CAT-2338/CAT-2339/CAT-2340 Fixed #723

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 16, 2016
Merged

CAT-2338/CAT-2339/CAT-2340 Fixed #723

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3906c8c
CAT-2338/CAT-2339/CAT-2340 Fixed
Durgesh1988 Sep 16, 2016
3a14587
CAT-2338/CAT-2339/CAT-2340 Fixed
Durgesh1988 Sep 16, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
196 changes: 132 additions & 64 deletions client/htmls/private/ajax/Settings/providerSync.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1071,7 +1071,6 @@ <h4 class="modal-title">Importing Instances</h4>
//For project catalystEntityType
$mappingprojectDatatable.clear().draw();
var $tbody = $('#mappingprojectTable tbody').empty();

for(var j = 0; j < catalystEntityTypeListPassed.length; j++){
//For Table
var $tr = $('<tr id="'+catalystEntityTypeListPassed[j].rowid+'" class=""></tr>');
Expand Down Expand Up @@ -1102,6 +1101,8 @@ <h4 class="modal-title">Importing Instances</h4>
}
}
}
}else{
$('.btnprojectMappingSave').attr('disabled',true);
}
//For environment catalystEntityType
if(objcatalystEntityType == catalystEntityEnvName){
Expand All @@ -1110,7 +1111,6 @@ <h4 class="modal-title">Importing Instances</h4>
}
},
error: function(jxhr) {

}
});

Expand All @@ -1127,9 +1127,13 @@ <h4 class="modal-title">Importing Instances</h4>
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;
}
Expand Down Expand Up @@ -1272,7 +1276,7 @@ <h4 class="modal-title">Importing Instances</h4>
}
}
}).fail(function(jxhr) {

$('.btnenvMappingSave').attr('disabled',true);
});
}

Expand Down Expand Up @@ -1313,7 +1317,7 @@ <h4 class="modal-title">Importing Instances</h4>
}
}
}).fail(function(jxhr) {

$('.btnbgMappingSave').attr('disabled',true);
});
}
$('.btnbgMappingSave').on('click',function(){
Expand All @@ -1328,36 +1332,51 @@ <h4 class="modal-title">Importing Instances</h4>
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;
objbgMapping["tagValue"] = mappingbgSelectTagName;

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();
}
});
}
}
});
});
Expand All @@ -1373,7 +1392,10 @@ <h4 class="modal-title">Importing Instances</h4>
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;
Expand All @@ -1382,19 +1404,31 @@ <h4 class="modal-title">Importing Instances</h4>
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) {
}
});
}
}
});
});
Expand All @@ -1412,36 +1446,51 @@ <h4 class="modal-title">Importing Instances</h4>
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;
objenvMapping["tagValue"] = mappingenvSelectTagName;

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();
}
});
}
}
});
});
Expand Down Expand Up @@ -1958,6 +2007,13 @@ <h4 class="modal-title">Importing Instances</h4>
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;
Expand Down Expand Up @@ -2016,6 +2072,12 @@ <h4 class="modal-title">Importing Instances</h4>
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;
Expand Down Expand Up @@ -2072,6 +2134,12 @@ <h4 class="modal-title">Importing Instances</h4>
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;
Expand Down
Loading