From d7d2b0657b18a96bc1889f8404d7b212f28922e6 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>
(cherry picked from commit 7cc92c22ac6172d6b51425d8628e431350593bca)
---
 .../controllers/controller-catalog.controller.ts   | 20 +++++++--------
 .../controller-catalog.datasource-template.ts      | 30 +++++++++++-----------
 .../src/services/controller-catalog.service.ts     |  2 +-
 3 files changed, 26 insertions(+), 26 deletions(-)

(limited to 'cds-ui/server')

diff --git a/cds-ui/server/src/controllers/controller-catalog.controller.ts b/cds-ui/server/src/controllers/controller-catalog.controller.ts
index 20e1cded6..b55785dcc 100644
--- a/cds-ui/server/src/controllers/controller-catalog.controller.ts
+++ b/cds-ui/server/src/controllers/controller-catalog.controller.ts
@@ -60,14 +60,14 @@ export class ControllerCatalogController {
     return await this.Ccservice.getDefinitionTypes(definitionType);
   }
 
-  @del('/controllercatalog/model-type/{name}', {
-      responses: {
-        '200': {
-          content: { 'application/json': {} }
-        }
-      },
-    })
-    async delete(@param.path.string('name') name: string): Promise<JSON>  {
-      return await this.Ccservice.deleteCatalog(name);
-    }
+  @del('/controllercatalog/{name}', {
+    responses: {
+      '200': {
+        content: { 'application/json': {} }
+      }
+    },
+  })
+  async delete(@param.path.string('name') name: string) {
+    return await this.Ccservice.delete(name);
+  }
 }
diff --git a/cds-ui/server/src/datasources/controller-catalog.datasource-template.ts b/cds-ui/server/src/datasources/controller-catalog.datasource-template.ts
index e45741576..dcd732a1b 100644
--- a/cds-ui/server/src/datasources/controller-catalog.datasource-template.ts
+++ b/cds-ui/server/src/datasources/controller-catalog.datasource-template.ts
@@ -57,20 +57,20 @@ export default {
 
            }
         },
-           {
-             "template": {
-                   "method": "DEL",
-                   "url": processorApiConfig.http.url + "/model-type/{name}",
-                   "headers": {
-                       "accepts": "application/json",
-                       "content-type": "application/json",
-                       "authorization": processorApiConfig.http.authToken
-                   },
-                   "responsePath": "$.*"
-             },
-             "functions": {
-                  "delete": ["name"]
-             }
-           }
+        {
+         "template": {
+                    "method": "DELETE",
+                    "url": processorApiConfig.http.url + "/model-type/{name}",
+                    "headers": {
+                        "accepts": "application/json",
+                        "content-type": "application/json",
+                        "authorization": processorApiConfig.http.authToken
+                    },
+                    "responsePath": "$.*"
+              },
+              "functions": {
+                   "delete": ["name"]
+              }
+        }
     ]
 };
\ No newline at end of file
diff --git a/cds-ui/server/src/services/controller-catalog.service.ts b/cds-ui/server/src/services/controller-catalog.service.ts
index 9b4880543..db8d8560c 100644
--- a/cds-ui/server/src/services/controller-catalog.service.ts
+++ b/cds-ui/server/src/services/controller-catalog.service.ts
@@ -6,7 +6,7 @@ export interface ControllerCatalogService {
   getByTags(tags: string): Promise<JSON>;
   save(controllerCatalog: JSON): Promise<JSON>;
   getDefinitionTypes(definitionType: string): Promise<JSON>;
-  deleteCatalog(name: string): Promise<JSON>;
+  delete(name: string): Promise<JSON>;
 }
 
 export class ControllerCatalogServiceProvider implements Provider<ControllerCatalogService> {
-- 
cgit 1.2.3-korg