Improve getting streams #2521 #2522

2sic · Sep 17, 2021 · 5f0fbed · 5f0fbed
1 parent 9a85f57
commit 5f0fbed
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 13 deletions.
diff --git a/Src/Dnn/ToSic.Sxc.Dnn/Dnn/Cms/DnnPagePublishing.cs b/Src/Dnn/ToSic.Sxc.Dnn/Dnn/Cms/DnnPagePublishing.cs
@@ -148,7 +148,7 @@ public void Publish(int instanceId, int version)
 
         private IEnumerable<IEntity> TryToAddStream(IEnumerable<IEntity> list, IBlockDataSource data, string key)
         {
-            var cont = data.Out.ContainsKey(key) ? data[key]?.List?.ToImmutableList() : null;
+            var cont = data.GetStream(key, nullIfNotFound: true)?.List.ToImmutableList(); //  data.Out.ContainsKey(key) ? data[key]?.List?.ToImmutableList() : null;
             Log.Add($"TryToAddStream(..., ..., key:{key}), found:{cont != null} add⋮{cont?.Count ?? 0}" );
             if (cont != null) list = list.Concat(cont);
             return list;

diff --git a/Src/Oqtane/ToSic.Sxc.Oqt.Server/Run/OqtPagePublishing.cs b/Src/Oqtane/ToSic.Sxc.Oqt.Server/Run/OqtPagePublishing.cs
@@ -1,13 +1,9 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using ToSic.Eav.Apps.Environment;
 using ToSic.Eav.Context;
-using ToSic.Eav.Data;
 using ToSic.Eav.Logging;
 using ToSic.Sxc.Cms.Publishing;
 using ToSic.Sxc.Context;
-using ToSic.Sxc.DataSources;
 using ToSic.Sxc.Oqt.Shared;
 
 
@@ -50,13 +46,13 @@ public void Publish(int instanceId, int version)
             Log.Add("publish never happened ");
         }
 
-        private IEnumerable<IEntity> TryToAddStream(IEnumerable<IEntity> list, IBlockDataSource data, string key)
-        {
-            var cont = data.Out.ContainsKey(key) ? data[key]?.List : null;
-            Log.Add($"TryToAddStream(..., ..., key:{key}), found:{cont != null} add⋮{cont?.Count() ?? 0}");
-            if (cont != null) list = list.Concat(cont);
-            return list;
-        }
+        //private IEnumerable<IEntity> TryToAddStream(IEnumerable<IEntity> list, IBlockDataSource data, string key)
+        //{
+        //    var cont = data.GetStream(key, nullIfNotFound: true)?.List; // data.Out.ContainsKey(key) ? data[key]?.List : null;
+        //    Log.Add($"TryToAddStream(..., ..., key:{key}), found:{cont != null} add⋮{cont?.Count() ?? 0}");
+        //    if (cont != null) list = list.Concat(cont);
+        //    return list;
+        //}
 
     }
 }
diff --git a/Src/Sxc/ToSic.Sxc/Code/DynamicCodeRoot_As.cs b/Src/Sxc/ToSic.Sxc/Code/DynamicCodeRoot_As.cs
@@ -106,7 +106,7 @@ public IEnumerable<dynamic> AsList(object list)
                 case null:
                     return new List<dynamic>();
                 case IDataSource dsEntities:
-                    return AsList(dsEntities[Eav.Constants.DefaultStreamName]);
+                    return AsList(dsEntities.List); // [Eav.Constants.DefaultStreamName]);
                 case IEnumerable<IEntity> iEntities:
                     return iEntities.Select(e => AsDynamic(e));
                 case IEnumerable<IDynamicEntity> dynIDynEnt: