From d7d2b0657b18a96bc1889f8404d7b212f28922e6 Mon Sep 17 00:00:00 2001 From: swapnalipode Date: Mon, 2 Mar 2020 12:57:20 +0530 Subject: Adding delete catalog Adding delete catalog functionality in client ui Change-Id: I56bcba1c09d949b80155b3ac9368203e85eb4f99 Issue-ID: CCSDK-815 Signed-off-by: swapnalipode (cherry picked from commit 7cc92c22ac6172d6b51425d8628e431350593bca) --- .../search-catalog/search-catalog.component.ts | 37 ++++++---------------- .../search-catalog/search-catalog.service.ts | 4 +++ 2 files changed, 14 insertions(+), 27 deletions(-) (limited to 'cds-ui/client/src/app/feature-modules') diff --git a/cds-ui/client/src/app/feature-modules/controller-catalog/search-catalog/search-catalog.component.ts b/cds-ui/client/src/app/feature-modules/controller-catalog/search-catalog/search-catalog.component.ts index efafe5e8f..7c379599f 100644 --- a/cds-ui/client/src/app/feature-modules/controller-catalog/search-catalog/search-catalog.component.ts +++ b/cds-ui/client/src/app/feature-modules/controller-catalog/search-catalog/search-catalog.component.ts @@ -82,37 +82,20 @@ export class SearchCatalogComponent implements OnInit { }, error=>{ window.alert('Catalog not matching the search tag' + error); }) - -// this.options=[ { -// "modelName": "tosca.nodes.Artifact", -// "derivedFrom": "tosca.nodes.Root", -// "definitionType": "node_type", -// "definition": { -// "description": "This is Deprecated Artifact Node Type.", -// "version": "1.0.0", -// "derived_from": "tosca.nodes.Root" -// }, -// "description": "This is Deprecated Artifact Node Type.", -// "version": "1.0.0", -// "tags": "tosca.nodes.Artifact,tosca.nodes.Root,node_type", -// "creationDate": "2019-09-16T07:35:24.000Z", -// "updatedBy": "System" -// }]; } editInfo(item: ICatalog, option: string) { - if(option == 'Delete'){ -// this.catalogCreateService.deleteCatalog(item.modelName) -// .subscribe(response=>{ -// this.alertService.success("Delete Success"+ response) -// }, -// error=>{ -// console.log(error); -// this.alertService.error('Error while deleting catalog'+ error); -// -// }) - } + if(option == 'Delete'){ + this.searchCatalogService.deleteCatalog(item.modelName) + .subscribe(response=>{ + this.alertService.success("Delete Success"+ response) + }, + error=>{ + console.log(error); + this.alertService.error('Error while deleting catalog'+ error); + }) + } else{ this.dialogRef = this.dialog.open(CatalogDataDialogComponent, { height: '500px', diff --git a/cds-ui/client/src/app/feature-modules/controller-catalog/search-catalog/search-catalog.service.ts b/cds-ui/client/src/app/feature-modules/controller-catalog/search-catalog/search-catalog.service.ts index 47896058a..362eab030 100644 --- a/cds-ui/client/src/app/feature-modules/controller-catalog/search-catalog/search-catalog.service.ts +++ b/cds-ui/client/src/app/feature-modules/controller-catalog/search-catalog/search-catalog.service.ts @@ -33,4 +33,8 @@ export class SearchCatalogService { searchByTags(tag) { return this.api.get(ControllerCatalogURLs.searchControllerCatalogByTags + '/' + tag); } + + deleteCatalog(modelName) { + return this.api.delete(ControllerCatalogURLs.deleteCatalog + '/' + modelName); + } } -- cgit 1.2.3-korg