feat: concurrency rule

apps/event-worker/src/workers/evaluate-release-target.ts

@@ -110,7 +110,10 @@ export const evaluateReleaseTargetWorker = createWorker(
 
         await tx.execute(
           sql`
-            SELECT id FROM ${schema.releaseTarget}
+            SELECT * FROM ${schema.releaseTarget}
+            INNER JOIN ${schema.computedPolicyTargetReleaseTarget} ON ${eq(schema.computedPolicyTargetReleaseTarget.releaseTargetId, schema.releaseTarget.id)}
+            INNER JOIN ${schema.policyTarget} ON ${eq(schema.computedPolicyTargetReleaseTarget.policyTargetId, schema.policyTarget.id)}
+            INNER JOIN ${schema.policy} ON ${eq(schema.policyTarget.policyId, schema.policy.id)}
             WHERE ${eq(schema.releaseTarget.id, releaseTarget.id)}
             FOR UPDATE NOWAIT
           `,

apps/webservice/src/app/[workspaceSlug]/(app)/policies/(sidebar)/_components/PolicyTable.tsx

@@ -51,6 +51,8 @@ const getRules = (policy: RouterOutputs["policy"]["list"][number]) => {
   if (policy.deploymentVersionSelector != null)
     rules.push("deployment-version-selector");
 
+  if (policy.concurrency != null) rules.push("concurrency");
+
   return rules;
 };
 

apps/webservice/src/app/[workspaceSlug]/(app)/policies/(sidebar)/_components/rule-themes.tsx

@@ -5,6 +5,7 @@ import {
   LayersIcon,
 } from "@radix-ui/react-icons";
 import {
+  IconArrowsSplit,
   IconCalendarTime,
   IconFilter,
   IconUserCheck,
@@ -19,7 +20,8 @@ export type RuleType =
   | "rollout-pass-rate"
   | "release-dependency"
   | "approval-gate"
-  | "deployment-version-selector";
+  | "deployment-version-selector"
+  | "concurrency";
 
 export const ruleTypeIcons: Record<
   RuleType,
@@ -46,6 +48,11 @@ export const ruleTypeIcons: Record<
   "deployment-version-selector": (props) => (
     <IconFilter className={cn("size-3 text-purple-400", props.className)} />
   ),
+  concurrency: (props) => (
+    <IconArrowsSplit
+      className={cn("size-3 text-yellow-400", props.className)}
+    />
+  ),
 } as const;
 
 export const getRuleTypeIcon = (type: RuleType) => {
@@ -60,6 +67,7 @@ export const ruleTypeLabels: Record<RuleType, string> = {
   "release-dependency": "Release Dependency",
   "approval-gate": "Approval Gate",
   "deployment-version-selector": "Deployment Version Selector",
+  concurrency: "Concurrency",
 } as const;
 
 export const getRuleTypeLabel = (type: RuleType) => {
@@ -81,6 +89,8 @@ export const ruleTypeColors: Record<RuleType, string> = {
     "bg-purple-500/10 text-purple-400 hover:bg-purple-500/20 border-purple-500/50",
   "deployment-version-selector":
     "bg-purple-500/10 text-purple-400 hover:bg-purple-500/20 border-purple-500/50",
+  concurrency:
+    "bg-yellow-500/10 text-yellow-400 hover:bg-yellow-500/20 border-yellow-500/50",
 } as const;
 
 export const getTypeColorClass = (type: RuleType): string => {

apps/webservice/src/app/[workspaceSlug]/(app)/policies/[policyId]/_components/PolicyTabs.tsx

@@ -24,6 +24,7 @@ export const PolicyTabs: React.FC = () => {
   const timeWindowsUrl = editUrls.timeWindows();
   const deploymentFlowUrl = editUrls.deploymentFlow();
   const qualitySecurityUrl = editUrls.qualitySecurity();
+  const concurrencyUrl = editUrls.concurrency();
 
   const pathname = usePathname();
 
@@ -33,6 +34,7 @@ export const PolicyTabs: React.FC = () => {
     if (pathname === timeWindowsUrl) return "time-windows";
     if (pathname === deploymentFlowUrl) return "deployment-flow";
     if (pathname === qualitySecurityUrl) return "quality-security";
+    if (pathname === concurrencyUrl) return "concurrency";
     return "overview";
   };
 
@@ -46,6 +48,7 @@ export const PolicyTabs: React.FC = () => {
     if (value === "time-windows") router.push(timeWindowsUrl);
     if (value === "deployment-flow") router.push(deploymentFlowUrl);
     if (value === "quality-security") router.push(qualitySecurityUrl);
+    if (value === "concurrency") router.push(concurrencyUrl);
     setActiveTab(value);
   };
 
@@ -65,6 +68,10 @@ export const PolicyTabs: React.FC = () => {
           <IconTag className="h-4 w-4" />
           Version Conditions
         </TabsTrigger>
+        <TabsTrigger value="concurrency" className="flex items-center gap-1">
+          <IconCircleCheck className="h-4 w-4" />
+          Concurrency
+        </TabsTrigger>
         <TabsTrigger
           value="quality-security"
           className="flex items-center gap-1"

apps/webservice/src/app/[workspaceSlug]/(app)/policies/[policyId]/edit/_components/PolicyEditTabs.tsx

@@ -48,6 +48,12 @@ export const PolicyEditTabs: React.FC = () => {
       description: "Control deployment progression",
       href: policyEditUrls.deploymentFlow(),
     },
+    {
+      id: "concurrency",
+      label: "Concurrency",
+      description: "Control the number of concurrent deployments",
+      href: policyEditUrls.concurrency(),
+    },
     {
       id: "quality-security",
       label: "Quality & Security",

apps/webservice/src/app/[workspaceSlug]/(app)/policies/[policyId]/edit/_components/PolicyFormContext.tsx

@@ -23,6 +23,7 @@ type Policy = SCHEMA.Policy & {
   versionAnyApprovals: SCHEMA.PolicyRuleAnyApproval | null;
   versionUserApprovals: SCHEMA.PolicyRuleUserApproval[];
   versionRoleApprovals: SCHEMA.PolicyRuleRoleApproval[];
+  concurrency: SCHEMA.PolicyRuleConcurrency | null;
 };
 
 type PolicyFormContextType = {
@@ -45,11 +46,11 @@ export const PolicyFormContextProvider: React.FC<{
   children: React.ReactNode;
   policy: Policy;
 }> = ({ children, policy }) => {
-  console.log(policy);
-
+  const concurrency = policy.concurrency?.concurrency ?? null;
+  const defaultValues = { ...policy, concurrency };
   const form = useForm({
     schema: SCHEMA.updatePolicy,
-    defaultValues: policy,
+    defaultValues,
   });
 
   console.log(form.getValues());

apps/webservice/src/app/[workspaceSlug]/(app)/policies/[policyId]/edit/concurrency/EditConcurrency.tsx

@@ -0,0 +1,55 @@
+"use client";
+
+import { Button } from "@ctrlplane/ui/button";
+import {
+  FormControl,
+  FormField,
+  FormItem,
+  FormMessage,
+} from "@ctrlplane/ui/form";
+import { Input } from "@ctrlplane/ui/input";
+
+import { usePolicyFormContext } from "../_components/PolicyFormContext";
+
+export const EditConcurrency: React.FC = () => {
+  const { form } = usePolicyFormContext();
+  return (
+    <div className="space-y-6">
+      <div className="max-w-xl space-y-1">
+        <h2 className="text-lg font-semibold">Concurrency</h2>
+        <p className="text-sm text-muted-foreground">
+          Control the number of concurrent deployments
+        </p>
+      </div>
+
+      <FormField
+        control={form.control}
+        name="concurrency"
+        render={({ field: { value, onChange } }) => (
+          <FormItem>
+            <FormControl>
+              <Input
+                type="number"
+                value={value ?? ""}
+                onChange={(e) => {
+                  const value = e.target.valueAsNumber;
+                  const parsedValue = Number.isNaN(value) ? null : value;
+                  onChange(parsedValue);
+                }}
+                className="w-20"
+              />
+            </FormControl>
+            <FormMessage />
+          </FormItem>
+        )}
+      />
+
+      <Button
+        type="submit"
+        disabled={form.formState.isSubmitting || !form.formState.isDirty}
+      >
+        Save
+      </Button>
+    </div>
+  );
+};

apps/webservice/src/app/[workspaceSlug]/(app)/policies/[policyId]/edit/concurrency/page.tsx

@@ -0,0 +1,5 @@
+import { EditConcurrency } from "./EditConcurrency";
+
+export default function EditConcurrencyPage() {
+  return <EditConcurrency />;
+}

apps/webservice/src/app/[workspaceSlug]/(app)/policies/[policyId]/page.tsx

@@ -28,12 +28,11 @@ export default async function PolicyPage(props: {
       policy.versionAnyApprovals != null ||
       policy.versionUserApprovals.length > 0 ||
       policy.versionRoleApprovals.length > 0
-    ) {
+    )
       rules.push("approval-gate");
-    }
-    if (policy.deploymentVersionSelector != null) {
+    if (policy.deploymentVersionSelector != null)
       rules.push("deployment-version-selector");
-    }
+    if (policy.concurrency != null) rules.push("concurrency");
     return rules;
   };
 
@@ -109,6 +108,14 @@ export default async function PolicyPage(props: {
                       Version Conditions
                     </Badge>
                   )}
+                  {rules.includes("concurrency") && (
+                    <Badge
+                      variant="outline"
+                      className="border-yellow-500 text-yellow-500"
+                    >
+                      Concurrency
+                    </Badge>
+                  )}
                 </div>
               )}
             </div>

apps/webservice/src/app/[workspaceSlug]/(app)/policies/create/_components/Concurrency.tsx

@@ -0,0 +1,45 @@
+import {
+  FormControl,
+  FormField,
+  FormItem,
+  FormMessage,
+} from "@ctrlplane/ui/form";
+import { Input } from "@ctrlplane/ui/input";
+
+import { usePolicyContext } from "./PolicyContext";
+
+export const Concurrency: React.FC = () => {
+  const { form } = usePolicyContext();
+  return (
+    <div className="space-y-6">
+      <div className="max-w-xl space-y-1">
+        <h2 className="text-lg font-semibold">Concurrency</h2>
+        <p className="text-sm text-muted-foreground">
+          Control the number of concurrent deployments
+        </p>
+      </div>
+
+      <FormField
+        control={form.control}
+        name="concurrency"
+        render={({ field: { value, onChange } }) => (
+          <FormItem>
+            <FormControl>
+              <Input
+                type="number"
+                value={value ?? ""}
+                onChange={(e) => {
+                  const value = e.target.valueAsNumber;
+                  const parsedValue = Number.isNaN(value) ? null : value;
+                  onChange(parsedValue);
+                }}
+                className="w-20"
+              />
+            </FormControl>
+            <FormMessage />
+          </FormItem>
+        )}
+      />
+    </div>
+  );
+};

apps/webservice/src/app/[workspaceSlug]/(app)/policies/create/_components/PolicyContext.tsx

@@ -21,6 +21,7 @@ export type PolicyTab =
   | "config"
   | "time-windows"
   | "deployment-flow"
+  | "concurrency"
   | "quality-security";
 
 type PolicyContextType = {
@@ -45,6 +46,7 @@ const defaultPolicy: CreatePolicy = {
   versionAnyApprovals: null,
   versionUserApprovals: [],
   versionRoleApprovals: [],
+  concurrency: null,
 };
 
 const PolicyContext = createContext<PolicyContextType>({
@@ -82,6 +84,7 @@ export const PolicyContextProvider: React.FC<{
       versionAnyApprovals: null,
       versionUserApprovals: [],
       versionRoleApprovals: [],
+      concurrency: null,
     },
   });
   const [activeTab, setActiveTab] = useState<PolicyTab>("config");
@@ -93,6 +96,11 @@ export const PolicyContextProvider: React.FC<{
   const createPolicy = api.policy.create.useMutation();
 
   const onSubmit = form.handleSubmit((data) => {
+    const { errors } = form.formState;
+    for (const error of Object.values(errors))
+      if (error.message != null)
+        toast.error("Error creating policy", { description: error.message });
+
     const targets = data.targets.map(convertEmptySelectorsToNull);
     const isTargetsValid = targets.every(isValidTarget);
     if (!isTargetsValid) {

apps/webservice/src/app/[workspaceSlug]/(app)/policies/create/_components/PolicyCreationTabs.tsx

@@ -12,6 +12,7 @@ import {
   QualitySecurity,
   TimeWindows,
 } from ".";
+import { Concurrency } from "./Concurrency";
 import { usePolicyContext } from "./PolicyContext";
 
 interface TabConfig {
@@ -36,6 +37,11 @@ const POLICY_TABS: TabConfig[] = [
     label: "Deployment Flow",
     description: "Control deployment progression",
   },
+  {
+    id: "concurrency",
+    label: "Concurrency",
+    description: "Control the number of concurrent deployments",
+  },
   {
     id: "quality-security",
     label: "Quality & Security",
@@ -56,6 +62,8 @@ export const PolicyCreationTabs: React.FC<{
         return <TimeWindows />;
       case "deployment-flow":
         return <DeploymentFlow />;
+      case "concurrency":
+        return <Concurrency />;
       case "quality-security":
         return <QualitySecurity workspaceId={workspaceId} />;
     }

apps/webservice/src/app/api/v1/policies/[policyId]/openapi.ts

@@ -77,6 +77,9 @@ export const openapi: Swagger.SwaggerV3 = {
                       required: ["roleId"],
                     },
                   },
+                  concurrency: {
+                    $ref: "#/components/schemas/PolicyConcurrency",
+                  },
                 },
               },
             },

apps/webservice/src/app/api/v1/policies/openapi.ts

@@ -67,6 +67,7 @@ export const openapi: Swagger.SwaggerV3 = {
         },
         required: ["roleId", "requiredApprovalsCount"],
       },
+      PolicyConcurrency: { type: "number", nullable: true },
       Policy: {
         type: "object",
         properties: {
@@ -99,6 +100,9 @@ export const openapi: Swagger.SwaggerV3 = {
             type: "array",
             items: { $ref: "#/components/schemas/VersionRoleApproval" },
           },
+          concurrency: {
+            $ref: "#/components/schemas/PolicyConcurrency",
+          },
         },
         required: [
           "id",

apps/webservice/src/app/urls.ts

@@ -59,6 +59,7 @@ const workspacePolicyEdit = (slug: string, policyId: string) => {
     timeWindows: () => buildUrl(...base, "time-windows"),
     deploymentFlow: () => buildUrl(...base, "deployment-flow"),
     qualitySecurity: () => buildUrl(...base, "quality-security"),
+    concurrency: () => buildUrl(...base, "concurrency"),
     approvalGates: () => buildUrl(...base, "approval-gates"),
   };
 };