Compare commits
1 Commits
master
...
feature/ui
| Author | SHA1 | Date | |
|---|---|---|---|
| e5f9da6c26 |
@@ -55,6 +55,15 @@ type Domain = {
|
||||
updated_at: string;
|
||||
};
|
||||
|
||||
type DomainSortKey =
|
||||
| "domain"
|
||||
| "status"
|
||||
| "hosting"
|
||||
| "created"
|
||||
| "aliases"
|
||||
| "last_seen"
|
||||
| "actions";
|
||||
|
||||
type Props = {
|
||||
instances: Instance[];
|
||||
subscriptions: Subscription[];
|
||||
@@ -198,6 +207,10 @@ export function DashboardControls({
|
||||
);
|
||||
const [domainSearch, setDomainSearch] = useState("");
|
||||
const [domainStatus, setDomainStatus] = useState("all");
|
||||
const [domainSort, setDomainSort] = useState<{
|
||||
key: DomainSortKey;
|
||||
direction: "asc" | "desc";
|
||||
}>({ key: "domain", direction: "asc" });
|
||||
const [message, setMessage] = useState<string | null>(null);
|
||||
const [loading, setLoading] = useState(false);
|
||||
const [isConnectPanelOpen, setIsConnectPanelOpen] = useState(!hasInstances);
|
||||
@@ -295,6 +308,112 @@ export function DashboardControls({
|
||||
return statusMatches && searchMatches;
|
||||
});
|
||||
|
||||
const sortedDomains = filteredDomains
|
||||
.map((domain, index) => ({ domain, index }))
|
||||
.sort((a, b) => {
|
||||
function compareNullable<T>(
|
||||
left: T | null | undefined,
|
||||
right: T | null | undefined,
|
||||
compare: (leftValue: T, rightValue: T) => number,
|
||||
) {
|
||||
const leftMissing = left == null;
|
||||
const rightMissing = right == null;
|
||||
if (leftMissing && rightMissing) return 0;
|
||||
if (leftMissing) return 1;
|
||||
if (rightMissing) return -1;
|
||||
return compare(left, right);
|
||||
}
|
||||
|
||||
function compareStrings(
|
||||
left: string | null | undefined,
|
||||
right: string | null | undefined,
|
||||
) {
|
||||
return compareNullable(left, right, (l, r) =>
|
||||
l.localeCompare(r, undefined, { sensitivity: "base" }),
|
||||
);
|
||||
}
|
||||
|
||||
function compareNumbers(
|
||||
left: number | null | undefined,
|
||||
right: number | null | undefined,
|
||||
) {
|
||||
return compareNullable(left, right, (l, r) => l - r);
|
||||
}
|
||||
|
||||
function toTime(value: string | null | undefined) {
|
||||
if (!value) return null;
|
||||
const time = new Date(value).getTime();
|
||||
return Number.isNaN(time) ? null : time;
|
||||
}
|
||||
|
||||
const leftDomain = a.domain;
|
||||
const rightDomain = b.domain;
|
||||
|
||||
let comparison = 0;
|
||||
|
||||
if (domainSort.key === "domain") {
|
||||
comparison = compareStrings(
|
||||
leftDomain.domain_name,
|
||||
rightDomain.domain_name,
|
||||
);
|
||||
} else if (domainSort.key === "status") {
|
||||
comparison = compareStrings(
|
||||
formatDomainStatusLabel(leftDomain.status),
|
||||
formatDomainStatusLabel(rightDomain.status),
|
||||
);
|
||||
} else if (domainSort.key === "hosting") {
|
||||
comparison = compareStrings(
|
||||
leftDomain.hosting_type,
|
||||
rightDomain.hosting_type,
|
||||
);
|
||||
} else if (domainSort.key === "created") {
|
||||
comparison = compareNumbers(
|
||||
toTime(leftDomain.source_created_at),
|
||||
toTime(rightDomain.source_created_at),
|
||||
);
|
||||
} else if (domainSort.key === "aliases") {
|
||||
comparison = compareNumbers(
|
||||
leftDomain.aliases_count,
|
||||
rightDomain.aliases_count,
|
||||
);
|
||||
} else if (domainSort.key === "last_seen") {
|
||||
comparison = compareNumbers(
|
||||
toTime(leftDomain.updated_at),
|
||||
toTime(rightDomain.updated_at),
|
||||
);
|
||||
} else if (domainSort.key === "actions") {
|
||||
comparison = compareNumbers(
|
||||
leftDomain.subscription_id ? 1 : 0,
|
||||
rightDomain.subscription_id ? 1 : 0,
|
||||
);
|
||||
}
|
||||
|
||||
if (comparison === 0) {
|
||||
comparison = a.index - b.index;
|
||||
}
|
||||
|
||||
return domainSort.direction === "asc" ? comparison : comparison * -1;
|
||||
})
|
||||
.map((entry) => entry.domain);
|
||||
|
||||
function toggleDomainSort(key: DomainSortKey) {
|
||||
setDomainSort((current) => {
|
||||
if (current.key === key) {
|
||||
return {
|
||||
key,
|
||||
direction: current.direction === "asc" ? "desc" : "asc",
|
||||
};
|
||||
}
|
||||
|
||||
return { key, direction: "asc" };
|
||||
});
|
||||
}
|
||||
|
||||
function getSortIndicator(key: DomainSortKey) {
|
||||
if (domainSort.key !== key) return "↕";
|
||||
return domainSort.direction === "asc" ? "↑" : "↓";
|
||||
}
|
||||
|
||||
const instanceHealthSummary = instances.reduce(
|
||||
(acc, instance) => {
|
||||
const status = (instance.health_status ?? "unknown").toLowerCase();
|
||||
@@ -1094,24 +1213,143 @@ export function DashboardControls({
|
||||
<table className="min-w-full text-left text-sm">
|
||||
<thead>
|
||||
<tr className="border-b border-slate-200 text-xs uppercase text-slate-500">
|
||||
<th className="px-2 py-2">Domain</th>
|
||||
<th className="px-2 py-2">Subscription Status</th>
|
||||
<th className="px-2 py-2">Hosting</th>
|
||||
<th className="px-2 py-2">Created</th>
|
||||
<th className="px-2 py-2">Aliases</th>
|
||||
<th className="px-2 py-2">Last seen</th>
|
||||
<th className="px-2 py-2">Actions</th>
|
||||
<th className="px-2 py-2">
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => toggleDomainSort("domain")}
|
||||
className="inline-flex items-center gap-1"
|
||||
>
|
||||
Domain
|
||||
<span
|
||||
className={
|
||||
domainSort.key === "domain"
|
||||
? "text-brand-700"
|
||||
: "text-slate-400"
|
||||
}
|
||||
>
|
||||
{getSortIndicator("domain")}
|
||||
</span>
|
||||
</button>
|
||||
</th>
|
||||
<th className="px-2 py-2">
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => toggleDomainSort("status")}
|
||||
className="inline-flex items-center gap-1"
|
||||
>
|
||||
Subscription Status
|
||||
<span
|
||||
className={
|
||||
domainSort.key === "status"
|
||||
? "text-brand-700"
|
||||
: "text-slate-400"
|
||||
}
|
||||
>
|
||||
{getSortIndicator("status")}
|
||||
</span>
|
||||
</button>
|
||||
</th>
|
||||
<th className="px-2 py-2">
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => toggleDomainSort("hosting")}
|
||||
className="inline-flex items-center gap-1"
|
||||
>
|
||||
Hosting
|
||||
<span
|
||||
className={
|
||||
domainSort.key === "hosting"
|
||||
? "text-brand-700"
|
||||
: "text-slate-400"
|
||||
}
|
||||
>
|
||||
{getSortIndicator("hosting")}
|
||||
</span>
|
||||
</button>
|
||||
</th>
|
||||
<th className="px-2 py-2">
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => toggleDomainSort("created")}
|
||||
className="inline-flex items-center gap-1"
|
||||
>
|
||||
Created
|
||||
<span
|
||||
className={
|
||||
domainSort.key === "created"
|
||||
? "text-brand-700"
|
||||
: "text-slate-400"
|
||||
}
|
||||
>
|
||||
{getSortIndicator("created")}
|
||||
</span>
|
||||
</button>
|
||||
</th>
|
||||
<th className="px-2 py-2">
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => toggleDomainSort("aliases")}
|
||||
className="inline-flex items-center gap-1"
|
||||
>
|
||||
Aliases
|
||||
<span
|
||||
className={
|
||||
domainSort.key === "aliases"
|
||||
? "text-brand-700"
|
||||
: "text-slate-400"
|
||||
}
|
||||
>
|
||||
{getSortIndicator("aliases")}
|
||||
</span>
|
||||
</button>
|
||||
</th>
|
||||
<th className="px-2 py-2">
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => toggleDomainSort("last_seen")}
|
||||
className="inline-flex items-center gap-1"
|
||||
>
|
||||
Last seen
|
||||
<span
|
||||
className={
|
||||
domainSort.key === "last_seen"
|
||||
? "text-brand-700"
|
||||
: "text-slate-400"
|
||||
}
|
||||
>
|
||||
{getSortIndicator("last_seen")}
|
||||
</span>
|
||||
</button>
|
||||
</th>
|
||||
<th className="px-2 py-2">
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => toggleDomainSort("actions")}
|
||||
className="inline-flex items-center gap-1"
|
||||
>
|
||||
Actions
|
||||
<span
|
||||
className={
|
||||
domainSort.key === "actions"
|
||||
? "text-brand-700"
|
||||
: "text-slate-400"
|
||||
}
|
||||
>
|
||||
{getSortIndicator("actions")}
|
||||
</span>
|
||||
</button>
|
||||
</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{filteredDomains.length === 0 ? (
|
||||
{sortedDomains.length === 0 ? (
|
||||
<tr>
|
||||
<td className="px-2 py-3 text-slate-500" colSpan={7}>
|
||||
No domains found.
|
||||
</td>
|
||||
</tr>
|
||||
) : (
|
||||
filteredDomains.map((domain) => (
|
||||
sortedDomains.map((domain) => (
|
||||
<tr key={domain.id} className="border-b border-slate-100">
|
||||
<td className="px-2 py-2 font-medium text-slate-900">
|
||||
<a
|
||||
|
||||
Reference in New Issue
Block a user