Compare commits
1 Commits
feature/cl
...
feature/cl
| Author | SHA1 | Date | |
|---|---|---|---|
| c9e3fe1dbc |
@@ -50,7 +50,7 @@ export default async function DashboardPage() {
|
||||
supabase
|
||||
.from("plesk_domains")
|
||||
.select(
|
||||
"id, plesk_instance_id, subscription_id, domain_name, status, hosting_type, source_created_at, aliases_count, updated_at",
|
||||
"id, plesk_instance_id, subscription_id, status, domain_name, hosting_type, source_created_at, aliases_count, updated_at, subscription:plesk_subscriptions(status)",
|
||||
)
|
||||
.eq("agency_id", context.agencyId)
|
||||
.order("updated_at", { ascending: false })
|
||||
@@ -107,6 +107,9 @@ export default async function DashboardPage() {
|
||||
source_created_at: string | null;
|
||||
aliases_count: number | null;
|
||||
updated_at: string;
|
||||
subscription: {
|
||||
status: string | null;
|
||||
} | null;
|
||||
}> | null;
|
||||
},
|
||||
{ data: BillingSummary | null },
|
||||
@@ -167,7 +170,16 @@ export default async function DashboardPage() {
|
||||
<DashboardControls
|
||||
instances={instances ?? []}
|
||||
subscriptions={subscriptions ?? []}
|
||||
domains={domains ?? []}
|
||||
domains={(domains ?? []).map((domain) => {
|
||||
const joinedStatus = Array.isArray(domain.subscription)
|
||||
? domain.subscription[0]?.status
|
||||
: domain.subscription?.status;
|
||||
|
||||
return {
|
||||
...domain,
|
||||
status: joinedStatus ?? "unknown",
|
||||
};
|
||||
})}
|
||||
autoSyncByInstance={Object.fromEntries(autoSyncByInstance.entries())}
|
||||
/>
|
||||
</main>
|
||||
|
||||
@@ -22,13 +22,6 @@ type InstanceRow = Pick<
|
||||
| "last_connected_at"
|
||||
>;
|
||||
|
||||
type LocalSubscriptionLookupRow = {
|
||||
id: string;
|
||||
plesk_subscription_id: string;
|
||||
name: string | null;
|
||||
status: string | null;
|
||||
};
|
||||
|
||||
const MIN_INTERVAL_MS = 3 * 60 * 1000;
|
||||
|
||||
export async function syncPleskInstance(
|
||||
@@ -163,7 +156,7 @@ export async function syncPleskInstance(
|
||||
const { data: localSubscriptions, error: localSubscriptionsError } =
|
||||
await supabase
|
||||
.from("plesk_subscriptions")
|
||||
.select("id, plesk_subscription_id, name, status")
|
||||
.select("id, plesk_subscription_id, status")
|
||||
.eq("agency_id", instance.agency_id)
|
||||
.eq("plesk_instance_id", instance.id);
|
||||
|
||||
@@ -171,49 +164,19 @@ export async function syncPleskInstance(
|
||||
throw new Error(localSubscriptionsError.message);
|
||||
}
|
||||
|
||||
const subscriptionsIndexed = ((localSubscriptions ?? []) as Array<any>)
|
||||
.filter((row): row is LocalSubscriptionLookupRow =>
|
||||
Boolean(row?.plesk_subscription_id && row?.id),
|
||||
)
|
||||
.map((row) => ({
|
||||
id: String(row.id),
|
||||
pleskSubscriptionId: String(row.plesk_subscription_id),
|
||||
status: row?.status ? String(row.status) : null,
|
||||
name: row?.name ? String(row.name) : null,
|
||||
}));
|
||||
|
||||
const subscriptionByExternalId = new Map<
|
||||
string,
|
||||
{
|
||||
id: string;
|
||||
pleskSubscriptionId: string;
|
||||
status: string | null;
|
||||
name: string | null;
|
||||
}
|
||||
>(subscriptionsIndexed.map((row) => [row.pleskSubscriptionId, row]));
|
||||
|
||||
const subscriptionByLocalId = new Map<
|
||||
string,
|
||||
{
|
||||
id: string;
|
||||
pleskSubscriptionId: string;
|
||||
status: string | null;
|
||||
name: string | null;
|
||||
}
|
||||
>(subscriptionsIndexed.map((row) => [row.id, row]));
|
||||
|
||||
const subscriptionByName = new Map<
|
||||
string,
|
||||
{
|
||||
id: string;
|
||||
pleskSubscriptionId: string;
|
||||
status: string | null;
|
||||
name: string | null;
|
||||
}
|
||||
{ id: string; status: string | null }
|
||||
>(
|
||||
subscriptionsIndexed
|
||||
.filter((row) => row.name)
|
||||
.map((row) => [String(row.name).trim().toLowerCase(), row]),
|
||||
(localSubscriptions ?? [])
|
||||
.filter((row: any) => row?.plesk_subscription_id && row?.id)
|
||||
.map((row: any) => [
|
||||
String(row.plesk_subscription_id),
|
||||
{
|
||||
id: String(row.id),
|
||||
status: row?.status ? String(row.status) : null,
|
||||
},
|
||||
]),
|
||||
);
|
||||
|
||||
const domainsForUpsert = domainsRaw
|
||||
@@ -222,37 +185,12 @@ export async function syncPleskInstance(
|
||||
const domainName = item?.name ?? item?.domain_name ?? item?.domain;
|
||||
const subExternalId =
|
||||
item?.subscription?.id ?? item?.subscription_id ?? item?.webspace_id;
|
||||
const rawExternalSubscriptionId = subExternalId
|
||||
const externalSubscriptionId = subExternalId
|
||||
? String(subExternalId)
|
||||
: null;
|
||||
const subscriptionNameHint =
|
||||
item?.subscription?.name ??
|
||||
item?.subscription_name ??
|
||||
item?.webspace_name ??
|
||||
item?.webspace ??
|
||||
null;
|
||||
|
||||
const localSubscriptionByExternal = rawExternalSubscriptionId
|
||||
? subscriptionByExternalId.get(rawExternalSubscriptionId)
|
||||
const localSubscription = externalSubscriptionId
|
||||
? subscriptionByExternalId.get(externalSubscriptionId)
|
||||
: undefined;
|
||||
const localSubscriptionByLocalId = rawExternalSubscriptionId
|
||||
? subscriptionByLocalId.get(rawExternalSubscriptionId)
|
||||
: undefined;
|
||||
const localSubscriptionByName = subscriptionNameHint
|
||||
? subscriptionByName.get(
|
||||
String(subscriptionNameHint).trim().toLowerCase(),
|
||||
)
|
||||
: undefined;
|
||||
const localSubscription =
|
||||
localSubscriptionByExternal ??
|
||||
localSubscriptionByLocalId ??
|
||||
localSubscriptionByName;
|
||||
|
||||
const externalSubscriptionId = localSubscription
|
||||
? localSubscription.pleskSubscriptionId
|
||||
: subscriptionNameHint
|
||||
? String(subscriptionNameHint)
|
||||
: rawExternalSubscriptionId;
|
||||
const rawCreated = item?.created_at ?? item?.created;
|
||||
const sourceCreatedAt = rawCreated
|
||||
? new Date(String(rawCreated)).toISOString()
|
||||
|
||||
Reference in New Issue
Block a user