diff options
Diffstat (limited to 'usecaseui-portal')
5 files changed, 55 insertions, 22 deletions
diff --git a/usecaseui-portal/src/app/core/services/managemencs.service.ts b/usecaseui-portal/src/app/core/services/managemencs.service.ts index da43b8f5..b7aff872 100644 --- a/usecaseui-portal/src/app/core/services/managemencs.service.ts +++ b/usecaseui-portal/src/app/core/services/managemencs.service.ts @@ -12,18 +12,18 @@ export class ManagemencsService { /* line up */ url = { - // The following APIs are optimizable - customers: this.baseUrl + "/uui-lcm/customers", /* get */ + //mock Currently tuned api interface + customers: this.baseUrl + "/uui-lcm/customers", /* get or delete */ CustomersPir: this.baseUrl + "/uui-lcm/serviceNumByCustomer", /* get */ - deleteCustomer: this.baseUrl + "/uui-lcm/customers?customerId=*_*&resourceVersion=*+*", /* delete */ - // The following APIs are not optimizable - serviceType: this.baseUrl + "/uui-lcm/customers/" + "*_*" + "/service-subscriptions", /* get */ + serviceType: this.baseUrl + "/uui-lcm/customers/*_*/service-subscriptions", /* get */ CustomersColumn: this.baseUrl + "/uui-lcm/serviceNumByServiceType/" + "*_*", /* get */ + //mock Currently unadjustable api interface + deleteCustomer: this.baseUrl + "/uui-lcm/customers", /* delete */ createCustomer: this.baseUrl + "/uui-lcm/customers/", /* put */ createServiceType: this.baseUrl + "/uui-lcm/customers/*_*/service-subscriptions/*+*", /* put */ - getCustomerresourceVersion: this.baseUrl + "/uui-lcm/customers/*_*", /* put */ + getCustomerresourceVersion: this.baseUrl + "/uui-lcm/customers/*_*", /* get */ getServiceTypeResourceVersion: this.baseUrl + "/uui-lcm/customers/*_*/service-subscriptions/*+*", - deleteServiceType: this.baseUrl + "/uui-lcm/customers/*_*/service-subscriptions/*+*?resourceVersion=*@* ", + deleteServiceType: this.baseUrl + "/uui-lcm/customers/*_*/service-subscriptions/*+*", }; //The following APIs are optimizable ---------------------------------- @@ -38,11 +38,10 @@ export class ManagemencsService { return this.http.put(url, createParams); } // delete SelectCustomer - deleteSelectCustomer(params) { - let customerId = params.customerId, - version = params.version; - let url = this.url.deleteCustomer.replace("*_*", customerId).replace("*+*", version); - return this.http.delete(url); + deleteSelectCustomer(paramsObj) { + let url = this.url.deleteCustomer; + let params = new HttpParams({ fromObject: paramsObj }); + return this.http.delete(url,{params}); } //The following APIs are not optimizable --------------------------------- @@ -81,11 +80,14 @@ export class ManagemencsService { return this.http.get(url); } // delete Select ServiceType - deleteSelectServiceType(params) { - let customerId = params.customerId.id, - ServiceType = params.ServiceType, - version = params.version; - let url = this.url.deleteServiceType.replace("*_*", customerId).replace("*+*", ServiceType).replace("*@*", version); - return this.http.delete(url); + deleteSelectServiceType(paramsObj) { + let customerId = paramsObj.customerId.id, + ServiceType = paramsObj.ServiceType, + version = { + "resourceVersion":paramsObj.version + }; + let url = this.url.deleteServiceType.replace("*_*", customerId).replace("*+*", ServiceType); + let params = new HttpParams({ fromObject: version }); + return this.http.delete(url,{params}); } } diff --git a/usecaseui-portal/src/app/mock/json/CustomersColumn.json b/usecaseui-portal/src/app/mock/json/CustomersColumn.json new file mode 100644 index 00000000..329258d8 --- /dev/null +++ b/usecaseui-portal/src/app/mock/json/CustomersColumn.json @@ -0,0 +1,8 @@ +{ + "list":[ + {"name":"SOTN","value":"23"}, + {"name":"CCVPN","value":"67"}, + {"name":"CCVPN1","value":"34"}, + {"name":"SOTN1","value":"12"} + ] +}
\ No newline at end of file diff --git a/usecaseui-portal/src/app/mock/json/serviceType.json b/usecaseui-portal/src/app/mock/json/serviceType.json new file mode 100644 index 00000000..cda17d57 --- /dev/null +++ b/usecaseui-portal/src/app/mock/json/serviceType.json @@ -0,0 +1,21 @@ +[ + { + "service-type": "CCVPN", + "temp-ub-sub-account-id": "sotnaccount", + "resource-version": "1535601345780" + }, + { + "service-type": "SOTN", + "temp-ub-sub-account-id": "sotnaccount", + "resource-version": "1535601333330" + }, + { + "service-type": "E2E Service", + "temp-ub-sub-account-id": "sotnaccount", + "resource-version": "1536111036667" + },{ + "service-type": "Network Service", + "temp-ub-sub-account-id": "sotnaccount", + "resource-version": "1536111036467" +} +]
\ No newline at end of file diff --git a/usecaseui-portal/src/app/mock/routes.js b/usecaseui-portal/src/app/mock/routes.js index 9668e2fc..4a4b4057 100644 --- a/usecaseui-portal/src/app/mock/routes.js +++ b/usecaseui-portal/src/app/mock/routes.js @@ -35,7 +35,9 @@ module.exports = ///////////////////////// ///////<-------------managemence services--------->///// - "/uui-lcm/customers/:customer/service-subscriptions": "/serviceTypes?customer=:customer", + "/uui-lcm/customers/:customer/service-subscriptions": "/serviceType", + "/uui-lcm/serviceNumByServiceType/:customer":"/CustomersColumn", + ///////////////////////// ///////<-------------myhttp services--------->///// diff --git a/usecaseui-portal/src/app/shared/components/customer/customer.component.ts b/usecaseui-portal/src/app/shared/components/customer/customer.component.ts index a510e6db..17142d77 100644 --- a/usecaseui-portal/src/app/shared/components/customer/customer.component.ts +++ b/usecaseui-portal/src/app/shared/components/customer/customer.component.ts @@ -436,7 +436,7 @@ export class CustomerComponent implements OnInit { if (data["status"] == 'SUCCESS') { let params = { customerId: thisdeleteCustomer.id, - version: data["result"]["resource-version"] + resourceVersion: data["result"]["resource-version"] }; this.deleteCustomer(params, notificationModel); } else { @@ -444,8 +444,8 @@ export class CustomerComponent implements OnInit { } }) } - deleteCustomer(params, notificationModel) { - this.managemencs.deleteSelectCustomer(params).subscribe((data) => { + deleteCustomer(paramsObj, notificationModel) { + this.managemencs.deleteSelectCustomer(paramsObj).subscribe((data) => { if (data["status"] == 'SUCCESS') { this.notificationSuccess(notificationModel); this.getAllCustomers(); |