feat: redeploy based on job status #610
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -0,0 +1,256 @@ | ||||||
| import type React from "react"; | ||||||
| import { useState } from "react"; | ||||||
| import { useRouter } from "next/navigation"; | ||||||
| import { capitalCase } from "change-case"; | ||||||
|
|
||||||
| import { Badge } from "@ctrlplane/ui/badge"; | ||||||
| import { Button } from "@ctrlplane/ui/button"; | ||||||
| import { | ||||||
| Dialog, | ||||||
| DialogClose, | ||||||
| DialogContent, | ||||||
| DialogDescription, | ||||||
| DialogFooter, | ||||||
| DialogHeader, | ||||||
| DialogTitle, | ||||||
| DialogTrigger, | ||||||
| } from "@ctrlplane/ui/dialog"; | ||||||
| import { | ||||||
| HoverCard, | ||||||
| HoverCardContent, | ||||||
| HoverCardTrigger, | ||||||
| } from "@ctrlplane/ui/hover-card"; | ||||||
| import { Label } from "@ctrlplane/ui/label"; | ||||||
| import { | ||||||
| Select, | ||||||
| SelectContent, | ||||||
| SelectItem, | ||||||
| SelectTrigger, | ||||||
| SelectValue, | ||||||
| } from "@ctrlplane/ui/select"; | ||||||
| import { toast } from "@ctrlplane/ui/toast"; | ||||||
| import { JobStatus } from "@ctrlplane/validators/jobs"; | ||||||
|
|
||||||
| import { api } from "~/trpc/react"; | ||||||
|
|
||||||
| type Job = { id: string; status: JobStatus }; | ||||||
|
|
||||||
| type ReleaseTarget = { | ||||||
| id: string; | ||||||
| resource: { id: string; name: string }; | ||||||
| latestJob: Job; | ||||||
| }; | ||||||
|
|
||||||
| const ALL_JOBS_STATUS = "all"; | ||||||
|
|
||||||
| const useFilterByJobStatus = (releaseTargets: ReleaseTarget[]) => { | ||||||
| const [selectedStatus, setSelectedStatus] = useState< | ||||||
| JobStatus | typeof ALL_JOBS_STATUS | ||||||
| >(ALL_JOBS_STATUS); | ||||||
| const [filteredReleaseTargets, setFilteredReleaseTargets] = | ||||||
| useState<ReleaseTarget[]>(releaseTargets); | ||||||
|
|
||||||
| const onSelectStatus = (status: JobStatus | typeof ALL_JOBS_STATUS) => { | ||||||
| setSelectedStatus(status); | ||||||
| if (status === ALL_JOBS_STATUS) { | ||||||
| setFilteredReleaseTargets(releaseTargets); | ||||||
| return; | ||||||
| } | ||||||
|
|
||||||
| const filteredReleaseTargets = releaseTargets.filter( | ||||||
| ({ latestJob }) => latestJob.status === status, | ||||||
| ); | ||||||
| setFilteredReleaseTargets(filteredReleaseTargets); | ||||||
| }; | ||||||
|
|
||||||
| return { | ||||||
| selectedStatus, | ||||||
| filteredReleaseTargets, | ||||||
| onSelectStatus, | ||||||
| }; | ||||||
| }; | ||||||
|
|
||||||
| const JobStatusSelector: React.FC<{ | ||||||
| value: JobStatus | typeof ALL_JOBS_STATUS; | ||||||
| onChange: (value: JobStatus | typeof ALL_JOBS_STATUS) => void; | ||||||
| }> = ({ value, onChange }) => { | ||||||
| return ( | ||||||
| <div className="space-y-2"> | ||||||
| <Label>Select jobs to override by status</Label> | ||||||
| <Select value={value} onValueChange={onChange}> | ||||||
| <SelectTrigger> | ||||||
| <SelectValue /> | ||||||
| </SelectTrigger> | ||||||
| <SelectContent> | ||||||
| <SelectItem value={ALL_JOBS_STATUS}>All statuses</SelectItem> | ||||||
| {Object.values(JobStatus).map((status) => ( | ||||||
| <SelectItem key={status} value={status}> | ||||||
| {capitalCase(status)} | ||||||
| </SelectItem> | ||||||
| ))} | ||||||
| </SelectContent> | ||||||
| </Select> | ||||||
| </div> | ||||||
| ); | ||||||
| }; | ||||||
|
|
||||||
| const SelectedResourcesHoverList: React.FC<{ | ||||||
| releaseTargets: ReleaseTarget[]; | ||||||
| }> = ({ releaseTargets }) => { | ||||||
| const resources = releaseTargets.map(({ resource }) => resource); | ||||||
|
|
||||||
| return ( | ||||||
| <HoverCard> | ||||||
| <div className="flex items-center gap-2"> | ||||||
| <span className="text-sm text-muted-foreground">Redeploying to:</span> | ||||||
| <HoverCardTrigger asChild> | ||||||
| <Badge variant="secondary" className="h-7 text-xs"> | ||||||
| {resources.length} resources | ||||||
| </Badge> | ||||||
| </HoverCardTrigger> | ||||||
| </div> | ||||||
| <HoverCardContent className="w-80 p-2" align="center" side="right"> | ||||||
| <div className="flex flex-col gap-2"> | ||||||
| {resources.map((resource) => ( | ||||||
| <span | ||||||
| key={resource.id} | ||||||
| className="truncate text-sm text-muted-foreground" | ||||||
| > | ||||||
| {resource.name} | ||||||
| </span> | ||||||
| ))} | ||||||
| </div> | ||||||
| </HoverCardContent> | ||||||
| </HoverCard> | ||||||
| ); | ||||||
| }; | ||||||
|
|
||||||
| const useRedeployReleaseTargets = ( | ||||||
| environmentId: string, | ||||||
| releaseTargetIds: string[], | ||||||
| force: boolean, | ||||||
| onClose?: () => void, | ||||||
| ) => { | ||||||
| const redeploy = api.redeploy.toEnvironment.useMutation(); | ||||||
|
Contributor
There was a problem hiding this comment. Use the correct API endpoint for redeploying release targets. The hook should use the new Apply this fix: - const redeploy = api.redeploy.toEnvironment.useMutation();
+ const redeploy = api.redeploy.toReleaseTargets.useMutation();📝 Committable suggestion
Suggested change
🤖 Prompt for AI Agents |
||||||
| const router = useRouter(); | ||||||
|
|
||||||
| const handleRedeploy = () => | ||||||
| redeploy | ||||||
| .mutateAsync({ environmentId, releaseTargetIds, force }) | ||||||
| .then(() => toast.success("Jobs queued successfully")) | ||||||
| .then(() => router.refresh()) | ||||||
| .then(() => onClose?.()); | ||||||
|
|
||||||
| return { handleRedeploy, isPending: redeploy.isPending }; | ||||||
| }; | ||||||
|
|
||||||
| export const RedeployReleaseTargetsDialog: React.FC<{ | ||||||
| environment: { id: string }; | ||||||
| releaseTargets: ReleaseTarget[]; | ||||||
| children: React.ReactNode; | ||||||
| onClose?: () => void; | ||||||
| }> = ({ environment, releaseTargets, children, onClose }) => { | ||||||
| const [open, setOpen] = useState(false); | ||||||
| const { selectedStatus, filteredReleaseTargets, onSelectStatus } = | ||||||
| useFilterByJobStatus(releaseTargets); | ||||||
|
|
||||||
| const { handleRedeploy, isPending } = useRedeployReleaseTargets( | ||||||
| environment.id, | ||||||
| filteredReleaseTargets.map(({ id }) => id), | ||||||
| false, | ||||||
| onClose, | ||||||
| ); | ||||||
|
|
||||||
| return ( | ||||||
| <Dialog | ||||||
| open={open} | ||||||
| onOpenChange={(open) => { | ||||||
| if (!open) onClose?.(); | ||||||
| setOpen(open); | ||||||
| }} | ||||||
| > | ||||||
| <DialogTrigger asChild>{children}</DialogTrigger> | ||||||
| <DialogContent className="space-y-4" onClick={(e) => e.stopPropagation()}> | ||||||
| <DialogHeader> | ||||||
| <DialogTitle>Redeploy resources</DialogTitle> | ||||||
| <DialogDescription> | ||||||
| This will redeploy to the selected resources. | ||||||
| </DialogDescription> | ||||||
| </DialogHeader> | ||||||
|
|
||||||
| <JobStatusSelector value={selectedStatus} onChange={onSelectStatus} /> | ||||||
|
|
||||||
| <SelectedResourcesHoverList releaseTargets={filteredReleaseTargets} /> | ||||||
|
|
||||||
| <DialogFooter className="flex justify-between sm:justify-between"> | ||||||
| <DialogClose asChild> | ||||||
| <Button variant="outline">Cancel</Button> | ||||||
| </DialogClose> | ||||||
|
|
||||||
| <Button | ||||||
| onClick={handleRedeploy} | ||||||
| disabled={isPending || filteredReleaseTargets.length === 0} | ||||||
| > | ||||||
| Redeploy | ||||||
| </Button> | ||||||
| </DialogFooter> | ||||||
| </DialogContent> | ||||||
| </Dialog> | ||||||
| ); | ||||||
| }; | ||||||
|
|
||||||
| export const ForceDeployReleaseTargetsDialog: React.FC<{ | ||||||
| environment: { id: string }; | ||||||
| releaseTargets: ReleaseTarget[]; | ||||||
| children: React.ReactNode; | ||||||
| onClose?: () => void; | ||||||
| }> = ({ environment, releaseTargets, children, onClose }) => { | ||||||
| const [open, setOpen] = useState(false); | ||||||
| const { selectedStatus, filteredReleaseTargets, onSelectStatus } = | ||||||
| useFilterByJobStatus(releaseTargets); | ||||||
|
|
||||||
| const { handleRedeploy, isPending } = useRedeployReleaseTargets( | ||||||
| environment.id, | ||||||
| filteredReleaseTargets.map(({ id }) => id), | ||||||
| true, | ||||||
| onClose, | ||||||
| ); | ||||||
|
|
||||||
| return ( | ||||||
| <Dialog | ||||||
| open={open} | ||||||
| onOpenChange={(open) => { | ||||||
| if (!open) onClose?.(); | ||||||
| setOpen(open); | ||||||
| }} | ||||||
| > | ||||||
| <DialogTrigger asChild>{children}</DialogTrigger> | ||||||
| <DialogContent className="space-y-4" onClick={(e) => e.stopPropagation()}> | ||||||
| <DialogHeader> | ||||||
| <DialogTitle>Force deploy resources</DialogTitle> | ||||||
| <DialogDescription> | ||||||
| Are you sure? This will force deploy to the selected resources. | ||||||
| </DialogDescription> | ||||||
| </DialogHeader> | ||||||
|
|
||||||
| <JobStatusSelector value={selectedStatus} onChange={onSelectStatus} /> | ||||||
|
|
||||||
| <SelectedResourcesHoverList releaseTargets={filteredReleaseTargets} /> | ||||||
|
|
||||||
| <DialogFooter className="flex justify-between sm:justify-between"> | ||||||
| <DialogClose asChild> | ||||||
| <Button variant="outline">Cancel</Button> | ||||||
| </DialogClose> | ||||||
|
|
||||||
| <Button | ||||||
| variant="destructive" | ||||||
| onClick={handleRedeploy} | ||||||
| disabled={isPending || filteredReleaseTargets.length === 0} | ||||||
| > | ||||||
| Force deploy | ||||||
| </Button> | ||||||
| </DialogFooter> | ||||||
| </DialogContent> | ||||||
| </Dialog> | ||||||
| ); | ||||||
| }; | ||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🛠️ Refactor suggestion
Add useEffect to sync filtered data when releaseTargets changes.
The hook maintains
filteredReleaseTargetsin local state but doesn't update it when thereleaseTargetsprop changes. This could lead to stale data if the parent component updates the array.Add a useEffect to keep the filtered data in sync:
🤖 Prompt for AI Agents