🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.
Refactor Organization Members page and dialogs for improved functionality and UI consistency
Bill Yang469846ccf7c3
diff --git a/client/src/app/settings/organization/members/components/EditOrganizationDialog.tsx b/client/src/app/settings/organization/members/components/EditOrganizationDialog.tsxdeleted file mode 100644index ac3081295..000000000--- a/client/src/app/settings/organization/members/components/EditOrganizationDialog.tsx+++ /dev/null@@ -1,87 +0,0 @@-"use client";--import { useState } from "react";-import { Button } from "@/components/ui/button";-import { Dialog } from "@/components/ui/dialog";-import { DialogContent } from "@/components/ui/dialog";-import { DialogHeader } from "@/components/ui/dialog";-import { DialogTitle } from "@/components/ui/dialog";-import { DialogTrigger } from "@/components/ui/dialog";-import { DialogFooter } from "@/components/ui/dialog";-import { DialogDescription } from "@/components/ui/dialog";-import { Input } from "@/components/ui/input";-import { Label } from "@/components/ui/label";-import { Edit } from "lucide-react";-import { authClient } from "@/lib/auth";-import { toast } from "sonner";-import { Organization } from "../page";--interface EditOrganizationDialogProps {- organization: Organization;- onSuccess: () => void;-}--export function EditOrganizationDialog({ organization, onSuccess }: EditOrganizationDialogProps) {- const [name, setName] = useState(organization.name);- const [isLoading, setIsLoading] = useState(false);- const [open, setOpen] = useState(false);-- const handleUpdate = async () => {- if (!name) {- toast.error("Organization name is required");- return;- }-- setIsLoading(true);- try {- // Using the appropriate method and parameters based on Better Auth API- await authClient.organization.update({- organizationId: organization.id,- data: { name },- });-- toast.success("Organization updated successfully");- setOpen(false);- onSuccess();- } catch (error: any) {- toast.error(error.message || "Failed to update organization");- } finally {- setIsLoading(false);- }- };-- return (- <Dialog open={open} onOpenChange={setOpen}>- <DialogTrigger asChild>- <Button size="sm" variant="outline">- <Edit className="h-4 w-4 mr-1" />- Edit- </Button>- </DialogTrigger>- <DialogContent className="max-w-lg">- <DialogHeader>- <DialogTitle>Edit Organization</DialogTitle>- <DialogDescription>Update the details of your organization.</DialogDescription>- </DialogHeader>- <div className="grid gap-4 py-4">- <div className="grid gap-2">- <Label htmlFor="name">Organization Name</Label>- <Input- id="name"- value={name}- onChange={(e: React.ChangeEvent<HTMLInputElement>) => setName(e.target.value)}- />- </div>- </div>- <DialogFooter>- <Button variant="outline" onClick={() => setOpen(false)}>- Cancel- </Button>- <Button onClick={handleUpdate} disabled={isLoading} variant="success">- {isLoading ? "Updating..." : "Update Organization"}- </Button>- </DialogFooter>- </DialogContent>- </Dialog>- );-}diff --git a/client/src/app/settings/organization/members/page.tsx b/client/src/app/settings/organization/members/page.tsxindex 0e3b23f4c..790d55c6b 100644--- a/client/src/app/settings/organization/members/page.tsx+++ b/client/src/app/settings/organization/members/page.tsx@@ -4,21 +4,19 @@ import { Card, CardContent, CardHeader, CardTitle } from "../../../../componentsimport { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "../../../../components/ui/table";import { authClient } from "../../../../lib/auth";+import { useEffect, useState } from "react";+import { toast } from "sonner";import { useOrganizationMembers } from "../../../../api/admin/auth";import { useOrganizationInvitations } from "../../../../api/admin/organizations";import { NoOrganization } from "../../../../components/NoOrganization";-import { InviteMemberDialog } from "./components/InviteMemberDialog";+import { Button } from "../../../../components/ui/button";+import { Input } from "../../../../components/ui/input";import { useSetPageTitle } from "../../../../hooks/useSetPageTitle";-import { EditOrganizationDialog } from "./components/EditOrganizationDialog";-import { DeleteOrganizationDialog } from "./components/DeleteOrganizationDialog";-import { RemoveMemberDialog } from "./components/RemoveMemberDialog";-import { Invitations } from "./components/Invitations";import { IS_CLOUD } from "../../../../lib/const";import { CreateUserDialog } from "./components/CreateUserDialog";-import { Input } from "../../../../components/ui/input";-import { useEffect, useState } from "react";-import { Button } from "../../../../components/ui/button";-import { toast } from "sonner";+import { Invitations } from "./components/Invitations";+import { InviteMemberDialog } from "./components/InviteMemberDialog";+import { RemoveMemberDialog } from "./components/RemoveMemberDialog";// Types for our componentexport type Organization = {@@ -65,6 +63,7 @@ function Organization({const { data } = authClient.useSession();const isOwner = members?.data.find(member => member.role === "owner" && member.userId === data?.user?.id);+ const isAdmin = members?.data.find(member => member.role === "admin" && member.userId === data?.user?.id) || isOwner;const handleRefresh = () => {refetch();@@ -139,7 +138,6 @@ function Organization({) : (<CreateUserDialog organizationId={org.id} onSuccess={handleRefresh} />)}- <EditOrganizationDialog organization={org} onSuccess={handleRefresh} /></>)}</div>@@ -192,9 +190,9 @@ function Organization({.toLocal().toLocaleString(DateTime.DATE_SHORT)}</TableCell>- {isOwner && (+ {isAdmin && (<TableCell className="text-right">- {member.role !== "owner" && (+ {(isOwner || member.role !== "owner") && (<RemoveMemberDialog member={member} organizationId={org.id} onSuccess={handleRefresh} />)}</TableCell>diff --git a/client/src/components/ui/table.tsx b/client/src/components/ui/table.tsxindex e8ed2099c..97fb1b9f6 100644--- a/client/src/components/ui/table.tsx+++ b/client/src/components/ui/table.tsx@@ -14,7 +14,7 @@ Table.displayName = "Table";const TableHeader = React.forwardRef<HTMLTableSectionElement, React.HTMLAttributes<HTMLTableSectionElement>>(({ className, ...props }, ref) => (- <thead ref={ref} className={cn("[&_tr]:border-b-0 bg-neutral-100 dark:bg-neutral-850", className)} {...props} />+ <thead ref={ref} className={cn("[&_tr]:border-b-0 bg-neutral-50 dark:bg-neutral-850", className)} {...props} />));TableHeader.displayName = "TableHeader";@@ -42,7 +42,7 @@ const TableRow = React.forwardRef<HTMLTableRowElement, React.HTMLAttributes<HTML<trref={ref}className={cn(- "border-b border-b-neutral-100 transition-colors hover:bg-neutral-100/50 data-[state=selected]:bg-neutral-100 dark:border-b-neutral-800 dark:hover:bg-neutral-800/20 dark:data-[state=selected]:bg-neutral-800",+ "border-b border-b-neutral-100 transition-colors hover:bg-neutral-0 data-[state=selected]:bg-neutral-100 dark:border-b-neutral-800 dark:hover:bg-neutral-800/20 dark:data-[state=selected]:bg-neutral-800",className)}{...props}diff --git a/server/src/lib/auth.ts b/server/src/lib/auth.tsindex 4f5641af8..3f27048bc 100644--- a/server/src/lib/auth.ts+++ b/server/src/lib/auth.ts@@ -159,11 +159,17 @@ export const auth = betterAuth({before: async userUpdate => {// Security: Prevent role field from being updated via regular update-user endpoint// Role changes should only go through the admin setRole endpoint- if (userUpdate && typeof userUpdate === "object" && "role" in userUpdate) {- // Remove role from the update data- const { role: _, ...dataWithoutRole } = userUpdate;+ if (userUpdate && typeof userUpdate === "object") {+ if ("role" in userUpdate) {+ // Remove role from the update data+ const { role: _, ...dataWithoutRole } = userUpdate;+ return {+ data: dataWithoutRole,+ };+ }+ // Always return the data, even if role wasn't presentreturn {- data: dataWithoutRole,+ data: userUpdate,};}},