Upstream
/
harbor
mirror of https://github.com/goharbor/harbor.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #11835 from AllForNothing/ui-bugs 

Fix some UI bugs
This commit is contained in:
Will Sun 2020-05-07 11:45:57 +08:00 committed by GitHub
parent 8331703eb3 bdf6c5b8d9
commit 119751e0fd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 28 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/portal/src/app/base/harbor-shell/harbor-shell.component.html
View File

@ -81,19 +81,15 @@
</clr-vertical-nav-group>
</div>
<div>
<div class="vertical-nav-footer">
<ng-container *ngFor="let theme of themeArray;let i=index">
<ng-container *ngIf="theme.showStyle === styleMode">
<a class="nav-link nav-icon theme-select"
(click)="themeChanged(theme)">
<clr-icon size="20" *ngIf="styleMode ==='DARK'" shape="sun" class="is-solid"></clr-icon>
<clr-icon size="20" *ngIf="styleMode ==='LIGHT'" shape="moon" class="is-solid"></clr-icon>
<ng-container *ngFor="let theme of themeArray;let i=index">
<ng-container *ngIf="theme.showStyle === styleMode">
<a clrVerticalNavLink (click)="themeChanged(theme)">
<clr-icon clrVerticalNavIcon size="20" *ngIf="styleMode ==='DARK'" shape="sun" class="is-solid"></clr-icon>
<clr-icon clrVerticalNavIcon size="20" *ngIf="styleMode ==='LIGHT'" shape="moon" class="is-solid"></clr-icon>
{{ theme.text | translate }}
</a>
</ng-container>
</ng-container>
</div>
</ng-container>
</ng-container>
<clr-vertical-nav-group routerLinkActive="active">
<clr-icon shape="network-globe" clrVerticalNavIcon></clr-icon>
{{'SIDE_NAV.API_EXPLORER' | translate}}

36
src/portal/src/app/base/harbor-shell/harbor-shell.component.scss
View File

