Skip to content

fix for bug #4827 #5026

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

Merged
merged 6 commits into from
Aug 12, 2025
Merged

fix for bug #4827 #5026

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
004380d
fix for bug #4943
reshmee011 May 28, 2025
d4b6cd8
Merge branch 'dev' of https://github.com/reshmee011/powershell into dev
reshmee011 Jul 14, 2025
fb73ef1
Merge branch 'dev' of https://github.com/reshmee011/powershell into dev
reshmee011 Jul 16, 2025
01ebf1e
fix for bug 4827
reshmee011 Jul 16, 2025
84436d6
refactor code
reshmee011 Jul 17, 2025
c85b6a3
Merge branch 'dev' into sethomesite
gautamdsheth Aug 12, 2025
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
47 changes: 25 additions & 22 deletions src/Commands/Admin/SetHomeSite.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,55 +27,58 @@ public class SetHomeSite : PnPSharePointOnlineAdminCmdlet
protected override void ExecuteCmdlet()
{
Tenant.EnsureProperties(t => t.IsMultipleVivaConnectionsFlightEnabled, t => t.IsVivaHomeFlightEnabled);
HomeSiteConfigurationParam configurationParam;

bool hasVivaConnectionsDefaultStart = ParameterSpecified(nameof(VivaConnectionsDefaultStart));
bool hasDraftMode = ParameterSpecified(nameof(DraftMode));

// Replace the current configurationParam assignment block with the following:

configurationParam = null;
if (hasVivaConnectionsDefaultStart || hasDraftMode)
{
configurationParam = new();
if (hasVivaConnectionsDefaultStart)
{
configurationParam.vivaConnectionsDefaultStart = VivaConnectionsDefaultStart;
configurationParam.IsVivaConnectionsDefaultStartPresent = true;
}
if (hasDraftMode)
{
configurationParam.isInDraftMode = DraftMode;
configurationParam.IsInDraftModePresent = true;
}
}

if (Tenant.IsMultipleVivaConnectionsFlightEnabled)
{
if (Force || ShouldContinue("Before you update a home site or Viva Connections experiences, make sure you review the documentation at https://aka.ms/homesites.", Properties.Resources.Confirm))
{
IEnumerable<TargetedSiteDetails> enumerable = Tenant.GetTargetedSitesDetails()?.Where((TargetedSiteDetails hs) => !hs.IsVivaBackendSite);
AdminContext.ExecuteQueryRetry();
bool flag = false;
if (enumerable == null || enumerable.Count() == 0)
{
Tenant.AddHomeSite(HomeSiteUrl, 1, null);
AdminContext.ExecuteQueryRetry();
flag = true;
}
else if (enumerable.Count() == 1 && !IsSameSiteUrl(enumerable.First().Url, HomeSiteUrl))
{
Tenant.RemoveTargetedSite(enumerable.First().SiteId);
AdminContext.ExecuteQueryRetry();
Tenant.AddHomeSite(HomeSiteUrl, 1, null);
AdminContext.ExecuteQueryRetry();
flag = true;
}
HomeSiteConfigurationParam configurationParam = new()
{
vivaConnectionsDefaultStart = VivaConnectionsDefaultStart,
IsVivaConnectionsDefaultStartPresent = VivaConnectionsDefaultStart,
isInDraftMode = DraftMode,
IsInDraftModePresent = DraftMode || flag
};

ClientResult<TargetedSiteDetails> clientResult = Tenant.UpdateTargetedSite(HomeSiteUrl, configurationParam);

AdminContext.ExecuteQueryRetry();
WriteObject(clientResult.Value);
}
}
else if (Force || ShouldContinue("Before you set a Home site, make sure you review the documentation at https://aka.ms/homesites.", Properties.Resources.Confirm))
{
Tenant.ValidateVivaHomeParameterExists(VivaConnectionsDefaultStart);
HomeSiteConfigurationParam configuration = null;
if (VivaConnectionsDefaultStart || DraftMode)
{
configuration = new HomeSiteConfigurationParam
{
vivaConnectionsDefaultStart = VivaConnectionsDefaultStart,
IsVivaConnectionsDefaultStartPresent = VivaConnectionsDefaultStart,
isInDraftMode = DraftMode,
IsInDraftModePresent = DraftMode
};
}
ClientResult<string> clientResult = Tenant.SetSPHSiteWithConfiguration(HomeSiteUrl, configuration);
ClientResult<string> clientResult = Tenant.SetSPHSiteWithConfiguration(HomeSiteUrl, configurationParam);
AdminContext.ExecuteQueryRetry();
WriteObject(clientResult.Value);
}
Expand Down
Loading