fix(linking): link subdomains to parent subscription via suffix match

This commit is contained in:
2026-03-05 14:14:20 +00:00
parent ce8b04285a
commit cc7e30092d
2 changed files with 102 additions and 3 deletions

View File

@@ -21,6 +21,22 @@ function normalizeDomainLike(value: string) {
return value.trim().toLowerCase().replace(/\.$/, "");
}
function findBestSuffixStatusMatch(
normalizedDomain: string,
candidates: Array<{ normalizedName: string; status: string | null }>,
) {
let best: { normalizedName: string; status: string | null } | null = null;
for (const candidate of candidates) {
if (!normalizedDomain.endsWith(`.${candidate.normalizedName}`)) continue;
if (!best || candidate.normalizedName.length > best.normalizedName.length) {
best = candidate;
}
}
return best?.status ?? null;
}
export default async function DashboardPage() {
const context = await getServerAgencyContextOrRedirect();
const supabase = createSupabaseServerClient() as any;
@@ -163,6 +179,24 @@ export default async function DashboardPage() {
]),
);
const subscriptionStatusNameCandidatesByInstance = new Map<
string,
Array<{ normalizedName: string; status: string | null }>
>();
for (const subscription of domainSubscriptions ?? []) {
if (!subscription?.plesk_instance_id || !subscription?.name) continue;
const instanceId = String(subscription.plesk_instance_id);
const existing =
subscriptionStatusNameCandidatesByInstance.get(instanceId) ?? [];
existing.push({
normalizedName: normalizeDomainLike(String(subscription.name)),
status: subscription?.status ? String(subscription.status) : null,
});
subscriptionStatusNameCandidatesByInstance.set(instanceId, existing);
}
const autoSyncByInstance = new Map<
string,
{ status: string; created_at: string; error_message: string | null }
@@ -229,10 +263,17 @@ export default async function DashboardPage() {
const joinedStatusByName = subscriptionStatusByInstanceAndName.get(
`${domain.plesk_instance_id}:${normalizeDomainLike(domain.domain_name)}`,
);
const joinedStatusBySuffix = findBestSuffixStatusMatch(
normalizeDomainLike(domain.domain_name),
subscriptionStatusNameCandidatesByInstance.get(
domain.plesk_instance_id,
) ?? [],
);
const joinedStatus =
joinedStatusByLocalId ??
joinedStatusByExternalId ??
joinedStatusByName;
joinedStatusByName ??
joinedStatusBySuffix;
return {
...domain,