diff options
| author |   Anjali Walsatwar <anjali.walsatwar@huawei.com> | 2018-04-11 07:58:25 +0530 |
|---|---|---|
| committer | Anjali Walsatwar <anjali.walsatwar@huawei.com> | 2018-04-11 07:58:25 +0530 |
| commit | b932a9d99ed92e0dd016b3b7652a4cec8e742337 (patch) | |
| tree | 2371c4ae9754962450fb4dc7d9dfd39ca58df324 /vnfmarket | |
| parent | 23c4a2268728595acbfbe9bf14d695391a4b4a14 (diff) | |
code needs to be formatted
code needs to be formatted
Issue-ID: VNFSDK-245
Change-Id: I09e450ca7e66fda29634c66c24fc9a282eb04ed2
Signed-off-by: Anjali Walsatwar <anjali.walsatwar@huawei.com>
Diffstat (limited to 'vnfmarket')
13 files changed, 284 insertions, 273 deletions
diff --git a/vnfmarket/src/main/webapp/vnfmarket/app/modules/home/serviceUpload/onboarding/functionalTest/functionalTestCtrl.js b/vnfmarket/src/main/webapp/vnfmarket/app/modules/home/serviceUpload/onboarding/functionalTest/functionalTestCtrl.js index a9d12db3..709ceb2c 100644 --- a/vnfmarket/src/main/webapp/vnfmarket/app/modules/home/serviceUpload/onboarding/functionalTest/functionalTestCtrl.js +++ b/vnfmarket/src/main/webapp/vnfmarket/app/modules/home/serviceUpload/onboarding/functionalTest/functionalTestCtrl.js @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and
* limitations under the License.
*/
-(function() {
+(function () {
'use strict';
/**
@@ -24,11 +24,9 @@ * Controller of the app
*/
- angular
- .module('vnfmarket')
- .controller('functionalTestOnboardingCtrl', functionalTest);
+ angular.module('vnfmarket').controller('functionalTestOnboardingCtrl', functionalTest);
- functionalTest.$inject = [ 'vnfConfig', 'baseUrlConfig', '$mdDialog', 'functionalTestService', '$stateParams'];
+ functionalTest.$inject = ['vnfConfig', 'baseUrlConfig', '$mdDialog', 'functionalTestService', '$stateParams'];
/*
* recommend
@@ -36,9 +34,9 @@ * and bindable members up top.
*/
- function functionalTest(vnfConfig, baseUrlConfig, $mdDialog, functionalTestService,$stateParams) {
+ function functionalTest(vnfConfig, baseUrlConfig, $mdDialog, functionalTestService, $stateParams) {
var vm = this;
- vm.csarId = $stateParams.csarId;
+ vm.csarId = $stateParams.csarId;
console.log("functionalTest")
vm.filter = {
"search": '',
@@ -51,7 +49,7 @@ vm.pagination = [5, 10, 15, {
label: 'All',
- value: function() {
+ value: function () {
return vm.validations.length ? vm.validations.length : 0;
}
}];
@@ -73,26 +71,26 @@ limitSelect: true,
pageSelect: true
};
- vm.getvalidations = function(){
+ vm.getvalidations = function () {
console.log(vm.functionalTests)
}
-
-
- vm.hide = function(answer) {
+
+
+ vm.hide = function (answer) {
$mdDialog.hide(answer);
};
-
-
- vm.getFunctionTestDetails = function() {
- functionalTestService.getFunctionTestDetails(vm.csarId).then(function(response){
- vm.validations = response.data;
- })
- }
-
- vm.getFunctionTestDetails();
-
- vm.cancel = function() {
+
+
+ vm.getFunctionTestDetails = function () {
+ functionalTestService.getFunctionTestDetails(vm.csarId).then(function (response) {
+ vm.validations = response.data;
+ })
+ }
+
+ vm.getFunctionTestDetails();
+
+ vm.cancel = function () {
$mdDialog.cancel();
};
}
diff --git a/vnfmarket/src/main/webapp/vnfmarket/app/modules/home/serviceUpload/onboarding/functionalTest/view.html b/vnfmarket/src/main/webapp/vnfmarket/app/modules/home/serviceUpload/onboarding/functionalTest/view.html index 7a626ff6..b251f2ab 100644 --- a/vnfmarket/src/main/webapp/vnfmarket/app/modules/home/serviceUpload/onboarding/functionalTest/view.html +++ b/vnfmarket/src/main/webapp/vnfmarket/app/modules/home/serviceUpload/onboarding/functionalTest/view.html @@ -4,24 +4,24 @@ <h2>{{'common.tabs.functionTest.title' | translate}}</h2>
<span flex></span>
<button class="btnTransparency" ng-click="vm.cancel()">
- <i class="fa fa-close fa-sm" aria-hidden="true"></i>
+ <i class="fa fa-close fa-sm" aria-hidden="true"></i>
</button>
</div>
</md-toolbar>
<br>
<div>
- <!-- <img src="../../../../../common/images/floating-layer-function.png">-->
+ <!-- <img src="../../../../../common/images/floating-layer-function.png">-->
<img src="/onapui/vnfmarket/common/images/floating_layer_function.png" width="100%" height="40%">
</div>
<br>
-<md-card flex="100" class="nomargin md-padding">
+ <md-card flex="100" class="nomargin md-padding">
<md-table-container>
<table md-table>
<thead md-head md-order="vm.filter.name" md-on-reorder="vm.getValidations">
<tr md-row>
- <th md-column class="fontSize" md-order-by="testCase">
+ <th md-column class="fontSize" md-order-by="testCase">
<md-tooltip md-direction="top">{{'common.tabs.functionTest.testTHead' | translate}} </md-tooltip>
{{'common.tabs.functionTest.testTHead' | translate}}
</th>
@@ -29,15 +29,15 @@ <md-tooltip md-direction="top">{{'common.tabs.functionTest.descTHead' | translate}} </md-tooltip>
{{'common.tabs.functionTest.descTHead' | translate}}
</th>
- <th md-column class="fontSize" md-order-by="testResult">
+ <th md-column class="fontSize" md-order-by="testResult">
<md-tooltip md-direction="top">{{'common.tabs.functionTest.resultTHead' | translate}} </md-tooltip>
{{'common.tabs.functionTest.resultTHead' | translate}}
</th>
-
+
</tr>
</thead>
<tbody md-body>
- <tr md-row ng-repeat="validation in vm.validations | orderBy: vm.filter.name |
+ <tr md-row ng-repeat="validation in vm.validations | orderBy: vm.filter.name |
limitTo: vm.paginationQuery.limit: (vm.paginationQuery.page - 1) * vm.paginationQuery.limit track by $index">
<td md-cell class="">
<md-tooltip md-direction="top">{{validation.name}}</md-tooltip>{{validation.name}}
@@ -49,11 +49,13 @@ <td md-cell class="">
<md-tooltip md-direction="top">{{validation.status}}</md-tooltip>{{validation.status}}
</td>
-
+
</tr>
</tbody>
</table>
</md-table-container>
- <md-table-pagination class="pagination-class" md-limit="vm.paginationQuery.limit" md-limit-options="vm.pagination" md-page="vm.paginationQuery.page" md-total="{{vm.validations.length}}" md-page-select="vm.paginationOptions.pageSelect" md-boundary-links="vm.paginationOptions.boundaryLink" md-label="{ page : 'Page', RowPerPage:'row per page', of:'of'}"></md-table-pagination>
-</md-card>
+ <md-table-pagination class="pagination-class" md-limit="vm.paginationQuery.limit" md-limit-options="vm.pagination" md-page="vm.paginationQuery.page"
+ md-total="{{vm.validations.length}}" md-page-select="vm.paginationOptions.pageSelect" md-boundary-links="vm.paginationOptions.boundaryLink"
+ md-label="{ page : 'Page', RowPerPage:'row per page', of:'of'}"></md-table-pagination>
+ </md-card>
</md-dialog>
\ No newline at end of file diff --git a/vnfmarket/src/main/webapp/vnfmarket/app/modules/home/serviceUpload/onboarding/lifeCycle/lifeCycleCtrl.js b/vnfmarket/src/main/webapp/vnfmarket/app/modules/home/serviceUpload/onboarding/lifeCycle/lifeCycleCtrl.js index 60f9e3fd..715ca31b 100644 --- a/vnfmarket/src/main/webapp/vnfmarket/app/modules/home/serviceUpload/onboarding/lifeCycle/lifeCycleCtrl.js +++ b/vnfmarket/src/main/webapp/vnfmarket/app/modules/home/serviceUpload/onboarding/lifeCycle/lifeCycleCtrl.js @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and
* limitations under the License.
*/
-(function() {
+(function () {
'use strict';
/**
@@ -28,7 +28,7 @@ .module('vnfmarket')
.controller('lifeCycleOnboardingCtrl', lifeCycle);
- lifeCycle.$inject = [ 'vnfConfig', 'baseUrlConfig', '$mdDialog'];
+ lifeCycle.$inject = ['vnfConfig', 'baseUrlConfig', '$mdDialog'];
/*
* recommend
@@ -36,7 +36,7 @@ * and bindable members up top.
*/
- function lifeCycle(vnfConfig, baseUrlConfig,$mdDialog) {
+ function lifeCycle(vnfConfig, baseUrlConfig, $mdDialog) {
var vm = this;
console.log("functionalTest")
vm.filter = {
@@ -50,7 +50,7 @@ vm.pagination = [5, 10, 15, {
label: 'All',
- value: function() {
+ value: function () {
return vm.lifeCycleTests.length ? vm.lifeCycleTests.length : 0;
}
}];
@@ -72,32 +72,32 @@ limitSelect: true,
pageSelect: true
};
- vm.getTests = function(){
+ vm.getTests = function () {
console.log(vm.lifeCycleTests)
}
-
-
- vm.hide = function(answer) {
+
+
+ vm.hide = function (answer) {
$mdDialog.hide(answer);
};
- vm.cancel = function() {
+ vm.cancel = function () {
$mdDialog.cancel();
};
- vm.lifeCycleTests = [{
- "step" : "Lifecycle step-1",
- "parameter" : "Lifecycle Parameter1",
- "result" : "pass"
- },
- {
- "step" : "Lifecycle step-2",
- "parameter" : "Lifecycle Parameter2",
- "result" : "pass"
- },{
- "step" : "Lifecycle step-3",
- "parameter" : "Parameter3",
- "result" : "pass"
- }]
+ vm.lifeCycleTests = [{
+ "step": "Lifecycle step-1",
+ "parameter": "Lifecycle Parameter1",
+ "result": "pass"
+ },
+ {
+ "step": "Lifecycle step-2",
+ "parameter": "Lifecycle Parameter2",
+ "result": "pass"
+ }, {
+ "step": "Lifecycle step-3",
+ "parameter": "Parameter3",
+ "result": "pass"
+ }]
}
})();
\ No newline at end of file diff --git a/vnfmarket/src/main/webapp/vnfmarket/app/modules/home/serviceUpload/onboarding/lifeCycle/view.html b/vnfmarket/src/main/webapp/vnfmarket/app/modules/home/serviceUpload/onboarding/lifeCycle/view.html index e74436f3..692e78e5 100644 --- a/vnfmarket/src/main/webapp/vnfmarket/app/modules/home/serviceUpload/onboarding/lifeCycle/view.html +++ b/vnfmarket/src/main/webapp/vnfmarket/app/modules/home/serviceUpload/onboarding/lifeCycle/view.html @@ -4,48 +4,50 @@ <h2>{{'common.tabs.lifeCycle.title' | translate}}</h2>
<span flex></span>
<button class="btnTransparency" ng-click="vm.cancel()">
- <i class="fa fa-close fa-sm" aria-hidden="true"></i>
+ <i class="fa fa-close fa-sm" aria-hidden="true"></i>
</button>
</div>
</md-toolbar>
-
-<md-card flex="100" class="nomargin md-padding">
+
+ <md-card flex="100" class="nomargin md-padding">
<md-table-container>
<table md-table>
<thead md-head md-order="vm.filter.name" md-on-reorder="vm.getTests">
<tr md-row>
- <th md-column class="fontSize" md-order-by="step">
- <md-tooltip md-direction="top">{{'common.tabs.lifeCycle.stepTHead' | translate}}</md-tooltip>
+ <th md-column class="fontSize" md-order-by="step">
+ <md-tooltip md-direction="top">{{'common.tabs.lifeCycle.stepTHead' | translate}}</md-tooltip>
{{'common.tabs.lifeCycle.stepTHead' | translate}}
</th>
- <th md-column class="fontSize" md-order-by="parameter">
- <md-tooltip md-direction="top">{{'common.tabs.lifeCycle.ParamTHead' | translate}}</md-tooltip>
+ <th md-column class="fontSize" md-order-by="parameter">
+ <md-tooltip md-direction="top">{{'common.tabs.lifeCycle.ParamTHead' | translate}}</md-tooltip>
{{'common.tabs.lifeCycle.ParamTHead' | translate}}
</th>
- <th md-column class="fontSize" md-order-by="result">
- <md-tooltip md-direction="top">{{'common.tabs.lifeCycle.ResultTHead' | translate}}</md-tooltip>
+ <th md-column class="fontSize" md-order-by="result">
+ <md-tooltip md-direction="top">{{'common.tabs.lifeCycle.ResultTHead' | translate}}</md-tooltip>
{{'common.tabs.lifeCycle.ResultTHead' | translate}}
</th>
-
+
</tr>
</thead>
<tbody md-body>
<tr md-row md-select="dessert" md-select-id="name" md-auto-select ng-repeat="test in vm.lifeCycleTests | orderBy: vm.filter.name |
limitTo: vm.paginationQuery.limit: (vm.paginationQuery.page - 1) * vm.paginationQuery.limit track by $index">
<td md-cell>
- <md-tooltip md-direction="top">{{test.step}}</md-tooltip>{{test.step}}
+ <md-tooltip md-direction="top">{{test.step}}</md-tooltip>{{test.step}}
</td>
<td md-cell>
- <md-tooltip md-direction="top">{{test.parameter}}</md-tooltip>{{test.parameter}}
+ <md-tooltip md-direction="top">{{test.parameter}}</md-tooltip>{{test.parameter}}
</td>
<td md-cell>
- <md-tooltip md-direction="top">{{test.result}}</md-tooltip>{{test.result}}
+ <md-tooltip md-direction="top">{{test.result}}</md-tooltip>{{test.result}}
</td>
-
+
</tr>
</tbody>
</table>
</md-table-container>
- <md-table-pagination class="pagination-class" md-limit="vm.paginationQuery.limit" md-limit-options="vm.pagination" md-page="vm.paginationQuery.page" md-total="{{vm.lifeCycleTests.length}}" md-page-select="vm.paginationOptions.pageSelect" md-boundary-links="vm.paginationOptions.boundaryLink" md-label="{ page : 'Page', RowPerPage:'row per page', of:'of'}"></md-table-pagination>
-</md-card>
+ <md-table-pagination class="pagination-class" md-limit="vm.paginationQuery.limit" md-limit-options="vm.pagination" md-page="vm.paginationQuery.page"
+ md-total="{{vm.lifeCycleTests.length}}" md-page-select="vm.paginationOptions.pageSelect" md-boundary-links="vm.paginationOptions.boundaryLink"
+ md-label="{ page : 'Page', RowPerPage:'row per page', of:'of'}"></md-table-pagination>
+ </md-card>
</md-dialog>
\ No newline at end of file diff --git a/vnfmarket/src/main/webapp/vnfmarket/app/modules/home/serviceUpload/onboarding/onBoardingService.js b/vnfmarket/src/main/webapp/vnfmarket/app/modules/home/serviceUpload/onboarding/onBoardingService.js index b73cd5a7..abc788c3 100644 --- a/vnfmarket/src/main/webapp/vnfmarket/app/modules/home/serviceUpload/onboarding/onBoardingService.js +++ b/vnfmarket/src/main/webapp/vnfmarket/app/modules/home/serviceUpload/onboarding/onBoardingService.js @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -(function() { +(function () { 'use strict'; /** @@ -40,8 +40,8 @@ method = vnfConfig.api.home.getFunctionalList.method; url = url.replace(":csarId", csarId); - url += "?operTypeId="+operTypeId; - url += "&operId="+operId; + url += "?operTypeId=" + operTypeId; + url += "&operId=" + operId; /*var response = @@ -73,9 +73,9 @@ //defer.resolve(response); httpService.apiRequest(url, method) - .then(function(response) { + .then(function (response) { defer.resolve(response); - }, function(error) { + }, function (error) { defer.reject(error); }); return defer.promise; @@ -144,9 +144,9 @@ httpService.apiRequest(url, method) - .then(function(response) { + .then(function (response) { defer.resolve(response); - }, function(error) { + }, function (error) { defer.reject(error); }); return defer.promise; diff --git a/vnfmarket/src/main/webapp/vnfmarket/app/modules/home/serviceUpload/onboarding/onboarding.html b/vnfmarket/src/main/webapp/vnfmarket/app/modules/home/serviceUpload/onboarding/onboarding.html index 57e65451..040b2e45 100644 --- a/vnfmarket/src/main/webapp/vnfmarket/app/modules/home/serviceUpload/onboarding/onboarding.html +++ b/vnfmarket/src/main/webapp/vnfmarket/app/modules/home/serviceUpload/onboarding/onboarding.html @@ -7,7 +7,9 @@ <div class="layout-row onboardProgress">
<div class="flex-100 progress1">
<div class="progressDiv"></div>
- <div class="roundProg"><span>1</span></div>
+ <div class="roundProg">
+ <span>1</span>
+ </div>
</div>
<!-- <div class="flex-33 progress2">
<div class="progressDiv"></div>
@@ -23,7 +25,7 @@ <div class="onbdContent">
<div class="onboarddiv">
<div class="btnOuter">
- <div class="onboardBtn btnImage1" type="button" aria-label="Eat cake" ng-click="vm.displayValidationDialog()">
+ <div class="onboardBtn btnImage1" type="button" aria-label="Eat cake" ng-click="vm.displayValidationDialog()">
</div>
</div>
diff --git a/vnfmarket/src/main/webapp/vnfmarket/app/modules/home/serviceUpload/onboarding/onboarding.js b/vnfmarket/src/main/webapp/vnfmarket/app/modules/home/serviceUpload/onboarding/onboarding.js index c2c735be..e9803480 100644 --- a/vnfmarket/src/main/webapp/vnfmarket/app/modules/home/serviceUpload/onboarding/onboarding.js +++ b/vnfmarket/src/main/webapp/vnfmarket/app/modules/home/serviceUpload/onboarding/onboarding.js @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and
* limitations under the License.
*/
-(function() {
+(function () {
'use strict';
/**
@@ -28,7 +28,7 @@ .module('vnfmarket')
.controller('onBoardingCtrl', onBoarding);
- onBoarding.$inject = [ 'vnfConfig', 'baseUrlConfig', '$interval', '$timeout', '$state', '$mdDialog', '$stateParams', 'onBoardingService'];
+ onBoarding.$inject = ['vnfConfig', 'baseUrlConfig', '$interval', '$timeout', '$state', '$mdDialog', '$stateParams', 'onBoardingService'];
/*
* recommend
@@ -50,36 +50,36 @@ $(".onboardProgress .progress3 .progressDiv").removeClass("progressed");
$(".onboardProgress .progress3 .roundProg").removeClass("progressed");
- var fileName = $stateParams.csarName
-
- vm.mainTitle = fileName.slice(0, fileName.lastIndexOf("."));
+ var fileName = $stateParams.csarName
+
+ vm.mainTitle = fileName.slice(0, fileName.lastIndexOf("."));
//vm.mainTitle = $stateParams.csarName;//"clearwater_ns";
var csarId = $stateParams.csarId;
- if(!csarId) {
+ if (!csarId) {
$state.go("home.marketplace", {});
- return;
+ return;
}
/*onBoardingService.getFunctionalList(csarId).then(function(response) {
vm.functionalDataList = response.data;
});*/
- vm.getIconClass = function(status) {
+ vm.getIconClass = function (status) {
var classIcon = "";
- if(status == undefined || status == 1) {
+ if (status == undefined || status == 1) {
//classIcon = "fa fa-clock-o";
classIcon = "clock-icon";
}
- else if(status == 2) {
+ else if (status == 2) {
//classIcon = "fa fa-spinner fa-spin";
classIcon = "progress-icon fa-spin";
}
- else if(status == 0) {
+ else if (status == 0) {
//classIcon = "fa fa-check-circle";
classIcon = "success-icon";
}
- else if(status == -1) {
+ else if (status == -1) {
classIcon = "failed-icon fa fa-exclamation";
}
return classIcon;
@@ -90,11 +90,11 @@ vm.functional = [];
var currentIteration = {};
- onBoardingService.getOnBoardingSteps().then(function(response) {
+ onBoardingService.getOnBoardingSteps().then(function (response) {
var operTypeList = response.data.operTypeList;
- for(var i = 0; i < operTypeList.length; i++) {
-
+ for (var i = 0; i < operTypeList.length; i++) {
+
switch (operTypeList[i].operTypeId) {
case "validation":
vm.validation = operTypeList[i];
@@ -110,13 +110,13 @@ break;
}
}
- currentIteration = {"list":vm.validation, "item":0};
+ currentIteration = { "list": vm.validation, "item": 0 };
updateStepStatus();
});
function addDefaultStatus(listArr) {
- for(var index = 0; index < listArr.oper.length; index++) {
+ for (var index = 0; index < listArr.oper.length; index++) {
listArr.oper[index].status = 1;
}
}
@@ -132,7 +132,7 @@ var operTypeId = currentIteration.list["operTypeId"];
var operId = currentIteration.list.oper[currentIteration.item].operId;
- if(operTypeId == "validation" || operTypeId == "lifecycletest") {
+ if (operTypeId == "validation" || operTypeId == "lifecycletest") {
updateView(0);
}
else {
@@ -150,15 +150,15 @@ function updateView(stepStatus) {
var listIterFinished = false;
- if(stepStatus == 0) {
+ if (stepStatus == 0) {
currentIteration.list.oper[currentIteration.item].status = stepStatus;
//Success, go to next step
- if(currentIteration.list.oper.length - 1 > currentIteration.item) {
+ if (currentIteration.list.oper.length - 1 > currentIteration.item) {
currentIteration.item++;
}
else {
//Choose next list
- if(currentIteration.list == vm.validation){
+ if (currentIteration.list == vm.validation) {
//First list is completed
$(".onboardProgress .progress1 .progressDiv").addClass("progressed");
$(".onboardProgress .progress1 .roundProg").addClass("progressed");
@@ -166,7 +166,7 @@ currentIteration.item = 0*/
listIterFinished = true;
- $state.go('home.onboardingSuccess', {"csarId": csarId});
+ $state.go('home.onboardingSuccess', { "csarId": csarId });
}
/*else if(currentIteration.list == vm.lifeCycle){
//Second list is completed
@@ -185,55 +185,55 @@ }*/
}
}
- else if(stepStatus == -1) {
+ else if (stepStatus == -1) {
//Failed case
currentIteration.list.oper[currentIteration.item].status = stepStatus;
listIterFinished = true;
}
- if(!listIterFinished) {
+ if (!listIterFinished) {
updateStepStatus();
}
}
- vm.displayValidationDialog = function(){
- $mdDialog.show({
- controller: 'validationOnboardingCtrl',
- templateUrl: vnfConfig.modulePath.home + '/serviceUpload/onboarding/validation/view.html',
- controllerAs: 'vm'
- })
- .then(function(answer) {
- vm.getFeatureList();
- // vm.status = 'You said the information was "' + answer + '".';
- }, function() {
- // vm.status = 'You cancelled the dialog.';
- });
- }
- vm.displayLifecycleDialog = function(){
- $mdDialog.show({
- controller: 'lifeCycleOnboardingCtrl',
- templateUrl: vnfConfig.modulePath.home + '/serviceUpload/onboarding/lifeCycle/view.html',
- controllerAs: 'vm'
- })
- .then(function(answer) {
- vm.getFeatureList();
- // vm.status = 'You said the information was "' + answer + '".';
- }, function() {
- // vm.status = 'You cancelled the dialog.';
- });
- }
- vm.displayFunctionalTestDialog = function(){
- $mdDialog.show({
- controller: 'functionalTestOnboardingCtrl',
- templateUrl: vnfConfig.modulePath.home + '/serviceUpload/onboarding/functionalTest/view.html',
- controllerAs: 'vm'
- })
- .then(function(answer) {
- vm.getFeatureList();
- // vm.status = 'You said the information was "' + answer + '".';
- }, function() {
- // vm.status = 'You cancelled the dialog.';
- });
- }
+ vm.displayValidationDialog = function () {
+ $mdDialog.show({
+ controller: 'validationOnboardingCtrl',
+ templateUrl: vnfConfig.modulePath.home + '/serviceUpload/onboarding/validation/view.html',
+ controllerAs: 'vm'
+ })
+ .then(function (answer) {
+ vm.getFeatureList();
+ // vm.status = 'You said the information was "' + answer + '".';
+ }, function () {
+ // vm.status = 'You cancelled the dialog.';
+ });
+ }
+ vm.displayLifecycleDialog = function () {
+ $mdDialog.show({
+ controller: 'lifeCycleOnboardingCtrl',
+ templateUrl: vnfConfig.modulePath.home + '/serviceUpload/onboarding/lifeCycle/view.html',
+ controllerAs: 'vm'
+ })
+ .then(function (answer) {
+ vm.getFeatureList();
+ // vm.status = 'You said the information was "' + answer + '".';
+ }, function () {
+ // vm.status = 'You cancelled the dialog.';
+ });
+ }
+ vm.displayFunctionalTestDialog = function () {
+ $mdDialog.show({
+ controller: 'functionalTestOnboardingCtrl',
+ templateUrl: vnfConfig.modulePath.home + '/serviceUpload/onboarding/functionalTest/view.html',
+ controllerAs: 'vm'
+ })
+ .then(function (answer) {
+ vm.getFeatureList();
+ // vm.status = 'You said the information was "' + answer + '".';
+ }, function () {
+ // vm.status = 'You cancelled the dialog.';
+ });
+ }
}
})();
\ No newline at end of file diff --git a/vnfmarket/src/main/webapp/vnfmarket/app/modules/home/serviceUpload/onboarding/onboardingSuccess.js b/vnfmarket/src/main/webapp/vnfmarket/app/modules/home/serviceUpload/onboarding/onboardingSuccess.js index 584237fc..47414995 100644 --- a/vnfmarket/src/main/webapp/vnfmarket/app/modules/home/serviceUpload/onboarding/onboardingSuccess.js +++ b/vnfmarket/src/main/webapp/vnfmarket/app/modules/home/serviceUpload/onboarding/onboardingSuccess.js @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and
* limitations under the License.
*/
-(function() {
+(function () {
'use strict';
/**
@@ -28,7 +28,7 @@ .module('vnfmarket')
.controller('onBoardingSuccessCtrl', onBoardingSuccess);
- onBoardingSuccess.$inject = [ 'vnfConfig', 'baseUrlConfig', 'homeService', '$state', '$stateParams'];
+ onBoardingSuccess.$inject = ['vnfConfig', 'baseUrlConfig', 'homeService', '$state', '$stateParams'];
/*
* recommend
@@ -39,36 +39,36 @@ function onBoardingSuccess(vnfConfig, baseUrlConfig, homeService, $state, $stateParams) {
var vm = this;
console.log("onBoardingSuccess");
- vm.services= [], vm.serviceDetails;
+ vm.services = [], vm.serviceDetails;
var csarId = $stateParams.csarId;
- if(!csarId) {
+ if (!csarId) {
$state.go("home.marketplace", {});
- return;
+ return;
}
- vm.return = function() {
+ vm.return = function () {
$state.go('home.marketplace', {}, {
reload: true
});
}
- vm.showDetailPage = function() {
- homeService.getFeaturesList().then(function(response) {
+ vm.showDetailPage = function () {
+ homeService.getFeaturesList().then(function (response) {
for (var i = 0; i < response.data.length; i++) {
response.data[i].createTime = new Date(response.data[i].createTime);
response.data[i].modifyTime = new Date(response.data[i].modifyTime);
}
vm.services = response.data;
- for(var j = 0; j < response.data.length; j++) {
- if(response.data[j].csarId == csarId) {
+ for (var j = 0; j < response.data.length; j++) {
+ if (response.data[j].csarId == csarId) {
vm.serviceDetails = response.data[j];
break;
}
}
$state.go("home.serviceDetails.validation", {
- serviceDetails : vm.serviceDetails
+ serviceDetails: vm.serviceDetails
});
});
}
diff --git a/vnfmarket/src/main/webapp/vnfmarket/app/modules/home/serviceUpload/onboarding/validation/validationCtrl.js b/vnfmarket/src/main/webapp/vnfmarket/app/modules/home/serviceUpload/onboarding/validation/validationCtrl.js index 6eb746e2..6937239f 100644 --- a/vnfmarket/src/main/webapp/vnfmarket/app/modules/home/serviceUpload/onboarding/validation/validationCtrl.js +++ b/vnfmarket/src/main/webapp/vnfmarket/app/modules/home/serviceUpload/onboarding/validation/validationCtrl.js @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and
* limitations under the License.
*/
-(function() {
+(function () {
'use strict';
/**
@@ -28,7 +28,7 @@ .module('vnfmarket')
.controller('validationOnboardingCtrl', validation);
- validation.$inject = [ 'vnfConfig', 'baseUrlConfig', '$mdDialog'];
+ validation.$inject = ['vnfConfig', 'baseUrlConfig', '$mdDialog'];
/*
* recommend
@@ -50,7 +50,7 @@ vm.pagination = [5, 10, 15, {
label: 'All',
- value: function() {
+ value: function () {
return vm.validations.length ? vm.validations.length : 0;
}
}];
@@ -72,32 +72,32 @@ limitSelect: true,
pageSelect: true
};
- vm.getValidations = function(){
+ vm.getValidations = function () {
console.log(vm.validations)
}
-
-
- vm.hide = function(answer) {
+
+
+ vm.hide = function (answer) {
$mdDialog.hide(answer);
};
- vm.cancel = function() {
+ vm.cancel = function () {
$mdDialog.cancel();
};
- vm.validations = [{
- "step" : "Validation step-1",
- "parameter" : "Validation Parameter1",
- "result" : "pass"
- },
- {
- "step" : "Validation step-2",
- "parameter" : "Validation Parameter2",
- "result" : "pass"
- },{
- "step" : "Validation step-3",
- "parameter" : "Validation Parameter3",
- "result" : "pass"
- }];
+ vm.validations = [{
+ "step": "Validation step-1",
+ "parameter": "Validation Parameter1",
+ "result": "pass"
+ },
+ {
+ "step": "Validation step-2",
+ "parameter": "Validation Parameter2",
+ "result": "pass"
+ }, {
+ "step": "Validation step-3",
+ "parameter": "Validation Parameter3",
+ "result": "pass"
+ }];
}
})();
\ No newline at end of file diff --git a/vnfmarket/src/main/webapp/vnfmarket/app/modules/home/serviceUpload/onboarding/validation/view.html b/vnfmarket/src/main/webapp/vnfmarket/app/modules/home/serviceUpload/onboarding/validation/view.html index 0411b076..6cc2c75a 100644 --- a/vnfmarket/src/main/webapp/vnfmarket/app/modules/home/serviceUpload/onboarding/validation/view.html +++ b/vnfmarket/src/main/webapp/vnfmarket/app/modules/home/serviceUpload/onboarding/validation/view.html @@ -1,51 +1,53 @@ <md-dialog aria-label="Upload Service dialog" flex="80" id="uploadDialog" ng-cloak>
- <md-toolbar class="md-hue-3 dialogHeader">
- <div class="md-toolbar-tools">
- <h2>{{'common.tabs.validation.title' | translate}}</h2>
- <span flex></span>
- <button class="btnTransparency" ng-click="vm.cancel()">
- <i class="fa fa-close fa-sm" aria-hidden="true"></i>
- </button>
- </div>
- </md-toolbar>
+ <md-toolbar class="md-hue-3 dialogHeader">
+ <div class="md-toolbar-tools">
+ <h2>{{'common.tabs.validation.title' | translate}}</h2>
+ <span flex></span>
+ <button class="btnTransparency" ng-click="vm.cancel()">
+ <i class="fa fa-close fa-sm" aria-hidden="true"></i>
+ </button>
+ </div>
+ </md-toolbar>
<md-card flex="100" class="nomargin md-padding">
- <md-table-container>
- <table md-table>
- <thead md-head md-order="vm.filter.name" md-on-reorder="vm.getValidations">
- <tr md-row>
- <th md-column class="fontSize" md-order-by="step">
- <md-tooltip md-direction="top">{{'common.tabs.validation.stepTHead' | translate}}</md-tooltip>
- {{'common.tabs.validation.stepTHead' | translate}}
- </th>
- <th md-column class="fontSize" md-order-by="parameter">
- <md-tooltip md-direction="top">{{'common.tabs.validation.ParamTHead' | translate}}</md-tooltip>
- {{'common.tabs.validation.ParamTHead' | translate}}
- </th>
- <th md-column class="fontSize" md-order-by="result">
- <md-tooltip md-direction="top">{{'common.tabs.validation.ResultTHead' | translate}}</md-tooltip>
- {{'common.tabs.validation.ResultTHead' | translate}}
- </th>
-
- </tr>
- </thead>
- <tbody md-body>
- <tr md-row md-select="dessert" md-select-id="name" md-auto-select ng-repeat="validation in vm.validations | orderBy: vm.filter.name |
+ <md-table-container>
+ <table md-table>
+ <thead md-head md-order="vm.filter.name" md-on-reorder="vm.getValidations">
+ <tr md-row>
+ <th md-column class="fontSize" md-order-by="step">
+ <md-tooltip md-direction="top">{{'common.tabs.validation.stepTHead' | translate}}</md-tooltip>
+ {{'common.tabs.validation.stepTHead' | translate}}
+ </th>
+ <th md-column class="fontSize" md-order-by="parameter">
+ <md-tooltip md-direction="top">{{'common.tabs.validation.ParamTHead' | translate}}</md-tooltip>
+ {{'common.tabs.validation.ParamTHead' | translate}}
+ </th>
+ <th md-column class="fontSize" md-order-by="result">
+ <md-tooltip md-direction="top">{{'common.tabs.validation.ResultTHead' | translate}}</md-tooltip>
+ {{'common.tabs.validation.ResultTHead' | translate}}
+ </th>
+
+ </tr>
+ </thead>
+ <tbody md-body>
+ <tr md-row md-select="dessert" md-select-id="name" md-auto-select ng-repeat="validation in vm.validations | orderBy: vm.filter.name |
limitTo: vm.paginationQuery.limit: (vm.paginationQuery.page - 1) * vm.paginationQuery.limit track by $index">
- <td md-cell>
- <md-tooltip md-direction="top">{{validation.step}}</md-tooltip>{{validation.step}}
- </td>
- <td md-cell>
- <md-tooltip md-direction="top">{{validation.parameter}}</md-tooltip>{{validation.parameter}}
- </td>
- <td md-cell>
- <md-tooltip md-direction="top">{{validation.result}}</md-tooltip>{{validation.result}}
- </td>
-
- </tr>
- </tbody>
- </table>
- </md-table-container>
- <md-table-pagination class="pagination-class" md-limit="vm.paginationQuery.limit" md-limit-options="vm.pagination" md-page="vm.paginationQuery.page" md-total="{{vm.validations.length}}" md-page-select="vm.paginationOptions.pageSelect" md-boundary-links="vm.paginationOptions.boundaryLink" md-label="{ page : 'Page', RowPerPage:'row per page', of:'of'}"></md-table-pagination>
+ <td md-cell>
+ <md-tooltip md-direction="top">{{validation.step}}</md-tooltip>{{validation.step}}
+ </td>
+ <td md-cell>
+ <md-tooltip md-direction="top">{{validation.parameter}}</md-tooltip>{{validation.parameter}}
+ </td>
+ <td md-cell>
+ <md-tooltip md-direction="top">{{validation.result}}</md-tooltip>{{validation.result}}
+ </td>
+
+ </tr>
+ </tbody>
+ </table>
+ </md-table-container>
+ <md-table-pagination class="pagination-class" md-limit="vm.paginationQuery.limit" md-limit-options="vm.pagination" md-page="vm.paginationQuery.page"
+ md-total="{{vm.validations.length}}" md-page-select="vm.paginationOptions.pageSelect" md-boundary-links="vm.paginationOptions.boundaryLink"
+ md-label="{ page : 'Page', RowPerPage:'row per page', of:'of'}"></md-table-pagination>
</md-card>
</md-dialog>
\ No newline at end of file diff --git a/vnfmarket/src/main/webapp/vnfmarket/app/modules/home/serviceUpload/serviceUpload.html b/vnfmarket/src/main/webapp/vnfmarket/app/modules/home/serviceUpload/serviceUpload.html index 2c813fb3..9c864f03 100644 --- a/vnfmarket/src/main/webapp/vnfmarket/app/modules/home/serviceUpload/serviceUpload.html +++ b/vnfmarket/src/main/webapp/vnfmarket/app/modules/home/serviceUpload/serviceUpload.html @@ -17,11 +17,11 @@ <md-toolbar class="md-hue-3 dialogHeader">
<div class="md-toolbar-tools" id="uploadStyle">
- <h2 ng-if="vm.isUpload" >{{'module.marketplace.serviceUpload.title' | translate}}</h2>
- <h2 ng-if="!vm.isUpload" >{{'module.marketplace.serviceUpload.updateTitle' | translate}}</h2>
+ <h2 ng-if="vm.isUpload">{{'module.marketplace.serviceUpload.title' | translate}}</h2>
+ <h2 ng-if="!vm.isUpload">{{'module.marketplace.serviceUpload.updateTitle' | translate}}</h2>
<span flex></span>
<button class="btnTransparency" ng-click="vm.cancel()" ng-hide="vm.status == 'progress'">
- <i class="fa fa-close fa-sm" aria-hidden="true"></i>
+ <i class="fa fa-close fa-sm" aria-hidden="true"></i>
</button>
</div>
</md-toolbar>
@@ -35,7 +35,7 @@ <label for="file" class="btn btnDefault"> {{'common.actions.add' | translate}} </label>
<label>
<span ng-if="!vm.service.file"> {{'module.marketplace.serviceUpload.fields.fileUpload.noFileSelected' | translate}}</span>
- <span ng-if="vm.service.file"> {{ vm.service.file.name}}</span>
+ <span ng-if="vm.service.file"> {{ vm.service.file.name}}</span>
</label>
</div>
<input class="hidden" id="file" type="file" file-upload="vm.service.file" md-asterisk accept=".csar">
@@ -43,18 +43,18 @@ </div>
<div>
- <label for="shortDesc" class="labels">{{'module.marketplace.serviceUpload.fields.shortDescription.placeholder' | translate}}</label>
- <input ng-model="vm.service.shortDesc" type="text" id="shortDesc" name="shortDesc">
+ <label for="shortDesc" class="labels">{{'module.marketplace.serviceUpload.fields.shortDescription.placeholder' | translate}}</label>
+ <input ng-model="vm.service.shortDesc" type="text" id="shortDesc" name="shortDesc">
</div>
<div>
-
- <label class="labels">{{'module.marketplace.serviceUpload.fields.details.placeholder' | translate}}</label>
- <textarea name="details" ng-model="vm.service.details" maxlength="150" rows="3" md-select-on-focus></textarea>
+
+ <label class="labels">{{'module.marketplace.serviceUpload.fields.details.placeholder' | translate}}</label>
+ <textarea name="details" ng-model="vm.service.details" maxlength="150" rows="3" md-select-on-focus></textarea>
</div>
<div>
-
- <label for="remarks" class="labels">{{'module.marketplace.serviceUpload.fields.remarks.placeholder' | translate}}</label>
- <input ng-model="vm.service.remarks" type="text" id="remarks" name="remarks">
+
+ <label for="remarks" class="labels">{{'module.marketplace.serviceUpload.fields.remarks.placeholder' | translate}}</label>
+ <input ng-model="vm.service.remarks" type="text" id="remarks" name="remarks">
</div>
</div>
</md-dialog-content>
@@ -76,7 +76,10 @@ </div>
<md-progress-linear md-mode="determinate" value="{{vm.apiInfo}}"></md-progress-linear>
<h4 class="text-center"> {{vm.apiInfo}} % </h4>
- <span class="text-center" ng-if="vm.status == 'success'">{{'module.marketplace.serviceUpload.fields.funcTestReport.label' | translate}} <a href="{{vm.funcTestReportUrl}}" target="_blank">{{'common.actions.clickHere' | translate}}</a></span>
+ <span class="text-center" ng-if="vm.status == 'success'">{{'module.marketplace.serviceUpload.fields.funcTestReport.label' | translate}}
+ <a href="{{vm.funcTestReportUrl}}"
+ target="_blank">{{'common.actions.clickHere' | translate}}</a>
+ </span>
</div>
<div flex="25" layout="column">
</div>
@@ -88,19 +91,21 @@ <md-dialog-actions layout="row" ng-show="vm.status == 'Idle'" class="marginAuto">
<!-- <span flex></span> -->
-
- <button ng-if="!vm.isUpload" class="md-raised btn btnPrimary btnPrimaryPadding btnSpacing" ng-click="vm.answer('Uploaded')" ng-disabled="!vm.service.file">
+
+ <button ng-if="!vm.isUpload" class="md-raised btn btnPrimary btnPrimaryPadding btnSpacing" ng-click="vm.answer('Uploaded')"
+ ng-disabled="!vm.service.file">
{{'common.actions.update' | translate}}
</button>
-
- <button ng-if="vm.isUpload" class="md-raised btn btnPrimary btnPrimaryPadding btnSpacing" ng-click="vm.answer('Uploaded')" ng-disabled="!vm.service.file">
+
+ <button ng-if="vm.isUpload" class="md-raised btn btnPrimary btnPrimaryPadding btnSpacing" ng-click="vm.answer('Uploaded')"
+ ng-disabled="!vm.service.file">
{{'common.actions.upload' | translate}}
</button>
<button class="md-raised btn btnDefault btnPrimaryPadding btnSpacing" ng-click="vm.cancel()">
{{'common.actions.close' | translate}}
</button>
-
+
</md-dialog-actions>
<md-dialog-actions class="marginAuto" layout="row" ng-show="vm.status == 'success'">
diff --git a/vnfmarket/src/main/webapp/vnfmarket/app/modules/home/serviceUpload/serviceUploadCtrl.js b/vnfmarket/src/main/webapp/vnfmarket/app/modules/home/serviceUpload/serviceUploadCtrl.js index 7a2fdaaa..6d141ce1 100644 --- a/vnfmarket/src/main/webapp/vnfmarket/app/modules/home/serviceUpload/serviceUploadCtrl.js +++ b/vnfmarket/src/main/webapp/vnfmarket/app/modules/home/serviceUpload/serviceUploadCtrl.js @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and
* limitations under the License.
*/
-(function() {
+(function () {
'use strict';
/**
@@ -36,24 +36,24 @@ * and bindable members up top.
*/
- function ServiceUpload(serviceUploadService, $scope, vnfConfig, $mdDialog, $mdToast, $rootScope, $interval, baseUrlConfig,$state, isUpload, csarId) {
+ function ServiceUpload(serviceUploadService, $scope, vnfConfig, $mdDialog, $mdToast, $rootScope, $interval, baseUrlConfig, $state, isUpload, csarId) {
var vm = this;
- vm.isUpload = isUpload;
- vm.csarId = csarId
+ vm.isUpload = isUpload;
+ vm.csarId = csarId
vm.apiInfo = 0;
vm.status = "Idle";
vm.promise = null;
vm.service = {};
- vm.hide = function(answer) {
+ vm.hide = function (answer) {
$mdDialog.hide(answer);
};
- vm.cancel = function() {
+ vm.cancel = function () {
$mdDialog.cancel();
};
- vm.answer = function(answer) {
+ vm.answer = function (answer) {
vm.status = "progress";
var dataObj = vm.service,
file = vm.service.file,
@@ -70,31 +70,31 @@ "Content-Type": undefined
}
- vm.promise = $interval(function() {
+ vm.promise = $interval(function () {
if ($rootScope.progressBar >= 80 && vm.status !== "success") {
vm.apiInfo = 80;
} else {
vm.apiInfo = parseInt($rootScope.progressBar, 10);
}
}, 500);
-
- if(vm.isUpload){
- var filename = vm.service.file.name;
- serviceUploadService.postServiceUpload(fd, headers)
- .then(function(response) {
- vm.hide("Uploading")
- $state.go('home.onboarding', {"csarId": response.data.csarId, "csarName": filename});
- });
- } else {
- serviceUploadService.repostServiceUpload(fd, headers, vm.csarId)
- .then(function(response) {
- vm.hide("Uploading")
- $state.go('home.onboarding', {"csarId": response.data.csarId, "csarName": filename});
- });
- }
+
+ if (vm.isUpload) {
+ var filename = vm.service.file.name;
+ serviceUploadService.postServiceUpload(fd, headers)
+ .then(function (response) {
+ vm.hide("Uploading")
+ $state.go('home.onboarding', { "csarId": response.data.csarId, "csarName": filename });
+ });
+ } else {
+ serviceUploadService.repostServiceUpload(fd, headers, vm.csarId)
+ .then(function (response) {
+ vm.hide("Uploading")
+ $state.go('home.onboarding', { "csarId": response.data.csarId, "csarName": filename });
+ });
+ }
};
- $scope.$on("$destroy", function() {
+ $scope.$on("$destroy", function () {
if (vm.promise) {
$interval.cancel(vm.promise);
}
diff --git a/vnfmarket/src/main/webapp/vnfmarket/app/modules/home/serviceUpload/serviceUploadService.js b/vnfmarket/src/main/webapp/vnfmarket/app/modules/home/serviceUpload/serviceUploadService.js index a938c097..458a98b6 100644 --- a/vnfmarket/src/main/webapp/vnfmarket/app/modules/home/serviceUpload/serviceUploadService.js +++ b/vnfmarket/src/main/webapp/vnfmarket/app/modules/home/serviceUpload/serviceUploadService.js @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -(function() { +(function () { 'use strict'; /** @@ -32,7 +32,7 @@ function serviceUpload($q, vnfConfig, httpService) { return { postServiceUpload: postServiceUpload, - repostServiceUpload: repostServiceUpload + repostServiceUpload: repostServiceUpload }; function postServiceUpload(data, headers) { @@ -42,25 +42,25 @@ var defer = $q.defer() httpService.apiRequestWithProgress(url, method, apiData, headers) - .then(function(response) { + .then(function (response) { defer.resolve(response); - }, function(error) { + }, function (error) { defer.reject(error); }); return defer.promise; } - - function repostServiceUpload(data, headers, csarId) { + + function repostServiceUpload(data, headers, csarId) { var url = vnfConfig.api.home.repostServiceUpload.url, method = vnfConfig.api.home.repostServiceUpload.method, apiData = data; - url = url.replace(":csarId", csarId) + url = url.replace(":csarId", csarId) var defer = $q.defer() httpService.apiRequestWithProgress(url, method, apiData, headers) - .then(function(response) { + .then(function (response) { defer.resolve(response); - }, function(error) { + }, function (error) { defer.reject(error); }); return defer.promise; |