yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated menu items and legacy action converters, now all legacy dialogs should now load. Now need to get legacy js actions being handled (i.e. just raw js calls like deleting)

Browse Source
This commit is contained in:
Shannon
2013-07-11 13:26:54 +10:00
parent 9d2c3865ed
commit a00074af44
9 changed files with 285 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Umbraco.Web/Trees/ApplicationTreeController.cs
View File

@@ -84,7 +84,8 @@ namespace Umbraco.Web.Trees
{
return byControllerAttempt.Result;
}
var legacyAttempt = configTree.TryGetRootNodeFromLegacyTree(queryStrings, Url);
var legacyAttempt = configTree.TryGetRootNodeFromLegacyTree(queryStrings, Url, configTree.ApplicationAlias);
if (legacyAttempt.Success)
{
return legacyAttempt.Result;
@@ -108,7 +109,7 @@ namespace Umbraco.Web.Trees
{
return byControllerAttempt.Result;
}
var legacyAttempt = configTree.TryLoadFromLegacyTree(id, queryStrings, Url);
var legacyAttempt = configTree.TryLoadFromLegacyTree(id, queryStrings, Url, configTree.ApplicationAlias);
if (legacyAttempt.Success)
{
return legacyAttempt.Result;

18
src/Umbraco.Web/Trees/ApplicationTreeExtensions.cs
View File

@@ -73,15 +73,15 @@ namespace Umbraco.Web.Trees
return new Attempt<TreeNodeCollection>(true, instance.GetNodes(id, formCollection));
}
internal static Attempt<TreeNode> TryGetRootNodeFromLegacyTree(this ApplicationTree appTree, FormDataCollection formCollection, UrlHelper urlHelper)
internal static Attempt<TreeNode> TryGetRootNodeFromLegacyTree(this ApplicationTree appTree, FormDataCollection formCollection, UrlHelper urlHelper, string currentSection)
{
var xmlTreeNodeAttempt = TryGetRootXmlNodeFromLegacyTree(appTree, formCollection, urlHelper);
if (xmlTreeNodeAttempt.Success == false)
{
return new Attempt<TreeNode>(xmlTreeNodeAttempt.Error);
}
return new Attempt<TreeNode>(true,
LegacyTreeDataConverter.ConvertFromLegacy(xmlTreeNodeAttempt.Result.NodeID, xmlTreeNodeAttempt.Result, urlHelper, isRoot: true));
return new Attempt<TreeNode>(true,
LegacyTreeDataConverter.ConvertFromLegacy(xmlTreeNodeAttempt.Result.NodeID, xmlTreeNodeAttempt.Result, urlHelper, currentSection, isRoot: true));
}
internal static Attempt<XmlTreeNode> TryGetRootXmlNodeFromLegacyTree(this ApplicationTree appTree, FormDataCollection formCollection, UrlHelper urlHelper)
@@ -107,14 +107,14 @@ namespace Umbraco.Web.Trees
: new Attempt<TreeDefinition>(true, treeDef);
}
internal static Attempt<TreeNodeCollection> TryLoadFromLegacyTree(this ApplicationTree appTree, string id, FormDataCollection formCollection, UrlHelper urlHelper)
internal static Attempt<TreeNodeCollection> TryLoadFromLegacyTree(this ApplicationTree appTree, string id, FormDataCollection formCollection, UrlHelper urlHelper, string currentSection)
{
var xTreeAttempt = appTree.TryGetXmlTree(id, formCollection);
if (xTreeAttempt.Success == false)
{
return new Attempt<TreeNodeCollection>(xTreeAttempt.Error);
}
return new Attempt<TreeNodeCollection>(true, LegacyTreeDataConverter.ConvertFromLegacy(id, xTreeAttempt.Result, urlHelper));
return new Attempt<TreeNodeCollection>(true, LegacyTreeDataConverter.ConvertFromLegacy(id, xTreeAttempt.Result, urlHelper, currentSection));
}
internal static Attempt<MenuItemCollection> TryGetMenuFromLegacyTreeRootNode(this ApplicationTree appTree, FormDataCollection formCollection, UrlHelper urlHelper)
@@ -125,7 +125,9 @@ namespace Umbraco.Web.Trees
return new Attempt<MenuItemCollection>(rootAttempt.Error);
}
var result = LegacyTreeDataConverter.ConvertFromLegacyMenu(rootAttempt.Result);
var currentSection = formCollection.GetRequiredString("section");
var result = LegacyTreeDataConverter.ConvertFromLegacyMenu(rootAttempt.Result, currentSection);
return new Attempt<MenuItemCollection>(true, result);
}
@@ -137,7 +139,9 @@ namespace Umbraco.Web.Trees
return new Attempt<MenuItemCollection>(xTreeAttempt.Error);
}
var result = LegacyTreeDataConverter.ConvertFromLegacyMenu(nodeId, xTreeAttempt.Result);
var currentSection = formCollection.GetRequiredString("section");
var result = LegacyTreeDataConverter.ConvertFromLegacyMenu(nodeId, xTreeAttempt.Result, currentSection);
if (result == null)
{
return new Attempt<MenuItemCollection>(new ApplicationException("Could not find the node with id " + nodeId + " in the collection of nodes contained with parent id " + parentId));

2
src/Umbraco.Web/Trees/LegacyTreeApiController.cs
View File

@@ -28,7 +28,7 @@ namespace Umbraco.Web.Trees
public TreeNodeCollection GetNodes(string id, FormDataCollection queryStrings)
{
var tree = GetTree(queryStrings);
var attempt = tree.TryLoadFromLegacyTree(id, queryStrings, Url);
var attempt = tree.TryLoadFromLegacyTree(id, queryStrings, Url, tree.ApplicationAlias);
if (attempt.Success == false)
{
var msg = "Could not render tree " + queryStrings.GetRequiredString("treeType") + " for node id " + id;

183
src/Umbraco.Web/Trees/LegacyTreeDataConverter.cs
View File

@@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.Linq;
using System.Web.Http.Routing;
using Umbraco.Core;
using umbraco;
using umbraco.BusinessLogic.Actions;
using umbraco.cms.helpers;
using umbraco.cms.presentation.Trees;
@@ -16,14 +17,14 @@ namespace Umbraco.Web.Trees
/// </summary>
internal class LegacyTreeDataConverter
{
/// <summary>
/// Gets the menu item collection from a legacy tree node based on it's parent node's child collection
/// </summary>
/// <param name="nodeId">The node id</param>
/// <param name="xmlTree">The node collection that contains the node id</param>
/// <param name="currentSection"></param>
/// <returns></returns>
internal static MenuItemCollection ConvertFromLegacyMenu(string nodeId, XmlTree xmlTree)
internal static MenuItemCollection ConvertFromLegacyMenu(string nodeId, XmlTree xmlTree, string currentSection)
{
var xmlTreeNode = xmlTree.treeCollection.FirstOrDefault(x => x.NodeID == nodeId);
if (xmlTreeNode == null)
@@ -31,15 +32,16 @@ namespace Umbraco.Web.Trees
return null;
}
return ConvertFromLegacyMenu(xmlTreeNode);
return ConvertFromLegacyMenu(xmlTreeNode, currentSection);
}
/// <summary>
/// Gets the menu item collection from a legacy tree node
/// </summary>
/// <param name="xmlTreeNode"></param>
/// <param name="currentSection"></param>
/// <returns></returns>
internal static MenuItemCollection ConvertFromLegacyMenu(XmlTreeNode xmlTreeNode)
internal static MenuItemCollection ConvertFromLegacyMenu(XmlTreeNode xmlTreeNode, string currentSection)
{
var collection = new MenuItemCollection();
@@ -55,7 +57,15 @@ namespace Umbraco.Web.Trees
}
else
{
collection.AddMenuItem(t);
var menuItem = collection.AddMenuItem(t);
//Now we need to figure out how to deal with the legacy menu actions t.JsSource
var tryGetLegacyUrl = GetUrlAndTitleFromLegacyAction(t, xmlTreeNode, currentSection);
if (tryGetLegacyUrl.Success)
{
menuItem.SetActionUrl(tryGetLegacyUrl.Result.Url, tryGetLegacyUrl.Result.ActionMethod);
menuItem.SetDialogTitle(tryGetLegacyUrl.Result.DialogTitle);
}
numAdded++;
}
}
@@ -71,7 +81,141 @@ namespace Umbraco.Web.Trees
return collection;
}
internal static TreeNode ConvertFromLegacy(string parentId, XmlTreeNode xmlTreeNode, UrlHelper urlHelper, bool isRoot = false)
/// <summary>
/// This will look at a legacy IAction's JsFunctionName and convert it to a URL if possible.
/// </summary>
/// <param name="action"></param>
/// <param name="actionNode"></param>
/// <param name="currentSection"></param>
internal static Attempt<LegacyUrlAction> GetUrlAndTitleFromLegacyAction(IAction action, XmlTreeNode actionNode, string currentSection)
{
if (action.JsFunctionName.IsNullOrWhiteSpace())
{
return Attempt<LegacyUrlAction>.False;
}
switch (action.JsFunctionName)
{
case "UmbClientMgr.appActions().actionNew()":
return new Attempt<LegacyUrlAction>(
true,
new LegacyUrlAction(
"create.aspx?nodeId=" + actionNode.NodeID + "&nodeType=" + actionNode.NodeType + "&nodeName=" + actionNode.Text + "&rnd=" + DateTime.UtcNow.Ticks,
ui.GetText("actions", "create")));
case "UmbClientMgr.appActions().actionNewFolder()":
return new Attempt<LegacyUrlAction>(
true,
new LegacyUrlAction(
"createFolder.aspx?nodeId=" + actionNode.NodeID + "&nodeType=" + actionNode.NodeType + "&nodeName=" + actionNode.Text + "&rnd=" + DateTime.UtcNow.Ticks,
ui.GetText("actions", "create")));
case "UmbClientMgr.appActions().actionSort()":
return new Attempt<LegacyUrlAction>(
true,
new LegacyUrlAction(
"dialogs/sort.aspx?id=" + actionNode.NodeID + "&nodeType=" + actionNode.NodeType + "&app=" + currentSection + "&rnd=" + DateTime.UtcNow.Ticks,
ui.GetText("actions", "sort")));
case "UmbClientMgr.appActions().actionRights()":
return new Attempt<LegacyUrlAction>(
true,
new LegacyUrlAction(
"dialogs/cruds.aspx?id=" + actionNode.NodeID + "&rnd=" + DateTime.UtcNow.Ticks,
ui.GetText("actions", "rights")));
case "UmbClientMgr.appActions().actionProtect()":
return new Attempt<LegacyUrlAction>(
true,
new LegacyUrlAction(
"dialogs/protectPage.aspx?mode=cut&nodeId=" + actionNode.NodeID + "&rnd=" + DateTime.UtcNow.Ticks,
ui.GetText("actions", "protect")));
case "UmbClientMgr.appActions().actionRollback()":
return new Attempt<LegacyUrlAction>(
true,
new LegacyUrlAction(
"dialogs/rollback.aspx?nodeId=" + actionNode.NodeID + "&rnd=" + DateTime.UtcNow.Ticks,
ui.GetText("actions", "rollback")));
case "UmbClientMgr.appActions().actionNotify()":
return new Attempt<LegacyUrlAction>(
true,
new LegacyUrlAction(
"dialogs/notifications.aspx?id=" + actionNode.NodeID + "&rnd=" + DateTime.UtcNow.Ticks,
ui.GetText("actions", "notify")));
case "UmbClientMgr.appActions().actionPublish()":
return new Attempt<LegacyUrlAction>(
true,
new LegacyUrlAction(
"dialogs/publish.aspx?id=" + actionNode.NodeID + "&rnd=" + DateTime.UtcNow.Ticks,
ui.GetText("actions", "publish")));
case "UmbClientMgr.appActions().actionToPublish()":
return new Attempt<LegacyUrlAction>(
true,
new LegacyUrlAction(
"dialogs/SendPublish.aspx?id=" + actionNode.NodeID + "&rnd=" + DateTime.UtcNow.Ticks,
ui.GetText("actions", "sendtopublish")));
case "UmbClientMgr.appActions().actionRePublish()":
return new Attempt<LegacyUrlAction>(
true,
new LegacyUrlAction(
"dialogs/republish.aspx?rnd=" + actionNode.NodeID + "&rnd=" + DateTime.UtcNow.Ticks,
"Republishing entire site"));
case "UmbClientMgr.appActions().actionAssignDomain()":
return new Attempt<LegacyUrlAction>(
true,
new LegacyUrlAction(
"dialogs/assignDomain2.aspx?id=" + actionNode.NodeID + "&rnd=" + DateTime.UtcNow.Ticks,
ui.GetText("actions", "assignDomain")));
case "UmbClientMgr.appActions().actionLiveEdit()":
return new Attempt<LegacyUrlAction>(
true,
new LegacyUrlAction(
"canvas.aspx?redir=/" + actionNode.NodeID + ".aspx",
"",
ActionUrlMethod.BlankWindow));
case "UmbClientMgr.appActions().actionSendToTranslate()":
return new Attempt<LegacyUrlAction>(
true,
new LegacyUrlAction(
"dialogs/sendToTranslation.aspx?id=" + actionNode.NodeID + "&rnd=" + DateTime.UtcNow.Ticks,
ui.GetText("actions", "sendToTranslate")));
case "UmbClientMgr.appActions().actionEmptyTranscan()":
return new Attempt<LegacyUrlAction>(
true,
new LegacyUrlAction(
"dialogs/emptyTrashcan.aspx?type=" + currentSection,
ui.GetText("actions", "emptyTrashcan")));
case "UmbClientMgr.appActions().actionImport()":
return new Attempt<LegacyUrlAction>(
true,
new LegacyUrlAction(
"dialogs/importDocumentType.aspx",
ui.GetText("actions", "importDocumentType")));
case "UmbClientMgr.appActions().actionExport()":
return new Attempt<LegacyUrlAction>(
true,
new LegacyUrlAction(
"dialogs/exportDocumentType.aspx?nodeId=" + actionNode.NodeID + "&rnd=" + DateTime.UtcNow.Ticks,
""));
case "UmbClientMgr.appActions().actionAudit()":
return new Attempt<LegacyUrlAction>(
true,
new LegacyUrlAction(
"dialogs/viewAuditTrail.aspx?nodeId=" + actionNode.NodeID + "&rnd=" + DateTime.UtcNow.Ticks,
ui.GetText("actions", "auditTrail")));
case "UmbClientMgr.appActions().actionMove()":
return new Attempt<LegacyUrlAction>(
true,
new LegacyUrlAction(
"dialogs/moveOrCopy.aspx?app=" + currentSection + "&mode=cut&id=" + actionNode.NodeID + "&rnd=" + DateTime.UtcNow.Ticks,
ui.GetText("actions", "move")));
case "UmbClientMgr.appActions().actionCopy()":
return new Attempt<LegacyUrlAction>(
true,
new LegacyUrlAction(
"dialogs/moveOrCopy.aspx?app=" + currentSection + "&mode=copy&id=" + actionNode.NodeID + "&rnd=" + DateTime.UtcNow.Ticks,
ui.GetText("actions", "copy")));
}
return Attempt<LegacyUrlAction>.False;
}
internal static TreeNode ConvertFromLegacy(string parentId, XmlTreeNode xmlTreeNode, UrlHelper urlHelper, string currentSection, bool isRoot = false)
{
// /umbraco/tree.aspx?rnd=d0d0ff11a1c347dabfaa0fc75effcc2a&id=1046&treeType=content&contextMenu=false&isDialog=false
@@ -92,7 +236,8 @@ namespace Umbraco.Web.Trees
{
"id=" + (isRoot ? "-1" : xmlTreeNode.NodeID),
"treeType=" + xmlTreeNode.TreeType,
"parentId=" + (isRoot ? "-1" : parentId)
"parentId=" + (isRoot ? "-1" : parentId),
"section=" + currentSection
});
//TODO: Might need to add stuff to additional attributes
@@ -117,7 +262,7 @@ namespace Umbraco.Web.Trees
return node;
}
internal static TreeNodeCollection ConvertFromLegacy(string parentId, XmlTree xmlTree, UrlHelper urlHelper)
internal static TreeNodeCollection ConvertFromLegacy(string parentId, XmlTree xmlTree, UrlHelper urlHelper, string currentSection)
{
//TODO: Once we get the editor URL stuff working we'll need to figure out how to convert
// that over to use the old school ui.xml stuff for these old trees and however the old menu items worked.
@@ -125,10 +270,30 @@ namespace Umbraco.Web.Trees
var collection = new TreeNodeCollection();
foreach (var x in xmlTree.treeCollection)
{
collection.Add(ConvertFromLegacy(parentId, x, urlHelper));
collection.Add(ConvertFromLegacy(parentId, x, urlHelper, currentSection));
}
return collection;
}
internal class LegacyUrlAction
{
public LegacyUrlAction(string url, string dialogTitle)
: this(url, dialogTitle, ActionUrlMethod.Dialog)
{
}
public LegacyUrlAction(string url, string dialogTitle, ActionUrlMethod actionMethod)
{
Url = url;
ActionMethod = actionMethod;
DialogTitle = dialogTitle;
}
public string Url { get; private set; }
public ActionUrlMethod ActionMethod { get; private set; }
public string DialogTitle { get; private set; }
}
}
}

