From 76b6717cba770f316847ad9dbf05361457d4ec48 Mon Sep 17 00:00:00 2001
From: Yaroslav Serhieiev <noomorph@gmail.com>
Date: Fri, 29 Mar 2024 10:26:40 +0200
Subject: [PATCH] Make test result labels more stylable

---
 .../main/javascript/blocks/pane/styles.scss   |  6 +++++
 .../testresult-category/CategoryView.hbs      | 12 ++++++----
 .../DescriptionView.hbs                       |  2 +-
 .../testresult-duration/DurationView.hbs      | 14 ++++++-----
 .../plugins/testresult-links/LinksView.hbs    | 24 ++++++++++---------
 .../plugins/testresult-owner/OwnerView.hbs    |  4 ++--
 .../testresult-parameters/ParametersView.hbs  |  6 +++--
 .../testresult-severity/SeverityView.hbs      |  6 +++--
 .../plugins/testresult-tags/TagsView.hbs      | 11 +++++----
 9 files changed, 52 insertions(+), 33 deletions(-)

diff --git a/allure-generator/src/main/javascript/blocks/pane/styles.scss b/allure-generator/src/main/javascript/blocks/pane/styles.scss
index 1d1bd5543..0e281b355 100644
--- a/allure-generator/src/main/javascript/blocks/pane/styles.scss
+++ b/allure-generator/src/main/javascript/blocks/pane/styles.scss
@@ -48,5 +48,11 @@
 
   &__section-title {
     margin: 0 0 $gap-size;
+
+    @at-root #{selector-append('span', &)} {
+      &::after {
+        content: ':';
+      }
+    }
   }
 }
