From 627badaf69987c01811c477219fd943757a635f5 Mon Sep 17 00:00:00 2001 From: "Christopher Lott (Christopher) (cl778h)" Date: Mon, 12 Jun 2017 09:49:00 -0400 Subject: [PORTAL-16 PORTAL-18] Widget ms; staging Remove staging repositories from poms. Add widget microservice code base. Add portal unit tests. Repair defects. Normalize line endings. Change-Id: Ia5e48da2a3141b352439ecd548cddf918f4df585 Signed-off-by: Christopher Lott (cl778h) --- .../client/app/services/catalog/catalog.service.js | 374 +++++++++++---------- 1 file changed, 202 insertions(+), 172 deletions(-) (limited to 'ecomp-portal-FE-common/client/app/services/catalog/catalog.service.js') diff --git a/ecomp-portal-FE-common/client/app/services/catalog/catalog.service.js b/ecomp-portal-FE-common/client/app/services/catalog/catalog.service.js index 63d5b966..6b89341d 100644 --- a/ecomp-portal-FE-common/client/app/services/catalog/catalog.service.js +++ b/ecomp-portal-FE-common/client/app/services/catalog/catalog.service.js @@ -1,172 +1,202 @@ -/*- - * ================================================================================ - * 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 CatalogService { - - constructor($q, $log, $http, conf, uuid, utilsService) { - this.$q = $q; - this.$log = $log; - this.$http = $http; - this.conf = conf; - this.uuid = uuid; - this.debug = false; - this.utilsService = utilsService; - } - - getAppCatalog() { - let deferred = this.$q.defer(); - this.$http({ - method: "GET", - url: this.conf.api.appCatalog, - cache: false, - headers: { - 'X-ECOMP-RequestID':this.uuid.generate() - } - }) - .then( res => { - if (this.debug) - this.$log.debug('CatalogService::getAppCatalog: result is ' + JSON.stringify(res)); - // Res is always JSON, but the data object might be an HTML error page. - if (! this.utilsService.isValidJSON(res.data)) { - var msg = 'CatalogService::getAppCatalog: result data is not JSON'; - if (this.debug) - this.$log.debug(msg); - deferred.reject(msg); - } else { - if (this.debug) - this.$log.debug('CatalogService::getAppCatalog: success'); - deferred.resolve(res.data); - } - }) - .catch( status => { - this.$log.error('CatalogService:getAppCatalog failed: ' + status); - deferred.reject(status); - }); - return deferred.promise; - } - - // Expects an object with fields matching model class AppCatalogSelection: - // appId (number), select (boolean), pending (boolean). - updateAppCatalog(appData) { - let deferred = this.$q.defer(); - // Validate the request, maybe this is overkill - if (appData == null || appData.appId == null || appData.select == null) { - var msg = 'CatalogService::updateAppCatalog: field appId and/or select not found'; - this.$log.error(msg); - return deferred.reject(msg); - } - this.$http({ - method: "PUT", - url: this.conf.api.appCatalog, - data: appData, - headers: { - 'X-ECOMP-RequestID':this.uuid.generate() - } - }).then( res => { - // Detect missing result - if (res == null || res.data == null) { - deferred.reject("CatalogService::updateAppCatalog Failed"); - } else { - deferred.resolve(res.data); - } - }) - .catch( status => { - this.$log.error('CatalogService:updateAppCatalog failed: ' + status); - deferred.reject(status); - }); - return deferred.promise; - } - - // Expects an object with fields and used to update records for ep_pers_user_app_man_sort table: - // appId (number), select (boolean). - updateManualAppSort(appData) { - let deferred = this.$q.defer(); - - // Validate the request, maybe this is overkill - if (appData == null || appData.appId == null || appData.select == null) { - var msg = 'CatalogService::updateManualAppSort: field appId and/or select not found'; - this.$log.error(msg); - return deferred.reject(msg); - } - this.$http({ - method: "PUT", - url: this.conf.api.UpdateUserAppsSortManual, - data: appData, - headers: { - 'X-ECOMP-RequestID':this.uuid.generate() - } - }).then( res => { - // Detect missing result - if (res == null || res.data == null) { - deferred.reject("CatalogService::updateManualAppSort Failed"); - } else { - deferred.resolve(res.data); - } - }) - .catch( status => { - this.$log.error('CatalogService:updateManualAppSort failed: ' + status); - deferred.reject(status); - }); - - return deferred.promise; - } - - getuserAppRolesCatalog(item) { - let deferred = this.$q.defer(); - this.$http({ - method: "GET", - url: this.conf.api.appCatalogRoles, - params:{appName:item}, - cache: false, - headers: { - 'X-ECOMP-RequestID':this.uuid.generate() - } - }) - .then( res => { - if (this.debug) - this.$log.debug('CatalogService::getAppCatalog: result is ' + JSON.stringify(res)); - // Res is always JSON, but the data object might be an HTML error page. - if (! this.utilsService.isValidJSON(res.data)) { - var msg = 'CatalogService::getAppCatalog: result data is not JSON'; - if (this.debug) - this.$log.debug(msg); - deferred.reject(msg); - } else { - if (this.debug) - this.$log.debug('CatalogService::getAppCatalog: success'); - deferred.resolve(res.data); - } - }) - .catch( status => { - this.$log.error('CatalogService:getAppCatalog failed: ' + status); - deferred.reject(status); - }); - return deferred.promise; - } - - - - } - - CatalogService.$inject = ['$q', '$log', '$http', 'conf','uuid4', 'utilsService']; - angular.module('ecompApp').service('catalogService', CatalogService) -})(); +/*- + * ================================================================================ + * 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 CatalogService { + + constructor($q, $log, $http, conf, uuid, utilsService) { + this.$q = $q; + this.$log = $log; + this.$http = $http; + this.conf = conf; + this.uuid = uuid; + this.debug = false; + this.utilsService = utilsService; + } + + getAppCatalog() { + let deferred = this.$q.defer(); + this.$http({ + method: "GET", + url: this.conf.api.appCatalog, + cache: false, + headers: { + 'X-ECOMP-RequestID':this.uuid.generate() + } + }) + .then( res => { + if (this.debug) + this.$log.debug('CatalogService::getAppCatalog: result is ' + JSON.stringify(res)); + // Res is always JSON, but the data object might be an HTML error page. + if (! this.utilsService.isValidJSON(res.data)) { + var msg = 'CatalogService::getAppCatalog: result data is not JSON'; + if (this.debug) + this.$log.debug(msg); + deferred.reject(msg); + } else { + if (this.debug) + this.$log.debug('CatalogService::getAppCatalog: success'); + deferred.resolve(res.data); + } + }) + .catch( status => { + this.$log.error('CatalogService:getAppCatalog failed: ' + status); + deferred.reject(status); + }); + return deferred.promise; + } + + // Expects an object with fields matching model class AppCatalogSelection: + // appId (number), select (boolean), pending (boolean). + updateAppCatalog(appData) { + let deferred = this.$q.defer(); + // Validate the request, maybe this is overkill + if (appData == null || appData.appId == null || appData.select == null) { + var msg = 'CatalogService::updateAppCatalog: field appId and/or select not found'; + this.$log.error(msg); + return deferred.reject(msg); + } + this.$http({ + method: "PUT", + url: this.conf.api.appCatalog, + data: appData, + headers: { + 'X-ECOMP-RequestID':this.uuid.generate() + } + }).then( res => { + // Detect missing result + if (res == null || res.data == null) { + deferred.reject("CatalogService::updateAppCatalog Failed"); + } else { + deferred.resolve(res.data); + } + }) + .catch( status => { + this.$log.error('CatalogService:updateAppCatalog failed: ' + status); + deferred.reject(status); + }); + return deferred.promise; + } + + // Expects an object with fields and used to update records for ep_pers_user_app_man_sort table: + // appId (number), select (boolean). + updateManualAppSort(appData) { + let deferred = this.$q.defer(); + + // Validate the request, maybe this is overkill + if (appData == null || appData.appId == null || appData.select == null) { + var msg = 'CatalogService::updateManualAppSort: field appId and/or select not found'; + this.$log.error(msg); + return deferred.reject(msg); + } + this.$http({ + method: "PUT", + url: this.conf.api.UpdateUserAppsSortManual, + data: appData, + headers: { + 'X-ECOMP-RequestID':this.uuid.generate() + } + }).then( res => { + // Detect missing result + if (res == null || res.data == null) { + deferred.reject("CatalogService::updateManualAppSort Failed"); + } else { + deferred.resolve(res.data); + } + }) + .catch( status => { + this.$log.error('CatalogService:updateManualAppSort failed: ' + status); + deferred.reject(status); + }); + + return deferred.promise; + } + + getuserAppRolesCatalog(item) { + let deferred = this.$q.defer(); + this.$http({ + method: "GET", + url: this.conf.api.appCatalogRoles, + params:{appName:item}, + cache: false, + headers: { + 'X-ECOMP-RequestID':this.uuid.generate() + } + }) + .then( res => { + if (this.debug) + this.$log.debug('CatalogService::getAppCatalog: result is ' + JSON.stringify(res)); + // Res is always JSON, but the data object might be an HTML error page. + if (! this.utilsService.isValidJSON(res.data)) { + var msg = 'CatalogService::getAppCatalog: result data is not JSON'; + if (this.debug) + this.$log.debug(msg); + deferred.reject(msg); + } else { + if (this.debug) + this.$log.debug('CatalogService::getAppCatalog: success'); + deferred.resolve(res.data); + } + }) + .catch( status => { + this.$log.error('CatalogService:getAppCatalog failed: ' + status); + deferred.reject(status); + }); + return deferred.promise; + } + + getAppsFullList() { + let deferred = this.$q.defer(); + this.$http({ + method: "GET", + url: this.conf.api.appsFullList, + cache: false, + headers: { + 'X-ECOMP-RequestID':this.uuid.generate() + } + }) + .then( res => { + if (this.debug) + this.$log.debug('CatalogService::getAppsFullList: result is ' + JSON.stringify(res)); + // Res is always JSON, but the data object might be an HTML error page. + if (! this.utilsService.isValidJSON(res.data)) { + var msg = 'CatalogService::getAppsFullList: result data is not JSON'; + if (this.debug) + this.$log.error(msg); + deferred.reject(msg); + } else { + if (this.debug) + this.$log.debug('CatalogService::getAppsFullList: success'); + deferred.resolve(res.data); + } + }) + .catch( status => { + this.$log.error('CatalogService:getAppsFullList failed: ' + status); + deferred.reject(status); + }); + return deferred.promise; + } + + } + + CatalogService.$inject = ['$q', '$log', '$http', 'conf','uuid4', 'utilsService']; + angular.module('ecompApp').service('catalogService', CatalogService) +})(); -- cgit 1.2.3-korg