X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ecomp-portal-FE-common%2Fclient%2Fapp%2Fservices%2Fmicroservice%2Fmicroservice.service.js;h=393e7ccbbfda183eb8ce0811bb32e187e2fa52dc;hb=627badaf69987c01811c477219fd943757a635f5;hp=cb27cd4c9c455ea19e36e9b17d6682632a977326;hpb=ba838f2e13f1e8050c75e68bd3733d56d8f416d5;p=portal.git

diff --git a/ecomp-portal-FE-common/client/app/services/microservice/microservice.service.js b/ecomp-portal-FE-common/client/app/services/microservice/microservice.service.js
index cb27cd4c..393e7ccb 100644
--- a/ecomp-portal-FE-common/client/app/services/microservice/microservice.service.js
+++ b/ecomp-portal-FE-common/client/app/services/microservice/microservice.service.js
@@ -1,218 +1,218 @@
-/*-
- * ================================================================================
- * ECOMP Portal
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ================================================================================
- */
-'use strict';
-
-(function () {
-    class MicroserviceService {
-        constructor($q, $log, $http, conf,uuid, utilsService) {
-            this.$q = $q;
-            this.$log = $log;
-            this.$http = $http;
-            this.conf = conf;
-            this.uuid = uuid;
-            this.utilsService = utilsService;   
-        }
-        
-        createService(newService) {
-        	let deferred = this.$q.defer();
-        	this.$http({
-                method: "POST",
-                url: this.conf.api.widgetCommon,
-                data: newService,
-                cache: false,
-                headers:{
-            		'X-ECOMP-RequestID':this.uuid.generate()
-                }
-            }).then(res => {
-            	if (res == null || res.data == null) {
-        	 		this.$log.error('MicroserviceService::createService Failed: Result or result.data is null');
-                     deferred.reject("MicroserviceService::createService Failed: Result or result.data is null");
-                } else if (!this.utilsService.isValidJSON(res.data)) {
-                 	this.$log.error('MicroserviceService::createService Failed: Invalid JSON format');
-                    deferred.reject("MicroserviceService::createService Failed: Invalid JSON format");
-                } else {
-                    deferred.resolve(res.data);
-                }
-            })
-            .catch(errRes => {
-                deferred.reject(errRes);
-            });
-            return deferred.promise;
-        }
-        
-        
-        updateService(serviceId, newService) {
-        	let deferred = this.$q.defer();
-        	this.$http({
-                method: "PUT",
-                url: this.conf.api.widgetCommon + "/" + serviceId,
-                data: newService,
-                cache: false,
-                headers:{
-            		'X-ECOMP-RequestID':this.uuid.generate()
-                }
-            }).then(res => {
-            	if (res == null || res.data == null) {
-        	 		this.$log.error('MicroserviceService::updateService Failed: Result or result.data is null');
-                     deferred.reject("MicroserviceService::updateService Failed: Result or result.data is null");
-                } else if (!this.utilsService.isValidJSON(res.data)) {
-                 	this.$log.error('MicroserviceService::updateService Failed: Invalid JSON format');
-                    deferred.reject("MicroserviceService::updateService Failed: Invalid JSON format");
-                } else {
-                    deferred.resolve(res.data);
-                }
-            })
-            .catch(errRes => {
-                deferred.reject(errRes);
-            });
-            return deferred.promise;
-        }
-        
-        deleteService(serviceId) {
-        	let deferred = this.$q.defer();
-        	this.$http({
-                method: "DELETE",
-                url: this.conf.api.widgetCommon + "/" + serviceId,
-                cache: false,
-                headers:{
-            		'X-ECOMP-RequestID':this.uuid.generate()
-                }
-            }).then(res => {
-            	if (res == null || res.data == null) {
-        	 		this.$log.error('MicroserviceService::deleteService Failed: Result or result.data is null');
-                     deferred.reject("MicroserviceService::deleteService Failed: Result or result.data is null");
-                } else if (!this.utilsService.isValidJSON(res.data)) {
-                 	this.$log.error('MicroserviceService::deleteService Failed: Invalid JSON format');
-                    deferred.reject("MicroserviceService::deleteService Failed: Invalid JSON format");
-                } else {
-                    deferred.resolve(res.data);
-                }
-            })
-            .catch(errRes => {
-                deferred.reject(errRes);
-            });
-            return deferred.promise;
-        }
-        
-        getServiceList() {
-          	let deferred = this.$q.defer();
-        	this.$http({
-                method: "GET",
-                url: this.conf.api.widgetCommon,
-                cache: false,
-                headers:{
-            		'X-ECOMP-RequestID':this.uuid.generate()
-                }
-            }).then(res => {
-            	if (res == null || res.data == null) {
-        	 		this.$log.error('MicroserviceService::getServiceList Failed: Result or result.data is null');
-                     deferred.reject("MicroserviceService::getServiceList Failed: Result or result.data is null");
-                } else if (!this.utilsService.isValidJSON(res.data)) {
-                 	this.$log.error('MicroserviceService::getServiceList Failed: Invalid JSON format');
-                    deferred.reject("MicroserviceService::getServiceList Failed: Invalid JSON format");
-                }  else {
-                    deferred.resolve(res.data);
-                }
-            })
-            .catch(errRes => {
-                deferred.reject(errRes);
-            });
-            return deferred.promise;
-        }
-        
-        getWidgetListByService(serviceId) {
-          	let deferred = this.$q.defer();
-        	this.$http({
-                method: "GET",
-                url: this.conf.api.widgetCommon + '/' + serviceId,
-                cache: false,
-                headers:{
-            		'X-ECOMP-RequestID':this.uuid.generate()
-                }
-            }).then(res => {
-            	if (res == null || res.data == null) {
-        	 		this.$log.error('MicroserviceService::getWidgetListByService Failed: Result or result.data is null');
-                     deferred.reject("MicroserviceService::getWidgetListByService Failed: Result or result.data is null");
-                } else if (!this.utilsService.isValidJSON(res.data)) {
-                 	this.$log.error('MicroserviceService::getWidgetListByService Failed: Invalid JSON format');
-                    deferred.reject("MicroserviceService::getWidgetListByService Failed: Invalid JSON format");
-                } else {
-                    deferred.resolve(res.data);
-                }
-            })
-            .catch(errRes => {
-                deferred.reject(errRes);
-            });
-            return deferred.promise;
-        }
-        
-        getUserParameterById(paramId){
-        	let deferred = this.$q.defer();
-        	this.$http({
-                method: "GET",
-                url: this.conf.api.widgetCommon + '/services/' +  paramId,
-                cache: false,
-                headers:{
-            		'X-ECOMP-RequestID':this.uuid.generate()
-                }
-            }).then(res => {
-            	if (res == null || res.data == null) {
-        	 		this.$log.error('MicroserviceService::getUserParameterById Failed: Result or result.data is null');
-                     deferred.reject("MicroserviceService::getUserParameterById Failed: Result or result.data is null");
-                } else if (!this.utilsService.isValidJSON(res.data)) {
-                 	this.$log.error('MicroserviceService::getUserParameterById Failed: Invalid JSON format');
-                    deferred.reject("MicroserviceService::getUserParameterById Failed: Invalid JSON format");
-                } else {
-                    deferred.resolve(res.data);
-                }
-            })
-            .catch(errRes => {
-                deferred.reject(errRes);
-            });
-            return deferred.promise;
-        }
-        
-        deleteUserParameterById(paramId){
-        	let deferred = this.$q.defer();
-        	this.$http({
-                method: "DELETE",
-                url: this.conf.api.widgetCommon + '/services/' +  paramId,
-                cache: false,
-                headers:{
-            		'X-ECOMP-RequestID':this.uuid.generate()
-                }
-            }).then(res => {
-            	if (res == null || res.data == null) {
-        	 		this.$log.error('MicroserviceService::deleteUserParameterById Failed: Result or result.data is null');
-                     deferred.reject("MicroserviceService::deleteUserParameterById Failed: Result or result.data is null");
-                } else {
-                    deferred.resolve(res.data);
-                }
-            })
-            .catch(errRes => {
-                deferred.reject(errRes);
-            });
-            return deferred.promise;
-        }
-    }
-    
-    MicroserviceService.$inject = ['$q', '$log', '$http', 'conf','uuid4', 'utilsService'];
-    angular.module('ecompApp').service('microserviceService', MicroserviceService)
-})();
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+'use strict';
+
+(function () {
+    class MicroserviceService {
+        constructor($q, $log, $http, conf,uuid, utilsService) {
+            this.$q = $q;
+            this.$log = $log;
+            this.$http = $http;
+            this.conf = conf;
+            this.uuid = uuid;
+            this.utilsService = utilsService;   
+        }
+        
+        createService(newService) {
+        	let deferred = this.$q.defer();
+        	this.$http({
+                method: "POST",
+                url: this.conf.api.widgetCommon,
+                data: newService,
+                cache: false,
+                headers:{
+            		'X-ECOMP-RequestID':this.uuid.generate()
+                }
+            }).then(res => {
+            	if (res == null || res.data == null) {
+        	 		this.$log.error('MicroserviceService::createService Failed: Result or result.data is null');
+                     deferred.reject("MicroserviceService::createService Failed: Result or result.data is null");
+                } else if (!this.utilsService.isValidJSON(res.data)) {
+                 	this.$log.error('MicroserviceService::createService Failed: Invalid JSON format');
+                    deferred.reject("MicroserviceService::createService Failed: Invalid JSON format");
+                } else {
+                    deferred.resolve(res.data);
+                }
+            })
+            .catch(errRes => {
+                deferred.reject(errRes);
+            });
+            return deferred.promise;
+        }
+        
+        
+        updateService(serviceId, newService) {
+        	let deferred = this.$q.defer();
+        	this.$http({
+                method: "PUT",
+                url: this.conf.api.widgetCommon + "/" + serviceId,
+                data: newService,
+                cache: false,
+                headers:{
+            		'X-ECOMP-RequestID':this.uuid.generate()
+                }
+            }).then(res => {
+            	if (res == null || res.data == null) {
+        	 		this.$log.error('MicroserviceService::updateService Failed: Result or result.data is null');
+                     deferred.reject("MicroserviceService::updateService Failed: Result or result.data is null");
+                } else if (!this.utilsService.isValidJSON(res.data)) {
+                 	this.$log.error('MicroserviceService::updateService Failed: Invalid JSON format');
+                    deferred.reject("MicroserviceService::updateService Failed: Invalid JSON format");
+                } else {
+                    deferred.resolve(res.data);
+                }
+            })
+            .catch(errRes => {
+                deferred.reject(errRes);
+            });
+            return deferred.promise;
+        }
+        
+        deleteService(serviceId) {
+        	let deferred = this.$q.defer();
+        	this.$http({
+                method: "DELETE",
+                url: this.conf.api.widgetCommon + "/" + serviceId,
+                cache: false,
+                headers:{
+            		'X-ECOMP-RequestID':this.uuid.generate()
+                }
+            }).then(res => {
+            	if (res == null || res.data == null) {
+        	 		this.$log.error('MicroserviceService::deleteService Failed: Result or result.data is null');
+                     deferred.reject("MicroserviceService::deleteService Failed: Result or result.data is null");
+                } else if (!this.utilsService.isValidJSON(res.data)) {
+                 	this.$log.error('MicroserviceService::deleteService Failed: Invalid JSON format');
+                    deferred.reject("MicroserviceService::deleteService Failed: Invalid JSON format");
+                } else {
+                    deferred.resolve(res.data);
+                }
+            })
+            .catch(errRes => {
+                deferred.reject(errRes);
+            });
+            return deferred.promise;
+        }
+        
+        getServiceList() {
+          	let deferred = this.$q.defer();
+        	this.$http({
+                method: "GET",
+                url: this.conf.api.widgetCommon,
+                cache: false,
+                headers:{
+            		'X-ECOMP-RequestID':this.uuid.generate()
+                }
+            }).then(res => {
+            	if (res == null || res.data == null) {
+        	 		this.$log.error('MicroserviceService::getServiceList Failed: Result or result.data is null');
+                     deferred.reject("MicroserviceService::getServiceList Failed: Result or result.data is null");
+                } else if (!this.utilsService.isValidJSON(res.data)) {
+                 	this.$log.error('MicroserviceService::getServiceList Failed: Invalid JSON format');
+                    deferred.reject("MicroserviceService::getServiceList Failed: Invalid JSON format");
+                }  else {
+                    deferred.resolve(res.data);
+                }
+            })
+            .catch(errRes => {
+                deferred.reject(errRes);
+            });
+            return deferred.promise;
+        }
+        
+        getWidgetListByService(serviceId) {
+          	let deferred = this.$q.defer();
+        	this.$http({
+                method: "GET",
+                url: this.conf.api.widgetCommon + '/' + serviceId,
+                cache: false,
+                headers:{
+            		'X-ECOMP-RequestID':this.uuid.generate()
+                }
+            }).then(res => {
+            	if (res == null || res.data == null) {
+        	 		this.$log.error('MicroserviceService::getWidgetListByService Failed: Result or result.data is null');
+                     deferred.reject("MicroserviceService::getWidgetListByService Failed: Result or result.data is null");
+                } else if (!this.utilsService.isValidJSON(res.data)) {
+                 	this.$log.error('MicroserviceService::getWidgetListByService Failed: Invalid JSON format');
+                    deferred.reject("MicroserviceService::getWidgetListByService Failed: Invalid JSON format");
+                } else {
+                    deferred.resolve(res.data);
+                }
+            })
+            .catch(errRes => {
+                deferred.reject(errRes);
+            });
+            return deferred.promise;
+        }
+        
+        getUserParameterById(paramId){
+        	let deferred = this.$q.defer();
+        	this.$http({
+                method: "GET",
+                url: this.conf.api.widgetCommon + '/services/' +  paramId,
+                cache: false,
+                headers:{
+            		'X-ECOMP-RequestID':this.uuid.generate()
+                }
+            }).then(res => {
+            	if (res == null || res.data == null) {
+        	 		this.$log.error('MicroserviceService::getUserParameterById Failed: Result or result.data is null');
+                     deferred.reject("MicroserviceService::getUserParameterById Failed: Result or result.data is null");
+                } else if (!this.utilsService.isValidJSON(res.data)) {
+                 	this.$log.error('MicroserviceService::getUserParameterById Failed: Invalid JSON format');
+                    deferred.reject("MicroserviceService::getUserParameterById Failed: Invalid JSON format");
+                } else {
+                    deferred.resolve(res.data);
+                }
+            })
+            .catch(errRes => {
+                deferred.reject(errRes);
+            });
+            return deferred.promise;
+        }
+        
+        deleteUserParameterById(paramId){
+        	let deferred = this.$q.defer();
+        	this.$http({
+                method: "DELETE",
+                url: this.conf.api.widgetCommon + '/services/' +  paramId,
+                cache: false,
+                headers:{
+            		'X-ECOMP-RequestID':this.uuid.generate()
+                }
+            }).then(res => {
+            	if (res == null || res.data == null) {
+        	 		this.$log.error('MicroserviceService::deleteUserParameterById Failed: Result or result.data is null');
+                     deferred.reject("MicroserviceService::deleteUserParameterById Failed: Result or result.data is null");
+                } else {
+                    deferred.resolve(res.data);
+                }
+            })
+            .catch(errRes => {
+                deferred.reject(errRes);
+            });
+            return deferred.promise;
+        }
+    }
+    
+    MicroserviceService.$inject = ['$q', '$log', '$http', 'conf','uuid4', 'utilsService'];
+    angular.module('ecompApp').service('microserviceService', MicroserviceService)
+})();