From f838c6d854344477fc4b1dd9a2bb9895a3bc492e Mon Sep 17 00:00:00 2001 From: srikanthv02 Date: Wed, 28 Sep 2016 17:46:13 +0530 Subject: [PATCH 1/2] Bugs for setting wizard resolved --- .../private/ajax/Settings/Dashboard.html | 30 +++++---- .../htmls/private/ajax/Settings/bgWizard.html | 26 +++++--- .../ajax/Settings/configManagementWizard.html | 65 +++++++++++-------- .../ajax/Settings/devopsRolesWizard.html | 6 +- .../private/ajax/Settings/dockerWizard.html | 2 +- .../private/ajax/Settings/envWizard.html | 12 +++- .../private/ajax/Settings/galleryWizard.html | 8 ++- .../private/ajax/Settings/jenkinsWizard.html | 4 +- .../private/ajax/Settings/projWizard.html | 16 +++-- .../private/ajax/Settings/providerWizard.html | 23 +++++-- .../private/ajax/Settings/scriptWizard.html | 10 +-- .../ajax/Settings/serviceCommandWizard.html | 13 ++-- .../private/ajax/Settings/settingsWizard.html | 19 ++++-- .../private/ajax/Settings/teamWizard.html | 2 +- .../private/ajax/Settings/vmImageWizard.html | 16 ++++- client/htmls/private/css/wizardBg.css | 3 + client/htmls/private/js/settingscommon.js | 1 + 17 files changed, 174 insertions(+), 82 deletions(-) diff --git a/client/htmls/private/ajax/Settings/Dashboard.html b/client/htmls/private/ajax/Settings/Dashboard.html index e497e6d46..ac3775927 100755 --- a/client/htmls/private/ajax/Settings/Dashboard.html +++ b/client/htmls/private/ajax/Settings/Dashboard.html @@ -102,6 +102,7 @@
$('.btn-1 a').click(function(e) { e.preventDefault(); if($(this).attr('href')){ + clearActiveClasses(); $(this).addClass('wizardActiveBtn').attr('href'); $(this).removeClass('process-btn'); $('.contentSetting').load(this.getAttribute('href')); @@ -118,28 +119,30 @@
//on click of new button to create a new wizard.. $('#createNew').click(function(e) { + clearActiveClasses(); $('#orgDropdown option:selected').val(''); $('.providerSelect').addClass('hidden'); $('#cancelWizard').removeClass('hidden'); $('#createNew').addClass('hidden'); - clearActiveClasses(); $('#startConfig a').addClass('green-btn').removeClass('process-btn'); $('#orgConfiguration a').addClass('wizardActiveBtn').removeClass('process-btn'); $('#orgConfiguration a').trigger('click'); }); $('#orgConfiguration a').trigger('click'); +var firstOrgValue; $.get('/d4dMasters/readmasterjsonnew/1', function(data) { $("#orgDropdown").empty(); for (var i = 0; i < data.length; i++) { + firstOrgValue = data[0].rowid var $option = $('').val(data[i].rowid).attr('rowid', data[i].orgname).html(data[i].orgname); $('#orgDropdown').append($option); } $('#orgDropdown').change(function(e) { - e.preventDefault(); $('#wizardActionListLoader').show(); clearActiveClasses(); orgIdForSetup = $("#orgDropdown").val(); changeWizardStatus(orgIdForSetup); + e.preventDefault(); $('#wizardActionListLoader').hide(); }); $("#orgDropdown").trigger("change"); @@ -148,7 +151,7 @@
$('#cancelWizard').addClass('hidden'); $('.providerSelect').removeClass('hidden'); $('#createNew').removeClass('hidden'); - $('#orgConfiguration a').trigger('click'); + changeWizardStatus(firstOrgValue); }); }); var selectedDropdownValue, lastDropdownValue; @@ -170,7 +173,6 @@
}); $('#providerConfiguration a').click(function(e) { - selectedDropdownValue = $('#orgDropdown option:selected').val(); orgForBg = $('#orgDropdown option:selected').text(); }); @@ -183,33 +185,39 @@
$('#wizardActionListLoader').hide(); } else { var isCompleted = data.previousStep.isCompleted; - if (isCompleted = 'true') { + if (isCompleted === true) { if (data.previousStep.name === 'Introduction') { + $('#orgConfiguration a').attr('href','ajax/Settings/settingsWizard.html'); + $('#orgConfiguration a').trigger('click'); $('#startConfig a').addClass('green-btn').removeClass('process-btn'); $('#orgConfiguration a').addClass('wizardActiveBtn').removeClass('process-btn'); - $('#orgConfiguration a').trigger('click'); $('#configManagement a,#providerConfiguration a,#galleryConfiguration a,#devopsConfiguration a,#cmdbConfiguration a').removeAttr('href'); } else if (data.previousStep.name === 'Org Configuration') { + $('#configManagement a').attr('href','ajax/Settings/configManagementWizard.html'); + $('#configManagement a').trigger('click'); $('.providerSelect').removeClass('hidden'); $('#startConfig a, #orgConfiguration a').addClass('green-btn').removeClass('process-btn'); - $('#configManagement a').trigger('click'); $('#providerConfiguration a,#galleryConfiguration a,#devopsConfiguration a,#cmdbConfiguration a').removeAttr('href'); toastr.error('Please Configure Teams to Navigate to Workzone'); } else if (data.previousStep.name === 'Config Management') { + $('#providerConfiguration a').attr('href','ajax/Settings/providerWizard.html'); + $('#providerConfiguration a').trigger('click'); $('#galleryConfiguration a,#devopsConfiguration a,#cmdbConfiguration a').removeAttr('href'); $('#startConfig a,#orgConfiguration a,#configManagement a').removeClass('wizardActiveBtn process-btn').addClass('green-btn'); - $('#providerConfiguration a').trigger('click'); } else if (data.previousStep.name === 'Provider Configuration') { + $('#galleryConfiguration a').attr('href','ajax/Settings/galleryWizard.html'); + $('#galleryConfiguration a').trigger('click'); $('#devopsConfiguration a,#cmdbConfiguration a').removeAttr('href'); $('#startConfig a, #orgConfiguration a,#configManagement a,#providerConfiguration a').removeClass('wizardActiveBtn process-btn').addClass('green-btn'); - $('#galleryConfiguration a').trigger('click'); } else if (data.previousStep.name === 'Gallery Setup') { - $('#startConfig a, #orgConfiguration a,#configManagement a,#providerConfiguration a,#galleryConfiguration a').removeClass('wizardActiveBtn process-btn').addClass('green-btn'); + $('#devopsConfiguration a').attr('href','ajax/Settings/devopsRolesWizard.html'); $('#devopsConfiguration a').trigger('click'); + $('#startConfig a, #orgConfiguration a,#configManagement a,#providerConfiguration a,#galleryConfiguration a').removeClass('wizardActiveBtn process-btn').addClass('green-btn'); $('#cmdbConfiguration a').removeAttr('href'); } else if (data.previousStep.name === 'Devops Roles') { - $('#startConfig a, #orgConfiguration a,#configManagement a, #providerConfiguration a,#galleryConfiguration a,#devopsConfiguration a').removeClass('wizardActiveBtn process-btn').addClass('green-btn'); + $('#cmdbConfiguration a').attr('href','ajax/Settings/cmdbWizard.html'); $('#cmdbConfiguration a').trigger('click'); + $('#startConfig a, #orgConfiguration a,#configManagement a, #providerConfiguration a,#galleryConfiguration a,#devopsConfiguration a').removeClass('wizardActiveBtn process-btn').addClass('green-btn'); } } } diff --git a/client/htmls/private/ajax/Settings/bgWizard.html b/client/htmls/private/ajax/Settings/bgWizard.html index 163580448..0c3225a4c 100644 --- a/client/htmls/private/ajax/Settings/bgWizard.html +++ b/client/htmls/private/ajax/Settings/bgWizard.html @@ -1,16 +1,21 @@
-

Create Business Group

+

Create Business Group + +
+  Add New BG +
+ +

- - -
+ +
@@ -55,6 +59,8 @@

Create Business Group

}); } + enableUniqueCheckingForInputs(2); + $('#myForm2').submit(function() { if ($(this).valid) { if (!saveform('2')) @@ -65,13 +71,17 @@

Create Business Group

} return false; // for demo }); - + var bgCreateClick = false; $('#createNewBG').click(function(e){ e.preventDefault(); - $('.content').load(this.getAttribute('href')); + if(!bgCreateClick){ + bgCreateClick =true; + $('.content').load(this.getAttribute('href')); + } }); $(".nextFormWizard").click(function() { + getProjValues(); $('.contentSetting').find('ol li#bgCreate').removeClass('active').addClass('green-btn'); $('.contentSetting').find('ol li#projectCreate').addClass('active'); $('.content').load("ajax/Settings/projWizard.html"); diff --git a/client/htmls/private/ajax/Settings/configManagementWizard.html b/client/htmls/private/ajax/Settings/configManagementWizard.html index 747dfc3b7..d19de1aa6 100644 --- a/client/htmls/private/ajax/Settings/configManagementWizard.html +++ b/client/htmls/private/ajax/Settings/configManagementWizard.html @@ -7,7 +7,7 @@

New Configuration Management

-
+
@@ -83,7 +83,7 @@

New Configuration Management

- +
@@ -103,7 +103,7 @@

New Configuration Management

$(this).next().next().val($(this).val()); }); } - $(document).ready(function(e) { + //api call for getting the status of wizard var wizardStepsConfig = $('
  1. 1Create Chef Server
  2. 2Create Environment
  3. 3Create Team
'); $('.wizardFlow').append(wizardStepsConfig); @@ -120,9 +120,12 @@

New Configuration Management

bindChange_importPemFile(); var $pemFileLocation = $('#frmconfigmanagement'); $pemFileLocation.find('input.pemFile').val(data[i].userpemfile_filename); + $('input#userpemfile').attr('disabled','disabled'); + $('input#kniferbfile').attr('disabled','disabled'); var $knifeFileLocation = $('#knifeFile'); - $knifeFileLocation.find('input.knifeFile').val(data[i].kniferbfile_filename); + $knifeFileLocation.find('input.knifeFile').attr('disabled','disabled').val(data[i].kniferbfile_filename); $('.btn-2 a').parent('.bwizard-steps li').removeClass('active').addClass('green-btn'); + $('#saveConfigWizard').addClass('hidden'); } } }); @@ -139,6 +142,8 @@

