diff --git a/Directory.Build.props b/Directory.Build.props index 72d3c1d5..e1f15325 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -2,7 +2,7 @@ net10.0 Debug;Release - 10.0.4 + 10.1.0 Oqtane Shaun Walker .NET Foundation @@ -10,7 +10,7 @@ .NET Foundation https://www.oqtane.org https://github.com/oqtane/oqtane.framework/blob/dev/LICENSE - https://github.com/oqtane/oqtane.framework/releases/tag/v10.0.4 + https://github.com/oqtane/oqtane.framework/releases/tag/v10.1.0 https://github.com/oqtane/oqtane.framework Git diff --git a/Oqtane.Application/Client/Oqtane.Application.Client.csproj b/Oqtane.Application/Client/Oqtane.Application.Client.csproj index 69df010a..8874d9db 100644 --- a/Oqtane.Application/Client/Oqtane.Application.Client.csproj +++ b/Oqtane.Application/Client/Oqtane.Application.Client.csproj @@ -12,10 +12,10 @@ - - - - + + + + @@ -23,7 +23,7 @@ - + diff --git a/Oqtane.Application/Oqtane.Application.Template.nuspec b/Oqtane.Application/Oqtane.Application.Template.nuspec index e6c2bdb6..9ba1ed74 100644 --- a/Oqtane.Application/Oqtane.Application.Template.nuspec +++ b/Oqtane.Application/Oqtane.Application.Template.nuspec @@ -2,7 +2,7 @@ Oqtane.Application.Template - 10.0.4 + 10.1.0 Oqtane Application Template For Blazor Shaun Walker false diff --git a/Oqtane.Application/Server/Oqtane.Application.Server.csproj b/Oqtane.Application/Server/Oqtane.Application.Server.csproj index 9aed8cfc..3526407a 100644 --- a/Oqtane.Application/Server/Oqtane.Application.Server.csproj +++ b/Oqtane.Application/Server/Oqtane.Application.Server.csproj @@ -22,9 +22,9 @@ - - - + + + @@ -33,7 +33,7 @@ - + diff --git a/Oqtane.Application/Shared/Oqtane.Application.Shared.csproj b/Oqtane.Application/Shared/Oqtane.Application.Shared.csproj index fb8f617b..7689e461 100644 --- a/Oqtane.Application/Shared/Oqtane.Application.Shared.csproj +++ b/Oqtane.Application/Shared/Oqtane.Application.Shared.csproj @@ -11,7 +11,7 @@ - + diff --git a/Oqtane.Client/Extensions/OqtaneServiceCollectionExtensions.cs b/Oqtane.Client/Extensions/OqtaneServiceCollectionExtensions.cs index 70188b2d..4cb6c220 100644 --- a/Oqtane.Client/Extensions/OqtaneServiceCollectionExtensions.cs +++ b/Oqtane.Client/Extensions/OqtaneServiceCollectionExtensions.cs @@ -57,8 +57,8 @@ namespace Microsoft.Extensions.DependencyInjection services.AddScoped(); services.AddScoped(); services.AddScoped(); - services.AddScoped(); services.AddScoped(); + services.AddScoped(); services.AddScoped(); // providers diff --git a/Oqtane.Client/Modules/Admin/Site/Index.razor b/Oqtane.Client/Modules/Admin/Site/Index.razor index 473ce664..9aa6090f 100644 --- a/Oqtane.Client/Modules/Admin/Site/Index.razor +++ b/Oqtane.Client/Modules/Admin/Site/Index.razor @@ -18,8 +18,8 @@ @inject IJobService JobService @inject IStringLocalizer SharedLocalizer @inject IOutputCacheService CacheService -@inject ISiteGroupDefinitionService SiteGroupDefinitionService @inject ISiteGroupService SiteGroupService +@inject ISiteGroupMemberService SiteGroupMemberService @if (_initialized) { @@ -448,22 +448,22 @@ -
+
- @if (!_addSiteGroupDefinition) + @if (!_addSiteGroup) {
- +
- - @foreach (var siteGroupDefinition in _siteGroupDefinitions) + @foreach (var siteGroup in _siteGroups) { - + } - @if (!_addSiteGroupDefinition) + @if (!_addSiteGroup) { } @@ -471,109 +471,91 @@
} - @if (_siteGroupDefinitionId != -1 || _addSiteGroupDefinition) + @if (_siteGroupId != -1 || _addSiteGroup) {
- +
- +
- -
-
-
- -
- + + +
} - @if (_siteGroupDefinitionId != -1) + @if (_siteGroupId != -1) {
- +
+ @if (!_addSiteGroupMember) + { + + } + else + { + + }
} - @if (_siteGroupDefinitionId != -1) + @if (_siteGroupId != -1 && _siteId != -1) {
- +
- - - +
- @if (_member == "Secondary" && _synchronization == "True") + @if (_primary == "False" && (_groupType == SiteGroupTypes.Synchronization || _groupType == SiteGroupTypes.Comparison)) {
- +
- -
-
-
- -
- -
-
- @if (!string.IsNullOrEmpty(_synchronized)) - { -
- -
+
-
+ @if (!string.IsNullOrEmpty(_synchronized)) + { + + }
- } +
+
} }
- @if ((_siteGroupDefinitionId != -1 || _addSiteGroupDefinition)) + @if ((_siteGroupId != -1 || _addSiteGroup)) { - + } - @if ((_siteGroupDefinitionId != -1 && !_addSiteGroupDefinition) && _member != "False") + @if (_siteGroupId != -1 && !_addSiteGroup && _siteId != -1 && !_addSiteGroupMember) { - + } - @if (_addSiteGroupDefinition) + @if (_addSiteGroup) { - + }
@@ -605,10 +587,6 @@
- @if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host) && _siteGroupDefinitions.Any(item => item.PrimarySiteId == PageState.Site.SiteId && item.Synchronization)) - { - - }

