From fa0027d4f1d08b97ecfad3573eac17d851a6ea6f Mon Sep 17 00:00:00 2001 From: patrickdemooij9 Date: Sun, 27 Feb 2022 10:09:35 +0100 Subject: [PATCH] Added property way of seeing composition (#11811) --- .../umbcontenttypegroup.component.js | 4 +- .../umbcontenttypeproperty.component.js | 8 + .../umbcontenttypetab.component.js | 4 +- .../components/umbgroupsbuilder.directive.js | 4 +- .../less/components/umb-group-builder.less | 2 +- .../umb-content-type-property.html | 221 +++++++++--------- .../views/components/umb-groups-builder.html | 6 +- 7 files changed, 128 insertions(+), 121 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/contenttype/umbcontenttypegroup.component.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/contenttype/umbcontenttypegroup.component.js index 82112012c0..3445b4039c 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/components/contenttype/umbcontenttypegroup.component.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/contenttype/umbcontenttypegroup.component.js @@ -45,9 +45,9 @@ vm.onChangeSortOrderValue( {group: vm.group}); } } - function clickComposition (documentTypeId) { + function clickComposition (contentTypeId) { if (vm.onClickComposition) { - vm.onClickComposition({documentTypeId: documentTypeId}); + vm.onClickComposition({contentTypeId: contentTypeId}); } } } diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/contenttype/umbcontenttypeproperty.component.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/contenttype/umbcontenttypeproperty.component.js index 8f27332ec2..c96944dbd5 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/components/contenttype/umbcontenttypeproperty.component.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/contenttype/umbcontenttypeproperty.component.js @@ -12,6 +12,7 @@ vm.edit = edit; vm.remove = remove; vm.changeSortOrderValue = changeSortOrderValue; + vm.clickComposition = clickComposition; function edit () { if (vm.onEdit) { @@ -31,6 +32,12 @@ } } + function clickComposition(contentTypeId) { + if (vm.onClickComposition) { + vm.onClickComposition({ contentTypeId: contentTypeId }); + } + } + } const umbContentTypePropertyComponent = { @@ -41,6 +48,7 @@ onEdit: '&', onRemove: '&', onChangeSortOrderValue: '&', + onClickComposition: '&?', valServerFieldAlias: '@', valServerFieldLabel: '@', valTabAlias: '@' diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/contenttype/umbcontenttypetab.component.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/contenttype/umbcontenttypetab.component.js index 6c0e5c8baf..5fb8297847 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/components/contenttype/umbcontenttypetab.component.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/contenttype/umbcontenttypetab.component.js @@ -59,9 +59,9 @@ } } - function clickComposition (documentTypeId) { + function clickComposition(contentTypeId) { if (vm.onClickComposition) { - vm.onClickComposition({documentTypeId: documentTypeId}); + vm.onClickComposition({ contentTypeId: contentTypeId}); } } diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js index 79da9e3ac6..9a116beb5a 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js @@ -484,9 +484,9 @@ }; - scope.openDocumentType = (documentTypeId) => { + scope.openContentType = (contentTypeId) => { const editor = { - id: documentTypeId, + id: contentTypeId, submit: () => { const args = { node: scope.model }; eventsService.emit("editors.documentType.reload", args); diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-group-builder.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-group-builder.less index cae8a1c253..486c0f1336 100644 --- a/src/Umbraco.Web.UI.Client/src/less/components/umb-group-builder.less +++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-group-builder.less @@ -714,7 +714,7 @@ input.umb-group-builder__group-title-input:disabled:hover { } .umb-group-builder__property-tags.-right { - right: 0; + right: 4px; left: auto; } diff --git a/src/Umbraco.Web.UI.Client/src/views/components/contenttype/umb-content-type-property.html b/src/Umbraco.Web.UI.Client/src/views/components/contenttype/umb-content-type-property.html index fff779e626..9166f0c8ab 100644 --- a/src/Umbraco.Web.UI.Client/src/views/components/contenttype/umb-content-type-property.html +++ b/src/Umbraco.Web.UI.Client/src/views/components/contenttype/umb-content-type-property.html @@ -3,147 +3,144 @@
- -
+ +
-
{{ vm.property.alias }}
- - +
{{ vm.property.alias }}
+ + -
- -
-
{{propertyTypeForm.groupName.errorMsg}}
-
Required label
-
- -
- -
- -
+
+
{{propertyTypeForm.groupName.errorMsg}}
+
Required label
- -
- - {{ vm.property.label }} - ({{ vm.property.alias }}) - +
+ +
+ +
+ + +
+ + {{ vm.property.label }} + ({{ vm.property.alias }}) + +
-
+
- - {{vm.property.dataTypeName}} - Preview - - -
- * - Mandatory -
- -
- - Show on member profile -
- -
- - Member can edit -
- -
- - Is sensitive data -
- -
- - Vary by culture -
- -
- - Vary by segments -
+ + {{vm.property.dataTypeName}} + Preview + +
+ * + Mandatory
-
- -
- - Inherited from - {{vm.property.contentTypeName}} -
- -
- - Locked -
- +
+ + Show on member profile
- - - - +
+ + Member can edit +
- +
+ + Is sensitive data +
+ +
+ + Vary by culture +
+ +
+ + Vary by segments +
+ +
+ +
+
+ + Inherited from + +
+ +
+ + Locked +
+
+ + + + + + +
-
- - -
- -
- - -
- -
+
+ +
+
+ +
+ +
+ +
+
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-groups-builder.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-groups-builder.html index 3575453bd8..c35e1ee45a 100644 --- a/src/Umbraco.Web.UI.Client/src/views/components/umb-groups-builder.html +++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-groups-builder.html @@ -22,7 +22,7 @@ tab="tab" is-open="tab.alias === openTabAlias" on-click="changeTab(tab)" - on-click-composition="openDocumentType(documentTypeId)" + on-click-composition="openContentType(contentTypeId)" sorting="sortingMode" allow-remove="canRemoveTab(tab) && !sortingMode" on-remove="removeTab(tab, tabIndex)" @@ -105,6 +105,7 @@ sortable="sortingMode" on-edit="editPropertyTypeSettings(property)" on-remove="deleteProperty(tab.properties, property)" + on-click-composition="openContentType(contentTypeId)" val-server-field-alias="{{'Groups[' + tab.serverValidationIndex + '].Properties[' + propertyIndex + '].Alias'}}" val-server-field-label="{{'Groups[' + tab.serverValidationIndex + '].Properties[' + propertyIndex + '].Label'}}" on-change-sort-order-value="onChangePropertySortOrderValue(tab)" @@ -143,7 +144,7 @@ allow-name="true" group="group" allow-remove="canRemoveGroup(group) && !sortingMode" - on-click-composition="openDocumentType(documentTypeId)" + on-click-composition="openContentType(contentTypeId)" on-remove="removeGroup(group)" on-update-name="onChangeGroupName(group)" sorting="sortingMode" @@ -159,6 +160,7 @@ sortable="sortingMode" on-edit="editPropertyTypeSettings(property)" on-remove="deleteProperty(group.properties, property)" + on-click-composition="openContentType(contentTypeId)" on-change-sort-order-value="onChangePropertySortOrderValue(group)" val-server-field-alias="{{'Groups[' + group.serverValidationIndex + '].Properties[' + propertyIndex + '].Alias'}}" val-server-field-label="{{'Groups[' + group.serverValidationIndex + '].Properties[' + propertyIndex + '].Label'}}"