Code formatting / tidy-up

Author: leekelleher

src/Our.Umbraco.DocTypeGridEditor/Extensions/ContentTypeServiceExtensions.cs

@@ -1,5 +1,6 @@
 using System;
 using Umbraco.Core;
+using Umbraco.Core.Cache;
 using Umbraco.Core.Services;
 
 namespace Our.Umbraco.DocTypeGridEditor.Extensions
@@ -8,9 +9,11 @@ internal static class ContentTypeServiceExtensions
     {
         public static string GetAliasByGuid(this IContentTypeService contentTypeService, Guid id)
         {
-            return (string)ApplicationContext.Current.ApplicationCache.RuntimeCache.GetCacheItem(
+            return ApplicationContext.Current.ApplicationCache.RuntimeCache.GetCacheItem<string>(
                 string.Concat("Our.Umbraco.DocTypeGridEditor.Web.Extensions.ContentTypeServiceExtensions.GetAliasById_", id),
-                () => ApplicationContext.Current.DatabaseContext.Database
+                () => ApplicationContext.Current
+                    .DatabaseContext
+                    .Database
                     .ExecuteScalar<string>("SELECT [cmsContentType].[alias] FROM [cmsContentType] INNER JOIN [umbracoNode] ON [cmsContentType].[nodeId] = [umbracoNode].[id] WHERE [umbracoNode].[uniqueID] = @0", id));
         }
     }

src/Our.Umbraco.DocTypeGridEditor/Extensions/ViewEnginesCollectionExtensions.cs

@@ -7,7 +7,8 @@ internal static class ViewEnginesCollectionExtensions
         public static bool ViewExists(
             this ViewEngineCollection viewEngines,
             ControllerContext controllerContext,
-            string viewName, bool isPartial = false)
+            string viewName,
+            bool isPartial = false)
         {
             var result = isPartial == false
                 ? viewEngines.FindView(controllerContext, viewName, null)

src/Our.Umbraco.DocTypeGridEditor/Helpers/DocTypeGridEditorHelper.cs

@@ -234,6 +234,7 @@ private static IEnumerable<JsonDbRow> GetPropertyDataRows(string docTypeAlias)
     public class ContentTypeContainer
     {
         public PublishedContentType PublishedContentType { get; set; }
+
         public IContentType ContentType { get; set; }
     }
 }

src/Our.Umbraco.DocTypeGridEditor/Web/Extensions/HtmlHelperExtensions.cs

@@ -17,12 +17,13 @@ public static HtmlString RenderDocTypeGridEditorItem(
             IPublishedContent content,
             string editorAlias = "",
             string viewPath = "",
-            string previewViewPath = "")
+            string previewViewPath = "",
+            bool isPreview = false)
         {
             if (content == null)
                 return new HtmlString(string.Empty);
 
-            var controllerName = string.Concat(content.DocumentTypeAlias, "Surface");
+            var controllerName = $"{content.DocumentTypeAlias}Surface";
 
             if (string.IsNullOrWhiteSpace(viewPath) == false)
                 viewPath = viewPath.EnsureEndsWith('/');
@@ -91,21 +92,21 @@ public static HtmlString RenderDocTypeGridEditorItem(
 
             // Check for preview view
             if (string.IsNullOrWhiteSpace(previewViewPath) == false
-                && helper.ViewContext.RequestContext.HttpContext.Request.QueryString["dtgePreview"] == "1")
+                && isPreview)
             {
-                var fullPreviewViewPath = string.Concat(previewViewPath, editorAlias, ".cshtml");
+                var fullPreviewViewPath = $"{previewViewPath}{editorAlias}.cshtml";
                 if (ViewEngines.Engines.ViewExists(helper.ViewContext, fullPreviewViewPath, true))
                 {
                     return helper.Partial(fullPreviewViewPath, content);
                 }
 
-                fullPreviewViewPath = string.Concat(previewViewPath, content.DocumentTypeAlias, ".cshtml");
+                fullPreviewViewPath = $"{previewViewPath}{content.DocumentTypeAlias}.cshtml";
                 if (ViewEngines.Engines.ViewExists(helper.ViewContext, fullPreviewViewPath, true))
                 {
                     return helper.Partial(fullPreviewViewPath, content);
                 }
 
-                fullPreviewViewPath = string.Concat(previewViewPath, "Default.cshtml");
+                fullPreviewViewPath = $"{previewViewPath}Default.cshtml";
                 if (ViewEngines.Engines.ViewExists(helper.ViewContext, fullPreviewViewPath, true))
                 {
                     return helper.Partial(fullPreviewViewPath, content);
@@ -115,19 +116,19 @@ public static HtmlString RenderDocTypeGridEditorItem(
             // Check for view path view
             if (string.IsNullOrWhiteSpace(viewPath) == false)
             {
-                var fullViewPath = string.Concat(viewPath, editorAlias, ".cshtml");
+                var fullViewPath = $"{viewPath}{editorAlias}.cshtml";
                 if (ViewEngines.Engines.ViewExists(helper.ViewContext, fullViewPath, true))
                 {
                     return helper.Partial(fullViewPath, content);
                 }
 
-                fullViewPath = string.Concat(viewPath, content.DocumentTypeAlias, ".cshtml");
+                fullViewPath = $"{viewPath}{content.DocumentTypeAlias}.cshtml";
                 if (ViewEngines.Engines.ViewExists(helper.ViewContext, fullViewPath, true))
                 {
                     return helper.Partial(fullViewPath, content);
                 }
 
-                fullViewPath = string.Concat(viewPath, "Default.cshtml");
+                fullViewPath = $"{viewPath}Default.cshtml";
                 if (ViewEngines.Engines.ViewExists(helper.ViewContext, fullViewPath, true))
                 {
                     return helper.Partial(fullViewPath, content);