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
Expand Up @@ -41,18 +41,17 @@ import {
} from "@ctrlplane/ui/select";
import { toast } from "@ctrlplane/ui/toast";
import {
defaultCondition,
isEmptyCondition,
releaseCondition,
ReleaseFilterType,
ReleaseOperator,
} from "@ctrlplane/validators/releases";

import { api } from "~/trpc/react";
import { ReleaseConditionDialog } from "./release-condition/ReleaseConditionDialog";

const releaseDependency = z.object({
deploymentId: z.string().uuid(),
releaseFilter: releaseCondition,
releaseFilter: releaseCondition.nullable(),
});

const releaseForm = z.object({
Expand Down Expand Up @@ -112,8 +111,16 @@ export const CreateReleaseDialog: React.FC<{
const router = useRouter();
const utils = api.useUtils();
const onSubmit = form.handleSubmit(async (data) => {
const releaseDependencies = data.releaseDependencies.map((dep) => ({
...dep,
releaseFilter:
dep.releaseFilter == null || isEmptyCondition(dep.releaseFilter)
? null
: dep.releaseFilter,
}));
const release = await create.mutateAsync({
...data,
releaseDependencies,
name: data.version.trim(),
});
await utils.release.list.invalidate({ deploymentId: release.deploymentId });
Expand Down Expand Up @@ -282,14 +289,14 @@ export const CreateReleaseDialog: React.FC<{
<FormItem>
<FormControl>
<ReleaseConditionDialog
condition={value}
condition={value ?? defaultCondition}
onChange={onChange}
>
<Button variant="ghost" size="icon">
{isEmptyCondition(value) && (
{value == null && (
<IconFilterExclamation className="h-4 w-4" />
)}
{!isEmptyCondition(value) && (
{value != null && (
<IconFilterFilled className="h-4 w-4" />
)}
</Button>
Expand All @@ -314,14 +321,7 @@ export const CreateReleaseDialog: React.FC<{
variant="outline"
className="w-16"
onClick={() =>
append({
deploymentId: "",
releaseFilter: {
type: ReleaseFilterType.Comparison,
operator: ReleaseOperator.And,
conditions: [],
},
})
append({ deploymentId: "", releaseFilter: null })
}
>
Add
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ const DeploymentNode: React.FC<

const newEdges = deps.map((d) => ({
id: d.id,
label: d.releaseFilter.type,
label: `${d.deploymentId}-${d.releaseId}`,
target: d.deploymentId,
source: data.id,
animated: true,
Expand Down
2 changes: 2 additions & 0 deletions packages/db/drizzle/0032_past_firestar.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ALTER TABLE "release_dependency" ALTER COLUMN "release_filter" SET DEFAULT NULL;--> statement-breakpoint
ALTER TABLE "release_dependency" ALTER COLUMN "release_filter" DROP NOT NULL;
Loading
Loading