Diplomarbeit-Absolventenverein/oqtane.framework
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #6019 from sbwalker/dev

Browse Source 
improvements to site synchronization
This commit is contained in:
Shaun Walker
2026-02-10 12:32:26 -05:00
committed by GitHub
parent 8f25d9f06a ad300a58c1
commit 59bdc4c04e
2 changed files with 42 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Oqtane.Client/Resources/Themes/Controls/ControlPanelInteractive.resx
View File

@@ -174,9 +174,6 @@
<data name="Title" xml:space="preserve"> <data name="Title" xml:space="preserve">
<value>Title:</value> <value>Title:</value>
</data> </data>
<data name="System.Update" xml:space="preserve">
<value>Check For System Updates</value>
</data>
<data name="Visibility" xml:space="preserve"> <data name="Visibility" xml:space="preserve">
<value>Visibility:</value> <value>Visibility:</value>
</data> </data>
@@ -202,6 +199,6 @@
<value>Copy Existing Module</value> <value>Copy Existing Module</value>
</data> </data>
<data name="Synchronize" xml:space="preserve"> <data name="Synchronize" xml:space="preserve">
<value>Synchronize</value> <value>Synchronize Site</value>
</data> </data>
</root> </root>

62
Oqtane.Server/Infrastructure/Jobs/SynchronizationJob.cs
View File

