Upgrade to Optimizely 12

Toders.FindMyContent/Controllers/FindMyContentController.cs

@@ -1,41 +1,37 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web.Mvc;
-using EPiServer;
-using EPiServer.Core;
+using EPiServer.Core;
 using EPiServer.DataAbstraction;
 using EPiServer.Editor;
-using EPiServer.PlugIn;
-using EPiServer.ServiceLocation;
+using EPiServer.Shell.Modules;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
 using Toders.FindMyContent.Core;
 using Toders.FindMyContent.Models.FindMyContent;
 
 namespace Toders.FindMyContent.Controllers
 {
-    [GuiPlugIn(
-        Area = PlugInArea.AdminMenu,
-        Url = "/FindMyContent/",
-        DisplayName = "Find My Content")]
+    [Authorize(Roles = "CmsAdmins")]
     public class FindMyContentController : Controller
     {
         private readonly IContentTypeRepository _contentTypeRepository;
         private readonly IContentFinder _contentFinder;
-
-        public FindMyContentController()
-        : this(ServiceLocator.Current.GetInstance<IContentTypeRepository>(),
-            ServiceLocator.Current.GetInstance<IContentFinder>())
-        {
-        }
+        private readonly ProtectedModuleOptions _protectedModuleOptions;
 
         public FindMyContentController(
             IContentTypeRepository contentTypeRepository,
-            IContentFinder contentFinder)
+            IContentFinder contentFinder,
+            ProtectedModuleOptions protectedModuleOptions)
         {
             _contentTypeRepository = contentTypeRepository;
             _contentFinder = contentFinder;
+            _protectedModuleOptions = protectedModuleOptions;
         }
 
+        [Route("FindMyContent")]
+        [HttpGet]
         public ActionResult Index()
         {
             var contentTypes = _contentTypeRepository.List()
@@ -65,9 +61,11 @@ public ActionResult Index()
                 EditUrls = contentTypes.ToDictionary(x => x.Id, CreateEditContentTypeUrl)
             };
 
-            return View(string.Empty, model);
+            return View(model);
         }
 
+        [Route("FindMyContent/Details/{id}")]
+        [HttpGet]
         public ActionResult Details(int id)
         {
             ContentType contentType = _contentTypeRepository.Load(id);
@@ -81,7 +79,7 @@ public ActionResult Details(int id)
                 }).ToList()
             };
 
-            return View(string.Empty, model);
+            return View(model);
         }
 
         private Dictionary<string, string> CreateEditContentUrls(ContentSummary contentSummary)
@@ -93,9 +91,8 @@ private Dictionary<string, string> CreateEditContentUrls(ContentSummary contentS
 
         private string CreateEditContentTypeUrl(ContentTypeModel contentTypeModel)
         {
-            var urlBuilder = new UrlBuilder(UriSupport.AbsoluteUrlFromUIBySettings("Admin/EditContentType.aspx"));
-            urlBuilder.QueryCollection["typeId"] = contentTypeModel.Id.ToString();
-            return urlBuilder.ToString();
+            var rootPath = _protectedModuleOptions.RootPath.Replace("~", string.Empty);
+            return Path.Join(rootPath, $"/EPiServer.Cms.UI.Admin/default#/ContentTypes/edit-content-type/{contentTypeModel.Id}");
         }
 
         private ContentTypeModel CreateContentTypeModel(ContentType contentType)

Toders.FindMyContent/Core/ContentFinder.cs

@@ -1,10 +1,10 @@
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using EPiServer;
+using EPiServer;
 using EPiServer.Core;
 using EPiServer.DataAbstraction;
 using EPiServer.ServiceLocation;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
 
 namespace Toders.FindMyContent.Core
 {

Toders.FindMyContent/Core/ContentSummary.cs

@@ -1,5 +1,5 @@
-using System.Collections.Generic;
-using EPiServer.Core;
+using EPiServer.Core;
+using System.Collections.Generic;
 
 namespace Toders.FindMyContent.Core
 {

Toders.FindMyContent/FindMyContentMenuProvider.cs

@@ -0,0 +1,20 @@
+using EPiServer.Shell.Navigation;
+using System.Collections.Generic;
+
+namespace Toders.FindMyContent
+{
+    [MenuProvider]
+    public class FindMyContentMenuProvider : IMenuProvider
+    {
+        public IEnumerable<MenuItem> GetMenuItems()
+        {
+            return new List<MenuItem>(1)
+            {
+                new UrlMenuItem("Find My Content", "/global/cms/admin/findmycontent", "/FindMyContent/") {
+                    IsAvailable = context => true,
+                    SortIndex = 100,
+                }
+            };
+        }
+    }
+}

Toders.FindMyContent/Models/FindMyContent/ContentTypeModel.cs

@@ -27,6 +27,6 @@ public class ContentSummaryModel
     {
         public ContentSummary Summary { get; set; }
 
-        public Dictionary<string, string> EditUrls { get; set; } 
+        public Dictionary<string, string> EditUrls { get; set; }
     }
 }

Toders.FindMyContent/Models/FindMyContent/DetailsModel.cs

@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using Toders.FindMyContent.Core;
 
 namespace Toders.FindMyContent.Models.FindMyContent
 {