diff --git a/packages/frontend/src/components/organisations-dialog.tsx b/packages/frontend/src/components/organisations-dialog.tsx index d08b77c..75b767d 100644 --- a/packages/frontend/src/components/organisations-dialog.tsx +++ b/packages/frontend/src/components/organisations-dialog.tsx @@ -4,7 +4,7 @@ import { type OrganisationMemberResponse, type OrganisationResponse, } from "@issue/shared"; -import { ChevronDown, ChevronUp, Plus, X } from "lucide-react"; +import { ChevronDown, ChevronUp, EllipsisVertical, Plus, X } from "lucide-react"; import type { ReactNode } from "react"; import { useCallback, useEffect, useState } from "react"; import { AddMemberDialog } from "@/components/add-member-dialog"; @@ -16,6 +16,12 @@ import { Button } from "@/components/ui/button"; import ColourPicker from "@/components/ui/colour-picker"; import { ConfirmDialog } from "@/components/ui/confirm-dialog"; import { Dialog, DialogContent, DialogHeader, DialogTitle, DialogTrigger } from "@/components/ui/dialog"; +import { + DropdownMenu, + DropdownMenuContent, + DropdownMenuItem, + DropdownMenuTrigger, +} from "@/components/ui/dropdown-menu"; import { Input } from "@/components/ui/input"; import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select"; import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs"; @@ -207,6 +213,7 @@ function OrganisationsDialog({ newStatuses[trimmed] = newStatusColour; await updateStatuses(newStatuses); setNewStatusName(""); + setNewStatusColour(DEFAULT_STATUS_COLOUR); setIsCreatingStatus(false); setStatusError(null); }; @@ -421,42 +428,58 @@ function OrganisationsDialog({ /> {isAdmin && ( -
- Are you sure you want to remove the "{statusToRemove}" status? Which status
- would you like issues with this status to be set to?
+ Are you sure you want to remove the{" "}
+ {statusToRemove ? (
+