feat: rename certificate props 'issuer' to 'issuerOrg'

internal/domain/certificate.go

@@ -20,7 +20,7 @@ type Certificate struct {
 	SerialNumber      string                      `json:"serialNumber" db:"serialNumber"`
 	Certificate       string                      `json:"certificate" db:"certificate"`
 	PrivateKey        string                      `json:"privateKey" db:"privateKey"`
-	Issuer            string                      `json:"issuer" db:"issuer"`
+	IssuerOrg         string                      `json:"issuerOrg" db:"issuerOrg"`
 	IssuerCertificate string                      `json:"issuerCertificate" db:"issuerCertificate"`
 	KeyAlgorithm      CertificateKeyAlgorithmType `json:"keyAlgorithm" db:"keyAlgorithm"`
 	EffectAt          time.Time                   `json:"effectAt" db:"effectAt"`
@@ -38,7 +38,7 @@ type Certificate struct {
 func (c *Certificate) PopulateFromX509(certX509 *x509.Certificate) *Certificate {
 	c.SubjectAltNames = strings.Join(certX509.DNSNames, ";")
 	c.SerialNumber = strings.ToUpper(certX509.SerialNumber.Text(16))
-	c.Issuer = strings.Join(certX509.Issuer.Organization, ";")
+	c.IssuerOrg = strings.Join(certX509.Issuer.Organization, ";")
 	c.EffectAt = certX509.NotBefore
 	c.ExpireAt = certX509.NotAfter
 

internal/repository/certificate.go

@@ -101,7 +101,7 @@ func (r *CertificateRepository) Save(ctx context.Context, certificate *domain.Ce
 	record.Set("serialNumber", certificate.SerialNumber)
 	record.Set("certificate", certificate.Certificate)
 	record.Set("privateKey", certificate.PrivateKey)
-	record.Set("issuer", certificate.Issuer)
+	record.Set("issuerOrg", certificate.IssuerOrg)
 	record.Set("issuerCertificate", certificate.IssuerCertificate)
 	record.Set("keyAlgorithm", string(certificate.KeyAlgorithm))
 	record.Set("effectAt", certificate.EffectAt)
@@ -162,7 +162,7 @@ func (r *CertificateRepository) castRecordToModel(record *core.Record) (*domain.
 		SerialNumber:      record.GetString("serialNumber"),
 		Certificate:       record.GetString("certificate"),
 		PrivateKey:        record.GetString("privateKey"),
-		Issuer:            record.GetString("issuer"),
+		IssuerOrg:         record.GetString("issuerOrg"),
 		IssuerCertificate: record.GetString("issuerCertificate"),
 		KeyAlgorithm:      domain.CertificateKeyAlgorithmType(record.GetString("keyAlgorithm")),
 		EffectAt:          record.GetDateTime("effectAt").Time(),

migrations/1747389600_upgrade.go

@@ -7,6 +7,35 @@ import (
 
 func init() {
 	m.Register(func(app core.App) error {
+		// update collection `certificate`
+		{
+			collection, err := app.FindCollectionByNameOrId("4szxr9x43tpj6np")
+			if err != nil {
+				return err
+			}
+
+			if err := collection.Fields.AddMarshaledJSONAt(6, []byte(`{
+				"autogeneratePattern": "",
+				"hidden": false,
+				"id": "text2910474005",
+				"max": 0,
+				"min": 0,
+				"name": "issuerOrg",
+				"pattern": "",
+				"presentable": false,
+				"primaryKey": false,
+				"required": false,
+				"system": false,
+				"type": "text"
+			}`)); err != nil {
+				return err
+			}
+
+			if err := app.Save(collection); err != nil {
+				return err
+			}
+		}
+
 		// migrate data
 		{
 			accesses, err := app.FindAllRecords("access")

ui/src/components/certificate/CertificateDetail.tsx

@@ -42,7 +42,7 @@ const CertificateDetail = ({ data, ...props }: CertificateDetailProps) => {
         </Form.Item>
 
         <Form.Item label={t("certificate.props.issuer")}>
-          <Input value={data.issuer} variant="filled" placeholder="" />
+          <Input value={data.issuerOrg} variant="filled" placeholder="" />
         </Form.Item>
 
         <Form.Item label={t("certificate.props.validity")}>

ui/src/domain/certificate.ts

@@ -6,7 +6,7 @@ export interface CertificateModel extends BaseModel {
   serialNumber: string;
   certificate: string;
   privateKey: string;
-  issuer: string;
+  issuerOrg: string;
   keyAlgorithm: string;
   effectAt: ISO8601String;
   expireAt: ISO8601String;

ui/src/pages/certificates/CertificateList.tsx

@@ -126,11 +126,11 @@ const CertificateList = () => {
       },
     },
     {
-      key: "issuer",
+      key: "brand",
       title: t("certificate.props.brand"),
       render: (_, record) => (
         <Space className="max-w-full" direction="vertical" size={4}>
-          <Typography.Text>{record.issuer}</Typography.Text>
+          <Typography.Text>{record.issuerOrg}</Typography.Text>
           <Typography.Text>{record.keyAlgorithm}</Typography.Text>
         </Space>
       ),