Skip to content

Fix for Issue: https://github.com/pnp/pnpcore/pull/1688 when try to deploy empty sections from XML-Template #1179

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Fix for Issue: https://github.com/pnp/pnpcore/pull/1688 when try to deploy empty sections from XML-Template #1179

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
106 changes: 56 additions & 50 deletions src/lib/PnP.Framework/Provisioning/ObjectHandlers/ObjectClientSidePages.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -527,7 +527,7 @@ private void CreatePage(Web web, ProvisioningTemplate template, TokenParser pars
{
var textControl = page.NewTextPart();
PnPCore.ControlFlexLayoutPosition controlFlexLayoutPosition = null;

if (control.ControlProperties.Any())
{
var textProperty = control.ControlProperties.First();
Expand All @@ -536,7 +536,7 @@ private void CreatePage(Web web, ProvisioningTemplate template, TokenParser pars
{
var json = JsonConvert.DeserializeObject<JObject>(control.JsonControlData);
SetZoneId(page.Sections[sectionCount].Columns[control.Column - 1], json);

if (section.Type == CanvasSectionType.FlexibleLayoutSection || section.Type == CanvasSectionType.FlexibleLayoutVerticalSection)
{
controlFlexLayoutPosition = GetControlFlexLayoutPosition(json);
Expand Down Expand Up @@ -733,67 +733,70 @@ private void CreatePage(Web web, ProvisioningTemplate template, TokenParser pars
baseControl = componentsToAdd.FirstOrDefault(p => p.Name.Equals(webPartName, StringComparison.InvariantCultureIgnoreCase));
}

PnPCore.IPageWebPart myWebPart=null;
PnPCore.IPageWebPart myWebPart = null;

if (baseControl != null)
{
myWebPart = page.NewWebPart(baseControl);
}
else
else if (string.IsNullOrWhiteSpace(control.JsonControlData))
{
if (!string.IsNullOrWhiteSpace(control.JsonControlData) && control.JsonControlData.Contains("\"controlType\":14"))
{
myWebPart = page.NewSectionBackgroundControl();
}
else
{
myWebPart = page.NewWebPart();
}
myWebPart = page.NewWebPart();
}

myWebPart.Order = control.Order;


//process JsonControlData to extract layout information for FL sections and special webparts
PnPCore.ControlFlexLayoutPosition controlFlexLayoutPosition = null;
if (!string.IsNullOrEmpty(control.JsonControlData))
{
var json = JsonConvert.DeserializeObject<JObject>(control.JsonControlData);
SetDefaultProperties(page.Sections[sectionCount].Columns[control.Column - 1], myWebPart, json, parser);

PnPCore.ControlFlexLayoutPosition controlFlexLayoutPosition = null;
if (section.Type == CanvasSectionType.FlexibleLayoutSection || section.Type == CanvasSectionType.FlexibleLayoutVerticalSection)
if (myWebPart == null)
{
controlFlexLayoutPosition = GetControlFlexLayoutPosition(json);
var controlTypeInt = json.TryGetValue("controlType", StringComparison.InvariantCultureIgnoreCase, out JToken controlTypeToken) ? controlTypeToken.Value<int>() : 0;
switch (controlTypeInt)
{
case 1: // emptySection
//dont add an empty section here, as this webpart will be added automatically when a section is added without any webparts
SetDefaultProperties(page.Sections[sectionCount].Columns[control.Column - 1], null, json, parser);
break;
case 14: // SectionBackgroundControl
myWebPart = page.NewSectionBackgroundControl();
break;
default: // custom web part
myWebPart = page.NewWebPart();
break;
}
}

if(myWebPart == null)
continue;

SetDefaultProperties(page.Sections[sectionCount].Columns[control.Column - 1], myWebPart, json, parser);
myWebPart.PropertiesJson = control.JsonControlData;

if (baseControl == null)
{
if (json["id"] != null && json["id"].Type != JTokenType.Null)
if(json.TryGetValue("id", StringComparison.InvariantCultureIgnoreCase, out JToken idToken) && Guid.TryParse(idToken.Value<string>(), out Guid webPartId))
{
if (Guid.TryParse(json["id"].Value<string>(), out Guid webPartId))
PropertyInfo propertyInfo = myWebPart.Type.GetProperty("WebPartId");
if (propertyInfo != null)
{
PropertyInfo propertyInfo = myWebPart.Type.GetProperty("WebPartId");
if (propertyInfo != null)
{
propertyInfo.SetValue(myWebPart, json["id"].Value<string>());
}
propertyInfo.SetValue(myWebPart, webPartId.ToString());
}
}
}
// Reduce column number by 1 due 0 start indexing
page.AddControl(myWebPart, page.Sections[sectionCount].Columns[control.Column - 1], control.Order, controlFlexLayoutPosition);
}
else
{
// Reduce column number by 1 due 0 start indexing
page.AddControl(myWebPart, page.Sections[sectionCount].Columns[control.Column - 1], control.Order);
}

// set properties using json string
if (!string.IsNullOrEmpty(control.JsonControlData))
{
myWebPart.PropertiesJson = control.JsonControlData;
if (section.Type == CanvasSectionType.FlexibleLayoutSection || section.Type == CanvasSectionType.FlexibleLayoutVerticalSection)
{
controlFlexLayoutPosition = GetControlFlexLayoutPosition(json);
}
}

if (myWebPart != null)
{
myWebPart.Order = control.Order;
// Reduce column number by 1 due 0 start indexing
page.AddControl(myWebPart, page.Sections[sectionCount].Columns[control.Column - 1], control.Order, controlFlexLayoutPosition);
}
//CHECK:
// set using property collection
//if (control.ControlProperties.Any())
Expand Down Expand Up @@ -1051,20 +1054,23 @@ private static PnPCore.ControlFlexLayoutPosition GetControlFlexLayoutPosition(JO

private static void SetDefaultProperties(PnPCore.ICanvasColumn canvasColumn, PnPCore.IPageWebPart myWebPart, JObject json, TokenParser parser)
{
if (json["instanceId"] != null && json["instanceId"].Type != JTokenType.Null)
if (myWebPart != null)
{
if (Guid.TryParse(json["instanceId"].Value<string>(), out Guid instanceId))
if (json["instanceId"] != null && json["instanceId"].Type != JTokenType.Null)
{
myWebPart.InstanceId = instanceId;
if (Guid.TryParse(json["instanceId"].Value<string>(), out Guid instanceId))
{
myWebPart.InstanceId = instanceId;
}
}
if (json["title"] != null && json["title"].Type != JTokenType.Null)
{
myWebPart.Title = parser.ParseString(json["title"].Value<string>());
}
if (json["description"] != null && json["description"].Type != JTokenType.Null)
{
myWebPart.Description = parser.ParseString(json["description"].Value<string>());
}
}
if (json["title"] != null && json["title"].Type != JTokenType.Null)
{
myWebPart.Title = parser.ParseString(json["title"].Value<string>());
}
if (json["description"] != null && json["description"].Type != JTokenType.Null)
{
myWebPart.Description = parser.ParseString(json["description"].Value<string>());
}

SetZoneId(canvasColumn, json);
Expand Down
Loading