Skip to content

fix: Remove card for resource deployments #340

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 23, 2025
Merged

fix: Remove card for resource deployments #340

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
117 changes: 57 additions & 60 deletions ...rkspaceSlug]/(appv2)/resources/(raw)/[resourceId]/deployments/ResourceDeploymentTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import { useMemo } from "react";
import { useSearchParams } from "next/navigation";
import { subDays } from "date-fns";

import { Card } from "@ctrlplane/ui/card";
import {
Table,
TableBody,
Expand Down Expand Up @@ -47,64 +46,62 @@ export const ResourceDeploymentsTable: React.FC<
});

return (
<Card className="rounded-md">
<Table>
<TableHeader>
<TableRow className="h-16 hover:bg-transparent">
<TableHead className="p-4">
<TableSortHeader orderByKey={StatsColumn.Name}>
Deployment
</TableSortHeader>
</TableHead>

<TableHead className="w-20 p-4 xl:w-40">Version</TableHead>

<TableHead className="p-4">History</TableHead>

<TableHead className="p-4">
<TableSortHeader orderByKey={StatsColumn.P50}>
P50 Duration
</TableSortHeader>
</TableHead>

<TableHead className="p-4">
<TableSortHeader orderByKey={StatsColumn.P90}>
P90 Duration
</TableSortHeader>
</TableHead>

<TableHead className="p-4">
<TableSortHeader orderByKey={StatsColumn.SuccessRate}>
Success Rate
</TableSortHeader>
</TableHead>

<TableHead className="hidden p-4 xl:table-cell xl:w-[120px]">
<TableSortHeader orderByKey={StatsColumn.LastRunAt}>
Last Run
</TableSortHeader>
</TableHead>
</TableRow>
</TableHeader>

<TableBody>
{!isLoading &&
data?.map((stat) => (
<ResourceDeploymentRow
key={stat.id}
stats={stat}
workspaceId={workspaceId}
/>
))}
{isLoading &&
Array.from({ length: 3 }).map((_, index) => (
<ResourceDeploymentRowSkeleton
key={index}
opacity={1 * (1 - index / 3)}
/>
))}
</TableBody>
</Table>
</Card>
<Table>
<TableHeader>
<TableRow className="h-16 hover:bg-transparent">
<TableHead className="p-4">
<TableSortHeader orderByKey={StatsColumn.Name}>
Deployment
</TableSortHeader>
</TableHead>

<TableHead className="w-20 p-4 xl:w-40">Version</TableHead>

<TableHead className="p-4">History</TableHead>

<TableHead className="p-4">
<TableSortHeader orderByKey={StatsColumn.P50}>
P50 Duration
</TableSortHeader>
</TableHead>

<TableHead className="p-4">
<TableSortHeader orderByKey={StatsColumn.P90}>
P90 Duration
</TableSortHeader>
</TableHead>

<TableHead className="p-4">
<TableSortHeader orderByKey={StatsColumn.SuccessRate}>
Success Rate
</TableSortHeader>
</TableHead>

<TableHead className="hidden p-4 xl:table-cell xl:w-[120px]">
<TableSortHeader orderByKey={StatsColumn.LastRunAt}>
Last Run
</TableSortHeader>
</TableHead>
</TableRow>
</TableHeader>

<TableBody>
{!isLoading &&
data?.map((stat) => (
<ResourceDeploymentRow
key={stat.id}
stats={stat}
workspaceId={workspaceId}
/>
))}
{isLoading &&
Array.from({ length: 3 }).map((_, index) => (
<ResourceDeploymentRowSkeleton
key={index}
opacity={1 * (1 - index / 3)}
/>
))}
</TableBody>
</Table>
);
};
6 changes: 1 addition & 5 deletions ...service/src/app/[workspaceSlug]/(appv2)/resources/(raw)/[resourceId]/deployments/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,5 @@ export default async function DeploymentsPage(props: { params: Params }) {
const resource = await api.resource.byId(resourceId);
if (resource == null) notFound();

return (
<div className="container m-8 mx-auto">
<ResourceDeploymentsTable resource={resource} />
</div>
);
return <ResourceDeploymentsTable resource={resource} />;
}
2 changes: 1 addition & 1 deletion apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(raw)/[resourceId]/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ export default async function Layout(props: {
const resource = await api.resource.byId(params.resourceId);
if (resource == null) notFound();
return (
<div className="h-full">
<div className="flex h-full flex-col">
<PageHeader className="justify-between">
<div className="flex shrink-0 items-center gap-4">
<Link href={`/${params.workspaceSlug}/resources`}>
Expand Down
Loading