diff --git a/allure-generator/src/main/javascript/components/status-toggle/StatusToggleView.hbs b/allure-generator/src/main/javascript/components/status-toggle/StatusToggleView.hbs
index e0b3c5e4d..f5976e437 100644
--- a/allure-generator/src/main/javascript/components/status-toggle/StatusToggleView.hbs
+++ b/allure-generator/src/main/javascript/components/status-toggle/StatusToggleView.hbs
@@ -1,16 +1,14 @@
{{t 'component.tree.filter'}}:
{{#each statuses}}
- {{#if count}}
-
- {{#if active}}
- {{count}}
- {{else}}
- {{count}}
- {{/if}}
-
+
+ {{#if active}}
+ {{count}}
+ {{else}}
+ {{count}}
{{/if}}
+
{{/each}}
\ No newline at end of file
diff --git a/allure-generator/src/main/javascript/components/tree/TreeView.js b/allure-generator/src/main/javascript/components/tree/TreeView.js
index d95739c28..d7de52f41 100644
--- a/allure-generator/src/main/javascript/components/tree/TreeView.js
+++ b/allure-generator/src/main/javascript/components/tree/TreeView.js
@@ -93,7 +93,6 @@ class TreeView extends View {
const showGroupInfo = settings.get('showGroupInfo');
const shownCases = this.collection.testcases.length;
const totalCases = this.collection.allTestcases.length;
-
return {
baseUrl: this.baseUrl,
showGroupInfo: showGroupInfo,
diff --git a/allure-generator/src/main/javascript/data/tree/TreeCollection.js b/allure-generator/src/main/javascript/data/tree/TreeCollection.js
index 0988dad7b..11f7b4b23 100644
--- a/allure-generator/src/main/javascript/data/tree/TreeCollection.js
+++ b/allure-generator/src/main/javascript/data/tree/TreeCollection.js
@@ -18,11 +18,12 @@ export default class TreeCollection extends Collection {
}
parse({time, statistic, children}) {
- this.allTestcases = this.getFlattenTestcases(children);
- this.allNodes = children;
+ const items = children || [];
+ this.allTestcases = this.getFlattenTestcases(items);
+ this.allNodes = items;
this.time = time;
this.statistic = statistic;
- return children;
+ return items;
}
applyFilterAndSorting(statuses, sortSettings) {
diff --git a/allure-plugin-api/src/main/java/io/qameta/allure/tree/AbstractTreeAggregator.java b/allure-plugin-api/src/main/java/io/qameta/allure/tree/AbstractTreeAggregator.java
index 3641ad6ef..0c66260a7 100644
--- a/allure-plugin-api/src/main/java/io/qameta/allure/tree/AbstractTreeAggregator.java
+++ b/allure-plugin-api/src/main/java/io/qameta/allure/tree/AbstractTreeAggregator.java
@@ -5,6 +5,8 @@
import io.qameta.allure.context.RandomUidContext;
import io.qameta.allure.core.Configuration;
import io.qameta.allure.core.LaunchResults;
+import io.qameta.allure.entity.GroupTime;
+import io.qameta.allure.entity.Statistic;
import io.qameta.allure.entity.StatusDetails;
import io.qameta.allure.entity.TestResult;
@@ -39,7 +41,11 @@ public void aggregate(final Configuration configuration,
protected TreeData getData(final Supplier uidGenerator,
final List launches) {
- final TreeData tree = new TreeData();
+ final TreeData tree = new TreeData()
+ .withTime(new GroupTime())
+ .withStatistic(new Statistic())
+ .withChildren(new ArrayList<>());
+
launches.stream()
.flatMap(launch -> launch.getResults().stream())
.forEach(result -> addResultToTree(uidGenerator, tree, result));