From 3ce09496266d0dd64d5075410b90d586d419eda1 Mon Sep 17 00:00:00 2001 From: Ronald Barendse Date: Wed, 30 Jun 2021 14:49:10 +0200 Subject: [PATCH] Remove icon from property group --- .../V_8_16_0/AddPropertyTypeGroupColumns.cs | 1 - src/Umbraco.Core/Models/PropertyGroup.cs | 14 -------------- .../Persistence/Dtos/PropertyTypeGroupDto.cs | 4 ---- .../Persistence/Factories/PropertyGroupFactory.cs | 2 -- .../Persistence/Mappers/PropertyGroupMapper.cs | 1 - .../Implement/ContentTypeCommonRepository.cs | 1 - .../common/services/umbdataformatter.service.js | 2 +- src/Umbraco.Web/Editors/DashboardController.cs | 1 - .../Models/ContentEditing/PropertyGroupBasic.cs | 3 --- src/Umbraco.Web/Models/ContentEditing/Tab.cs | 3 --- .../Models/Mapping/ContentPropertyMapDefinition.cs | 1 - .../Models/Mapping/ContentTypeMapDefinition.cs | 4 ---- .../Models/Mapping/PropertyTypeGroupMapper.cs | 2 -- .../Models/Mapping/TabsAndPropertiesMapper.cs | 1 - 14 files changed, 1 insertion(+), 39 deletions(-) diff --git a/src/Umbraco.Core/Migrations/Upgrade/V_8_16_0/AddPropertyTypeGroupColumns.cs b/src/Umbraco.Core/Migrations/Upgrade/V_8_16_0/AddPropertyTypeGroupColumns.cs index 4fa3153e9a..e1141bab3f 100644 --- a/src/Umbraco.Core/Migrations/Upgrade/V_8_16_0/AddPropertyTypeGroupColumns.cs +++ b/src/Umbraco.Core/Migrations/Upgrade/V_8_16_0/AddPropertyTypeGroupColumns.cs @@ -16,7 +16,6 @@ namespace Umbraco.Core.Migrations.Upgrade.V_8_16_0 // Add new columns AddColumnIfNotExists(columns, "parentKey"); AddColumnIfNotExists(columns, "type"); - AddColumnIfNotExists(columns, "icon"); // Create self-referencing foreign key var foreignKeyName = "FK_" + PropertyTypeGroupDto.TableName + "_parentKey"; diff --git a/src/Umbraco.Core/Models/PropertyGroup.cs b/src/Umbraco.Core/Models/PropertyGroup.cs index 7d3bb3c361..08b1b75ba4 100644 --- a/src/Umbraco.Core/Models/PropertyGroup.cs +++ b/src/Umbraco.Core/Models/PropertyGroup.cs @@ -19,7 +19,6 @@ namespace Umbraco.Core.Models private Guid? _parentKey; private PropertyGroupType _type; private string _name; - private string _icon; private int _sortOrder; private PropertyTypeCollection _propertyTypes; @@ -76,19 +75,6 @@ namespace Umbraco.Core.Models set => SetPropertyValueAndDetectChanges(value, ref _name, nameof(Name)); } - /// - /// Gets or sets the icon of the group. - /// - /// - /// The icon. - /// - [DataMember] - public string Icon - { - get => _icon; - set => SetPropertyValueAndDetectChanges(value, ref _icon, nameof(Icon)); - } - /// /// Gets or sets the sort order of the group. /// diff --git a/src/Umbraco.Core/Persistence/Dtos/PropertyTypeGroupDto.cs b/src/Umbraco.Core/Persistence/Dtos/PropertyTypeGroupDto.cs index 48d72a7a63..2f5f98000c 100644 --- a/src/Umbraco.Core/Persistence/Dtos/PropertyTypeGroupDto.cs +++ b/src/Umbraco.Core/Persistence/Dtos/PropertyTypeGroupDto.cs @@ -36,10 +36,6 @@ namespace Umbraco.Core.Persistence.Dtos [ForeignKey(typeof(ContentTypeDto), Column = "nodeId")] public int ContentTypeNodeId { get; set; } - [Column("icon")] - [NullSetting(NullSetting = NullSettings.Null)] - public string Icon { get; set; } - [Column("text")] public string Text { get; set; } diff --git a/src/Umbraco.Core/Persistence/Factories/PropertyGroupFactory.cs b/src/Umbraco.Core/Persistence/Factories/PropertyGroupFactory.cs index 437cb33a31..0095ead7d0 100644 --- a/src/Umbraco.Core/Persistence/Factories/PropertyGroupFactory.cs +++ b/src/Umbraco.Core/Persistence/Factories/PropertyGroupFactory.cs @@ -37,7 +37,6 @@ namespace Umbraco.Core.Persistence.Factories group.Key = groupDto.UniqueId; group.ParentKey = groupDto.ParentKey; group.Type = (PropertyGroupType)groupDto.Type; - group.Icon = groupDto.Icon; group.Name = groupDto.Text; group.SortOrder = groupDto.SortOrder; @@ -111,7 +110,6 @@ namespace Umbraco.Core.Persistence.Factories ParentKey = propertyGroup.ParentKey, Type = (short)propertyGroup.Type, ContentTypeNodeId = contentTypeId, - Icon = propertyGroup.Icon, Text = propertyGroup.Name, SortOrder = propertyGroup.SortOrder }; diff --git a/src/Umbraco.Core/Persistence/Mappers/PropertyGroupMapper.cs b/src/Umbraco.Core/Persistence/Mappers/PropertyGroupMapper.cs index 0668518cd0..936bc9fbca 100644 --- a/src/Umbraco.Core/Persistence/Mappers/PropertyGroupMapper.cs +++ b/src/Umbraco.Core/Persistence/Mappers/PropertyGroupMapper.cs @@ -22,7 +22,6 @@ namespace Umbraco.Core.Persistence.Mappers DefineMap(nameof(PropertyGroup.Key), nameof(PropertyTypeGroupDto.UniqueId)); DefineMap(nameof(PropertyGroup.ParentKey), nameof(PropertyTypeGroupDto.ParentKey)); DefineMap(nameof(PropertyGroup.Type), nameof(PropertyTypeGroupDto.Type)); - DefineMap(nameof(PropertyGroup.Icon), nameof(PropertyTypeGroupDto.Icon)); DefineMap(nameof(PropertyGroup.Name), nameof(PropertyTypeGroupDto.Text)); DefineMap(nameof(PropertyGroup.SortOrder), nameof(PropertyTypeGroupDto.SortOrder)); } diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeCommonRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeCommonRepository.cs index a03f61d54e..e9ff44f45f 100644 --- a/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeCommonRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeCommonRepository.cs @@ -275,7 +275,6 @@ namespace Umbraco.Core.Persistence.Repositories.Implement Key = dto.UniqueId, ParentKey = dto.ParentKey, Type = (PropertyGroupType)dto.Type, - Icon = dto.Icon, Name = dto.Text, SortOrder = dto.SortOrder }; diff --git a/src/Umbraco.Web.UI.Client/src/common/services/umbdataformatter.service.js b/src/Umbraco.Web.UI.Client/src/common/services/umbdataformatter.service.js index 4926202559..3ebe79e947 100644 --- a/src/Umbraco.Web.UI.Client/src/common/services/umbdataformatter.service.js +++ b/src/Umbraco.Web.UI.Client/src/common/services/umbdataformatter.service.js @@ -75,7 +75,7 @@ }); saveModel.groups = _.map(realGroups, function (g) { - var saveGroup = _.pick(g, 'inherited', 'id', 'sortOrder', 'name', 'key', 'parentKey', 'type', 'icon'); + var saveGroup = _.pick(g, 'inherited', 'id', 'sortOrder', 'name', 'key', 'parentKey', 'type'); var realProperties = _.reject(g.properties, function (p) { //do not include these properties diff --git a/src/Umbraco.Web/Editors/DashboardController.cs b/src/Umbraco.Web/Editors/DashboardController.cs index 385d6e2774..e0d155a62e 100644 --- a/src/Umbraco.Web/Editors/DashboardController.cs +++ b/src/Umbraco.Web/Editors/DashboardController.cs @@ -218,7 +218,6 @@ namespace Umbraco.Web.Editors Key = x.Key, ParentKey = x.ParentKey, Type = x.Type, - Icon = x.Icon, Alias = x.Alias, Label = x.Label, Expanded = x.Expanded, diff --git a/src/Umbraco.Web/Models/ContentEditing/PropertyGroupBasic.cs b/src/Umbraco.Web/Models/ContentEditing/PropertyGroupBasic.cs index 2d00e94b6a..150f0631bb 100644 --- a/src/Umbraco.Web/Models/ContentEditing/PropertyGroupBasic.cs +++ b/src/Umbraco.Web/Models/ContentEditing/PropertyGroupBasic.cs @@ -43,9 +43,6 @@ namespace Umbraco.Web.Models.ContentEditing [DataMember(Name = "type")] public PropertyGroupType Type { get; set; } - [DataMember(Name = "icon")] - public string Icon { get; set; } - [Required] [DataMember(Name = "name")] public string Name { get; set; } diff --git a/src/Umbraco.Web/Models/ContentEditing/Tab.cs b/src/Umbraco.Web/Models/ContentEditing/Tab.cs index c122a18dff..6d952d4e10 100644 --- a/src/Umbraco.Web/Models/ContentEditing/Tab.cs +++ b/src/Umbraco.Web/Models/ContentEditing/Tab.cs @@ -23,9 +23,6 @@ namespace Umbraco.Web.Models.ContentEditing [DataMember(Name = "type")] public PropertyGroupType Type { get; set; } - [DataMember(Name = "icon")] - public string Icon { get; set; } - [DataMember(Name = "active")] public bool IsActive { get; set; } diff --git a/src/Umbraco.Web/Models/Mapping/ContentPropertyMapDefinition.cs b/src/Umbraco.Web/Models/Mapping/ContentPropertyMapDefinition.cs index e911b44f46..5f61608a19 100644 --- a/src/Umbraco.Web/Models/Mapping/ContentPropertyMapDefinition.cs +++ b/src/Umbraco.Web/Models/Mapping/ContentPropertyMapDefinition.cs @@ -39,7 +39,6 @@ namespace Umbraco.Web.Models.Mapping target.Key = source.Key; target.ParentKey = source.ParentKey; target.Type = source.Type; - target.Icon = source.Icon; target.IsActive = true; target.Label = source.Name; } diff --git a/src/Umbraco.Web/Models/Mapping/ContentTypeMapDefinition.cs b/src/Umbraco.Web/Models/Mapping/ContentTypeMapDefinition.cs index 2bc7a7d456..944c3ddbf0 100644 --- a/src/Umbraco.Web/Models/Mapping/ContentTypeMapDefinition.cs +++ b/src/Umbraco.Web/Models/Mapping/ContentTypeMapDefinition.cs @@ -304,7 +304,6 @@ namespace Umbraco.Web.Models.Mapping target.Key = source.Key; target.ParentKey = source.ParentKey; target.Type = source.Type; - target.Icon = source.Icon; target.Name = source.Name; target.SortOrder = source.SortOrder; } @@ -318,7 +317,6 @@ namespace Umbraco.Web.Models.Mapping target.Key = source.Key; target.ParentKey = source.ParentKey; target.Type = source.Type; - target.Icon = source.Icon; target.Name = source.Name; target.SortOrder = source.SortOrder; } @@ -332,7 +330,6 @@ namespace Umbraco.Web.Models.Mapping target.Key = source.Key; target.ParentKey = source.ParentKey; target.Type = source.Type; - target.Icon = source.Icon; target.Name = source.Name; target.SortOrder = source.SortOrder; @@ -349,7 +346,6 @@ namespace Umbraco.Web.Models.Mapping target.Key = source.Key; target.ParentKey = source.ParentKey; target.Type = source.Type; - target.Icon = source.Icon; target.Name = source.Name; target.SortOrder = source.SortOrder; diff --git a/src/Umbraco.Web/Models/Mapping/PropertyTypeGroupMapper.cs b/src/Umbraco.Web/Models/Mapping/PropertyTypeGroupMapper.cs index 2c3dec3061..f1a5d84d37 100644 --- a/src/Umbraco.Web/Models/Mapping/PropertyTypeGroupMapper.cs +++ b/src/Umbraco.Web/Models/Mapping/PropertyTypeGroupMapper.cs @@ -78,7 +78,6 @@ namespace Umbraco.Web.Models.Mapping Key = tab.Key, ParentKey = tab.ParentKey, Type = tab.Type, - Icon = tab.Icon, Name = tab.Name, SortOrder = tab.SortOrder, Inherited = false, @@ -107,7 +106,6 @@ namespace Umbraco.Web.Models.Mapping Key = tab.Key, ParentKey = tab.ParentKey, Type = tab.Type, - Icon = tab.Icon, Name = tab.Name, SortOrder = tab.SortOrder, Inherited = true, diff --git a/src/Umbraco.Web/Models/Mapping/TabsAndPropertiesMapper.cs b/src/Umbraco.Web/Models/Mapping/TabsAndPropertiesMapper.cs index c585c5f404..450a09c6cd 100644 --- a/src/Umbraco.Web/Models/Mapping/TabsAndPropertiesMapper.cs +++ b/src/Umbraco.Web/Models/Mapping/TabsAndPropertiesMapper.cs @@ -161,7 +161,6 @@ namespace Umbraco.Web.Models.Mapping Key = g.Key, ParentKey = g.ParentKey, Type = g.Type, - Icon = g.Icon, Alias = g.Name, Label = LocalizedTextService.UmbracoDictionaryTranslate(g.Name), Properties = mappedProperties,