Merge pull request #3730 from 2sic/develop

v21.03

Author: iJungleboy

Src/Dnn/ToSic.Sxc.Dnn.Core/Dnn/Code/DnnDynamicCodeRootTT.cs

@@ -1,5 +1,4 @@
 using ToSic.Sxc.Dnn.Run;
-using ToSic.Sxc.Services;
 using ToSic.Sxc.Services.Sys;
 using ToSic.Sxc.Sys.ExecutionContext;
 using ExecutionContext = ToSic.Sxc.Sys.ExecutionContext.ExecutionContext;
@@ -12,12 +11,8 @@ internal class DnnExecutionContext<TModel, TServiceKit>(ExecutionContext.Depende
     where TModel : class
     where TServiceKit : ServiceKit
 {
-
-    // TODO: WE CAN PROBABLY DROP THIS CLASS, IF WE ALWAYS USE GetService<IDnnContext>(reuse: true) INSTEAD OF DNN
-
     /// <summary>
     /// Dnn context with module, page, portal etc.
     /// </summary>
-    public IDnnContext Dnn => _dnn.Get(GetService<IDnnContext>);
-    private readonly GetOnce<IDnnContext> _dnn = new();
+    public IDnnContext Dnn => field ??= GetService<IDnnContext>(reuse: true);
 }

Src/Dnn/ToSic.Sxc.Dnn.Core/Dnn/Code/DnnExecutionContext.cs

@@ -1,5 +1,4 @@
-using ToSic.Sxc.Services;
-using ToSic.Sxc.Services.Sys;
+using ToSic.Sxc.Services.Sys;
 using ExecutionContext = ToSic.Sxc.Sys.ExecutionContext.ExecutionContext;
 
 namespace ToSic.Sxc.Dnn.Code;

Src/Dnn/ToSic.Sxc.Dnn.Core/Dnn/DnnModuleAndBlockBuilder.cs

@@ -18,7 +18,7 @@ internal class DnnModuleAndBlockBuilder(
     private ILog ParentLog => (Log as Log)?.Parent ?? Log;
 
 
-    protected override IModule GetModuleImplementation(int pageId, int moduleId)
+    public override IModule GetModule(int pageId, int moduleId)
     {
         var l = Log.Fn<IModule>($"{nameof(pageId)}: {pageId}, {nameof(moduleId)}: {moduleId}");
         var moduleInfo = new ModuleController().GetModule(moduleId, pageId, false);

Src/Dnn/ToSic.Sxc.Dnn.Core/Dnn/Search/SearchController.cs

@@ -39,7 +39,7 @@ namespace ToSic.Sxc.Dnn.Search;
 internal class SearchController(
     AppsCacheSwitch appsCache,
     Generator<CodeCompiler> codeCompiler,
-    Generator<IExecutionContextFactory> codeRootFactory,
+    Generator<IExecutionContextFactory> exCtxFactory,
     Generator<ISite> siteGenerator,
     LazySvc<IModuleAndBlockBuilder> moduleAndBlockBuilder,
     LazySvc<ILookUpEngineResolver> dnnLookUpEngineResolver,
@@ -49,7 +49,7 @@ internal class SearchController(
     : ServiceBase("DNN.Search",
         connect:
         [
-            appsCache, codeCompiler, codeRootFactory, siteGenerator, engineFactory, dnnLookUpEngineResolver,
+            appsCache, codeCompiler, exCtxFactory, siteGenerator, engineFactory, dnnLookUpEngineResolver,
             moduleAndBlockBuilder, logStore, polymorphism
         ])
 {
@@ -311,15 +311,20 @@ private ICustomizeSearch CreateAndInitViewController(ISite site, IBlock block)
         l.A("got instance of compiled ViewController class");
 
         // 2. Check if it implements ToSic.Sxc.Search.ICustomizeSearch - otherwise just return the empty search results as shown above
-        if (!(instance is ICustomizeSearch customizeSearch))
+        if (instance is not ICustomizeSearch customizeSearch)
             return l.ReturnNull("exit, class do not implements ICustomizeSearch");
 
         // 3. Make sure it has the full context if it's based on DynamicCode (like Code12)
         if (instance is INeedsExecutionContext instanceWithContext)
         {
             l.A($"attach DynamicCode context to class instance");
-            var parentDynamicCodeRoot = codeRootFactory.New()
-                .New(null, block, Log, CompatibilityLevels.CompatibilityLevel10);
+            var parentDynamicCodeRoot = exCtxFactory.New().New(new()
+            {
+                OwnerOrNull = null,
+                BlockOrNull = block,
+                ParentLog = Log,
+                CompatibilityFallback = CompatibilityLevels.CompatibilityLevel10,
+            });
             instanceWithContext.ConnectToRoot(parentDynamicCodeRoot);
         }
 

Src/Dnn/ToSic.Sxc.Dnn.Razor/Custom/Hybrid/RazorTyped.cs

@@ -200,7 +200,7 @@ public ITypedStack AsStack(params object[] items)
 
     /// <inheritdoc cref="ITypedApi.AsStack{T}" />
     public T AsStack<T>(params object[] items)
-        where T : class, IModelOfData, new()
+        where T : class, IModelFromData, new()
         => CodeApi.Cdf.AsStack<T>(items);
 
     #endregion
@@ -225,12 +225,12 @@ public T AsStack<T>(params object[] items)
 
     /// <inheritdoc />
     public T As<T>(object source, NoParamOrder npo = default)
-        where T : class, IModelOfData
+        where T : class, IModelFromData
         => CodeApi.Cdf.AsCustom<T>(source: source);
 
     /// <inheritdoc />
     public IEnumerable<T> AsList<T>(object source, NoParamOrder npo = default, bool nullIfNull = default)
-        where T : class, IModelOfData
+        where T : class, IModelFromData
         => CodeApi.Cdf.AsCustomList<T>(source: source, npo: npo, nullIfNull: nullIfNull);
 
     #endregion

Src/Dnn/ToSic.Sxc.Dnn.Razor/Dnn/Razor/Sys/DnnRazorCompiler.cs

@@ -179,8 +179,13 @@ private void InitHelpers(RazorComponentBase webPage)
         // All children which are then generated here should re-use that CodeApiService
         if (_sharedCodeApiService == null)
         {
-            _sharedCodeApiService = exCtxFactory
-                .New(webPage, Block, Log, compatibilityFallback: CompatibilityLevels.CompatibilityLevel9Old);
+            _sharedCodeApiService = exCtxFactory.New(new()
+            {
+                OwnerOrNull = webPage,
+                BlockOrNull = Block,
+                ParentLog = Log,
+                CompatibilityFallback = CompatibilityLevels.CompatibilityLevel9Old,
+            });
 
             // Since we just created a new CodeApiService, we must add this razor engine to it's piggyback
             _sharedCodeApiService.GetPiggyBack(nameof(DnnRazorCompiler), () => this);

Src/Dnn/ToSic.Sxc.Dnn.WebApi/Custom/Hybrid/ApiTyped.cs

@@ -209,7 +209,7 @@ public ITypedStack AsStack(params object[] items)
 
     /// <inheritdoc cref="ITypedApi.AsStack{T}" />
     public T AsStack<T>(params object[] items)
-        where T : class, IModelOfData, new()
+        where T : class, IModelFromData, new()
         => CodeApi.Cdf.AsStack<T>(items);
 
     #endregion
@@ -299,12 +299,12 @@ public dynamic File(NoParamOrder npo = default,
 
     /// <inheritdoc />
     public T As<T>(object source, NoParamOrder npo = default)
-        where T : class, IModelOfData
+        where T : class, IModelFromData
         => CodeApi.Cdf.AsCustom<T>(source: source, npo: npo);
 
     /// <inheritdoc />
     public IEnumerable<T> AsList<T>(object source, NoParamOrder npo = default, bool nullIfNull = default)
-        where T : class, IModelOfData
+        where T : class, IModelFromData
         => CodeApi.Cdf.AsCustomList<T>(source, npo, nullIfNull);
 
     #endregion

Src/Dnn/ToSic.Sxc.Dnn.WebApi/Dnn/Backend/Cms/EditController.cs

@@ -19,32 +19,25 @@ public class EditController() : DnnSxcControllerBase(RealController.LogSuffix),
     /// <inheritdoc />
     [HttpPost]
     [AllowAnonymous] // will check security internally, so assume no requirements
-    public EditLoadDto Load([FromBody] List<ItemIdentifier> items, int appId)
-    {
-        var l = Log.Fn<EditLoadDto>($"Items: {items.Count}, AppId: {appId}");
-        return l.ReturnAsOk(Real.Load(items, appId));
-    }
+    public async Task<EditLoadDto> Load([FromBody] List<ItemIdentifier> items, int appId) =>
+        await Real.Load(items, appId);
 
 
     /// <inheritdoc />
     [HttpPost]
     [AllowAnonymous] // will check security internally, so assume no requirements
-    public Dictionary<Guid, int> Save([FromBody] EditSaveDto package, int appId, bool partOfPage)
-    {
-        var l = Log.Fn<Dictionary<Guid, int>>($"Items: {package?.Items?.Count}, AppId: {appId}, PartOfPage: {partOfPage}");
-        return l.ReturnAsOk(Real.Save(package, appId, partOfPage));
-    }
+    public async Task<Dictionary<Guid, int>> Save([FromBody] EditSaveDto package, int appId, bool partOfPage) =>
+        await Real.Save(package, appId, partOfPage);
 
     /// <inheritdoc />
     [HttpGet]
     [DnnModuleAuthorize(AccessLevel = SecurityAccessLevel.View)]
-    public LinkInfoDto LinkInfo(string link, int appId, string contentType = default, Guid guid = default,
-        string field = default)
-        => Real.LinkInfo(link, appId, contentType, guid, field);
+    public LinkInfoDto LinkInfo(string link, int appId, string contentType = default, Guid guid = default, string field = default) =>
+        Real.LinkInfo(link, appId, contentType, guid, field);
 
     /// <inheritdoc />
     [HttpPost]
     [DnnModuleAuthorize(AccessLevel = SecurityAccessLevel.View)]
-    public bool Publish(int id)
-        => Real.Publish(id);
+    public bool Publish(int id) =>
+        Real.Publish(id);
 }

Src/Dnn/ToSic.Sxc.Dnn.WebApi/Dnn/WebApi/Sys/ControllerBase/DynamicApiCompileCodeHelpers.cs

@@ -54,27 +54,32 @@ public void InitializeBlockContext(HttpRequestMessage request)
         Log.A($"HasBlock: {block != null}");
 
         var services = _sysHlp.GetService<ApiControllerDependencies>().ConnectServices(Log);
-        var codeRoot = services.ExCtxFactory
-            .New(_owner, block, Log, compatibilityFallback: CompatibilityLevels.CompatibilityLevel10);
+        var exCtx = services.ExCtxFactory.New(new()
+        {
+            OwnerOrNull = _owner,
+            BlockOrNull = block,
+            ParentLog = Log,
+            CompatibilityFallback = CompatibilityLevels.CompatibilityLevel10,
+        });
 
-        _sysHlp.ConnectToRoot(codeRoot);
+        _sysHlp.ConnectToRoot(exCtx);
 
-        AdamCode = codeRoot.GetService<AdamCode>();
+        AdamCode = exCtx.GetService<AdamCode>();
 
         // In case SxcBlock was null, there is no instance, but we may still need the app
-        var app = codeRoot.GetApp();
+        var app = exCtx.GetApp();
         if (app == null! /* Special: there are cases where it's null, even though the API doesn't show it */)
         {
             Log.A("DynCode.App is null");
             app = GetAppOrNullFromUrlParams(services, request);
             if (app != null)
-                ((IExCtxAttachApp)codeRoot).AttachApp(app);
+                ((IExCtxAttachApp)exCtx).AttachApp(app);
         }
 
         var reqProperties = request.Properties;
 
         // must run this after creating AppAndDataHelpers
-        reqProperties.Add(DnnConstants.DnnContextKey, (codeRoot as IHasDnn)?.Dnn);
+        reqProperties.Add(DnnConstants.DnnContextKey, (exCtx as IHasDnn)?.Dnn);
 
         /*if (*/
         reqProperties.TryGetTyped(SourceCodeConstants.SharedCodeRootPathKeyInCache, out string path);
@@ -85,7 +90,7 @@ public void InitializeBlockContext(HttpRequestMessage request)
         _sysHlp.WebApiLogging?.AddLogSpecs(block, app, currentPath, _sysHlp.GetService<CodeInfosInScope>());
 
 
-        return (codeRoot, path);
+        return (exCtx, path);
     }
 
 

Src/Dnn/ToSic.Sxc.Dnn/DnnPackageBuilder/ReleaseNotes.txt

@@ -1,5 +1,5 @@
 <p>
-    <b>2sxc v21.02.00</b>
+    <b>2sxc v21.03.00</b>
     <br><br>
     Note: 2sxc v20 cleans up a lot of old APIs, so it's called a <a href="https://go.2sxc.org/mot">MoT release</a> (Moment of Truth).
     <br><br>