Merge pull request #58 from RWS/develop

Merging all latest 2.2 updates to release branch
RWS · Jan 31, 2024 · 0c48bc1 · 0c48bc1
2 parents 71692ea + bfb0ea4
commit 0c48bc1
Show file tree

Hide file tree

Showing 27 changed files with 10 additions and 142 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-SDL Digital Experience Accelerator CM-side framework
+RWSDigital Experience Accelerator CM-side framework
 ===
 Build status
 ------------
@@ -27,7 +27,7 @@ If you really have to modify the DXA Core TBBs, we kindly request you to submit
 
 Support
 ---------------
-At SDL we take your investment in Digital Experience very seriously, if you encounter any issues with the Digital Experience Accelerator, please use one of the following channels:
+At RWS we take your investment in Digital Experience very seriously, if you encounter any issues with the Digital Experience Accelerator, please use one of the following channels:
 
 - Report issues directly in [this repository](https://github.com/sdl/dxa-content-management/issues)
 - Ask questions 24/7 on the SDL Tridion Community at https://tridion.stackexchange.com

diff --git a/Sdl.Web.Tridion.Templates.R2/Data/DataModelBuilder.cs b/Sdl.Web.Tridion.Templates.R2/Data/DataModelBuilder.cs
@@ -217,7 +217,7 @@ private object GetFieldValue(XmlElement xmlElement, int expandLinkDepth)
             if (xmlElement.SelectSingleElement("xhtml:*") != null)
             {
                 // XHTML field
-                return BuildRichTextModel(xmlElement);
+                return BuildRichTextModel(xmlElement, expandLinkDepth);
             }
 
             if (xmlElement.SelectSingleElement("*") != null)
@@ -292,7 +292,7 @@ private ViewModelData GetLinkFieldValue(IdentifiableObject linkedItem, int expan
             return Pipeline.CreateKeywordModel(linkedKeyword, expandLinkDepth - 1);
         }
 
-        protected RichTextData BuildRichTextModel(XmlElement xhtmlElement)
+        protected RichTextData BuildRichTextModel(XmlElement xhtmlElement, int expandLinkDepth = 0)
         {
             XmlDocument xmlDoc = xhtmlElement.OwnerDocument;
             IList<EntityModelData> embeddedEntities = new List<EntityModelData>();
@@ -301,7 +301,7 @@ protected RichTextData BuildRichTextModel(XmlElement xhtmlElement)
                 Component linkedComponent = Pipeline.Session.GetObject(xlinkElement) as Component;
                 if (xlinkElement.LocalName == "img" || ShouldBeEmbedded(linkedComponent))
                 {
-                    EntityModelData embeddedEntity = Pipeline.CreateEntityModel(linkedComponent, ct: null, expandLinkDepth: 0);
+                    EntityModelData embeddedEntity = Pipeline.CreateEntityModel(linkedComponent, ct: null, expandLinkDepth: expandLinkDepth);
 
                     // Map each attribute to a metadata field
 

diff --git a/cms/content/sites9/all-publications/Binaries/2-70-2048.tbbasm b/cms/content/sites9/all-publications/Binaries/2-70-2048.tbbasm
diff --git a/cms/content/sites9/all-publications/Binaries/2-80-2048.tbbasm b/cms/content/sites9/all-publications/Binaries/2-80-2048.tbbasm
diff --git a/cms/content/sites9/all-publications/TemplateBuildingBlocks/1-28-2048.xml b/cms/content/sites9/all-publications/TemplateBuildingBlocks/1-28-2048.xml
diff --git a/cms/content/sites9/all-publications/TemplateBuildingBlocks/1-34-2048.xml b/cms/content/sites9/all-publications/TemplateBuildingBlocks/1-34-2048.xml
@@ -11,9 +11,6 @@
   &lt;TemplateInvocation&gt;
     &lt;Template xlink:href="/webdav/000%20Empty/Building%20Blocks/Default%20Templates/Link%20Resolver.tbbcs" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:title="Link Resolver" /&gt;
   &lt;/TemplateInvocation&gt;
-  &lt;TemplateInvocation&gt;
-    &lt;Template xlink:href="/webdav/000%20Empty/Building%20Blocks/Default%20Templates/Target%20Group%20Personalization.tbbcs" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:title="Target Group Personalization" /&gt;
-  &lt;/TemplateInvocation&gt;
   &lt;TemplateInvocation&gt;
     &lt;Template xlink:href="/webdav/000%20Empty/Building%20Blocks/Default%20Templates/Cleanup%20Template.tbbcs" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:title="Cleanup Template" /&gt;
   &lt;/TemplateInvocation&gt;
@@ -36,6 +33,5 @@
     <Dependency dependencyType="TemplateLinkedItem" itemUrl="/webdav/000%20Empty/Building%20Blocks/Default%20Templates/Convert%20Xml%20to%20Html.tbbcs" linkName="ExtractedReferences[1]" />
     <Dependency dependencyType="TemplateLinkedItem" itemUrl="/webdav/000%20Empty/Building%20Blocks/Default%20Templates/Link%20Resolver.tbbcs" linkName="ExtractedReferences[2]" />
     <Dependency dependencyType="TemplateLinkedItem" itemUrl="/webdav/000%20Empty/Building%20Blocks/Default%20Templates/Publish%20Binaries%20in%20Package.tbbcs" linkName="ExtractedReferences[3]" />
-    <Dependency dependencyType="TemplateLinkedItem" itemUrl="/webdav/000%20Empty/Building%20Blocks/Default%20Templates/Target%20Group%20Personalization.tbbcs" linkName="ExtractedReferences[4]" />
   </Dependencies>
 </PackageItem>
diff --git a/cms/content/sites9/all-publications/TemplateBuildingBlocks/1-55-2048.xml b/cms/content/sites9/all-publications/TemplateBuildingBlocks/1-55-2048.xml
diff --git a/cms/content/sites9/all-publications/TemplateBuildingBlocks/2-72-2048.xml b/cms/content/sites9/all-publications/TemplateBuildingBlocks/2-72-2048.xml
@@ -10,7 +10,7 @@
     &lt;TemplateParameters&gt;
       &lt;Parameters xmlns="http://www.sdl.com/web/schemas/dynamicpage"&gt;
         &lt;expandLinkDepth xmlns="http://www.sdl.com/web/schemas/dynamicpage"&gt;2&lt;/expandLinkDepth&gt;
-        &lt;modelBuilderTypeNames&gt;DefaultModelBuilder;DefaultPageMetaModelBuilder;EclModelBuilder;ContextExpressionsModelBuilder&lt;/modelBuilderTypeNames&gt;
+        &lt;modelBuilderTypeNames&gt;DefaultModelBuilder;DefaultPageMetaModelBuilder;EclModelBuilder&lt;/modelBuilderTypeNames&gt;
       &lt;/Parameters&gt;
     &lt;/TemplateParameters&gt;
   &lt;/TemplateInvocation&gt;

diff --git a/cms/content/sites9/all-publications/index.xml b/cms/content/sites9/all-publications/index.xml
@@ -23,8 +23,6 @@
           <Item id="tcm:1-24-8" title="Link%20Resolver" extension="xsd" itemType="Schema" subtype="6" blueprintStatus="LocalItem" selected="false" exported="true" />
           <Item id="tcm:1-27-2048" title="Publish%20Binaries%20in%20Package" extension="tbbcs" itemType="TemplateBuildingBlock" blueprintStatus="LocalItem" selected="false" exported="true" />
           <Item id="tcm:1-26-8" title="Publish%20Binaries%20in%20Package" extension="xsd" itemType="Schema" subtype="6" blueprintStatus="LocalItem" selected="false" exported="true" />
-          <Item id="tcm:1-28-2048" title="Target%20Group%20Personalization" extension="tbbcs" itemType="TemplateBuildingBlock" blueprintStatus="LocalItem" selected="false" exported="true" />
-          <Item id="tcm:1-55-2048" title="Tridion%2EExtensions%2EContextExpressions%2ETemplates" extension="tbbasm" itemType="TemplateBuildingBlock" blueprintStatus="LocalItem" selected="false" exported="true" />
         </Item>
         <Item id="tcm:1-7-8192" title="Modified%20in%20the%20last%207%20days" itemType="VirtualFolder" blueprintStatus="LocalItem" selected="true" exported="true" />
         <Item id="tcm:1-9-8" title="Default%20Multimedia%20Schema" extension="xsd" itemType="Schema" subtype="1" blueprintStatus="LocalItem" selected="false" exported="true" />

diff --git a/cms/content/sites9/all-publications/mappings.xml b/cms/content/sites9/all-publications/mappings.xml
@@ -653,8 +653,6 @@
     <Mapping exportContext="/000%20Empty/Building%20Blocks/Default%20Templates" exportTitle="Extract%20Components%20from%20Regions.tbbcs" importContext="" importTitle="" />
     <Mapping exportContext="/000%20Empty/Building%20Blocks/Default%20Templates" exportTitle="Link%20Resolver.tbbcs" importContext="" importTitle="" />
     <Mapping exportContext="/000%20Empty/Building%20Blocks/Default%20Templates" exportTitle="Publish%20Binaries%20in%20Package.tbbcs" importContext="" importTitle="" />
-    <Mapping exportContext="/000%20Empty/Building%20Blocks/Default%20Templates" exportTitle="Target%20Group%20Personalization.tbbcs" importContext="" importTitle="" />
-    <Mapping exportContext="/000%20Empty/Building%20Blocks/Default%20Templates" exportTitle="Tridion%2EExtensions%2EContextExpressions%2ETemplates.tbbasm" importContext="" importTitle="" />
     <Mapping exportContext="/100%20Master/Building%20Blocks/Default%20Templates" exportTitle="Default%20Dreamweaver%20Page%20Design.dwt" importContext="" importTitle="" />
     <Mapping exportContext="/100%20Master/Building%20Blocks/Framework/Developer/Templates/DXA%2ELegacy" exportTitle="Add%20inherited%20metadata%20to%20component.tbbcs" importContext="" importTitle="" />
     <Mapping exportContext="/100%20Master/Building%20Blocks/Framework/Developer/Templates/DXA%2ELegacy" exportTitle="Add%20inherited%20metadata%20to%20page.tbbcs" importContext="" importTitle="" />

diff --git a/cms/content/sites9/framework-only/Binaries/2-70-2048.tbbasm b/cms/content/sites9/framework-only/Binaries/2-70-2048.tbbasm
diff --git a/cms/content/sites9/framework-only/Binaries/2-80-2048.tbbasm b/cms/content/sites9/framework-only/Binaries/2-80-2048.tbbasm
diff --git a/cms/content/sites9/framework-only/TemplateBuildingBlocks/1-28-2048.xml b/cms/content/sites9/framework-only/TemplateBuildingBlocks/1-28-2048.xml
diff --git a/cms/content/sites9/framework-only/TemplateBuildingBlocks/1-34-2048.xml b/cms/content/sites9/framework-only/TemplateBuildingBlocks/1-34-2048.xml
@@ -11,9 +11,6 @@
   &lt;TemplateInvocation&gt;
     &lt;Template xlink:href="/webdav/000%20Empty/Building%20Blocks/Default%20Templates/Link%20Resolver.tbbcs" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:title="Link Resolver" /&gt;
   &lt;/TemplateInvocation&gt;
-  &lt;TemplateInvocation&gt;
-    &lt;Template xlink:href="/webdav/000%20Empty/Building%20Blocks/Default%20Templates/Target%20Group%20Personalization.tbbcs" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:title="Target Group Personalization" /&gt;
-  &lt;/TemplateInvocation&gt;
   &lt;TemplateInvocation&gt;
     &lt;Template xlink:href="/webdav/000%20Empty/Building%20Blocks/Default%20Templates/Cleanup%20Template.tbbcs" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:title="Cleanup Template" /&gt;
   &lt;/TemplateInvocation&gt;
@@ -36,6 +33,5 @@
     <Dependency dependencyType="TemplateLinkedItem" itemUrl="/webdav/000%20Empty/Building%20Blocks/Default%20Templates/Convert%20Xml%20to%20Html.tbbcs" linkName="ExtractedReferences[1]" />
     <Dependency dependencyType="TemplateLinkedItem" itemUrl="/webdav/000%20Empty/Building%20Blocks/Default%20Templates/Link%20Resolver.tbbcs" linkName="ExtractedReferences[2]" />
     <Dependency dependencyType="TemplateLinkedItem" itemUrl="/webdav/000%20Empty/Building%20Blocks/Default%20Templates/Publish%20Binaries%20in%20Package.tbbcs" linkName="ExtractedReferences[3]" />
-    <Dependency dependencyType="TemplateLinkedItem" itemUrl="/webdav/000%20Empty/Building%20Blocks/Default%20Templates/Target%20Group%20Personalization.tbbcs" linkName="ExtractedReferences[4]" />
   </Dependencies>
 </PackageItem>
diff --git a/cms/content/sites9/framework-only/TemplateBuildingBlocks/1-55-2048.xml b/cms/content/sites9/framework-only/TemplateBuildingBlocks/1-55-2048.xml
diff --git a/cms/content/sites9/framework-only/TemplateBuildingBlocks/2-72-2048.xml b/cms/content/sites9/framework-only/TemplateBuildingBlocks/2-72-2048.xml
@@ -10,7 +10,7 @@
     &lt;TemplateParameters&gt;
       &lt;Parameters xmlns="http://www.sdl.com/web/schemas/dynamicpage"&gt;
         &lt;expandLinkDepth xmlns="http://www.sdl.com/web/schemas/dynamicpage"&gt;2&lt;/expandLinkDepth&gt;
-        &lt;modelBuilderTypeNames&gt;DefaultModelBuilder;DefaultPageMetaModelBuilder;EclModelBuilder;ContextExpressionsModelBuilder&lt;/modelBuilderTypeNames&gt;
+        &lt;modelBuilderTypeNames&gt;DefaultModelBuilder;DefaultPageMetaModelBuilder;EclModelBuilder&lt;/modelBuilderTypeNames&gt;
       &lt;/Parameters&gt;
     &lt;/TemplateParameters&gt;
   &lt;/TemplateInvocation&gt;

diff --git a/cms/content/sites9/framework-only/index.xml b/cms/content/sites9/framework-only/index.xml
@@ -23,8 +23,6 @@
           <Item id="tcm:1-24-8" title="Link%20Resolver" extension="xsd" itemType="Schema" subtype="6" blueprintStatus="LocalItem" selected="false" exported="true" />
           <Item id="tcm:1-27-2048" title="Publish%20Binaries%20in%20Package" extension="tbbcs" itemType="TemplateBuildingBlock" blueprintStatus="LocalItem" selected="false" exported="true" />
           <Item id="tcm:1-26-8" title="Publish%20Binaries%20in%20Package" extension="xsd" itemType="Schema" subtype="6" blueprintStatus="LocalItem" selected="false" exported="true" />
-          <Item id="tcm:1-28-2048" title="Target%20Group%20Personalization" extension="tbbcs" itemType="TemplateBuildingBlock" blueprintStatus="LocalItem" selected="false" exported="true" />
-          <Item id="tcm:1-55-2048" title="Tridion%2EExtensions%2EContextExpressions%2ETemplates" extension="tbbasm" itemType="TemplateBuildingBlock" blueprintStatus="LocalItem" selected="false" exported="true" />
         </Item>
         <Item id="tcm:1-9-8" title="Default%20Multimedia%20Schema" extension="xsd" itemType="Schema" subtype="1" blueprintStatus="LocalItem" selected="false" exported="true" />
       </Item>

diff --git a/cms/content/sites9/framework-only/mappings.xml b/cms/content/sites9/framework-only/mappings.xml
@@ -137,8 +137,6 @@
     <Mapping exportContext="/000%20Empty/Building%20Blocks/Default%20Templates" exportTitle="Extract%20Components%20from%20Regions.tbbcs" importContext="" importTitle="" />
     <Mapping exportContext="/000%20Empty/Building%20Blocks/Default%20Templates" exportTitle="Link%20Resolver.tbbcs" importContext="" importTitle="" />
     <Mapping exportContext="/000%20Empty/Building%20Blocks/Default%20Templates" exportTitle="Publish%20Binaries%20in%20Package.tbbcs" importContext="" importTitle="" />
-    <Mapping exportContext="/000%20Empty/Building%20Blocks/Default%20Templates" exportTitle="Target%20Group%20Personalization.tbbcs" importContext="" importTitle="" />
-    <Mapping exportContext="/000%20Empty/Building%20Blocks/Default%20Templates" exportTitle="Tridion%2EExtensions%2EContextExpressions%2ETemplates.tbbasm" importContext="" importTitle="" />
     <Mapping exportContext="/100%20Master/Building%20Blocks/Default%20Templates" exportTitle="Default%20Dreamweaver%20Page%20Design.dwt" importContext="" importTitle="" />
     <Mapping exportContext="/100%20Master/Building%20Blocks/Framework/Developer/Templates/DXA%2ELegacy" exportTitle="Add%20inherited%20metadata%20to%20component.tbbcs" importContext="" importTitle="" />
     <Mapping exportContext="/100%20Master/Building%20Blocks/Framework/Developer/Templates/DXA%2ELegacy" exportTitle="Add%20inherited%20metadata%20to%20page.tbbcs" importContext="" importTitle="" />

diff --git a/cms/content/sites9/master-only/Binaries/2-70-2048.tbbasm b/cms/content/sites9/master-only/Binaries/2-70-2048.tbbasm
diff --git a/cms/content/sites9/master-only/Binaries/2-80-2048.tbbasm b/cms/content/sites9/master-only/Binaries/2-80-2048.tbbasm
diff --git a/cms/content/sites9/master-only/TemplateBuildingBlocks/2-72-2048.xml b/cms/content/sites9/master-only/TemplateBuildingBlocks/2-72-2048.xml
@@ -10,7 +10,7 @@
     &lt;TemplateParameters&gt;
       &lt;Parameters xmlns="http://www.sdl.com/web/schemas/dynamicpage"&gt;
         &lt;expandLinkDepth xmlns="http://www.sdl.com/web/schemas/dynamicpage"&gt;2&lt;/expandLinkDepth&gt;
-        &lt;modelBuilderTypeNames&gt;DefaultModelBuilder;DefaultPageMetaModelBuilder;EclModelBuilder;ContextExpressionsModelBuilder&lt;/modelBuilderTypeNames&gt;
+        &lt;modelBuilderTypeNames&gt;DefaultModelBuilder;DefaultPageMetaModelBuilder;EclModelBuilder&lt;/modelBuilderTypeNames&gt;
       &lt;/Parameters&gt;
     &lt;/TemplateParameters&gt;
   &lt;/TemplateInvocation&gt;

diff --git a/cms/content/web8/all-publications/TemplateBuildingBlocks/1-26-2048.xml b/cms/content/web8/all-publications/TemplateBuildingBlocks/1-26-2048.xml