-
-
Notifications
You must be signed in to change notification settings - Fork 774
Enhance Page Header Tag Management Functionality #7248
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.
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
zzmzaizai
wants to merge
10
commits into
dnnsoftware:develop
Choose a base branch
from
zzmzaizai:develop
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+1,168
−131
Open
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
315963d
feat(SEO): Add page header tag management functionality
e52cb88
Update DNN Platform/Website/Providers/DataProviders/SqlDataProvider/1…
zzmzaizai 7208846
refactor(PageHeaderTags): Adjust grid column width layout
7312f97
Merge branch 'dnnsoftware:develop' into develop
zzmzaizai bdb115d
fix: resolve issue where culture code was not passed when deleting po…
2b62ccf
refactor: Simplify the processing logic of page header tags and metadata
7679981
Merge branch 'develop' into develop
mitchelsellers 368ce78
Merge branch 'dnnsoftware:develop' into develop
zzmzaizai 88d7b53
chore: complete PageHeadText to PageHeaderTag migration and deprecation
d952013
Merge branch 'dnnsoftware:develop' into develop
zzmzaizai File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
152 changes: 152 additions & 0 deletions
152
DNN Platform/Library/Entities/Tabs/PageHeaderTagInfo.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,152 @@ | ||
| // Licensed to the .NET Foundation under one or more agreements. | ||
| // The .NET Foundation licenses this file to you under the MIT license. | ||
| // See the LICENSE file in the project root for more information | ||
|
|
||
| namespace DotNetNuke.Entities.Tabs | ||
| { | ||
| using System; | ||
| using System.Collections; | ||
| using System.Collections.Generic; | ||
| using System.Globalization; | ||
| using System.Linq; | ||
|
|
||
| using DotNetNuke.Common.Utilities; | ||
| using DotNetNuke.Entities.Portals; | ||
|
|
||
| public class PageHeaderTagInfo | ||
| { | ||
| public const string SettingPrefix = "PageHeaderTag_"; | ||
|
|
||
| public string Name { get; set; } | ||
|
|
||
| public string Content { get; set; } | ||
|
|
||
| public string SettingName => SettingPrefix + this.Name; | ||
|
|
||
| public static IList<PageHeaderTagInfo> FromSettings(IDictionary settings) | ||
| { | ||
| var items = new List<PageHeaderTagInfo>(); | ||
| if (settings == null) | ||
| { | ||
| return items; | ||
| } | ||
|
|
||
| foreach (DictionaryEntry entry in settings) | ||
| { | ||
| var key = Convert.ToString(entry.Key, CultureInfo.InvariantCulture); | ||
| if (string.IsNullOrEmpty(key) || !key.StartsWith(SettingPrefix, StringComparison.Ordinal)) | ||
| { | ||
| continue; | ||
| } | ||
|
|
||
| var name = key.Substring(SettingPrefix.Length); | ||
| if (string.IsNullOrWhiteSpace(name)) | ||
| { | ||
| continue; | ||
| } | ||
|
|
||
| items.Add(new PageHeaderTagInfo | ||
| { | ||
| Name = name, | ||
| Content = Convert.ToString(entry.Value, CultureInfo.InvariantCulture), | ||
| }); | ||
| } | ||
|
|
||
| return items.OrderBy(item => item.Name, StringComparer.OrdinalIgnoreCase).ToList(); | ||
| } | ||
|
|
||
| public static IList<PageHeaderTagInfo> GetTabItems(int tabId) | ||
| { | ||
| return FromSettings(TabController.Instance.GetTabSettings(tabId)); | ||
| } | ||
|
|
||
| public static IList<PageHeaderTagInfo> GetPortalItems(int portalId, string cultureCode = null) | ||
| { | ||
| var settings = string.IsNullOrEmpty(cultureCode) | ||
| ? PortalController.Instance.GetPortalSettings(portalId) | ||
| : PortalController.Instance.GetPortalSettings(portalId, cultureCode); | ||
|
|
||
| return FromSettings(new Hashtable(settings)); | ||
| } | ||
|
|
||
| public static string Render(IEnumerable<PageHeaderTagInfo> items) | ||
| { | ||
| if (items == null) | ||
| { | ||
| return string.Empty; | ||
| } | ||
|
|
||
| return string.Join(Environment.NewLine, items.Select(item => item.Content).Where(content => !string.IsNullOrWhiteSpace(content))); | ||
| } | ||
|
|
||
| public static void SaveTabItems(int tabId, IEnumerable<PageHeaderTagInfo> items) | ||
| { | ||
| var normalizedItems = Normalize(items); | ||
| var targetSettingNames = new HashSet<string>(normalizedItems.Select(item => item.SettingName), StringComparer.OrdinalIgnoreCase); | ||
| var existingSettingNames = TabController.Instance.GetTabSettings(tabId) | ||
| .Cast<DictionaryEntry>() | ||
| .Select(entry => Convert.ToString(entry.Key, CultureInfo.InvariantCulture)) | ||
| .Where(key => !string.IsNullOrEmpty(key)) | ||
| .ToList(); | ||
|
|
||
| foreach (var key in existingSettingNames) | ||
| { | ||
| if (key.StartsWith(SettingPrefix, StringComparison.Ordinal) && !targetSettingNames.Contains(key)) | ||
| { | ||
| TabController.Instance.DeleteTabSetting(tabId, key); | ||
| } | ||
| } | ||
|
|
||
| foreach (var item in normalizedItems) | ||
| { | ||
| TabController.Instance.UpdateTabSetting(tabId, item.SettingName, item.Content); | ||
| } | ||
| } | ||
|
Comment on lines
+82
to
+104
|
||
|
|
||
| public static void SavePortalItems(int portalId, IEnumerable<PageHeaderTagInfo> items, string cultureCode = null) | ||
| { | ||
| var normalizedItems = Normalize(items); | ||
| var targetSettingNames = new HashSet<string>(normalizedItems.Select(item => item.SettingName), StringComparer.OrdinalIgnoreCase); | ||
| var existingSettingNames = (string.IsNullOrEmpty(cultureCode) | ||
| ? PortalController.Instance.GetPortalSettings(portalId) | ||
| : PortalController.Instance.GetPortalSettings(portalId, cultureCode)) | ||
| .Keys | ||
| .Where(key => !string.IsNullOrEmpty(key)) | ||
| .ToList(); | ||
|
|
||
| foreach (var key in existingSettingNames) | ||
|
mitchelsellers marked this conversation as resolved.
|
||
| { | ||
| if (key.StartsWith(SettingPrefix, StringComparison.Ordinal) && !targetSettingNames.Contains(key)) | ||
| { | ||
| PortalController.DeletePortalSetting(portalId, key, cultureCode ?? Null.NullString); | ||
| } | ||
| } | ||
|
|
||
| foreach (var item in normalizedItems) | ||
| { | ||
| PortalController.Instance.UpdatePortalSetting(portalId, item.SettingName, item.Content, true, cultureCode ?? Null.NullString); | ||
| } | ||
| } | ||
|
|
||
| private static List<PageHeaderTagInfo> Normalize(IEnumerable<PageHeaderTagInfo> items) | ||
|
mitchelsellers marked this conversation as resolved.
|
||
| { | ||
| if (items == null) | ||
| { | ||
| return new List<PageHeaderTagInfo>(); | ||
| } | ||
|
|
||
| return items | ||
| .Where(item => item != null) | ||
| .Select(item => new PageHeaderTagInfo | ||
| { | ||
| Name = (item.Name ?? string.Empty).Trim(), | ||
| Content = item.Content ?? string.Empty, | ||
| }) | ||
| .Where(item => !string.IsNullOrWhiteSpace(item.Name) && !string.IsNullOrWhiteSpace(item.Content)) | ||
| .GroupBy(item => item.Name, StringComparer.OrdinalIgnoreCase) | ||
| .Select(group => group.Last()) | ||
| .OrderBy(item => item.Name, StringComparer.OrdinalIgnoreCase) | ||
| .ToList(); | ||
| } | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.