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

Add two columns to display capability type for scanner (#20111) 

Signed-off-by: xuelichao <xuel@vmware.com>
Signed-off-by: Lichao Xue <68891670+xuelichao@users.noreply.github.com>
Co-authored-by: Wang Yan <wangyan@vmware.com>
This commit is contained in:
Lichao Xue 2024-03-26 14:36:18 +08:00 committed by GitHub
parent fd81e7c43e
commit aa4a142bc1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
11 changed files with 74 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/portal/src/app/base/left-side-nav/interrogation-services/scanner/config-scanner.component.html
View File

@ -139,9 +139,21 @@
<clr-dg-column class="width-240" [clrDgField]="'url'">{{
'SCANNER.ENDPOINT' | translate
}}</clr-dg-column>
<clr-dg-column>{{ 'SCANNER.HEALTH' | translate }}</clr-dg-column>
<clr-dg-column>{{ 'SCANNER.ENABLED' | translate }}</clr-dg-column>
<clr-dg-column>{{ 'SCANNER.AUTH' | translate }}</clr-dg-column>
<clr-dg-column class="width-120">{{
'SCANNER.HEALTH' | translate
}}</clr-dg-column>
<clr-dg-column class="width-120">{{
'SCANNER.ENABLED' | translate
}}</clr-dg-column>
<clr-dg-column class="width-120">{{
'SCANNER.AUTH' | translate
}}</clr-dg-column>
<clr-dg-column class="width-120">{{
'SCANNER.VULNERABILITY' | translate
}}</clr-dg-column>
<clr-dg-column class="width-120">{{
'SCANNER.SBOM' | translate
}}</clr-dg-column>
<clr-dg-column>{{
'SCANNER.DESCRIPTION' | translate
}}</clr-dg-column>
@ -198,6 +210,18 @@
<clr-dg-cell>{{
scanner.auth ? scanner.auth : 'None'
}}</clr-dg-cell>
<clr-dg-cell>{{
(supportCapability(scanner, 'vulnerability')
? 'SCANNER.SUPPORTED'
: 'SCANNER.NOT_SUPPORTED'
) | translate
}}</clr-dg-cell>
<clr-dg-cell>{{
(supportCapability(scanner, 'sbom')
? 'SCANNER.SUPPORTED'
: 'SCANNER.NOT_SUPPORTED'
) | translate
}}</clr-dg-cell>
<clr-dg-cell>{{ scanner.description }}</clr-dg-cell>
<scanner-metadata
*clrIfExpanded

4
src/portal/src/app/base/left-side-nav/interrogation-services/scanner/config-scanner.component.scss
View File

@ -18,6 +18,10 @@
min-width: 240px !important;
}
.width-120 {
min-width: 120px !important;
}
.margin-top-0 {
margin-top: 0;
}

11
src/portal/src/app/base/left-side-nav/interrogation-services/scanner/config-scanner.component.ts
View File

