The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.
TypeScript clickhousemysqlnextjsopen-sourceplanetscaleprismatailwindcsstinybirdtypescriptupstashvercel
show disabled tooltip members row
Steven Teyb9b9d8fd0ad5
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/members/page-client.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/members/page-client.tsxdeleted file mode 100644index f6a5db5ab7..0000000000--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/members/page-client.tsx+++ /dev/null@@ -1,516 +0,0 @@-"use client";--import { clientAccessCheck } from "@/lib/client-access-check";-import useWorkspace from "@/lib/swr/use-workspace";-import { WorkspaceUserProps } from "@/lib/types";-import {- getAvailableRolesForPlan,- WORKSPACE_ROLES,-} from "@/lib/workspace-roles";-import { PageContent } from "@/ui/layout/page-content";-import { PageWidthWrapper } from "@/ui/layout/page-width-wrapper";-import { useInviteCodeModal } from "@/ui/modals/invite-code-modal";-import { useInviteWorkspaceUserModal } from "@/ui/modals/invite-workspace-user-modal";-import { useRemoveWorkspaceUserModal } from "@/ui/modals/remove-workspace-user-modal";-import { useWorkspaceUserRoleModal } from "@/ui/modals/update-workspace-user-role";-import { SearchBoxPersisted } from "@/ui/shared/search-box";-import { UserAvatar } from "@/ui/users/user-avatar";-import { WorkspaceRole } from "@dub/prisma/client";-import {- Button,- Filter,- Popover,- Table,- useKeyboardShortcut,- usePagination,- useRouterStuff,- useTable,-} from "@dub/ui";-import {- CircleCheck,- CircleDotted,- Dots,- EnvelopeArrowRight,- Icon,- Link4 as LinkIcon,- UserCheck,-} from "@dub/ui/icons";-import { cn, fetcher, timeAgo } from "@dub/utils";-import { ColumnDef, Row } from "@tanstack/react-table";-import { Command } from "cmdk";-import { UserMinus } from "lucide-react";-import { useSession } from "next-auth/react";-import { useSearchParams } from "next/navigation";-import { useEffect, useMemo, useState } from "react";-import useSWR from "swr";--export function WorkspaceMembersClient() {- const { setShowInviteWorkspaceUserModal, InviteWorkspaceUserModal } =- useInviteWorkspaceUserModal({ showSavedInvites: true });-- const { setShowInviteCodeModal, InviteCodeModal } = useInviteCodeModal();-- const { role, plan } = useWorkspace();- const { data: session } = useSession();- const { id: workspaceId } = useWorkspace();-- const { queryParams, searchParams } = useRouterStuff();- const { pagination, setPagination } = usePagination();-- const status = searchParams.get("status") as "active" | "invited" | null;- const roleFilter = searchParams.get("role") as WorkspaceRole | null;- const search = searchParams.get("search");-- const {- data: users,- error,- isLoading: loading,- } = useSWR<WorkspaceUserProps[]>(- workspaceId &&- `/api/workspaces/${workspaceId}/${status === "invited" ? "invites" : "users"}?${new URLSearchParams(- {- ...(search && { search }),- ...(roleFilter && { role: roleFilter }),- } as Record<string, any>,- ).toString()}`,- fetcher,- {- keepPreviousData: true,- },- );-- const { data: invitesForCount } = useSWR<WorkspaceUserProps[]>(- workspaceId ? `/api/workspaces/${workspaceId}/invites` : null,- fetcher,- );- const inviteCount = invitesForCount?.length ?? 0;-- const availableRolesForPlan = useMemo(() => {- return getAvailableRolesForPlan(plan);- }, [plan]);-- const isCurrentUserOwner = role === "owner";-- const filters = useMemo(- () => [- {- key: "role",- icon: UserCheck,- label: "Role",- options: WORKSPACE_ROLES.filter(({ value }) =>- availableRolesForPlan.includes(value),- ).map(({ value, label, icon }) => ({- value,- label,- icon,- })),- },- {- key: "status",- icon: CircleDotted,- label: "Status",- options: [- {- value: "active",- label: "Active",- icon: (- <CircleCheck className="size-4 bg-green-100 bg-transparent text-green-600" />- ),- },- {- value: "invited",- label: "Invited",- icon: (- <EnvelopeArrowRight className="size-4 bg-blue-100 bg-transparent text-blue-600" />- ),- },- ],- },- ],- [availableRolesForPlan],- );-- // Active filters state- const activeFilters = useMemo(() => {- const filters: { key: string; value: any }[] = [];- if (status) {- filters.push({ key: "status", value: status });- }- if (roleFilter) {- filters.push({ key: "role", value: roleFilter });- }- return filters;- }, [status, roleFilter]);-- useKeyboardShortcut("m", () => setShowInviteWorkspaceUserModal(true));-- const columns = useMemo<ColumnDef<WorkspaceUserProps>[]>(- () => [- {- id: "name",- header: "Name",- accessorFn: (row) => row.name || row.email,- minSize: 360,- size: 870,- maxSize: 900,- cell: ({ row }) => {- const user = row.original;- const isCurrentUser = session?.user?.email === user.email;-- return (- <div className="flex items-center space-x-3">- <UserAvatar user={user} />- <div className="flex flex-col">- <h3 className="text-sm font-medium">- {user.name || user.email}- {isCurrentUser && (- <span className="ml-1 text-neutral-500">(You)</span>- )}- </h3>- <p className="text-xs text-neutral-500">- {status === "invited"- ? `Invited ${timeAgo(user.createdAt)}`- : user.email}- </p>- </div>- </div>- );- },- },- {- id: "role",- header: "Role",- accessorFn: (row) => row.role,- minSize: 120,- size: 150,- maxSize: 200,- cell: ({ row }) =>- !row.original.isMachine && (- <RoleCell- user={row.original}- isCurrentUser={session?.user?.email === row.original.email}- isCurrentUserOwner={isCurrentUserOwner}- />- ),- },- {- id: "menu",- enableHiding: false,- header: () => null,- cell: ({ row }) => (- <RowMenuButton row={row} isCurrentUserOwner={isCurrentUserOwner} />- ),- },- ],- [session?.user?.email, isCurrentUserOwner, status],- );-- const { table, ...tableProps } = useTable({- data: users || [],- columns,- pagination,- onPaginationChange: setPagination,- getRowId: (row) =>- `${row.id || row.email}-${status}-${roleFilter || "all"}`,- thClassName: "border-l-0",- tdClassName: "border-l-0",- resourceName: (p) =>- `${status === "invited" ? "invite" : "member"}${p ? "s" : ""}`,- rowCount: users?.length || 0,- loading,- error: error ? "Failed to load members" : undefined,- });-- const onSelect = (key: string, value: any) => {- queryParams({- set: {- [key]: value,- },- });- };-- const onRemove = (key: string) => {- queryParams({- del: [key, "page"],- });- };-- const onRemoveAll = () => {- queryParams({- del: ["role", "status", "page"],- });- };-- return (- <>- <InviteWorkspaceUserModal />- <InviteCodeModal />- <PageContent- title="Members"- titleInfo={{- title:- "Learn how to [invite teammates](https://dub.co/help/article/how-to-invite-teammates) to your workspace and [assign them different roles and permissions](https://dub.co/help/article/workspace-roles).",- }}- controls={- <div className="flex space-x-2">- <Button- text="Invite member"- onClick={() => setShowInviteWorkspaceUserModal(true)}- className="h-9 w-fit"- shortcut="M"- disabledTooltip={- clientAccessCheck({- action: "workspaces.write",- role,- customPermissionDescription: "invite new teammates",- }).error || undefined- }- />- <Button- icon={<LinkIcon className="h-4 w-4 text-neutral-800" />}- variant="secondary"- onClick={() => setShowInviteCodeModal(true)}- className="h-9 space-x-0"- disabledTooltip={- clientAccessCheck({- action: "workspaces.write",- role,- customPermissionDescription: "generate invite links",- }).error || undefined- }- />- </div>- }- >- <PageWidthWrapper className="mb-20 flex flex-col gap-2">- <div className="flex justify-between gap-3">- <div className="flex items-center gap-2">- <Filter.Select- filters={filters}- activeFilters={activeFilters}- onSelect={onSelect}- onRemove={onRemove}- />- {inviteCount && status !== "invited" ? (- <Button- text="View pending invites"- variant="secondary"- className="w-fit"- right={- inviteCount > 0 ? (- <span className="rounded-full bg-neutral-200 px-1.5 py-0.5 text-xs font-medium text-neutral-700">- {inviteCount}- </span>- ) : undefined- }- onClick={() =>- queryParams({ set: { status: "invited" }, del: "page" })- }- />- ) : undefined}- </div>- <SearchBoxPersisted- placeholder="Search by name or email"- inputClassName="w-full md:w-[20rem]"- />- </div>- <Filter.List- filters={filters}- activeFilters={activeFilters}- onSelect={onSelect}- onRemove={onRemove}- onRemoveAll={onRemoveAll}- />- <Table {...tableProps} table={table} />- </PageWidthWrapper>- </PageContent>- </>- );-}--function RoleCell({- user,- isCurrentUser,- isCurrentUserOwner,-}: {- user: WorkspaceUserProps;- isCurrentUser: boolean;- isCurrentUserOwner: boolean;-}) {- const { plan } = useWorkspace();- const [role, setRole] = useState<WorkspaceRole>(user.role);-- useEffect(() => {- setRole(user.role);- }, [user.role]);-- // Get available roles for plan to determine which to disable- const availableRolesForPlan = useMemo(() => {- return getAvailableRolesForPlan(plan);- }, [plan]);-- const { WorkspaceUserRoleModal, setShowWorkspaceUserRoleModal } =- useWorkspaceUserRoleModal({- user: {- id: user.id || "",- name: user.name || "",- email: user.email || "",- image: user.image || "",- createdAt: user.createdAt,- source: null,- isMachine: false,- hasPassword: false,- provider: null,- },- role,- });-- const isDisabled =- !isCurrentUserOwner || // Only owners can change roles- isCurrentUser; // Can't change your own role-- return (- <>- <WorkspaceUserRoleModal />- <select- className={cn(- "rounded-md border border-neutral-200 text-xs text-neutral-500 focus:border-neutral-600 focus:ring-neutral-600",- {- "cursor-not-allowed bg-neutral-100": isDisabled,- },- )}- value={role}- disabled={isDisabled}- onChange={(e) => {- const newRole = e.target.value as WorkspaceRole;- setRole(newRole);- setShowWorkspaceUserRoleModal(true);- }}- title={- !isCurrentUserOwner- ? "Only owners can change member roles"- : isCurrentUser- ? "You cannot change your own role"- : undefined- }- >- {WORKSPACE_ROLES.map(({ value, label }) => {- return (- <option- key={value}- value={value}- disabled={!availableRolesForPlan.includes(value)}- >- {label}- </option>- );- })}- </select>- </>- );-}--function RowMenuButton({- row,- isCurrentUserOwner,-}: {- row: Row<WorkspaceUserProps>;- isCurrentUserOwner: boolean;-}) {- const [isOpen, setIsOpen] = useState(false);- const { data: session } = useSession();-- const user = row.original;- const searchParams = useSearchParams();- const isInvite = searchParams.get("status") === "invited";-- const { RemoveWorkspaceUserModal, setShowRemoveWorkspaceUserModal } =- useRemoveWorkspaceUserModal({- user: {- id: user.id || "",- name: user.name || "",- email: user.email || "",- image: user.image || "",- createdAt: user.createdAt,- source: null,- isMachine: false,- hasPassword: false,- provider: null,- },- });-- const isCurrentUser = session?.user?.email === user.email;-- // Only show menu if user is owner OR they're removing themselves- if (!isCurrentUserOwner && !isCurrentUser) {- return null;- }-- return (- <>- <RemoveWorkspaceUserModal />- <Popover- openPopover={isOpen}- setOpenPopover={setIsOpen}- content={- <Command tabIndex={0} loop className="focus:outline-none">- <Command.List className="w-screen text-sm focus-visible:outline-none sm:w-auto sm:min-w-[200px]">- <Command.Group className="grid gap-px p-1.5">- <MenuItem- icon={UserMinus}- label={- isCurrentUser- ? "Leave workspace"- : isInvite- ? "Revoke invitation"- : "Remove member"- }- variant="danger"- onSelect={() => {- setShowRemoveWorkspaceUserModal(true);- setIsOpen(false);- }}- />- </Command.Group>- </Command.List>- </Command>- }- align="end"- >- <Button- type="button"- className="h-8 whitespace-nowrap px-2 disabled:border-transparent disabled:bg-transparent"- variant="outline"- icon={<Dots className="h-4 w-4 shrink-0" />}- />- </Popover>- </>- );-}--function MenuItem({- icon: IconComp,- label,- onSelect,- variant = "default",-}: {- icon: Icon;- label: string;- onSelect: () => void;- variant?: "default" | "danger";-}) {- return (- <Command.Item- onSelect={onSelect}- className={cn(- "flex cursor-pointer items-center gap-2 rounded-md px-2 py-1.5 text-sm",- variant === "danger"- ? "text-red-600 hover:bg-red-50"- : "text-neutral-700 hover:bg-neutral-100",- )}- >- <IconComp className="size-4 shrink-0" />- {label}- </Command.Item>- );-}diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/members/page.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/members/page.tsxindex 65bf610ccc..4af66beb71 100644--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/members/page.tsx+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/members/page.tsx@@ -1,5 +1,522 @@-import { WorkspaceMembersClient } from "./page-client";+"use client";-export default function WorkspaceMembers() {- return <WorkspaceMembersClient />;+import { clientAccessCheck } from "@/lib/client-access-check";+import useWorkspace from "@/lib/swr/use-workspace";+import { WorkspaceUserProps } from "@/lib/types";+import {+ getAvailableRolesForPlan,+ WORKSPACE_ROLES,+} from "@/lib/workspace-roles";+import { PageContent } from "@/ui/layout/page-content";+import { PageWidthWrapper } from "@/ui/layout/page-width-wrapper";+import { useInviteCodeModal } from "@/ui/modals/invite-code-modal";+import { useInviteWorkspaceUserModal } from "@/ui/modals/invite-workspace-user-modal";+import { useRemoveWorkspaceUserModal } from "@/ui/modals/remove-workspace-user-modal";+import { useWorkspaceUserRoleModal } from "@/ui/modals/update-workspace-user-role";+import { SearchBoxPersisted } from "@/ui/shared/search-box";+import { UserAvatar } from "@/ui/users/user-avatar";+import { WorkspaceRole } from "@dub/prisma/client";+import {+ Button,+ DynamicTooltipWrapper,+ Filter,+ Popover,+ Table,+ useKeyboardShortcut,+ usePagination,+ useRouterStuff,+ useTable,+} from "@dub/ui";+import {+ CircleCheck,+ CircleDotted,+ Dots,+ EnvelopeArrowRight,+ Icon,+ Link4 as LinkIcon,+ UserCheck,+} from "@dub/ui/icons";+import { cn, fetcher, timeAgo } from "@dub/utils";+import { ColumnDef, Row } from "@tanstack/react-table";+import { Command } from "cmdk";+import { UserMinus } from "lucide-react";+import { useSession } from "next-auth/react";+import { useSearchParams } from "next/navigation";+import { useEffect, useMemo, useState } from "react";+import useSWR from "swr";++export default function WorkspaceMembersPage() {+ const { setShowInviteWorkspaceUserModal, InviteWorkspaceUserModal } =+ useInviteWorkspaceUserModal({ showSavedInvites: true });++ const { setShowInviteCodeModal, InviteCodeModal } = useInviteCodeModal();++ const { role, plan } = useWorkspace();+ const { data: session } = useSession();+ const { id: workspaceId } = useWorkspace();++ const { queryParams, searchParams } = useRouterStuff();+ const { pagination, setPagination } = usePagination();++ const status = searchParams.get("status") as "active" | "invited" | null;+ const roleFilter = searchParams.get("role") as WorkspaceRole | null;+ const search = searchParams.get("search");++ const {+ data: users,+ error,+ isLoading: loading,+ } = useSWR<WorkspaceUserProps[]>(+ workspaceId &&+ `/api/workspaces/${workspaceId}/${status === "invited" ? "invites" : "users"}?${new URLSearchParams(+ {+ ...(search && { search }),+ ...(roleFilter && { role: roleFilter }),+ } as Record<string, any>,+ ).toString()}`,+ fetcher,+ {+ keepPreviousData: true,+ },+ );++ const { data: invitesForCount } = useSWR<WorkspaceUserProps[]>(+ workspaceId ? `/api/workspaces/${workspaceId}/invites` : null,+ fetcher,+ );+ const inviteCount = invitesForCount?.length ?? 0;++ const availableRolesForPlan = useMemo(() => {+ return getAvailableRolesForPlan(plan);+ }, [plan]);++ const isCurrentUserOwner = role === "owner";++ const filters = useMemo(+ () => [+ {+ key: "role",+ icon: UserCheck,+ label: "Role",+ options: WORKSPACE_ROLES.filter(({ value }) =>+ availableRolesForPlan.includes(value),+ ).map(({ value, label, icon }) => ({+ value,+ label,+ icon,+ })),+ },+ {+ key: "status",+ icon: CircleDotted,+ label: "Status",+ options: [+ {+ value: "active",+ label: "Active",+ icon: (+ <CircleCheck className="size-4 bg-green-100 bg-transparent text-green-600" />+ ),+ },+ {+ value: "invited",+ label: "Invited",+ icon: (+ <EnvelopeArrowRight className="size-4 bg-blue-100 bg-transparent text-blue-600" />+ ),+ },+ ],+ },+ ],+ [availableRolesForPlan],+ );++ // Active filters state+ const activeFilters = useMemo(() => {+ const filters: { key: string; value: any }[] = [];+ if (status) {+ filters.push({ key: "status", value: status });+ }+ if (roleFilter) {+ filters.push({ key: "role", value: roleFilter });+ }+ return filters;+ }, [status, roleFilter]);++ useKeyboardShortcut("m", () => setShowInviteWorkspaceUserModal(true));++ const columns = useMemo<ColumnDef<WorkspaceUserProps>[]>(+ () => [+ {+ id: "name",+ header: "Name",+ accessorFn: (row) => row.name || row.email,+ minSize: 360,+ size: 870,+ maxSize: 900,+ cell: ({ row }) => {+ const user = row.original;+ const isCurrentUser = session?.user?.email === user.email;++ return (+ <div className="flex items-center space-x-3">+ <UserAvatar user={user} />+ <div className="flex flex-col">+ <h3 className="text-sm font-medium">+ {user.name || user.email}+ {isCurrentUser && (+ <span className="ml-1 text-neutral-500">(You)</span>+ )}+ </h3>+ <p className="text-xs text-neutral-500">+ {status === "invited"+ ? `Invited ${timeAgo(user.createdAt)}`+ : user.email}+ </p>+ </div>+ </div>+ );+ },+ },+ {+ id: "role",+ header: "Role",+ accessorFn: (row) => row.role,+ minSize: 120,+ size: 150,+ maxSize: 200,+ cell: ({ row }) =>+ !row.original.isMachine && (+ <RoleCell+ user={row.original}+ isCurrentUser={session?.user?.email === row.original.email}+ isCurrentUserOwner={isCurrentUserOwner}+ />+ ),+ },+ {+ id: "menu",+ enableHiding: false,+ header: () => null,+ cell: ({ row }) => (+ <RowMenuButton row={row} isCurrentUserOwner={isCurrentUserOwner} />+ ),+ },+ ],+ [session?.user?.email, isCurrentUserOwner, status],+ );++ const { table, ...tableProps } = useTable({+ data: users || [],+ columns,+ pagination,+ onPaginationChange: setPagination,+ getRowId: (row) =>+ `${row.id || row.email}-${status}-${roleFilter || "all"}`,+ thClassName: "border-l-0",+ tdClassName: "border-l-0",+ resourceName: (p) =>+ `${status === "invited" ? "invite" : "member"}${p ? "s" : ""}`,+ rowCount: users?.length || 0,+ loading,+ error: error ? "Failed to load members" : undefined,+ });++ const onSelect = (key: string, value: any) => {+ queryParams({+ set: {+ [key]: value,+ },+ });+ };++ const onRemove = (key: string) => {+ queryParams({+ del: [key, "page"],+ });+ };++ const onRemoveAll = () => {+ queryParams({+ del: ["role", "status", "page"],+ });+ };++ return (+ <>+ <InviteWorkspaceUserModal />+ <InviteCodeModal />+ <PageContent+ title="Members"+ titleInfo={{+ title:+ "Learn how to [invite teammates](https://dub.co/help/article/how-to-invite-teammates) to your workspace and [assign them different roles and permissions](https://dub.co/help/article/workspace-roles).",+ }}+ controls={+ <div className="flex space-x-2">+ <Button+ text="Invite member"+ onClick={() => setShowInviteWorkspaceUserModal(true)}+ className="h-9 w-fit"+ shortcut="M"+ disabledTooltip={+ clientAccessCheck({+ action: "workspaces.write",+ role,+ customPermissionDescription: "invite new teammates",+ }).error || undefined+ }+ />+ <Button+ icon={<LinkIcon className="h-4 w-4 text-neutral-800" />}+ variant="secondary"+ onClick={() => setShowInviteCodeModal(true)}+ className="h-9 space-x-0"+ disabledTooltip={+ clientAccessCheck({+ action: "workspaces.write",+ role,+ customPermissionDescription: "generate invite links",+ }).error || undefined+ }+ />+ </div>+ }+ >+ <PageWidthWrapper className="mb-20 flex flex-col gap-2">+ <div className="flex justify-between gap-3">+ <div className="flex items-center gap-2">+ <Filter.Select+ filters={filters}+ activeFilters={activeFilters}+ onSelect={onSelect}+ onRemove={onRemove}+ />+ {inviteCount && status !== "invited" ? (+ <Button+ text="View pending invites"+ variant="secondary"+ className="w-fit"+ right={+ inviteCount > 0 ? (+ <span className="rounded-full bg-neutral-200 px-1.5 py-0.5 text-xs font-medium text-neutral-700">+ {inviteCount}+ </span>+ ) : undefined+ }+ onClick={() =>+ queryParams({ set: { status: "invited" }, del: "page" })+ }+ />+ ) : undefined}+ </div>+ <SearchBoxPersisted+ placeholder="Search by name or email"+ inputClassName="w-full md:w-[20rem]"+ />+ </div>+ <Filter.List+ filters={filters}+ activeFilters={activeFilters}+ onSelect={onSelect}+ onRemove={onRemove}+ onRemoveAll={onRemoveAll}+ />+ <Table {...tableProps} table={table} />+ </PageWidthWrapper>+ </PageContent>+ </>+ );+}++function RoleCell({+ user,+ isCurrentUser,+ isCurrentUserOwner,+}: {+ user: WorkspaceUserProps;+ isCurrentUser: boolean;+ isCurrentUserOwner: boolean;+}) {+ const { plan } = useWorkspace();+ const [role, setRole] = useState<WorkspaceRole>(user.role);++ useEffect(() => {+ setRole(user.role);+ }, [user.role]);++ // Get available roles for plan to determine which to disable+ const availableRolesForPlan = useMemo(() => {+ return getAvailableRolesForPlan(plan);+ }, [plan]);++ const { WorkspaceUserRoleModal, setShowWorkspaceUserRoleModal } =+ useWorkspaceUserRoleModal({+ user: {+ id: user.id || "",+ name: user.name || "",+ email: user.email || "",+ image: user.image || "",+ createdAt: user.createdAt,+ source: null,+ isMachine: false,+ hasPassword: false,+ provider: null,+ },+ role,+ });++ const isDisabled =+ !isCurrentUserOwner || // Only owners can change roles+ isCurrentUser; // Can't change your own role++ const disabledTooltip = !isCurrentUserOwner+ ? "Only owners can change member roles"+ : isCurrentUser+ ? "You cannot change your own role"+ : undefined;++ return (+ <>+ <WorkspaceUserRoleModal />+ <DynamicTooltipWrapper+ tooltipProps={+ disabledTooltip ? { content: disabledTooltip } : undefined+ }+ >+ <select+ className={cn(+ "rounded-md border border-neutral-200 text-xs text-neutral-500 focus:border-neutral-600 focus:ring-neutral-600",+ {+ "cursor-not-allowed bg-neutral-100": isDisabled,+ },+ )}+ value={role}+ disabled={isDisabled}+ onChange={(e) => {+ const newRole = e.target.value as WorkspaceRole;+ setRole(newRole);+ setShowWorkspaceUserRoleModal(true);+ }}+ >+ {WORKSPACE_ROLES.map(({ value, label }) => {+ return (+ <option+ key={value}+ value={value}+ disabled={!availableRolesForPlan.includes(value)}+ >+ {label}+ </option>+ );+ })}+ </select>+ </DynamicTooltipWrapper>+ </>+ );+}++function RowMenuButton({+ row,+ isCurrentUserOwner,+}: {+ row: Row<WorkspaceUserProps>;+ isCurrentUserOwner: boolean;+}) {+ const [isOpen, setIsOpen] = useState(false);+ const { data: session } = useSession();++ const user = row.original;+ const searchParams = useSearchParams();+ const isInvite = searchParams.get("status") === "invited";++ const { RemoveWorkspaceUserModal, setShowRemoveWorkspaceUserModal } =+ useRemoveWorkspaceUserModal({+ user: {+ id: user.id || "",+ name: user.name || "",+ email: user.email || "",+ image: user.image || "",+ createdAt: user.createdAt,+ source: null,+ isMachine: false,+ hasPassword: false,+ provider: null,+ },+ });++ const isCurrentUser = session?.user?.email === user.email;++ // Only show menu if user is owner OR they're removing themselves+ if (!isCurrentUserOwner && !isCurrentUser) {+ return null;+ }++ return (+ <>+ <RemoveWorkspaceUserModal />+ <Popover+ openPopover={isOpen}+ setOpenPopover={setIsOpen}+ content={+ <Command tabIndex={0} loop className="focus:outline-none">+ <Command.List className="w-screen text-sm focus-visible:outline-none sm:w-auto sm:min-w-[200px]">+ <Command.Group className="grid gap-px p-1.5">+ <MenuItem+ icon={UserMinus}+ label={+ isCurrentUser+ ? "Leave workspace"+ : isInvite+ ? "Revoke invitation"+ : "Remove member"+ }+ variant="danger"+ onSelect={() => {+ setShowRemoveWorkspaceUserModal(true);+ setIsOpen(false);+ }}+ />+ </Command.Group>+ </Command.List>+ </Command>+ }+ align="end"+ >+ <Button+ type="button"+ className="h-8 whitespace-nowrap px-2 disabled:border-transparent disabled:bg-transparent"+ variant="outline"+ icon={<Dots className="h-4 w-4 shrink-0" />}+ />+ </Popover>+ </>+ );+}++function MenuItem({+ icon: IconComp,+ label,+ onSelect,+ variant = "default",+}: {+ icon: Icon;+ label: string;+ onSelect: () => void;+ variant?: "default" | "danger";+}) {+ return (+ <Command.Item+ onSelect={onSelect}+ className={cn(+ "flex cursor-pointer items-center gap-2 rounded-md px-2 py-1.5 text-sm",+ variant === "danger"+ ? "text-red-600 hover:bg-red-50"+ : "text-neutral-700 hover:bg-neutral-100",+ )}+ >+ <IconComp className="size-4 shrink-0" />+ {label}+ </Command.Item>+ );}diff --git a/packages/ui/src/tooltip.tsx b/packages/ui/src/tooltip.tsxindex 3b32d4dc2c..8709cf5005 100644--- a/packages/ui/src/tooltip.tsx+++ b/packages/ui/src/tooltip.tsx@@ -223,7 +223,7 @@ export function DynamicTooltipWrapper({}) {return tooltipProps ? (<Tooltip {...tooltipProps}>- <div>{children}</div>+ <div className="w-fit">{children}</div></Tooltip>) : (children