New Configuration Management

$('#myForm1').find('select#environmentname').remove(); $('#myForm1').find('input#environmentName').removeClass('hidden').val(data[i].environmentname).attr('disabled','disabled'); $('.btn-3 a').parent('.bwizard-steps li').removeClass('active').addClass('green-btn'); + $('#myForm1').find('button#saveConfigEnv').addClass('hidden'); + $('.nextFormWizard').removeAttr('disabled'); } } }); @@ -152,7 +157,9 @@

New Configuration Management

$('#myForm3').find('select#orgname').append($optionOrgNameEnv).attr('disabled', 'disabled'); $('#myForm3').find('input#teamname').val(data[i].teamname).attr('disabled', 'disabled'); $('#myForm3').find('input#description').val(data[i].description).attr('disabled', 'disabled'); - $('.btn-3 a').parent('.bwizard-steps li').removeClass('active').addClass('green-btn'); + $('.btn-4 a').parent('.bwizard-steps li').removeClass('active').addClass('green-btn'); + $('#myForm3').find('button#saveConfigTeam').addClass('hidden'); + $('.nextFormWizard').removeAttr('disabled'); } } }); @@ -163,35 +170,31 @@

New Configuration Management

clicked = false; $('.contentSetting').load(this.getAttribute('href')); }); - var clickEnv = false; $('.envCreate a').click(function(e) { - e.preventDefault(); - if(!clickEnv){ - clickEnv = true; - getEnvValues(); - $('.btn-2 a').parent('.bwizard-steps li').removeClass('active'); - $(this).parent('.bwizard-steps li').addClass('active'); - $('.content').load(this.getAttribute('href')); - } + e.preventDefault(); + $('.content').empty(); + getEnvValues(); + $('.btn-2 a').parent('.bwizard-steps li').removeClass('active'); + $(this).parent('.bwizard-steps li').addClass('active'); + $('.content').load(this.getAttribute('href')); }); - var clickTeam = false; + $('.btn-4 a').click(function(e) { e.preventDefault(); - if(!clickTeam){ - clickTeam = true - getTeamValues(); - $('.btn-2 a').parent('.bwizard-steps li').removeClass('active'); - $(this).parent('.bwizard-steps li').addClass('active'); - $('.content').load(this.getAttribute('href')); - } + $('.content').empty(); + getTeamValues(); + $('.btn-2 a').parent('.bwizard-steps li').removeClass('active'); + $(this).parent('.bwizard-steps li').addClass('active'); + $('.content').load(this.getAttribute('href')); }); + orgIdForSetup = selectedDropdownValue; if (clicked) { - $.get('/setting-wizard/org/' + orgIdForSetup, function(data) { + if(orgIdForSetup){ + $.get('/setting-wizard/org/' + orgIdForSetup, function(data) { if (data.currentStep.name === 'Config Management') { if (data.currentStep.nestedSteps) { var nestedSteps = data.currentStep.nestedSteps; if (nestedSteps[0].name === 'ChefServer' && nestedSteps[0].isCompleted === true && nestedSteps[1].name === 'Environment' && nestedSteps[1].isCompleted === false && nestedSteps[2].name === 'Teams' && nestedSteps[2].isCompleted === false) { - $('.btn-2 a').parent('.bwizard-steps li').removeClass('active').addClass('green-btn'); $('.contentSetting').find('ol li#envCreate').addClass('active'); $('.content').load('ajax/Settings/envWizard.html'); @@ -205,21 +208,26 @@

New Configuration Management

} } else { getConfigValues(); + $('#saveConfigWizard').addClass('hidden'); + $('.nextFormWizard').removeAttr('disabled'); + $('.btn-3 a').removeClass('not-activeAnchor'); + $('.btn-4 a').removeClass('not-activeAnchor'); $('.btn-2 a').parent('.bwizard-steps li').removeClass('active').addClass('green-btn'); $('.btn-3 a').parent('.bwizard-steps li').removeClass('active').addClass('green-btn'); $('.btn-4 a').parent('.bwizard-steps li').removeClass('active').addClass('green-btn'); } }); + } } else { //comes when the chefServer is created and navigates back to it. $('.btn-3 a').removeClass('not-activeAnchor'); $('.btn-4 a').removeClass('not-activeAnchor'); + $('.btn-5 a').removeClass('not-activeAnchor'); getConfigValues(); - getEnvValues(); } $('#wizardActionListLoader').hide(); - }); + function setfolderpath() { var folderpath = '/' + $('#loginname').val() + "/.chef/"; @@ -235,8 +243,13 @@

New Configuration Management

}); $(".nextFormWizard").click(function() { + + $('.content').empty(); $('.btn-2 a').parent('.bwizard-steps li').removeClass('active').addClass('green-btn'); $('.contentSetting').find('ol li#envCreate').addClass('active'); $('.content').load('ajax/Settings/envWizard.html'); + getEnvValues(); }); + + \ No newline at end of file diff --git a/client/htmls/private/ajax/Settings/devopsRolesWizard.html b/client/htmls/private/ajax/Settings/devopsRolesWizard.html index b72fbeda9..ca01bfab0 100644 --- a/client/htmls/private/ajax/Settings/devopsRolesWizard.html +++ b/client/htmls/private/ajax/Settings/devopsRolesWizard.html @@ -200,15 +200,17 @@

$('.contentSetting').load(this.getAttribute('href')); }); $('.btn-3 a').click(function(e) { + e.preventDefault(); + $('.content').empty(); $('.btn-2 a,.btn-4 a').parent('.bwizard-steps li').removeClass('active'); $(this).parent('.bwizard-steps li').addClass('active'); - e.preventDefault(); $('.content').load(this.getAttribute('href')); }); $('.btn-4 a').click(function(e) { + e.preventDefault(); + $('.content').empty(); $('.btn-2 a,.btn-3 a').parent('.bwizard-steps li').removeClass('active'); $(this).parent('.bwizard-steps li').addClass('active'); - e.preventDefault(); $('.content').load(this.getAttribute('href')); }); diff --git a/client/htmls/private/ajax/Settings/dockerWizard.html b/client/htmls/private/ajax/Settings/dockerWizard.html index e7e646dee..f73ca6a1b 100644 --- a/client/htmls/private/ajax/Settings/dockerWizard.html +++ b/client/htmls/private/ajax/Settings/dockerWizard.html @@ -13,7 +13,7 @@

