🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.
Update organization layout and member page for improved functionality
Bill Yang53b5dc6e2040
diff --git a/client/src/app/settings/organization/layout.tsx b/client/src/app/settings/organization/layout.tsxindex 751756ef2..cc73eaa02 100644--- a/client/src/app/settings/organization/layout.tsx+++ b/client/src/app/settings/organization/layout.tsx@@ -15,10 +15,10 @@ export default function OrganizationLayout({ children }: { children: React.Reactconst [createOrgDialogOpen, setCreateOrgDialogOpen] = useState(false);// Determine active tab from pathname- const activeTab = pathname.includes("/subscription") ? "subscription" : "members";+ const activeTab = pathname.includes("/subscription") ? "subscription" : "organization";const handleTabChange = (value: string) => {- if (value === "members") {+ if (value === "organization") {router.push("/settings/organization/members");} else if (value === "subscription") {router.push("/settings/organization/subscription");@@ -44,9 +44,9 @@ export default function OrganizationLayout({ children }: { children: React.React<Tabs value={activeTab} onValueChange={handleTabChange}><TabsList>- <TabsTrigger value="members" className="flex items-center gap-2">+ <TabsTrigger value="organization" className="flex items-center gap-2"><Users size={16} />- Members+ Organization</TabsTrigger>{IS_CLOUD && (<TabsTrigger value="subscription" className="flex items-center gap-2">diff --git a/client/src/app/settings/organization/members/page.tsx b/client/src/app/settings/organization/members/page.tsxindex fab5f5ebc..e777d0cfd 100644--- a/client/src/app/settings/organization/members/page.tsx+++ b/client/src/app/settings/organization/members/page.tsx@@ -15,6 +15,10 @@ 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";// Types for our componentexport type Organization = {@@ -49,6 +53,13 @@ function Organization({createdAt: Date;};}) {+ const [name, setName] = useState(org.name);+ const [isUpdating, setIsUpdating] = useState(false);++ useEffect(() => {+ setName(org.name);+ }, [org.name]);+const { data: members, refetch, isLoading: membersLoading } = useOrganizationMembers(org.id);const { refetch: refetchInvitations } = useOrganizationInvitations(org.id);const { data } = authClient.useSession();@@ -60,8 +71,54 @@ function Organization({refetchInvitations();};+ const handleOrganizationNameUpdate = async () => {+ if (!name) {+ toast.error("Organization name cannot be empty");+ return;+ }++ try {+ setIsUpdating(true);+ const response = await authClient.organization.update({+ organizationId: org.id,+ data: {+ name,+ },+ });++ if (response.error) {+ throw new Error(response.error.message || "Failed to update organization name");+ }++ toast.success("Name updated successfully");+ window.location.reload();+ } catch (error) {+ console.error("Error updating organization name:", error);+ toast.error(error instanceof Error ? error.message : "Failed to update organization name");+ } finally {+ setIsUpdating(false);+ }+ };+return (<>+ <Card>+ <CardHeader>+ <CardTitle className="text-xl">Organization</CardTitle>+ </CardHeader>+ <CardContent>+ <div className="space-y-2">+ <h4 className="text-sm font-medium">Organization Name</h4>+ <p className="text-xs text-neutral-500">Update your organization name</p>+ <div className="flex space-x-2">+ <Input id="name" value={name} onChange={({ target }) => setName(target.value)} placeholder="name" />+ <Button variant="outline" onClick={handleOrganizationNameUpdate} disabled={name === org.name}>+ {isUpdating ? "Updating..." : "Update"}+ </Button>+ </div>+ </div>+ </CardContent>+ </Card><Card className="w-full"><CardHeader className="pb-2"><div className="flex items-center justify-between flex-wrap gap-2">