From 0f3aa320be1b1b434b91bc9062c2e0ab8f8afd39 Mon Sep 17 00:00:00 2001
From: Nikolaj Geisle <niko737@edu.ucl.dk>
Date: Fri, 18 Mar 2022 12:54:19 +0100
Subject: [PATCH] Fix caching & contentPicker in parameter

---
 src/Umbraco.Core/Cache/MacroCacheRefresher.cs |  8 ++-
 .../MultipleContentPickerParameterEditor.cs   | 57 ++++++++++++++++++-
 2 files changed, 63 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Core/Cache/MacroCacheRefresher.cs b/src/Umbraco.Core/Cache/MacroCacheRefresher.cs
index f5b0b21e7a..e1b65e2a32 100644
--- a/src/Umbraco.Core/Cache/MacroCacheRefresher.cs
+++ b/src/Umbraco.Core/Cache/MacroCacheRefresher.cs
@@ -46,6 +46,11 @@ namespace Umbraco.Cms.Core.Cache
         {
             var payloads = Deserialize(json);
 
+            Refresh(payloads);
+        }
+
+        public override void Refresh(JsonPayload[] payloads)
+        {
             foreach (var payload in payloads)
             {
                 foreach (var alias in GetCacheKeysForAlias(payload.Alias))
@@ -59,8 +64,9 @@ namespace Umbraco.Cms.Core.Cache
                 }
             }
 
-            base.Refresh(json);
+            base.Refresh(payloads);
         }
+
         #endregion
 
         #region Json
diff --git a/src/Umbraco.Core/PropertyEditors/ParameterEditors/MultipleContentPickerParameterEditor.cs b/src/Umbraco.Core/PropertyEditors/ParameterEditors/MultipleContentPickerParameterEditor.cs
index 048ad40ac0..a7ae997eeb 100644
--- a/src/Umbraco.Core/PropertyEditors/ParameterEditors/MultipleContentPickerParameterEditor.cs
+++ b/src/Umbraco.Core/PropertyEditors/ParameterEditors/MultipleContentPickerParameterEditor.cs
@@ -1,5 +1,10 @@
-using Microsoft.Extensions.Logging;
+using System;
+using System.Collections.Generic;
+using Microsoft.Extensions.Logging;
 using Umbraco.Cms.Core.Hosting;
+using Umbraco.Cms.Core.IO;
+using Umbraco.Cms.Core.Models;
+using Umbraco.Cms.Core.Models.Editors;
 using Umbraco.Cms.Core.Serialization;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Core.Strings;
@@ -28,5 +33,55 @@ namespace Umbraco.Cms.Core.PropertyEditors.ParameterEditors
             DefaultConfiguration.Add("minNumber",0 );
             DefaultConfiguration.Add("maxNumber", 0);
         }
+
+        protected override IDataValueEditor CreateValueEditor() => DataValueEditorFactory.Create<MultipleContentPickerParameterEditor.MultipleContentPickerParamateterValueEditor>(Attribute);
+
+        internal class MultipleContentPickerParamateterValueEditor : DataValueEditor, IDataValueReference
+        {
+            private readonly IEntityService _entityService;
+
+            public MultipleContentPickerParamateterValueEditor(
+                ILocalizedTextService localizedTextService,
+                IShortStringHelper shortStringHelper,
+                IJsonSerializer jsonSerializer,
+                IIOHelper ioHelper,
+                DataEditorAttribute attribute,
+                IEntityService entityService)
+                : base(localizedTextService, shortStringHelper, jsonSerializer, ioHelper, attribute)
+            {
+                _entityService = entityService;
+            }
+
+            public IEnumerable<UmbracoEntityReference> GetReferences(object value)
+            {
+                var asString = value is string str ? str : value?.ToString();
+
+                if (string.IsNullOrEmpty(asString))
+                {
+                    yield break;
+                }
+
+                foreach (var udiStr in asString.Split(','))
+                {
+                    if (UdiParser.TryParse(udiStr, out Udi udi))
+                    {
+                        yield return new UmbracoEntityReference(udi);
+                    }
+
+                    // this is needed to support the legacy case when the multiple media picker parameter editor stores ints not udis
+                    if (int.TryParse(udiStr, out var id))
+                    {
+                        Attempt<Guid> guidAttempt = _entityService.GetKey(id, UmbracoObjectTypes.Document);
+                        Guid guid = guidAttempt.Success ? guidAttempt.Result : Guid.Empty;
+
+                        if (guid != Guid.Empty)
+                        {
+                            yield return new UmbracoEntityReference(new GuidUdi(Constants.UdiEntityType.Media, guid));
+                        }
+
+                    }
+                }
+            }
+        }
     }
 }