fix rxjs (#3276)

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

Hide file tree

Showing 5 changed files with 16 additions and 3 deletions.
diff --git a/ui/package.json b/ui/package.json
@@ -65,8 +65,9 @@
     "ngx-infinite-scroll": "^6.0.1",
     "ngx-markdown": "6.1.0",
     "prismjs": "^1.15.0",
-    "rxjs": "^6.2.0",
-    "rxjs-compat": "^6.2.0",
+    "rxjs": "6.2.0",
+    "rxjs-compat": "6.2.0",
+
     "semantic-ui": "2.2.13",
     "string-format-obj": "^1.1.1",
     "ts-helpers": "^1.1.1",

diff --git a/ui/src/app/shared/vulnerability/list/vulnerabilities.list.html b/ui/src/app/shared/vulnerability/list/vulnerabilities.list.html
@@ -15,10 +15,11 @@
                     <span>{{ ' ' + v.version}}</span>
                     <span class="title">{{ v.title + ' '}}<a [href]="v.link" target="_blank">{{v.cve}}<i class="external alternate icon"></i></a></span>
                 </div>
+                <div class="ui brown tag label">{{v.type}}</div>
                 <div class="action" *ngIf="edit">
                    <button class="ui tiny icon button" (click)="ignoreVulnerability(v)" [class.loading]="v.loading" [class.disabled]="v.loading">
                        <i class="undo icon" *ngIf="v.ignored"></i>
-                       <i class="trash icon" *ngIf="!v.ignored"></i>
+                       <i class="eye slash outline icon" *ngIf="!v.ignored" title="{{ 'vulnerability_ignore' | translate }}"></i>
                    </button>
                 </div>
             </div>

diff --git a/ui/src/app/shared/vulnerability/list/vulnerabilities.list.scss b/ui/src/app/shared/vulnerability/list/vulnerabilities.list.scss
@@ -13,6 +13,11 @@ ul {
     padding-top: 10px;
     padding-bottom: 10px;
 
+    .ui.tag.label {
+      margin-left: 20px;
+      font-size: 0.75em;
+    }
+
     .dot {
       width: 13px;
       height: 13px;
@@ -78,4 +83,8 @@ ul {
   li.inactive {
     color: grey;
   }
+}
+
+pre {
+  white-space: initial;
 }
diff --git a/ui/src/assets/i18n/en.json b/ui/src/assets/i18n/en.json
@@ -717,6 +717,7 @@
   "vcs_ssh_key" : "SSH key",
   "vcs_pgp_key" : "PGP key",
 
+  "vulnerability_ignore": "Ignore",
   "vulnerability_no" : "No vulnerabilities detected",
   "vulnerability_updated" : "Vulnerability updated",
 

diff --git a/ui/src/assets/i18n/fr.json b/ui/src/assets/i18n/fr.json
@@ -717,6 +717,7 @@
   "vcs_ssh_key" : "Clé SSH",
   "vcs_pgp_key" : "Clé PGP",
 
+  "vulnerability_ignore": "Ignorer",
   "vulnerability_no" : "Aucune vulnérabilité détectée",
   "vulnerability_updated" : "Vulnérabilité mise à jour",