diff options
author | 2016-09-27 19:39:49 +0800 | |
---|---|---|
committer | 2016-09-27 19:39:49 +0800 | |
commit | 7c4514d661177fd78ed528622a9ae796ade28a5e (patch) | |
tree | a3a58c037eb205db2df85277b38b9100675fc081 /openo-portal/portal-lifecyclemgr/src/main | |
parent | b7be4ada90f9cbd9648ab888fdbb5b09766dd60e (diff) |
use jquery promise api instead of synchroize ajax invocation
Change-Id: I1a280ff520307edad2db32876aeb33c9db1629c0
Signed-off-by: Luji7 <lu.ji3@zte.com.cn>
Diffstat (limited to 'openo-portal/portal-lifecyclemgr/src/main')
-rw-r--r-- | openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/js/gsolcm.js | 103 |
1 files changed, 45 insertions, 58 deletions
diff --git a/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/js/gsolcm.js b/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/js/gsolcm.js index f0069cda..d78ef378 100644 --- a/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/js/gsolcm.js +++ b/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/js/gsolcm.js @@ -108,73 +108,61 @@ function fetchServiceTemplateBy(templateId) { } function renderTemplateParametersTab() { - templateParameters = fetchTemplateParameterDefinitions(templateParameters); - var vims = fetchVimInfo(); - var components = transfromToComponents(templateParameters.parameters, vims); - document.getElementById("parameterTab").innerHTML = components; + $.when( + fetchTemplateParameterDefinitions(templateParameters), + fetchVimInfo2() + ).then(function(templateParameterResponse, vimsInfoResponse) { + templateParameters = translateToTemplateParameters(templateParameterResponse[0].inputs); + var vims = translateToVimInfo(vimsInfoResponse[0]); + var components = transfromToComponents(templateParameters.parameters, vims); + document.getElementById("parameterTab").innerHTML = components; + }) } function fetchTemplateParameterDefinitions(parameters) { - var serviceTemplate = parameters.templateName; var currentServiceTemplate = $("#svcTempl").val(); - // Do not need to fetch template parameters if template do not change in UI. - if (serviceTemplate === currentServiceTemplate) { - return; - } - var queryParametersUri = '/openoapi/catalog/v1/servicetemplates/' + currentServiceTemplate + '/parameters'; - var inputParameters = []; - $.ajax({ + var queryParametersUri = 'http://localhost:8080/openoapi/catalog/v1/servicetemplates/' + currentServiceTemplate + '/parameters'; + return $.ajax({ type: "GET", - async: false, - url: queryParametersUri, - contentType: "application/json", - dataType: "json", - success: function (jsonResp) { - var inputs = jsonResp.inputs; - var i; - for (i = 0; i < inputs.length; i += 1) { - inputParameters[i] = { - name: inputs[i].name, - type: inputs[i].type, - description: inputs[i].description, - defaultValue: inputs[i].defaultValue, - required: inputs[i].required, - id: 'parameter_' + i, - value: inputs[i].defaultValue - }; - } - }, - error: function (xhr, ajaxOptions, thrownError) { - alert("Error on page : " + xhr.responseText); - } + url: queryParametersUri }); - return {name: currentServiceTemplate, parameters: inputParameters}; } -function fetchVimInfo() { - var result = []; - var vimQueryUri = '/openoapi/extsys/v1/vims'; - $.ajax({ +function fetchVimInfo2() { + var vimQueryUri = 'http://localhost:8080/openoapi/extsys/v1/vims'; + return $.ajax({ type: "GET", - async: false, - url: vimQueryUri, - contentType: "application/json", - dataType: "json", - success: function (jsonResp) { - var vims = jsonResp; - var i; - for (i = 0; i < vims.length; i += 1) { - var option = '<option value="' + vims[i].vimId + '">' + vims[i].name + '</option>'; - result[i] = { - vimId: vims[i].vimId, - vimName: vims[i].name - } - } - }, - error: function (xhr, ajaxOptions, thrownError) { - alert("Error on page : " + xhr.responseText); - } + url: vimQueryUri }); +} + +function translateToTemplateParameters(inputs) { + var inputParameters = []; + var i; + for (i = 0; i < inputs.length; i += 1) { + inputParameters[i] = { + name: inputs[i].name, + type: inputs[i].type, + description: inputs[i].description, + defaultValue: inputs[i].defaultValue, + required: inputs[i].required, + id: 'parameter_' + i, + value: inputs[i].defaultValue + }; + } + return {name: $("#svcTempl").val(), parameters: inputParameters}; +} + +function translateToVimInfo(vims) { + var result = []; + var i; + for (i = 0; i < vims.length; i += 1) { + var option = '<option value="' + vims[i].vimId + '">' + vims[i].name + '</option>'; + result[i] = { + vimId: vims[i].vimId, + vimName: vims[i].name + } + } return result; } @@ -214,7 +202,6 @@ function generateLocationComponent(vims) { '<select class="form-control" style ="padding-top: 0px;padding-bottom: 0px;"' + ' id="vim_location" name="vim_location">' + transformToOptions(vims) + - // '<option value="vimid">vim1 name</option>' + '</select></div></div>'; return component; } |