Fix for #601 proper display of spec groups in html report

Author: ishubin

galen-core/src/main/resources/html-report/galen-report.js

@@ -368,7 +368,15 @@ Vue.component('layout-spec', {
             this.bus.$emit('spec-clicked', this.spec, this.layout);
         }
     }
-})
+});
+
+Vue.component('layout-spec-group', {
+    props: ['layout', 'specgroup', 'bus'],
+    template: '#tpl-spec-group',
+    methods: {
+        toggleReportNode: toggleReportNode
+    }
+});
 
 Vue.component('layout-report', {
     props: ['layout'],
@@ -656,18 +664,31 @@ function enrichObjectAndReturnHasFailure(object) {
     object.expanded = false;
     object.hasFailure = false;
 
-    _.forEach(object.specs, function (spec) {
-        if (spec.errors && spec.errors.length > 0) {
-            object.hasFailure = true;
-        }
-        if (spec.subLayout && spec.subLayout.sections) {
-            _.forEach(spec.subLayout.sections, function (subSection) {
-                if (enrichSectionAndReturnHasFailure(subSection)) {
-                    object.hasFailure = true;
-                }
-            });
-        }
-    });
+    var enrichSpec = function(parent) {
+        return function (spec) {
+            if (spec.errors && spec.errors.length > 0) {
+                parent.hasFailure = true;
+            }
+            if (spec.subLayout && spec.subLayout.sections) {
+                _.forEach(spec.subLayout.sections, function (subSection) {
+                    if (enrichSectionAndReturnHasFailure(subSection)) {
+                        parent.hasFailure = true;
+                    }
+                });
+            }
+        };
+    };
+
+    _.forEach(object.specs, enrichSpec(object));
+    if (object.specGroups) {
+        _.forEach(object.specGroups, function (specGroup) {
+            specGroup.expanded = false;
+            _.forEach(specGroup.specs, enrichSpec(specGroup));
+            if (specGroup.hasFailure) {
+                object.hasFailure = true;
+            }
+        });
+    }
     return object.hasFailure;
 }
 
@@ -733,6 +754,14 @@ function expandOnlyErrorsInSection (section) {
                 }
             });
         }
+        _.forEach(object.specGroups, function (specGroup) {
+            specGroup.expanded = specGroup.hasFailure;
+            _.forEach(specGroup.specs, function (spec) {
+                if (spec.subLayout && spec.subLayout.sections) {
+                    _.forEach(spec.subLayout.sections, expandOnlyErrorsInSection);
+                }
+            });
+        });
     });
 }
 
@@ -758,6 +787,17 @@ function visitEachSection(section, callback) {
     });
     _.forEach(section.objects, function (object) {
         callback(object, 'object');
+
+        _.forEach(object.specs, function (spec) {
+            if (spec.subLayout) {
+                _.forEach(spec.subLayout.sections, function (subSection) {
+                    visitEachSection(subSection, callback);
+                });
+            }
+        });
+        _.forEach(object.specGroups, function (specGroup) {
+            callback(specGroup);
+        });
     });
 }
 

galen-core/src/main/resources/html-report/report-test.tpl.html

@@ -189,6 +189,24 @@
                     >{{object.name}}:</div>
                 <div class="child-nodes" v-bind:class="{'child-nodes-expanded': object.expanded}">
                     <layout-spec v-for="spec in object.specs" v-bind:spec="spec" v-bind:bus="bus" v-bind:layout="layout"></layout-spec>
+
+                    <layout-spec-group v-if="object.specGroups"
+                        v-for="specGroup in object.specGroups"
+                        v-bind:specgroup="specGroup"
+                        v-bind:bus="bus"
+                        v-bind:layout="layout"
+                        ></layout-spec-group>
+                </div>
+            </div>
+        </template>
+
+        <template id="tpl-spec-group">
+            <div class="layout-section" v-bind:class="{'has-failure': specgroup.hasFailure}">
+                <div class="title icon-sprite-before"
+                    v-on:click="toggleReportNode(specgroup)"
+                    >{{specgroup.name}}:</div>
+                <div class="child-nodes" v-bind:class="{'child-nodes-expanded': specgroup.expanded}">
+                    <layout-spec v-for="spec in specgroup.specs" v-bind:spec="spec" v-bind:bus="bus" v-bind:layout="layout"></layout-spec>
                 </div>
             </div>
         </template>
@@ -207,6 +225,8 @@
                 </div>
             </div>
         </template>
+
+
         <template id="tpl-screenshot-popup">
             <div>
                 <div class="popup-shadow" v-on:click="$emit('close')"> </div>