Skip to content

Commit b427a8c

Browse files
AndyButlandAndyButland
committed
Merge branch 'main' into v17/dev
2 parents bd8ad5f + 486f1ba commit b427a8c

File tree

161 files changed

+1688
-358
lines changed

Some content is hidden

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

161 files changed

+1688
-358
lines changed

‎src/Umbraco.Cms.Api.Management/DependencyInjection/ServerEventExtensions.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using System.Text.Json.Serialization;
1+
using System.Text.Json.Serialization;
22
using Microsoft.Extensions.DependencyInjection;
33
using Umbraco.Cms.Api.Management.ServerEvents;
44
using Umbraco.Cms.Api.Management.ServerEvents.Authorizers;
@@ -28,6 +28,7 @@ internal static IUmbracoBuilder AddServerEvents(this IUmbracoBuilder builder)
2828
private static IUmbracoBuilder AddEvents(this IUmbracoBuilder builder)
2929
{
3030
builder.AddNotificationAsyncHandler<ContentSavedNotification, ServerEventSender>();
31+
builder.AddNotificationAsyncHandler<ContentSavedBlueprintNotification, ServerEventSender>();
3132
builder.AddNotificationAsyncHandler<ContentTypeSavedNotification, ServerEventSender>();
3233
builder.AddNotificationAsyncHandler<MediaSavedNotification, ServerEventSender>();
3334
builder.AddNotificationAsyncHandler<MediaTypeSavedNotification, ServerEventSender>();

‎src/Umbraco.Cms.Api.Management/Mapping/Document/DocumentMapDefinition.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public void DefineMaps(IUmbracoMapper mapper)
2727
mapper.Define<ContentScheduleCollection, DocumentResponseModel>(Map);
2828
}
2929

