Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -1,10 +1,4 @@
import { Button } from "@ctrlplane/ui/button";
import {
Tooltip,
TooltipContent,
TooltipProvider,
TooltipTrigger,
} from "@ctrlplane/ui/tooltip";

import { ApprovalDialog } from "~/app/[workspaceSlug]/(app)/(deploy)/_components/deployment-version/ApprovalDialog";
import { api } from "~/trpc/react";
Expand All @@ -16,16 +10,24 @@ export const ApprovalCheck: React.FC<{
versionId: string;
versionTag: string;
}> = (props) => {
const { data, isLoading } =
api.deployment.version.checks.approval.status.useQuery(props);
const { data, isLoading } = api.policy.evaluate.useQuery(props);
const utils = api.useUtils();
const invalidate = () =>
utils.deployment.version.checks.approval.status.invalidate(props);
const invalidate = () => utils.policy.evaluate.invalidate(props);

const isApproved = data?.approved ?? false;
const rejectionReasonEntries = Array.from(
data?.rejectionReasons.entries() ?? [],
);
const isAnyApprovalSatisfied = Object.values(
data?.rules.anyApprovals ?? {},
).every((reasons) => reasons.length === 0);
const isUserApprovalSatisfied = Object.values(
data?.rules.userApprovals ?? {},
).every((reasons) => reasons.length === 0);
const isRoleApprovalSatisfied = Object.values(
data?.rules.roleApprovals ?? {},
).every((reasons) => reasons.length === 0);

const isApproved =
isAnyApprovalSatisfied &&
isUserApprovalSatisfied &&
isRoleApprovalSatisfied;

if (isLoading)
return (
Expand All @@ -41,35 +43,6 @@ export const ApprovalCheck: React.FC<{
</div>
);

if (rejectionReasonEntries.length > 0)
return (
<TooltipProvider>
<Tooltip>
<TooltipTrigger>
<div className="flex items-center justify-between">
<div className="flex items-center gap-2">
<Waiting /> Not enough approvals
</div>
<ApprovalDialog {...props} onSubmit={invalidate}>
<Button size="sm" className="h-6">
Approve
</Button>
</ApprovalDialog>
</div>
</TooltipTrigger>
<TooltipContent>
<ul>
{rejectionReasonEntries.map(([reason, comment]) => (
<li key={reason}>
{reason}: {comment}
</li>
))}
</ul>
</TooltipContent>
</Tooltip>
</TooltipProvider>
);

return (
<div className="flex items-center justify-between">
<div className="flex items-center gap-2">
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,14 @@ export const VersionSelectorCheck: React.FC<{
versionId: string;
environmentId: string;
}> = ({ versionId, environmentId }) => {
const { data, isLoading } =
api.deployment.version.checks.versionSelector.useQuery({
versionId,
environmentId,
});
const { data, isLoading } = api.policy.evaluate.useQuery({
environmentId,
versionId,
});

const isPassingVersionSelector = data ?? false;
const isPassingVersionSelector = Object.values(
data?.rules.versionSelector ?? {},
).every((isPassing) => isPassing);

if (isLoading)
return (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import { cn } from "@ctrlplane/ui";
import { Separator } from "@ctrlplane/ui/separator";

import { ApprovalCheck } from "../checks/Approval";
import { DenyWindowCheck } from "../checks/DenyWindow";
import { VersionSelectorCheck } from "../checks/VersionSelector";

type EnvironmentNodeProps = NodeProps<{
Expand All @@ -35,7 +34,6 @@ export const EnvironmentNode: React.FC<EnvironmentNodeProps> = ({ data }) => (
<Separator className="!m-0 bg-neutral-800" />
<div className="space-y-1 px-2 pb-2">
<ApprovalCheck {...data} />
<DenyWindowCheck {...data} />
<VersionSelectorCheck {...data} />
</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import type { Metadata } from "next";
import { notFound } from "next/navigation";
import { IconMenu2 } from "@tabler/icons-react";
import _ from "lodash";

import { SidebarTrigger } from "@ctrlplane/ui/sidebar";

Expand Down Expand Up @@ -44,9 +45,15 @@ export default async function ChecksPage(props: PageProps) {
if (deploymentVersion == null || deployment == null) return notFound();

const { system } = deployment;
const environments = await api.deployment.version.checks.environmentsToCheck(
deployment.id,
const releaseTargets = await api.releaseTarget.list({
deploymentId: deployment.id,
});

const environments = _.uniqBy(
releaseTargets.map((r) => r.environment),
(env) => env.id,
);

return (
<div className="relative h-full">
<SidebarTrigger
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,7 @@ export const ApprovalDialog: React.FC<{
onSubmit?: () => void;
}> = ({ versionId, versionTag, environmentId, children, onSubmit }) => {
const [open, setOpen] = useState(false);
const addRecord =
api.deployment.version.checks.approval.addRecord.useMutation();
const addRecord = api.deployment.version.addApprovalRecord.useMutation();

const router = useRouter();

Expand Down
126 changes: 0 additions & 126 deletions packages/api/src/router/deployment-version-checks/approvals.ts

This file was deleted.

24 changes: 0 additions & 24 deletions packages/api/src/router/deployment-version-checks/deny-window.ts

This file was deleted.

Loading
Loading