Skip to content

Commit da8c036

Browse files
authored
V17 - Removing obsoleted code from Umbraco.Core (#20009)
* Removing obsoleted code from ApiMediaQueryService.cs * Removing obsoleted code from ApiRichTextMarkupParserTests.cs * Removing obsoleted code from ContentCacheRefresher.cs * Removing obsoleted code from ContentFinderByUrlAlias.cs and adjusting its tests to use the new logic * Removing obsoleted code from ContentFinderByUrl.cs & its dependencies * Removing obsoleted code from ApiRichTextMarkupParserTests.cs * Removing obsoleted code from DocumentCache.cs & its dependencies * Removing obsoleted code from MediaCache.cs & its dependencies * Removing obsoleted code from PublishedCacheBase.cs & its dependencies * Removing obsoleted code from RenderNoContentController.cs and its tests * Removing obsoleted code from UmbracoRouteValueTransformer.cs * Removing obsoleted constructors from DefaultUrlProvider.cs * Removing accidental bookmark * Introducing a helper method to get the root keys in ApiMediaQueryService.cs * Removing obsoleted code from Cache classes * Removing unused imports * Refactoring to meet the CR * Added attribute to controller * Fixing missing using statement * Removing obsoleted constructor from ExternalLoginService.cs and making usages fit * Removing obsoleted method from IContentTypeFilter.cs * Removing obsoleted methods from IContentEditingService.cs * Removing obosoleted code from DocumentUrlService.cs * Removed obsoleted code from DataTypeService.cs * Removed obsoleted code from PublishStatusService.cs * Removing obsoleted code from the IContentPublishingService.cs and its dependencies. Also implementing a TODO in the service implementation * Removing obsoleted code from IRelationService.cs * Removing obsoleted code from ContentPublishingService.cs * Removing obsoleted code from ContentEditingService.cs * Removing obsoleted code from Constants-DataTypes.cs * Removing obsoleted code from IAction.cs and its implementations * Removing obsoleted code from IContentService.cs * Removing obsoleted code from DomainUtilities.cs * Removing obsoleted code from IIndexedEntitySearchService.cs and dependencies * Removing obsoleted code from UrlProvider.cs * Removing obsoleted code from AliasUrlProvider.cs * Removing obsoleted code from ApiContentRouteBuilder.cs * Removing obsoleted code from ApiPublishedContentCache.cs * Removing obsoleted class TemplateQueryResult.cs * Removing obsoleted code from ApiContentBuilder.cs * Removing obsoleted code from HealthCheck.cs * Removing obsoleted code from ContentTypeEditingService.cs * Removing obsoleted code from NewDefaultUrlProvider.cs * Removing obsoleted code from PublishedElementPropertyBase.cs * Removing obsoleted code from WebhookRequestService.cs * Bumping to obsolete in V18, due to usage in class that will be removed in V18 * Removing obsoleted code from PropertyValidationService.cs * Removing obsoleted code from AddUnroutableContentWarningsWhenPublishingNotificationHandler.cs * Removing obsoleted code from IMemberService.cs * Removing obsoleted code from DocumentCache.cs
1 parent 20c29f8 commit da8c036

File tree

72 files changed

+207
-1245
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+207
-1245
lines changed

src/Umbraco.Cms.Api.Management/Controllers/Member/Item/SearchMemberItemController.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,15 @@ public SearchMemberItemController(IIndexedEntitySearchService indexedEntitySearc
2424
[HttpGet("search")]
2525
[MapToApiVersion("1.0")]
2626
[ProducesResponseType(typeof(PagedModel<MemberItemResponseModel>), StatusCodes.Status200OK)]
27-
public Task<IActionResult> SearchWithAllowedTypes(CancellationToken cancellationToken, string query, int skip = 0, int take = 100, [FromQuery]IEnumerable<Guid>? allowedMemberTypes = null)
27+
public async Task<IActionResult> SearchWithAllowedTypes(CancellationToken cancellationToken, string query, int skip = 0, int take = 100, [FromQuery]IEnumerable<Guid>? allowedMemberTypes = null)
2828
{
29-
PagedModel<IEntitySlim> searchResult = _indexedEntitySearchService.Search(UmbracoObjectTypes.Member, query, null, allowedMemberTypes, skip, take);
29+
PagedModel<IEntitySlim> searchResult = await _indexedEntitySearchService.SearchAsync(UmbracoObjectTypes.Member, query, null, allowedMemberTypes, false, "*", skip, take);
3030
var result = new PagedModel<MemberItemResponseModel>
3131
{
3232
Items = searchResult.Items.OfType<IMemberEntitySlim>().Select(_memberPresentationFactory.CreateItemResponseModel),
33-
Total = searchResult.Total
33+
Total = searchResult.Total,
3434
};
3535

36-
return Task.FromResult<IActionResult>(Ok(result));
36+
return await Task.FromResult<IActionResult>(Ok(result));
3737
}
3838
}

src/Umbraco.Core/Actions/ActionAssignDomain.cs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,6 @@ public class ActionAssignDomain : IAction
2020
/// <inheritdoc/>
2121
public string Alias => ActionAlias;
2222

23-
/// <inheritdoc />
24-
public string Category => Constants.Conventions.PermissionCategories.AdministrationCategory;
25-
26-
/// <inheritdoc />
27-
public string Icon => "icon-home";
28-
2923
/// <inheritdoc />
3024
public bool ShowInNotifier => false;
3125

src/Umbraco.Core/Actions/ActionBrowse.cs

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,4 @@ public class ActionBrowse : IAction
3333

3434
/// <inheritdoc />
3535
public bool CanBePermissionAssigned => true;
36-
37-
/// <inheritdoc />
38-
public string Icon => string.Empty;
39-
40-
41-
/// <inheritdoc />
42-
public string Category => Constants.Conventions.PermissionCategories.ContentCategory;
4336
}