Create Docker

diff --git a/client/htmls/private/ajax/Settings/envWizard.html b/client/htmls/private/ajax/Settings/envWizard.html index 9bfa0e299..7d4641c35 100644 --- a/client/htmls/private/ajax/Settings/envWizard.html +++ b/client/htmls/private/ajax/Settings/envWizard.html @@ -2,7 +2,13 @@
-

Create Environment

+

Create Environment + +
+  Add New Env +
+ +

@@ -59,7 +65,6 @@

Create Environment

-  Add Another
@@ -244,7 +249,8 @@

Add a Chef Environment

}); $(".nextFormWizard").click(function() { $('.content').empty(); - clickTeam = false; + clickTeam = false; + getTeamValues(); $('.btn-3 a').parent('.bwizard-steps li').removeClass('active').addClass('green-btn'); $('.contentSetting').find('ol li#teamCreate').addClass('active'); $('.content').load('ajax/Settings/teamWizard.html'); diff --git a/client/htmls/private/ajax/Settings/galleryWizard.html b/client/htmls/private/ajax/Settings/galleryWizard.html index 1f7487c18..215b727f4 100644 --- a/client/htmls/private/ajax/Settings/galleryWizard.html +++ b/client/htmls/private/ajax/Settings/galleryWizard.html @@ -143,15 +143,17 @@

Create Templates

$('.contentSetting').load(this.getAttribute('href')); }); $('.btn-3 a').click(function(e) { + e.preventDefault(); + $('.content').empty(); $('.btn-2 a').parent('.bwizard-steps li').removeClass('active') $(this).parent('.bwizard-steps li').addClass('active'); - e.preventDefault(); $('.content').load(this.getAttribute('href')); }); $('.btn-4 a').click(function(e) { + e.preventDefault(); + $('.content').empty(); $('.btn-2 a,.btn-3 a').parent('.bwizard-steps li').removeClass('active'); $(this).parent('.bwizard-steps li').addClass('active'); - e.preventDefault(); $('.content').load(this.getAttribute('href')); }); @@ -190,7 +192,7 @@

