Merge pull request #259 from mistyn8/feature/rc002

skttl · web-flow · commit fa4009ae73eb · 2021-09-15T09:56:31.000+02:00
Supporting rc002 breaking changes.
diff --git a/src/Our.Umbraco.DocTypeGridEditor/Controllers/DocTypeGridEditorApiController.cs b/src/Our.Umbraco.DocTypeGridEditor/Controllers/DocTypeGridEditorApiController.cs
@@ -27,6 +27,7 @@ namespace Our.Umbraco.DocTypeGridEditor.Controllers
     public class DocTypeGridEditorApiController : UmbracoAuthorizedJsonController
     {
         private readonly IUmbracoContextAccessor _umbracoContext;
+        private readonly IVariationContextAccessor _variationContextAccessor;
         private readonly IContentTypeService _contentTypeService;
         private readonly IContentService _contentService;
         private readonly IDataTypeService _dataTypeService;
@@ -39,6 +40,7 @@ public class DocTypeGridEditorApiController : UmbracoAuthorizedJsonController
         private readonly PropertyEditorCollection _propertyEditorCollection;
 
         public DocTypeGridEditorApiController(IUmbracoContextAccessor umbracoContext,
+            IVariationContextAccessor variationContextAccessor,
             IContentTypeService contentTypeService,
             IContentService contentService,
             IDataTypeService dataTypeService,
@@ -51,6 +53,7 @@ public DocTypeGridEditorApiController(IUmbracoContextAccessor umbracoContext,
             DocTypeGridEditorHelper dtgeHelper)
         {
             _umbracoContext = umbracoContext;
+            _variationContextAccessor = variationContextAccessor;
             _contentTypeService = contentTypeService;
             _contentService = contentService;
             _dataTypeService = dataTypeService;
@@ -168,11 +171,11 @@ public PartialViewResult GetPreviewMarkup([FromForm] PreviewData data, [FromQuer
             }
 
 
-            if (_umbracoContext.UmbracoContext.PublishedRequest == null)
+            if (_umbracoContext.GetRequiredUmbracoContext().PublishedRequest == null)
             {
                 var request = _router.CreateRequestAsync(new Uri(Request.GetDisplayUrl())).Result;
                 request.SetPublishedContent(page);
-                _umbracoContext.UmbracoContext.PublishedRequest = request.Build();
+                _umbracoContext.GetRequiredUmbracoContext().PublishedRequest = request.Build();
             }
 
             // Set the culture for the preview
@@ -184,7 +187,7 @@ public PartialViewResult GetPreviewMarkup([FromForm] PreviewData data, [FromQuer
                     var culture = new CultureInfo(page.Cultures[currentCulture].Culture);
                     System.Threading.Thread.CurrentThread.CurrentCulture = culture;
                     System.Threading.Thread.CurrentThread.CurrentUICulture = culture;
-                    _umbracoContext.UmbracoContext.VariationContextAccessor.VariationContext = new VariationContext(culture.Name);
+                    _variationContextAccessor.VariationContext = new VariationContext(culture.Name);
                 }
             }
 
diff --git a/src/Our.Umbraco.DocTypeGridEditor/Helpers/DocTypeGridEditorHelper.cs b/src/Our.Umbraco.DocTypeGridEditor/Helpers/DocTypeGridEditorHelper.cs
@@ -74,7 +74,7 @@ public IPublishedElement ConvertValueToContent(string id, string contentTypeAlia
             if (dataJson == null)
                 return null;
 
-            if (_umbracoContext.UmbracoContext == null)
+            if (_umbracoContext.GetRequiredUmbracoContext() == null)
                 return ConvertValue(id, contentTypeAlias, dataJson);
 
             return (IPublishedElement)_appCaches.RequestCache.Get(
@@ -155,7 +155,7 @@ private IPublishedElement ConvertValue(string id, string contentTypeAlias, strin
 
             // Get the current request node we are embedded in
 
-            var pcr = _umbracoContext.UmbracoContext.PublishedRequest;
+            var pcr = _umbracoContext.GetRequiredUmbracoContext().PublishedRequest;
             var containerNode = pcr != null && pcr.HasPublishedContent() ? pcr.PublishedContent : null;
 
             // Create the model based on our implementation of IPublishedElement
diff --git a/src/Our.Umbraco.DocTypeGridEditor/Our.Umbraco.DocTypeGridEditor.csproj b/src/Our.Umbraco.DocTypeGridEditor/Our.Umbraco.DocTypeGridEditor.csproj
@@ -8,16 +8,16 @@
         <Product>Our.Umbraco.DocTypeGridEditor</Product>
         <PackageTags>umbraco plugin package</PackageTags>
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-        <Version>9.0.0-beta001</Version>
+        <Version>9.0.0-beta002</Version>
         <Authors>Søren Kottal</Authors>
         <Company></Company>
         <AssemblyName>Our.Umbraco.DocTypeGridEditor</AssemblyName>
         <RootNamespace>Our.Umbraco.DocTypeGridEditor</RootNamespace>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Umbraco.Cms.Web.Website" Version="9.0.0-beta003" />
-        <PackageReference Include="Umbraco.Cms.Web.BackOffice" Version="9.0.0-beta003" />
+        <PackageReference Include="Umbraco.Cms.Web.Website" Version="9.0.0-rc002" />
+        <PackageReference Include="Umbraco.Cms.Web.BackOffice" Version="9.0.0-rc002" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/src/Our.Umbraco.DocTypeGridEditor/ValueProcessing/Collections/DocTypeGridEditorValueProcessorsCollection.cs b/src/Our.Umbraco.DocTypeGridEditor/ValueProcessing/Collections/DocTypeGridEditorValueProcessorsCollection.cs
@@ -12,7 +12,7 @@ namespace Our.Umbraco.DocTypeGridEditor.ValueProcessing.Collections
     /// </summary>
     public class DocTypeGridEditorValueProcessorsCollection : BuilderCollectionBase<IDocTypeGridEditorValueProcessor>
     {
-        public DocTypeGridEditorValueProcessorsCollection(IEnumerable<IDocTypeGridEditorValueProcessor> items) : base(items)
+        public DocTypeGridEditorValueProcessorsCollection(Func<IEnumerable<IDocTypeGridEditorValueProcessor>> items) : base(items)
         {
 
         }

Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,7 @@ namespace Our.Umbraco.DocTypeGridEditor.Controllers`
`27`	`27`	`public class DocTypeGridEditorApiController : UmbracoAuthorizedJsonController`
`28`	`28`	`{`
`29`	`29`	`private readonly IUmbracoContextAccessor _umbracoContext;`
	`30`	`+ private readonly IVariationContextAccessor _variationContextAccessor;`
`30`	`31`	`private readonly IContentTypeService _contentTypeService;`
`31`	`32`	`private readonly IContentService _contentService;`
`32`	`33`	`private readonly IDataTypeService _dataTypeService;`
`@@ -39,6 +40,7 @@ public class DocTypeGridEditorApiController : UmbracoAuthorizedJsonController`
`39`	`40`	`private readonly PropertyEditorCollection _propertyEditorCollection;`
`40`	`41`
`41`	`42`	`public DocTypeGridEditorApiController(IUmbracoContextAccessor umbracoContext,`
	`43`	`+ IVariationContextAccessor variationContextAccessor,`
`42`	`44`	`IContentTypeService contentTypeService,`
`43`	`45`	`IContentService contentService,`
`44`	`46`	`IDataTypeService dataTypeService,`
`@@ -51,6 +53,7 @@ public DocTypeGridEditorApiController(IUmbracoContextAccessor umbracoContext,`
`51`	`53`	`DocTypeGridEditorHelper dtgeHelper)`
`52`	`54`	`{`
`53`	`55`	`_umbracoContext = umbracoContext;`
	`56`	`+ _variationContextAccessor = variationContextAccessor;`
`54`	`57`	`_contentTypeService = contentTypeService;`
`55`	`58`	`_contentService = contentService;`
`56`	`59`	`_dataTypeService = dataTypeService;`
`@@ -168,11 +171,11 @@ public PartialViewResult GetPreviewMarkup([FromForm] PreviewData data, [FromQuer`
`168`	`171`	`}`
`169`	`172`
`170`	`173`
`171`		`- if (_umbracoContext.UmbracoContext.PublishedRequest == null)`
	`174`	`+ if (_umbracoContext.GetRequiredUmbracoContext().PublishedRequest == null)`
`172`	`175`	`{`
`173`	`176`	`var request = _router.CreateRequestAsync(new Uri(Request.GetDisplayUrl())).Result;`
`174`	`177`	`request.SetPublishedContent(page);`
`175`		`- _umbracoContext.UmbracoContext.PublishedRequest = request.Build();`
	`178`	`+ _umbracoContext.GetRequiredUmbracoContext().PublishedRequest = request.Build();`
`176`	`179`	`}`
`177`	`180`
`178`	`181`	`// Set the culture for the preview`
`@@ -184,7 +187,7 @@ public PartialViewResult GetPreviewMarkup([FromForm] PreviewData data, [FromQuer`
`184`	`187`	`var culture = new CultureInfo(page.Cultures[currentCulture].Culture);`
`185`	`188`	`System.Threading.Thread.CurrentThread.CurrentCulture = culture;`
`186`	`189`	`System.Threading.Thread.CurrentThread.CurrentUICulture = culture;`
`187`		`- _umbracoContext.UmbracoContext.VariationContextAccessor.VariationContext = new VariationContext(culture.Name);`
	`190`	`+ _variationContextAccessor.VariationContext = new VariationContext(culture.Name);`
`188`	`191`	`}`
`189`	`192`	`}`
`190`	`193`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ namespace Our.Umbraco.DocTypeGridEditor.ValueProcessing.Collections`
`12`	`12`	`/// </summary>`
`13`	`13`	`public class DocTypeGridEditorValueProcessorsCollection : BuilderCollectionBase<IDocTypeGridEditorValueProcessor>`
`14`	`14`	`{`
`15`		`- public DocTypeGridEditorValueProcessorsCollection(IEnumerable<IDocTypeGridEditorValueProcessor> items) : base(items)`
	`15`	`+ public DocTypeGridEditorValueProcessorsCollection(Func<IEnumerable<IDocTypeGridEditorValueProcessor>> items) : base(items)`
`16`	`16`	`{`
`17`	`17`
`18`	`18`	`}`