@ -178,6 +178,17 @@ export class ConfigurationScannerComponent implements OnInit, OnDestroy {
addSuccess() {
this.getScanners();
}
supportCapability(scanner: Scanner, capabilityType: string): boolean {
return scanner && scanner.metadata && capabilityType
? (
scanner?.metadata?.capabilities?.filter(
({ type }) => type === capabilityType
) ?? []
).length >= 1
: false;
}
changeStat() {
if (this.selectedRow) {
let scanner: ScannerRegistrationReq = clone(this.selectedRow);

4
src/portal/src/i18n/lang/de-de-lang.json
View File

@ -1433,6 +1433,10 @@
"NAME_REQUIRED": "Name ist erforderlich",
"NAME_REX": "Der Name muss mindestens 2 Zeichen lang sein. Mit Kleinbuchstaben, Ziffern und ._-. Er muss mit Buchstaben oder Ziffern beginnen.",
"DESCRIPTION": "Beschreibung",
"SBOM": "SBOM",
"VULNERABILITY": "Vulnerability",
"SUPPORTED": "Supported",
"NOT_SUPPORTED": "Not Supported",
"ENDPOINT": "Endpunkt",
"ENDPOINT_EXISTS": "URL existiert bereits",
"ENDPOINT_REQUIRED": "URL ist erforderlich",

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

@ -1434,6 +1434,10 @@
"NAME_REQUIRED": "Name is required",
"NAME_REX": "Name should be at least 2 characters long with lower case characters, numbers and ._- and must be start with characters or numbers.",
"DESCRIPTION": "Description",
"SBOM": "SBOM",
"VULNERABILITY": "Vulnerability",
"SUPPORTED": "Supported",
"NOT_SUPPORTED": "Not Supported",
"ENDPOINT": "Endpoint",
"ENDPOINT_EXISTS": "EndpointUrl already exists",
"ENDPOINT_REQUIRED": "EndpointUrl is required",

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

@ -1430,6 +1430,10 @@
"NAME_REQUIRED": "Name is required",
"NAME_REX": "Name should be at least 2 characters long with lower case characters, numbers and ._- and must be start with characters or numbers.",
"DESCRIPTION": "Description",
"SBOM": "SBOM",
"VULNERABILITY": "Vulnerability",
"SUPPORTED": "Supported",
"NOT_SUPPORTED": "Not Supported",
"ENDPOINT": "Endpoint",
"ENDPOINT_EXISTS": "EndpointUrl already exists",
"ENDPOINT_REQUIRED": "EndpointUrl is required",

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

@ -1431,6 +1431,10 @@
"NAME_REQUIRED": "Le nom est requis",
"NAME_REX": "Le nom doit comporter au moins 2 caractères avec des minuscules, des chiffres et. _- et doit commencer par des caractères ou des chiffres.",
"DESCRIPTION": "Description",
"SBOM": "SBOM",
"VULNERABILITY": "Vulnerability",
"SUPPORTED": "Supported",
"NOT_SUPPORTED": "Not Supported",
"ENDPOINT": "Endpoint",
"ENDPOINT_EXISTS": "L'URL de l'endpoint existe déjà",
"ENDPOINT_REQUIRED": "L'URL de l'endpoint est requise",

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

@ -1430,6 +1430,10 @@
"NAME_REQUIRED": "Nome é obrigatório",
"NAME_REX": "O nome precisa ter no mínimo 2 caracteres. Pode conter apenas letras minúsculas, numeros, ou símbolos ._- e deve começar por uma letra ou número.",
"DESCRIPTION": "Descrição",
"SBOM": "SBOM",
"VULNERABILITY": "Vulnerability",
"SUPPORTED": "Supported",
"NOT_SUPPORTED": "Not Supported",
"ENDPOINT": "Endereço",
"ENDPOINT_EXISTS": "Endereço já usado por outro examinador",
"ENDPOINT_REQUIRED": "Endereço é obrigatório",

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

@ -1433,6 +1433,10 @@
"NAME_REQUIRED": "Name is required",
"NAME_REX": "Name should be at least 2 characters long with lower case characters, numbers and ._- and must be start with characters or numbers.",
"DESCRIPTION": "Description",
"SBOM": "SBOM",
"VULNERABILITY": "Vulnerability",
"SUPPORTED": "Supported",
"NOT_SUPPORTED": "Not Supported",
"ENDPOINT": "Endpoint",
"ENDPOINT_EXISTS": "EndpointUrl already exists",
"ENDPOINT_REQUIRED": "EndpointUrl is required",

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

@ -1429,6 +1429,10 @@
"NAME_REQUIRED": "名称为必填项",
"NAME_REX": "名称由小写字符、数字和._-组成且至少2个字符并以字符或者数字开头。",
"DESCRIPTION": "描述",
"SBOM": "SBOM",
"VULNERABILITY": "Vulnerability",
"SUPPORTED": "Supported",
"NOT_SUPPORTED": "Not Supported",
"ENDPOINT": "地址",
"ENDPOINT_EXISTS": "地址已存在",
"ENDPOINT_REQUIRED": "地址为必填项",

4
src/portal/src/i18n/lang/zh-tw-lang.json
View File

@ -1428,6 +1428,10 @@
"NAME_REQUIRED": "名稱必填",
"NAME_REX": "名稱必須由小寫字母、數字和 ._- 組成，至少2個字元，並且必須以字母或數字開頭。",
"DESCRIPTION": "描述",
"SBOM": "SBOM",
"VULNERABILITY": "Vulnerability",
"SUPPORTED": "Supported",
"NOT_SUPPORTED": "Not Supported",
"ENDPOINT": "端點",
"ENDPOINT_EXISTS": "端點 URL 已存在",
"ENDPOINT_REQUIRED": "端點 URL 必填",