@@ -266,13 +266,17 @@ namespace Oqtane.Infrastructure
roleRepository.UpdateRole(secondaryRole); roleRepository.UpdateRole(secondaryRole);
} }
log += Log(siteGroupMember, $"Role Updated: {secondaryRole.Name}"); log += Log(siteGroupMember, $"Role Updated: {secondaryRole.Name}");
secondaryRoles.Remove(role);
} }
} }
if (role != null)
{
secondaryRoles.Remove(role);
}
} }
// remove roles in the secondary site which do not exist in the primary site // 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 (siteGroupMember.SiteGroup.Type == SiteGroupTypes.Synchronization) if (siteGroupMember.SiteGroup.Type == SiteGroupTypes.Synchronization)
{ {
@@ -345,10 +349,14 @@ namespace Oqtane.Infrastructure
folderRepository.UpdateFolder(secondaryFolder); folderRepository.UpdateFolder(secondaryFolder);
} }
log += Log(siteGroupMember, $"Folder Updated: {secondaryFolder.Path}"); log += Log(siteGroupMember, $"Folder Updated: {secondaryFolder.Path}");
secondaryFolders.Remove(folder);
} }
} }
if (folder != null)
{
secondaryFolders.Remove(folder);
}
// folder settings // folder settings
log += SynchronizeSettings(settingRepository, siteGroupMember, EntityNames.Folder, primaryFolder.FolderId, secondaryFolder.FolderId); log += SynchronizeSettings(settingRepository, siteGroupMember, EntityNames.Folder, primaryFolder.FolderId, secondaryFolder.FolderId);
@@ -384,7 +392,7 @@ namespace Oqtane.Infrastructure
fileRepository.AddFile(secondaryFile); fileRepository.AddFile(secondaryFile);
SynchronizeFile(folderRepository, primaryFolder, primaryFile, secondaryFolder, secondaryFile); SynchronizeFile(folderRepository, primaryFolder, primaryFile, secondaryFolder, secondaryFile);
} }
log += Log(siteGroupMember, $"File Added: {CreateLink(siteGroupMember.AliasName + secondaryFolder.Path + secondaryFile.Name)}"); log += Log(siteGroupMember, $"File Added: {CreateLink(siteGroupMember.AliasName + "/" + secondaryFolder.Path + secondaryFile.Name)}");
} }
else else
{ {
@@ -393,14 +401,18 @@ namespace Oqtane.Infrastructure
fileRepository.UpdateFile(secondaryFile); fileRepository.UpdateFile(secondaryFile);
SynchronizeFile(folderRepository, primaryFolder, primaryFile, secondaryFolder, secondaryFile); SynchronizeFile(folderRepository, primaryFolder, primaryFile, secondaryFolder, secondaryFile);
} }
log += Log(siteGroupMember, $"File Updated: {CreateLink(siteGroupMember.AliasName + secondaryFolder.Path + secondaryFile.Name)}"); log += Log(siteGroupMember, $"File Updated: {CreateLink(siteGroupMember.AliasName + "/" + secondaryFolder.Path + secondaryFile.Name)}");
secondaryFiles.Remove(file);
} }
} }
if (file != null)
{
secondaryFiles.Remove(file);
}
} }
// remove files in the secondary site which do not exist in the primary site // 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 (siteGroupMember.SiteGroup.Type == SiteGroupTypes.Synchronization) if (siteGroupMember.SiteGroup.Type == SiteGroupTypes.Synchronization)
{ {
@@ -408,12 +420,12 @@ namespace Oqtane.Infrastructure
var secondaryPath = Path.Combine(folderRepository.GetFolderPath(secondaryFolder), secondaryFile.Name); var secondaryPath = Path.Combine(folderRepository.GetFolderPath(secondaryFolder), secondaryFile.Name);
System.IO.File.Delete(secondaryPath); System.IO.File.Delete(secondaryPath);
} }
log += Log(siteGroupMember, $"File Deleted: {CreateLink(siteGroupMember.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 // 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 (siteGroupMember.SiteGroup.Type == SiteGroupTypes.Synchronization) if (siteGroupMember.SiteGroup.Type == SiteGroupTypes.Synchronization)
{ {
@@ -510,7 +522,7 @@ namespace Oqtane.Infrastructure
{ {
secondaryPage = pageRepository.AddPage(secondaryPage); secondaryPage = pageRepository.AddPage(secondaryPage);
} }
log += Log(siteGroupMember, $"Page Added: {CreateLink(siteGroupMember.AliasName + secondaryPage.Path)}"); log += Log(siteGroupMember, $"Page Added: {CreateLink(siteGroupMember.AliasName + "/" + secondaryPage.Path)}");
} }
else else
{ {
@@ -518,11 +530,15 @@ namespace Oqtane.Infrastructure
{ {
secondaryPage = pageRepository.UpdatePage(secondaryPage); secondaryPage = pageRepository.UpdatePage(secondaryPage);
} }
log += Log(siteGroupMember, $"Page Updated: {CreateLink(siteGroupMember.AliasName + secondaryPage.Path)}"); log += Log(siteGroupMember, $"Page Updated: {CreateLink(siteGroupMember.AliasName + "/" + secondaryPage.Path)}");
secondaryPages.Remove(page);
} }
} }
if (page != null)
{
secondaryPages.Remove(page);
}
// page settings // page settings
log += SynchronizeSettings(settingRepository, siteGroupMember, EntityNames.Page, primaryPage.PageId, secondaryPage.PageId); log += SynchronizeSettings(settingRepository, siteGroupMember, EntityNames.Page, primaryPage.PageId, secondaryPage.PageId);
@@ -579,7 +595,7 @@ namespace Oqtane.Infrastructure
module = moduleRepository.AddModule(secondaryPageModule.Module); module = moduleRepository.AddModule(secondaryPageModule.Module);
updateContent = true; updateContent = true;
} }
log += Log(siteGroupMember, $"Module Added: {module.Title} - {CreateLink(siteGroupMember.AliasName + secondaryPage.Path)}"); log += Log(siteGroupMember, $"Module Added: {secondaryPageModule.Title} - {CreateLink(siteGroupMember.AliasName + "/" + secondaryPage.Path)}");
} }
if (module != null) if (module != null)
{ {
@@ -589,7 +605,7 @@ namespace Oqtane.Infrastructure
{ {
secondaryPageModule = pageModuleRepository.AddPageModule(secondaryPageModule); secondaryPageModule = pageModuleRepository.AddPageModule(secondaryPageModule);
} }
log += Log(siteGroupMember, $"Module Instance Added: {module.Title} - {CreateLink(siteGroupMember.AliasName + secondaryPage.Path)}"); log += Log(siteGroupMember, $"Module Instance Added: {secondaryPageModule.Title} - {CreateLink(siteGroupMember.AliasName + "/" + secondaryPage.Path)}");
secondaryPageModule.Module = module; secondaryPageModule.Module = module;
} }
} }
@@ -603,7 +619,7 @@ namespace Oqtane.Infrastructure
moduleRepository.UpdateModule(secondaryPageModule.Module); moduleRepository.UpdateModule(secondaryPageModule.Module);
} }
updateContent = true; updateContent = true;
log += Log(siteGroupMember, $"Module Updated: {secondaryPageModule.Title} - {CreateLink(siteGroupMember.AliasName + secondaryPage.Path)}"); log += Log(siteGroupMember, $"Module Updated: {secondaryPageModule.Title} - {CreateLink(siteGroupMember.AliasName + "/" + secondaryPage.Path)}");
} }
if (primaryPageModule.ModifiedOn > siteGroupMember.SynchronizedOn) if (primaryPageModule.ModifiedOn > siteGroupMember.SynchronizedOn)
{ {
@@ -611,8 +627,7 @@ namespace Oqtane.Infrastructure
{ {
secondaryPageModule = pageModuleRepository.UpdatePageModule(secondaryPageModule); secondaryPageModule = pageModuleRepository.UpdatePageModule(secondaryPageModule);
} }
log += Log(siteGroupMember, $"Module Instance Updated: {secondaryPageModule.Title} - {CreateLink(siteGroupMember.AliasName + secondaryPage.Path)}"); log += Log(siteGroupMember, $"Module Instance Updated: {secondaryPageModule.Title} - {CreateLink(siteGroupMember.AliasName + "/" + secondaryPage.Path)}");
secondaryPageModules.Remove(pageModule);
} }
} }
@@ -633,7 +648,7 @@ namespace Oqtane.Infrastructure
{ {
((ISynchronizable)moduleObject).LoadModule(secondaryPageModule.Module, primaryModuleContent, primaryPageModule.Module.ModuleDefinition.Version); ((ISynchronizable)moduleObject).LoadModule(secondaryPageModule.Module, primaryModuleContent, primaryPageModule.Module.ModuleDefinition.Version);
} }
log += Log(siteGroupMember, $"Module Content Updated: {secondaryPageModule.Title} - {CreateLink(siteGroupMember.AliasName + secondaryPage.Path)}"); log += Log(siteGroupMember, $"Module Content Updated: {secondaryPageModule.Title} - {CreateLink(siteGroupMember.AliasName + "/" + secondaryPage.Path)}");
} }
} }
catch catch
@@ -644,6 +659,11 @@ namespace Oqtane.Infrastructure
} }
} }
if (pageModule != null)
{
secondaryPageModules.Remove(pageModule);
}
// module settings // module settings
log += SynchronizeSettings(settingRepository, siteGroupMember, EntityNames.Module, primaryPageModule.ModuleId, secondaryPageModule.ModuleId); log += SynchronizeSettings(settingRepository, siteGroupMember, EntityNames.Module, primaryPageModule.ModuleId, secondaryPageModule.ModuleId);
} }
@@ -668,18 +688,18 @@ namespace Oqtane.Infrastructure
{ {
pageModuleRepository.DeletePageModule(secondaryPageModule.PageModuleId); pageModuleRepository.DeletePageModule(secondaryPageModule.PageModuleId);
} }
log += Log(siteGroupMember, $"Module Instance Deleted: {secondaryPageModule.Title} - {CreateLink(siteGroupMember.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 // 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 (siteGroupMember.SiteGroup.Type == SiteGroupTypes.Synchronization) if (siteGroupMember.SiteGroup.Type == SiteGroupTypes.Synchronization)
{ {
pageRepository.DeletePage(secondaryPage.PageId); pageRepository.DeletePage(secondaryPage.PageId);
} }
log += Log(siteGroupMember, $"Page Deleted: {CreateLink(siteGroupMember.AliasName + secondaryPage.Path)}"); log += Log(siteGroupMember, $"Page Deleted: {CreateLink(siteGroupMember.AliasName + "/" + secondaryPage.Path)}");
} }
if (siteGroupMember.SynchronizedOn == DateTime.MinValue || !string.IsNullOrEmpty(log)) if (siteGroupMember.SynchronizedOn == DateTime.MinValue || !string.IsNullOrEmpty(log))