From a6ab47150520b8d2a09374a6cf46af29bb7bc116 Mon Sep 17 00:00:00 2001
From: James Coxhead <jamescoxhead@users.noreply.github.com>
Date: Fri, 30 Nov 2018 14:09:48 +0000
Subject: [PATCH] Added delete endpoint. Updated tree controller to use Angular
 delete view

---
 .../src/views/relationtypes/delete.html       |  0
 .../Editors/RelationTypeController.cs         | 18 ++++++++++++++++--
 .../Trees/RelationTypeTreeController.cs       | 19 +++++++------------
 3 files changed, 23 insertions(+), 14 deletions(-)
 create mode 100644 src/Umbraco.Web.UI.Client/src/views/relationtypes/delete.html

diff --git a/src/Umbraco.Web.UI.Client/src/views/relationtypes/delete.html b/src/Umbraco.Web.UI.Client/src/views/relationtypes/delete.html
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/Umbraco.Web/Editors/RelationTypeController.cs b/src/Umbraco.Web/Editors/RelationTypeController.cs
index 3751dd5bcf..05de96699d 100644
--- a/src/Umbraco.Web/Editors/RelationTypeController.cs
+++ b/src/Umbraco.Web/Editors/RelationTypeController.cs
@@ -126,9 +126,23 @@ namespace Umbraco.Web.Editors
             }
         }
 
-        public void DeleteById()
+        /// <summary>
+        /// Deletes a relation type with a given ID.
+        /// </summary>
+        /// <param name="id">The ID of the relation type to delete.</param>
+        /// <returns>A <see cref="HttpResponseMessage"/>.</returns>
+        [HttpPost]
+        [HttpDelete]
+        public HttpResponseMessage DeleteById(int id)
         {
-            throw new NotImplementedException();
+            var relationType = Services.RelationService.GetRelationTypeById(id);
+
+            if(relationType == null)
+                throw new HttpResponseException(HttpStatusCode.NotFound);
+
+            Services.RelationService.Delete(relationType);
+
+            return Request.CreateResponse(HttpStatusCode.OK);
         }
     }
 }
diff --git a/src/Umbraco.Web/Trees/RelationTypeTreeController.cs b/src/Umbraco.Web/Trees/RelationTypeTreeController.cs
index 096c7a6870..6131ca8646 100644
--- a/src/Umbraco.Web/Trees/RelationTypeTreeController.cs
+++ b/src/Umbraco.Web/Trees/RelationTypeTreeController.cs
@@ -34,9 +34,10 @@ namespace Umbraco.Web.Trees
 
             var relationType = Services.RelationService.GetRelationTypeById(int.Parse(id));
             if (relationType == null) return new MenuItemCollection();
+            
+            menu.Items.Add<ActionDelete>(Services.TextService.Localize("actions", ActionDelete.Instance.Alias));
 
-            //add delete option for all macros
-            menu.Items.Add<ActionDelete>(Services.TextService.Localize("actions", ActionDelete.Instance.Alias))
+            /*menu.Items.Add<ActionDelete>(Services.TextService.Localize("actions", ActionDelete.Instance.Alias))
                 //Since we haven't implemented anything for relationtypes in angular, this needs to be converted to
                 //use the legacy format
                 .ConvertLegacyMenuItem(new EntitySlim
@@ -45,7 +46,7 @@ namespace Umbraco.Web.Trees
                     Level = 1,
                     ParentId = -1,
                     Name = relationType.Name
-                }, "relationTypes", queryStrings.GetValue<string>("application"));
+                }, "relationTypes", queryStrings.GetValue<string>("application"));*/
 
             return menu;
         }
@@ -56,15 +57,9 @@ namespace Umbraco.Web.Trees
 
             if (id == Constants.System.Root.ToInvariantString())
             {
-                nodes.AddRange(Services.RelationService
-                .GetAllRelationTypes().Select(rt => CreateTreeNode(
-                    rt.Id.ToString(),
-                    id,
-                    queryStrings,
-                    rt.Name,
-                    "icon-trafic",
-                    false
-                    )));
+                nodes.AddRange(Services.RelationService.GetAllRelationTypes()
+                                       .Select(rt => CreateTreeNode(rt.Id.ToString(), id, queryStrings, rt.Name,
+                                                                    "icon-trafic", false)));
             }
             return nodes;
         }