Incremental work on import/export steps.

This commit is contained in:
Sipke Schoorstra
2015-07-14 00:12:44 +01:00
parent ff872f0716
commit 21df6cbedd
10 changed files with 133 additions and 3 deletions

View File

@@ -4,6 +4,7 @@ using System.IO;
using System.Linq;
using System.Web.Mvc;
using Orchard.ContentManagement.MetaData;
using Orchard.DisplayManagement;
using Orchard.ImportExport.Services;
using Orchard.ImportExport.ViewModels;
using Orchard.Localization;
@@ -18,17 +19,21 @@ namespace Orchard.ImportExport.Controllers {
private readonly IContentDefinitionManager _contentDefinitionManager;
private readonly ICustomExportStep _customExportStep;
private readonly IRecipeResultAccessor _recipeResultAccessor;
private readonly IEnumerable<IExportStepProvider> _exportStepProviders;
public AdminController(
IOrchardServices services,
IImportExportService importExportService,
IContentDefinitionManager contentDefinitionManager,
ICustomExportStep customExportStep,
IRecipeResultAccessor recipeResultAccessor) {
IRecipeResultAccessor recipeResultAccessor,
IEnumerable<IExportStepProvider> exportStepProviders) {
_importExportService = importExportService;
_contentDefinitionManager = contentDefinitionManager;
_customExportStep = customExportStep;
_recipeResultAccessor = recipeResultAccessor;
_exportStepProviders = exportStepProviders;
Services = services;
T = NullLocalizer.Instance;
}
@@ -74,10 +79,19 @@ namespace Orchard.ImportExport.Controllers {
var customSteps = new List<string>();
_customExportStep.Register(customSteps);
var exportSteps = _exportStepProviders.Select(x => {
var editor = x.BuildEditor(Services.New);
editor.Provider = x;
editor.Name = x.Name;
editor.DisplayName = x.DisplayName;
return editor;
}).Where(x => x != null);
var viewModel = new ExportViewModel {
RecipeVersion = "1.0",
ContentTypes = new List<ContentTypeEntry>(),
CustomSteps = customSteps.Select(x => new CustomStepEntry { CustomStep = x }).ToList()
CustomSteps = customSteps.Select(x => new CustomStepEntry { CustomStep = x }).ToList(),
ExportSteps = exportSteps.ToList()
};
foreach (var contentType in _contentDefinitionManager.ListTypeDefinitions().OrderBy(c => c.Name)) {

View File

@@ -71,10 +71,15 @@
<Compile Include="Models\ExportOptions.cs" />
<Compile Include="Permissions.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Providers\DataExportStep.cs" />
<Compile Include="Services\ICustomExportStep.cs" />
<Compile Include="Services\IExportEventHandler.cs" />
<Compile Include="Services\IImportExportService.cs" />
<Compile Include="Services\IImportStepProvider.cs" />
<Compile Include="Services\ImportExportService.cs" />
<Compile Include="Services\IExportStepProvider.cs" />
<Compile Include="Services\ImportStepProvider.cs" />
<Compile Include="Services\ExportStepProvider.cs" />
<Compile Include="ViewModels\ExportViewModel.cs" />
<Compile Include="ViewModels\ImportResultViewModel.cs" />
<Compile Include="ViewModels\ImportViewModel.cs" />
@@ -113,6 +118,9 @@
<ItemGroup>
<Content Include="Views\Admin\ImportResult.cshtml" />
</ItemGroup>
<ItemGroup>
<Content Include="Views\EditorTemplates\ExportSteps\Data.cshtml" />
</ItemGroup>
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>

View File

@@ -0,0 +1,27 @@
using Orchard.ContentManagement;
using Orchard.ImportExport.Services;
using Orchard.Localization;
namespace Orchard.ImportExport.Providers {
public class DataExportStep : ExportStepProvider {
public override string Name {
get { return "Data"; }
}
public override LocalizedString DisplayName {
get { return T("Data"); }
}
public override dynamic BuildEditor(dynamic shapeFactory) {
return UpdateEditor(shapeFactory, null);
}
public override dynamic UpdateEditor(dynamic shapeFactory, IUpdateModel updater) {
if (updater != null) {
}
return shapeFactory.EditorTemplate(TemplateName: "ExportSteps/Data");
}
}
}

View File

@@ -0,0 +1,21 @@
using Orchard.ContentManagement;
using Orchard.Localization;
namespace Orchard.ImportExport.Services {
public abstract class ExportStepProvider : Component, IExportStepProvider {
public abstract string Name { get; }
public abstract LocalizedString DisplayName { get; }
protected virtual string Prefix {
get { return GetType().Name; }
}
public virtual dynamic BuildEditor(dynamic shapeFactory) {
return null;
}
public virtual dynamic UpdateEditor(dynamic shapeFactory, IUpdateModel updater) {
return null;
}
}
}

View File

@@ -0,0 +1,11 @@
using Orchard.ContentManagement;
using Orchard.Localization;
namespace Orchard.ImportExport.Services {
public interface IExportStepProvider : IDependency {
string Name { get; }
LocalizedString DisplayName { get; }
dynamic BuildEditor(dynamic shapeFactory);
dynamic UpdateEditor(dynamic shapeFactory, IUpdateModel updater);
}
}

View File

@@ -0,0 +1,11 @@
using Orchard.ContentManagement;
using Orchard.Localization;
namespace Orchard.ImportExport.Services {
public interface IImportStepProvider : IDependency {
string Name { get; }
LocalizedString DisplayName { get; }
dynamic BuildEditor(dynamic shapeFactory);
dynamic UpdateEditor(dynamic shapeFactory, IUpdateModel updater);
}
}

View File

@@ -0,0 +1,21 @@
using Orchard.ContentManagement;
using Orchard.Localization;
namespace Orchard.ImportExport.Services {
public abstract class ImportStepProvider : Component, IImportStepProvider {
public abstract string Name { get; }
public abstract LocalizedString DisplayName { get; }
protected virtual string Prefix {
get { return GetType().Name; }
}
public virtual dynamic BuildEditor(dynamic shapeFactory) {
return null;
}
public virtual dynamic UpdateEditor(dynamic shapeFactory, IUpdateModel updater) {
return null;
}
}
}

View File

@@ -4,6 +4,7 @@ namespace Orchard.ImportExport.ViewModels {
public class ExportViewModel {
public IList<ContentTypeEntry> ContentTypes { get; set; }
public IList<CustomStepEntry> CustomSteps { get; set; }
public IList<dynamic> ExportSteps { get; set; }
public bool Metadata { get; set; }
public bool Data { get; set; }
public int? ImportBatchSize { get; set; }

View File

@@ -1,8 +1,19 @@
@using Orchard.Utility.Extensions
@using Orchard.Localization
@using Orchard.Utility.Extensions
@model Orchard.ImportExport.ViewModels.ExportViewModel
@{ Layout.Title = T("Export").ToString(); }
@using (Html.BeginFormAntiForgeryPost()) {
Html.ValidationSummary();
foreach (var exportStep in Model.ExportSteps) {
var displayName = (LocalizedString)exportStep.DisplayName;
var stepId = String.Format("step-{0}", displayName.ToString().HtmlClassify());
<fieldset>
<legend><label><input type="checkbox" id="@stepId" />@displayName</label></legend>
<div data-controllerid="@stepId">
@Display(exportStep)
</div>
</fieldset>
}
<fieldset>
<legend>@T("Choose the types to include in the export file:")</legend>
<label><input type="checkbox" class="check-all" />@T("Select all")</label>

View File

@@ -0,0 +1,5 @@
<table>
<thead>
</thead>
</table>