diff --git a/frontend/src/pages/cert-manager/CertificatesPage/components/CertificateTemplateModal.tsx b/frontend/src/pages/cert-manager/CertificatesPage/components/CertificateTemplateModal.tsx index 477aa0356..86f75f149 100644 --- a/frontend/src/pages/cert-manager/CertificatesPage/components/CertificateTemplateModal.tsx +++ b/frontend/src/pages/cert-manager/CertificatesPage/components/CertificateTemplateModal.tsx @@ -172,7 +172,11 @@ export const CertificateTemplateModal = ({ popUp, handlePopUpToggle, caId }: Pro ttl, keyUsages: Object.entries(keyUsages) .filter(([, value]) => value) - .map(([key]) => key.replace(/_([a-z])/g, (_, letter) => letter.toUpperCase())), + .map(([key]) => + key === CertKeyUsage.CRL_SIGN + ? "cRLSign" + : key.replace(/_([a-z])/g, (_, letter) => letter.toUpperCase()) + ), extendedKeyUsages: Object.entries(extendedKeyUsages) .filter(([, value]) => value) .map(([key]) => key.replace(/_([a-z])/g, (_, letter) => letter.toUpperCase())) @@ -193,7 +197,11 @@ export const CertificateTemplateModal = ({ popUp, handlePopUpToggle, caId }: Pro ttl, keyUsages: Object.entries(keyUsages) .filter(([, value]) => value) - .map(([key]) => key.replace(/_([a-z])/g, (_, letter) => letter.toUpperCase())), + .map(([key]) => + key === CertKeyUsage.CRL_SIGN + ? "cRLSign" + : key.replace(/_([a-z])/g, (_, letter) => letter.toUpperCase()) + ), extendedKeyUsages: Object.entries(extendedKeyUsages) .filter(([, value]) => value) .map(([key]) => key.replace(/_([a-z])/g, (_, letter) => letter.toUpperCase())) diff --git a/frontend/src/pages/cert-manager/PkiSubscribersPage/components/PkiSubscriberModal.tsx b/frontend/src/pages/cert-manager/PkiSubscribersPage/components/PkiSubscriberModal.tsx index 020bf5c6c..52104ed1f 100644 --- a/frontend/src/pages/cert-manager/PkiSubscribersPage/components/PkiSubscriberModal.tsx +++ b/frontend/src/pages/cert-manager/PkiSubscribersPage/components/PkiSubscriberModal.tsx @@ -352,7 +352,9 @@ export const PkiSubscriberModal = ({ popUp, handlePopUpToggle }: Props) => { subjectAlternativeNames: subjectAlternativeNamesList, ttl, keyUsages: keyUsagesList.map((key) => - key.replace(/_([a-z])/g, (_, letter) => letter.toUpperCase()) + key === CertKeyUsage.CRL_SIGN + ? "cRLSign" + : key.replace(/_([a-z])/g, (_, letter) => letter.toUpperCase()) ), extendedKeyUsages: extendedKeyUsagesList.map((key) => key.replace(/_([a-z])/g, (_, letter) => letter.toUpperCase()) @@ -370,7 +372,9 @@ export const PkiSubscriberModal = ({ popUp, handlePopUpToggle }: Props) => { subjectAlternativeNames: subjectAlternativeNamesList, ttl, keyUsages: keyUsagesList.map((key) => - key.replace(/_([a-z])/g, (_, letter) => letter.toUpperCase()) + key === CertKeyUsage.CRL_SIGN + ? "cRLSign" + : key.replace(/_([a-z])/g, (_, letter) => letter.toUpperCase()) ), extendedKeyUsages: extendedKeyUsagesList.map((key) => key.replace(/_([a-z])/g, (_, letter) => letter.toUpperCase()) diff --git a/frontend/src/pages/cert-manager/PkiTemplateListPage/components/PkiTemplateForm.tsx b/frontend/src/pages/cert-manager/PkiTemplateListPage/components/PkiTemplateForm.tsx index 36a729b73..94cf66ff8 100644 --- a/frontend/src/pages/cert-manager/PkiTemplateListPage/components/PkiTemplateForm.tsx +++ b/frontend/src/pages/cert-manager/PkiTemplateListPage/components/PkiTemplateForm.tsx @@ -140,7 +140,11 @@ export const PkiTemplateForm = ({ certTemplate, handlePopUpToggle }: Props) => { ttl, keyUsages: Object.entries(keyUsages) .filter(([, value]) => value) - .map(([key]) => key.replace(/_([a-z])/g, (_, letter) => letter.toUpperCase())), + .map(([key]) => + key === CertKeyUsage.CRL_SIGN + ? "cRLSign" + : key.replace(/_([a-z])/g, (_, letter) => letter.toUpperCase()) + ), extendedKeyUsages: Object.entries(extendedKeyUsages) .filter(([, value]) => value) .map(([key]) => key.replace(/_([a-z])/g, (_, letter) => letter.toUpperCase())) @@ -160,7 +164,11 @@ export const PkiTemplateForm = ({ certTemplate, handlePopUpToggle }: Props) => { ttl, keyUsages: Object.entries(keyUsages) .filter(([, value]) => value) - .map(([key]) => key.replace(/_([a-z])/g, (_, letter) => letter.toUpperCase())), + .map(([key]) => + key === CertKeyUsage.CRL_SIGN + ? "cRLSign" + : key.replace(/_([a-z])/g, (_, letter) => letter.toUpperCase()) + ), extendedKeyUsages: Object.entries(extendedKeyUsages) .filter(([, value]) => value) .map(([key]) => key.replace(/_([a-z])/g, (_, letter) => letter.toUpperCase()))