+
{{vm.version}}
{{vm.savings.title}} {{vm.savings.message}}
diff --git a/uSync8.BackOffice/App_Plugins/uSync8/settings/expansion.html b/uSync.BackOffice/App_Plugins/uSync8/settings/expansion.html
similarity index 100%
rename from uSync8.BackOffice/App_Plugins/uSync8/settings/expansion.html
rename to uSync.BackOffice/App_Plugins/uSync8/settings/expansion.html
diff --git a/uSync8.BackOffice/App_Plugins/uSync8/settings/expansionController.js b/uSync.BackOffice/App_Plugins/uSync8/settings/expansionController.js
similarity index 100%
rename from uSync8.BackOffice/App_Plugins/uSync8/settings/expansionController.js
rename to uSync.BackOffice/App_Plugins/uSync8/settings/expansionController.js
diff --git a/uSync8.BackOffice/App_Plugins/uSync8/settings/settings.html b/uSync.BackOffice/App_Plugins/uSync8/settings/settings.html
similarity index 100%
rename from uSync8.BackOffice/App_Plugins/uSync8/settings/settings.html
rename to uSync.BackOffice/App_Plugins/uSync8/settings/settings.html
diff --git a/uSync8.BackOffice/App_Plugins/uSync8/settings/settingsController.js b/uSync.BackOffice/App_Plugins/uSync8/settings/settingsController.js
similarity index 100%
rename from uSync8.BackOffice/App_Plugins/uSync8/settings/settingsController.js
rename to uSync.BackOffice/App_Plugins/uSync8/settings/settingsController.js
diff --git a/uSync8.BackOffice/App_Plugins/uSync8/settings/uSyncController.js b/uSync.BackOffice/App_Plugins/uSync8/settings/uSyncController.js
similarity index 96%
rename from uSync8.BackOffice/App_Plugins/uSync8/settings/uSyncController.js
rename to uSync.BackOffice/App_Plugins/uSync8/settings/uSyncController.js
index c651da69..62407533 100644
--- a/uSync8.BackOffice/App_Plugins/uSync8/settings/uSyncController.js
+++ b/uSync.BackOffice/App_Plugins/uSync8/settings/uSyncController.js
@@ -109,9 +109,19 @@
uSync8DashboardService.checkVersion()
.then(function (result) {
vm.versionInfo = result.data;
- })
+ });
+
+ uSync8DashboardService.getAddOns()
+ .then(function (result) {
+ vm.version = 'v' + result.data.Version;
+ if (result.data.AddOnString.length > 0) {
+ vm.version += ' + ' + result.data.AddOnString;
+ }
+ });
}
+
+
///////////
function report(group) {
resetStatus(modes.REPORT);
@@ -158,7 +168,7 @@
function importItems(force, group) {
resetStatus(modes.IMPORT);
- vm.hideLink = true;
+ vm.hideLink = false;
vm.importButton.state = 'busy';
uSync8DashboardService.importItems(force, group, getClientId())
diff --git a/uSync8.BackOffice/App_Plugins/uSync8/uSyncHub.js b/uSync.BackOffice/App_Plugins/uSync8/uSyncHub.js
similarity index 100%
rename from uSync8.BackOffice/App_Plugins/uSync8/uSyncHub.js
rename to uSync.BackOffice/App_Plugins/uSync8/uSyncHub.js
diff --git a/uSync8.BackOffice/App_Plugins/uSync8/uSyncService.js b/uSync.BackOffice/App_Plugins/uSync8/uSyncService.js
similarity index 100%
rename from uSync8.BackOffice/App_Plugins/uSync8/uSyncService.js
rename to uSync.BackOffice/App_Plugins/uSync8/uSyncService.js
diff --git a/uSync8.BackOffice/App_Plugins/uSync8/uSync_864.js b/uSync.BackOffice/App_Plugins/uSync8/uSync_864.js
similarity index 100%
rename from uSync8.BackOffice/App_Plugins/uSync8/uSync_864.js
rename to uSync.BackOffice/App_Plugins/uSync8/uSync_864.js
diff --git a/uSync8.BackOffice/App_Plugins/uSync8/usync.css b/uSync.BackOffice/App_Plugins/uSync8/usync.css
similarity index 100%
rename from uSync8.BackOffice/App_Plugins/uSync8/usync.css
rename to uSync.BackOffice/App_Plugins/uSync8/usync.css
diff --git a/uSync8.BackOffice/App_Plugins/uSync8/usync_864.css b/uSync.BackOffice/App_Plugins/uSync8/usync_864.css
similarity index 100%
rename from uSync8.BackOffice/App_Plugins/uSync8/usync_864.css
rename to uSync.BackOffice/App_Plugins/uSync8/usync_864.css
diff --git a/uSync8.BackOffice/BackOfficeConstants.cs b/uSync.BackOffice/BackOfficeConstants.cs
similarity index 94%
rename from uSync8.BackOffice/BackOfficeConstants.cs
rename to uSync.BackOffice/BackOfficeConstants.cs
index 072c555f..d815d8e1 100644
--- a/uSync8.BackOffice/BackOfficeConstants.cs
+++ b/uSync.BackOffice/BackOfficeConstants.cs
@@ -1,7 +1,9 @@
-namespace uSync8.BackOffice
+namespace uSync.BackOffice
{
public static partial class uSyncBackOfficeConstants
{
+ public const string ReleaseSuffix = "-core-alpha";
+
public const string ConfigFile = "uSync8.config";
public static class Priorites
diff --git a/uSync8.BackOffice/Config/uSync8.config b/uSync.BackOffice/Config/uSync8.config
similarity index 82%
rename from uSync8.BackOffice/Config/uSync8.config
rename to uSync.BackOffice/Config/uSync8.config
index f1fe5979..89e68bb0 100644
--- a/uSync8.BackOffice/Config/uSync8.config
+++ b/uSync.BackOffice/Config/uSync8.config
@@ -32,6 +32,15 @@
+
+
+
+
\ No newline at end of file
diff --git a/uSync8.BackOffice/Configuration/BackOfficeConfig.cs b/uSync.BackOffice/Configuration/BackOfficeConfig.cs
similarity index 89%
rename from uSync8.BackOffice/Configuration/BackOfficeConfig.cs
rename to uSync.BackOffice/Configuration/BackOfficeConfig.cs
index 9c094e3f..5f136063 100644
--- a/uSync8.BackOffice/Configuration/BackOfficeConfig.cs
+++ b/uSync.BackOffice/Configuration/BackOfficeConfig.cs
@@ -7,12 +7,13 @@
using Newtonsoft.Json;
using Newtonsoft.Json.Serialization;
+using Umbraco.Composing;
using Umbraco.Core;
using Umbraco.Core.Logging;
-using uSync8.Core.Extensions;
+using uSync.Core.Extensions;
-namespace uSync8.BackOffice.Configuration
+namespace uSync.BackOffice.Configuration
{
///
/// uSync config loading / saving
@@ -36,13 +37,15 @@ namespace uSync8.BackOffice.Configuration
public class uSyncConfig
{
private readonly IProfilingLogger logger;
-
public uSyncSettings Settings { get; set; }
- private string settingsFile = $"{Umbraco.Core.IO.SystemDirectories.Config}/{uSyncBackOfficeConstants.ConfigFile}";
+ private readonly string settingsFile;
public uSyncConfig(IProfilingLogger logger)
{
+ var configFolder = new DirectoryInfo(Current.HostingEnvironment.MapPathContentRoot(Constants.SystemDirectories.Config));
+ settingsFile = Path.Combine(configFolder.FullName, uSyncBackOfficeConstants.ConfigFile);
+
this.logger = logger;
this.Settings = LoadSettings();
}
@@ -61,7 +64,9 @@ public uSyncSettings LoadSettings()
return SaveSettings(settings);
}
- settings.RootFolder = ValueFromWebConfigOrDefault("Folder", node.Element("Folder").ValueOrDefault(settings.RootFolder));
+ settings.RootFolder = Current.HostingEnvironment.MapPathContentRoot("~/uSync/v9");
+
+ // settings.RootFolder = ValueFromWebConfigOrDefault("Folder", node.Element("Folder").ValueOrDefault(settings.RootFolder));
settings.UseFlatStructure = ValueFromWebConfigOrDefault("FlatFolders", node.Element("FlatFolders").ValueOrDefault(true));
settings.ImportAtStartup = ValueFromWebConfigOrDefault("ImportAtStartup", node.Element("ImportAtStartup").ValueOrDefault(true));
settings.ExportAtStartup = ValueFromWebConfigOrDefault("ExportAtStartup", node.Element("ExportAtStartup").ValueOrDefault(false));
@@ -93,6 +98,8 @@ public uSyncSettings LoadSettings()
}
}
+ settings.CustomMappings = LoadAppKeysFromNode(node, "Mappings", true);
+
// fire the loaded event, so things can tell when they are loaded.
Reloaded?.Invoke(settings);
@@ -146,6 +153,42 @@ private HandlerSet LoadSingleHandlerSet(XElement setNode, uSyncSettings defaultS
}
+ ///
+ /// Loads a selection of app keys from a given node.
+ ///
+ ///
+ /// lets us load a dictionary from a key/value set.
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ private IDictionary LoadAppKeysFromNode(XElement root, string node, bool lowerCaseKey = false)
+ {
+ var AppSettings = new Dictionary();
+
+ var settingsNode = root.Element(node);
+ if (settingsNode != null)
+ {
+ foreach(var element in settingsNode.Elements("Add"))
+ {
+ var key = element.Attribute("Key").ValueOrDefault(string.Empty);
+ var value = element.Attribute("Value").ValueOrDefault(string.Empty);
+
+ if (!string.IsNullOrWhiteSpace(key) && !string.IsNullOrWhiteSpace(value))
+ {
+ var keyValue = lowerCaseKey ? key.ToLower() : key;
+ AppSettings[keyValue] = value;
+ }
+ }
+ }
+
+ return AppSettings;
+ }
+
///
/// Save the settings to disk.
///
@@ -351,7 +394,7 @@ public void SaveHandlerConfig(XElement node, HandlerSettings config, uSyncSettin
///
private XElement GetSettingsFile(bool loadIfBlank = false)
{
- var filePath = Umbraco.Core.IO.IOHelper.MapPath(settingsFile);
+ var filePath = Current.IOHelper.MapPath(settingsFile);
if (File.Exists(filePath))
{
logger.Debug
("Loading Settings from {filePath}", filePath);
@@ -393,7 +436,7 @@ private void SaveSettingsFile(XElement node)
var root = node.Parent;
if (root != null)
{
- var filePath = Umbraco.Core.IO.IOHelper.MapPath(settingsFile);
+ var filePath = Current.IOHelper.MapPath(settingsFile);
root.Save(filePath);
}
}
diff --git a/uSync8.BackOffice/Configuration/ConfigExtensions.cs b/uSync.BackOffice/Configuration/ConfigExtensions.cs
similarity index 92%
rename from uSync8.BackOffice/Configuration/ConfigExtensions.cs
rename to uSync.BackOffice/Configuration/ConfigExtensions.cs
index ed741e58..32a6cc31 100644
--- a/uSync8.BackOffice/Configuration/ConfigExtensions.cs
+++ b/uSync.BackOffice/Configuration/ConfigExtensions.cs
@@ -1,6 +1,6 @@
using Umbraco.Core.Configuration;
-namespace uSync8.BackOffice.Configuration
+namespace uSync.BackOffice.Configuration
{
public static class ConfigExtensions
{
diff --git a/uSync8.BackOffice/Configuration/OverriddenValue.cs b/uSync.BackOffice/Configuration/OverriddenValue.cs
similarity index 96%
rename from uSync8.BackOffice/Configuration/OverriddenValue.cs
rename to uSync.BackOffice/Configuration/OverriddenValue.cs
index 952fd436..3bbf6858 100644
--- a/uSync8.BackOffice/Configuration/OverriddenValue.cs
+++ b/uSync.BackOffice/Configuration/OverriddenValue.cs
@@ -1,4 +1,4 @@
-namespace uSync8.BackOffice.Configuration
+namespace uSync.BackOffice.Configuration
{
///
/// Overridden value - will let us use the value - but when
diff --git a/uSync8.BackOffice/Configuration/uSyncHandlerSettings.cs b/uSync.BackOffice/Configuration/uSyncHandlerSettings.cs
similarity index 97%
rename from uSync8.BackOffice/Configuration/uSyncHandlerSettings.cs
rename to uSync.BackOffice/Configuration/uSyncHandlerSettings.cs
index 4f8ba743..8f7870d7 100644
--- a/uSync8.BackOffice/Configuration/uSyncHandlerSettings.cs
+++ b/uSync.BackOffice/Configuration/uSyncHandlerSettings.cs
@@ -5,7 +5,7 @@
using Umbraco.Core;
-namespace uSync8.BackOffice.Configuration
+namespace uSync.BackOffice.Configuration
{
[JsonObject(NamingStrategyType = typeof(DefaultNamingStrategy))]
public class HandlerSettings
diff --git a/uSync8.BackOffice/Configuration/uSyncSettings.cs b/uSync.BackOffice/Configuration/uSyncSettings.cs
similarity index 91%
rename from uSync8.BackOffice/Configuration/uSyncSettings.cs
rename to uSync.BackOffice/Configuration/uSyncSettings.cs
index 3e9f94bc..c4e23b00 100644
--- a/uSync8.BackOffice/Configuration/uSyncSettings.cs
+++ b/uSync.BackOffice/Configuration/uSyncSettings.cs
@@ -6,7 +6,7 @@
using Umbraco.Core;
-namespace uSync8.BackOffice.Configuration
+namespace uSync.BackOffice.Configuration
{
[JsonObject(NamingStrategyType = typeof(DefaultNamingStrategy))]
public class uSyncSettings
@@ -83,6 +83,12 @@ public class uSyncSettings
///
public HandlerSet DefaultHandlerSet()
=> this.HandlerSets.Where(x => x.Name.InvariantEquals(this.DefaultSet)).FirstOrDefault();
+
+ ///
+ /// Custom mapping keys, allows users to add a simple config mapping
+ /// to make one property type to behave like an existing one
+ ///
+ public IDictionary CustomMappings { get; set; }
}
public class HandlerSet
diff --git a/uSync8.BackOffice/Controllers/Trees/uSyncTreeController.cs b/uSync.BackOffice/Controllers/Trees/uSyncTreeController.cs
similarity index 51%
rename from uSync8.BackOffice/Controllers/Trees/uSyncTreeController.cs
rename to uSync.BackOffice/Controllers/Trees/uSyncTreeController.cs
index 6ca10a0b..9088e0b6 100644
--- a/uSync8.BackOffice/Controllers/Trees/uSyncTreeController.cs
+++ b/uSync.BackOffice/Controllers/Trees/uSyncTreeController.cs
@@ -1,13 +1,19 @@
-using System.Net.Http.Formatting;
-using System.Web.Http.ModelBinding;
+
+using System.Net.Http.Formatting;
+
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
using Umbraco.Core;
+using Umbraco.Core.Services;
+using Umbraco.Web.BackOffice.Trees;
+using Umbraco.Web.Common.Attributes;
+using Umbraco.Web.Common.ModelBinders;
using Umbraco.Web.Models.Trees;
-using Umbraco.Web.Mvc;
using Umbraco.Web.Trees;
-using Umbraco.Web.WebApi.Filters;
+using Umbraco.Web.WebApi;
-namespace uSync8.BackOffice.Controllers.Trees
+namespace uSync.BackOffice.Controllers.Trees
{
[Tree(Constants.Applications.Settings, uSync.Trees.uSync,
TreeGroup = uSync.Trees.Group,
@@ -15,7 +21,13 @@ namespace uSync8.BackOffice.Controllers.Trees
[PluginController(uSync.Name)]
public class uSyncTreeController : TreeController
{
- protected override TreeNode CreateRootNode(FormDataCollection queryStrings)
+ public uSyncTreeController(
+ ILocalizedTextService localizedTextService,
+ UmbracoApiControllerTypeCollection umbracoApiControllerTypeCollection)
+ : base(localizedTextService, umbracoApiControllerTypeCollection)
+ { }
+
+ protected override TreeNode CreateRootNode(FormCollection queryStrings)
{
var root = base.CreateRootNode(queryStrings);
@@ -27,12 +39,12 @@ protected override TreeNode CreateRootNode(FormDataCollection queryStrings)
return root;
}
- protected override MenuItemCollection GetMenuForNode(string id, [ModelBinder(typeof(HttpQueryStringModelBinder))] FormDataCollection queryStrings)
+ protected override MenuItemCollection GetMenuForNode(string id, [ModelBinder(typeof(HttpQueryStringModelBinder))] FormCollection queryStrings)
{
return null;
}
- protected override TreeNodeCollection GetTreeNodes(string id, [ModelBinder(typeof(HttpQueryStringModelBinder))] FormDataCollection queryStrings)
+ protected override TreeNodeCollection GetTreeNodes(string id, [ModelBinder(typeof(HttpQueryStringModelBinder))] FormCollection queryStrings)
{
return new TreeNodeCollection();
}
diff --git a/uSync8.BackOffice/Controllers/ViewModels/AddOnInfo.cs b/uSync.BackOffice/Controllers/ViewModels/AddOnInfo.cs
similarity index 84%
rename from uSync8.BackOffice/Controllers/ViewModels/AddOnInfo.cs
rename to uSync.BackOffice/Controllers/ViewModels/AddOnInfo.cs
index 74828a07..5494b374 100644
--- a/uSync8.BackOffice/Controllers/ViewModels/AddOnInfo.cs
+++ b/uSync.BackOffice/Controllers/ViewModels/AddOnInfo.cs
@@ -3,9 +3,9 @@
using Newtonsoft.Json;
using Newtonsoft.Json.Serialization;
-using uSync8.BackOffice.Models;
+using uSync.BackOffice.Models;
-namespace uSync8.BackOffice.Controllers
+namespace uSync.BackOffice.Controllers
{
[JsonObject(NamingStrategyType = typeof(DefaultNamingStrategy))]
public class AddOnInfo
diff --git a/uSync8.BackOffice/Controllers/ViewModels/uSyncOptions.cs b/uSync.BackOffice/Controllers/ViewModels/uSyncOptions.cs
similarity index 93%
rename from uSync8.BackOffice/Controllers/ViewModels/uSyncOptions.cs
rename to uSync.BackOffice/Controllers/ViewModels/uSyncOptions.cs
index e005fa31..1a6d8ed2 100644
--- a/uSync8.BackOffice/Controllers/ViewModels/uSyncOptions.cs
+++ b/uSync.BackOffice/Controllers/ViewModels/uSyncOptions.cs
@@ -3,7 +3,7 @@
using Newtonsoft.Json;
using Newtonsoft.Json.Serialization;
-namespace uSync8.BackOffice.Controllers
+namespace uSync.BackOffice.Controllers
{
[JsonObject(NamingStrategyType = typeof(DefaultNamingStrategy))]
public class uSyncOptions
diff --git a/uSync8.BackOffice/Controllers/uSyncDashboardApiController.cs b/uSync.BackOffice/Controllers/uSyncDashboardApiController.cs
similarity index 82%
rename from uSync8.BackOffice/Controllers/uSyncDashboardApiController.cs
rename to uSync.BackOffice/Controllers/uSyncDashboardApiController.cs
index f39d03c6..4c5bb9a7 100644
--- a/uSync8.BackOffice/Controllers/uSyncDashboardApiController.cs
+++ b/uSync.BackOffice/Controllers/uSyncDashboardApiController.cs
@@ -5,28 +5,33 @@
using System.Net;
using System.Net.Http;
using System.Threading.Tasks;
-using System.Web.Http;
+
+using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using Newtonsoft.Json.Serialization;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+using Umbraco.Composing;
using Umbraco.Core.Cache;
-using Umbraco.Core.Logging;
using Umbraco.Core.Composing;
using Umbraco.Core.IO;
-using Umbraco.Web.Mvc;
-using Umbraco.Web.WebApi;
-using Umbraco.Web.WebApi.Filters;
+using Umbraco.Core.Logging;
+using Umbraco.Web.BackOffice.Controllers;
+using Umbraco.Web.BackOffice.Filters;
+using Umbraco.Web.Common.Attributes;
-using uSync8.BackOffice.Configuration;
-using uSync8.BackOffice.Hubs;
-using uSync8.BackOffice.Models;
-using uSync8.BackOffice.SyncHandlers;
+using uSync.BackOffice.Configuration;
+using uSync.BackOffice.Hubs;
+using uSync.BackOffice.Models;
+using uSync.BackOffice.SyncHandlers;
using Constants = Umbraco.Core.Constants;
-namespace uSync8.BackOffice.Controllers
+namespace uSync.BackOffice.Controllers
{
[PluginController("uSync")]
[UmbracoApplicationAuthorize(Constants.Applications.Settings)]
@@ -38,17 +43,30 @@ public class uSyncDashboardApiController : UmbracoAuthorizedApiController
private uSyncSettings settings;
private uSyncConfig Config;
+ private readonly IProfilingLogger logger;
+
+ private readonly ITypeFinder typeFinder;
+ private readonly AppCaches appCaches;
+
public uSyncDashboardApiController(
+ ITypeFinder typeFinder,
+ AppCaches appCaches,
uSyncService uSyncService,
SyncHandlerFactory handlerFactory,
- uSyncConfig config)
+ uSyncConfig config,
+ IProfilingLogger logger)
{
+ this.typeFinder = typeFinder;
+ this.appCaches = appCaches;
+
this.Config = config;
this.uSyncService = uSyncService;
this.settings = Current.Configs.uSync();
this.handlerFactory = handlerFactory;
+ this.logger = logger;
+
uSyncConfig.Reloaded += BackOfficeConfig_Reloaded;
}
@@ -97,11 +115,13 @@ public IEnumerable