mirror of
https://github.com/goharbor/harbor
synced 2024-09-20 11:45:38 +00:00
Wrong values shown for the columns of support_sbom and support_vulnerability in scanner list (#20308)
Fix wrong value shown for the columns of support_sbom and support_vulnerability in scanner list Signed-off-by: xuelichao <xuel@vmware.com>
This commit is contained in:
parent
d759429831
commit
e7fce62723
|
@ -180,12 +180,8 @@ export class ConfigurationScannerComponent implements OnInit, OnDestroy {
|
||||||
}
|
}
|
||||||
|
|
||||||
supportCapability(scanner: Scanner, capabilityType: string): boolean {
|
supportCapability(scanner: Scanner, capabilityType: string): boolean {
|
||||||
return scanner && scanner.metadata && capabilityType
|
return scanner && scanner.capabilities && capabilityType
|
||||||
? (
|
? scanner?.capabilities?.[`support_${capabilityType}`] ?? false
|
||||||
scanner?.metadata?.capabilities?.filter(
|
|
||||||
({ type }) => type === capabilityType
|
|
||||||
) ?? []
|
|
||||||
).length >= 1
|
|
||||||
: false;
|
: false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -19,21 +19,44 @@
|
||||||
<div class="clr-control-label">
|
<div class="clr-control-label">
|
||||||
{{ 'SCANNER.CAPABILITIES' | translate }}
|
{{ 'SCANNER.CAPABILITIES' | translate }}
|
||||||
</div>
|
</div>
|
||||||
<div class="ml-1">
|
<div
|
||||||
<span>{{ 'SCANNER.CONSUMES_MIME_TYPES_COLON' | translate }}</span>
|
class="ml-1"
|
||||||
<span
|
*ngFor="let item of scannerMetadata?.capabilities; let i = index">
|
||||||
class="ml-1"
|
{{ i }}:
|
||||||
[innerHTML]="
|
<div class="ml-1">
|
||||||
toString(scannerMetadata?.capabilities[0]?.consumes_mime_types)
|
<span>{{ 'SCANNER.CONSUMES_MIME_TYPES_COLON' | translate }}</span>
|
||||||
"></span>
|
<span
|
||||||
</div>
|
class="ml-1"
|
||||||
<div class="ml-1">
|
[innerHTML]="
|
||||||
<span>{{ 'SCANNER.PRODUCTS_MIME_TYPES_COLON' | translate }}</span>
|
toString(
|
||||||
<span
|
scannerMetadata?.capabilities[i]?.consumes_mime_types
|
||||||
class="ml-1"
|
)
|
||||||
[innerHTML]="
|
"></span>
|
||||||
toString(scannerMetadata?.capabilities[0]?.produces_mime_types)
|
</div>
|
||||||
"></span>
|
<div class="ml-1">
|
||||||
|
<span>{{ 'SCANNER.PRODUCTS_MIME_TYPES_COLON' | translate }}</span>
|
||||||
|
<span
|
||||||
|
class="ml-1"
|
||||||
|
[innerHTML]="
|
||||||
|
toString(
|
||||||
|
scannerMetadata?.capabilities[i]?.produces_mime_types
|
||||||
|
)
|
||||||
|
"></span>
|
||||||
|
</div>
|
||||||
|
<div class="ml-1" *ngIf="scannerMetadata?.capabilities[i]?.type">
|
||||||
|
<span>{{ 'SCANNER.CAPABILITIES_TYPE' | translate }}</span>
|
||||||
|
<span class="ml-1">
|
||||||
|
{{
|
||||||
|
(scannerMetadata?.capabilities[i]?.type === 'sbom'
|
||||||
|
? 'SCANNER.SBOM'
|
||||||
|
: scannerMetadata?.capabilities[i]?.type ===
|
||||||
|
'vulnerability'
|
||||||
|
? 'SCANNER.VULNERABILITY'
|
||||||
|
: scannerMetadata?.capabilities[i]?.type
|
||||||
|
) | translate
|
||||||
|
}}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="clr-control-label">{{ 'SCANNER.PROPERTIES' | translate }}</div>
|
<div class="clr-control-label">{{ 'SCANNER.PROPERTIES' | translate }}</div>
|
||||||
<div
|
<div
|
||||||
|
|
|
@ -1503,9 +1503,10 @@
|
||||||
"NAME_COLON": "Name:",
|
"NAME_COLON": "Name:",
|
||||||
"VENDOR_COLON": "Hersteller:",
|
"VENDOR_COLON": "Hersteller:",
|
||||||
"VERSION_COLON": "Version:",
|
"VERSION_COLON": "Version:",
|
||||||
"CAPABILITIES": "Fähigkeiten",
|
"CAPABILITIES": "Fähigkeiten:",
|
||||||
"CONSUMES_MIME_TYPES_COLON": "Benötigt Mime Types:",
|
"CONSUMES_MIME_TYPES_COLON": "Benötigt Mime Types:",
|
||||||
"PRODUCTS_MIME_TYPES_COLON": "Erzeugt Mime Types:",
|
"PRODUCTS_MIME_TYPES_COLON": "Erzeugt Mime Types:",
|
||||||
|
"CAPABILITIES_TYPE": "Type:",
|
||||||
"PROPERTIES": "Eigenschaften",
|
"PROPERTIES": "Eigenschaften",
|
||||||
"NEW_SCANNER": "NEUER SCANNER",
|
"NEW_SCANNER": "NEUER SCANNER",
|
||||||
"SET_AS_DEFAULT": "ALS STANDARD SETZEN",
|
"SET_AS_DEFAULT": "ALS STANDARD SETZEN",
|
||||||
|
|
|
@ -1504,9 +1504,10 @@
|
||||||
"NAME_COLON": "Name:",
|
"NAME_COLON": "Name:",
|
||||||
"VENDOR_COLON": "Vendor:",
|
"VENDOR_COLON": "Vendor:",
|
||||||
"VERSION_COLON": "Version:",
|
"VERSION_COLON": "Version:",
|
||||||
"CAPABILITIES": "Capabilities",
|
"CAPABILITIES": "Capabilities:",
|
||||||
"CONSUMES_MIME_TYPES_COLON": "Consumes Mime Types:",
|
"CONSUMES_MIME_TYPES_COLON": "Consumes Mime Types:",
|
||||||
"PRODUCTS_MIME_TYPES_COLON": "Produces Mime Types:",
|
"PRODUCTS_MIME_TYPES_COLON": "Produces Mime Types:",
|
||||||
|
"CAPABILITIES_TYPE": "Type:",
|
||||||
"PROPERTIES": "Properties",
|
"PROPERTIES": "Properties",
|
||||||
"NEW_SCANNER": "NEW SCANNER",
|
"NEW_SCANNER": "NEW SCANNER",
|
||||||
"SET_AS_DEFAULT": "SET AS DEFAULT",
|
"SET_AS_DEFAULT": "SET AS DEFAULT",
|
||||||
|
|
|
@ -1500,9 +1500,10 @@
|
||||||
"NAME_COLON": "Name:",
|
"NAME_COLON": "Name:",
|
||||||
"VENDOR_COLON": "Vendor:",
|
"VENDOR_COLON": "Vendor:",
|
||||||
"VERSION_COLON": "Version:",
|
"VERSION_COLON": "Version:",
|
||||||
"CAPABILITIES": "Capabilities",
|
"CAPABILITIES": "Capabilities:",
|
||||||
"CONSUMES_MIME_TYPES_COLON": "Consumes Mime Types:",
|
"CONSUMES_MIME_TYPES_COLON": "Consumes Mime Types:",
|
||||||
"PRODUCTS_MIME_TYPES_COLON": "Produces Mime Types:",
|
"PRODUCTS_MIME_TYPES_COLON": "Produces Mime Types:",
|
||||||
|
"CAPABILITIES_TYPE": "Type:",
|
||||||
"PROPERTIES": "Properties",
|
"PROPERTIES": "Properties",
|
||||||
"NEW_SCANNER": "NEW SCANNER",
|
"NEW_SCANNER": "NEW SCANNER",
|
||||||
"SET_AS_DEFAULT": "SET AS DEFAULT",
|
"SET_AS_DEFAULT": "SET AS DEFAULT",
|
||||||
|
|
|
@ -1501,9 +1501,10 @@
|
||||||
"NAME_COLON": "Nom :",
|
"NAME_COLON": "Nom :",
|
||||||
"VENDOR_COLON": "Vendeur :",
|
"VENDOR_COLON": "Vendeur :",
|
||||||
"VERSION_COLON": "Version :",
|
"VERSION_COLON": "Version :",
|
||||||
"CAPABILITIES": "Capacités",
|
"CAPABILITIES": "Capacités:",
|
||||||
"CONSUMES_MIME_TYPES_COLON": "Consomme les types Mime :",
|
"CONSUMES_MIME_TYPES_COLON": "Consomme les types Mime :",
|
||||||
"PRODUCTS_MIME_TYPES_COLON": "Produit les types Mime :",
|
"PRODUCTS_MIME_TYPES_COLON": "Produit les types Mime :",
|
||||||
|
"CAPABILITIES_TYPE": "Type:",
|
||||||
"PROPERTIES": "Propriétés",
|
"PROPERTIES": "Propriétés",
|
||||||
"NEW_SCANNER": "Nouveau scanneur",
|
"NEW_SCANNER": "Nouveau scanneur",
|
||||||
"SET_AS_DEFAULT": "PAR DEFAUT",
|
"SET_AS_DEFAULT": "PAR DEFAUT",
|
||||||
|
|
|
@ -1497,9 +1497,10 @@
|
||||||
"NAME_COLON": "이름:",
|
"NAME_COLON": "이름:",
|
||||||
"VENDOR_COLON": "Vendor:",
|
"VENDOR_COLON": "Vendor:",
|
||||||
"VERSION_COLON": "버전:",
|
"VERSION_COLON": "버전:",
|
||||||
"CAPABILITIES": "기능",
|
"CAPABILITIES": "기능:",
|
||||||
"CONSUMES_MIME_TYPES_COLON": "Mime 유형 사용:",
|
"CONSUMES_MIME_TYPES_COLON": "Mime 유형 사용:",
|
||||||
"PRODUCTS_MIME_TYPES_COLON": "Mime 유형 제공:",
|
"PRODUCTS_MIME_TYPES_COLON": "Mime 유형 제공:",
|
||||||
|
"CAPABILITIES_TYPE": "Type:",
|
||||||
"PROPERTIES": "속성",
|
"PROPERTIES": "속성",
|
||||||
"NEW_SCANNER": "새 스캐너",
|
"NEW_SCANNER": "새 스캐너",
|
||||||
"SET_AS_DEFAULT": "기본으로 설정",
|
"SET_AS_DEFAULT": "기본으로 설정",
|
||||||
|
|
|
@ -1500,9 +1500,10 @@
|
||||||
"NAME_COLON": "Nome:",
|
"NAME_COLON": "Nome:",
|
||||||
"VENDOR_COLON": "Fornecedor:",
|
"VENDOR_COLON": "Fornecedor:",
|
||||||
"VERSION_COLON": "Versão:",
|
"VERSION_COLON": "Versão:",
|
||||||
"CAPABILITIES": "Habilidades",
|
"CAPABILITIES": "Habilidades:",
|
||||||
"CONSUMES_MIME_TYPES_COLON": "Consome estes Mime Types:",
|
"CONSUMES_MIME_TYPES_COLON": "Consome estes Mime Types:",
|
||||||
"PRODUCTS_MIME_TYPES_COLON": "Produz estes Mime Types:",
|
"PRODUCTS_MIME_TYPES_COLON": "Produz estes Mime Types:",
|
||||||
|
"CAPABILITIES_TYPE": "Type:",
|
||||||
"PROPERTIES": "Propriedades",
|
"PROPERTIES": "Propriedades",
|
||||||
"NEW_SCANNER": "NOVO EXAMINADOR",
|
"NEW_SCANNER": "NOVO EXAMINADOR",
|
||||||
"SET_AS_DEFAULT": "DEFINIR COMO PADRÃO",
|
"SET_AS_DEFAULT": "DEFINIR COMO PADRÃO",
|
||||||
|
|
|
@ -1503,9 +1503,10 @@
|
||||||
"NAME_COLON": "Name:",
|
"NAME_COLON": "Name:",
|
||||||
"VENDOR_COLON": "Vendor:",
|
"VENDOR_COLON": "Vendor:",
|
||||||
"VERSION_COLON": "Version:",
|
"VERSION_COLON": "Version:",
|
||||||
"CAPABILITIES": "Capabilities",
|
"CAPABILITIES": "Capabilities:",
|
||||||
"CONSUMES_MIME_TYPES_COLON": "Consumes Mime Types:",
|
"CONSUMES_MIME_TYPES_COLON": "Consumes Mime Types:",
|
||||||
"PRODUCTS_MIME_TYPES_COLON": "Produces Mime Types:",
|
"PRODUCTS_MIME_TYPES_COLON": "Produces Mime Types:",
|
||||||
|
"CAPABILITIES_TYPE": "Type:",
|
||||||
"PROPERTIES": "Properties",
|
"PROPERTIES": "Properties",
|
||||||
"NEW_SCANNER": "NEW SCANNER",
|
"NEW_SCANNER": "NEW SCANNER",
|
||||||
"SET_AS_DEFAULT": "SET AS DEFAULT",
|
"SET_AS_DEFAULT": "SET AS DEFAULT",
|
||||||
|
|
|
@ -1499,9 +1499,10 @@
|
||||||
"NAME_COLON": "Name:",
|
"NAME_COLON": "Name:",
|
||||||
"VENDOR_COLON": "Vendor:",
|
"VENDOR_COLON": "Vendor:",
|
||||||
"VERSION_COLON": "Version:",
|
"VERSION_COLON": "Version:",
|
||||||
"CAPABILITIES": "Capabilities",
|
"CAPABILITIES": "Capabilities:",
|
||||||
"CONSUMES_MIME_TYPES_COLON": "Consumes Mime Types:",
|
"CONSUMES_MIME_TYPES_COLON": "Consumes Mime Types:",
|
||||||
"PRODUCTS_MIME_TYPES_COLON": "Produces Mime Types:",
|
"PRODUCTS_MIME_TYPES_COLON": "Produces Mime Types:",
|
||||||
|
"CAPABILITIES_TYPE": "Type:",
|
||||||
"PROPERTIES": "Properties",
|
"PROPERTIES": "Properties",
|
||||||
"NEW_SCANNER": "新建扫描器",
|
"NEW_SCANNER": "新建扫描器",
|
||||||
"SET_AS_DEFAULT": "设为默认",
|
"SET_AS_DEFAULT": "设为默认",
|
||||||
|
|
|
@ -1498,9 +1498,10 @@
|
||||||
"NAME_COLON": "名稱:",
|
"NAME_COLON": "名稱:",
|
||||||
"VENDOR_COLON": "供應商:",
|
"VENDOR_COLON": "供應商:",
|
||||||
"VERSION_COLON": "版本:",
|
"VERSION_COLON": "版本:",
|
||||||
"CAPABILITIES": "功能",
|
"CAPABILITIES": "功能:",
|
||||||
"CONSUMES_MIME_TYPES_COLON": "可處理的 MIME 類型:",
|
"CONSUMES_MIME_TYPES_COLON": "可處理的 MIME 類型:",
|
||||||
"PRODUCTS_MIME_TYPES_COLON": "產出的 MIME 類型:",
|
"PRODUCTS_MIME_TYPES_COLON": "產出的 MIME 類型:",
|
||||||
|
"CAPABILITIES_TYPE": "Type:",
|
||||||
"PROPERTIES": "屬性",
|
"PROPERTIES": "屬性",
|
||||||
"NEW_SCANNER": "新增掃描器",
|
"NEW_SCANNER": "新增掃描器",
|
||||||
"SET_AS_DEFAULT": "設為預設",
|
"SET_AS_DEFAULT": "設為預設",
|
||||||
|
|
Loading…
Reference in New Issue
Block a user