Create Templates

}); $('#wizardActionListLoader').hide(); } else { - getTemplateValues(); + //getTemplateValues(); $('.btn-2 a').parent('.bwizard-steps li').removeClass('active').addClass('green-btn'); } }); diff --git a/client/htmls/private/ajax/Settings/jenkinsWizard.html b/client/htmls/private/ajax/Settings/jenkinsWizard.html index 425be5ecd..9e9212359 100644 --- a/client/htmls/private/ajax/Settings/jenkinsWizard.html +++ b/client/htmls/private/ajax/Settings/jenkinsWizard.html @@ -13,7 +13,7 @@

Create Jenkins

@@ -50,7 +50,7 @@

Create Jenkins

\ No newline at end of file diff --git a/client/htmls/private/ajax/Settings/serviceCommandWizard.html b/client/htmls/private/ajax/Settings/serviceCommandWizard.html index 80e192ff5..614761943 100644 --- a/client/htmls/private/ajax/Settings/serviceCommandWizard.html +++ b/client/htmls/private/ajax/Settings/serviceCommandWizard.html @@ -13,7 +13,6 @@

Create Services

@@ -163,10 +162,13 @@

Create Services

\ No newline at end of file diff --git a/client/htmls/private/ajax/Settings/teamWizard.html b/client/htmls/private/ajax/Settings/teamWizard.html index addb82cf8..0add8e2ae 100644 --- a/client/htmls/private/ajax/Settings/teamWizard.html +++ b/client/htmls/private/ajax/Settings/teamWizard.html @@ -50,7 +50,7 @@

Create Team

- +
diff --git a/client/htmls/private/ajax/Settings/vmImageWizard.html b/client/htmls/private/ajax/Settings/vmImageWizard.html index ee2b5989e..83d9d710d 100644 --- a/client/htmls/private/ajax/Settings/vmImageWizard.html +++ b/client/htmls/private/ajax/Settings/vmImageWizard.html @@ -2,7 +2,13 @@
-

Create VmImages

+

Create VMImages + +
+  Add New VmImage +
+ +

@@ -57,7 +63,7 @@

Create VmImages

- +
@@ -172,6 +178,7 @@

Create VmImages

$('#btncancel').click(); } removeLoader(); + $('#saveImageWizard').attr('disabled',true); $('.nextFormWizard').removeAttr('disabled','disabled'); } else { removeLoader(); @@ -241,6 +248,11 @@

Create VmImages

populateOSList(); }); + $('#createNewVmImage').click(function(e){ + $('.content').empty(); + e.preventDefault(); + $('.content').load(this.getAttribute('href')); + }); $(".nextFormWizard").click(function() { $('#galleryConfiguration a').attr('href','ajax/Settings/galleryWizard.html'); diff --git a/client/htmls/private/css/wizardBg.css b/client/htmls/private/css/wizardBg.css index 27058a040..0b81c0ef4 100644 --- a/client/htmls/private/css/wizardBg.css +++ b/client/htmls/private/css/wizardBg.css @@ -4,6 +4,9 @@ Version: 2.0.0 Author: Sean Ngu Website: http://www.seantheme.com/color-admin-v2.0/admin/html/ */ +.wizardAdd { + margin-top: -10px; +} .bwizard-steps { font-size: 14px!important; border-radius: 3px!important; diff --git a/client/htmls/private/js/settingscommon.js b/client/htmls/private/js/settingscommon.js index 41de6af31..4733d2514 100755 --- a/client/htmls/private/js/settingscommon.js +++ b/client/htmls/private/js/settingscommon.js @@ -2442,6 +2442,7 @@ function saveform(formID, operationTypes) { button.removeAttr("rowid", ""); $("#masterssavespinner").detach(); button.removeAttr('disabled'); + $('.saveFormWizard').attr('disabled',true); $('.nextFormWizard').removeAttr('disabled','disabled'); } else { $(".savespinner").hide(); From 3dcb89197f0a9201b92ff32ca262745948aa4cfb Mon Sep 17 00:00:00 2001 From: srikanthv02 Date: Wed, 28 Sep 2016 17:50:57 +0530 Subject: [PATCH 2/2] Resolved bug for wizard --- client/htmls/private/ajax/Settings/jenkinsWizard.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/client/htmls/private/ajax/Settings/jenkinsWizard.html b/client/htmls/private/ajax/Settings/jenkinsWizard.html index 9e9212359..01f5abddd 100644 --- a/client/htmls/private/ajax/Settings/jenkinsWizard.html +++ b/client/htmls/private/ajax/Settings/jenkinsWizard.html @@ -64,9 +64,10 @@

Create Jenkins

$(".nextFormWizard").click(function(){ + $('#cmdbConfiguration a').attr('href','ajax/Settings/cmdbWizard.html'); + $('#cmdbConfiguration a').trigger('click'); toastr.success('Step 5 - Devops Roles Configuration Completed'); $('#startConfig a, #orgConfiguration a,#configManagement a,#providerConfiguration a,#galleryConfiguration a').addClass('green-btn').removeClass('process-btn'); $('.wizardFlow').empty(); - $('#cmdbConfiguration a').trigger('click'); }); \ No newline at end of file