Merge pull request #463 from leekelleher/dev/v5.x

Preparing v5.1.1 release

Author: leekelleher

.github/README.md

@@ -105,7 +105,7 @@ I reserve the right to address bug reports or feature requests **in my own time*
 **Any feedback is welcome and appreciated.** Please keep in mind, I am not your personal support developer.
 
 If you are really stuck, do remember that the Umbraco community is amongst the friendliest on our planet, learn to embrace it.
-Ask for help on the [Our Umbraco support forum](https://our.umbraco.com/), or the [Community Discord Server](https://community.umbraco.com/get-involved/community-discord-server/), I am sure someone can help you there.
+Ask for help on the [Umbraco support forum](https://forum.umbraco.com/), I am sure someone can help you there.
 
 
 ### Contributions, collaborations, rules of engagement

VERSION

@@ -1 +1 @@
-5.1.0
+5.1.1

src/Umbraco.Community.Contentment/DataEditors/Buttons/buttons.js

@@ -112,7 +112,7 @@ angular.module("umbraco").controller("Umbraco.Community.Contentment.DataEditors.
             vm.items.forEach(x => {
 
                 if (vm.multiple === false) {
-                    x.selected = x.value === item.value;
+                    x.selected = item.selected && x.value === item.value;
                 }
 
                 if (x.selected) {

src/Umbraco.Community.Contentment/DataEditors/ContentBlocks/content-blocks.js

@@ -224,6 +224,7 @@ angular.module("umbraco").controller("Umbraco.Community.Contentment.DataEditors.
                     config.elementTypeScaffoldCache[elementType.alias] = scaffold;
                 }
 
+                scaffold.key = item.key;
                 scaffold.name = name;
                 scaffold.variants[0].name = name;
 

src/Umbraco.Community.Contentment/DataEditors/ContentBlocks/content-blocks.overlay.js

@@ -46,11 +46,7 @@ angular.module("umbraco").controller("Umbraco.Community.Contentment.Overlays.Con
                 vm.items = config.elementTypes;
                 vm.selectedElementType = null;
 
-                // NOTE: Corrected `retriveDataOfType` typo, but kept backwards-compatibility for v8.17.x.
-                // ref: https://github.com/umbraco/Umbraco-CMS/pull/11027
-                vm.clipboardItems = typeof clipboardService.retrieveDataOfType === "function"
-                    ? clipboardService.retrieveDataOfType("elementType", config.elementTypes.map(item => item.alias))
-                    : clipboardService.retriveDataOfType("elementType", config.elementTypes.map(item => item.alias));
+                vm.clipboardItems = clipboardService.retrieveDataOfType("elementType", config.elementTypes.map(item => item.alias));
 
                 if (config.elementTypes.length > 1 || vm.clipboardItems.length > 0) {
 

src/Umbraco.Community.Contentment/DataEditors/DataList/DataSources/ExamineDataListSource.cs

@@ -5,6 +5,7 @@
 
 using Examine;
 using Examine.Search;
+using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.IO;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.PropertyEditors;
@@ -197,6 +198,15 @@ private PagedResult<DataListItem> GetExamineResults(
                                 luceneQuery = string.Format(luceneQuery, udi.Result);
                             }
                         }
+                        else if (_contentmentContentContext is IContentmentContentContext2 ctx2)
+                        {
+                            var contentKey = ctx2.GetCurrentContentId<Guid?>(out _);
+                            if (contentKey.HasValue == true)
+                            {
+                                var udi = new GuidUdi(UmbConstants.UdiEntityType.Document, contentKey.Value);
+                                luceneQuery = string.Format(luceneQuery, udi);
+                            }
+                        }
                     }
 
                     var nameField = config.GetValueAs("nameField", _defaultNameField);

src/Umbraco.Community.Contentment/DataEditors/DataList/DataSources/UmbracoMembersDataListSource.cs

@@ -124,13 +124,9 @@ public Task<PagedResult<DataListItem>> SearchAsync(Dictionary<string, object> co
 
             if (items?.Any() == true)
             {
-                var offset = pageIndex * pageSize;
                 var results = new PagedResult<DataListItem>(totalRecords, pageNumber, pageSize)
                 {
-                    Items = items
-                        .Skip(offset)
-                        .Take(pageSize)
-                        .Select(ToDataListItem)
+                    Items = items.Select(ToDataListItem)
                 };
 
                 return Task.FromResult(results);

src/Umbraco.Community.Contentment/DataEditors/TemplatedList/templated-list.js

@@ -102,7 +102,7 @@ angular.module("umbraco").controller("Umbraco.Community.Contentment.DataEditors.
             vm.items.forEach(x => {
 
                 if (vm.multiple === false) {
-                    x.selected = x.value === item.value;
+                    x.selected = item.selected && x.value === item.value;
                 }
 
                 if (x.selected) {

src/Umbraco.Community.Contentment/Services/ContentmentContentContext.cs

@@ -5,13 +5,14 @@
 
 using Microsoft.AspNetCore.Http;
 using Newtonsoft.Json;
+using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Models.PublishedContent;
 using Umbraco.Cms.Core.Web;
 using Umbraco.Extensions;
 
 namespace Umbraco.Community.Contentment.Services
 {
-    public sealed class ContentmentContentContext : IContentmentContentContext
+    public sealed class ContentmentContentContext : IContentmentContentContext2
     {
         private readonly IHttpContextAccessor _httpContextAccessor;
         private readonly IRequestAccessor _requestAccessor;
@@ -27,40 +28,43 @@ public ContentmentContentContext(
             _umbracoContextAccessor = umbracoContextAccessor;
         }
 
-        public int? GetCurrentContentId(out bool isParent)
+        public T? GetCurrentContentId<T>(out bool isParent)
         {
             isParent = false;
 
-            if (_umbracoContextAccessor.TryGetUmbracoContext(out var umbracoContext) == true)
+            if (_umbracoContextAccessor.TryGetUmbracoContext(out var umbracoContext) == true &&
+                umbracoContext.PublishedRequest?.PublishedContent is not null)
             {
-                if (umbracoContext.PublishedRequest?.PublishedContent != null)
+                var attempt = umbracoContext.PublishedRequest.PublishedContent.Id.TryConvertTo<T>();
+                if (attempt.Success)
                 {
-                    isParent = false;
-                    return umbracoContext.PublishedRequest.PublishedContent.Id;
+                    return attempt.Result;
                 }
             }
 
             // NOTE: First we check for "id" (if on a content page), then "parentId" (if editing an element).
-            if (int.TryParse(_requestAccessor.GetRequestValue("id"), out var currentId) == true)
+            var attempt1 = _requestAccessor.GetRequestValue("id")?.TryConvertTo<T>() ?? Attempt.Fail<T>();
+            if (attempt1.Success)
             {
-                return currentId;
+                return attempt1.Result;
             }
-            else if (int.TryParse(_requestAccessor.GetRequestValue("parentId"), out var parentId) == true)
+
+            var attempt2 = _requestAccessor.GetRequestValue("parentId")?.TryConvertTo<T>() ?? Attempt.Fail<T>();
+            if (attempt2.Success)
             {
                 isParent = true;
-
-                return parentId;
+                return attempt2.Result;
             }
 
             var json = _httpContextAccessor.HttpContext?.Request.GetRawBodyStringAsync().GetAwaiter().GetResult();
             if (string.IsNullOrWhiteSpace(json) == false)
             {
-                var obj = JsonConvert.DeserializeAnonymousType(json, new { id = 0, parentId = 0 });
-                if (obj?.id > 0)
+                var obj = JsonConvert.DeserializeAnonymousType(json, new { id = default(T), parentId = default(T) });
+                if (obj is not null && obj.id is not null)
                 {
                     return obj.id;
                 }
-                else if (obj?.parentId > 0)
+                else if (obj is not null && obj.parentId is not null)
                 {
                     isParent = true;
                     return obj.parentId;
@@ -70,6 +74,8 @@ public ContentmentContentContext(
             return default;
         }
 
+        public int? GetCurrentContentId(out bool isParent) => GetCurrentContentId<int>(out isParent);
+
         public IPublishedContent? GetCurrentContent(out bool isParent)
         {
             isParent = false;
@@ -81,12 +87,21 @@ public ContentmentContentContext(
                     return umbracoContext.PublishedRequest.PublishedContent;
                 }
 
-                var currentContentId = GetCurrentContentId(out isParent);
+                // NOTE: First we check for an integer ID.
+                var currentContentId = GetCurrentContentId<int?>(out isParent);
 
                 if (currentContentId.HasValue == true)
                 {
                     return umbracoContext.Content?.GetById(true, currentContentId.Value);
                 }
+
+                // NOTE: Next we check for a GUID ID.
+                var currentContentKey = GetCurrentContentId<Guid?>(out isParent);
+
+                if (currentContentKey.HasValue == true)
+                {
+                    return umbracoContext.Content?.GetById(true, currentContentKey.Value);
+                }
             }
 
             return default;

src/Umbraco.Community.Contentment/Services/IContentmentContentContext.cs

@@ -1,4 +1,4 @@
-/* Copyright © 2022 Lee Kelleher.
+/* Copyright © 2022 Lee Kelleher.
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
@@ -13,4 +13,10 @@ public interface IContentmentContentContext
 
         IPublishedContent? GetCurrentContent(out bool isParent);
     }
+
+    // NOTE: Added as a separate interface, so not to break binary backwards-compatibility. [LK]
+    public interface IContentmentContentContext2 : IContentmentContentContext
+    {
+        T? GetCurrentContentId<T>(out bool isParent);
+    }
 }