Include more info on fields (#178)

patrickdemooij9 · Jun 1, 2023 · aa88f17 · aa88f17
1 parent fe4b469
commit aa88f17
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 8 deletions.
diff --git a/...lds/wwwroot/MetaFields/Interface/Components/ItemGroupPicker/itemGroupPicker.controller.js b/...lds/wwwroot/MetaFields/Interface/Components/ItemGroupPicker/itemGroupPicker.controller.js
@@ -7,6 +7,12 @@
         var vm = this;
 
         vm.availableItems = $scope.model.availableItems;
+        vm.groupedItems = $scope.model.availableItems.reduce((grp, item) => {
+            let { group } = item;
+            grp[group] = grp[group] ?? [];
+            grp[group].push(item);   
+            return grp;
+          }, {});
         vm.model = {
             selection: []
         };

diff --git a/...o.MetaFields/wwwroot/MetaFields/Interface/Components/ItemGroupPicker/itemGroupPicker.html b/...o.MetaFields/wwwroot/MetaFields/Interface/Components/ItemGroupPicker/itemGroupPicker.html
@@ -7,16 +7,19 @@
                            hide-description="true">
         </umb-editor-header>
         <umb-editor-container>
-            <umb-box>
+            <umb-box ng-repeat="group in vm.groupedItems">
                 <umb-box-content>
                     <div class="umb-tree">
+                        <h4>
+                            {{group[0].group}}
+                        </h4>
                         <ul>
-                            <li class="umb-tree-item" ng-repeat="item in vm.availableItems">
+                            <li class="umb-tree-item" ng-repeat="item in group">
                                 <div class="umb-tree-item__inner">
                                     <umb-icon icon="icon-check" class="umb-tree-icon" ng-show="vm.model.selection.includes(item)"></umb-icon>
                                     <umb-icon icon="icon-autofill" class="umb-tree-icon" ng-show="!vm.model.selection.includes(item)"></umb-icon>
                                     <a class="umb-tree-item__label" ng-click="vm.selectItem(item)">
-                                        {{item.name}}
+                                        {{item.name}} {{item.source == 1 ? '(' + item.value + ')' : ''}}
                                     </a>
                                 </div>
                             </li>

diff --git a/...elds/wwwroot/MetaFields/Interface/SeoFieldEditors/FieldsEditor/fieldsEditor.controller.js b/...elds/wwwroot/MetaFields/Interface/SeoFieldEditors/FieldsEditor/fieldsEditor.controller.js
@@ -46,7 +46,8 @@
                         name: field.name,
                         value: field.value,
                         onlyShowIfInherited: field.onlyShowIfInherited,
-                        source: 2
+                        source: 2,
+                        group: 'SEO Toolkit'
                     });
                 });
                 fields.forEach(function (d) {
@@ -107,11 +108,11 @@
 
         function getAllContentFields(fields) {
             return editorState.getCurrent().groups.flatMap(function (g) {
-                return g.properties;
+                return g.properties.map(prop => {return { group: g, prop};});
             }).filter(function (g) {
-                return fields.includes(g.editor);
+                return fields.includes(g.prop.editor);
             }).map(function (g) {
-                return { name: g.label, value: g.alias, source: 1 };
+                return { name: g.prop.label, value: g.prop.alias, source: 1, group: g.group.name };
             });
         }
 

diff --git a/...co.MetaFields/wwwroot/MetaFields/Interface/SeoFieldEditors/FieldsEditor/fieldsEditor.html b/...co.MetaFields/wwwroot/MetaFields/Interface/SeoFieldEditors/FieldsEditor/fieldsEditor.html
@@ -10,7 +10,7 @@
                         <div class="umb-nested-content__heading">
                             <umb-icon icon="icon-autofill" class="icon"></umb-icon>
                             <div class="umb-nested-content__item-name --has-icon">
-                                {{field.name}}
+                                {{field.name}} {{field.source == 1 ? '(' + field.value + ')' : ''}}
                             </div>
                         </div>
                         <div class="umb-nested-content__icons">