diff --git a/allure-generator/src/main/javascript/plugins/testresult-category/CategoryView.hbs b/allure-generator/src/main/javascript/plugins/testresult-category/CategoryView.hbs
index 404d8ee53..2b53eb23e 100644
--- a/allure-generator/src/main/javascript/plugins/testresult-category/CategoryView.hbs
+++ b/allure-generator/src/main/javascript/plugins/testresult-category/CategoryView.hbs
@@ -1,6 +1,8 @@
 {{#if categories}}
-    {{t 'testResult.categories.name'}}:
-    {{#each categories}}
-        <span>{{name}} </span>
-    {{/each}}
-{{/if}}
\ No newline at end of file
+    <span class="pane__section-title">{{t 'testResult.categories.name'}}</span>
+    <span class="pane__section-content">
+        {{#each categories}}
+            <span>{{name}} </span>
+        {{/each}}
+    </span>
+{{/if}}
diff --git a/allure-generator/src/main/javascript/plugins/testresult-description/DescriptionView.hbs b/allure-generator/src/main/javascript/plugins/testresult-description/DescriptionView.hbs
index ced31904a..832809a5a 100644
--- a/allure-generator/src/main/javascript/plugins/testresult-description/DescriptionView.hbs
+++ b/allure-generator/src/main/javascript/plugins/testresult-description/DescriptionView.hbs
@@ -1,4 +1,4 @@
 {{#if descriptionHtml}}
     <h3 class="pane__section-title">{{t 'testResult.description.name'}}</h3>
-    <div class="description__text">{{{descriptionHtml}}}</div>
+    <div class="pane__section-content description__text">{{{descriptionHtml}}}</div>
 {{/if}}
diff --git a/allure-generator/src/main/javascript/plugins/testresult-duration/DurationView.hbs b/allure-generator/src/main/javascript/plugins/testresult-duration/DurationView.hbs
index c43779eca..36fc860ce 100644
--- a/allure-generator/src/main/javascript/plugins/testresult-duration/DurationView.hbs
+++ b/allure-generator/src/main/javascript/plugins/testresult-duration/DurationView.hbs
@@ -1,7 +1,9 @@
 {{#if time}}
-    <span data-tooltip="{{date time.start}} {{time time.start}}&nbsp;&ndash;&nbsp;{{time time.stop}}">
-        {{t 'testResult.duration.name'}}:
-        <span class="fa fa-clock-o"></span>
-        {{duration time.duration 2}}
-    </span>
-{{/if}}
\ No newline at end of file
+    <div data-tooltip="{{date time.start}} {{time time.start}}&nbsp;&ndash;&nbsp;{{time time.stop}}">
+        <span class="pane__section-title">{{t 'testResult.duration.name'}}</span>
+        <span class="pane__section-content">
+            <span class="fa fa-clock-o"></span>
+            {{duration time.duration 2}}
+        </span>
+    </div>
+{{/if}}
diff --git a/allure-generator/src/main/javascript/plugins/testresult-links/LinksView.hbs b/allure-generator/src/main/javascript/plugins/testresult-links/LinksView.hbs
index 66bb2d04d..f44eab077 100644
--- a/allure-generator/src/main/javascript/plugins/testresult-links/LinksView.hbs
+++ b/allure-generator/src/main/javascript/plugins/testresult-links/LinksView.hbs
@@ -1,14 +1,16 @@
 {{#if links}}
     <h3 class="pane__section-title">{{t 'testResult.links.name'}}</h3>
-    {{#each links}}
-        <span class="testresult-link">
-        {{#if (eq type "issue")}}
-            <span class="fa fa-bug"></span>
-        {{/if}}
-        {{#if (eq type "tms")}}
-            <span class="fa fa-database"></span>
-        {{/if}}
-        <a class="link" href="{{default url name}}" target="_blank">{{default name url 'link'}}</a>
-    </span>
-    {{/each}}
+    <div class="pane__section-content">
+        {{#each links}}
+            <span class="testresult-link">
+            {{#if (eq type "issue")}}
+                <span class="fa fa-bug"></span>
+            {{/if}}
+            {{#if (eq type "tms")}}
+                <span class="fa fa-database"></span>
+            {{/if}}
+            <a class="link" href="{{default url name}}" target="_blank">{{default name url 'link'}}</a>
+        </span>
+        {{/each}}
+    </div>
 {{/if}}
diff --git a/allure-generator/src/main/javascript/plugins/testresult-owner/OwnerView.hbs b/allure-generator/src/main/javascript/plugins/testresult-owner/OwnerView.hbs
index 9702ac9e5..5f25570fb 100644
--- a/allure-generator/src/main/javascript/plugins/testresult-owner/OwnerView.hbs
+++ b/allure-generator/src/main/javascript/plugins/testresult-owner/OwnerView.hbs
@@ -1,4 +1,4 @@
 {{#if owner}}
     <h3 class="pane__section-title">{{t 'testResult.owner.name'}}</h3>
-    <div>{{owner}}</div>
-{{/if}}
\ No newline at end of file
+    <div class="pane__section-content">{{owner}}</div>
+{{/if}}
diff --git a/allure-generator/src/main/javascript/plugins/testresult-parameters/ParametersView.hbs b/allure-generator/src/main/javascript/plugins/testresult-parameters/ParametersView.hbs
index 0d755ab64..75d406769 100644
--- a/allure-generator/src/main/javascript/plugins/testresult-parameters/ParametersView.hbs
+++ b/allure-generator/src/main/javascript/plugins/testresult-parameters/ParametersView.hbs
@@ -1,5 +1,6 @@
 {{#if parameters.length}}
-<h3>{{t 'testResult.parameters.name'}}</h3>
+<h3 class="pane__section-title">{{t 'testResult.parameters.name'}}</h3>
+<div class="pane__section-content">
     {{#each parameters}}
         <div class="environment long-line line-ellipsis">
             <span class="environment__key">{{#if name}}{{name}}{{else}}&lt;null&gt;{{/if}}</span>:
@@ -10,4 +11,5 @@
             {{/if}}
         </div>
     {{/each}}
-{{/if}}
\ No newline at end of file
+</div>
+{{/if}}
diff --git a/allure-generator/src/main/javascript/plugins/testresult-severity/SeverityView.hbs b/allure-generator/src/main/javascript/plugins/testresult-severity/SeverityView.hbs
index 467043120..6174b5314 100644
--- a/allure-generator/src/main/javascript/plugins/testresult-severity/SeverityView.hbs
+++ b/allure-generator/src/main/javascript/plugins/testresult-severity/SeverityView.hbs
@@ -1,4 +1,6 @@
 {{#if severity}}
-    {{t 'testResult.severity.name'}}:
-    {{t (concat 'testResult.severity.' severity)}}
+    <span class="pane__section-title">{{t 'testResult.severity.name'}}</span>
+    <span class="pane__section-content" data-severity="{{severity}}">
+        {{t (concat 'testResult.severity.' severity)}}
+    </span>
 {{/if}}
diff --git a/allure-generator/src/main/javascript/plugins/testresult-tags/TagsView.hbs b/allure-generator/src/main/javascript/plugins/testresult-tags/TagsView.hbs
index fc100ca78..491d321db 100644
--- a/allure-generator/src/main/javascript/plugins/testresult-tags/TagsView.hbs
+++ b/allure-generator/src/main/javascript/plugins/testresult-tags/TagsView.hbs
@@ -1,5 +1,8 @@
 {{#if tags}}
-    {{t 'testResult.tags.name'}}: {{#each tags}}
-        <span class="label label__info">{{#if this}}{{this}}{{else}}null{{/if}}</span>
-    {{/each}}
-{{/if}}
\ No newline at end of file
+    <span class="pane__section-title">{{t 'testResult.tags.name'}}</span>
+    <span class="pane__section-content">
+        {{#each tags}}
+            <span class="label label__info">{{#if this}}{{this}}{{else}}null{{/if}}</span>
+        {{/each}}
+    </span>
+{{/if}}