30-
// Umbraco.Code.MapAll -Urls -Template
30+
// Umbraco.Code.MapAll -Urls -Template -Signs
3131
private void Map(IContent source, DocumentResponseModel target, MapperContext context)
3232
{
3333
target.Id = source.Key;
@@ -45,7 +45,7 @@ private void Map(IContent source, DocumentResponseModel target, MapperContext co
4545
target.IsTrashed = source.Trashed;
4646
}
4747

48-
// Umbraco.Code.MapAll -Urls -Template
48+
// Umbraco.Code.MapAll -Urls -Template -Signs
4949
private void Map(IContent source, PublishedDocumentResponseModel target, MapperContext context)
5050
{
5151
target.Id = source.Key;
@@ -67,7 +67,7 @@ private void Map(IContent source, PublishedDocumentResponseModel target, MapperC
6767
target.IsTrashed = source.Trashed;
6868
}
6969

70-
// Umbraco.Code.MapAll -IsProtected -Ancestors
70+
// Umbraco.Code.MapAll -IsProtected -Ancestors -Signs
7171
private void Map(IContent source, DocumentCollectionResponseModel target, MapperContext context)
7272
{
7373
target.Id = source.Key;
@@ -101,7 +101,7 @@ private void Map(IContent source, DocumentCollectionResponseModel target, Mapper
101101
}
102102

103103

104-
// Umbraco.Code.MapAll
104+
// Umbraco.Code.MapAll -Signs
105105
private void Map(IContent source, DocumentBlueprintResponseModel target, MapperContext context)
106106
{
107107
target.Id = source.Key;

‎src/Umbraco.Cms.Api.Management/Mapping/DocumentType/DocumentTypeMapDefinition.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ private void Map(ISimpleContentType source, DocumentTypeCollectionReferenceRespo
118118
target.Collection = ReferenceByIdModel.ReferenceOrNull(source.ListView);
119119
}
120120

121-
// Umbraco.Code.MapAll
121+
// Umbraco.Code.MapAll -Signs
122122
private void Map(IContent source, DocumentTypeBlueprintItemResponseModel target, MapperContext context)
123123
{
124124
target.Id = source.Key;

‎src/Umbraco.Cms.Api.Management/Mapping/Item/ItemTypeMapDefinition.cs

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ private static void Map(ILanguage source, LanguageItemResponseModel target, Mapp
4242
target.IsoCode = source.IsoCode;
4343
}
4444

45-
// Umbraco.Code.MapAll
45+
// Umbraco.Code.MapAll -Signs
4646
private static void Map(IDataType source, DataTypeItemResponseModel target, MapperContext context)
4747
{
4848
target.Name = source.Name ?? string.Empty;
@@ -52,14 +52,14 @@ private static void Map(IDataType source, DataTypeItemResponseModel target, Mapp
5252
target.IsDeletable = source.IsDeletableDataType();
5353
}
5454

55-
// Umbraco.Code.MapAll
55+
// Umbraco.Code.MapAll -Signs
5656
private static void Map(IDictionaryItem source, DictionaryItemItemResponseModel target, MapperContext context)
5757
{
5858
target.Name = source.ItemKey;
5959
target.Id = source.Key;
6060
}
6161

62-
// Umbraco.Code.MapAll
62+
// Umbraco.Code.MapAll -Signs
6363
private static void Map(IContentType source, DocumentTypeItemResponseModel target, MapperContext context)
6464
{
6565
target.Name = source.Name ?? string.Empty;
@@ -69,46 +69,46 @@ private static void Map(IContentType source, DocumentTypeItemResponseModel targe
6969
target.Description = source.Description;
7070
}
7171

72-
// Umbraco.Code.MapAll
72+
// Umbraco.Code.MapAll -Signs
7373
private static void Map(IMediaType source, MediaTypeItemResponseModel target, MapperContext context)
7474
{
7575
target.Name = source.Name ?? string.Empty;
7676
target.Id = source.Key;
7777
target.Icon = source.Icon;
7878
}
7979

80-
// Umbraco.Code.MapAll
80+
// Umbraco.Code.MapAll -Signs
8181
private static void Map(IEntitySlim source, MemberGroupItemResponseModel target, MapperContext context)
8282
{
8383
target.Name = source.Name ?? string.Empty;
8484
target.Id = source.Key;
8585
}
8686

87-
// Umbraco.Code.MapAll
87+
// Umbraco.Code.MapAll -Signs
8888
private static void Map(ITemplate source, TemplateItemResponseModel target, MapperContext context)
8989
{
9090
target.Name = source.Name ?? string.Empty;
9191
target.Id = source.Key;
9292
target.Alias = source.Alias;
9393
}
9494

95-
// Umbraco.Code.MapAll
95+
// Umbraco.Code.MapAll -Signs
9696
private static void Map(IMemberType source, MemberTypeItemResponseModel target, MapperContext context)
9797
{
9898
target.Name = source.Name ?? string.Empty;
9999
target.Id = source.Key;
100100
target.Icon = source.Icon;
101101
}
102102

103-
// Umbraco.Code.MapAll
103+
// Umbraco.Code.MapAll -Signs
104104
private static void Map(IRelationType source, RelationTypeItemResponseModel target, MapperContext context)
105105
{
106106
target.Id = source.Key;
107107
target.Name = source.Name ?? string.Empty;
108108
target.IsDeletable = source.IsDeletableRelationType();
109109
}
110110

111-
// Umbraco.Code.MapAll
111+
// Umbraco.Code.MapAll -Signs
112112
private static void Map(IUserGroup source, UserGroupItemResponseModel target, MapperContext context)
113113
{
114114
target.Id = source.Key;
@@ -117,9 +117,10 @@ private static void Map(IUserGroup source, UserGroupItemResponseModel target, Ma
117117
target.Alias = source.Alias;
118118
}
119119

120-
// Umbraco.Code.MapAll
120+
// Umbraco.Code.MapAll -Signs
121121
private static void Map(IWebhook source, WebhookItemResponseModel target, MapperContext context)
122122
{
123+
target.Id = source.Key;
123124
target.Name = source.Name ?? source.Url;
124125
target.Url = source.Url;
125126
target.Enabled = source.Enabled;

‎src/Umbraco.Cms.Api.Management/Mapping/Media/MediaMapDefinition.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using Umbraco.Cms.Api.Management.Mapping.Content;
1+
using Umbraco.Cms.Api.Management.Mapping.Content;
22
using Umbraco.Cms.Api.Management.ViewModels.Media;
33
using Umbraco.Cms.Api.Management.ViewModels.Media.Collection;
44
using Umbraco.Cms.Api.Management.ViewModels.MediaType;
@@ -24,7 +24,7 @@ public void DefineMaps(IUmbracoMapper mapper)
2424
mapper.Define<IMedia, MediaCollectionResponseModel>((_, _) => new MediaCollectionResponseModel(), Map);
2525
}
2626

27-
// Umbraco.Code.MapAll -Urls
27+
// Umbraco.Code.MapAll -Urls -Signs
2828
private void Map(IMedia source, MediaResponseModel target, MapperContext context)
2929
{
3030
target.Id = source.Key;
@@ -34,7 +34,7 @@ private void Map(IMedia source, MediaResponseModel target, MapperContext context
3434
target.IsTrashed = source.Trashed;
3535
}
3636

37-
// Umbraco.Code.MapAll
37+
// Umbraco.Code.MapAll -Signs
3838
private void Map(IMedia source, MediaCollectionResponseModel target, MapperContext context)
3939
{
4040
target.Id = source.Key;

‎src/Umbraco.Cms.Api.Management/Mapping/Member/MemberMapDefinition.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using Umbraco.Cms.Api.Management.Mapping.Content;
1+
using Umbraco.Cms.Api.Management.Mapping.Content;
22
using Umbraco.Cms.Api.Management.ViewModels.Member;
33
using Umbraco.Cms.Api.Management.ViewModels.MemberType;
44
using Umbraco.Cms.Core.Mapping;
@@ -17,7 +17,7 @@ public MemberMapDefinition(PropertyEditorCollection propertyEditorCollection)
1717
public void DefineMaps(IUmbracoMapper mapper)
1818
=> mapper.Define<IMember, MemberResponseModel>((_, _) => new MemberResponseModel(), Map);
1919

20-
// Umbraco.Code.MapAll -IsTwoFactorEnabled -Groups -Kind
20+
// Umbraco.Code.MapAll -IsTwoFactorEnabled -Groups -Kind -Signs
2121
private void Map(IMember source, MemberResponseModel target, MapperContext context)
2222
{
2323
target.Id = source.Key;

0 commit comments

Comments
 (0)