fix: oneOf ConditionManifest

jcdcdev · Dec 31, 2024 · bfd2462 · bfd2462
1 parent 6bfad37
commit bfd2462
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/jcdcdev.Umbraco.Core.TestSite/SimpleWorkspaceViewPackageManifestReader.cs b/src/jcdcdev.Umbraco.Core.TestSite/SimpleWorkspaceViewPackageManifestReader.cs
@@ -1,6 +1,7 @@
 using jcdcdev.Umbraco.Core.Extensions;
 using jcdcdev.Umbraco.Core.Web.Models.Manifests;
 using Umbraco.Cms.Core.Manifest;
+using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Infrastructure.Manifest;
 using Umbraco.Cms.Web.Common.PublishedModels;
 
@@ -53,7 +54,7 @@ public async Task<IEnumerable<PackageManifest>> ReadPackageManifestsAsync()
             Conditions =
             [
                 ConditionManifest.EntityIsTrashed(),
-                ConditionManifest.WorkspaceContentTypeAlias(Home.ModelTypeAlias)
+                ConditionManifest.WorkspaceContentTypeAlias([Home.ModelTypeAlias, BasePage.ModelTypeAlias])
             ]
         };
 

diff --git a/src/jcdcdev.Umbraco.Core/Web/Models/Manifests/ConditionManifest.cs b/src/jcdcdev.Umbraco.Core/Web/Models/Manifests/ConditionManifest.cs
@@ -15,8 +15,8 @@ private ConditionManifest(string alias, object[] oneOf)
     }
 
     public static ConditionManifest Create(string alias, string match) => new(alias, match);
-    public static ConditionManifest Create(string alias, string[] match) => new(alias, match.Select(x => (object)x));
     public static ConditionManifest Create(string alias, bool match) => new(alias, match);
+    public static ConditionManifest Create(string alias, string[] oneOf) => new(alias, (object[])oneOf);
 
     /// <summary>
     /// Requires the current Section Alias to match the one specified.