@@ -685,18 +663,16 @@ private string _defaultalias; private bool _addAlias = false; - private List _siteGroupDefinitions = new List(); + private List _siteGroups = new List(); private List _sites = new List(); - private int _siteGroupDefinitionId = -1; + private int _siteGroupId = -1; private int _siteId; private string _groupName = string.Empty; - private string _synchronization = "True"; - private string _localization = "False"; - private string _member = "Primary"; - private string _synchronize = "True"; - private string _notify = "True"; + private string _groupType = SiteGroupTypes.Synchronization; + private string _primary = "True"; private string _synchronized = string.Empty; - private bool _addSiteGroupDefinition = false; + private bool _addSiteGroup = false; + private bool _addSiteGroupMember = false; private string _tenant = string.Empty; private string _database = string.Empty; @@ -1262,82 +1238,76 @@ private async Task LoadSiteGroups() { - _siteGroupDefinitions = await SiteGroupDefinitionService.GetSiteGroupDefinitionsAsync(); - _siteGroupDefinitionId = -1; - _addSiteGroupDefinition = false; + _siteGroups = await SiteGroupService.GetSiteGroupsAsync(); + _siteGroupId = -1; + _addSiteGroup = false; StateHasChanged(); } - private async void SiteGroupChanged(ChangeEventArgs e) + private async Task SiteGroupChanged(ChangeEventArgs e) { - _siteGroupDefinitionId = int.Parse(e.Value.ToString()); - if (_siteGroupDefinitionId != -1) + _siteGroupId = int.Parse(e.Value.ToString()); + if (_siteGroupId != -1) { - var group = _siteGroupDefinitions.FirstOrDefault(item => item.SiteGroupDefinitionId == _siteGroupDefinitionId); + var group = _siteGroups.FirstOrDefault(item => item.SiteGroupId == _siteGroupId); if (group != null) { _groupName = group.Name; - _synchronization = group.Synchronization.ToString(); - _localization = group.Localization.ToString(); + _groupType = group.Type; + _siteId = -1; + _primary = "False"; + _addSiteGroupMember = false; - if (_sites.Count == 0) - { - _sites = await SiteService.GetSitesAsync(); - } - _siteId = PageState.Site.SiteId; - _member = "False"; - - var siteGroups = await SiteGroupService.GetSiteGroupsAsync(-1, _siteGroupDefinitionId); - foreach (var site in _sites) - { - site.Fingerprint = ""; // used as temporary state - var siteGroup = siteGroups.FirstOrDefault(item => item.SiteId == site.SiteId); - if (siteGroup != null) - { - if (group.PrimarySiteId == site.SiteId) - { - site.Fingerprint = "Primary"; - } - else - { - site.Fingerprint = "Secondary"; - } - - if (siteGroup.SiteId == _siteId) - { - _member = site.Fingerprint; - _synchronize = siteGroup.Synchronize.ToString(); - _notify = siteGroup.Notify.ToString(); - _synchronized = UtcToLocal(siteGroup.SynchronizedOn).ToString(); - } - } - } + await LoadSites(); } } StateHasChanged(); } - private async void SiteChanged(ChangeEventArgs e) + private async Task LoadSites() { - _siteId = int.Parse(e.Value.ToString()); - var siteGroup = await SiteGroupService.GetSiteGroupAsync(_siteId, _siteGroupDefinitionId); - if (siteGroup != null) + var siteGroupMembers = await SiteGroupMemberService.GetSiteGroupMembersAsync(-1, _siteGroupId); + + _sites = await SiteService.GetSitesAsync(); + if (_addSiteGroupMember) { - if (siteGroup.SiteGroupDefinition.PrimarySiteId == _siteId) - { - _member = "Primary"; - } - else - { - _member = "Secondary"; - } - _synchronize = siteGroup.Synchronize.ToString(); - _notify = siteGroup.Notify.ToString(); - _synchronized = UtcToLocal(siteGroup.SynchronizedOn).ToString(); + // include sites which are not members + _sites = _sites.ExceptBy(siteGroupMembers.Select(item => item.SiteId), item => item.SiteId).ToList(); } else { - _member = "False"; + // include sites which are members + _sites = _sites.Where(item => siteGroupMembers.Any(item2 => item2.SiteId == item.SiteId)).ToList(); + var group = _siteGroups.FirstOrDefault(item => item.SiteGroupId == _siteGroupId); + foreach (var site in _sites) + { + if (group.PrimarySiteId == site.SiteId) + { + site.Name += $" ({Localizer["Primary"]})"; + } + else + { + site.Name += $" ({Localizer["Secondary"]})"; + } + } + + var siteGroupMember = siteGroupMembers.FirstOrDefault(item => item.SiteId == _siteId); + if (siteGroupMember != null) + { + _primary = (siteGroupMember.SiteGroup.PrimarySiteId == _siteId) ? "True" : "False"; + _synchronized = UtcToLocal(siteGroupMember.SynchronizedOn).ToString(); + } + } + } + + private async Task SiteChanged(ChangeEventArgs e) + { + _siteId = int.Parse(e.Value.ToString()); + var siteGroupMember = await SiteGroupMemberService.GetSiteGroupMemberAsync(_siteId, _siteGroupId); + if (siteGroupMember != null) + { + _primary = (siteGroupMember.SiteGroup.PrimarySiteId == _siteId) ? "True" : "False"; + _synchronized = UtcToLocal(siteGroupMember.SynchronizedOn).ToString(); } StateHasChanged(); } @@ -1346,129 +1316,121 @@ { _groupName = ""; _siteId = PageState.Site.SiteId; - _member = "Primary"; + _primary = "True"; _synchronized = ""; - _addSiteGroupDefinition = true; + _addSiteGroup = true; } - private async Task SaveSiteGroup() + private async Task AddSiteGroupMember() { - SiteGroupDefinition siteGroupDefinition = null; + _addSiteGroupMember = !_addSiteGroupMember; + _siteId = -1; + await LoadSites(); + } - if (_siteGroupDefinitionId == -1) + private async Task SaveSiteGroupMember() + { + if (string.IsNullOrEmpty(_groupName)) { - if (!string.IsNullOrEmpty(_groupName)) + AddModuleMessage(Localizer["Message.Required.GroupName"], MessageType.Warning); + await ScrollToPageTop(); + return; + } + + SiteGroup siteGroup = null; + + if (_siteGroupId == -1) + { + siteGroup = new SiteGroup { - siteGroupDefinition = new Models.SiteGroupDefinition - { - Name = _groupName, - PrimarySiteId = _siteId, - Synchronization = bool.Parse(_synchronization), - Localization = bool.Parse(_localization), - Synchronize = false - }; - siteGroupDefinition = await SiteGroupDefinitionService.AddSiteGroupDefinitionAsync(siteGroupDefinition); - } + Name = _groupName, + Type = _groupType, + PrimarySiteId = _siteId, + Synchronize = false + }; + siteGroup = await SiteGroupService.AddSiteGroupAsync(siteGroup); } else { - siteGroupDefinition = _siteGroupDefinitions.FirstOrDefault(item => item.SiteGroupDefinitionId == _siteGroupDefinitionId); - if (siteGroupDefinition != null && !string.IsNullOrEmpty(_groupName)) + siteGroup = _siteGroups.FirstOrDefault(item => item.SiteGroupId == _siteGroupId); + if (siteGroup != null) { - siteGroupDefinition.Name = _groupName; - siteGroupDefinition.PrimarySiteId = (_member == "Primary") ? _siteId : siteGroupDefinition.PrimarySiteId; - siteGroupDefinition.Synchronization = bool.Parse(_synchronization); - siteGroupDefinition.Localization = bool.Parse(_localization); - siteGroupDefinition = await SiteGroupDefinitionService.UpdateSiteGroupDefinitionAsync(siteGroupDefinition); + siteGroup.Name = _groupName; + siteGroup.Type = _groupType; + siteGroup.PrimarySiteId = (_primary == "True") ? _siteId : siteGroup.PrimarySiteId; + siteGroup = await SiteGroupService.UpdateSiteGroupAsync(siteGroup); } else { - siteGroupDefinition = null; + siteGroup = null; } } - if (siteGroupDefinition != null) + if (siteGroup != null) { - var siteGroup = await SiteGroupService.GetSiteGroupAsync(_siteId, siteGroupDefinition.SiteGroupDefinitionId); - if (siteGroup == null) + if (_siteId != -1) { - siteGroup = new SiteGroup + var siteGroupMember = await SiteGroupMemberService.GetSiteGroupMemberAsync(_siteId, siteGroup.SiteGroupId); + if (siteGroupMember == null) { - SiteGroupDefinitionId = siteGroupDefinition.SiteGroupDefinitionId, - SiteId = _siteId, - Synchronize = bool.Parse(_synchronize), - Notify = bool.Parse(_notify) - }; - await SiteGroupService.AddSiteGroupAsync(siteGroup); - } - else - { - if (_member == "False") - { - await SiteGroupService.DeleteSiteGroupAsync(siteGroup.SiteGroupId); + siteGroupMember = new SiteGroupMember + { + SiteGroupId = siteGroup.SiteGroupId, + SiteId = _siteId + }; + await SiteGroupMemberService.AddSiteGroupMemberAsync(siteGroupMember); } else { - siteGroup.Synchronize = bool.Parse(_synchronize); - siteGroup.Notify = bool.Parse(_notify); - await SiteGroupService.UpdateSiteGroupAsync(siteGroup); + siteGroupMember.SynchronizedOn = string.IsNullOrEmpty(_synchronized) ? null : siteGroupMember.SynchronizedOn; + await SiteGroupMemberService.UpdateSiteGroupMemberAsync(siteGroupMember); + } + } + + if (siteGroup.Type == SiteGroupTypes.Synchronization) + { + // enable synchronization job if it is not enabled already + var jobs = await JobService.GetJobsAsync(); + var job = jobs.FirstOrDefault(item => item.JobType == "Oqtane.Infrastructure.SynchronizationJob, Oqtane.Server"); + if (job != null && !job.IsEnabled) + { + job.IsEnabled = true; + await JobService.UpdateJobAsync(job); } } await LoadSiteGroups(); } - else - { - AddModuleMessage(Localizer["Message.Required.GroupName"], MessageType.Warning); - await ScrollToPageTop(); - } } - private async Task CancelSiteGroup() + private async Task CancelSiteGroupMember() { _groupName = ""; await LoadSiteGroups(); } - private async Task DeleteSiteGroup() + private async Task DeleteSiteGroupMember() { - if (_siteGroupDefinitionId != -1) + if (_siteGroupId != -1) { - var siteGroup = await SiteGroupService.GetSiteGroupAsync(PageState.Site.SiteId, _siteGroupDefinitionId); - if (siteGroup != null) + var siteGroupMember = await SiteGroupMemberService.GetSiteGroupMemberAsync(PageState.Site.SiteId, _siteGroupId); + if (siteGroupMember != null) { - await SiteGroupService.DeleteSiteGroupAsync(siteGroup.SiteGroupDefinitionId); + await SiteGroupMemberService.DeleteSiteGroupMemberAsync(siteGroupMember.SiteGroupId); } - var siteGroups = await SiteGroupService.GetSiteGroupsAsync(-1, _siteGroupDefinitionId); - if (!siteGroups.Any()) + var siteGroupMembers = await SiteGroupMemberService.GetSiteGroupMembersAsync(-1, _siteGroupId); + if (!siteGroupMembers.Any()) { - await SiteGroupDefinitionService.DeleteSiteGroupDefinitionAsync(_siteGroupDefinitionId); + await SiteGroupService.DeleteSiteGroupAsync(_siteGroupId); } await LoadSiteGroups(); } } - private async Task SynchronizeSite() + private async Task ResetSiteGroupMember() { - // enable synchronization job if it is not enabled already - var jobs = await JobService.GetJobsAsync(); - var job = jobs.FirstOrDefault(item => item.JobType == "Oqtane.Infrastructure.SynchronizationJob, Oqtane.Server"); - if (job != null && !job.IsEnabled) - { - job.IsEnabled = true; - await JobService.UpdateJobAsync(job); - } - - // mark secondary sites for synchronization - foreach (var group in _siteGroupDefinitions.Where(item => item.PrimarySiteId == PageState.Site.SiteId && item.Synchronization)) - { - group.Synchronize = true; - await SiteGroupDefinitionService.UpdateSiteGroupDefinitionAsync(group); - } - - AddModuleMessage(Localizer["Message.Site.Synchronize"], MessageType.Success); - await ScrollToPageTop(); + _synchronized = ""; } } diff --git a/Oqtane.Client/Modules/Admin/Users/Edit.razor b/Oqtane.Client/Modules/Admin/Users/Edit.razor index d629c8bb..eed0111b 100644 --- a/Oqtane.Client/Modules/Admin/Users/Edit.razor +++ b/Oqtane.Client/Modules/Admin/Users/Edit.razor @@ -224,7 +224,7 @@ { } - @if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host) && _isdeleted == "True") + @if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host) && _candelete) { } @@ -251,6 +251,7 @@ private string _lastlogin; private string _lastipaddress; private bool _ishost = false; + private bool _candelete = false; private string _passwordrequirements; private string _password = string.Empty; @@ -296,6 +297,7 @@ _timezoneid = PageState.User.TimeZoneId; _culturecode = PageState.User.CultureCode; _isdeleted = user.IsDeleted.ToString(); + _candelete = user.IsDeleted; _lastlogin = string.Format("{0:MMM dd yyyy HH:mm:ss}", UtcToLocal(user.LastLoginOn)); _lastipaddress = user.LastIPAddress; _ishost = UserSecurity.ContainsRole(user.Roles, RoleNames.Host); diff --git a/Oqtane.Client/Oqtane.Client.csproj b/Oqtane.Client/Oqtane.Client.csproj index e4249072..c1db2ae1 100644 --- a/Oqtane.Client/Oqtane.Client.csproj +++ b/Oqtane.Client/Oqtane.Client.csproj @@ -8,11 +8,11 @@ - - - - - + + + + + diff --git a/Oqtane.Client/Resources/Modules/Admin/Site/Index.resx b/Oqtane.Client/Resources/Modules/Admin/Site/Index.resx index b653285a..b12fb46d 100644 --- a/Oqtane.Client/Resources/Modules/Admin/Site/Index.resx +++ b/Oqtane.Client/Resources/Modules/Admin/Site/Index.resx @@ -498,17 +498,17 @@ A url for this site. This can include domain names (ie. domain.com), subdomains (ie. sub.domain.com) or virtual folders (ie. domain.com/folder). - + Group: - + The site groups in this tenant (database) - - Member? + + Primary? - - Indicates if the current site is a member of the selected group + + Indicates if the selected member is the primary site of the site group Name: @@ -516,18 +516,6 @@ Name of the site group - - Synchronization? - - - Specifies if the group supports content synchronization between the primary site and other sites in the group - - - Localization? - - - Specifies if the content of the sites in the group are localized - Primary @@ -540,43 +528,43 @@ Update - - Delete Site Group + + Delete Site Group Member - - Are You Sure You Wish To Delete {0}? + + Are You Sure You Wish To Delete This Member From The Site Group? - Group Name Is Required + Site Group Name Is Required Site Submitted For Synchronization - - Synchronize - - - Notify? - - - Specifies if site administrators should be notified of any synchronization activity - - Site: + Members: - The sites in this tenant (database) + The sites which are members of this site group Synchronized: + + Type: + + + The site group type (ie. synchronization, comparison, localization) + - The date/time of the last synchronization for the site + The date/time when the site was last synchronized - - Synchronize? + + Synchronization - - Specifies the synchronization approach between the primary site and the selected site + + Localization + + + Comparison \ No newline at end of file diff --git a/Oqtane.Client/Resources/Themes/Controls/ControlPanelInteractive.resx b/Oqtane.Client/Resources/Themes/Controls/ControlPanelInteractive.resx index 15c567fc..5247824e 100644 --- a/Oqtane.Client/Resources/Themes/Controls/ControlPanelInteractive.resx +++ b/Oqtane.Client/Resources/Themes/Controls/ControlPanelInteractive.resx @@ -174,9 +174,6 @@ Title: - - Check For System Updates - Visibility: @@ -200,5 +197,8 @@ Copy Existing Module - + + + Synchronize Site + \ No newline at end of file diff --git a/Oqtane.Client/Services/SiteGroupDefinitionService.cs b/Oqtane.Client/Services/SiteGroupDefinitionService.cs deleted file mode 100644 index 4f9728e6..00000000 --- a/Oqtane.Client/Services/SiteGroupDefinitionService.cs +++ /dev/null @@ -1,83 +0,0 @@ -using Oqtane.Models; -using System.Threading.Tasks; -using System.Net.Http; -using System.Collections.Generic; -using Oqtane.Documentation; -using Oqtane.Shared; -using System.Linq; - -namespace Oqtane.Services -{ - /// - /// Service to manage s on a - /// - public interface ISiteGroupDefinitionService - { - /// - /// Get all s - /// - /// - Task> GetSiteGroupDefinitionsAsync(); - - /// - /// Get one specific - /// - /// ID-reference of a - /// - Task GetSiteGroupDefinitionAsync(int siteGroupDefinitionId); - - /// - /// Add / save a new to the database. - /// - /// - /// - Task AddSiteGroupDefinitionAsync(SiteGroupDefinition siteGroupDefinition); - - /// - /// Update a in the database. - /// - /// - /// - Task UpdateSiteGroupDefinitionAsync(SiteGroupDefinition siteGroupDefinition); - - /// - /// Delete a in the database. - /// - /// ID-reference of a - /// - Task DeleteSiteGroupDefinitionAsync(int siteGroupDefinitionId); - } - - [PrivateApi("Don't show in the documentation, as everything should use the Interface")] - public class SiteGroupDefinitionService : ServiceBase, ISiteGroupDefinitionService - { - public SiteGroupDefinitionService(HttpClient http, SiteState siteState) : base(http, siteState) { } - - private string Apiurl => CreateApiUrl("SiteGroupDefinition"); - - public async Task> GetSiteGroupDefinitionsAsync() - { - return await GetJsonAsync>($"{Apiurl}", Enumerable.Empty().ToList()); - } - - public async Task GetSiteGroupDefinitionAsync(int siteGroupDefinitionId) - { - return await GetJsonAsync($"{Apiurl}/{siteGroupDefinitionId}"); - } - - public async Task AddSiteGroupDefinitionAsync(SiteGroupDefinition siteGroupDefinition) - { - return await PostJsonAsync(Apiurl, siteGroupDefinition); - } - - public async Task UpdateSiteGroupDefinitionAsync(SiteGroupDefinition siteGroupDefinition) - { - return await PutJsonAsync($"{Apiurl}/{siteGroupDefinition.SiteGroupDefinitionId}", siteGroupDefinition); - } - - public async Task DeleteSiteGroupDefinitionAsync(int siteGroupDefinitionId) - { - await DeleteAsync($"{Apiurl}/{siteGroupDefinitionId}"); - } - } -} diff --git a/Oqtane.Client/Services/SiteGroupMemberService.cs b/Oqtane.Client/Services/SiteGroupMemberService.cs new file mode 100644 index 00000000..22bee97f --- /dev/null +++ b/Oqtane.Client/Services/SiteGroupMemberService.cs @@ -0,0 +1,104 @@ +using Oqtane.Models; +using System.Threading.Tasks; +using System.Net.Http; +using System.Collections.Generic; +using Oqtane.Documentation; +using Oqtane.Shared; +using System.Linq; + +namespace Oqtane.Services +{ + /// + /// Service to manage s on a + /// + public interface ISiteGroupMemberService + { + /// + /// Get all s + /// + /// + Task> GetSiteGroupMembersAsync(int siteId, int siteGroupId); + + /// + /// Get one specific + /// + /// ID-reference of a + /// + Task GetSiteGroupMemberAsync(int siteGroupMemberId); + + /// + /// Get one specific + /// + /// ID-reference of a + /// ID-reference of a + /// + Task GetSiteGroupMemberAsync(int siteId, int siteGroupId); + + /// + /// Add / save a new to the database. + /// + /// + /// + Task AddSiteGroupMemberAsync(SiteGroupMember siteGroupMember); + + /// + /// Update a in the database. + /// + /// + /// + Task UpdateSiteGroupMemberAsync(SiteGroupMember siteGroupMember); + + /// + /// Delete a in the database. + /// + /// ID-reference of a + /// + Task DeleteSiteGroupMemberAsync(int siteGroupMemberId); + } + + [PrivateApi("Don't show in the documentation, as everything should use the Interface")] + public class SiteGroupMemberService : ServiceBase, ISiteGroupMemberService + { + public SiteGroupMemberService(HttpClient http, SiteState siteState) : base(http, siteState) { } + + private string Apiurl => CreateApiUrl("SiteGroupMember"); + + public async Task> GetSiteGroupMembersAsync(int siteId, int siteGroupId) + { + return await GetJsonAsync>($"{Apiurl}?siteid={siteId}&groupid={siteGroupId}", Enumerable.Empty().ToList()); + } + + public async Task GetSiteGroupMemberAsync(int siteGroupMemberId) + { + return await GetJsonAsync($"{Apiurl}/{siteGroupMemberId}"); + } + + public async Task GetSiteGroupMemberAsync(int siteId, int siteGroupId) + { + var siteGroupMembers = await GetSiteGroupMembersAsync(siteId, siteGroupId); + if (siteGroupMembers != null && siteGroupMembers.Count > 0) + { + return siteGroupMembers[0]; + } + else + { + return null; + } + } + + public async Task AddSiteGroupMemberAsync(SiteGroupMember siteGroupMember) + { + return await PostJsonAsync(Apiurl, siteGroupMember); + } + + public async Task UpdateSiteGroupMemberAsync(SiteGroupMember siteGroupMember) + { + return await PutJsonAsync($"{Apiurl}/{siteGroupMember.SiteGroupId}", siteGroupMember); + } + + public async Task DeleteSiteGroupMemberAsync(int siteGroupMemberId) + { + await DeleteAsync($"{Apiurl}/{siteGroupMemberId}"); + } + } +} diff --git a/Oqtane.Client/Services/SiteGroupService.cs b/Oqtane.Client/Services/SiteGroupService.cs index 8cae99f7..83a63242 100644 --- a/Oqtane.Client/Services/SiteGroupService.cs +++ b/Oqtane.Client/Services/SiteGroupService.cs @@ -17,43 +17,41 @@ namespace Oqtane.Services /// Get all s /// /// - Task> GetSiteGroupsAsync(int siteId, int siteGroupDefinitionId); + Task> GetSiteGroupsAsync(); + + /// + /// Get all s + /// + /// + Task> GetSiteGroupsAsync(int primarySiteId); /// /// Get one specific /// - /// ID-reference of a + /// ID-reference of a /// - Task GetSiteGroupAsync(int siteSiteGroupDefinitionId); - - /// - /// Get one specific - /// - /// ID-reference of a - /// ID-reference of a - /// - Task GetSiteGroupAsync(int siteId, int siteGroupDefinitionId); + Task GetSiteGroupAsync(int siteGroupId); /// /// Add / save a new to the database. /// - /// + /// /// Task AddSiteGroupAsync(SiteGroup siteGroup); /// /// Update a in the database. /// - /// + /// /// Task UpdateSiteGroupAsync(SiteGroup siteGroup); /// /// Delete a in the database. /// - /// ID-reference of a + /// ID-reference of a /// - Task DeleteSiteGroupAsync(int siteSiteGroupDefinitionId); + Task DeleteSiteGroupAsync(int siteGroupId); } [PrivateApi("Don't show in the documentation, as everything should use the Interface")] @@ -63,27 +61,19 @@ namespace Oqtane.Services private string Apiurl => CreateApiUrl("SiteGroup"); - public async Task> GetSiteGroupsAsync(int siteId, int siteGroupDefinitionId) + public async Task> GetSiteGroupsAsync() { - return await GetJsonAsync>($"{Apiurl}?siteid={siteId}&groupid={siteGroupDefinitionId}", Enumerable.Empty().ToList()); + return await GetSiteGroupsAsync(-1); } - public async Task GetSiteGroupAsync(int siteSiteGroupDefinitionId) + public async Task> GetSiteGroupsAsync(int primarySiteId) { - return await GetJsonAsync($"{Apiurl}/{siteSiteGroupDefinitionId}"); + return await GetJsonAsync>($"{Apiurl}?siteid={primarySiteId}", Enumerable.Empty().ToList()); } - public async Task GetSiteGroupAsync(int siteId, int siteGroupDefinitionId) + public async Task GetSiteGroupAsync(int siteGroupId) { - var siteGroups = await GetSiteGroupsAsync(siteId, siteGroupDefinitionId); - if (siteGroups != null && siteGroups.Count > 0) - { - return siteGroups[0]; - } - else - { - return null; - } + return await GetJsonAsync($"{Apiurl}/{siteGroupId}"); } public async Task AddSiteGroupAsync(SiteGroup siteGroup) @@ -93,12 +83,12 @@ namespace Oqtane.Services public async Task UpdateSiteGroupAsync(SiteGroup siteGroup) { - return await PutJsonAsync($"{Apiurl}/{siteGroup.SiteGroupDefinitionId}", siteGroup); + return await PutJsonAsync($"{Apiurl}/{siteGroup.SiteGroupId}", siteGroup); } - public async Task DeleteSiteGroupAsync(int siteSiteGroupDefinitionId) + public async Task DeleteSiteGroupAsync(int siteGroupId) { - await DeleteAsync($"{Apiurl}/{siteSiteGroupDefinitionId}"); + await DeleteAsync($"{Apiurl}/{siteGroupId}"); } } } diff --git a/Oqtane.Client/Themes/Controls/Theme/ControlPanel.razor b/Oqtane.Client/Themes/Controls/Theme/ControlPanel.razor index 78fb7a40..7fcf2542 100644 --- a/Oqtane.Client/Themes/Controls/Theme/ControlPanel.razor +++ b/Oqtane.Client/Themes/Controls/Theme/ControlPanel.razor @@ -4,6 +4,11 @@ @inject IPageService PageService @inject ISettingService SettingService +@if (ShowLanguageSwitcher) +{ + +} + @if (ShowEditMode && (_showEditMode || (PageState.Page.IsPersonalizable && PageState.User != null && UserSecurity.IsAuthorized(PageState.User, RoleNames.Registered)))) {
@@ -48,11 +53,9 @@ [Parameter] public string BodyClass { get; set; } = "offcanvas-body overflow-auto"; - // deprecated in 10.1.0 - UI culture is set in user's profile [Parameter] public bool ShowLanguageSwitcher { get; set; } = true; - // deprecated in 10.1.0 - UI culture is set in user's profile [Parameter] public string LanguageDropdownAlignment { get; set; } = string.Empty; // Empty or Left or Right @@ -94,6 +97,7 @@ Alias = PageState.Alias, Site = new Site { + SiteId = PageState.Site.SiteId, DefaultContainerType = PageState.Site.DefaultContainerType, Settings = PageState.Site.Settings, Themes = PageState.Site.Themes diff --git a/Oqtane.Client/Themes/Controls/Theme/ControlPanelInteractive.razor b/Oqtane.Client/Themes/Controls/Theme/ControlPanelInteractive.razor index b702ad8d..2b126f25 100644 --- a/Oqtane.Client/Themes/Controls/Theme/ControlPanelInteractive.razor +++ b/Oqtane.Client/Themes/Controls/Theme/ControlPanelInteractive.razor @@ -11,6 +11,7 @@ @inject ILogService logger @inject ISettingService SettingService @inject IJSRuntime jsRuntime +@inject ISiteGroupService SiteGroupService @inject IServiceProvider ServiceProvider @inject ILogService LoggingService @inject IStringLocalizer Localizer @@ -34,6 +35,11 @@
+ @if (_siteGroups.Any(item => (item.Type == SiteGroupTypes.Synchronization || item.Type == SiteGroupTypes.Comparison) && item.PrimarySiteId == PageState.Site.SiteId)) + { +
+ + }
} @if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.Edit, PageState.Page.PermissionList)) @@ -257,6 +263,7 @@ private List _pages = new List(); private List _modules = new List(); private List _containers = new List(); + private List _siteGroups = new List(); private string _category = "Common"; private string _pane = ""; @@ -287,6 +294,7 @@ _allModuleDefinitions = await ModuleDefinitionService.GetModuleDefinitionsAsync(PageState.Page.SiteId); _moduleDefinitions = _allModuleDefinitions.Where(item => item.Categories.Contains(_category)).ToList(); _categories = _allModuleDefinitions.SelectMany(m => m.Categories.Split(',', StringSplitOptions.RemoveEmptyEntries)).Distinct().Where(item => item != "Headless").ToList(); + _siteGroups = await SiteGroupService.GetSiteGroupsAsync(PageState.Site.SiteId); } } @@ -631,4 +639,14 @@ { _message = ""; } + + private async Task SynchronizeSite() + { + foreach (var group in _siteGroups.Where(item => (item.Type == SiteGroupTypes.Synchronization || item.Type == SiteGroupTypes.Comparison) && item.PrimarySiteId == PageState.Site.SiteId)) + { + group.Synchronize = true; + await SiteGroupService.UpdateSiteGroupAsync(group); + } + NavigationManager.NavigateTo(Utilities.NavigateUrl(PageState.Alias.Path, PageState.Page.Path, ""), true); + } } diff --git a/Oqtane.Client/Themes/Controls/Theme/LanguageSelector.razor b/Oqtane.Client/Themes/Controls/Theme/LanguageSelector.razor deleted file mode 100644 index 4a8e1277..00000000 --- a/Oqtane.Client/Themes/Controls/Theme/LanguageSelector.razor +++ /dev/null @@ -1,37 +0,0 @@ -@using System.Globalization -@using Oqtane.Models -@using System.Linq -@namespace Oqtane.Themes.Controls -@inherits ThemeControlBase -@inject ILocalizationService LocalizationService -@inject NavigationManager NavigationManager - -@if (PageState.Site.Languages.Count() > 1) -{ -
- -
- @foreach (var language in PageState.Site.Languages) - { - @language.Name - } -
-
-} - -@code{ - private string MenuAlignment = string.Empty; - - [Parameter] - public string DropdownAlignment { get; set; } = string.Empty; // Empty or Left or Right - - [Parameter] - public string ButtonClass { get; set; } = "btn-outline-secondary"; - - protected override async Task OnParametersSetAsync() - { - MenuAlignment = DropdownAlignment.ToLower() == "right" ? "dropdown-menu-end" : string.Empty; - } -} diff --git a/Oqtane.Client/Themes/Controls/Theme/LanguageSwitcher.razor b/Oqtane.Client/Themes/Controls/Theme/LanguageSwitcher.razor index 03cdcbaa..d049e436 100644 --- a/Oqtane.Client/Themes/Controls/Theme/LanguageSwitcher.razor +++ b/Oqtane.Client/Themes/Controls/Theme/LanguageSwitcher.razor @@ -6,22 +6,29 @@ @inject ILocalizationCookieService LocalizationCookieService @inject NavigationManager NavigationManager -@if (_supportedCultures?.Count() > 1) +@if (PageState.Site.Languages.Count() > 1) {
- @foreach (var culture in _supportedCultures) + @foreach (var language in PageState.Site.Languages) { - @if (PageState.RenderMode == RenderModes.Interactive) + @if (_contentLocalization) { - @culture.DisplayName + @language.Name } else { - @culture.DisplayName + @if (PageState.RenderMode == RenderModes.Interactive) + { + @language.Name + } + else + { + @language.Name + } } }
@@ -29,7 +36,7 @@ } @code{ - private IEnumerable _supportedCultures; + private bool _contentLocalization; private string MenuAlignment = string.Empty; [Parameter] @@ -41,12 +48,13 @@ { MenuAlignment = DropdownAlignment.ToLower() == "right" ? "dropdown-menu-end" : string.Empty; - _supportedCultures = PageState.Languages.Select(l => new Culture { Name = l.Code, DisplayName = l.Name }); + // if AliasName is populated it means the site is using content localization + _contentLocalization = PageState.Languages.Any(item => !string.IsNullOrEmpty(item.AliasName)); if (PageState.QueryString.ContainsKey("culture")) { var culture = PageState.QueryString["culture"]; - if (_supportedCultures.Any(item => item.Name == culture)) + if (PageState.Site.Languages.Any(item => item.Code == culture)) { await LocalizationCookieService.SetLocalizationCookieAsync(culture); } diff --git a/Oqtane.Client/Themes/OqtaneTheme/Themes/Default.razor b/Oqtane.Client/Themes/OqtaneTheme/Themes/Default.razor index b54570ed..f4fe08d6 100644 --- a/Oqtane.Client/Themes/OqtaneTheme/Themes/Default.razor +++ b/Oqtane.Client/Themes/OqtaneTheme/Themes/Default.razor @@ -11,7 +11,6 @@ -
diff --git a/Oqtane.Maui/Oqtane.Maui.csproj b/Oqtane.Maui/Oqtane.Maui.csproj index 6c64032d..18f449d8 100644 --- a/Oqtane.Maui/Oqtane.Maui.csproj +++ b/Oqtane.Maui/Oqtane.Maui.csproj @@ -18,7 +18,7 @@ com.oqtane.maui - 10.0.4 + 10.1.0 1 @@ -54,11 +54,11 @@ - - - - - + + + + + diff --git a/Oqtane.Package/Oqtane.Client.nuspec b/Oqtane.Package/Oqtane.Client.nuspec index 708e1d4d..42696e16 100644 --- a/Oqtane.Package/Oqtane.Client.nuspec +++ b/Oqtane.Package/Oqtane.Client.nuspec @@ -2,7 +2,7 @@ Oqtane.Client - 10.0.4 + 10.1.0 Shaun Walker .NET Foundation Oqtane Framework @@ -12,18 +12,18 @@ false MIT https://github.com/oqtane/oqtane.framework - https://github.com/oqtane/oqtane.framework/releases/tag/v10.0.4 + https://github.com/oqtane/oqtane.framework/releases/tag/v10.1.0 readme.md icon.png oqtane - - - - - - + + + + + + diff --git a/Oqtane.Package/Oqtane.Framework.nuspec b/Oqtane.Package/Oqtane.Framework.nuspec index 83edf33a..25f116ad 100644 --- a/Oqtane.Package/Oqtane.Framework.nuspec +++ b/Oqtane.Package/Oqtane.Framework.nuspec @@ -2,7 +2,7 @@ Oqtane.Framework - 10.0.4 + 10.1.0 Shaun Walker .NET Foundation Oqtane Framework @@ -11,8 +11,8 @@ .NET Foundation false MIT - https://github.com/oqtane/oqtane.framework/releases/download/v10.0.4/Oqtane.Framework.10.0.4.Upgrade.zip - https://github.com/oqtane/oqtane.framework/releases/tag/v10.0.4 + https://github.com/oqtane/oqtane.framework/releases/download/v10.1.0/Oqtane.Framework.10.1.0.Upgrade.zip + https://github.com/oqtane/oqtane.framework/releases/tag/v10.1.0 readme.md icon.png oqtane framework diff --git a/Oqtane.Package/Oqtane.Server.nuspec b/Oqtane.Package/Oqtane.Server.nuspec index f03cd1d9..4caf53a3 100644 --- a/Oqtane.Package/Oqtane.Server.nuspec +++ b/Oqtane.Package/Oqtane.Server.nuspec @@ -2,7 +2,7 @@ Oqtane.Server - 10.0.4 + 10.1.0 Shaun Walker .NET Foundation Oqtane Framework @@ -12,29 +12,29 @@ false MIT https://github.com/oqtane/oqtane.framework - https://github.com/oqtane/oqtane.framework/releases/tag/v10.0.4 + https://github.com/oqtane/oqtane.framework/releases/tag/v10.1.0 readme.md icon.png oqtane - - - - - - + + + + + + - + - - - + + + - - - + + + diff --git a/Oqtane.Package/Oqtane.Shared.nuspec b/Oqtane.Package/Oqtane.Shared.nuspec index 6338ba42..b1374aea 100644 --- a/Oqtane.Package/Oqtane.Shared.nuspec +++ b/Oqtane.Package/Oqtane.Shared.nuspec @@ -2,7 +2,7 @@ Oqtane.Shared - 10.0.4 + 10.1.0 Shaun Walker .NET Foundation Oqtane Framework @@ -12,14 +12,14 @@ false MIT https://github.com/oqtane/oqtane.framework - https://github.com/oqtane/oqtane.framework/releases/tag/v10.0.4 + https://github.com/oqtane/oqtane.framework/releases/tag/v10.1.0 readme.md icon.png oqtane - - + + diff --git a/Oqtane.Package/Oqtane.Updater.nuspec b/Oqtane.Package/Oqtane.Updater.nuspec index 5cdb39ae..840f3de0 100644 --- a/Oqtane.Package/Oqtane.Updater.nuspec +++ b/Oqtane.Package/Oqtane.Updater.nuspec @@ -2,7 +2,7 @@ Oqtane.Updater - 10.0.4 + 10.1.0 Shaun Walker .NET Foundation Oqtane Framework @@ -12,7 +12,7 @@ false MIT https://github.com/oqtane/oqtane.framework - https://github.com/oqtane/oqtane.framework/releases/tag/v10.0.4 + https://github.com/oqtane/oqtane.framework/releases/tag/v10.1.0 readme.md icon.png oqtane diff --git a/Oqtane.Package/install.ps1 b/Oqtane.Package/install.ps1 index 39124413..1849738e 100644 --- a/Oqtane.Package/install.ps1 +++ b/Oqtane.Package/install.ps1 @@ -1 +1 @@ -Compress-Archive -Path "..\Oqtane.Server\bin\Release\net10.0\publish\*" -DestinationPath "Oqtane.Framework.10.0.4.Install.zip" -Force +Compress-Archive -Path "..\Oqtane.Server\bin\Release\net10.0\publish\*" -DestinationPath "Oqtane.Framework.10.1.0.Install.zip" -Force diff --git a/Oqtane.Package/upgrade.ps1 b/Oqtane.Package/upgrade.ps1 index eb0e0a31..dba48f9b 100644 --- a/Oqtane.Package/upgrade.ps1 +++ b/Oqtane.Package/upgrade.ps1 @@ -1 +1 @@ -Compress-Archive -Path "..\Oqtane.Server\bin\Release\net10.0\publish\*" -DestinationPath "Oqtane.Framework.10.0.4.Upgrade.zip" -Force +Compress-Archive -Path "..\Oqtane.Server\bin\Release\net10.0\publish\*" -DestinationPath "Oqtane.Framework.10.1.0.Upgrade.zip" -Force diff --git a/Oqtane.Server/Controllers/SiteGroupController.cs b/Oqtane.Server/Controllers/SiteGroupController.cs index 62441495..61e2a174 100644 --- a/Oqtane.Server/Controllers/SiteGroupController.cs +++ b/Oqtane.Server/Controllers/SiteGroupController.cs @@ -1,6 +1,7 @@ using System.Collections.Generic; using System.Linq; using System.Net; +using System.Security.Policy; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Oqtane.Enums; @@ -27,18 +28,23 @@ namespace Oqtane.Controllers _alias = tenantManager.GetAlias(); } - // GET: api/?siteid=x&groupid=y + // GET: api/?siteid=x [HttpGet] - [Authorize(Roles = RoleNames.Host)] - public IEnumerable Get(string siteid, string groupid) + [Authorize(Roles = RoleNames.Admin)] + public IEnumerable Get(string siteid) { - if (int.TryParse(siteid, out int SiteId) && int.TryParse(groupid, out int SiteGroupDefinitionId)) + if (User.IsInRole(RoleNames.Host) || (int.TryParse(siteid, out int SiteId) && SiteId == _alias.SiteId)) { - return _siteGroupRepository.GetSiteGroups(SiteId, SiteGroupDefinitionId).ToList(); + var siteGroups = _siteGroupRepository.GetSiteGroups(); + if (!User.IsInRole(RoleNames.Host)) + { + siteGroups = siteGroups.Where(item => item.PrimarySiteId == _alias.SiteId); + } + return siteGroups.ToList(); } else { - _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Site Group Get Attempt for SiteId {SiteId} And SiteGroupDefinitionId {SiteGroupDefinitionId}", siteid, groupid); + _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Site Group Get Attempt {SiteId}", siteid); HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden; return null; } @@ -49,10 +55,10 @@ namespace Oqtane.Controllers [Authorize(Roles = RoleNames.Host)] public SiteGroup Get(int id) { - var siteGroup = _siteGroupRepository.GetSiteGroup(id); - if (siteGroup != null) + var group = _siteGroupRepository.GetSiteGroup(id); + if (group != null) { - return siteGroup; + return group; } else { @@ -69,12 +75,12 @@ namespace Oqtane.Controllers if (ModelState.IsValid) { siteGroup = _siteGroupRepository.AddSiteGroup(siteGroup); - _syncManager.AddSyncEvent(_alias, EntityNames.SiteGroup, siteGroup.SiteGroupDefinitionId, SyncEventActions.Create); - _logger.Log(LogLevel.Information, this, LogFunction.Create, "Site Group Added {SiteGroup}", siteGroup); + _syncManager.AddSyncEvent(_alias, EntityNames.SiteGroup, siteGroup.SiteGroupId, SyncEventActions.Create); + _logger.Log(LogLevel.Information, this, LogFunction.Create, "Site Group Added {Group}", siteGroup); } else { - _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Site Group Post Attempt {SiteGroup}", siteGroup); + _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Site Group Post Attempt {Group}", siteGroup); HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden; siteGroup = null; } @@ -83,18 +89,24 @@ namespace Oqtane.Controllers // PUT api//5 [HttpPut("{id}")] - [Authorize(Roles = RoleNames.Host)] + [Authorize(Roles = RoleNames.Admin)] public SiteGroup Put(int id, [FromBody] SiteGroup siteGroup) { - if (ModelState.IsValid && siteGroup.SiteGroupDefinitionId == id && _siteGroupRepository.GetSiteGroup(siteGroup.SiteGroupDefinitionId, false) != null) + if (ModelState.IsValid && siteGroup.SiteGroupId == id) { + if (!User.IsInRole(RoleNames.Host) && siteGroup.Synchronize) + { + // admins can only update the synchronize field + siteGroup = _siteGroupRepository.GetSiteGroup(siteGroup.SiteGroupId, false); + siteGroup.Synchronize = true; + } siteGroup = _siteGroupRepository.UpdateSiteGroup(siteGroup); - _syncManager.AddSyncEvent(_alias, EntityNames.SiteGroup, siteGroup.SiteGroupDefinitionId, SyncEventActions.Update); - _logger.Log(LogLevel.Information, this, LogFunction.Update, "Site Group Updated {SiteGroup}", siteGroup); + _syncManager.AddSyncEvent(_alias, EntityNames.SiteGroup, siteGroup.SiteGroupId, SyncEventActions.Update); + _logger.Log(LogLevel.Information, this, LogFunction.Update, "Site Group Updated {Group}", siteGroup); } else { - _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Site Group Put Attempt {SiteGroup}", siteGroup); + _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Site Group Put Attempt {Group}", siteGroup); HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden; siteGroup = null; } @@ -111,11 +123,11 @@ namespace Oqtane.Controllers { _siteGroupRepository.DeleteSiteGroup(id); _syncManager.AddSyncEvent(_alias, EntityNames.SiteGroup, siteGroup.SiteGroupId, SyncEventActions.Delete); - _logger.Log(LogLevel.Information, this, LogFunction.Delete, "Site Group Deleted {SiteGroupId}", id); + _logger.Log(LogLevel.Information, this, LogFunction.Delete, "Site Group Deleted {siteGroupId}", id); } else { - _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Site Group Delete Attempt {SiteGroupId}", id); + _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Site Group Delete Attempt {siteGroupId}", id); HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden; } } diff --git a/Oqtane.Server/Controllers/SiteGroupDefinitionController.cs b/Oqtane.Server/Controllers/SiteGroupDefinitionController.cs deleted file mode 100644 index ed419755..00000000 --- a/Oqtane.Server/Controllers/SiteGroupDefinitionController.cs +++ /dev/null @@ -1,114 +0,0 @@ -using System.Collections.Generic; -using Microsoft.AspNetCore.Mvc; -using Microsoft.AspNetCore.Authorization; -using Oqtane.Enums; -using Oqtane.Models; -using Oqtane.Shared; -using Oqtane.Infrastructure; -using Oqtane.Repository; -using System.Net; -using System.Linq; - -namespace Oqtane.Controllers -{ - [Route(ControllerRoutes.ApiRoute)] - public class SiteGroupDefinitionController : Controller - { - private readonly ISiteGroupDefinitionRepository _siteGroupDefinitionRepository; - private readonly ISyncManager _syncManager; - private readonly ILogManager _logger; - private readonly Alias _alias; - - public SiteGroupDefinitionController(ISiteGroupDefinitionRepository siteGroupDefinitionRepository, ISyncManager syncManager, ILogManager logger, ITenantManager tenantManager) - { - _siteGroupDefinitionRepository = siteGroupDefinitionRepository; - _syncManager = syncManager; - _logger = logger; - _alias = tenantManager.GetAlias(); - } - - // GET: api/ - [HttpGet] - [Authorize(Roles = RoleNames.Host)] - public IEnumerable Get() - { - return _siteGroupDefinitionRepository.GetSiteGroupDefinitions().ToList(); - } - - // GET api//5 - [HttpGet("{id}")] - [Authorize(Roles = RoleNames.Host)] - public SiteGroupDefinition Get(int id) - { - var group = _siteGroupDefinitionRepository.GetSiteGroupDefinition(id); - if (group != null) - { - return group; - } - else - { - HttpContext.Response.StatusCode = (int)HttpStatusCode.NotFound; - return null; - } - } - - // POST api/ - [HttpPost] - [Authorize(Roles = RoleNames.Host)] - public SiteGroupDefinition Post([FromBody] SiteGroupDefinition siteGroupDefinition) - { - if (ModelState.IsValid) - { - siteGroupDefinition = _siteGroupDefinitionRepository.AddSiteGroupDefinition(siteGroupDefinition); - _syncManager.AddSyncEvent(_alias, EntityNames.SiteGroupDefinition, siteGroupDefinition.SiteGroupDefinitionId, SyncEventActions.Create); - _logger.Log(LogLevel.Information, this, LogFunction.Create, "Site Group Definition Added {Group}", siteGroupDefinition); - } - else - { - _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Site Group Definition Post Attempt {Group}", siteGroupDefinition); - HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden; - siteGroupDefinition = null; - } - return siteGroupDefinition; - } - - // PUT api//5 - [HttpPut("{id}")] - [Authorize(Roles = RoleNames.Host)] - public SiteGroupDefinition Put(int id, [FromBody] SiteGroupDefinition siteGroupDefinition) - { - if (ModelState.IsValid && siteGroupDefinition.SiteGroupDefinitionId == id && _siteGroupDefinitionRepository.GetSiteGroupDefinition(siteGroupDefinition.SiteGroupDefinitionId, false) != null) - { - siteGroupDefinition = _siteGroupDefinitionRepository.UpdateSiteGroupDefinition(siteGroupDefinition); - _syncManager.AddSyncEvent(_alias, EntityNames.SiteGroupDefinition, siteGroupDefinition.SiteGroupDefinitionId, SyncEventActions.Update); - _logger.Log(LogLevel.Information, this, LogFunction.Update, "Site Group Definition Updated {Group}", siteGroupDefinition); - } - else - { - _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Site Group Definition Put Attempt {Group}", siteGroupDefinition); - HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden; - siteGroupDefinition = null; - } - return siteGroupDefinition; - } - - // DELETE api//5 - [HttpDelete("{id}")] - [Authorize(Roles = RoleNames.Host)] - public void Delete(int id) - { - var siteGroupDefinition = _siteGroupDefinitionRepository.GetSiteGroupDefinition(id); - if (siteGroupDefinition != null) - { - _siteGroupDefinitionRepository.DeleteSiteGroupDefinition(id); - _syncManager.AddSyncEvent(_alias, EntityNames.SiteGroupDefinition, siteGroupDefinition.SiteGroupDefinitionId, SyncEventActions.Delete); - _logger.Log(LogLevel.Information, this, LogFunction.Delete, "Site Group Definition Deleted {siteGroupDefinitionId}", id); - } - else - { - _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Site Group Definition Delete Attempt {siteGroupDefinitionId}", id); - HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden; - } - } - } -} diff --git a/Oqtane.Server/Controllers/SiteGroupMemberController.cs b/Oqtane.Server/Controllers/SiteGroupMemberController.cs new file mode 100644 index 00000000..2cb8442c --- /dev/null +++ b/Oqtane.Server/Controllers/SiteGroupMemberController.cs @@ -0,0 +1,126 @@ +using System.Collections.Generic; +using System.Linq; +using System.Net; +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Mvc; +using Oqtane.Enums; +using Oqtane.Infrastructure; +using Oqtane.Models; +using Oqtane.Repository; +using Oqtane.Shared; + +namespace Oqtane.Controllers +{ + [Route(ControllerRoutes.ApiRoute)] + public class SiteGroupMemberController : Controller + { + private readonly ISiteGroupMemberRepository _siteGroupMemberRepository; + private readonly ISyncManager _syncManager; + private readonly ILogManager _logger; + private readonly Alias _alias; + + public SiteGroupMemberController(ISiteGroupMemberRepository siteGroupMemberRepository, ISyncManager syncManager, ILogManager logger, ITenantManager tenantManager) + { + _siteGroupMemberRepository = siteGroupMemberRepository; + _syncManager = syncManager; + _logger = logger; + _alias = tenantManager.GetAlias(); + } + + // GET: api/?siteid=x&groupid=y + [HttpGet] + [Authorize(Roles = RoleNames.Host)] + public IEnumerable Get(string siteid, string groupid) + { + if (int.TryParse(siteid, out int SiteId) && int.TryParse(groupid, out int SiteGroupId)) + { + return _siteGroupMemberRepository.GetSiteGroupMembers(SiteId, SiteGroupId).ToList(); + } + else + { + _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Site Group Member Get Attempt for SiteId {SiteId} And SiteGroupId {SiteGroupId}", siteid, groupid); + HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden; + return null; + } + } + + // GET api//5 + [HttpGet("{id}")] + [Authorize(Roles = RoleNames.Host)] + public SiteGroupMember Get(int id) + { + var siteGroupMember = _siteGroupMemberRepository.GetSiteGroupMember(id); + if (siteGroupMember != null) + { + return siteGroupMember; + } + else + { + HttpContext.Response.StatusCode = (int)HttpStatusCode.NotFound; + return null; + } + } + + // POST api/ + [HttpPost] + [Authorize(Roles = RoleNames.Host)] + public SiteGroupMember Post([FromBody] SiteGroupMember siteGroupMember) + { + if (ModelState.IsValid) + { + siteGroupMember = _siteGroupMemberRepository.AddSiteGroupMember(siteGroupMember); + _syncManager.AddSyncEvent(_alias, EntityNames.SiteGroupMember, siteGroupMember.SiteGroupId, SyncEventActions.Create); + _syncManager.AddSyncEvent(_alias, EntityNames.Site, siteGroupMember.SiteId, SyncEventActions.Refresh); + _logger.Log(LogLevel.Information, this, LogFunction.Create, "Site Group Member Added {SiteGroupMember}", siteGroupMember); + } + else + { + _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Site Group Member Post Attempt {SiteGroupMember}", siteGroupMember); + HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden; + siteGroupMember = null; + } + return siteGroupMember; + } + + // PUT api//5 + [HttpPut("{id}")] + [Authorize(Roles = RoleNames.Host)] + public SiteGroupMember Put(int id, [FromBody] SiteGroupMember siteGroupMember) + { + if (ModelState.IsValid && siteGroupMember.SiteGroupId == id && _siteGroupMemberRepository.GetSiteGroupMember(siteGroupMember.SiteGroupId, false) != null) + { + siteGroupMember = _siteGroupMemberRepository.UpdateSiteGroupMember(siteGroupMember); + _syncManager.AddSyncEvent(_alias, EntityNames.SiteGroupMember, siteGroupMember.SiteGroupId, SyncEventActions.Update); + _syncManager.AddSyncEvent(_alias, EntityNames.Site, siteGroupMember.SiteId, SyncEventActions.Refresh); + _logger.Log(LogLevel.Information, this, LogFunction.Update, "Site Group Member Updated {SiteGroupMember}", siteGroupMember); + } + else + { + _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Site Group Member Put Attempt {SiteGroupMember}", siteGroupMember); + HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden; + siteGroupMember = null; + } + return siteGroupMember; + } + + // DELETE api//5 + [HttpDelete("{id}")] + [Authorize(Roles = RoleNames.Host)] + public void Delete(int id) + { + var siteGroupMember = _siteGroupMemberRepository.GetSiteGroupMember(id); + if (siteGroupMember != null) + { + _siteGroupMemberRepository.DeleteSiteGroupMember(id); + _syncManager.AddSyncEvent(_alias, EntityNames.SiteGroupMember, siteGroupMember.SiteGroupMemberId, SyncEventActions.Delete); + _syncManager.AddSyncEvent(_alias, EntityNames.Site, siteGroupMember.SiteId, SyncEventActions.Refresh); + _logger.Log(LogLevel.Information, this, LogFunction.Delete, "Site Group Member Deleted {SiteGroupMemberId}", id); + } + else + { + _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Site Group Member Delete Attempt {SiteGroupMemberId}", id); + HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden; + } + } + } +} diff --git a/Oqtane.Server/Extensions/OqtaneServiceCollectionExtensions.cs b/Oqtane.Server/Extensions/OqtaneServiceCollectionExtensions.cs index a541ebfd..8249560a 100644 --- a/Oqtane.Server/Extensions/OqtaneServiceCollectionExtensions.cs +++ b/Oqtane.Server/Extensions/OqtaneServiceCollectionExtensions.cs @@ -233,8 +233,8 @@ namespace Microsoft.Extensions.DependencyInjection services.AddScoped(); services.AddScoped(); services.AddScoped(); - services.AddScoped(); services.AddScoped(); + services.AddScoped(); // providers services.AddScoped(); @@ -284,8 +284,8 @@ namespace Microsoft.Extensions.DependencyInjection services.AddTransient(); services.AddTransient(); services.AddTransient(); - services.AddTransient(); services.AddTransient(); + services.AddTransient(); // managers services.AddTransient(); diff --git a/Oqtane.Server/Infrastructure/Jobs/SynchronizationJob.cs b/Oqtane.Server/Infrastructure/Jobs/SynchronizationJob.cs index 5ef48827..32ac379c 100644 --- a/Oqtane.Server/Infrastructure/Jobs/SynchronizationJob.cs +++ b/Oqtane.Server/Infrastructure/Jobs/SynchronizationJob.cs @@ -16,9 +16,8 @@ namespace Oqtane.Infrastructure // JobType = "Oqtane.Infrastructure.SynchronizationJob, Oqtane.Server" // synchronization only supports sites in the same tenant (database) - // module title is used as a key to identify module instances on a page (ie. using "-" as a module title is problematic ie. content as configuration) - // relies on Module.ModifiedOn to be set if the module content changes (for efficiency) - // modules must implement ISynchronizable interface (new interface as IPortable was generally only implemented in an additive manner) + // module title is used as a key to identify module instances on a page + // modules must implement ISynchronizable interface // define settings that should not be synchronized (should be extensible in the future) List excludedSettings = new List() { @@ -38,76 +37,82 @@ namespace Oqtane.Infrastructure { string log = ""; - var siteGroupDefinitionRepository = provider.GetRequiredService(); var siteGroupRepository = provider.GetRequiredService(); + var siteGroupMemberRepository = provider.GetRequiredService(); var siteRepository = provider.GetRequiredService(); var aliasRepository = provider.GetRequiredService(); var tenantManager = provider.GetRequiredService(); var settingRepository = provider.GetRequiredService(); - List siteGroups = null; + List siteGroupMembers = null; List sites = null; List aliases = null; - // get groups - var groups = siteGroupDefinitionRepository.GetSiteGroupDefinitions(); + // get site groups + var siteGroups = siteGroupRepository.GetSiteGroups(); - // iterate through groups which need to be synchronized - foreach (var group in groups.Where(item => item.Synchronization && item.Synchronize)) + // iterate through site groups which need to be synchronized + foreach (var siteGroup in siteGroups.Where(item => item.Synchronize && (item.Type == SiteGroupTypes.Synchronization || item.Type == SiteGroupTypes.Comparison))) { // get data - if (siteGroups == null) + if (siteGroupMembers == null) { - siteGroups = siteGroupRepository.GetSiteGroups().ToList(); + siteGroupMembers = siteGroupMemberRepository.GetSiteGroupMembers().ToList(); sites = siteRepository.GetSites().ToList(); aliases = aliasRepository.GetAliases().ToList(); } - var aliasName = "https://" + aliases.First(item => item.TenantId == tenantManager.GetTenant().TenantId && item.SiteId == group.PrimarySiteId && item.IsDefault).Name; - log += $"Processing Primary Site: {sites.First(item => item.SiteId == group.PrimarySiteId).Name} - {CreateLink(aliasName)}
"; + var primaryAliasName = "https://" + aliases.First(item => item.TenantId == tenantManager.GetTenant().TenantId && item.SiteId == siteGroup.PrimarySiteId && item.IsDefault).Name; + log += (siteGroup.Type == SiteGroupTypes.Synchronization) ? "Synchronizing " : "Comparing "; + log += $"Primary Site: {sites.First(item => item.SiteId == siteGroup.PrimarySiteId).Name} - {CreateLink(primaryAliasName)}
"; // get primary site - var primarySite = sites.FirstOrDefault(item => item.SiteId == group.PrimarySiteId); + var primarySite = sites.FirstOrDefault(item => item.SiteId == siteGroup.PrimarySiteId); if (primarySite != null) { // update flag to prevent job from processing group again - group.Synchronize = false; - siteGroupDefinitionRepository.UpdateSiteGroupDefinition(group); + siteGroup.Synchronize = false; + siteGroupRepository.UpdateSiteGroup(siteGroup); - // iterate through sites in group - foreach (var siteGroup in siteGroups.Where(item => item.SiteGroupDefinitionId == group.SiteGroupDefinitionId && item.SiteId != group.PrimarySiteId)) + // iterate through sites in site group + foreach (var siteGroupMember in siteGroupMembers.Where(item => item.SiteGroupId == siteGroup.SiteGroupId && item.SiteId != siteGroup.PrimarySiteId)) { // get secondary site - var secondarySite = sites.FirstOrDefault(item => item.SiteId == siteGroup.SiteId); + var secondarySite = sites.FirstOrDefault(item => item.SiteId == siteGroupMember.SiteId); if (secondarySite != null) { // get default alias for site - siteGroup.AliasName = "https://" + aliases.First(item => item.TenantId == tenantManager.GetTenant().TenantId && item.SiteId == siteGroup.SiteId && item.IsDefault).Name; + var secondaryAliasName = "https://" + aliases.First(item => item.TenantId == tenantManager.GetTenant().TenantId && item.SiteId == siteGroupMember.SiteId && item.IsDefault).Name; + siteGroupMember.AliasName = (siteGroupMember.SiteGroup.Type == SiteGroupTypes.Synchronization) ? secondaryAliasName : primaryAliasName; // initialize SynchronizedOn - if (siteGroup.SynchronizedOn == null) + if (siteGroupMember.SynchronizedOn == null) { - siteGroup.SynchronizedOn = DateTime.MinValue; + siteGroupMember.SynchronizedOn = DateTime.MinValue; } - // replicate site - var siteLog = ReplicateSite(provider, tenantManager, settingRepository, siteGroup, primarySite, secondarySite); + // synchronize site + var siteLog = SynchronizeSite(provider, tenantManager, settingRepository, siteGroupMember, primarySite, secondarySite); + if (string.IsNullOrEmpty(siteLog)) + { + siteLog = (siteGroupMember.SynchronizedOn != DateTime.MinValue) ? "No Changes Identified
" : "Initialization Complete
"; + } // set synchronized on date/time - siteGroup.SynchronizedOn = DateTime.UtcNow; - siteGroupRepository.UpdateSiteGroup(siteGroup); + siteGroupMember.SynchronizedOn = DateTime.UtcNow; + siteGroupMemberRepository.UpdateSiteGroupMember(siteGroupMember); - log += $"Processed Secondary Site: {secondarySite.Name} - {CreateLink(siteGroup.AliasName)}
" + siteLog; + log += $"With Secondary Site: {secondarySite.Name} - {CreateLink(secondaryAliasName)}
" + siteLog; } else { - log += $"Site Group {group.Name} Has A SiteId {siteGroup.SiteId} Which Does Not Exist
"; + log += $"Site Group {siteGroup.Name} Has A SiteId {siteGroupMember.SiteId} Which Does Not Exist
"; } } } else { - log += $"Site Group {group.Name} Has A PrimarySiteId {group.PrimarySiteId} Which Does Not Exist
"; + log += $"Site Group {siteGroup.Name} Has A PrimarySiteId {siteGroup.PrimarySiteId} Which Does Not Exist
"; } } @@ -119,23 +124,24 @@ namespace Oqtane.Infrastructure return log; } - private string ReplicateSite(IServiceProvider provider, ITenantManager tenantManager, ISettingRepository settingRepository, SiteGroup siteGroup, Site primarySite, Site secondarySite) + private string SynchronizeSite(IServiceProvider provider, ITenantManager tenantManager, ISettingRepository settingRepository, SiteGroupMember siteGroupMember, Site primarySite, Site secondarySite) { var log = ""; - // replicate roles/users - log += ReplicateRoles(provider, settingRepository, siteGroup, primarySite.SiteId, secondarySite.SiteId); + // synchronize roles/users + log += SynchronizeRoles(provider, settingRepository, siteGroupMember, primarySite.SiteId, secondarySite.SiteId); - // replicate folders/files - log += ReplicateFolders(provider, settingRepository, siteGroup, primarySite.SiteId, secondarySite.SiteId); + // synchronize folders/files + log += SynchronizeFolders(provider, settingRepository, siteGroupMember, primarySite.SiteId, secondarySite.SiteId); - // replicate pages/modules - log += ReplicatePages(provider, settingRepository, tenantManager, siteGroup, primarySite.SiteId, secondarySite.SiteId); + // synchronize pages/modules + log += SynchronizePages(provider, settingRepository, tenantManager, siteGroupMember, primarySite.SiteId, secondarySite.SiteId); - // replicate site - if (primarySite.ModifiedOn > siteGroup.SynchronizedOn) + // synchronize site + if (primarySite.ModifiedOn > siteGroupMember.SynchronizedOn) { secondarySite.TimeZoneId = primarySite.TimeZoneId; + secondarySite.CultureCode = primarySite.CultureCode; if (secondarySite.LogoFileId != primarySite.LogoFileId) { secondarySite.LogoFileId = ResolveFileId(provider, primarySite.LogoFileId, secondarySite.SiteId); @@ -176,29 +182,30 @@ namespace Oqtane.Infrastructure secondarySite.DeletedBy = primarySite.DeletedBy; secondarySite.DeletedOn = primarySite.DeletedOn; - var siteRepository = provider.GetRequiredService(); - if (siteGroup.Synchronize) + if (siteGroupMember.SiteGroup.Type == SiteGroupTypes.Synchronization) { + var siteRepository = provider.GetRequiredService(); siteRepository.UpdateSite(secondarySite); } - log += Log(siteGroup, $"Secondary Site Updated: {secondarySite.Name}"); + log += Log(siteGroupMember, $"Site Updated: {secondarySite.Name} - {CreateLink(siteGroupMember.AliasName)}"); } // site settings - log += ReplicateSettings(settingRepository, siteGroup, EntityNames.Site, primarySite.SiteId, secondarySite.SiteId); + log += SynchronizeSettings(settingRepository, siteGroupMember, EntityNames.Site, primarySite.SiteId, secondarySite.SiteId); - if (siteGroup.SynchronizedOn == DateTime.MinValue || !string.IsNullOrEmpty(log)) + if (siteGroupMember.SynchronizedOn == DateTime.MinValue || !string.IsNullOrEmpty(log)) { - // clear cache for secondary site if any content was replicated + // clear cache for secondary site if any content was Synchronized var syncManager = provider.GetRequiredService(); var alias = new Alias { TenantId = tenantManager.GetTenant().TenantId, SiteId = secondarySite.SiteId }; syncManager.AddSyncEvent(alias, EntityNames.Site, secondarySite.SiteId, SyncEventActions.Refresh); } - if (!string.IsNullOrEmpty(log) && siteGroup.Notify) + if (!string.IsNullOrEmpty(log) && siteGroupMember.SiteGroup.Type == SiteGroupTypes.Comparison) { // send change log to administrators SendNotifications(provider, secondarySite.SiteId, secondarySite.Name, log); + log += Log(siteGroupMember, $"Change Log Sent To Administrators"); } return log; @@ -215,7 +222,7 @@ namespace Oqtane.Infrastructure return fileId; } - private string ReplicateRoles(IServiceProvider provider, ISettingRepository settingRepository, SiteGroup siteGroup, int primarySiteId, int secondarySiteId) + private string SynchronizeRoles(IServiceProvider provider, ISettingRepository settingRepository, SiteGroupMember siteGroupMember, int primarySiteId, int secondarySiteId) { // get roles var roleRepository = provider.GetRequiredService(); @@ -234,7 +241,7 @@ namespace Oqtane.Infrastructure secondaryRole.SiteId = secondarySiteId; } - if (role == null || primaryRole.ModifiedOn > siteGroup.SynchronizedOn) + if (role == null || primaryRole.ModifiedOn > siteGroupMember.SynchronizedOn) { // set all properties secondaryRole.Name = primaryRole.Name; @@ -244,41 +251,45 @@ namespace Oqtane.Infrastructure if (role == null) { - if (siteGroup.Synchronize) + if (siteGroupMember.SiteGroup.Type == SiteGroupTypes.Synchronization) { roleRepository.AddRole(secondaryRole); } - log += Log(siteGroup, $"Role Added: {secondaryRole.Name}"); + log += Log(siteGroupMember, $"Role Added: {secondaryRole.Name}"); } else { - if (siteGroup.Synchronize) + if (siteGroupMember.SiteGroup.Type == SiteGroupTypes.Synchronization) { roleRepository.UpdateRole(secondaryRole); } - log += Log(siteGroup, $"Role Updated: {secondaryRole.Name}"); - secondaryRoles.Remove(role); + log += Log(siteGroupMember, $"Role Updated: {secondaryRole.Name}"); } } + + if (role != null) + { + secondaryRoles.Remove(role); + } } // remove roles in the secondary site which do not exist in the primary site - foreach (var secondaryRole in secondaryRoles.Where(item => !primaryRoles.Select(item => item.Name).Contains(item.Name))) + foreach (var secondaryRole in secondaryRoles) { - if (siteGroup.Synchronize) + if (siteGroupMember.SiteGroup.Type == SiteGroupTypes.Synchronization) { roleRepository.DeleteRole(secondaryRole.RoleId); } - log += Log(siteGroup, $"Role Deleted: {secondaryRole.Name}"); + log += Log(siteGroupMember, $"Role Deleted: {secondaryRole.Name}"); } // settings - log += ReplicateSettings(settingRepository, siteGroup, EntityNames.Role, primarySiteId, secondarySiteId); + log += SynchronizeSettings(settingRepository, siteGroupMember, EntityNames.Role, primarySiteId, secondarySiteId); return log; } - private string ReplicateFolders(IServiceProvider provider, ISettingRepository settingRepository, SiteGroup siteGroup, int primarySiteId, int secondarySiteId) + private string SynchronizeFolders(IServiceProvider provider, ISettingRepository settingRepository, SiteGroupMember siteGroupMember, int primarySiteId, int secondarySiteId) { var folderRepository = provider.GetRequiredService(); var fileRepository = provider.GetRequiredService(); @@ -300,7 +311,7 @@ namespace Oqtane.Infrastructure secondaryFolder.SiteId = secondarySiteId; } - if (folder == null || primaryFolder.ModifiedOn > siteGroup.SynchronizedOn) + if (folder == null || primaryFolder.ModifiedOn > siteGroupMember.SynchronizedOn) { // set all properties secondaryFolder.ParentId = null; @@ -319,29 +330,33 @@ namespace Oqtane.Infrastructure secondaryFolder.Capacity = primaryFolder.Capacity; secondaryFolder.ImageSizes = primaryFolder.ImageSizes; secondaryFolder.IsSystem = primaryFolder.IsSystem; - secondaryFolder.PermissionList = ReplicatePermissions(primaryFolder.PermissionList, secondarySiteId); + secondaryFolder.PermissionList = SynchronizePermissions(primaryFolder.PermissionList, secondarySiteId); if (folder == null) { - if (siteGroup.Synchronize) + if (siteGroupMember.SiteGroup.Type == SiteGroupTypes.Synchronization) { folderRepository.AddFolder(secondaryFolder); } - log += Log(siteGroup, $"Folder Added: {secondaryFolder.Path}"); + log += Log(siteGroupMember, $"Folder Added: {secondaryFolder.Path}"); } else { - if (siteGroup.Synchronize) + if (siteGroupMember.SiteGroup.Type == SiteGroupTypes.Synchronization) { folderRepository.UpdateFolder(secondaryFolder); } - log += Log(siteGroup, $"Folder Updated: {secondaryFolder.Path}"); - secondaryFolders.Remove(folder); + log += Log(siteGroupMember, $"Folder Updated: {secondaryFolder.Path}"); } } + if (folder != null) + { + secondaryFolders.Remove(folder); + } + // folder settings - log += ReplicateSettings(settingRepository, siteGroup, EntityNames.Folder, primaryFolder.FolderId, secondaryFolder.FolderId); + log += SynchronizeSettings(settingRepository, siteGroupMember, EntityNames.Folder, primaryFolder.FolderId, secondaryFolder.FolderId); // get files for folder var primaryFiles = fileRepository.GetFiles(primaryFolder.FolderId); @@ -359,7 +374,7 @@ namespace Oqtane.Infrastructure secondaryFile.Name = primaryFile.Name; } - if (file == null || primaryFile.ModifiedOn > siteGroup.SynchronizedOn) + if (file == null || primaryFile.ModifiedOn > siteGroupMember.SynchronizedOn) { // set all properties secondaryFile.Extension = primaryFile.Extension; @@ -370,53 +385,57 @@ namespace Oqtane.Infrastructure if (file == null) { - if (siteGroup.Synchronize) + if (siteGroupMember.SiteGroup.Type == SiteGroupTypes.Synchronization) { fileRepository.AddFile(secondaryFile); - ReplicateFile(folderRepository, primaryFolder, primaryFile, secondaryFolder, secondaryFile); + SynchronizeFile(folderRepository, primaryFolder, primaryFile, secondaryFolder, secondaryFile); } - log += Log(siteGroup, $"File Added: {CreateLink(siteGroup.AliasName + secondaryFolder.Path + secondaryFile.Name)}"); + log += Log(siteGroupMember, $"File Added: {CreateLink(siteGroupMember.AliasName + "/" + secondaryFolder.Path + secondaryFile.Name)}"); } else { - if (siteGroup.Synchronize) + if (siteGroupMember.SiteGroup.Type == SiteGroupTypes.Synchronization) { fileRepository.UpdateFile(secondaryFile); - ReplicateFile(folderRepository, primaryFolder, primaryFile, secondaryFolder, secondaryFile); + SynchronizeFile(folderRepository, primaryFolder, primaryFile, secondaryFolder, secondaryFile); } - log += Log(siteGroup, $"File Updated: {CreateLink(siteGroup.AliasName + secondaryFolder.Path + secondaryFile.Name)}"); - secondaryFiles.Remove(file); + log += Log(siteGroupMember, $"File Updated: {CreateLink(siteGroupMember.AliasName + "/" + secondaryFolder.Path + secondaryFile.Name)}"); } } + + if (file != null) + { + secondaryFiles.Remove(file); + } } // remove files in the secondary site which do not exist in the primary site - foreach (var secondaryFile in secondaryFiles.Where(item => !primaryFiles.Select(item => item.Name).Contains(item.Name))) + foreach (var secondaryFile in secondaryFiles) { - if (siteGroup.Synchronize) + if (siteGroupMember.SiteGroup.Type == SiteGroupTypes.Synchronization) { fileRepository.DeleteFile(secondaryFile.FileId); var secondaryPath = Path.Combine(folderRepository.GetFolderPath(secondaryFolder), secondaryFile.Name); System.IO.File.Delete(secondaryPath); } - log += Log(siteGroup, $"File Deleted: {CreateLink(siteGroup.AliasName + secondaryFolder.Path + secondaryFile.Name)}"); + log += Log(siteGroupMember, $"File Deleted: {CreateLink(siteGroupMember.AliasName + "/" + secondaryFolder.Path + secondaryFile.Name)}"); } } // remove folders in the secondary site which do not exist in the primary site - foreach (var secondaryFolder in secondaryFolders.Where(item => !primaryFolders.Select(item => item.Path).Contains(item.Path))) + foreach (var secondaryFolder in secondaryFolders) { - if (siteGroup.Synchronize) + if (siteGroupMember.SiteGroup.Type == SiteGroupTypes.Synchronization) { folderRepository.DeleteFolder(secondaryFolder.FolderId); } - log += Log(siteGroup, $"Folder Deleted: {secondaryFolder.Path}"); + log += Log(siteGroupMember, $"Folder Deleted: {secondaryFolder.Path}"); } return log; } - private void ReplicateFile(IFolderRepository folderRepository, Folder primaryFolder, Models.File primaryFile, Folder secondaryFolder, Models.File secondaryFile) + private void SynchronizeFile(IFolderRepository folderRepository, Folder primaryFolder, Models.File primaryFile, Folder secondaryFolder, Models.File secondaryFile) { var primaryPath = Path.Combine(folderRepository.GetFolderPath(primaryFolder), primaryFile.Name); if (System.IO.File.Exists(primaryPath)) @@ -430,7 +449,7 @@ namespace Oqtane.Infrastructure } } - private string ReplicatePages(IServiceProvider provider, ISettingRepository settingRepository, ITenantManager tenantManager, SiteGroup siteGroup, int primarySiteId, int secondarySiteId) + private string SynchronizePages(IServiceProvider provider, ISettingRepository settingRepository, ITenantManager tenantManager, SiteGroupMember siteGroupMember, int primarySiteId, int secondarySiteId) { var pageRepository = provider.GetRequiredService(); var pageModuleRepository = provider.GetRequiredService(); @@ -458,7 +477,7 @@ namespace Oqtane.Infrastructure secondaryPage.SiteId = secondarySiteId; } - if (page == null || primaryPage.ModifiedOn > siteGroup.SynchronizedOn) + if (page == null || primaryPage.ModifiedOn > siteGroupMember.SynchronizedOn) { // set all properties secondaryPage.Path = primaryPage.Path; @@ -493,29 +512,33 @@ namespace Oqtane.Infrastructure secondaryPage.DeletedBy = primaryPage.DeletedBy; secondaryPage.DeletedOn = primaryPage.DeletedOn; secondaryPage.IsDeleted = primaryPage.IsDeleted; - secondaryPage.PermissionList = ReplicatePermissions(primaryPage.PermissionList, secondarySiteId); + secondaryPage.PermissionList = SynchronizePermissions(primaryPage.PermissionList, secondarySiteId); if (page == null) { - if (siteGroup.Synchronize) + if (siteGroupMember.SiteGroup.Type == SiteGroupTypes.Synchronization) { secondaryPage = pageRepository.AddPage(secondaryPage); } - log += Log(siteGroup, $"Page Added: {CreateLink(siteGroup.AliasName + secondaryPage.Path)}"); + log += Log(siteGroupMember, $"Page Added: {CreateLink(siteGroupMember.AliasName + "/" + secondaryPage.Path)}"); } else { - if (siteGroup.Synchronize) + if (siteGroupMember.SiteGroup.Type == SiteGroupTypes.Synchronization) { secondaryPage = pageRepository.UpdatePage(secondaryPage); } - log += Log(siteGroup, $"Page Updated: {CreateLink(siteGroup.AliasName + secondaryPage.Path)}"); - secondaryPages.Remove(page); + log += Log(siteGroupMember, $"Page Updated: {CreateLink(siteGroupMember.AliasName + "/" + secondaryPage.Path)}"); } } + if (page != null) + { + secondaryPages.Remove(page); + } + // page settings - log += ReplicateSettings(settingRepository, siteGroup, EntityNames.Page, primaryPage.PageId, secondaryPage.PageId); + log += SynchronizeSettings(settingRepository, siteGroupMember, EntityNames.Page, primaryPage.PageId, secondaryPage.PageId); // modules if (primaryPageModules == null) @@ -542,7 +565,7 @@ namespace Oqtane.Infrastructure secondaryPageModule.Module.ModuleDefinitionName = primaryPageModule.Module.ModuleDefinitionName; } - if (pageModule == null || primaryPageModule.ModifiedOn > siteGroup.SynchronizedOn || primaryPageModule.Module.ModifiedOn > siteGroup.SynchronizedOn) + if (pageModule == null || primaryPageModule.ModifiedOn > siteGroupMember.SynchronizedOn || primaryPageModule.Module.ModifiedOn > siteGroupMember.SynchronizedOn) { // set all properties secondaryPageModule.Title = primaryPageModule.Title; @@ -552,12 +575,10 @@ namespace Oqtane.Infrastructure secondaryPageModule.Header = primaryPageModule.Header; secondaryPageModule.Footer = primaryPageModule.Footer; secondaryPageModule.IsDeleted = primaryPageModule.IsDeleted; - secondaryPageModule.Module.PermissionList = ReplicatePermissions(primaryPageModule.Module.PermissionList, secondarySiteId); + secondaryPageModule.Module.PermissionList = SynchronizePermissions(primaryPageModule.Module.PermissionList, secondarySiteId); secondaryPageModule.Module.AllPages = false; secondaryPageModule.Module.IsDeleted = false; - var updateContent = false; - if (pageModule == null) { // check if module exists @@ -565,78 +586,79 @@ namespace Oqtane.Infrastructure if (module == null) { // add new module - if (siteGroup.Synchronize) + if (siteGroupMember.SiteGroup.Type == SiteGroupTypes.Synchronization) { module = moduleRepository.AddModule(secondaryPageModule.Module); - updateContent = true; } - log += Log(siteGroup, $"Module Added: {module.Title} - {CreateLink(siteGroup.AliasName + secondaryPage.Path)}"); + log += Log(siteGroupMember, $"Module Added: {secondaryPageModule.Title} - {CreateLink(siteGroupMember.AliasName + "/" + secondaryPage.Path)}"); } if (module != null) { secondaryPageModule.ModuleId = module.ModuleId; secondaryPageModule.Module = null; // remove tracking - if (siteGroup.Synchronize) + if (siteGroupMember.SiteGroup.Type == SiteGroupTypes.Synchronization) { secondaryPageModule = pageModuleRepository.AddPageModule(secondaryPageModule); } - log += Log(siteGroup, $"Module Instance Added: {module.Title} - {CreateLink(siteGroup.AliasName + secondaryPage.Path)}"); + log += Log(siteGroupMember, $"Module Instance Added: {secondaryPageModule.Title} - {CreateLink(siteGroupMember.AliasName + "/" + secondaryPage.Path)}"); secondaryPageModule.Module = module; } } else { // update existing module - if (primaryPageModule.Module.ModifiedOn > siteGroup.SynchronizedOn) + if (primaryPageModule.Module.ModifiedOn > siteGroupMember.SynchronizedOn) { - if (siteGroup.Synchronize) + if (siteGroupMember.SiteGroup.Type == SiteGroupTypes.Synchronization) { moduleRepository.UpdateModule(secondaryPageModule.Module); - updateContent = true; } - log += Log(siteGroup, $"Module Updated: {secondaryPageModule.Title} - {CreateLink(siteGroup.AliasName + secondaryPage.Path)}"); + log += Log(siteGroupMember, $"Module Updated: {secondaryPageModule.Title} - {CreateLink(siteGroupMember.AliasName + "/" + secondaryPage.Path)}"); } - if (primaryPageModule.ModifiedOn > siteGroup.SynchronizedOn) + if (primaryPageModule.ModifiedOn > siteGroupMember.SynchronizedOn) { - if (siteGroup.Synchronize) + if (siteGroupMember.SiteGroup.Type == SiteGroupTypes.Synchronization) { secondaryPageModule = pageModuleRepository.UpdatePageModule(secondaryPageModule); } - log += Log(siteGroup, $"Module Instance Updated: {secondaryPageModule.Title} - {CreateLink(siteGroup.AliasName + secondaryPage.Path)}"); - secondaryPageModules.Remove(pageModule); - } - } - - // module content - if (updateContent && primaryPageModule.Module.ModuleDefinition.ServerManagerType != "") - { - Type moduleType = Type.GetType(primaryPageModule.Module.ModuleDefinition.ServerManagerType); - if (moduleType != null && moduleType.GetInterface(nameof(ISynchronizable)) != null) - { - try - { - var moduleObject = ActivatorUtilities.CreateInstance(provider, moduleType); - var primaryModuleContent = ((ISynchronizable)moduleObject).ExtractModule(primaryPageModule.Module); - var secondaryModuleContent = ((ISynchronizable)moduleObject).ExtractModule(secondaryPageModule.Module); - if (primaryModuleContent != secondaryModuleContent) - { - if (siteGroup.Synchronize) - { - ((ISynchronizable)moduleObject).LoadModule(secondaryPageModule.Module, primaryModuleContent, primaryPageModule.Module.ModuleDefinition.Version); - } - log += Log(siteGroup, $"Module Content Updated: {secondaryPageModule.Title} - {CreateLink(siteGroup.AliasName + secondaryPage.Path)}"); - } - } - catch - { - // error exporting/importing - } + log += Log(siteGroupMember, $"Module Instance Updated: {secondaryPageModule.Title} - {CreateLink(siteGroupMember.AliasName + "/" + secondaryPage.Path)}"); } } } + // module content + if (primaryPageModule.Module.ModuleDefinition.ServerManagerType != "") + { + Type moduleType = Type.GetType(primaryPageModule.Module.ModuleDefinition.ServerManagerType); + if (moduleType != null && moduleType.GetInterface(nameof(ISynchronizable)) != null) + { + try + { + var moduleObject = ActivatorUtilities.CreateInstance(provider, moduleType); + var moduleContent = ((ISynchronizable)moduleObject).ExtractModule(primaryPageModule.Module, siteGroupMember.SynchronizedOn.Value); + if (!string.IsNullOrEmpty(moduleContent)) + { + if (siteGroupMember.SiteGroup.Type == SiteGroupTypes.Synchronization) + { + ((ISynchronizable)moduleObject).LoadModule(secondaryPageModule.Module, moduleContent); + } + log += Log(siteGroupMember, $"Module Content Updated: {secondaryPageModule.Title} - {CreateLink(siteGroupMember.AliasName + "/" + secondaryPage.Path)}"); + } + } + catch + { + // error exporting/importing + } + } + } + + if (pageModule != null) + { + secondaryPageModules.Remove(pageModule); + } + // module settings - log += ReplicateSettings(settingRepository, siteGroup, EntityNames.Module, primaryPageModule.ModuleId, secondaryPageModule.ModuleId); + log += SynchronizeSettings(settingRepository, siteGroupMember, EntityNames.Module, primaryPageModule.ModuleId, secondaryPageModule.ModuleId); } } @@ -655,27 +677,27 @@ namespace Oqtane.Infrastructure } if (!primaryPageModules.Any(item => item.PageId == primaryPageId && item.Module.ModuleDefinitionName == secondaryPageModule.Module.ModuleDefinitionName && item.Title.ToLower() == secondaryPageModule.Title.ToLower())) { - if (siteGroup.Synchronize) + if (siteGroupMember.SiteGroup.Type == SiteGroupTypes.Synchronization) { pageModuleRepository.DeletePageModule(secondaryPageModule.PageModuleId); } - log += Log(siteGroup, $"Module Instance Deleted: {secondaryPageModule.Title} - {CreateLink(siteGroup.AliasName + secondaryPageModule.Page.Path)}"); + log += Log(siteGroupMember, $"Module Instance Deleted: {secondaryPageModule.Title} - {CreateLink(siteGroupMember.AliasName + "/" + secondaryPageModule.Page.Path)}"); } } // remove pages in the secondary site which do not exist in the primary site - foreach (var secondaryPage in secondaryPages.Where(item => !primaryPages.Select(item => item.Path).Contains(item.Path))) + foreach (var secondaryPage in secondaryPages) { - if (siteGroup.Synchronize) + if (siteGroupMember.SiteGroup.Type == SiteGroupTypes.Synchronization) { pageRepository.DeletePage(secondaryPage.PageId); } - log += Log(siteGroup, $"Page Deleted: {CreateLink(siteGroup.AliasName + secondaryPage.Path)}"); + log += Log(siteGroupMember, $"Page Deleted: {CreateLink(siteGroupMember.AliasName + "/" + secondaryPage.Path)}"); } - if (siteGroup.SynchronizedOn == DateTime.MinValue || !string.IsNullOrEmpty(log)) + if (siteGroupMember.SynchronizedOn == DateTime.MinValue || !string.IsNullOrEmpty(log)) { - // clear cache for secondary site if any content was replicated + // clear cache for secondary site if any content was Synchronized var syncManager = provider.GetRequiredService(); var alias = new Alias { TenantId = tenantManager.GetTenant().TenantId, SiteId = secondarySiteId }; syncManager.AddSyncEvent(alias, EntityNames.Site, secondarySiteId, SyncEventActions.Refresh); @@ -684,7 +706,7 @@ namespace Oqtane.Infrastructure return log; } - private List ReplicatePermissions(List permissionList, int siteId) + private List SynchronizePermissions(List permissionList, int siteId) { return permissionList.Select(item => new Permission { @@ -700,7 +722,7 @@ namespace Oqtane.Infrastructure }).ToList(); } - private string ReplicateSettings(ISettingRepository settingRepository, SiteGroup siteGroup, string entityName, int primaryEntityId, int secondaryEntityId) + private string SynchronizeSettings(ISettingRepository settingRepository, SiteGroupMember siteGroupMember, string entityName, int primaryEntityId, int secondaryEntityId) { var log = ""; var updated = false; @@ -717,7 +739,7 @@ namespace Oqtane.Infrastructure secondarySetting.SettingName = primarySetting.SettingName; secondarySetting.SettingValue = primarySetting.SettingValue; secondarySetting.IsPrivate = primarySetting.IsPrivate; - if (siteGroup.Synchronize && !excludedSettings.Any(item => item.EntityName == secondarySetting.EntityName && item.SettingName == secondarySetting.SettingName)) + if (siteGroupMember.SiteGroup.Type == SiteGroupTypes.Synchronization && !excludedSettings.Any(item => item.EntityName == secondarySetting.EntityName && item.SettingName == secondarySetting.SettingName)) { settingRepository.AddSetting(secondarySetting); updated = true; @@ -729,7 +751,7 @@ namespace Oqtane.Infrastructure { secondarySetting.SettingValue = primarySetting.SettingValue; secondarySetting.IsPrivate = primarySetting.IsPrivate; - if (siteGroup.Synchronize && !excludedSettings.Any(item => item.EntityName == secondarySetting.EntityName && item.SettingName == secondarySetting.SettingName)) + if (siteGroupMember.SiteGroup.Type == SiteGroupTypes.Synchronization && !excludedSettings.Any(item => item.EntityName == secondarySetting.EntityName && item.SettingName == secondarySetting.SettingName)) { settingRepository.UpdateSetting(secondarySetting); updated = true; @@ -742,7 +764,7 @@ namespace Oqtane.Infrastructure // any remaining secondary settings need to be deleted foreach (var secondarySetting in secondarySettings) { - if (siteGroup.Synchronize && !excludedSettings.Any(item => item.EntityName == secondarySetting.EntityName && item.SettingName == secondarySetting.SettingName)) + if (siteGroupMember.SiteGroup.Type == SiteGroupTypes.Synchronization && !excludedSettings.Any(item => item.EntityName == secondarySetting.EntityName && item.SettingName == secondarySetting.SettingName)) { settingRepository.DeleteSetting(secondarySetting.EntityName, secondarySetting.SettingId); updated = true; @@ -751,7 +773,7 @@ namespace Oqtane.Infrastructure if (updated) { - log += Log(siteGroup, $"{entityName} Settings Updated"); + log += Log(siteGroupMember, $"{entityName} Settings Updated"); } return log; @@ -769,10 +791,10 @@ namespace Oqtane.Infrastructure } } - private string Log(SiteGroup siteGroup, string content) + private string Log(SiteGroupMember siteGroupMember, string content) { - // not necessary to log initial replication - if (siteGroup.SynchronizedOn != DateTime.MinValue) + // not necessary to log initial synchronization + if (siteGroupMember.SynchronizedOn != DateTime.MinValue) { return content + "
"; } diff --git a/Oqtane.Server/Migrations/EntityBuilders/SiteGroupDefinitionEntityBuilder.cs b/Oqtane.Server/Migrations/EntityBuilders/SiteGroupDefinitionEntityBuilder.cs deleted file mode 100644 index 72974ecb..00000000 --- a/Oqtane.Server/Migrations/EntityBuilders/SiteGroupDefinitionEntityBuilder.cs +++ /dev/null @@ -1,48 +0,0 @@ -using Microsoft.EntityFrameworkCore.Migrations; -using Microsoft.EntityFrameworkCore.Migrations.Operations; -using Microsoft.EntityFrameworkCore.Migrations.Operations.Builders; -using Oqtane.Databases.Interfaces; - -// ReSharper disable MemberCanBePrivate.Global -// ReSharper disable UnusedAutoPropertyAccessor.Global - -namespace Oqtane.Migrations.EntityBuilders -{ - public class SiteGroupDefinitionEntityBuilder : AuditableBaseEntityBuilder - { - private const string _entityTableName = "SiteGroupDefinition"; - private readonly PrimaryKey _primaryKey = new("PK_SiteGroupDefinition", x => x.SiteGroupDefinitionId); - - public SiteGroupDefinitionEntityBuilder(MigrationBuilder migrationBuilder, IDatabase database) : base(migrationBuilder, database) - { - EntityTableName = _entityTableName; - PrimaryKey = _primaryKey; - } - - protected override SiteGroupDefinitionEntityBuilder BuildTable(ColumnsBuilder table) - { - SiteGroupDefinitionId = AddAutoIncrementColumn(table, "SiteGroupDefinitionId"); - Name = AddStringColumn(table, "Name", 200); - PrimarySiteId = AddIntegerColumn(table, "PrimarySiteId"); - Synchronization = AddBooleanColumn(table, "Synchronization"); - Synchronize = AddBooleanColumn(table, "Synchronize"); - Localization = AddBooleanColumn(table, "Localization"); - - AddAuditableColumns(table); - - return this; - } - - public OperationBuilder SiteGroupDefinitionId { get; set; } - - public OperationBuilder Name { get; set; } - - public OperationBuilder PrimarySiteId { get; set; } - - public OperationBuilder Synchronization { get; set; } - - public OperationBuilder Synchronize { get; set; } - - public OperationBuilder Localization { get; set; } - } -} diff --git a/Oqtane.Server/Migrations/EntityBuilders/SiteGroupEntityBuilder.cs b/Oqtane.Server/Migrations/EntityBuilders/SiteGroupEntityBuilder.cs index a6663315..3af17760 100644 --- a/Oqtane.Server/Migrations/EntityBuilders/SiteGroupEntityBuilder.cs +++ b/Oqtane.Server/Migrations/EntityBuilders/SiteGroupEntityBuilder.cs @@ -12,25 +12,20 @@ namespace Oqtane.Migrations.EntityBuilders { private const string _entityTableName = "SiteGroup"; private readonly PrimaryKey _primaryKey = new("PK_SiteGroup", x => x.SiteGroupId); - private readonly ForeignKey _groupForeignKey = new("FK_SiteGroup_SiteGroupDefinition", x => x.SiteGroupDefinitionId, "SiteGroupDefinition", "SiteGroupDefinitionId", ReferentialAction.Cascade); - private readonly ForeignKey _siteForeignKey = new("FK_SiteGroup_Site", x => x.SiteId, "Site", "SiteId", ReferentialAction.Cascade); public SiteGroupEntityBuilder(MigrationBuilder migrationBuilder, IDatabase database) : base(migrationBuilder, database) { EntityTableName = _entityTableName; PrimaryKey = _primaryKey; - ForeignKeys.Add(_groupForeignKey); - ForeignKeys.Add(_siteForeignKey); } protected override SiteGroupEntityBuilder BuildTable(ColumnsBuilder table) { SiteGroupId = AddAutoIncrementColumn(table, "SiteGroupId"); - SiteGroupDefinitionId = AddIntegerColumn(table, "SiteGroupDefinitionId"); - SiteId = AddIntegerColumn(table, "SiteId"); + Name = AddStringColumn(table, "Name", 200); + Type = AddStringColumn(table, "Type", 50); + PrimarySiteId = AddIntegerColumn(table, "PrimarySiteId"); Synchronize = AddBooleanColumn(table, "Synchronize"); - Notify = AddBooleanColumn(table, "Notify"); - SynchronizedOn = AddDateTimeColumn(table, "SynchronizedOn", true); AddAuditableColumns(table); @@ -39,14 +34,12 @@ namespace Oqtane.Migrations.EntityBuilders public OperationBuilder SiteGroupId { get; set; } - public OperationBuilder SiteGroupDefinitionId { get; set; } + public OperationBuilder Name { get; set; } - public OperationBuilder SiteId { get; set; } + public OperationBuilder Type { get; set; } + + public OperationBuilder PrimarySiteId { get; set; } public OperationBuilder Synchronize { get; set; } - - public OperationBuilder Notify { get; set; } - - public OperationBuilder SynchronizedOn { get; set; } } } diff --git a/Oqtane.Server/Migrations/EntityBuilders/SiteGroupMemberEntityBuilder.cs b/Oqtane.Server/Migrations/EntityBuilders/SiteGroupMemberEntityBuilder.cs new file mode 100644 index 00000000..d5ff717b --- /dev/null +++ b/Oqtane.Server/Migrations/EntityBuilders/SiteGroupMemberEntityBuilder.cs @@ -0,0 +1,46 @@ +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Migrations.Operations; +using Microsoft.EntityFrameworkCore.Migrations.Operations.Builders; +using Oqtane.Databases.Interfaces; + +// ReSharper disable MemberCanBePrivate.Global +// ReSharper disable UnusedAutoPropertyAccessor.Global + +namespace Oqtane.Migrations.EntityBuilders +{ + public class SiteGroupMemberEntityBuilder : AuditableBaseEntityBuilder + { + private const string _entityTableName = "SiteGroupMember"; + private readonly PrimaryKey _primaryKey = new("PK_SiteGroupMember", x => x.SiteGroupMemberId); + private readonly ForeignKey _groupForeignKey = new("FK_SiteGroupMember_SiteGroup", x => x.SiteGroupId, "SiteGroup", "SiteGroupId", ReferentialAction.Cascade); + private readonly ForeignKey _siteForeignKey = new("FK_SiteGroupMember_Site", x => x.SiteId, "Site", "SiteId", ReferentialAction.Cascade); + + public SiteGroupMemberEntityBuilder(MigrationBuilder migrationBuilder, IDatabase database) : base(migrationBuilder, database) + { + EntityTableName = _entityTableName; + PrimaryKey = _primaryKey; + ForeignKeys.Add(_groupForeignKey); + ForeignKeys.Add(_siteForeignKey); + } + + protected override SiteGroupMemberEntityBuilder BuildTable(ColumnsBuilder table) + { + SiteGroupMemberId = AddAutoIncrementColumn(table, "SiteGroupMemberId"); + SiteGroupId = AddIntegerColumn(table, "SiteGroupId"); + SiteId = AddIntegerColumn(table, "SiteId"); + SynchronizedOn = AddDateTimeColumn(table, "SynchronizedOn", true); + + AddAuditableColumns(table); + + return this; + } + + public OperationBuilder SiteGroupMemberId { get; set; } + + public OperationBuilder SiteGroupId { get; set; } + + public OperationBuilder SiteId { get; set; } + + public OperationBuilder SynchronizedOn { get; set; } + } +} diff --git a/Oqtane.Server/Migrations/Tenant/10010001_AddSiteGroups.cs b/Oqtane.Server/Migrations/Tenant/10010001_AddSiteGroups.cs index a8e767c2..f504e86d 100644 --- a/Oqtane.Server/Migrations/Tenant/10010001_AddSiteGroups.cs +++ b/Oqtane.Server/Migrations/Tenant/10010001_AddSiteGroups.cs @@ -16,12 +16,12 @@ namespace Oqtane.Migrations.Tenant protected override void Up(MigrationBuilder migrationBuilder) { - var siteGroupDefinitionEntityBuilder = new SiteGroupDefinitionEntityBuilder(migrationBuilder, ActiveDatabase); - siteGroupDefinitionEntityBuilder.Create(); - var siteGroupEntityBuilder = new SiteGroupEntityBuilder(migrationBuilder, ActiveDatabase); siteGroupEntityBuilder.Create(); - siteGroupEntityBuilder.AddIndex("IX_SiteGroup", new[] { "SiteId", "SiteGroupDefinitionId" }, true); + + var siteGroupMemberEntityBuilder = new SiteGroupMemberEntityBuilder(migrationBuilder, ActiveDatabase); + siteGroupMemberEntityBuilder.Create(); + siteGroupMemberEntityBuilder.AddIndex("IX_SiteGroupMember", new[] { "SiteId", "SiteGroupId" }, true); } protected override void Down(MigrationBuilder migrationBuilder) diff --git a/Oqtane.Server/Modules/HtmlText/Manager/HtmlTextManager.cs b/Oqtane.Server/Modules/HtmlText/Manager/HtmlTextManager.cs index da556510..93647fe7 100644 --- a/Oqtane.Server/Modules/HtmlText/Manager/HtmlTextManager.cs +++ b/Oqtane.Server/Modules/HtmlText/Manager/HtmlTextManager.cs @@ -59,39 +59,50 @@ namespace Oqtane.Modules.HtmlText.Manager // IPortable implementation public string ExportModule(Module module) - { - return GetModuleContent(module); - } - - public void ImportModule(Module module, string content, string version) - { - SaveModuleContent(module, content, version); - } - - // ISynchronizable implementation - public string ExtractModule(Module module) - { - return GetModuleContent(module); - } - - public void LoadModule(Module module, string content, string version) - { - SaveModuleContent(module, content, version); - } - - private string GetModuleContent(Module module) { string content = ""; - var htmltexts = _htmlText.GetHtmlTexts(module.ModuleId); - if (htmltexts != null && htmltexts.Any()) + var htmltext = GetModuleContent(module.ModuleId); + if (htmltext != null) { - var htmltext = htmltexts.OrderByDescending(item => item.CreatedOn).First(); content = WebUtility.HtmlEncode(htmltext.Content); } return content; } - private void SaveModuleContent(Module module, string content, string version) + public void ImportModule(Module module, string content, string version) + { + SaveModuleContent(module, content); + } + + // ISynchronizable implementation + public string ExtractModule(Module module, DateTime lastSynchronizedOn) + { + string content = ""; + var htmltext = GetModuleContent(module.ModuleId); + if (htmltext != null && htmltext.CreatedOn > lastSynchronizedOn) + { + content = WebUtility.HtmlEncode(htmltext.Content); + } + return content; + } + + public void LoadModule(Module module, string content) + { + SaveModuleContent(module, content); + } + + private Models.HtmlText GetModuleContent(int moduleId) + { + // get the most recent htmltext record for the module + var htmltexts = _htmlText.GetHtmlTexts(moduleId); + if (htmltexts != null && htmltexts.Any()) + { + return htmltexts.OrderByDescending(item => item.CreatedOn).First(); + } + return null; + } + + private void SaveModuleContent(Module module, string content) { content = WebUtility.HtmlDecode(content); var htmlText = new Models.HtmlText(); diff --git a/Oqtane.Server/Modules/HtmlText/Repository/HtmlTextRepository.cs b/Oqtane.Server/Modules/HtmlText/Repository/HtmlTextRepository.cs index 4c320455..53688d4c 100644 --- a/Oqtane.Server/Modules/HtmlText/Repository/HtmlTextRepository.cs +++ b/Oqtane.Server/Modules/HtmlText/Repository/HtmlTextRepository.cs @@ -2,7 +2,6 @@ using System.Linq; using Oqtane.Documentation; using System.Collections.Generic; using Microsoft.EntityFrameworkCore; -using Oqtane.Repository; namespace Oqtane.Modules.HtmlText.Repository { @@ -19,12 +18,10 @@ namespace Oqtane.Modules.HtmlText.Repository public class HtmlTextRepository : IHtmlTextRepository, ITransientService { private readonly IDbContextFactory _factory; - private readonly IModuleRepository _moduleRepository; - public HtmlTextRepository(IDbContextFactory factory, IModuleRepository moduleRepository) + public HtmlTextRepository(IDbContextFactory factory) { _factory = factory; - _moduleRepository = moduleRepository; } public IEnumerable GetHtmlTexts(int moduleId) @@ -44,11 +41,6 @@ namespace Oqtane.Modules.HtmlText.Repository using var db = _factory.CreateDbContext(); db.HtmlText.Add(htmlText); db.SaveChanges(); - - // update module ModifiedOn date - var module = _moduleRepository.GetModule(htmlText.ModuleId); - _moduleRepository.UpdateModule(module); - return htmlText; } @@ -60,10 +52,6 @@ namespace Oqtane.Modules.HtmlText.Repository { db.HtmlText.Remove(htmlText); db.SaveChanges(); - - // update module ModifiedOn date - var module = _moduleRepository.GetModule(htmlText.ModuleId); - _moduleRepository.UpdateModule(module); } } } diff --git a/Oqtane.Server/Modules/ISynchronizable.cs b/Oqtane.Server/Modules/ISynchronizable.cs index 7dce3284..456d992f 100644 --- a/Oqtane.Server/Modules/ISynchronizable.cs +++ b/Oqtane.Server/Modules/ISynchronizable.cs @@ -1,3 +1,4 @@ +using System; using Oqtane.Models; namespace Oqtane.Modules @@ -6,8 +7,8 @@ namespace Oqtane.Modules { // You Must Set The "ServerManagerType" In Your IModule Interface - string ExtractModule(Module module); + string ExtractModule(Module module, DateTime lastSynchronizedOn); - void LoadModule(Module module, string content, string version); + void LoadModule(Module module, string content); } } diff --git a/Oqtane.Server/Oqtane.Server.csproj b/Oqtane.Server/Oqtane.Server.csproj index 446622cf..b5ba8453 100644 --- a/Oqtane.Server/Oqtane.Server.csproj +++ b/Oqtane.Server/Oqtane.Server.csproj @@ -28,28 +28,28 @@ - - - - + + + + - + - - + + - + - - + + - + diff --git a/Oqtane.Server/Repository/Context/TenantDBContext.cs b/Oqtane.Server/Repository/Context/TenantDBContext.cs index 0c970c3b..f6325fd9 100644 --- a/Oqtane.Server/Repository/Context/TenantDBContext.cs +++ b/Oqtane.Server/Repository/Context/TenantDBContext.cs @@ -134,7 +134,7 @@ namespace Oqtane.Repository public virtual DbSet SearchContentWord { get; set; } public virtual DbSet SearchWord { get; set; } public virtual DbSet MigrationHistory { get; set; } - public virtual DbSet SiteGroupDefinition { get; set; } public virtual DbSet SiteGroup { get; set; } + public virtual DbSet SiteGroupMember { get; set; } } } diff --git a/Oqtane.Server/Repository/SiteGroupDefinitionRepository.cs b/Oqtane.Server/Repository/SiteGroupDefinitionRepository.cs deleted file mode 100644 index 1d1019be..00000000 --- a/Oqtane.Server/Repository/SiteGroupDefinitionRepository.cs +++ /dev/null @@ -1,75 +0,0 @@ -using System.Collections.Generic; -using System.Linq; -using Microsoft.EntityFrameworkCore; -using Oqtane.Models; - -namespace Oqtane.Repository -{ - public interface ISiteGroupDefinitionRepository - { - IEnumerable GetSiteGroupDefinitions(); - SiteGroupDefinition AddSiteGroupDefinition(SiteGroupDefinition siteGroupDefinition); - SiteGroupDefinition UpdateSiteGroupDefinition(SiteGroupDefinition siteGroupDefinition); - SiteGroupDefinition GetSiteGroupDefinition(int siteGroupDefinitionId); - SiteGroupDefinition GetSiteGroupDefinition(int siteGroupDefinitionId, bool tracking); - void DeleteSiteGroupDefinition(int siteGroupDefinitionId); - } - - public class SiteGroupDefinitionRepository : ISiteGroupDefinitionRepository - { - private readonly IDbContextFactory _dbContextFactory; - - public SiteGroupDefinitionRepository(IDbContextFactory dbContextFactory) - { - _dbContextFactory = dbContextFactory; - } - - public IEnumerable GetSiteGroupDefinitions() - { - using var db = _dbContextFactory.CreateDbContext(); - return db.SiteGroupDefinition.ToList(); - } - - public SiteGroupDefinition AddSiteGroupDefinition(SiteGroupDefinition siteGroupDefinition) - { - using var db = _dbContextFactory.CreateDbContext(); - db.SiteGroupDefinition.Add(siteGroupDefinition); - db.SaveChanges(); - return siteGroupDefinition; - } - - public SiteGroupDefinition UpdateSiteGroupDefinition(SiteGroupDefinition siteGroupDefinition) - { - using var db = _dbContextFactory.CreateDbContext(); - db.Entry(siteGroupDefinition).State = EntityState.Modified; - db.SaveChanges(); - return siteGroupDefinition; - } - - public SiteGroupDefinition GetSiteGroupDefinition(int siteGroupDefinitionId) - { - return GetSiteGroupDefinition(siteGroupDefinitionId, true); - } - - public SiteGroupDefinition GetSiteGroupDefinition(int siteGroupDefinitionId, bool tracking) - { - using var db = _dbContextFactory.CreateDbContext(); - if (tracking) - { - return db.SiteGroupDefinition.FirstOrDefault(item => item.SiteGroupDefinitionId == siteGroupDefinitionId); - } - else - { - return db.SiteGroupDefinition.AsNoTracking().FirstOrDefault(item => item.SiteGroupDefinitionId == siteGroupDefinitionId); - } - } - - public void DeleteSiteGroupDefinition(int siteGroupDefinitionId) - { - using var db = _dbContextFactory.CreateDbContext(); - SiteGroupDefinition group = db.SiteGroupDefinition.Find(siteGroupDefinitionId); - db.SiteGroupDefinition.Remove(group); - db.SaveChanges(); - } - } -} diff --git a/Oqtane.Server/Repository/SiteGroupMemberRepository.cs b/Oqtane.Server/Repository/SiteGroupMemberRepository.cs new file mode 100644 index 00000000..82efb37a --- /dev/null +++ b/Oqtane.Server/Repository/SiteGroupMemberRepository.cs @@ -0,0 +1,88 @@ +using System.Collections.Generic; +using System.Linq; +using Microsoft.EntityFrameworkCore; +using Oqtane.Models; + +namespace Oqtane.Repository +{ + public interface ISiteGroupMemberRepository + { + IEnumerable GetSiteGroupMembers(); + IEnumerable GetSiteGroupMembers(int siteId, int siteGroupId); + SiteGroupMember AddSiteGroupMember(SiteGroupMember siteGroupMember); + SiteGroupMember UpdateSiteGroupMember(SiteGroupMember siteGroupMember); + SiteGroupMember GetSiteGroupMember(int siteGroupMemberId); + SiteGroupMember GetSiteGroupMember(int siteGroupMemberId, bool tracking); + void DeleteSiteGroupMember(int siteGroupMemberId); + } + + public class SiteGroupMemberRepository : ISiteGroupMemberRepository + { + private readonly IDbContextFactory _dbContextFactory; + + public SiteGroupMemberRepository(IDbContextFactory dbContextFactory) + { + _dbContextFactory = dbContextFactory; + } + + public IEnumerable GetSiteGroupMembers() + { + return GetSiteGroupMembers(-1, -1); + } + + public IEnumerable GetSiteGroupMembers(int siteId, int siteGroupId) + { + using var db = _dbContextFactory.CreateDbContext(); + return db.SiteGroupMember + .Where(item => (siteId == -1 || item.SiteId == siteId) && (siteGroupId == -1 || item.SiteGroupId == siteGroupId)) + .Include(item => item.SiteGroup) // eager load + .ToList(); + } + + public SiteGroupMember AddSiteGroupMember(SiteGroupMember siteGroupMember) + { + using var db = _dbContextFactory.CreateDbContext(); + db.SiteGroupMember.Add(siteGroupMember); + db.SaveChanges(); + return siteGroupMember; + } + + public SiteGroupMember UpdateSiteGroupMember(SiteGroupMember siteGroupMember) + { + using var db = _dbContextFactory.CreateDbContext(); + db.Entry(siteGroupMember).State = EntityState.Modified; + db.SaveChanges(); + return siteGroupMember; + } + + public SiteGroupMember GetSiteGroupMember(int siteGroupMemberId) + { + return GetSiteGroupMember(siteGroupMemberId, true); + } + + public SiteGroupMember GetSiteGroupMember(int siteGroupMemberId, bool tracking) + { + using var db = _dbContextFactory.CreateDbContext(); + if (tracking) + { + return db.SiteGroupMember + .Include(item => item.SiteGroup) // eager load + .FirstOrDefault(item => item.SiteGroupMemberId == siteGroupMemberId); + } + else + { + return db.SiteGroupMember.AsNoTracking() + .Include(item => item.SiteGroup) // eager load + .FirstOrDefault(item => item.SiteGroupMemberId == siteGroupMemberId); + } + } + + public void DeleteSiteGroupMember(int siteGroupMemberId) + { + using var db = _dbContextFactory.CreateDbContext(); + SiteGroupMember SiteGroupMember = db.SiteGroupMember.Find(siteGroupMemberId); + db.SiteGroupMember.Remove(SiteGroupMember); + db.SaveChanges(); + } + } +} diff --git a/Oqtane.Server/Repository/SiteGroupRepository.cs b/Oqtane.Server/Repository/SiteGroupRepository.cs index 392f83e7..883974c3 100644 --- a/Oqtane.Server/Repository/SiteGroupRepository.cs +++ b/Oqtane.Server/Repository/SiteGroupRepository.cs @@ -8,12 +8,11 @@ namespace Oqtane.Repository public interface ISiteGroupRepository { IEnumerable GetSiteGroups(); - IEnumerable GetSiteGroups(int siteId, int siteGroupDefinitionId); SiteGroup AddSiteGroup(SiteGroup siteGroup); SiteGroup UpdateSiteGroup(SiteGroup siteGroup); - SiteGroup GetSiteGroup(int siteSiteGroupId); - SiteGroup GetSiteGroup(int siteSiteGroupId, bool tracking); - void DeleteSiteGroup(int siteSiteGroupId); + SiteGroup GetSiteGroup(int siteGroupId); + SiteGroup GetSiteGroup(int siteGroupId, bool tracking); + void DeleteSiteGroup(int siteGroupId); } public class SiteGroupRepository : ISiteGroupRepository @@ -24,64 +23,52 @@ namespace Oqtane.Repository { _dbContextFactory = dbContextFactory; } - + public IEnumerable GetSiteGroups() { - return GetSiteGroups(-1, -1); + using var db = _dbContextFactory.CreateDbContext(); + return db.SiteGroup.ToList(); } - public IEnumerable GetSiteGroups(int siteId, int siteGroupDefinitionId) + public SiteGroup AddSiteGroup(SiteGroup siteGroup) { using var db = _dbContextFactory.CreateDbContext(); - return db.SiteGroup - .Where(item => (siteId == -1 || item.SiteId == siteId) && (siteGroupDefinitionId == -1 || item.SiteGroupDefinitionId == siteGroupDefinitionId)) - .Include(item => item.SiteGroupDefinition) // eager load - .ToList(); - } - - public SiteGroup AddSiteGroup(SiteGroup SiteGroup) - { - using var db = _dbContextFactory.CreateDbContext(); - db.SiteGroup.Add(SiteGroup); + db.SiteGroup.Add(siteGroup); db.SaveChanges(); - return SiteGroup; + return siteGroup; } - public SiteGroup UpdateSiteGroup(SiteGroup SiteGroup) + public SiteGroup UpdateSiteGroup(SiteGroup siteGroup) { using var db = _dbContextFactory.CreateDbContext(); - db.Entry(SiteGroup).State = EntityState.Modified; + db.Entry(siteGroup).State = EntityState.Modified; db.SaveChanges(); - return SiteGroup; + return siteGroup; } - public SiteGroup GetSiteGroup(int SiteGroupId) + public SiteGroup GetSiteGroup(int siteGroupId) { - return GetSiteGroup(SiteGroupId, true); + return GetSiteGroup(siteGroupId, true); } - public SiteGroup GetSiteGroup(int SiteGroupId, bool tracking) + public SiteGroup GetSiteGroup(int siteGroupId, bool tracking) { using var db = _dbContextFactory.CreateDbContext(); if (tracking) { - return db.SiteGroup - .Include(item => item.SiteGroupDefinition) // eager load - .FirstOrDefault(item => item.SiteGroupId == SiteGroupId); + return db.SiteGroup.FirstOrDefault(item => item.SiteGroupId == siteGroupId); } else { - return db.SiteGroup.AsNoTracking() - .Include(item => item.SiteGroupDefinition) // eager load - .FirstOrDefault(item => item.SiteGroupId == SiteGroupId); + return db.SiteGroup.AsNoTracking().FirstOrDefault(item => item.SiteGroupId == siteGroupId); } } - public void DeleteSiteGroup(int SiteGroupId) + public void DeleteSiteGroup(int siteGroupId) { using var db = _dbContextFactory.CreateDbContext(); - SiteGroup SiteGroup = db.SiteGroup.Find(SiteGroupId); - db.SiteGroup.Remove(SiteGroup); + SiteGroup group = db.SiteGroup.Find(siteGroupId); + db.SiteGroup.Remove(group); db.SaveChanges(); } } diff --git a/Oqtane.Server/Services/SiteService.cs b/Oqtane.Server/Services/SiteService.cs index ea232358..3c356fbd 100644 --- a/Oqtane.Server/Services/SiteService.cs +++ b/Oqtane.Server/Services/SiteService.cs @@ -21,7 +21,7 @@ namespace Oqtane.Services public class ServerSiteService : ISiteService { private readonly ISiteRepository _sites; - private readonly ISiteGroupRepository _siteGroups; + private readonly ISiteGroupMemberRepository _siteGroupMembers; private readonly IAliasRepository _aliases; private readonly IPageRepository _pages; private readonly IThemeRepository _themes; @@ -39,10 +39,10 @@ namespace Oqtane.Services private readonly IHttpContextAccessor _accessor; private readonly string _private = "[PRIVATE]"; - public ServerSiteService(ISiteRepository sites, ISiteGroupRepository siteGroups, IAliasRepository aliases, IPageRepository pages, IThemeRepository themes, IPageModuleRepository pageModules, IModuleDefinitionRepository moduleDefinitions, ILanguageRepository languages, IUserManager userManager, IUserPermissions userPermissions, ISettingRepository settings, ITenantManager tenantManager, ISyncManager syncManager, IConfigManager configManager, ILogManager logger, IMemoryCache cache, IHttpContextAccessor accessor) + public ServerSiteService(ISiteRepository sites, ISiteGroupMemberRepository siteGroupMembers, IAliasRepository aliases, IPageRepository pages, IThemeRepository themes, IPageModuleRepository pageModules, IModuleDefinitionRepository moduleDefinitions, ILanguageRepository languages, IUserManager userManager, IUserPermissions userPermissions, ISettingRepository settings, ITenantManager tenantManager, ISyncManager syncManager, IConfigManager configManager, ILogManager logger, IMemoryCache cache, IHttpContextAccessor accessor) { _sites = sites; - _siteGroups = siteGroups; + _siteGroupMembers = siteGroupMembers; _aliases = aliases; _pages = pages; _themes = themes; @@ -315,31 +315,39 @@ namespace Oqtane.Services { var languages = new List(); - var siteGroups = _siteGroups.GetSiteGroups(); - if (siteGroups.Any(item => item.SiteId == siteId && item.SiteGroupDefinition.Localization)) + var siteGroupMembers = _siteGroupMembers.GetSiteGroupMembers(); + if (siteGroupMembers.Any(item => item.SiteId == siteId && item.SiteGroup.Type == SiteGroupTypes.Localization)) { + // site is part of a localized site group - get all languages from the site group var sites = _sites.GetSites().ToList(); var aliases = _aliases.GetAliases().ToList(); - foreach (var siteGroupDefinitionId in siteGroups.Where(item => item.SiteId == siteId && item.SiteGroupDefinition.Localization).Select(item => item.SiteGroupDefinitionId).Distinct().ToList()) + foreach (var siteGroupId in siteGroupMembers.Where(item => item.SiteId == siteId && item.SiteGroup.Type == SiteGroupTypes.Localization).Select(item => item.SiteGroupId).Distinct().ToList()) { - foreach (var siteGroup in siteGroups.Where(item => item.SiteGroupDefinitionId == siteGroupDefinitionId)) + foreach (var siteGroupMember in siteGroupMembers.Where(item => item.SiteGroupId == siteGroupId)) { - var site = sites.FirstOrDefault(item => item.SiteId == siteGroup.SiteId); + var site = sites.FirstOrDefault(item => item.SiteId == siteGroupMember.SiteId); if (site != null && !string.IsNullOrEmpty(site.CultureCode)) { - if (!languages.Any(item => item.Code == site.CultureCode)) + var alias = aliases.FirstOrDefault(item => item.SiteId == siteGroupMember.SiteId && item.TenantId == tenantId && item.IsDefault); + if (alias != null) { - var alias = aliases.FirstOrDefault(item => item.SiteId == siteGroup.SiteId && item.TenantId == tenantId && item.IsDefault); - if (alias != null) - { - languages.Add(new Language { Code = site.CultureCode, Name = "", AliasName = alias.Name, IsDefault = true }); - } + languages.Add(new Language { Code = site.CultureCode, Name = "", AliasName = alias.Name, IsDefault = false }); } } } } } + else + { + // use site languages + languages = _languages.GetLanguages(siteId).ToList(); + var defaultCulture = CultureInfo.GetCultureInfo(Constants.DefaultCulture); + if (!languages.Exists(item => item.Code == defaultCulture.Name)) + { + languages.Add(new Language { Code = defaultCulture.Name, Name = "", Version = Constants.Version, IsDefault = !languages.Any(l => l.IsDefault) }); + } + } return languages; } diff --git a/Oqtane.Server/wwwroot/Modules/Templates/External/Client/[Owner].Module.[Module].Client.csproj b/Oqtane.Server/wwwroot/Modules/Templates/External/Client/[Owner].Module.[Module].Client.csproj index 2a6abe7e..fce77d74 100644 --- a/Oqtane.Server/wwwroot/Modules/Templates/External/Client/[Owner].Module.[Module].Client.csproj +++ b/Oqtane.Server/wwwroot/Modules/Templates/External/Client/[Owner].Module.[Module].Client.csproj @@ -13,10 +13,10 @@ - - - - + + + + diff --git a/Oqtane.Server/wwwroot/Modules/Templates/External/Server/[Owner].Module.[Module].Server.csproj b/Oqtane.Server/wwwroot/Modules/Templates/External/Server/[Owner].Module.[Module].Server.csproj index 8fabc8ca..c69fd9cf 100644 --- a/Oqtane.Server/wwwroot/Modules/Templates/External/Server/[Owner].Module.[Module].Server.csproj +++ b/Oqtane.Server/wwwroot/Modules/Templates/External/Server/[Owner].Module.[Module].Server.csproj @@ -20,10 +20,10 @@ - - - - + + + + diff --git a/Oqtane.Server/wwwroot/Themes/Templates/External/Client/[Owner].Theme.[Theme].Client.csproj b/Oqtane.Server/wwwroot/Themes/Templates/External/Client/[Owner].Theme.[Theme].Client.csproj index db9ce2c7..3378693d 100644 --- a/Oqtane.Server/wwwroot/Themes/Templates/External/Client/[Owner].Theme.[Theme].Client.csproj +++ b/Oqtane.Server/wwwroot/Themes/Templates/External/Client/[Owner].Theme.[Theme].Client.csproj @@ -14,9 +14,9 @@ - - - + + + diff --git a/Oqtane.Shared/Models/SiteGroup.cs b/Oqtane.Shared/Models/SiteGroup.cs index e6edc2e5..5d71709b 100644 --- a/Oqtane.Shared/Models/SiteGroup.cs +++ b/Oqtane.Shared/Models/SiteGroup.cs @@ -1,49 +1,30 @@ -using System; -using System.ComponentModel.DataAnnotations.Schema; - namespace Oqtane.Models { public class SiteGroup : ModelBase { /// - /// ID to identify the site group + /// ID to identify the group /// public int SiteGroupId { get; set; } /// - /// Reference to the . + /// Name of the group /// - public int SiteGroupDefinitionId { get; set; } + public string Name { get; set; } /// - /// Reference to the . + /// Group type ie. Synchronization, Localization /// - public int SiteId { get; set; } + public string Type { get; set; } /// - /// Specifies the site synchronization approach (false = compare, true = update) + /// SiteId of the primary site in the group /// - public bool Synchronize { get; set; } + public int PrimarySiteId { get; set; } /// - /// Indicates if the site administrator should be notified of any synchronization activity + /// Specifies if the group should be synchronized /// - public bool Notify { get; set; } - - /// - /// The last date/time the site was synchronized - /// - public DateTime? SynchronizedOn { get; set; } - - /// - /// The itself. - /// - public SiteGroupDefinition SiteGroupDefinition { get; set; } - - /// - /// The primary alias for the site - /// - [NotMapped] - public string AliasName { get; set; } + public bool Synchronize{ get; set; } } } diff --git a/Oqtane.Shared/Models/SiteGroupDefinition.cs b/Oqtane.Shared/Models/SiteGroupDefinition.cs deleted file mode 100644 index 4db114e4..00000000 --- a/Oqtane.Shared/Models/SiteGroupDefinition.cs +++ /dev/null @@ -1,35 +0,0 @@ -namespace Oqtane.Models -{ - public class SiteGroupDefinition : ModelBase - { - /// - /// ID to identify the group - /// - public int SiteGroupDefinitionId { get; set; } - - /// - /// Name of the group - /// - public string Name { get; set; } - - /// - /// SiteId of the primary site in the group - /// - public int PrimarySiteId { get; set; } - - /// - /// Indicates if the group supports synchronization - /// - public bool Synchronization { get; set; } - - /// - /// Specifies if the group needs to be synchronized - /// - public bool Synchronize { get; set; } - - /// - /// Indicates if the group supports localization - /// - public bool Localization { get; set; } - } -} diff --git a/Oqtane.Shared/Models/SiteGroupMember.cs b/Oqtane.Shared/Models/SiteGroupMember.cs new file mode 100644 index 00000000..cb572509 --- /dev/null +++ b/Oqtane.Shared/Models/SiteGroupMember.cs @@ -0,0 +1,39 @@ +using System; +using System.ComponentModel.DataAnnotations.Schema; + +namespace Oqtane.Models +{ + public class SiteGroupMember : ModelBase + { + /// + /// ID to identify the site group + /// + public int SiteGroupMemberId { get; set; } + + /// + /// Reference to the . + /// + public int SiteGroupId { get; set; } + + /// + /// Reference to the . + /// + public int SiteId { get; set; } + + /// + /// The last date/time the site was synchronized + /// + public DateTime? SynchronizedOn { get; set; } + + /// + /// The itself. + /// + public SiteGroup SiteGroup { get; set; } + + /// + /// The primary alias for the site + /// + [NotMapped] + public string AliasName { get; set; } + } +} diff --git a/Oqtane.Shared/Oqtane.Shared.csproj b/Oqtane.Shared/Oqtane.Shared.csproj index 1ed1fc4a..7b8432a7 100644 --- a/Oqtane.Shared/Oqtane.Shared.csproj +++ b/Oqtane.Shared/Oqtane.Shared.csproj @@ -5,8 +5,8 @@ - - + + diff --git a/Oqtane.Shared/Shared/EntityNames.cs b/Oqtane.Shared/Shared/EntityNames.cs index f7030223..72571e82 100644 --- a/Oqtane.Shared/Shared/EntityNames.cs +++ b/Oqtane.Shared/Shared/EntityNames.cs @@ -17,7 +17,7 @@ namespace Oqtane.Shared public const string Setting = "Setting"; public const string Site = "Site"; public const string SiteGroup = "SiteGroup"; - public const string SiteGroupDefinition = "SiteGroupDefinition"; + public const string SiteGroupMember = "SiteGroupMember"; public const string Tenant = "Tenant"; public const string Theme = "Theme"; public const string UrlMapping = "UrlMapping"; diff --git a/Oqtane.Shared/Shared/SiteGroupTypes.cs b/Oqtane.Shared/Shared/SiteGroupTypes.cs new file mode 100644 index 00000000..55e0f7ff --- /dev/null +++ b/Oqtane.Shared/Shared/SiteGroupTypes.cs @@ -0,0 +1,9 @@ +namespace Oqtane.Shared +{ + public class SiteGroupTypes + { + public const string Synchronization = "Synchronization"; + public const string Comparison = "Comparison"; + public const string Localization = "Localization"; + } +}