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/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/Dashboard.html b/client/htmls/private/ajax/Settings/Dashboard.html index bcefc338e..9406e72cd 100755 --- a/client/htmls/private/ajax/Settings/Dashboard.html +++ b/client/htmls/private/ajax/Settings/Dashboard.html @@ -1,272 +1,331 @@
-

$bgtagsList.val(objtagName); } if(objcatalystEntityType == catalystEntityProjName){ + //$('.btnprojectMappingSave').attr('disabled',false); $projecttagsList.val(objtagName); //For Mapping tab..... //For project catalystEntityType $mappingprojectDatatable.clear().draw(); var $tbody = $('#mappingprojectTable tbody').empty(); - for(var j = 0; j < catalystEntityTypeListPassed.length; j++){ //For Table var $tr = $(''); @@ -1090,7 +1107,9 @@

Importing Instances

} } } - } + }/*else{ + $('.btnprojectMappingSave').attr('disabled',true); + }*/ //For environment catalystEntityType if(objcatalystEntityType == catalystEntityEnvName){ $envtagsList.val(objtagName); @@ -1098,7 +1117,6 @@

Importing Instances

} }, error: function(jxhr) { - } }); @@ -1115,9 +1133,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; } @@ -1228,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 @@ -1260,7 +1283,7 @@

Importing Instances

} } }).fail(function(jxhr) { - + // $('.btnenvMappingSave').attr('disabled',true); }); } @@ -1269,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 @@ -1301,7 +1325,7 @@

Importing Instances

} } }).fail(function(jxhr) { - + /// $('.btnbgMappingSave').attr('disabled',true); }); } $('.btnbgMappingSave').on('click',function(){ @@ -1316,7 +1340,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; @@ -1324,28 +1351,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(); + } + }); + } } }); }); @@ -1361,7 +1400,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; @@ -1370,19 +1412,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) { + } + }); + } } }); }); @@ -1400,7 +1454,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; @@ -1408,28 +1465,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(); + } + }); + } } }); }); @@ -1697,7 +1766,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 && full.privateIpAddress !== null){ + return full.privateIpAddress; + }else{ + return '-'; + } + }else{ + return full.ip; + } } }, {"data": "","orderable" : true, @@ -1866,7 +1943,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 && full.privateIpAddress !== null){ + return full.privateIpAddress; + }else{ + return '-'; + } + }else{ + return full.ip; + } } }, {"data": "state","orderable" : true }, @@ -1930,6 +2015,12 @@

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; + } if(projectTagName === '' && envTagName === '' && bgTagName ===''){ bootbox.alert("Please update tag value in any text-box corresponding to selected check-box for updating tags"); return false; @@ -1988,6 +2079,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; @@ -2044,6 +2141,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/private/ajax/Settings/providerWizard.html b/client/htmls/private/ajax/Settings/providerWizard.html index b57b9788a..399019c6b 100644 --- a/client/htmls/private/ajax/Settings/providerWizard.html +++ b/client/htmls/private/ajax/Settings/providerWizard.html @@ -102,8 +102,8 @@
@@ -372,6 +372,14 @@

Create Providers