Clear cached PublishedDataTypes when content types are updated

umbraco · Nov 17, 2023 · c2a80fd · c2a80fd
1 parent 0085f98
commit c2a80fd
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/src/Umbraco.Core/Models/PublishedContent/IPublishedContentTypeFactory.cs b/src/Umbraco.Core/Models/PublishedContent/IPublishedContentTypeFactory.cs
@@ -60,5 +60,5 @@ IPublishedPropertyType CreateCorePropertyType(
     ///     <para>This is so the factory can flush its caches.</para>
     ///     <para>Invoked by the IPublishedSnapshotService.</para>
     /// </remarks>
-    void NotifyDataTypeChanges(int[] ids);
+    void NotifyDataTypeChanges(params int[] ids);
 }
diff --git a/src/Umbraco.Core/Models/PublishedContent/PublishedContentTypeFactory.cs b/src/Umbraco.Core/Models/PublishedContent/PublishedContentTypeFactory.cs
@@ -73,11 +73,11 @@ public PublishedDataType GetDataType(int id)
     }
 
     /// <inheritdoc />
-    public void NotifyDataTypeChanges(int[] ids)
+    public void NotifyDataTypeChanges(params int[] ids)
     {
         lock (_publishedDataTypesLocker)
         {
-            if (_publishedDataTypes == null)
+            if (_publishedDataTypes == null || ids.Length == 0)
             {
                 IEnumerable<IDataType> dataTypes = _dataTypeService.GetAll();
                 _publishedDataTypes = dataTypes.ToDictionary(x => x.Id, CreatePublishedDataType);

diff --git a/src/Umbraco.PublishedCache.NuCache/PublishedSnapshotService.cs b/src/Umbraco.PublishedCache.NuCache/PublishedSnapshotService.cs
@@ -189,6 +189,9 @@ public void Notify(ContentTypeCacheRefresher.JsonPayload[] payloads)
             }
         }
 
+        // Ensure all published data types are updated
+        _publishedContentTypeFactory.NotifyDataTypeChanges();
+
         Notify<IContentType>(_contentStore, payloads, RefreshContentTypesLocked);
         Notify<IMediaType>(_mediaStore, payloads, RefreshMediaTypesLocked);