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

get title and headcontent working again on interactive render mode #3818

Merged
merged 1 commit into from
Feb 16, 2024
Merged

get title and headcontent working again on interactive render mode #3818

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions Oqtane.Client/UI/InteractiveRenderMode.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ namespace Oqtane.UI
{
public static class InteractiveRenderMode
{
public static IComponentRenderMode GetInteractiveRenderMode(string runtime, bool prerender)
public static IComponentRenderMode? GetInteractiveRenderMode(string runtime, bool prerender)
{
switch (runtime)
{
Expand All @@ -17,7 +17,7 @@ public static IComponentRenderMode GetInteractiveRenderMode(string runtime, bool
case Runtimes.Auto:
return new InteractiveAutoRenderMode(prerender: prerender);
}
return new InteractiveServerRenderMode(prerender: prerender); // default to interactiver server
return null; // default to inherit existing render mode
}
}
}
24 changes: 0 additions & 24 deletions Oqtane.Client/UI/ThemeBuilder.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,30 +53,6 @@
{
headcontent = AddHeadContent(headcontent, PageState.Page.HeadContent);
}
if (PageState.RenderMode == RenderModes.Static)
{
string batch = DateTime.UtcNow.ToString("yyyyMMddHHmmssfff");
int count = 0;
foreach (Resource resource in PageState.Page.Resources.Where(item => item.ResourceType == ResourceType.Stylesheet && item.Level == ResourceLevel.Module))
{
// if (resource.Url.StartsWith("~"))
// {
// resource.Url = resource.Url.Replace("~", "/Themes/" + Utilities.GetTypeName(name) + "/").Replace("//", "/");
// }
if (!resource.Url.Contains("://") && PageState.Alias.BaseUrl != "" && !resource.Url.StartsWith(PageState.Alias.BaseUrl))
{
resource.Url = PageState.Alias.BaseUrl + resource.Url;
}

if (!headcontent.Contains(resource.Url, StringComparison.OrdinalIgnoreCase))
{
count++;
string id = "id=\"app-stylesheet-" + resource.Level.ToString().ToLower() + "-" + batch + "-" + count.ToString("00") + "\" ";
headcontent += "<link " + id + "rel=\"stylesheet\" href=\"" + resource.Url + "\"" + (!string.IsNullOrEmpty(resource.Integrity) ? " integrity=\"" + resource.Integrity + "\"" : "") + (!string.IsNullOrEmpty(resource.CrossOrigin) ? " crossorigin=\"" + resource.CrossOrigin + "\"" : "") + " type=\"text/css\"/>" + Environment.NewLine;
}
}

}
SiteState.Properties.HeadContent = headcontent;

DynamicComponent = builder =>
Expand Down
8 changes: 6 additions & 2 deletions Oqtane.Server/Components/App.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,12 +184,12 @@
}
}
ManageStyleSheets(resources, alias, theme.ThemeName);

// scripts
if (_renderMode == RenderModes.Static)
{
ManageScripts(resources, alias);
}

// scripts
if (_renderMode == RenderModes.Interactive && _runtime == Runtimes.Server)
{
_reconnectScript = CreateReconnectScript();
Expand Down Expand Up @@ -233,6 +233,10 @@
}

// create initial PageState
// page needs to be populated
// site.modules need to be populated
// user needs to be populated

_pageState = new PageState
{
Alias = alias,
Expand Down