Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make lists sortable with ordering setting #3711

Merged
merged 19 commits into from Jan 30, 2020
Merged

Make lists sortable with ordering setting #3711

Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
a61a1f8
Added enable ordering settings to listpart
deanmarcussen May 24, 2019
2dcaa05
actually setting is better as a bool, as we have no contained part se…
deanmarcussen May 24, 2019
de814f5
displaying a sort handle
deanmarcussen May 24, 2019
33eb1ef
wip starting to get an ordering concept working. need to know the cur…
deanmarcussen May 24, 2019
d6cbca6
sortable lists, resolved container service to do most of the lifting,…
deanmarcussen May 25, 2019
40c88c1
restrict containerservice to only update orders that have changed. up…
deanmarcussen May 27, 2019
d80f760
Merge branch 'dev' into lists-sortable
deanmarcussen Oct 8, 2019
2a27aaa
Fix after merge conflict
deanmarcussen Oct 8, 2019
f4ac1e7
Merge branch 'dev' into lists-sortable
deanmarcussen Dec 15, 2019
2f4de3c
Resort Project References
deanmarcussen Dec 16, 2019
df55d48
Some CSS adjustments
Skrypt Dec 16, 2019
7e66bcf
Removing space
Skrypt Dec 16, 2019
bb9e18a
Small UI fixes
Skrypt Dec 16, 2019
6ee2849
Update list ordering to support drafts and cloning
deanmarcussen Jan 26, 2020
4dfa257
Merge branch 'dev' into lists-sortable
deanmarcussen Jan 26, 2020
3ee1914
Merge branch 'dev' into lists-sortable
Jan 28, 2020
e108a29
use sortablejs from registered resources
deanmarcussen Jan 28, 2020
27fb0cc
tidy up list part driver
deanmarcussen Jan 28, 2020
5c0c1bb
GetPager to GetPagerSlim
deanmarcussen Jan 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
46 changes: 13 additions & 33 deletions src/OrchardCore.Modules/OrchardCore.Lists/Drivers/ListPartDisplayDriver.cs
View file
Open in desktop
@@ -1,42 +1,29 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using OrchardCore.ContentManagement;
using OrchardCore.ContentManagement.Display.ContentDisplay;
using OrchardCore.ContentManagement.Display.Models;
using OrchardCore.ContentManagement.Metadata;
using OrchardCore.ContentManagement.Metadata.Models;
using OrchardCore.DisplayManagement.ModelBinding;
using OrchardCore.DisplayManagement.Views;
using OrchardCore.Lists.Models;
using OrchardCore.Lists.Services;
using OrchardCore.Lists.ViewModels;
using OrchardCore.Navigation;
using YesSql;

namespace OrchardCore.Lists.Drivers
{
public class ListPartDisplayDriver : ContentPartDisplayDriver<ListPart>
{
private readonly IContentManager _contentManager;
private readonly ISession _session;
private readonly IServiceProvider _serviceProvider;
private readonly IContentDefinitionManager _contentDefinitionManager;
private readonly IContainerService _containerService;

public ListPartDisplayDriver(
IContentDefinitionManager contentDefinitionManager,
IContentManager contentManager,
ISession session,
IServiceProvider serviceProvider,
IContainerService containerService
)
{
_contentDefinitionManager = contentDefinitionManager;
_serviceProvider = serviceProvider;
_session = session;
_contentManager = contentManager;
_containerService = containerService;
}

Expand All @@ -46,24 +33,24 @@ public override IDisplayResult Display(ListPart listPart, BuildPartDisplayContex
Combine(
Initialize<ListPartViewModel>("ListPart", async model =>
{
var pager = await GetPagerAsync(context.Updater, listPart);
var settings = GetSettings(listPart);
var pager = await GetPagerAsync(context);
var settings = context.TypePartDefinition.GetSettings<ListPartSettings>();

model.ListPart = listPart;
model.ContentItems = (await _containerService.QueryContainedItemsAsync(listPart.ContentItem.ContentItemId, settings.EnableOrdering, pager, true)).ToArray();
model.ContainedContentTypeDefinitions = GetContainedContentTypes(listPart);
model.ContainedContentTypeDefinitions = GetContainedContentTypes(context);
model.Context = context;
model.Pager = await context.New.PagerSlim(pager);
})
.Location("Detail", "Content:10"),
Initialize<ListPartViewModel>("ListPart", async model =>
{
var pager = await GetPagerAsync(context.Updater, listPart);
var settings = GetSettings(listPart);
var pager = await GetPagerAsync(context);
var settings = context.TypePartDefinition.GetSettings<ListPartSettings>();

model.ListPart = listPart;
model.ContentItems = (await _containerService.QueryContainedItemsAsync(listPart.ContentItem.ContentItemId, settings.EnableOrdering, pager, false)).ToArray();
model.ContainedContentTypeDefinitions = GetContainedContentTypes(listPart);
model.ContainedContentTypeDefinitions = GetContainedContentTypes(context);
model.Context = context;
model.EnableOrdering = settings.EnableOrdering;
model.Pager = await context.New.PagerSlim(pager);
Expand All @@ -72,29 +59,22 @@ public override IDisplayResult Display(ListPart listPart, BuildPartDisplayContex
);
}

private async Task<PagerSlim> GetPagerAsync(IUpdateModel updater, ListPart part)
private async Task<PagerSlim> GetPagerAsync(BuildPartDisplayContext context)
Copy link
Contributor

@Skrypt Skrypt Jan 28, 2020 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It should be GetPagerSlimAsync and we should also have GetPagerAsync

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It should be GetPagerSlimAsync and we should also have GetPagerAsync

Changed to GetPagerSlimAsync.
What did you mean by also having GetPagerAsync? As a settings option too have the other type of pager?

{
var settings = GetSettings(part);
PagerSlimParameters pagerParameters = new PagerSlimParameters();
await updater.TryUpdateModelAsync(pagerParameters);
var settings = context.TypePartDefinition.GetSettings<ListPartSettings>();
var pagerParameters = new PagerSlimParameters();
await context.Updater.TryUpdateModelAsync(pagerParameters);

PagerSlim pager = new PagerSlim(pagerParameters, settings.PageSize);
var pager = new PagerSlim(pagerParameters, settings.PageSize);

return pager;
}

private IEnumerable<ContentTypeDefinition> GetContainedContentTypes(ListPart listPart)
private IEnumerable<ContentTypeDefinition> GetContainedContentTypes(BuildPartDisplayContext context)
{
var settings = GetSettings(listPart);
var settings = context.TypePartDefinition.GetSettings<ListPartSettings>();
var contentTypes = settings.ContainedContentTypes ?? Enumerable.Empty<string>();
return contentTypes.Select(contentType => _contentDefinitionManager.GetTypeDefinition(contentType));
}

private ListPartSettings GetSettings(ListPart listPart)
{
var contentTypeDefinition = _contentDefinitionManager.GetTypeDefinition(listPart.ContentItem.ContentType);
var contentTypePartDefinition = contentTypeDefinition.Parts.FirstOrDefault(x => String.Equals(x.PartDefinition.Name, "ListPart"));
return contentTypePartDefinition.GetSettings<ListPartSettings>();
}
}
}