make compatible with SXA local datasources

Author: IhorRomanko

src/Sitecore.Support.159068/Data/Fields/LayoutField.LinkRemover.cs

@@ -9,6 +9,8 @@
   using Sitecore.Diagnostics;
   using Sitecore.Layouts;
   using Sitecore.Links;
+  using Sitecore.Pipelines.ResolveRenderingDatasource;
+  using Sitecore.Pipelines;
 
   public partial class LayoutField
   {
@@ -17,6 +19,7 @@ private class LinkRemover
       #region Properties
 
       private readonly LayoutField layout;
+      private readonly Item currentContextItem;
 
       private static readonly MethodInfo GetParametersFieldsMethodInfo =
         typeof(Sitecore.Data.Fields.LayoutField).GetMethod("GetParametersFields",
@@ -26,9 +29,10 @@ private class LinkRemover
 
       #region C'tors
 
-      public LinkRemover(LayoutField layout)
+      public LinkRemover(LayoutField layout, Item currentContextItem)
       {
         this.layout = layout;
+        this.currentContextItem = currentContextItem;
       }
 
       #endregion
@@ -136,12 +140,23 @@ private void RemoveLinkFromRendering(ItemLink itemLink, RenderingDefinition rend
       {
         string targetItemId = itemLink.TargetItemID.ToString();
 
-        if (rendering.Datasource == itemLink.TargetPath)
+        string currentDatasource = rendering.Datasource;
+        if (!string.IsNullOrEmpty(rendering.Datasource))
+        {
+          using (new ContextItemSwitcher(currentContextItem))
+          {
+            ResolveRenderingDatasourceArgs resolveRenderingDatasourceArgs = new ResolveRenderingDatasourceArgs(rendering.Datasource);
+            CorePipeline.Run("resolveRenderingDatasource", resolveRenderingDatasourceArgs, false);
+            currentDatasource = resolveRenderingDatasourceArgs.Datasource;
+          }
+        }
+
+        if (currentDatasource != null && currentDatasource.Equals(itemLink.TargetPath, StringComparison.OrdinalIgnoreCase))
         {
           rendering.Datasource = string.Empty;
         }
 
-        if (rendering.Datasource == targetItemId)
+        if (currentDatasource == targetItemId)
         {
           rendering.Datasource = string.Empty;
         }

src/Sitecore.Support.159068/Data/Fields/LayoutField.cs

@@ -5,21 +5,19 @@
   using Sitecore.Diagnostics;
   using Sitecore.Layouts;
   using Sitecore.Links;
+  using Sitecore.Pipelines;
+  using Sitecore.Pipelines.ResolveRenderingDatasource;
   using Sitecore.Text;
   using System;
   using System.Collections;
   using System.Xml.Linq;
 
-  public partial class LayoutField: Sitecore.Data.Fields.LayoutField
+  public partial class LayoutField: Sitecore.XA.Foundation.SitecoreExtensions.CustomFields.LayoutField
   {
     public LayoutField(Item item) : base(item)
     {
     }
-
-    public LayoutField(Item item, string runtimeValue) : base(item, runtimeValue)
-    {
-    }
-
+    
     public LayoutField(Field innerField) : base(innerField)
     {
     }
@@ -30,7 +28,7 @@ public LayoutField(Field innerField, string runtimeValue) : base(innerField, run
 
     public override void RemoveLink(ItemLink itemLink)
     {
-      LinkRemover linkRemover = new LinkRemover(this);
+      LinkRemover linkRemover = new LinkRemover(this, base.InnerField.Item);
       linkRemover.RemoveLink(itemLink);
     }
     public override void Relink(ItemLink itemLink, Item newLink)
@@ -122,12 +120,23 @@ public override void Relink(ItemLink itemLink, Item newLink)
             rendering.ItemID = newLinkID;
           }
 
-          if (rendering.Datasource == targetItemID)
+          string currentDatasource = rendering.Datasource;
+          if (!string.IsNullOrEmpty(rendering.Datasource))
+          {
+            using (new ContextItemSwitcher(base.InnerField.Item))
+            {
+              ResolveRenderingDatasourceArgs resolveRenderingDatasourceArgs = new ResolveRenderingDatasourceArgs(rendering.Datasource);
+              CorePipeline.Run("resolveRenderingDatasource", resolveRenderingDatasourceArgs, false);
+              currentDatasource = resolveRenderingDatasourceArgs.Datasource;
+            }
+          }
+
+          if (currentDatasource == targetItemID)
           {
             rendering.Datasource = newLinkID;
           }
 
-          if (rendering.Datasource == itemLink.TargetPath)
+          if (currentDatasource != null && currentDatasource.Equals(itemLink.TargetPath, StringComparison.OrdinalIgnoreCase))
           {
             rendering.Datasource = newLink.Paths.FullPath;
           }
@@ -166,13 +175,5 @@ public override void Relink(ItemLink itemLink, Item newLink)
       this.Value = layoutDefinition.ToXml();
     }
 
-    private RenderingParametersFieldCollection GetParametersFields(Item layoutItem, string renderingParameters)
-    {
-      UrlString parameters = new UrlString(renderingParameters);
-      RenderingParametersFieldCollection parametersFields;
-      RenderingParametersFieldCollection.TryParse(layoutItem, parameters, out parametersFields);
-      return parametersFields;
-    }
-
   }
 }

src/Sitecore.Support.159068/Sitecore.Support.159068.csproj

@@ -46,6 +46,10 @@
       <HintPath>..\packages\SC.Sitecore.Kernel.9.0.1\lib\Sitecore.Kernel.dll</HintPath>
       <Private>False</Private>
     </Reference>
+    <Reference Include="Sitecore.XA.Foundation.SitecoreExtensions, Version=3.6.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\SXA90.Sitecore.XA.Foundation.SitecoreExtensions.1.6.0\lib\Sitecore.XA.Foundation.SitecoreExtensions.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Web" />

src/Sitecore.Support.159068/packages.config

@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="SC.Sitecore.Kernel" version="9.0.1" targetFramework="net462" />
-</packages>
+  <package id="SXA90.Sitecore.XA.Foundation.SitecoreExtensions" version="1.6.0" targetFramework="net462" />
+</packages>