@ -32,22 +32,6 @@ clr-vertical-nav {
justify-content: space-between;
}
}
.vertical-nav-footer {
margin: 5px 23px;
a {
display: inline-block;
line-height: 0;
padding: 0;
height: 24px;
&:hover {
background: transparent;
cursor: default;
}
.api-button {
margin: 0;
}
}
}
}
.font-size-13 {
font-size: 13px;
@ -82,23 +66,3 @@ clr-vertical-nav {
.right {
text-align: right;
}
.theme-select {
width: 5.4rem;
display: flex;
align-items: center;
justify-content: flex-start;
height: 100%;
font-size: 14px;
letter-spacing: 1px;
cursor: pointer;
&:hover {
opacity: 1;
}
clr-icon {
position: static;
transform: none;
margin-right: .2rem;
min-width: 20px;
}
}

9
src/portal/src/app/project/repository/artifact/artifact-additions/artifact-vulnerabilities/artifact-vulnerabilities.component.html
View File

@ -29,7 +29,12 @@
<clr-dg-column [clrDgField]="'version'">{{'VULNERABILITY.GRID.COLUMN_VERSION' | translate}}</clr-dg-column>
<clr-dg-column [clrDgField]="'fix_version'">{{'VULNERABILITY.GRID.COLUMN_FIXED' | translate}}</clr-dg-column>
<clr-dg-placeholder>{{'VULNERABILITY.CHART.TOOLTIPS_TITLE_ZERO' | translate}}</clr-dg-placeholder>
<clr-dg-placeholder>
<span *ngIf="hasScanned();else elseBlock">{{'VULNERABILITY.STATE.OTHER_STATUS' | translate}}</span>
<ng-template #elseBlock>
{{'VULNERABILITY.CHART.TOOLTIPS_TITLE_ZERO' | translate}}
</ng-template>
</clr-dg-placeholder>
<clr-dg-row *clrDgItems="let res of scanningResults">
<clr-dg-cell>
<span *ngIf="!res.links || res.links.length === 0">{{res.id}}</span>
@ -73,4 +78,4 @@
</clr-dg-footer>
</clr-datagrid>
</div>
</div>
</div>

7
src/portal/src/app/project/repository/artifact/artifact-additions/artifact-vulnerabilities/artifact-vulnerabilities.component.ts
View File

@ -181,6 +181,13 @@ export class ArtifactVulnerabilitiesComponent implements OnInit, OnDestroy {
return this.hasViewInitWithDelay && this.resultBarChartComponent
&& (this.resultBarChartComponent.queued || this.resultBarChartComponent.scanning || this.resultBarChartComponent.error);
}
hasScanned(): boolean {
return this.hasViewInitWithDelay && this.resultBarChartComponent
&& !(this.resultBarChartComponent.completed
|| this.resultBarChartComponent.error
|| this.resultBarChartComponent.queued
|| this.resultBarChartComponent.scanning);
}
handleScanOverview(scanOverview: any): any {
if (scanOverview) {
return scanOverview[DEFAULT_SUPPORTED_MIME_TYPE];

2
src/portal/src/i18n/lang/en-us-lang.json
View File

@ -997,7 +997,7 @@
"SCANNING_PERCENT_EXPLAIN": "Scan completed percentage is calculated as # of successfully scanned images / total number of images referenced within the image index.",
"TOOLTIPS_TITLE": "{{totalVulnerability}} of {{totalPackages}} {{package}} have known {{vulnerability}}.",
"TOOLTIPS_TITLE_SINGULAR": "{{totalVulnerability}} of {{totalPackages}} {{package}} has known {{vulnerability}}.",
"TOOLTIPS_TITLE_ZERO": "No recognizable vulnerability found"
"TOOLTIPS_TITLE_ZERO": "No recognizable vulnerability detected"
},
"SEVERITY": {
"CRITICAL": "Critical",

2
src/portal/src/i18n/lang/es-es-lang.json
View File

@ -997,7 +997,7 @@
"SCANNING_PERCENT_EXPLAIN": "Scan completed percentage is calculated as # of successfully scanned images / total number of images referenced within the image index.",
"TOOLTIPS_TITLE": "{{totalVulnerability}} of {{totalPackages}} {{package}} have known {{vulnerability}}.",
"TOOLTIPS_TITLE_SINGULAR": "{{totalVulnerability}} of {{totalPackages}} {{package}} has known {{vulnerability}}.",
"TOOLTIPS_TITLE_ZERO": "No recognizable vulnerability found"
"TOOLTIPS_TITLE_ZERO": "No recognizable vulnerability detected"
},
"SEVERITY": {
"CRITICAL": "Critical",

2
src/portal/src/i18n/lang/fr-fr-lang.json
View File

@ -970,7 +970,7 @@
"SCANNING_PERCENT_EXPLAIN": "Scan completed percentage is calculated as # of successfully scanned images / total number of images referenced within the image index.",
"TOOLTIPS_TITLE": "{{totalVulnerability}} de {{totalPackages}} {{package}} ont des {{vulnerability}} connues.",
"TOOLTIPS_TITLE_SINGULAR": "{{totalVulnerability}} de {{totalPackages}} {{package}} a des {{vulnerability}} connues.",
"TOOLTIPS_TITLE_ZERO": "No recognizable vulnerability found"
"TOOLTIPS_TITLE_ZERO": "No recognizable vulnerability detected"
},
"SEVERITY": {
"CRITICAL": "Critique",

2
src/portal/src/i18n/lang/pt-br-lang.json
View File

@ -993,7 +993,7 @@
"SCANNING_PERCENT_EXPLAIN": "Scan completed percentage is calculated as # of successfully scanned images / total number of images referenced within the image index.",
"TOOLTIPS_TITLE": "{{totalVulnerability}} de {{totalPackages}} {{package}} possuem {{vulnerability}}.",
"TOOLTIPS_TITLE_SINGULAR": "{{totalVulnerability}} de {{totalPackages}} {{package}} possuem {{vulnerability}}.",
"TOOLTIPS_TITLE_ZERO": "No recognizable vulnerability found"
"TOOLTIPS_TITLE_ZERO": "No recognizable vulnerability detected"
},
"SEVERITY": {
"CRITICAL": "Crítico",

2
src/portal/src/i18n/lang/tr-tr-lang.json
View File

@ -997,7 +997,7 @@
"SCANNING_PERCENT_EXPLAIN": "Scan completed percentage is calculated as # of successfully scanned images / total number of images referenced within the image index.",
"TOOLTIPS_TITLE": "{{totalVulnerability}} 'nın {{totalPackages}} {{package}} bilinen {{vulnerability}}.",
"TOOLTIPS_TITLE_SINGULAR": "{{totalVulnerability}} 'nın {{totalPackages}} {{package}} bilinen {{vulnerability}}.",
"TOOLTIPS_TITLE_ZERO": "No recognizable vulnerability found"
"TOOLTIPS_TITLE_ZERO": "No recognizable vulnerability detected"
},
"SEVERITY": {
"CRITICAL": "Kritik",

2
src/portal/src/i18n/lang/zh-cn-lang.json
View File

@ -997,7 +997,7 @@
"SCANNING_PERCENT_EXPLAIN": "扫描完成度是扫描成功的镜像数与总共需要扫描的镜像数的比值，总共需要的扫描的镜像不包含 Index 。",
"TOOLTIPS_TITLE": "{{totalPackages}}个{{package}}中的{{totalVulnerability}}个含有{{vulnerability}}。",
"TOOLTIPS_TITLE_SINGULAR": "{{totalPackages}}个{{package}}中的{{totalVulnerability}}个含有{{vulnerability}}。",
"TOOLTIPS_TITLE_ZERO": "没有发现可识别的漏洞"
"TOOLTIPS_TITLE_ZERO": "没有检测到可识别的漏洞"
},
"SEVERITY": {
"CRITICAL": "危急",

6
src/portal/src/lib/components/create-edit-rule/create-edit-rule.component.scss
View File

@ -102,10 +102,6 @@ h4 {
top: 8px;
}
.is-solid {
cursor: pointer;
}
.selectBox {
position: absolute;
width: 100%;
@ -296,4 +292,4 @@ clr-modal {
padding: 0;
}
}
}
}