feat(ui): add origin and fix in version (#3277)

ovh · Aug 31, 2018 · cb2bb9e · cb2bb9e
1 parent 8a3799e
commit cb2bb9e
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 3 deletions.
diff --git a/ui/src/app/shared/vulnerability/list/vulnerabilities.list.html b/ui/src/app/shared/vulnerability/list/vulnerabilities.list.html
@@ -27,6 +27,20 @@
                 <div class="description">
                     <markdown [data]="v.description"></markdown>
                 </div>
+                <a class="pointing" (click)="showMore = !showMore">
+                    <span *ngIf="showMore">{{ 'vunerability_hide' | translate }}</span>
+                    <span *ngIf="!showMore">{{ 'vulnerability_showmore' | translate }}</span>
+                </a>
+                <div class="more" *ngIf="showMore">
+                    <div class="origin">
+                        <h4>{{ 'vulnerability_origin' | translate }}</h4>
+                        <pre>{{v.origin}}</pre>
+                    </div>
+                    <div class="fixin">
+                        <h4>{{ 'vulnerability_fixin' | translate }}</h4>
+                        <pre>{{v.fix_in}}</pre>
+                    </div>
+                </div>
             </div>
         </li>
     </ul>

diff --git a/ui/src/app/shared/vulnerability/list/vulnerabilities.list.scss b/ui/src/app/shared/vulnerability/list/vulnerabilities.list.scss
@@ -68,6 +68,19 @@ ul {
 
     .resume {
       padding-top: 10px;
+
+      .description {
+        pre {
+          white-space: initial;
+        }
+      }
+      .more {
+        margin-top: 10px;
+
+        pre {
+          white-space: pre-line;
+        }
+      }
     }
   }
   li:first-child {
@@ -85,6 +98,3 @@ ul {
   }
 }
 
-pre {
-  white-space: initial;
-}
diff --git a/ui/src/assets/i18n/en.json b/ui/src/assets/i18n/en.json
@@ -717,8 +717,12 @@
   "vcs_ssh_key" : "SSH key",
   "vcs_pgp_key" : "PGP key",
 
+  "vulnerability_fixin" : "Fix in",
+  "vunerability_hide" : "Hide",
   "vulnerability_ignore": "Ignore",
   "vulnerability_no" : "No vulnerabilities detected",
+  "vulnerability_origin": "Origin",
+  "vulnerability_showmore" : "Show more",
   "vulnerability_updated" : "Vulnerability updated",
 
   "warning_context": "Context",

diff --git a/ui/src/assets/i18n/fr.json b/ui/src/assets/i18n/fr.json
@@ -717,8 +717,12 @@
   "vcs_ssh_key" : "Clé SSH",
   "vcs_pgp_key" : "Clé PGP",
 
+  "vulnerability_fixin" : "Fixé en",
+  "vunerability_hide" : "Cacher",
   "vulnerability_ignore": "Ignorer",
   "vulnerability_no" : "Aucune vulnérabilité détectée",
+  "vulnerability_origin": "Origine",
+  "vulnerability_showmore" : "Voir plus",
   "vulnerability_updated" : "Vulnérabilité mise à jour",
 
   "warning_context": "Contexte",