Skip to content

Commit

Permalink
Merge branch 'master' into upgrade-radix
Browse files Browse the repository at this point in the history
  • Loading branch information
SeanCassiere authored Jun 22, 2024
2 parents 3492c99 + 1d3da92 commit 8bf472f
Showing 1 changed file with 19 additions and 26 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -97,32 +97,25 @@ export default function VehicleStatusWidget(props: CommonWidgetProps) {
<div className="flex max-h-8 shrink-0 items-center justify-between gap-2">
<div className="flex grow items-center justify-between">
<span className="font-medium">{widgetName}</span>
<Tooltip delayDuration={250}>
<Select value={vehicleTypeId} onValueChange={setVehicleTypeId}>
<TooltipTrigger asChild>
<SelectTrigger className="h-8 w-auto gap-2">
<SelectValue placeholder="Select a vehicle type" />
</SelectTrigger>
</TooltipTrigger>
<SelectContent align="end">
<SelectGroup>
<SelectLabel>Vehicle types</SelectLabel>
<SelectItem value="0">All</SelectItem>
{vehicleTypes.map((type, idx) => (
<SelectItem
key={`vehicle_status_v_type_${idx}`}
value={String(type.id)}
>
{type.value}
</SelectItem>
))}
</SelectGroup>
</SelectContent>
</Select>
<TooltipContent align="start">
<p>Filter the fleet by vehicle type.</p>
</TooltipContent>
</Tooltip>
<Select value={vehicleTypeId} onValueChange={setVehicleTypeId}>
<SelectTrigger className="h-8 w-auto gap-2">
<SelectValue placeholder="Select a vehicle type" />
</SelectTrigger>
<SelectContent align="end">
<SelectGroup>
<SelectLabel>Vehicle types</SelectLabel>
<SelectItem value="0">All</SelectItem>
{vehicleTypes.map((type, idx) => (
<SelectItem
key={`vehicle_status_v_type_${idx}`}
value={String(type.id)}
>
{type.value}
</SelectItem>
))}
</SelectGroup>
</SelectContent>
</Select>
</div>
<Button
type="button"
Expand Down

0 comments on commit 8bf472f

Please sign in to comment.