From a4f5098c74bb4bccfa33b288cc497029828144fb Mon Sep 17 00:00:00 2001 From: Stas Vilchik Date: Wed, 10 Dec 2014 12:10:04 +0100 Subject: [PATCH] SONAR-5884 Update measures window --- .../_source-viewer-measures-duplications.hbs | 32 + .../_source-viewer-measures-issues.hbs | 61 ++ .../_source-viewer-measures-it-coverage.hbs | 85 +++ .../_source-viewer-measures-lines.hbs | 113 ++++ ...ource-viewer-measures-overall-coverage.hbs | 85 +++ .../_source-viewer-measures-tests.hbs | 107 ++++ .../_source-viewer-measures-ut-coverage.hbs | 85 +++ .../source-viewer/source-viewer-measures.hbs | 562 +----------------- 8 files changed, 592 insertions(+), 538 deletions(-) create mode 100644 server/sonar-web/src/main/hbs/source-viewer/measures/_source-viewer-measures-duplications.hbs create mode 100644 server/sonar-web/src/main/hbs/source-viewer/measures/_source-viewer-measures-issues.hbs create mode 100644 server/sonar-web/src/main/hbs/source-viewer/measures/_source-viewer-measures-it-coverage.hbs create mode 100644 server/sonar-web/src/main/hbs/source-viewer/measures/_source-viewer-measures-lines.hbs create mode 100644 server/sonar-web/src/main/hbs/source-viewer/measures/_source-viewer-measures-overall-coverage.hbs create mode 100644 server/sonar-web/src/main/hbs/source-viewer/measures/_source-viewer-measures-tests.hbs create mode 100644 server/sonar-web/src/main/hbs/source-viewer/measures/_source-viewer-measures-ut-coverage.hbs diff --git a/server/sonar-web/src/main/hbs/source-viewer/measures/_source-viewer-measures-duplications.hbs b/server/sonar-web/src/main/hbs/source-viewer/measures/_source-viewer-measures-duplications.hbs new file mode 100644 index 00000000000..29ac7d487d8 --- /dev/null +++ b/server/sonar-web/src/main/hbs/source-viewer/measures/_source-viewer-measures-duplications.hbs @@ -0,0 +1,32 @@ + + {{#notNull measures.duplicated_lines_density}} +
+
+ +
+
+
+ Duplications + {{measures.duplicated_lines_density}} +
+
+
+ +
+
+
+ {{t 'metric.duplicated_blocks.name'}} + {{measures.duplicated_blocks}} +
+
+ {{t 'metric.duplicated_lines.name'}} + {{measures.duplicated_lines}} +
+
+
+ {{/notNull}} + diff --git a/server/sonar-web/src/main/hbs/source-viewer/measures/_source-viewer-measures-issues.hbs b/server/sonar-web/src/main/hbs/source-viewer/measures/_source-viewer-measures-issues.hbs new file mode 100644 index 00000000000..0f4154d4864 --- /dev/null +++ b/server/sonar-web/src/main/hbs/source-viewer/measures/_source-viewer-measures-issues.hbs @@ -0,0 +1,61 @@ + + {{#notNull measures.fDebt}} +
+ {{#notNull measures.fSqaleRating}} +
+ {{measures.sqale_rating}} +
+ {{/notNull}} +
+
+ {{t 'metric.sqale_index.short_name'}} + {{measures.sqale_index}} +
+
+
+ {{/notNull}} +
+
+
+ Issues + {{measures.violations}} +
+
+ {{#notNull measures.fSqaleDebtRatio}} +
+
+ {{t 'metric.sqale_debt_ratio.short_name'}} + {{measures.sqale_debt_ratio}} +
+
+ {{/notNull}} +
+ {{#gt measures.fIssues 0}} +
+
+
+ {{severityIcon 'BLOCKER'}} {{t 'severity.BLOCKER'}} + {{default measures.blocker_violations 0}} +
+
+ {{severityIcon 'CRITICAL'}} {{t 'severity.CRITICAL'}} + {{default measures.critical_violations 0}} +
+
+ {{severityIcon 'MAJOR'}} {{t 'severity.MAJOR'}} + {{default measures.major_violations 0}} +
+
+
+
+ {{severityIcon 'MINOR'}} {{t 'severity.MINOR'}} + {{default measures.minor_violations 0}} +
+
+ {{severityIcon 'INFO'}} {{t 'severity.INFO'}} + {{default measures.info_violations 0}} +
+
+
+ {{/gt}} + diff --git a/server/sonar-web/src/main/hbs/source-viewer/measures/_source-viewer-measures-it-coverage.hbs b/server/sonar-web/src/main/hbs/source-viewer/measures/_source-viewer-measures-it-coverage.hbs new file mode 100644 index 00000000000..00b3b94730a --- /dev/null +++ b/server/sonar-web/src/main/hbs/source-viewer/measures/_source-viewer-measures-it-coverage.hbs @@ -0,0 +1,85 @@ +{{#notNull measures.it_coverage}} +
+
+ +
+
+
+ {{t 'metric.coverage.name'}} + {{measures.it_coverage}} +
+
+
+{{/notNull}} + +{{#notNull measures.it_line_coverage}} +
+
+ +
+
+
+
+ {{t 'metric.line_coverage.name'}} + {{measures.it_line_coverage}} +
+
+
+
+ +
+
+
+ {{t 'metric.lines_to_cover.name'}} + {{measures.it_lines_to_cover}} +
+
+ {{t 'metric.uncovered_lines.name'}} + {{measures.it_uncovered_lines}} +
+
+
+{{/notNull}} + +{{#notNull measures.it_branch_coverage}} +
+
+ +
+
+
+
+ {{t 'metric.branch_coverage.name'}} + {{measures.it_branch_coverage}} +
+
+
+
+ +
+
+
+ {{t 'metric.conditions_to_cover.name'}} + {{measures.it_conditions_to_cover}} +
+
+ {{t 'metric.uncovered_conditions.name'}} + {{measures.it_uncovered_conditions}} +
+
+
+{{/notNull}} diff --git a/server/sonar-web/src/main/hbs/source-viewer/measures/_source-viewer-measures-lines.hbs b/server/sonar-web/src/main/hbs/source-viewer/measures/_source-viewer-measures-lines.hbs new file mode 100644 index 00000000000..07d4e7e4ad2 --- /dev/null +++ b/server/sonar-web/src/main/hbs/source-viewer/measures/_source-viewer-measures-lines.hbs @@ -0,0 +1,113 @@ + +
+
+ +
+
+
+ {{t 'metric.ncloc.name'}} + {{measures.ncloc}} +
+
+ {{t 'metric.lines.name'}} + {{measures.lines}} +
+
+
+ + {{#any measures.generated_ncloc measures.generated_lines}} +
+
+ {{#if measures.generated_ncloc}} +
+ {{t 'metric.generated_ncloc.name'}} + {{measures.generated_ncloc}} +
+ {{/if}} + {{#if measures.generated_lines}} +
+ {{t 'metric.generated_lines.name'}} + {{measures.generated_lines}} +
+ {{/if}} +
+
+ {{/any}} + +
+
+
+ {{t 'metric.classes.name'}} + {{measures.classes}} +
+
+ {{t 'metric.functions.name'}} + {{measures.functions}} +
+
+
+
+ {{t 'metric.accessors.name'}} + {{measures.accessors}} +
+
+ {{t 'metric.statements.name'}} + {{measures.statements}} +
+
+
+ +
+
+ +
+
+
+
+ Comments + {{measures.comment_lines_density}} +
+
+ {{t 'metric.comment_lines.name'}} + {{measures.comment_lines}} +
+
+
+
+ +
+
+
+ {{t 'metric.public_api.name'}} + {{measures.public_api}} +
+
+ {{t 'metric.public_documented_api_density.name'}} + {{measures.public_documented_api_density}} +
+
+ {{t 'metric.public_undocumented_api.name'}} + {{measures.public_undocumented_api}} +
+
+
+ +
+
+
+ {{t 'metric.complexity.name'}} + {{measures.complexity}} +
+
+ {{t 'metric.function_complexity.name'}} + {{measures.function_complexity}} +
+
+
+ diff --git a/server/sonar-web/src/main/hbs/source-viewer/measures/_source-viewer-measures-overall-coverage.hbs b/server/sonar-web/src/main/hbs/source-viewer/measures/_source-viewer-measures-overall-coverage.hbs new file mode 100644 index 00000000000..b6b2c8c4462 --- /dev/null +++ b/server/sonar-web/src/main/hbs/source-viewer/measures/_source-viewer-measures-overall-coverage.hbs @@ -0,0 +1,85 @@ +{{#notNull measures.overall_coverage}} +
+
+ +
+
+
+ {{t 'metric.coverage.name'}} + {{measures.overall_coverage}} +
+
+
+{{/notNull}} + +{{#notNull measures.overall_line_coverage}} +
+
+ +
+
+
+
+ {{t 'metric.line_coverage.name'}} + {{measures.overall_line_coverage}} +
+
+
+
+ +
+
+
+ {{t 'metric.lines_to_cover.name'}} + {{measures.overall_lines_to_cover}} +
+
+ {{t 'metric.uncovered_lines.name'}} + {{measures.overall_uncovered_lines}} +
+
+
+{{/notNull}} + +{{#notNull measures.overall_branch_coverage}} +
+
+ +
+
+
+
+ {{t 'metric.branch_coverage.name'}} + {{measures.overall_branch_coverage}} +
+
+
+
+ +
+
+
+ {{t 'metric.conditions_to_cover.name'}} + {{measures.overall_conditions_to_cover}} +
+
+ {{t 'metric.uncovered_conditions.name'}} + {{measures.overall_uncovered_conditions}} +
+
+
+{{/notNull}} diff --git a/server/sonar-web/src/main/hbs/source-viewer/measures/_source-viewer-measures-tests.hbs b/server/sonar-web/src/main/hbs/source-viewer/measures/_source-viewer-measures-tests.hbs new file mode 100644 index 00000000000..4267dc52935 --- /dev/null +++ b/server/sonar-web/src/main/hbs/source-viewer/measures/_source-viewer-measures-tests.hbs @@ -0,0 +1,107 @@ + +
+
+
+ {{t 'metric.tests.name'}} + {{measures.tests}} +
+ {{#notNull measures.test_success_density}} +
+ {{t 'metric.test_success_density.name'}} + {{measures.test_success_density}} +
+ {{/notNull}} + {{#notNull measures.test_failures}} +
+ {{t 'metric.test_failures.name'}} + {{measures.test_failures}} +
+ {{/notNull}} + {{#notNull measures.test_errors}} +
+ {{t 'metric.test_errors.name'}} + {{measures.test_errors}} +
+ {{/notNull}} + {{#notNull measures.skipped_tests}} +
+ {{t 'metric.skipped_tests.name'}} + {{measures.skipped_tests}} +
+ {{/notNull}} + {{#notNull measures.test_execution_time}} +
+ {{t 'metric.test_execution_time.name'}} + {{measures.test_execution_time}} +
+ {{/notNull}} +
+
+ +
+ + + + + + {{#each tests}} + + {{#eq status 'SKIPPED'}} + + + + + {{else}} + {{#ifTestData this}} + + + + + {{else}} + + + + {{/ifTestData}} + {{/eq}} + + {{/each}} +
+ {{t 'component_viewer.measure_section.unit_tests'}}
+ {{t 'component_viewer.tests.ordered_by'}} + + {{t 'component_viewer.tests.duration'}} + / + + {{t 'component_viewer.tests.test_name'}} + / + + {{t 'component_viewer.tests.status'}} + 		{{t 'component_viewer.covered_lines'}}
{{testStatusIcon status}}{{name}}{{testStatusIcon status}}{{durationInMs}}ms{{name}}{{coveredLines}}{{testStatusIcon status}}{{durationInMs}}ms{{name}}
+
+ + + + {{#if selectedTest}} + {{#notEq selectedTest.status 'ERROR'}} + {{#notEq selectedTest.status 'FAILURE'}} +
{{t 'component_viewer.transition.covers'}}
+ {{#each coveredFiles}} +
+ {{longName}} + {{tp 'component_viewer.x_lines_are_covered' coveredLines}} +
+ {{else}} + {{t 'none'}} + {{/each}} + {{/notEq}} + {{/notEq}} + + {{#notEq selectedTest.status 'OK'}} +
{{t 'component_viewer.details'}}
+ {{#if selectedTest.message}} + 
{{selectedTest.message}}
+ {{/if}} + 
{{selectedTest.stackTrace}}
+ {{/notEq}} + {{/if}} + diff --git a/server/sonar-web/src/main/hbs/source-viewer/measures/_source-viewer-measures-ut-coverage.hbs b/server/sonar-web/src/main/hbs/source-viewer/measures/_source-viewer-measures-ut-coverage.hbs new file mode 100644 index 00000000000..bfb82f01cfa --- /dev/null +++ b/server/sonar-web/src/main/hbs/source-viewer/measures/_source-viewer-measures-ut-coverage.hbs @@ -0,0 +1,85 @@ +{{#notNull measures.coverage}} +
+
+ +
+
+
+ {{t 'metric.coverage.name'}} + {{measures.coverage}} +
+
+
+{{/notNull}} + +{{#notNull measures.line_coverage}} +
+
+ +
+
+
+
+ {{t 'metric.line_coverage.name'}} + {{measures.line_coverage}} +
+
+
+
+ +
+
+
+ {{t 'metric.lines_to_cover.name'}} + {{measures.lines_to_cover}} +
+
+ {{t 'metric.uncovered_lines.name'}} + {{measures.uncovered_lines}} +
+
+
+{{/notNull}} + +{{#notNull measures.branch_coverage}} +
+
+ +
+
+
+
+ {{t 'metric.branch_coverage.name'}} + {{measures.branch_coverage}} +
+
+
+
+ +
+
+
+ {{t 'metric.conditions_to_cover.name'}} + {{measures.conditions_to_cover}} +
+
+ {{t 'metric.uncovered_conditions.name'}} + {{measures.uncovered_conditions}} +
+
+
+{{/notNull}} diff --git a/server/sonar-web/src/main/hbs/source-viewer/source-viewer-measures.hbs b/server/sonar-web/src/main/hbs/source-viewer/source-viewer-measures.hbs index 6e90cd396c6..25ecaee3393 100644 --- a/server/sonar-web/src/main/hbs/source-viewer/source-viewer-measures.hbs +++ b/server/sonar-web/src/main/hbs/source-viewer/source-viewer-measures.hbs @@ -1,544 +1,30 @@ - -{{#unless isUnitTest}} - -{{/unless}} - - - -{{#unless isUnitTest}} - -{{/unless}} - -{{#if isUnitTest}} - - - + {{#unless isUnitTest}} + {{> '_source-viewer-measures-lines'}} + {{/unless}} + + {{> '_source-viewer-measures-issues'}} + + {{#unless isUnitTest}} + + {{/unless}} + + {{#if isUnitTest}} + {{> '_source-viewer-measures-tests'}} {{/if}} - -{{/if}} -{{#unless isUnitTest}} - -{{/unless}} - + {{#unless isUnitTest}} + {{> '_source-viewer-measures-duplications'}} + {{/unless}} +
-
-
- -
-
-
- {{t 'metric.ncloc.name'}} - {{measures.ncloc}} -
-
- {{t 'metric.lines.name'}} - {{measures.lines}} -
-
-
- - {{#any measures.generated_ncloc measures.generated_lines}} -
-
- {{#if measures.generated_ncloc}} -
- {{t 'metric.generated_ncloc.name'}} - {{measures.generated_ncloc}} -
- {{/if}} - {{#if measures.generated_lines}} -
- {{t 'metric.generated_lines.name'}} - {{measures.generated_lines}} -
- {{/if}} -
-
- {{/any}} - -
-
-
- {{t 'metric.classes.name'}} - {{measures.classes}} -
-
- {{t 'metric.functions.name'}} - {{measures.functions}} -
-
-
-
- {{t 'metric.accessors.name'}} - {{measures.accessors}} -
-
- {{t 'metric.statements.name'}} - {{measures.statements}} -
-
-
- -
-
- -
-
-
-
- Comments - {{measures.comment_lines_density}} -
-
- {{t 'metric.comment_lines.name'}} - {{measures.comment_lines}} -
-
-
-
- -
-
-
- {{t 'metric.public_api.name'}} - {{measures.public_api}} -
-
- {{t 'metric.public_documented_api_density.name'}} - {{measures.public_documented_api_density}} -
-
- {{t 'metric.public_undocumented_api.name'}} - {{measures.public_undocumented_api}} -
-
-
- -
-
-
- {{t 'metric.complexity.name'}} - {{measures.complexity}} -
-
- {{t 'metric.function_complexity.name'}} - {{measures.function_complexity}} -
-
-
- 		- {{#notNull measures.fDebt}} -
- {{#notNull measures.fSqaleRating}} -
- {{measures.sqale_rating}} -
- {{/notNull}} -
-
- {{t 'metric.sqale_index.short_name'}} - {{measures.sqale_index}} -
-
-
- {{/notNull}} -
-
-
- Issues - {{measures.violations}} -
-
- {{#notNull measures.fSqaleDebtRatio}} -
-
- {{t 'metric.sqale_debt_ratio.short_name'}} - {{measures.sqale_debt_ratio}} -
-
- {{/notNull}} -
- {{#gt measures.fIssues 0}} -
-
-
- {{severityIcon 'BLOCKER'}} {{t 'severity.BLOCKER'}} - {{default measures.blocker_violations 0}} -
-
- {{severityIcon 'CRITICAL'}} {{t 'severity.CRITICAL'}} - {{default measures.critical_violations 0}} -
-
- {{severityIcon 'MAJOR'}} {{t 'severity.MAJOR'}} - {{default measures.major_violations 0}} -
-
-
-
- {{severityIcon 'MINOR'}} {{t 'severity.MINOR'}} - {{default measures.minor_violations 0}} -
-
- {{severityIcon 'INFO'}} {{t 'severity.INFO'}} - {{default measures.info_violations 0}} -
-
-
- {{/gt}} -		 - {{#all measures.coverage measures.it_coverage}} -
-
- -
-
-
- {{t 'metric.coverage.name'}} - {{measures.coverage}} -
-
-
- -
-
- -
-
-
- {{t 'metric.line_coverage.name'}} - {{measures.line_coverage}} -
-
- {{t 'metric.lines_to_cover.name'}} - {{measures.lines_to_cover}} -
-
- {{t 'metric.uncovered_lines.name'}} - {{measures.uncovered_lines}} -
-
-
- -
-
- -
-
-
- {{t 'metric.branch_coverage.name'}} - {{measures.branch_coverage}} -
-
- {{t 'metric.conditions_to_cover.name'}} - {{measures.conditions_to_cover}} -
-
- {{t 'metric.uncovered_conditions.name'}} - {{measures.uncovered_conditions}} -
-
-
-
-
- -
-
-
- {{t 'metric.coverage.name'}} - {{measures.it_coverage}} -
-
-
- -
-
- -
-
-
- {{t 'metric.line_coverage.name'}} - {{measures.it_line_coverage}} -
-
- {{t 'metric.lines_to_cover.name'}} - {{measures.it_lines_to_cover}} -
-
- {{t 'metric.uncovered_lines.name'}} - {{measures.it_uncovered_lines}} -
-
-
- -
-
- -
-
-
- {{t 'metric.branch_coverage.name'}} - {{measures.it_branch_coverage}} -
-
- {{t 'metric.conditions_to_cover.name'}} - {{measures.it_conditions_to_cover}} -
-
- {{t 'metric.uncovered_conditions.name'}} - {{measures.it_uncovered_conditions}} -
-
-
- {{/all}} - - {{#if measures.overall_coverage}} -
-
- -
-
-
- {{t 'metric.coverage.name'}} - {{measures.overall_coverage}} -
-
-
- -
-
- -
-
-
-
- {{t 'metric.line_coverage.name'}} - {{measures.overall_line_coverage}} -
-
-
-
- -
-
-
- {{t 'metric.lines_to_cover.name'}} - {{measures.overall_lines_to_cover}} -
-
- {{t 'metric.uncovered_lines.name'}} - {{measures.overall_uncovered_lines}} -
-
-
- -
-
- -
-
-
-
- {{t 'metric.branch_coverage.name'}} - {{measures.overall_branch_coverage}} -
-
-
-
- -
-
-
- {{t 'metric.conditions_to_cover.name'}} - {{measures.overall_conditions_to_cover}} -
-
- {{t 'metric.uncovered_conditions.name'}} - {{measures.overall_uncovered_conditions}} -
-
-
- {{/if}} - 		-
-
-
- {{t 'metric.tests.name'}} - {{measures.tests}} -
- {{#notNull measures.test_success_density}} -
- {{t 'metric.test_success_density.name'}} - {{measures.test_success_density}} -
- {{/notNull}} - {{#notNull measures.test_failures}} -
- {{t 'metric.test_failures.name'}} - {{measures.test_failures}} -
- {{/notNull}} - {{#notNull measures.test_errors}} -
- {{t 'metric.test_errors.name'}} - {{measures.test_errors}} -
- {{/notNull}} - {{#notNull measures.skipped_tests}} -
- {{t 'metric.skipped_tests.name'}} - {{measures.skipped_tests}} -
- {{/notNull}} - {{#notNull measures.test_execution_time}} -
- {{t 'metric.test_execution_time.name'}} - {{measures.test_execution_time}} -
- {{/notNull}} -
-
- -
- - - - - - {{#each tests}} - - {{#eq status 'SKIPPED'}} - - - - - {{else}} - {{#ifTestData this}} - - - - - {{else}} - - - - {{/ifTestData}} - {{/eq}} - - {{/each}} -
- {{t 'component_viewer.measure_section.unit_tests'}}
- {{t 'component_viewer.tests.ordered_by'}} - - {{t 'component_viewer.tests.duration'}} - / - - {{t 'component_viewer.tests.test_name'}} - / - - {{t 'component_viewer.tests.status'}} - 		{{t 'component_viewer.covered_lines'}}
{{testStatusIcon status}}{{name}}{{testStatusIcon status}}{{durationInMs}}ms{{name}}{{coveredLines}}{{testStatusIcon status}}{{durationInMs}}ms{{name}}
-
- 		- {{#if selectedTest}} - {{#notEq selectedTest.status 'ERROR'}} - {{#notEq selectedTest.status 'FAILURE'}} -
{{t 'component_viewer.transition.covers'}}
- {{#each coveredFiles}} -
- {{longName}} - {{tp 'component_viewer.x_lines_are_covered' coveredLines}} -
- {{else}} - {{t 'none'}} - {{/each}} - {{/notEq}} - {{/notEq}} - - {{#notEq selectedTest.status 'OK'}} -
{{t 'component_viewer.details'}}
- {{#if selectedTest.message}} - 
{{selectedTest.message}}
- {{/if}} - 
{{selectedTest.stackTrace}}
- {{/notEq}} +
+ {{> '_source-viewer-measures-overall-coverage'}} + + {{#all measures.coverage measures.it_coverage}} + {{> '_source-viewer-measures-ut-coverage'}} + {{> '_source-viewer-measures-it-coverage'}} + {{/all}} + -
-
- -
-
-
- Duplications - {{measures.duplicated_lines_density}} -
-
-
-
-
-
- {{t 'metric.duplicated_blocks.name'}} - {{measures.duplicated_blocks}} -
-
- {{t 'metric.duplicated_lines.name'}} - {{measures.duplicated_lines}} -
-
-
-
-- 2.39.5