diff --git a/ui/src/components/certificate/CertificateDetail.tsx b/ui/src/components/certificate/CertificateDetail.tsx
index b8d502719..4c87c84e2 100644
--- a/ui/src/components/certificate/CertificateDetail.tsx
+++ b/ui/src/components/certificate/CertificateDetail.tsx
@@ -22,12 +22,20 @@ const CertificateDetail = ({ data, ...props }: CertificateDetailProps) => {
return (
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
diff --git a/ui/src/i18n/resources/en/nls.certificate.json b/ui/src/i18n/resources/en/nls.certificate.json
index 7a0c2eb0e..b16244656 100644
--- a/ui/src/i18n/resources/en/nls.certificate.json
+++ b/ui/src/i18n/resources/en/nls.certificate.json
@@ -93,9 +93,9 @@
},
"props": {
- "subject_alt_names": "Name",
+ "name": "Name",
"validity": {
- "": "Expiry",
+ "": "Validity period",
"left_days": "{{left}} / {{total}} days left",
"less_than_a_day": "≤1 / {{total}} days left",
"expired": "Expired",
@@ -106,18 +106,21 @@
"expired": "Expired"
}
},
- "brand": "Brand",
"source": {
"": "Source",
"request": "Request",
"upload": "Upload"
},
+ "brand": "Brand",
"revoked": "Revoked",
"certificate": "Certificate chain",
"private_key": "Private key",
"serial_number": "Serial number",
+ "subject_name": "Subject common name",
+ "subject_alt_names": "Subject alternative names",
+ "issuer_name": "Issuer common name",
+ "issuer_org": "Issuer organization",
"key_algorithm": "Key algorithm",
- "issuer": "Issuer",
"created_at": "Created at",
"updated_at": "Updated at"
}
diff --git a/ui/src/i18n/resources/zh/nls.certificate.json b/ui/src/i18n/resources/zh/nls.certificate.json
index eba234321..8af563a82 100644
--- a/ui/src/i18n/resources/zh/nls.certificate.json
+++ b/ui/src/i18n/resources/zh/nls.certificate.json
@@ -93,7 +93,7 @@
},
"props": {
- "subject_alt_names": "名称",
+ "name": "名称",
"validity": {
"": "有效期限",
"left_days": "{{left}} / {{total}} 天",
@@ -106,18 +106,21 @@
"expired": "已过期"
}
},
- "brand": "证书品牌",
"source": {
"": "来源",
"request": "申请",
"upload": "上传"
},
+ "brand": "证书品牌",
"revoked": "已吊销",
"certificate": "证书内容",
"private_key": "私钥内容",
"serial_number": "证书序列号",
+ "subject_name": "主题通用名称",
+ "subject_alt_names": "主题备用名称",
+ "issuer_name": "颁发者通用名称",
+ "issuer_org": "颁发者组织",
"key_algorithm": "私钥算法",
- "issuer": "颁发者",
"created_at": "创建时间",
"updated_at": "更新时间"
}
diff --git a/ui/src/pages/certificates/CertificateList.tsx b/ui/src/pages/certificates/CertificateList.tsx
index 46bca4cef..3fbf889ec 100644
--- a/ui/src/pages/certificates/CertificateList.tsx
+++ b/ui/src/pages/certificates/CertificateList.tsx
@@ -57,8 +57,10 @@ const CertificateList = () => {
const tableColumns: TableProps["columns"] = [
{
key: "name",
- title: t("certificate.props.subject_alt_names"),
- render: (_, record) => {record.subjectAltNames},
+ title: t("certificate.props.name"),
+ render: (_, record) => {
+ return {record.subjectAltNames.split(";").join("; ")};
+ },
},
{
key: "validity",
@@ -108,7 +110,10 @@ const CertificateList = () => {
render: (_, record) => (
{record.issuerOrg || "\u00A0"}
- {record.keyAlgorithm || "\u00A0"}
+
+ {record.keyAlgorithm || "\u00A0"}
+ {record.validationPolicy}
+
),
},
diff --git a/ui/src/repository/certificate.ts b/ui/src/repository/certificate.ts
index bfc5622a4..331d51772 100644
--- a/ui/src/repository/certificate.ts
+++ b/ui/src/repository/certificate.ts
@@ -9,10 +9,13 @@ const pbco = pb.collection(COLLECTION_NAME_CERTIFICATE);
const _commonFields = [
"id",
"source",
- "subjectAltNames",
"serialNumber",
+ "subjectName",
+ "subjectAltNames",
+ "issuerName",
"issuerOrg",
"keyAlgorithm",
+ "validationPolicy",
"validityNotBefore",
"validityNotAfter",
"validityInterval",