diff --git a/frontend/src/components/Table/Formatter/DomainsFormatter.tsx b/frontend/src/components/Table/Formatter/DomainsFormatter.tsx index d83adbd8..daaa2deb 100644 --- a/frontend/src/components/Table/Formatter/DomainsFormatter.tsx +++ b/frontend/src/components/Table/Formatter/DomainsFormatter.tsx @@ -5,6 +5,7 @@ interface Props { domains: string[]; createdOn?: string; niceName?: string; + provider?: string; } const DomainLink = ({ domain }: { domain: string }) => { @@ -26,7 +27,8 @@ const DomainLink = ({ domain }: { domain: string }) => { ); }; -export function DomainsFormatter({ domains, createdOn, niceName }: Props) { +export function DomainsFormatter({ domains, createdOn, niceName, provider }: Props) { + console.log("PROVIDER:", provider); const elms: ReactNode[] = []; if (domains.length === 0 && !niceName) { elms.push( @@ -35,7 +37,7 @@ export function DomainsFormatter({ domains, createdOn, niceName }: Props) { , ); } - if (niceName) { + if (niceName && provider !== "letsencrypt") { elms.push( {niceName} diff --git a/frontend/src/pages/Certificates/Table.tsx b/frontend/src/pages/Certificates/Table.tsx index ece9b83c..e880d049 100644 --- a/frontend/src/pages/Certificates/Table.tsx +++ b/frontend/src/pages/Certificates/Table.tsx @@ -45,21 +45,30 @@ export default function Table({ data, isFetching, onDelete, onRenew, onDownload, domains={value.domainNames} createdOn={value.createdOn} niceName={value.niceName} + provider={value.provider || ""} /> ); }, }), - columnHelper.accessor((row: any) => row.provider, { + columnHelper.accessor((row: any) => row, { id: "provider", header: intl.formatMessage({ id: "column.provider" }), cell: (info: any) => { - if (info.getValue() === "letsencrypt") { + const r = info.getValue(); + if (r.provider === "letsencrypt") { + if (r.meta?.dnsChallenge && r.meta?.dnsProvider) { + return ( + <> + – {r.meta?.dnsProvider} + + ); + } return ; } - if (info.getValue() === "other") { + if (r.provider === "other") { return ; } - return ; + return ; }, }), columnHelper.accessor((row: any) => row.expiresOn, {