src/Umbraco.Core/Actions/ActionCopy.cs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,6 @@ public class ActionCopy : IAction
2020
/// <inheritdoc/>
2121
public string Alias => ActionAlias;
2222

23-
/// <inheritdoc />
24-
public string Category => Constants.Conventions.PermissionCategories.StructureCategory;
25-
26-
/// <inheritdoc />
27-
public string Icon => "icon-documents";
28-
2923
/// <inheritdoc />
3024
public bool ShowInNotifier => true;
3125

src/Umbraco.Core/Actions/ActionCreateBlueprintFromContent.cs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,4 @@ public class ActionCreateBlueprintFromContent : IAction
2525

2626
/// <inheritdoc />
2727
public bool CanBePermissionAssigned => true;
28-
29-
/// <inheritdoc />
30-
public string Icon => Constants.Icons.Blueprint;
31-
32-
/// <inheritdoc />
33-
public string Category => Constants.Conventions.PermissionCategories.ContentCategory;
3428
}

src/Umbraco.Core/Actions/ActionDelete.cs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,6 @@ public class ActionDelete : IAction
2020
/// <inheritdoc/>
2121
public string Alias => ActionAlias;
2222

23-
/// <inheritdoc/>
24-
public string Category => Constants.Conventions.PermissionCategories.ContentCategory;
25-
26-
/// <inheritdoc/>
27-
public string Icon => "icon-delete";
28-
2923
/// <inheritdoc/>
3024
public bool ShowInNotifier => true;
3125

src/Umbraco.Core/Actions/ActionDocumentPropertyRead.cs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,5 @@ public class ActionDocumentPropertyRead : IAction
1919

2020
/// <inheritdoc />
2121
public bool CanBePermissionAssigned => true;
22-
23-
/// <inheritdoc />
24-
public string Icon => string.Empty;
25-
26-
/// <inheritdoc />
27-
public string Category => Constants.Conventions.PermissionCategories.OtherCategory;
2822
}
2923

src/Umbraco.Core/Actions/ActionDocumentPropertyWrite.cs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,5 @@ public class ActionDocumentPropertyWrite : IAction
1919

2020
/// <inheritdoc />
2121
public bool CanBePermissionAssigned => true;
22-
23-
/// <inheritdoc />
24-
public string Icon => string.Empty;
25-
26-
/// <inheritdoc />
27-
public string Category => Constants.Conventions.PermissionCategories.OtherCategory;
2822
}
2923

src/Umbraco.Core/Actions/ActionMove.cs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,6 @@ public class ActionMove : IAction
2020
/// <inheritdoc/>
2121
public string Alias => ActionAlias;
2222

23-
/// <inheritdoc />
24-
public string Category => Constants.Conventions.PermissionCategories.StructureCategory;
25-
26-
/// <inheritdoc />
27-
public string Icon => "icon-enter";
28-
2923
/// <inheritdoc />
3024
public bool ShowInNotifier => true;
3125

src/Umbraco.Core/Actions/ActionNew.cs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,9 @@ public class ActionNew : IAction
2020
/// <inheritdoc/>
2121
public string Alias => ActionAlias;
2222

23-
/// <inheritdoc />
24-
public string Icon => "icon-add";
25-
2623
/// <inheritdoc />
2724
public bool ShowInNotifier => true;
2825

2926
/// <inheritdoc />
3027
public bool CanBePermissionAssigned => true;
31-
32-
/// <inheritdoc />
33-
public string Category => Constants.Conventions.PermissionCategories.ContentCategory;
3428
}

0 commit comments

Comments
 (0)