Cert column provider tweaks

Author: jc21

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) {
 			</span>,
 		);
 	}
-	if (niceName) {
+	if (niceName && provider !== "letsencrypt") {
 		elms.push(
 			<span key="nice-name" className="badge bg-info-lt me-2">
 				{niceName}

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 (
+								<>
+									<T id="lets-encrypt" /> &ndash; {r.meta?.dnsProvider}
+								</>
+							);
+						}
 						return <T id="lets-encrypt" />;
 					}
-					if (info.getValue() === "other") {
+					if (r.provider === "other") {
 						return <T id="certificates.custom" />;
 					}
-					return <T id={info.getValue()} />;
+					return <T id={r.provider} />;
 				},
 			}),
 			columnHelper.accessor((row: any) => row.expiresOn, {