Code clean-up

refactored code that has been deprecated in Umbraco 15.
leekelleher · Nov 23, 2024 · 7aa59ad · 7aa59ad
1 parent 6196bb5
commit 7aa59ad
Show file tree

Hide file tree

Showing 47 changed files with 281 additions and 426 deletions.
diff --git a/src/Umbraco.Cms.15.x/Views/_ViewImports.cshtml b/src/Umbraco.Cms.15.x/Views/_ViewImports.cshtml
@@ -1,9 +1,6 @@
 @using Umbraco.Extensions
-@using Umbraco.Cms._15.x
 @using Umbraco.Cms.Web.Common.PublishedModels
 @using Umbraco.Cms.Web.Common.Views
 @using Umbraco.Cms.Core.Models.PublishedContent
 @using Microsoft.AspNetCore.Html
 @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
-@addTagHelper *, Smidge
-@inject Smidge.SmidgeHelper SmidgeHelper
diff --git a/src/Umbraco.Cms.15.x/Views/_layout.cshtml b/src/Umbraco.Cms.15.x/Views/_layout.cshtml
@@ -0,0 +1,14 @@
+@inherits UmbracoViewPage
+@{
+    Layout = null;
+}
+<!doctype html>
+<html>
+<head>
+    <title>@Model.Name</title>
+</head>
+<body>
+    <h1>@Model.Name</h1>
+    @RenderBody()
+</body>
+</html>
diff --git a/src/Umbraco.Cms.15.x/Views/homePage.cshtml b/src/Umbraco.Cms.15.x/Views/homePage.cshtml
@@ -0,0 +1,5 @@
+@inherits UmbracoViewPage
+@{
+    Layout = "_layout.cshtml";
+}
+<h2>@Model.Name</h2>
diff --git a/src/Umbraco.Community.Contentment/Composing/ContentmentComposer.cs b/src/Umbraco.Community.Contentment/Composing/ContentmentComposer.cs
@@ -20,13 +20,6 @@ internal sealed class ContentmentComposer : IComposer
     {
         public void Compose(IUmbracoBuilder builder)
         {
-#if NET8_0_OR_GREATER == false
-            builder
-                .ManifestFilters()
-                    .Append<ContentmentManifestFilter>()
-            ;
-#endif
-
             builder
                 .Services
                     .AddSingleton<ConfigurationEditorUtility>()

diff --git a/src/Umbraco.Community.Contentment/ContentmentConstants.cs b/src/Umbraco.Community.Contentment/ContentmentConstants.cs
@@ -100,6 +100,7 @@ public static class Views
 
             public const string ListItems = DataEditors.ListItemsDataEditor.DataEditorViewPath;
 
+            [Obsolete("To be removed in Contentment 7.0")]
             public const string MacroPicker = DataEditors.MacroPickerDataEditor.DataEditorViewPath;
 
             public const string Notes = DataEditors.NotesDataEditor.DataEditorViewPath;

diff --git a/src/Umbraco.Community.Contentment/ContentmentManifestFilter.cs b/src/Umbraco.Community.Contentment/ContentmentManifestFilter.cs
diff --git a/src/Umbraco.Community.Contentment/DataEditors/CodeEditor/CodeEditorDataEditor.cs b/src/Umbraco.Community.Contentment/DataEditors/CodeEditor/CodeEditorDataEditor.cs
@@ -27,22 +27,19 @@ public sealed class CodeEditorDataEditor : DataEditor
 
         private readonly IWebHostEnvironment _webHostEnvironment;
         private readonly IIOHelper _ioHelper;
-        private readonly ILocalizedTextService _localizedTextService;
         private readonly IShortStringHelper _shortStringHelper;
         private readonly IJsonSerializer _jsonSerializer;
 
         public CodeEditorDataEditor(
             IDataValueEditorFactory dataValueEditorFactory,
             IWebHostEnvironment webHostEnvironment,
             IIOHelper ioHelper,
-            ILocalizedTextService localizedTextService,
             IShortStringHelper shortStringHelper,
             IJsonSerializer jsonSerializer)
             : base(dataValueEditorFactory)
         {
             _webHostEnvironment = webHostEnvironment;
             _ioHelper = ioHelper;
-            _localizedTextService = localizedTextService;
             _shortStringHelper = shortStringHelper;
             _jsonSerializer = jsonSerializer;
         }
@@ -53,7 +50,6 @@ public CodeEditorDataEditor(
 
         protected override IDataValueEditor CreateValueEditor() => new TextOnlyValueEditor(
             Attribute!,
-            _localizedTextService,
             _shortStringHelper,
             _jsonSerializer,
             _ioHelper);

diff --git a/src/Umbraco.Community.Contentment/DataEditors/ContentBlocks/ContentBlocksDataEditor.cs b/src/Umbraco.Community.Contentment/DataEditors/ContentBlocks/ContentBlocksDataEditor.cs
@@ -30,7 +30,6 @@ public sealed class ContentBlocksDataEditor : IDataEditor
         private readonly IShortStringHelper _shortStringHelper;
         private readonly ConfigurationEditorUtility _utility;
         private readonly IIOHelper _ioHelper;
-        private readonly ILocalizedTextService _localizedTextService;
         private readonly IJsonSerializer _jsonSerializer;
         private readonly IPropertyValidationService _propertyValidationService;
 
@@ -39,7 +38,6 @@ public ContentBlocksDataEditor(
             IContentTypeService contentTypeService,
             Lazy<PropertyEditorCollection> propertyEditors,
             IDataTypeConfigurationCache dataTypeConfigurationCache,
-            ILocalizedTextService localizedTextService,
             IShortStringHelper shortStringHelper,
             IJsonSerializer jsonSerializer,
             ConfigurationEditorUtility utility,
@@ -49,7 +47,6 @@ public ContentBlocksDataEditor(
             _contentService = contentService;
             _contentTypeService = contentTypeService;
             _dataTypeConfigurationCache = dataTypeConfigurationCache;
-            _localizedTextService = localizedTextService;
             _shortStringHelper = shortStringHelper;
             _jsonSerializer = jsonSerializer;
             _propertyEditors = propertyEditors;
@@ -80,7 +77,6 @@ public IDataValueEditor GetValueEditor()
                 _contentTypeService,
                 _propertyEditors.Value,
                 _dataTypeConfigurationCache,
-                _localizedTextService,
                 _shortStringHelper,
                 _jsonSerializer,
                 _propertyValidationService)
@@ -92,47 +88,42 @@ public IDataValueEditor GetValueEditor()
 
         public IDataValueEditor GetValueEditor(object? configuration)
         {
-            var view = default(string);
-
-            if (configuration is Dictionary<string, object> config)
-            {
-                if (config.TryGetValue(ContentBlocksConfigurationEditor.DisplayMode, out var tmp1) == true)
-                {
-                    var displayMode = default(IContentBlocksDisplayMode);
-
-                    if (tmp1 is string str1 && str1?.InvariantStartsWith(Constants.Internals.EditorsPathRoot) == true)
-                    {
-                        displayMode = _utility.FindConfigurationEditor<IContentBlocksDisplayMode>(x => str1.InvariantEquals(x.View) == true);
-                    }
-                    else if (tmp1 is JArray array1 &&
-                        array1.Count > 0 &&
-                        array1[0] is JObject item1 &&
-                        item1.Value<string>("key") is string key)
-                    {
-                        displayMode = _utility.GetConfigurationEditor<IContentBlocksDisplayMode>(key);
-                    }
-
-                    if (displayMode != null)
-                    {
-                        view = displayMode.View;
-                    }
-                }
-            }
+            //var view = default(string);
+
+            //if (configuration is Dictionary<string, object> config)
+            //{
+            //    if (config.TryGetValue(ContentBlocksConfigurationEditor.DisplayMode, out var tmp1) == true)
+            //    {
+            //        var displayMode = default(IContentBlocksDisplayMode);
+
+            //        if (tmp1 is string str1 && str1?.InvariantStartsWith(Constants.Internals.EditorsPathRoot) == true)
+            //        {
+            //            displayMode = _utility.FindConfigurationEditor<IContentBlocksDisplayMode>(x => str1.InvariantEquals(x.View) == true);
+            //        }
+            //        else if (tmp1 is JArray array1 &&
+            //            array1.Count > 0 &&
+            //            array1[0] is JObject item1 &&
+            //            item1.Value<string>("key") is string key)
+            //        {
+            //            displayMode = _utility.GetConfigurationEditor<IContentBlocksDisplayMode>(key);
+            //        }
+
+            //        if (displayMode != null)
+            //        {
+            //            view = displayMode.View;
+            //        }
+            //    }
+            //}
 
             return new ContentBlocksDataValueEditor(
                 _contentTypeService,
                 _propertyEditors.Value,
                 _dataTypeConfigurationCache,
-                _localizedTextService,
                 _shortStringHelper,
                 _jsonSerializer,
                 _propertyValidationService)
             {
-#if NET8_0_OR_GREATER
                 ConfigurationObject = configuration,
-#else
-                Configuration = configuration,
-#endif
                 ValueType = ValueTypes.Json,
                 //View = _ioHelper.ResolveRelativeOrVirtualUrl(view ?? DataEditorViewPath),
             };

diff --git a/src/Umbraco.Community.Contentment/DataEditors/ContentBlocks/ContentBlocksDataValueEditor.cs b/src/Umbraco.Community.Contentment/DataEditors/ContentBlocks/ContentBlocksDataValueEditor.cs
@@ -33,11 +33,10 @@ public ContentBlocksDataValueEditor(
             IContentTypeService contentTypeService,
             PropertyEditorCollection propertyEditors,
             IDataTypeConfigurationCache dataTypeConfigurationCache,
-            ILocalizedTextService localizedTextService,
             IShortStringHelper shortStringHelper,
             IJsonSerializer jsonSerializer,
             IPropertyValidationService propertyValidationService)
-            : base(localizedTextService, shortStringHelper, jsonSerializer)
+            : base(shortStringHelper, jsonSerializer)
         {
             _dataTypeConfigurationCache = dataTypeConfigurationCache;
             _elementTypes = new Lazy<Dictionary<Guid, IContentType>>(() => contentTypeService.GetAllElementTypes().ToDictionary(x => x.Key));