From 7cc92c22ac6172d6b51425d8628e431350593bca Mon Sep 17 00:00:00 2001
From: swapnalipode <sp00501638@techmahindra.com>
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 <sp00501638@techmahindra.com>
---
 .../src/app/common/constants/app-constants.ts      |  2 +-
 .../src/app/common/core/services/api.service.ts    |  7 ++--
 .../search-catalog/search-catalog.component.ts     | 37 ++++++----------------
 .../search-catalog/search-catalog.service.ts       |  4 +++
 4 files changed, 19 insertions(+), 31 deletions(-)

(limited to 'cds-ui/client')

diff --git a/cds-ui/client/src/app/common/constants/app-constants.ts b/cds-ui/client/src/app/common/constants/app-constants.ts
index 1b4720c4a..30b4ece0b 100644
--- a/cds-ui/client/src/app/common/constants/app-constants.ts
+++ b/cds-ui/client/src/app/common/constants/app-constants.ts
@@ -119,5 +119,5 @@ export const ControllerCatalogURLs = {
 	saveControllerCatalog: '/controllercatalog/save',
 	getDefinition: '/controllercatalog/model-type/by-definition',
 	getDerivedFrom: '/controllercatalog/model-type/by-derivedfrom',
-	deleteCatalog: '/controllercatalog/model-type'
+	deleteCatalog:'/controllercatalog'
 }
\ No newline at end of file
diff --git a/cds-ui/client/src/app/common/core/services/api.service.ts b/cds-ui/client/src/app/common/core/services/api.service.ts
index addf51ca5..af93787fd 100644
--- a/cds-ui/client/src/app/common/core/services/api.service.ts
+++ b/cds-ui/client/src/app/common/core/services/api.service.ts
@@ -30,20 +30,21 @@ export class ApiService {
   
   constructor(private _http: HttpClient) {
   }
+
   get(url: string, params?: any): Observable<any> {
     return this._http.get(url,params);
   }
 
   post(url: string, body: any | null, options?:any): Observable<any> {
-
     return this._http.post(url, body,options);
   }
+  
   put() {
     // to do
   }
 
-  delete() {
-    // to do
+  delete(url: string, params?: any): Observable<any> {
+    return this._http.delete(url,params);
   }
 
 }
\ No newline at end of file
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