Skip to content

Commit 610228d

Browse files
committed
refactor: add IDataTypeContainerService to IDataTypeOrganiseAction (breaking)
1 parent cbf820c commit 610228d

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

src/Umbraco.Community.BackOfficeOrganiser/Organisers/DataTypes/DataTypeOrganiser.cs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,23 @@ namespace Umbraco.Community.BackOfficeOrganiser.Organisers.DataTypes;
88
public class DataTypeOrganiser(
99
ILogger<DataTypeOrganiser> logger,
1010
IDataTypeService dataTypeService,
11+
IDataTypeContainerService dataTypeContainerService,
1112
DataTypeOrganiseActionCollection organiseActions)
1213
: BackOfficeOrganiserBase<IDataType>(logger)
1314
{
1415
public override async Task OrganiseAsync(IDataType dataType)
1516
{
16-
var organiser = organiseActions.FirstOrDefault(x => x.CanMove(dataType, dataTypeService));
17+
var organiser = organiseActions.FirstOrDefault(x => x.CanMove(dataType, dataTypeService, dataTypeContainerService));
1718
if (organiser != null)
1819
{
19-
await organiser.MoveAsync(dataType, dataTypeService);
20+
await organiser.MoveAsync(dataType, dataTypeService, dataTypeContainerService);
2021
}
2122
}
2223

2324
protected override async Task<IEnumerable<IDataType>> GetAllAsync() => await dataTypeService.GetAllAsync();
2425

2526
protected override void PostOrganiseAll()
2627
{
27-
dataTypeService.DeleteAllEmptyContainers();
28+
dataTypeContainerService.DeleteAllEmptyContainers();
2829
}
2930
}

src/Umbraco.Community.BackOfficeOrganiser/Organisers/DataTypes/IDataTypeOrganiseAction.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ namespace Umbraco.Community.BackOfficeOrganiser.Organisers.DataTypes;
55

66
public interface IDataTypeOrganiseAction
77
{
8-
public bool CanMove(IDataType dataType, IDataTypeService dataTypeService);
9-
public Task MoveAsync(IDataType dataType, IDataTypeService dataTypeService);
8+
public bool CanMove(IDataType dataType, IDataTypeService dataTypeService, IDataTypeContainerService dataTypeContainerService);
9+
public Task MoveAsync(IDataType dataType, IDataTypeService dataTypeService, IDataTypeContainerService dataTypeContainerService);
1010
}

0 commit comments

Comments
 (0)