mirror of
https://github.com/freedbygrace/ActiveDirectoryManager.git
synced 2026-08-25 01:57:01 +00:00
Fix: Improved sites and subnets display for better user experience. No longer shows continual loading, instead displays default headers and "no results" message when appropriate.
Replit-Commit-Author: Agent Replit-Commit-Session-Id: 705f2157-ef97-4fbd-89e4-8c7f2ecaea90 Replit-Commit-Screenshot-Url: https://storage.googleapis.com/screenshot-production-us-central1/7ed01c5f-a82d-405a-b728-b2e3d127c60c/5e8d7bb0-ab4a-4d9f-a7d5-5f2fd4e43809.jpg
This commit is contained in:
@@ -579,7 +579,11 @@ export default function SitesPage() {
|
|||||||
</div>
|
</div>
|
||||||
</CardHeader>
|
</CardHeader>
|
||||||
<CardContent>
|
<CardContent>
|
||||||
{isLoadingSites || !selectedConnection ? (
|
{!selectedConnection ? (
|
||||||
|
<div className="text-center py-10">
|
||||||
|
<p className="text-muted-foreground">Please select a connection to view sites.</p>
|
||||||
|
</div>
|
||||||
|
) : isLoadingSites ? (
|
||||||
<div className="space-y-3">
|
<div className="space-y-3">
|
||||||
{[...Array(5)].map((_, i) => (
|
{[...Array(5)].map((_, i) => (
|
||||||
<div key={i} className="flex items-center space-x-4">
|
<div key={i} className="flex items-center space-x-4">
|
||||||
@@ -592,7 +596,7 @@ export default function SitesPage() {
|
|||||||
<p className="text-destructive font-medium">Error loading sites</p>
|
<p className="text-destructive font-medium">Error loading sites</p>
|
||||||
<p className="text-muted-foreground">{sitesError.message || "Unknown error occurred"}</p>
|
<p className="text-muted-foreground">{sitesError.message || "Unknown error occurred"}</p>
|
||||||
</div>
|
</div>
|
||||||
) : sitesData?.data && sitesData.data.length > 0 ? (
|
) : (
|
||||||
<Table>
|
<Table>
|
||||||
<TableHeader>
|
<TableHeader>
|
||||||
<TableRow>
|
<TableRow>
|
||||||
@@ -604,7 +608,8 @@ export default function SitesPage() {
|
|||||||
</TableRow>
|
</TableRow>
|
||||||
</TableHeader>
|
</TableHeader>
|
||||||
<TableBody>
|
<TableBody>
|
||||||
{sitesData?.data?.map((site: AdSite) => (
|
{sitesData?.data && sitesData.data.length > 0 ? (
|
||||||
|
sitesData.data.map((site: AdSite) => (
|
||||||
<TableRow key={site.objectGUID}>
|
<TableRow key={site.objectGUID}>
|
||||||
<TableCell className="font-medium">{site.name}</TableCell>
|
<TableCell className="font-medium">{site.name}</TableCell>
|
||||||
<TableCell>{site.description || '—'}</TableCell>
|
<TableCell>{site.description || '—'}</TableCell>
|
||||||
@@ -661,13 +666,16 @@ export default function SitesPage() {
|
|||||||
</div>
|
</div>
|
||||||
</TableCell>
|
</TableCell>
|
||||||
</TableRow>
|
</TableRow>
|
||||||
))}
|
))
|
||||||
|
) : (
|
||||||
|
<TableRow>
|
||||||
|
<TableCell colSpan={5} className="text-center py-6">
|
||||||
|
<p className="text-muted-foreground">No sites found for this connection.</p>
|
||||||
|
</TableCell>
|
||||||
|
</TableRow>
|
||||||
|
)}
|
||||||
</TableBody>
|
</TableBody>
|
||||||
</Table>
|
</Table>
|
||||||
) : (
|
|
||||||
<div className="text-center py-10">
|
|
||||||
<p className="text-muted-foreground">No sites found for this connection.</p>
|
|
||||||
</div>
|
|
||||||
)}
|
)}
|
||||||
|
|
||||||
{/* Pagination for sites */}
|
{/* Pagination for sites */}
|
||||||
@@ -832,7 +840,11 @@ export default function SitesPage() {
|
|||||||
</div>
|
</div>
|
||||||
</CardHeader>
|
</CardHeader>
|
||||||
<CardContent>
|
<CardContent>
|
||||||
{isLoadingSubnets || !selectedConnection ? (
|
{!selectedConnection ? (
|
||||||
|
<div className="text-center py-10">
|
||||||
|
<p className="text-muted-foreground">Please select a connection to view subnets.</p>
|
||||||
|
</div>
|
||||||
|
) : isLoadingSubnets ? (
|
||||||
<div className="space-y-3">
|
<div className="space-y-3">
|
||||||
{[...Array(5)].map((_, i) => (
|
{[...Array(5)].map((_, i) => (
|
||||||
<div key={i} className="flex items-center space-x-4">
|
<div key={i} className="flex items-center space-x-4">
|
||||||
@@ -845,7 +857,7 @@ export default function SitesPage() {
|
|||||||
<p className="text-destructive font-medium">Error loading subnets</p>
|
<p className="text-destructive font-medium">Error loading subnets</p>
|
||||||
<p className="text-muted-foreground">{subnetsError.message || "Unknown error occurred"}</p>
|
<p className="text-muted-foreground">{subnetsError.message || "Unknown error occurred"}</p>
|
||||||
</div>
|
</div>
|
||||||
) : subnetsData?.data && subnetsData.data.length > 0 ? (
|
) : (
|
||||||
<Table>
|
<Table>
|
||||||
<TableHeader>
|
<TableHeader>
|
||||||
<TableRow>
|
<TableRow>
|
||||||
@@ -858,7 +870,8 @@ export default function SitesPage() {
|
|||||||
</TableRow>
|
</TableRow>
|
||||||
</TableHeader>
|
</TableHeader>
|
||||||
<TableBody>
|
<TableBody>
|
||||||
{subnetsData?.data?.map((subnet: AdSubnet) => (
|
{subnetsData?.data && subnetsData.data.length > 0 ? (
|
||||||
|
subnetsData.data.map((subnet: AdSubnet) => (
|
||||||
<TableRow key={subnet.objectGUID}>
|
<TableRow key={subnet.objectGUID}>
|
||||||
<TableCell className="font-medium">{subnet.name}</TableCell>
|
<TableCell className="font-medium">{subnet.name}</TableCell>
|
||||||
<TableCell>{subnet.cidr || '—'}</TableCell>
|
<TableCell>{subnet.cidr || '—'}</TableCell>
|
||||||
@@ -916,13 +929,16 @@ export default function SitesPage() {
|
|||||||
</div>
|
</div>
|
||||||
</TableCell>
|
</TableCell>
|
||||||
</TableRow>
|
</TableRow>
|
||||||
))}
|
))
|
||||||
|
) : (
|
||||||
|
<TableRow>
|
||||||
|
<TableCell colSpan={6} className="text-center py-6">
|
||||||
|
<p className="text-muted-foreground">No subnets found for this connection.</p>
|
||||||
|
</TableCell>
|
||||||
|
</TableRow>
|
||||||
|
)}
|
||||||
</TableBody>
|
</TableBody>
|
||||||
</Table>
|
</Table>
|
||||||
) : (
|
|
||||||
<div className="text-center py-10">
|
|
||||||
<p className="text-muted-foreground">No subnets found for this connection.</p>
|
|
||||||
</div>
|
|
||||||
)}
|
)}
|
||||||
|
|
||||||
{/* Pagination for subnets */}
|
{/* Pagination for subnets */}
|
||||||
|
|||||||
Reference in New Issue
Block a user