add + remove users from organisation

packages/frontend/src/components/add-member-dialog.tsx

@@ -0,0 +1,141 @@
+import { type FormEvent, useState } from "react";
+import { Button } from "@/components/ui/button";
+import {
+    Dialog,
+    DialogClose,
+    DialogContent,
+    DialogHeader,
+    DialogTitle,
+    DialogTrigger,
+} from "@/components/ui/dialog";
+import { Field } from "@/components/ui/field";
+import { organisation, user } from "@/lib/server";
+
+export function AddMemberDialog({
+    organisationId,
+    existingMembers,
+    trigger,
+    onSuccess,
+}: {
+    organisationId: number;
+    existingMembers: string[];
+    trigger?: React.ReactNode;
+    onSuccess?: () => void | Promise<void>;
+}) {
+    const [open, setOpen] = useState(false);
+    const [username, setUsername] = useState("");
+    const [submitAttempted, setSubmitAttempted] = useState(false);
+    const [submitting, setSubmitting] = useState(false);
+    const [error, setError] = useState<string | null>(null);
+
+    const reset = () => {
+        setUsername("");
+        setSubmitAttempted(false);
+        setSubmitting(false);
+        setError(null);
+    };
+
+    const onOpenChange = (nextOpen: boolean) => {
+        setOpen(nextOpen);
+        if (!nextOpen) {
+            reset();
+        }
+    };
+
+    const handleSubmit = async (e: FormEvent) => {
+        e.preventDefault();
+        setError(null);
+        setSubmitAttempted(true);
+
+        if (username.trim() === "") {
+            return;
+        }
+
+        if (existingMembers.includes(username)) {
+            setError("user is already a member of this organisation");
+            return;
+        }
+
+        setSubmitting(true);
+        try {
+            let userId: number | null = null;
+            await user.byUsername({
+                username,
+                onSuccess: (userData) => {
+                    userId = userData.id;
+                },
+                onError: (err) => {
+                    setError(err || "user not found");
+                    setSubmitting(false);
+                },
+            });
+
+            if (!userId) {
+                return;
+            }
+
+            await organisation.addMember({
+                organisationId,
+                userId,
+                role: "member",
+                onSuccess: async () => {
+                    setOpen(false);
+                    reset();
+                    try {
+                        await onSuccess?.();
+                    } catch (actionErr) {
+                        console.error(actionErr);
+                    }
+                },
+                onError: (err) => {
+                    setError(err || "failed to add member");
+                    setSubmitting(false);
+                },
+            });
+        } catch (err) {
+            console.error(err);
+            setError("failed to add member");
+            setSubmitting(false);
+        }
+    };
+
+    return (
+        <Dialog open={open} onOpenChange={onOpenChange}>
+            <DialogTrigger asChild>{trigger || <Button variant="outline">Add Member</Button>}</DialogTrigger>
+
+            <DialogContent className={"w-md"}>
+                <DialogHeader>
+                    <DialogTitle>Add Member</DialogTitle>
+                </DialogHeader>
+
+                <form onSubmit={handleSubmit}>
+                    <div className="grid mt-2">
+                        <Field
+                            label="Username"
+                            value={username}
+                            onChange={(e) => setUsername(e.target.value)}
+                            validate={(v) => (v.trim() === "" ? "Cannot be empty" : undefined)}
+                            submitAttempted={submitAttempted}
+                            placeholder="Enter username"
+                            error={error || undefined}
+                        />
+
+                        <div className="flex gap-2 w-full justify-end mt-2">
+                            <DialogClose asChild>
+                                <Button variant="outline" type="button">
+                                    Cancel
+                                </Button>
+                            </DialogClose>
+                            <Button
+                                type="submit"
+                                disabled={submitting || (username.trim() === "" && submitAttempted)}
+                            >
+                                {submitting ? "Adding..." : "Add"}
+                            </Button>
+                        </div>
+                    </div>
+                </form>
+            </DialogContent>
+        </Dialog>
+    );
+}

packages/frontend/src/components/ui/confirm-dialog.tsx

@@ -0,0 +1,57 @@
+import { useState } from "react";
+import { Button } from "./button";
+import { Dialog, DialogClose, DialogContent, DialogHeader, DialogTitle } from "./dialog";
+ 
+export function ConfirmDialog({
+    open,
+    onOpenChange,
+    onConfirm,
+    title,
+    message,
+    processingText = "Processing...",
+    confirmText = "Confirm",
+    cancelText = "Cancel",
+    variant = "default",
+}: {
+    open: boolean;
+    onOpenChange: (open: boolean) => void;
+    onConfirm: () => void;
+    title: string;
+    message: string;
+    processingText?: string;
+    confirmText?: string;
+    cancelText?: string;
+    variant?: "default" | "destructive";
+}) {
+    const [submitting, setSubmitting] = useState(false);
+
+    const handleConfirm = async () => {
+        setSubmitting(true);
+        try {
+            await onConfirm();
+        } finally {
+            setSubmitting(false);
+        }
+    };
+
+    return (
+        <Dialog open={open} onOpenChange={onOpenChange}>
+            <DialogContent>
+                <DialogHeader>
+                    <DialogTitle>{title}</DialogTitle>
+                </DialogHeader>
+                <p className="text-sm text-muted-foreground">{message}</p>
+                <div className="flex gap-2 justify-end mt-4">
+                    <DialogClose asChild>
+                        <Button variant="outline" type="button">
+                            {cancelText}
+                        </Button>
+                    </DialogClose>
+                    <Button variant={variant} onClick={handleConfirm} disabled={submitting}>
+                        {submitting ? processingText : confirmText}
+                    </Button>
+                </div>
+            </DialogContent>
+        </Dialog>
+    );
+}

packages/frontend/src/components/ui/field.tsx

@@ -10,6 +10,7 @@ export function Field({
     hidden = false,
     submitAttempted,
     placeholder,
+    error,
 }: {
     label: string;
     value?: string;
@@ -18,6 +19,7 @@ export function Field({
     hidden?: boolean;
     submitAttempted?: boolean;
     placeholder?: string;
+    error?: string;
 }) {
     const [internalTouched, setInternalTouched] = useState(false);
     const isTouched = submitAttempted || internalTouched;
@@ -43,12 +45,12 @@ export function Field({
                 onChange={onChange}
                 onBlur={() => setInternalTouched(true)}
                 name={label}
-                aria-invalid={invalidMessage !== ""}
+                aria-invalid={error !== undefined || invalidMessage !== ""}
                 type={hidden ? "password" : "text"}
             />
-            <div className="flex items-end justify-end w-full text-xs -mb-0 -mt-1">
-                {invalidMessage !== "" ? (
-                    <Label className="text-destructive text-sm">{invalidMessage}</Label>
+            <div className="flex items-end justify-end w-full text-xs mb-0 -mt-1">
+                {error || invalidMessage !== "" ? (
+                    <Label className="text-destructive text-sm">{error ?? invalidMessage}</Label>
                 ) : (
                     <Label className="opacity-0 text-sm">a</Label>
                 )}