Split root and subdomain records

Author: TrySound

apps/builder/app/builder/features/topbar/domains.tsx

@@ -306,15 +306,23 @@ const DomainItem = ({
     value: projectDomain.expectedTxtRecord,
     ttl: 300,
   };
-  const dnsRecords: DnsRecord[] = [cnameRecord];
+  let dnsRecords: Record<string, DnsRecord[]>;
   if (cname === "@") {
-    dnsRecords.push(rootTxtRecord);
+    dnsRecords = {
+      domain: [cnameRecord, rootTxtRecord],
+    };
   } else if (cname === "www") {
     // add both www and root cname to support root -> www redirect
-    dnsRecords.push(rootTxtRecord, subdomainTxtRecord);
+    dnsRecords = {
+      domain: [rootTxtRecord],
+      subDomain: [cnameRecord, subdomainTxtRecord],
+    };
   } else {
-    dnsRecords.push(subdomainTxtRecord);
+    dnsRecords = {
+      subDomain: [cnameRecord, subdomainTxtRecord],
+    };
   }
+  const dnsRecordsList = Object.values(dnsRecords).flat();
 
   return (
     <CollapsibleDomainSection
@@ -448,7 +456,7 @@ const DomainItem = ({
             VALUE
           </Text>
 
-          {dnsRecords.map((record, index) => (
+          {dnsRecordsList.map((record, index) => (
             <Fragment key={index}>
               <InputEllipsis readOnly value={record.type} />
               <InputEllipsis

apps/builder/app/builder/features/topbar/entri.tsx

@@ -14,6 +14,8 @@ export type DnsRecord = {
   ttl: number;
 };
 
+export type DnsRecords = DnsRecord[] | Record<string, DnsRecord[]>;
+
 type EntriCloseEvent = CustomEvent<entri.EntriCloseEventDetail>;
 
 declare global {
@@ -37,7 +39,7 @@ const entriGlobalStyles = globalCss({
 
 type EntriProps = {
   domain: string;
-  dnsRecords: DnsRecord[];
+  dnsRecords: DnsRecords;
   onClose: (detail: entri.EntriCloseEventDetail) => void;
 };
 
@@ -105,7 +107,6 @@ export const Entri = ({ domain, dnsRecords, onClose }: EntriProps) => {
         css={{ width: "100%", flexShrink: 0 }}
         type="button"
         onClick={() => {
-          // @todo temporary for testing
           if (hasProPlan) {
             showDialog();
           } else {