Skip to content
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

Jump to bottom

Pnp#727 #739

Open
wants to merge 2 commits into
base: dev
Choose a base branch
from
Open

Pnp#727 #739

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0a46372
Support for referencing content types from the content type hub
jekeblad Sep 13, 2022
3a30f42
Added retry on object list handler when trying to add content type fr…
jekeblad Sep 13, 2022
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
74 changes: 72 additions & 2 deletions src/lib/PnP.Framework/Provisioning/ObjectHandlers/ObjectListInstance.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
using Microsoft.SharePoint.Client;
using Microsoft.SharePoint.Client.Taxonomy;
using PnP.Core.Model;
using PnP.Core.QueryModel;
using PnP.Core.Services;
using PnP.Framework.Diagnostics;
using PnP.Framework.Entities;
using PnP.Framework.Extensions;
Expand All @@ -15,6 +18,7 @@
using System.Linq;
using System.Text;
using System.Text.RegularExpressions;
using System.Threading;
using System.Threading.Tasks;
using System.Xml.Linq;
using ContentType = Microsoft.SharePoint.Client.ContentType;
Expand Down Expand Up @@ -78,7 +82,10 @@ public override TokenParser ProvisionObjects(Web web, ProvisioningTemplate templ
templateList.Url = listParser.ParseString(templateList.Url);
currentListIndex++;
WriteSubProgress("List", templateList.Title, currentListIndex, total);
CheckContentTypes(web, template, scope, templateList);
if (!CheckContentTypes(web, template, scope, templateList).Wait(new TimeSpan(0, 2, 0)))
{
throw new Exception("Could not check content type");
}
// check if the List exists by url or by title
var index = existingLists.FindIndex(x => x.Title.Equals(listParser.ParseString(templateList.Title), StringComparison.OrdinalIgnoreCase) || x.RootFolder.ServerRelativeUrl.Equals(UrlUtility.Combine(serverRelativeUrl, templateList.Url), StringComparison.OrdinalIgnoreCase));

Expand Down Expand Up @@ -616,7 +623,7 @@ private static void ProcessPropertyBagEntries(TokenParser parser, PnPMonitoredSc
}
}

private static void CheckContentTypes(Web web, ProvisioningTemplate template, PnPMonitoredScope scope, ListInstance templateList)
private static async Task CheckContentTypes(Web web, ProvisioningTemplate template, PnPMonitoredScope scope, ListInstance templateList)
{
// Check for the presence of the references content types and throw an exception if not present or in template
if (!templateList.ContentTypesEnabled) return;
Expand All @@ -631,6 +638,21 @@ private static void CheckContentTypes(Web web, ProvisioningTemplate template, Pn
found = existingCts.Any(t => string.Equals(t.StringId, ct.ContentTypeId, StringComparison.InvariantCultureIgnoreCase));
}
if (!found)
{
using (PnPContext context = PnPCoreSdk.Instance.GetPnPContext(web.Context as ClientContext))
{
// Copy from content type hub if it exists
await context.ContentTypeHub.LoadAsync(p => p.ContentTypes.QueryProperties(p => p.Name, p => p.Description,
p => p.FieldLinks.QueryProperties(p => p.Name)));
// Get the content type you want to add
var contentType = context.ContentTypeHub.ContentTypes.AsRequested().FirstOrDefault(t => string.Equals(t.StringId, ct.ContentTypeId, StringComparison.InvariantCultureIgnoreCase));
if (contentType != null)
{
found = true;
}
}
}
if (!found)
{
scope.LogError("Referenced content type {0} not available in site or in template", ct.ContentTypeId);
throw new Exception($"Referenced content type {ct.ContentTypeId} not available in site or in template");
Expand Down Expand Up @@ -1597,6 +1619,54 @@ private void ConfigureContentTypes(Web web, List list, ListInstance templateList
),
searchInSiteHierarchy: true
);

if (tempCT == null)
{
using (PnPContext context = PnPCoreSdk.Instance.GetPnPContext(web.Context as ClientContext))
{
// Copy from content type hub if it exists
if (!context.ContentTypeHub.LoadAsync(p => p.ContentTypes.QueryProperties(p => p.Name, p => p.Description,
p => p.FieldLinks.QueryProperties(p => p.Name))).Wait(new TimeSpan(0, 1, 0)))
{
throw new Exception("Could not load content type hub content types");
}

// Get the content type you want to add
var pnpCT = context.ContentTypeHub.ContentTypes.AsRequested().FirstOrDefault(t => string.Equals(t.StringId, ctb.ContentTypeId, StringComparison.InvariantCultureIgnoreCase));
if (pnpCT != null)
{
var _list = context.Web.Lists.GetById(list.Id);
var ctWasAdded = false;
for (int i = 0; i < 10 && !ctWasAdded; i++)
{
try
{
_list.ContentTypes.AddAvailableContentTypeFromHubAsync(pnpCT.StringId).Wait(new TimeSpan(0, 1, 0));
ctWasAdded = true;
}
catch (Exception e)
{
if (i >= 9)
throw new Exception("Could not add content type from hub. Cause: " + e.Message, e);
ctWasAdded = false;
Thread.Sleep(i * i * 1000);
}
}
tempCT = web.GetContentTypeById(ctb.ContentTypeId, cts => cts.Include(
ct => ct.Id,
ct => ct.Name,
ct => ct.FieldLinks.Include(fl => fl.Id, fl => fl.Hidden)
),
searchInSiteHierarchy: true
);

list.ContentTypes.RefreshLoad();
list.Context.Load(list.ContentTypes);
list.Context.ExecuteQuery();
}
}
}

if (tempCT != null)
{
ContentTypeId existingContentTypeId = list.ContentTypes.BestMatch(ctb.ContentTypeId);
Expand Down