55
src/Umbraco.Web/Trees/MenuItem.cs
View File

@@ -14,6 +14,7 @@ namespace Umbraco.Web.Trees
}
public MenuItem(IAction legacyMenu)
: this()
{
Name = legacyMenu.Alias;
Alias = legacyMenu.Alias;
@@ -25,6 +26,10 @@ namespace Umbraco.Web.Trees
/// A dictionary to support any additional meta data that should be rendered for the node which is
/// useful for custom action commands such as 'create', 'copy', etc...
/// </summary>
/// <remarks>
/// We will also use the meta data collection for dealing with legacy menu items (i.e. for loading custom URLs or
/// executing custom JS)
/// </remarks>
[DataMember(Name = "metaData")]
public Dictionary<string, object> AdditionalData { get; private set; }
@@ -41,5 +46,55 @@ namespace Umbraco.Web.Trees
[DataMember(Name = "cssclass")]
public string Icon { get; set; }
/// <summary>
/// The action to execute when the menu item is clicked. This is generally a route path.
/// </summary>
[DataMember(Name = "action")]
public string Action { get; set; }
}
public static class MenuItemExtensions
{
/// <summary>
/// Used as a key for the AdditionalData to specify a specific dialog title instead of the menu title
/// </summary>
internal const string DialogTitleKey = "dialogTitle";
internal const string ActionUrlKey = "actionUrl";
internal const string ActionUrlMethodKey = "actionUrlMethod";
/// <summary>
/// Puts a dialog title into the meta data to be displayed on the dialog of the menu item (if there is one)
/// instead of the menu name
/// </summary>
/// <param name="menuItem"></param>
/// <param name="dialogTitle"></param>
public static void SetDialogTitle(this MenuItem menuItem, string dialogTitle)
{
menuItem.AdditionalData[DialogTitleKey] = dialogTitle;
}
/// <summary>
/// Configures the menu item to launch a URL with the specified action (dialog or new window)
/// </summary>
/// <param name="menuItem"></param>
/// <param name="url"></param>
/// <param name="method"></param>
public static void SetActionUrl(this MenuItem menuItem, string url, ActionUrlMethod method = ActionUrlMethod.Dialog)
{
menuItem.AdditionalData[ActionUrlKey] = url;
menuItem.AdditionalData[ActionUrlMethodKey] = url;
}
}
/// <summary>
/// Specifies the action to take for a menu item when a URL is specified
/// </summary>
public enum ActionUrlMethod
{
Dialog,
BlankWindow
}
}

6
src/Umbraco.Web/Trees/MenuItemCollection.cs
View File

@@ -19,9 +19,11 @@ namespace Umbraco.Web.Trees
/// <summary>
/// Adds a menu item
/// </summary>
public void AddMenuItem(IAction action)
internal MenuItem AddMenuItem(IAction action)
{
_menuItems.Add(new MenuItem(action));
var item = new MenuItem(action);
_menuItems.Add(item);
return item;
}
/// <summary>