diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/cloud-workspaces/$workspaceId/components/CloudWorkspaceRecordScreen/CloudWorkspaceRecordScreen.tsx b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/cloud-workspaces/$workspaceId/components/CloudWorkspaceRecordScreen/CloudWorkspaceRecordScreen.tsx index c1a486df812..6595c11dfb8 100644 --- a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/cloud-workspaces/$workspaceId/components/CloudWorkspaceRecordScreen/CloudWorkspaceRecordScreen.tsx +++ b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/cloud-workspaces/$workspaceId/components/CloudWorkspaceRecordScreen/CloudWorkspaceRecordScreen.tsx @@ -23,6 +23,7 @@ import { useOpenPullRequestInApp } from "renderer/routes/_authenticated/_dashboa import { useOrganizationPeople } from "renderer/routes/_authenticated/_dashboard/hooks/useOrganizationPeople"; import { useSetCloudWorkspaceVisibility } from "renderer/routes/_authenticated/_dashboard/hooks/useSetCloudWorkspaceVisibility"; import { useCloudSidebarStore } from "renderer/routes/_authenticated/_dashboard/stores/cloudSidebarStore"; +import { useInviteMember } from "renderer/routes/_authenticated/hooks/useInviteMember"; import { useSaveImageToDownloads } from "renderer/routes/_authenticated/hooks/useSaveImageToDownloads"; import { useDeleteWorkspaceIntent } from "renderer/stores/delete-workspace-intent"; import { useSaveAsEnvironmentIntent } from "renderer/stores/save-as-environment-intent"; @@ -89,6 +90,7 @@ export function CloudWorkspaceRecordScreen({ } = useCloudWorkspaceRecordMutations(workspaceId); const [newProjectName, setNewProjectName] = useState(null); const { people, currentUserId } = useOrganizationPeople(); + const inviteMember = useInviteMember(); const createProject = cloudTrpc.taskProject.create.useMutation({ onSuccess: (project) => { void utils.taskProject.list.invalidate(); @@ -288,6 +290,7 @@ export function CloudWorkspaceRecordScreen({ open={newProjectName !== null} initialName={newProjectName ?? ""} people={people} + onInvite={inviteMember} defaultLeadId={currentUserId} isCreating={createProject.isPending} onOpenChange={(open) => { diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/components/CreateTaskDialog/components/CreateTaskAssigneePicker/CreateTaskAssigneePicker.tsx b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/components/CreateTaskDialog/components/CreateTaskAssigneePicker/CreateTaskAssigneePicker.tsx index 73cb9054751..9501c146ef6 100644 --- a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/components/CreateTaskDialog/components/CreateTaskAssigneePicker/CreateTaskAssigneePicker.tsx +++ b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/components/CreateTaskDialog/components/CreateTaskAssigneePicker/CreateTaskAssigneePicker.tsx @@ -8,10 +8,17 @@ import { CommandInput, CommandItem, CommandList, + CommandSeparator, } from "@superset/ui/command"; import { Popover, PopoverContent, PopoverTrigger } from "@superset/ui/popover"; import { useMemo, useState } from "react"; -import { HiCheck, HiChevronDown, HiOutlineUserCircle } from "react-icons/hi2"; +import { + HiCheck, + HiChevronDown, + HiOutlineUserCircle, + HiOutlineUserPlus, +} from "react-icons/hi2"; +import { useInviteMember } from "renderer/routes/_authenticated/hooks/useInviteMember"; interface CreateTaskAssigneePickerProps { users: Pick[]; @@ -27,6 +34,7 @@ export function CreateTaskAssigneePicker({ const { t } = useLingui(); const [open, setOpen] = useState(false); const [search, setSearch] = useState(""); + const inviteMember = useInviteMember(); const selectedUser = useMemo( () => users.find((user) => user.id === value) ?? null, @@ -129,6 +137,24 @@ export function CreateTaskAssigneePicker({ )} + {inviteMember && ( + <> + + + { + handleOpenChange(false); + inviteMember(); + }} + > + + + Invite member + + + + + )} diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/components/NewProjectDialog/NewProjectDialog.tsx b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/components/NewProjectDialog/NewProjectDialog.tsx index b62b5142682..82005e66a59 100644 --- a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/components/NewProjectDialog/NewProjectDialog.tsx +++ b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/components/NewProjectDialog/NewProjectDialog.tsx @@ -30,6 +30,7 @@ interface NewProjectDialogProps { initialName?: string; initialState?: TaskProjectState; people: { id: string; name: string; image: string | null }[]; + onInvite?: () => void; defaultLeadId: string | null; isCreating: boolean; onOpenChange: (open: boolean) => void; @@ -41,6 +42,7 @@ export function NewProjectDialog({ initialName = "", initialState = "planned", people, + onInvite, defaultLeadId, isCreating, onOpenChange, @@ -177,6 +179,7 @@ export function NewProjectDialog({ { if (changes.state) setState(changes.state); if (changes.leadUserId !== undefined) diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/components/ProjectLeadPicker/ProjectLeadPicker.stories.tsx b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/components/ProjectLeadPicker/ProjectLeadPicker.stories.tsx index bc4f9011e29..7457687400c 100644 --- a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/components/ProjectLeadPicker/ProjectLeadPicker.stories.tsx +++ b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/components/ProjectLeadPicker/ProjectLeadPicker.stories.tsx @@ -37,3 +37,7 @@ export const WithLead: Story = {}; export const NoLead: Story = { args: { value: null }, }; + +export const WithInvite: Story = { + args: { onInvite: fn() }, +}; diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/components/ProjectLeadPicker/ProjectLeadPicker.tsx b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/components/ProjectLeadPicker/ProjectLeadPicker.tsx index 46b2fa1733a..6c5de81d797 100644 --- a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/components/ProjectLeadPicker/ProjectLeadPicker.tsx +++ b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/components/ProjectLeadPicker/ProjectLeadPicker.tsx @@ -8,7 +8,7 @@ import { DropdownMenuTrigger, } from "@superset/ui/dropdown-menu"; import type { ReactNode } from "react"; -import { LuCheck, LuCircleUser } from "react-icons/lu"; +import { LuCheck, LuCircleUser, LuUserPlus } from "react-icons/lu"; interface Person { id: string; @@ -20,6 +20,7 @@ interface ProjectLeadPickerProps { people: Person[]; value: string | null; onChange: (userId: string | null) => void; + onInvite?: () => void; children: ReactNode; } @@ -27,38 +28,47 @@ export function ProjectLeadPicker({ people, value, onChange, + onInvite, children, }: ProjectLeadPickerProps) { return ( {children} - - onChange(null)}> - - - No lead - - {value === null && } - - - {people.map((person) => ( - onChange(person.id)} - > - - {person.name} - {person.id === value && } + +
+ onChange(null)}> + + + No lead + + {value === null && } - ))} + + {people.map((person) => ( + onChange(person.id)} + > + + {person.name} + {person.id === value && } + + ))} +
+ {onInvite && ( + <> + + + + Invite member + + + )}
); diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/components/ProjectPropertyChips/ProjectPropertyChips.tsx b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/components/ProjectPropertyChips/ProjectPropertyChips.tsx index 4b649cb6c2e..3491de0c14b 100644 --- a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/components/ProjectPropertyChips/ProjectPropertyChips.tsx +++ b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/components/ProjectPropertyChips/ProjectPropertyChips.tsx @@ -23,12 +23,14 @@ export interface ProjectProperties { interface ProjectPropertyChipsProps { value: ProjectProperties; people: { id: string; name: string; image: string | null }[]; + onInvite?: () => void; onChange: (changes: Partial) => void; } export function ProjectPropertyChips({ value, people, + onInvite, onChange, }: ProjectPropertyChipsProps) { const { formatDate } = useFormat(); @@ -50,6 +52,7 @@ export function ProjectPropertyChips({ onChange({ leadUserId })} > diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/projects/$projectId/components/ProjectRecordScreen/ProjectRecordScreen.tsx b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/projects/$projectId/components/ProjectRecordScreen/ProjectRecordScreen.tsx index 5e1f6dd6185..2c292eed625 100644 --- a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/projects/$projectId/components/ProjectRecordScreen/ProjectRecordScreen.tsx +++ b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/projects/$projectId/components/ProjectRecordScreen/ProjectRecordScreen.tsx @@ -9,6 +9,7 @@ import { cloudTrpc } from "renderer/lib/cloud-trpc"; import { useCloudWorkspaceListItems } from "renderer/routes/_authenticated/_dashboard/hooks/useCloudWorkspaceListItems"; import { useOrganizationPeople } from "renderer/routes/_authenticated/_dashboard/hooks/useOrganizationPeople"; import { sortCloudWorkspaces } from "renderer/routes/_authenticated/_dashboard/utils/groupCloudWorkspaces"; +import { useInviteMember } from "renderer/routes/_authenticated/hooks/useInviteMember"; import type { ProjectRecord, ProjectTab } from "../../types"; import { ProjectRecordView } from "../ProjectRecordView"; @@ -28,6 +29,7 @@ export function ProjectRecordScreen({ const now = useNow(NOW_TICK_MS); const utils = cloudTrpc.useUtils(); const { people } = useOrganizationPeople(); + const inviteMember = useInviteMember(); const { workspaces: allWorkspaces = [] } = useCloudWorkspaces(); const projectWorkspaces = allWorkspaces.filter( (workspace) => workspace.projectId === projectId, @@ -99,6 +101,7 @@ export function ProjectRecordScreen({ tab={tab} now={now} people={people} + onInvite={inviteMember} onTabChange={(next) => void navigate({ to: "/projects/$projectId", diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/projects/$projectId/components/ProjectRecordView/ProjectRecordView.tsx b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/projects/$projectId/components/ProjectRecordView/ProjectRecordView.tsx index e963082cec2..16b0df3692d 100644 --- a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/projects/$projectId/components/ProjectRecordView/ProjectRecordView.tsx +++ b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/projects/$projectId/components/ProjectRecordView/ProjectRecordView.tsx @@ -17,6 +17,7 @@ interface ProjectRecordViewProps { tab: ProjectTab; now: Date; people: { id: string; name: string; image: string | null }[]; + onInvite?: () => void; onTabChange: (tab: ProjectTab) => void; onBack: () => void; onChange: (changes: ProjectRecordChanges) => void; @@ -34,6 +35,7 @@ export function ProjectRecordView({ tab, now, people, + onInvite, onTabChange, onBack, onChange, @@ -97,6 +99,7 @@ export function ProjectRecordView({ diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/projects/$projectId/components/ProjectRecordView/components/ProjectRecordSide/ProjectRecordSide.tsx b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/projects/$projectId/components/ProjectRecordView/components/ProjectRecordSide/ProjectRecordSide.tsx index a60389b4d3d..4c5854c6f18 100644 --- a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/projects/$projectId/components/ProjectRecordView/components/ProjectRecordSide/ProjectRecordSide.tsx +++ b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/projects/$projectId/components/ProjectRecordView/components/ProjectRecordSide/ProjectRecordSide.tsx @@ -20,12 +20,14 @@ const EMPTY_VALUE = "text-muted-foreground"; interface ProjectRecordSideProps { project: ProjectRecord; people: { id: string; name: string; image: string | null }[]; + onInvite?: () => void; onChange: (changes: ProjectRecordChanges) => void; } export function ProjectRecordSide({ project, people, + onInvite, onChange, }: ProjectRecordSideProps) { const { formatDate } = useFormat(); @@ -54,6 +56,7 @@ export function ProjectRecordSide({ Lead}> onChange({ leadUserId })} > diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/projects/components/ProjectsView/ProjectsView.tsx b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/projects/components/ProjectsView/ProjectsView.tsx index 0cb4709e859..7e5d2554293 100644 --- a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/projects/components/ProjectsView/ProjectsView.tsx +++ b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/projects/components/ProjectsView/ProjectsView.tsx @@ -8,6 +8,7 @@ import { cloudTrpc } from "renderer/lib/cloud-trpc"; import { NewProjectDialog } from "renderer/routes/_authenticated/_dashboard/components/NewProjectDialog"; import { useOrganizationPeople } from "renderer/routes/_authenticated/_dashboard/hooks/useOrganizationPeople"; import { useListDisplayStore } from "renderer/routes/_authenticated/_dashboard/stores/listDisplayStore"; +import { useInviteMember } from "renderer/routes/_authenticated/hooks/useInviteMember"; import type { ProjectsSearch } from "../../types"; import { ProjectsHeader } from "./components/ProjectsHeader"; import { ProjectsList } from "./components/ProjectsList"; @@ -31,6 +32,7 @@ export function ProjectsView({ search }: ProjectsViewProps) { { enabled: organizationId !== null }, ); const { people, currentUserId } = useOrganizationPeople(); + const inviteMember = useInviteMember(); const setSearch = (patch: Partial) => { const next = { ...search, ...patch }; navigate({ @@ -130,6 +132,7 @@ export function ProjectsView({ search }: ProjectsViewProps) { needle.length > 0 || status.length > 0 || leads.length > 0 } people={people} + onInvite={inviteMember} onUpdate={(projectId, changes) => updateProject.mutate({ id: projectId, ...changes }) } @@ -142,6 +145,7 @@ export function ProjectsView({ search }: ProjectsViewProps) { void; people: { id: string; name: string; image: string | null }[]; + onInvite?: () => void; onUpdate: (projectId: string, changes: ProjectChanges) => void; } @@ -32,6 +33,7 @@ export function ProjectsList({ sort, onOpen, people, + onInvite, onUpdate, }: ProjectsListProps) { if (projects.length === 0) { @@ -88,6 +90,7 @@ export function ProjectsList({ project={project} onOpen={() => onOpen(project.id)} people={people} + onInvite={onInvite} onUpdate={(changes) => onUpdate(project.id, changes)} /> ))} diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/projects/components/ProjectsView/components/ProjectsList/components/ProjectListRow/ProjectListRow.tsx b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/projects/components/ProjectsView/components/ProjectsList/components/ProjectListRow/ProjectListRow.tsx index c821a2480d1..c0ad4db02e5 100644 --- a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/projects/components/ProjectsView/components/ProjectsList/components/ProjectListRow/ProjectListRow.tsx +++ b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/projects/components/ProjectsView/components/ProjectsList/components/ProjectListRow/ProjectListRow.tsx @@ -25,6 +25,7 @@ const stopRowEvent = (event: SyntheticEvent) => event.stopPropagation(); interface ProjectListRowProps { project: TaskProjectRow; people: { id: string; name: string; image: string | null }[]; + onInvite?: () => void; onOpen: () => void; onUpdate: (changes: ProjectChanges) => void; } @@ -32,6 +33,7 @@ interface ProjectListRowProps { export function ProjectListRow({ project, people, + onInvite, onOpen, onUpdate, }: ProjectListRowProps) { @@ -74,6 +76,7 @@ export function ProjectListRow({ onUpdate({ leadUserId })} > diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/tasks/$taskId/components/TaskRecordScreen/TaskRecordScreen.tsx b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/tasks/$taskId/components/TaskRecordScreen/TaskRecordScreen.tsx index 1aa925071e8..c9485b728a6 100644 --- a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/tasks/$taskId/components/TaskRecordScreen/TaskRecordScreen.tsx +++ b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/tasks/$taskId/components/TaskRecordScreen/TaskRecordScreen.tsx @@ -15,6 +15,7 @@ import { NewProjectDialog } from "renderer/routes/_authenticated/_dashboard/comp import { useCloudWorkspaceListItems } from "renderer/routes/_authenticated/_dashboard/hooks/useCloudWorkspaceListItems"; import { useCopyShareLink } from "renderer/routes/_authenticated/_dashboard/hooks/useCopyShareLink"; import { useOrganizationPeople } from "renderer/routes/_authenticated/_dashboard/hooks/useOrganizationPeople"; +import { useInviteMember } from "renderer/routes/_authenticated/hooks/useInviteMember"; import { useOptimisticActions } from "renderer/routes/_authenticated/hooks/useOptimisticActions"; import { TASK_LIST_REFETCH_INTERVAL } from "../../../components/TasksView/hooks/useTasksData"; import { useTaskLabelMutations } from "../../hooks/useTaskLabelMutations"; @@ -53,6 +54,7 @@ export function TaskRecordScreen({ const copyShareLink = useCopyShareLink(); const openUrl = electronTrpc.external.openUrl.useMutation(); const { people, currentUserId } = useOrganizationPeople(); + const inviteMember = useInviteMember(); const [newProjectName, setNewProjectName] = useState(null); const [isConfirmingDelete, setIsConfirmingDelete] = useState(false); @@ -370,6 +372,7 @@ export function TaskRecordScreen({ open={newProjectName !== null} initialName={newProjectName ?? ""} people={people} + onInvite={inviteMember} defaultLeadId={currentUserId} isCreating={createProject.isPending} onOpenChange={(open) => { diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/tasks/$taskId/components/TaskRecordView/components/TaskRecordSide/components/AssigneeProperty/AssigneeProperty.tsx b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/tasks/$taskId/components/TaskRecordView/components/TaskRecordSide/components/AssigneeProperty/AssigneeProperty.tsx index f06c52ebe01..e65bdf3ffa2 100644 --- a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/tasks/$taskId/components/TaskRecordView/components/TaskRecordSide/components/AssigneeProperty/AssigneeProperty.tsx +++ b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/tasks/$taskId/components/TaskRecordView/components/TaskRecordSide/components/AssigneeProperty/AssigneeProperty.tsx @@ -1,15 +1,16 @@ import { Trans, useLingui } from "@lingui/react/macro"; -import { Avatar } from "@superset/ui/atoms/Avatar"; import { DropdownMenu, DropdownMenuContent, DropdownMenuItem, + DropdownMenuSeparator, DropdownMenuTrigger, } from "@superset/ui/dropdown-menu"; import { useMemo, useState } from "react"; import { HiOutlineUserCircle } from "react-icons/hi2"; import { cloudTrpc } from "renderer/lib/cloud-trpc"; import { useOptimisticActions } from "renderer/routes/_authenticated/hooks/useOptimisticActions"; +import { AssigneeMenuItems } from "../../../../../../../components/TasksView/components/shared/AssigneeMenuItems"; import type { TaskWithStatus } from "../../../../../../../components/TasksView/hooks/useTasksTable"; interface AssigneePropertyProps { @@ -99,38 +100,14 @@ export function AssigneeProperty({ task }: AssigneePropertyProps) { -
- handleSelectUser(null)} - className="flex items-center gap-2" - > - - - No assignee - - {!task.assigneeId && !task.assigneeExternalId && ( - ✓ - )} - - {users.map((user) => ( - handleSelectUser(user.id)} - className="flex items-center gap-2" - > - -
- {user.name} - - {user.email} - -
- {user.id === task.assigneeId && ( - ✓ - )} -
- ))} -
+
); diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/tasks/components/TasksView/components/TasksTableView/components/TaskContextMenu/TaskContextMenu.tsx b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/tasks/components/TasksView/components/TasksTableView/components/TaskContextMenu/TaskContextMenu.tsx index ffbee5abde3..59dfc3cbfb3 100644 --- a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/tasks/components/TasksView/components/TasksTableView/components/TaskContextMenu/TaskContextMenu.tsx +++ b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/tasks/components/TasksView/components/TasksTableView/components/TaskContextMenu/TaskContextMenu.tsx @@ -122,15 +122,14 @@ export function TaskContextMenu({ -
- -
+
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/tasks/components/TasksView/components/shared/AssigneeMenuItems.tsx b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/tasks/components/TasksView/components/shared/AssigneeMenuItems.tsx index e08c5cfdb07..77c14280951 100644 --- a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/tasks/components/TasksView/components/shared/AssigneeMenuItems.tsx +++ b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/tasks/components/TasksView/components/shared/AssigneeMenuItems.tsx @@ -2,7 +2,8 @@ import { Trans } from "@lingui/react/macro"; import type { SelectUser } from "@superset/db/schema"; import { Avatar } from "@superset/ui/atoms/Avatar"; import type { ReactNode } from "react"; -import { HiOutlineUserCircle } from "react-icons/hi2"; +import { HiOutlineUserCircle, HiOutlineUserPlus } from "react-icons/hi2"; +import { useInviteMember } from "renderer/routes/_authenticated/hooks/useInviteMember"; interface MenuItemProps { children: ReactNode; @@ -18,6 +19,7 @@ interface AssigneeMenuItemsProps { hasExternalAssignee?: boolean; onSelect: (userId: string | null) => void; MenuItem: React.ComponentType; + MenuSeparator: React.ComponentType; } export function AssigneeMenuItems({ @@ -26,43 +28,60 @@ export function AssigneeMenuItems({ hasExternalAssignee, onSelect, MenuItem, + MenuSeparator, }: AssigneeMenuItemsProps) { + const inviteMember = useInviteMember(); + return ( <> - onSelect(null)} - className="flex items-center gap-2" - > - - - No assignee - - {!currentAssigneeId && !hasExternalAssignee && ( - ✓ - )} - +
+ onSelect(null)} + className="flex items-center gap-2" + > + + + No assignee + + {!currentAssigneeId && !hasExternalAssignee && ( + ✓ + )} + + + {users.map((user) => { + const isSelected = user.id === currentAssigneeId; + return ( + onSelect(user.id)} + className="flex items-center gap-2" + > + +
+ {user.name} + + {user.email} + +
+ {isSelected && ( + ✓ + )} +
+ ); + })} +
- {users.map((user) => { - const isSelected = user.id === currentAssigneeId; - return ( - onSelect(user.id)} - className="flex items-center gap-2" - > - -
- {user.name} - - {user.email} - -
- {isSelected && ( - ✓ - )} + {inviteMember && ( + <> + + + + + Invite member + - ); - })} + + )} ); } diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/tasks/components/TasksView/hooks/useTasksTable/components/AssigneeCell/AssigneeCell.tsx b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/tasks/components/TasksView/hooks/useTasksTable/components/AssigneeCell/AssigneeCell.tsx index 097c05a1604..01b6b3f4636 100644 --- a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/tasks/components/TasksView/hooks/useTasksTable/components/AssigneeCell/AssigneeCell.tsx +++ b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/tasks/components/TasksView/hooks/useTasksTable/components/AssigneeCell/AssigneeCell.tsx @@ -4,6 +4,7 @@ import { DropdownMenu, DropdownMenuContent, DropdownMenuItem, + DropdownMenuSeparator, DropdownMenuTrigger, } from "@superset/ui/dropdown-menu"; import type { CellContext } from "@tanstack/react-table"; @@ -11,6 +12,7 @@ import { useMemo, useState } from "react"; import { HiOutlineUserCircle } from "react-icons/hi2"; import { cloudTrpc } from "renderer/lib/cloud-trpc"; import { useOptimisticActions } from "renderer/routes/_authenticated/hooks/useOptimisticActions"; +import { AssigneeMenuItems } from "../../../../components/shared/AssigneeMenuItems"; import type { TaskWithStatus } from "../../useTasksTable"; interface AssigneeCellProps { @@ -80,43 +82,19 @@ export function AssigneeCell({ info }: AssigneeCellProps) { className="w-56" onClick={(e) => e.stopPropagation()} > -
- handleSelectUser(null)} - className="flex items-center gap-2" - > - - - No assignee - - {!assigneeId && !task.assigneeExternalId && ( - ✓ - )} - - {isLoadingMembers && ( -
- Loading members... -
- )} - {users.map((user) => ( - handleSelectUser(user.id)} - className="flex items-center gap-2" - > - -
- {user.name} - - {user.email} - -
- {user.id === assigneeId && ( - ✓ - )} -
- ))} -
+ {isLoadingMembers && ( +
+ Loading members... +
+ )} + ); diff --git a/apps/desktop/src/renderer/routes/_authenticated/settings/members/components/MembersSettings/components/InviteMemberButton/components/InviteMemberDialog/InviteMemberDialog.tsx b/apps/desktop/src/renderer/routes/_authenticated/components/InviteMemberDialog/InviteMemberDialog.tsx similarity index 72% rename from apps/desktop/src/renderer/routes/_authenticated/settings/members/components/MembersSettings/components/InviteMemberButton/components/InviteMemberDialog/InviteMemberDialog.tsx rename to apps/desktop/src/renderer/routes/_authenticated/components/InviteMemberDialog/InviteMemberDialog.tsx index 479ccb86d90..b8da4b871c8 100644 --- a/apps/desktop/src/renderer/routes/_authenticated/settings/members/components/MembersSettings/components/InviteMemberButton/components/InviteMemberDialog/InviteMemberDialog.tsx +++ b/apps/desktop/src/renderer/routes/_authenticated/components/InviteMemberDialog/InviteMemberDialog.tsx @@ -1,6 +1,10 @@ import { Trans, useLingui } from "@lingui/react/macro"; import { errorMessage } from "@superset/i18n/errors"; -import { canInvite, type OrganizationRole } from "@superset/shared/auth"; +import { + canInvite, + getInvitableRoles, + type OrganizationRole, +} from "@superset/shared/auth"; import { Button } from "@superset/ui/button"; import { Dialog, @@ -20,36 +24,36 @@ import { SelectValue, } from "@superset/ui/select"; import { toast } from "@superset/ui/sonner"; -import { useState } from "react"; +import { useRef, useState } from "react"; +import { useActiveOrganizationId } from "renderer/hooks/useActiveOrganizationId"; import { authClient } from "renderer/lib/auth-client"; import { cloudTrpc } from "renderer/lib/cloud-trpc"; import { organizationRoleName } from "renderer/lib/organizationRoleName"; +import { useOrganizationRole } from "renderer/routes/_authenticated/hooks/useOrganizationRole"; +import { useInviteMemberDialogStore } from "renderer/stores/invite-member-dialog"; -interface InviteMemberDialogProps { - open: boolean; - onOpenChange: (open: boolean) => void; - organizationId: string; - organizationName: string; - invitableRoles: OrganizationRole[]; - currentUserRole: OrganizationRole; -} - -export function InviteMemberDialog({ - open, - onOpenChange, - organizationId, - organizationName, - invitableRoles, - currentUserRole, -}: InviteMemberDialogProps) { +export function InviteMemberDialog() { const { t } = useLingui(); + const open = useInviteMemberDialogStore((state) => state.isOpen); + const onOpenChange = useInviteMemberDialogStore((state) => state.setOpen); + const organizationId = useActiveOrganizationId(); + const { data: organizations } = + cloudTrpc.organization.list.useQuery(undefined); + const organizationName = + organizations?.find((org) => org.id === organizationId)?.name ?? ""; + const currentUserRole = useOrganizationRole(); + const invitableRoles = currentUserRole + ? getInvitableRoles(currentUserRole) + : []; const [email, setEmail] = useState(""); const [role, setRole] = useState("member"); const [isInviting, setIsInviting] = useState(false); + const emailInputRef = useRef(null); const utils = cloudTrpc.useUtils(); const handleInvite = async () => { - if (!canInvite(currentUserRole, role)) { + if (!organizationId) return; + if (!currentUserRole || !canInvite(currentUserRole, role)) { const roleName = organizationRoleName(role); toast.error( t({ @@ -92,7 +96,13 @@ export function InviteMemberDialog({ return ( - + {/* Opened from menus that hand focus back to their trigger as they close. */} + { + event.preventDefault(); + emailInputRef.current?.focus(); + }} + > Invite Member @@ -111,6 +121,7 @@ export function InviteMemberDialog({ Email void) | undefined { + const { gateFeature } = usePaywall(); + const role = useOrganizationRole(); + const setDialogOpen = useInviteMemberDialogStore((state) => state.setOpen); + + if (role === null || getInvitableRoles(role).length === 0) { + return undefined; + } + + return () => { + gateFeature(GATED_FEATURES.INVITE_MEMBERS, () => setDialogOpen(true)); + }; +} diff --git a/apps/desktop/src/renderer/routes/_authenticated/hooks/useIsOrganizationOwner/useIsOrganizationOwner.ts b/apps/desktop/src/renderer/routes/_authenticated/hooks/useIsOrganizationOwner/useIsOrganizationOwner.ts index 6c6bc47711d..dd39fb68464 100644 --- a/apps/desktop/src/renderer/routes/_authenticated/hooks/useIsOrganizationOwner/useIsOrganizationOwner.ts +++ b/apps/desktop/src/renderer/routes/_authenticated/hooks/useIsOrganizationOwner/useIsOrganizationOwner.ts @@ -1,19 +1,5 @@ -import { authClient } from "renderer/lib/auth-client"; -import { cloudTrpc } from "renderer/lib/cloud-trpc"; +import { useOrganizationRole } from "../useOrganizationRole"; -/** - * Whether the signed-in user owns this window's organization. Reads - * membership for the window's org, not the session's active organization — - * the session holds one org for every window at once, and the member list is - * scoped server-side by the organization header this window sends. - */ export function useIsOrganizationOwner(): boolean { - const { data: session } = authClient.useSession(); - const { data: members } = cloudTrpc.organization.listMembers.useQuery({ - includeDeactivated: false, - }); - const currentUserId = session?.user?.id; - return ( - members?.find((member) => member.userId === currentUserId)?.role === "owner" - ); + return useOrganizationRole() === "owner"; } diff --git a/apps/desktop/src/renderer/routes/_authenticated/hooks/useOrganizationRole/index.ts b/apps/desktop/src/renderer/routes/_authenticated/hooks/useOrganizationRole/index.ts new file mode 100644 index 00000000000..5a72323b6ab --- /dev/null +++ b/apps/desktop/src/renderer/routes/_authenticated/hooks/useOrganizationRole/index.ts @@ -0,0 +1 @@ +export { useOrganizationRole } from "./useOrganizationRole"; diff --git a/apps/desktop/src/renderer/routes/_authenticated/hooks/useOrganizationRole/useOrganizationRole.ts b/apps/desktop/src/renderer/routes/_authenticated/hooks/useOrganizationRole/useOrganizationRole.ts new file mode 100644 index 00000000000..a215901c530 --- /dev/null +++ b/apps/desktop/src/renderer/routes/_authenticated/hooks/useOrganizationRole/useOrganizationRole.ts @@ -0,0 +1,19 @@ +import type { OrganizationRole } from "@superset/shared/auth"; +import { authClient } from "renderer/lib/auth-client"; +import { cloudTrpc } from "renderer/lib/cloud-trpc"; + +/** + * The signed-in user's role in this window's organization. Reads membership + * for the window's org, not the session's active organization — the session + * holds one org for every window at once, and the member list is scoped + * server-side by the organization header this window sends. + */ +export function useOrganizationRole(): OrganizationRole | null { + const { data: session } = authClient.useSession(); + const { data: members } = cloudTrpc.organization.listMembers.useQuery({ + includeDeactivated: false, + }); + const currentUserId = session?.user?.id; + const role = members?.find((member) => member.userId === currentUserId)?.role; + return (role as OrganizationRole | undefined) ?? null; +} diff --git a/apps/desktop/src/renderer/routes/_authenticated/layout.tsx b/apps/desktop/src/renderer/routes/_authenticated/layout.tsx index 60139476d0d..e036848ee0a 100644 --- a/apps/desktop/src/renderer/routes/_authenticated/layout.tsx +++ b/apps/desktop/src/renderer/routes/_authenticated/layout.tsx @@ -56,6 +56,7 @@ import { FileAutoSave } from "./components/FileAutoSave"; import { FileMenuListener } from "./components/FileMenuListener"; import { GitInitConfirmDialog } from "./components/GitInitConfirmDialog"; import { GlobalBrowserLifecycle } from "./components/GlobalBrowserLifecycle"; +import { InviteMemberDialog } from "./components/InviteMemberDialog"; import { TeardownLogsDialog } from "./components/TeardownLogsDialog"; import { V2NotificationController } from "./components/V2NotificationController"; import { WindowTitle } from "./components/WindowTitle"; @@ -340,6 +341,7 @@ function AuthenticatedLayout() { + diff --git a/apps/desktop/src/renderer/routes/_authenticated/settings/hosts/$hostId/components/HostSettings/components/AddMemberDropdown/AddMemberDropdown.tsx b/apps/desktop/src/renderer/routes/_authenticated/settings/hosts/$hostId/components/HostSettings/components/AddMemberDropdown/AddMemberDropdown.tsx index ce8fc776f1a..396f4b0fefd 100644 --- a/apps/desktop/src/renderer/routes/_authenticated/settings/hosts/$hostId/components/HostSettings/components/AddMemberDropdown/AddMemberDropdown.tsx +++ b/apps/desktop/src/renderer/routes/_authenticated/settings/hosts/$hostId/components/HostSettings/components/AddMemberDropdown/AddMemberDropdown.tsx @@ -4,9 +4,11 @@ import { DropdownMenu, DropdownMenuContent, DropdownMenuItem, + DropdownMenuSeparator, DropdownMenuTrigger, } from "@superset/ui/dropdown-menu"; -import { HiOutlinePlus } from "react-icons/hi2"; +import { HiOutlinePlus, HiOutlineUserPlus } from "react-icons/hi2"; +import { useInviteMember } from "renderer/routes/_authenticated/hooks/useInviteMember"; export interface CandidateRow { userId: string; @@ -23,7 +25,9 @@ export function AddMemberDropdown({ candidates, onPick, }: AddMemberDropdownProps) { - if (candidates.length === 0) { + const inviteMember = useInviteMember(); + + if (candidates.length === 0 && !inviteMember) { return ( - - - + ); } diff --git a/apps/desktop/src/renderer/routes/_authenticated/settings/members/components/PendingInvitations/PendingInvitations.tsx b/apps/desktop/src/renderer/routes/_authenticated/settings/members/components/PendingInvitations/PendingInvitations.tsx index dc97ac405a8..d42eb9490a4 100644 --- a/apps/desktop/src/renderer/routes/_authenticated/settings/members/components/PendingInvitations/PendingInvitations.tsx +++ b/apps/desktop/src/renderer/routes/_authenticated/settings/members/components/PendingInvitations/PendingInvitations.tsx @@ -1,6 +1,5 @@ import { Trans, useLingui } from "@lingui/react/macro"; import { useFormat } from "@superset/i18n/react"; -import type { OrganizationRole } from "@superset/shared/auth"; import { Badge } from "@superset/ui/badge"; import { Skeleton } from "@superset/ui/skeleton"; import { @@ -24,17 +23,9 @@ import { InvitationActions } from "./components/InvitationActions"; interface PendingInvitationsProps { visibleItems?: SettingItemId[] | null; - currentUserRole: OrganizationRole; - organizationId: string; - organizationName: string; } -export function PendingInvitations({ - visibleItems, - currentUserRole, - organizationId, - organizationName, -}: PendingInvitationsProps) { +export function PendingInvitations({ visibleItems }: PendingInvitationsProps) { const { formatDate: formatLocaleDate } = useFormat(); const { t } = useLingui(); @@ -80,13 +71,7 @@ export function PendingInvitations({ query={searchQuery} /> - {showInvite && ( - - )} + {showInvite && }
{[1, 2, 3].map((i) => ( @@ -115,13 +100,7 @@ export function PendingInvitations({ query={searchQuery} /> - {showInvite && ( - - )} + {showInvite && }
{invitations.length === 0 ? (
diff --git a/apps/desktop/src/renderer/routes/_authenticated/settings/organization/components/OrganizationSettings/OrganizationSettings.tsx b/apps/desktop/src/renderer/routes/_authenticated/settings/organization/components/OrganizationSettings/OrganizationSettings.tsx index 75281d3518d..fd25d01c320 100644 --- a/apps/desktop/src/renderer/routes/_authenticated/settings/organization/components/OrganizationSettings/OrganizationSettings.tsx +++ b/apps/desktop/src/renderer/routes/_authenticated/settings/organization/components/OrganizationSettings/OrganizationSettings.tsx @@ -513,16 +513,7 @@ export function OrganizationSettings({ {showMembersSection && (
- {currentUserRole && - activeOrganizationId && - organization?.name && ( - - )} + {showMembersList && (
diff --git a/apps/desktop/src/renderer/routes/_authenticated/settings/teams/$teamId/components/TeamDetailSettings/components/AddMemberButton/AddMemberButton.tsx b/apps/desktop/src/renderer/routes/_authenticated/settings/teams/$teamId/components/TeamDetailSettings/components/AddMemberButton/AddMemberButton.tsx index 3a3b532b590..d4254194586 100644 --- a/apps/desktop/src/renderer/routes/_authenticated/settings/teams/$teamId/components/TeamDetailSettings/components/AddMemberButton/AddMemberButton.tsx +++ b/apps/desktop/src/renderer/routes/_authenticated/settings/teams/$teamId/components/TeamDetailSettings/components/AddMemberButton/AddMemberButton.tsx @@ -5,11 +5,11 @@ import { Checkbox } from "@superset/ui/checkbox"; import { Input } from "@superset/ui/input"; import { Popover, PopoverContent, PopoverTrigger } from "@superset/ui/popover"; import { toast } from "@superset/ui/sonner"; -import { Link } from "@tanstack/react-router"; import { useMemo, useState } from "react"; -import { HiOutlinePaperAirplane, HiOutlinePlus } from "react-icons/hi2"; +import { HiOutlinePlus, HiOutlineUserPlus } from "react-icons/hi2"; import { apiTrpcClient } from "renderer/lib/api-trpc-client"; import { cloudTrpc } from "renderer/lib/cloud-trpc"; +import { useInviteMember } from "renderer/routes/_authenticated/hooks/useInviteMember"; interface OrgUser { id: string; @@ -36,6 +36,7 @@ export function AddMemberButton({ const [query, setQuery] = useState(""); const [pendingUserId, setPendingUserId] = useState(null); const utils = cloudTrpc.useUtils(); + const inviteMember = useInviteMember(); // Snapshot of who was a member when the popover opened. Sort against this // so toggling a checkbox doesn't reorder the row under the cursor. @@ -156,16 +157,21 @@ export function AddMemberButton({ }) )}
-
- setIsOpen(false)} - className="flex items-center gap-2 px-2 py-1.5 rounded-md text-sm text-muted-foreground hover:bg-accent hover:text-foreground" - > - - Invite people... - -
+ {inviteMember && ( +
+ +
+ )} ); diff --git a/apps/desktop/src/renderer/stores/invite-member-dialog.ts b/apps/desktop/src/renderer/stores/invite-member-dialog.ts new file mode 100644 index 00000000000..a66230f25fd --- /dev/null +++ b/apps/desktop/src/renderer/stores/invite-member-dialog.ts @@ -0,0 +1,17 @@ +import { create } from "zustand"; +import { devtools } from "zustand/middleware"; + +interface InviteMemberDialogState { + isOpen: boolean; + setOpen: (isOpen: boolean) => void; +} + +export const useInviteMemberDialogStore = create()( + devtools( + (set) => ({ + isOpen: false, + setOpen: (isOpen) => set({ isOpen }), + }), + { name: "InviteMemberDialogStore" }, + ), +); diff --git a/packages/i18n/locales/cs/messages.po b/packages/i18n/locales/cs/messages.po index 4329526354b..30680ecb1cf 100644 --- a/packages/i18n/locales/cs/messages.po +++ b/packages/i18n/locales/cs/messages.po @@ -1694,9 +1694,6 @@ msgstr "Přidán 1 soubor do {where}" msgid "Added only when launching with a prompt — e.g. <0>--, <1>--prompt, <2>-i." msgstr "Přidá se jen při spuštění s promptem — např. <0>--, <1>--prompt, <2>-i." -msgid "Adding members will increase your subscription cost, prorated to your billing cycle." -msgstr "Přidáním členů vzroste cena předplatného, poměrně k vašemu fakturačnímu cyklu." - msgid "Address Comments with Agent" msgstr "Vyřešit komentáře agentem" @@ -8221,9 +8218,6 @@ msgstr "Pozvat člena" msgid "Invite Member" msgstr "Pozvat člena" -msgid "Invite people..." -msgstr "Pozvat lidi..." - msgid "Invite teammate" msgstr "Pozvat kolegu" @@ -16171,9 +16165,6 @@ msgstr "V tomto zobrazení došlo k chybě" msgid "This week" msgstr "Tento týden" -msgid "This will affect your billing" -msgstr "Ovlivní to vaši fakturaci" - msgid "This will change your organization's public URL. Make sure to update any bookmarks or shared links." msgstr "Tímto se změní veřejná URL vaší organizace. Nezapomeňte aktualizovat záložky a sdílené odkazy." diff --git a/packages/i18n/locales/de/messages.po b/packages/i18n/locales/de/messages.po index a2664ec6fa0..c37386c332e 100644 --- a/packages/i18n/locales/de/messages.po +++ b/packages/i18n/locales/de/messages.po @@ -1694,9 +1694,6 @@ msgstr "1 Datei zu {where} hinzugefügt" msgid "Added only when launching with a prompt — e.g. <0>--, <1>--prompt, <2>-i." msgstr "Nur beim Start mit Prompt ergänzt — z. B. <0>--, <1>--prompt, <2>-i." -msgid "Adding members will increase your subscription cost, prorated to your billing cycle." -msgstr "Weitere Mitglieder erhöhen deine Abokosten, anteilig zu deinem Abrechnungszeitraum." - msgid "Address Comments with Agent" msgstr "Kommentare mit Agent bearbeiten" @@ -8221,9 +8218,6 @@ msgstr "Mitglied einladen" msgid "Invite Member" msgstr "Mitglied einladen" -msgid "Invite people..." -msgstr "Personen einladen..." - msgid "Invite teammate" msgstr "Teammitglied einladen" @@ -16171,9 +16165,6 @@ msgstr "In dieser Ansicht ist ein Fehler aufgetreten" msgid "This week" msgstr "Diese Woche" -msgid "This will affect your billing" -msgstr "Das wirkt sich auf deine Abrechnung aus" - msgid "This will change your organization's public URL. Make sure to update any bookmarks or shared links." msgstr "Damit ändert sich die öffentliche URL deiner Organisation. Denk daran, Lesezeichen oder geteilte Links zu aktualisieren." diff --git a/packages/i18n/locales/en/messages.po b/packages/i18n/locales/en/messages.po index 66f7003b25b..1e8a069e333 100644 --- a/packages/i18n/locales/en/messages.po +++ b/packages/i18n/locales/en/messages.po @@ -1694,9 +1694,6 @@ msgstr "Added 1 file to {where}" msgid "Added only when launching with a prompt — e.g. <0>--, <1>--prompt, <2>-i." msgstr "Added only when launching with a prompt — e.g. <0>--, <1>--prompt, <2>-i." -msgid "Adding members will increase your subscription cost, prorated to your billing cycle." -msgstr "Adding members will increase your subscription cost, prorated to your billing cycle." - msgid "Address Comments with Agent" msgstr "Address Comments with Agent" @@ -8221,9 +8218,6 @@ msgstr "Invite member" msgid "Invite Member" msgstr "Invite Member" -msgid "Invite people..." -msgstr "Invite people..." - msgid "Invite teammate" msgstr "Invite teammate" @@ -16171,9 +16165,6 @@ msgstr "This view hit an error" msgid "This week" msgstr "This week" -msgid "This will affect your billing" -msgstr "This will affect your billing" - msgid "This will change your organization's public URL. Make sure to update any bookmarks or shared links." msgstr "This will change your organization's public URL. Make sure to update any bookmarks or shared links." diff --git a/packages/i18n/locales/es/messages.po b/packages/i18n/locales/es/messages.po index 72049ec07b5..1b6e208fff9 100644 --- a/packages/i18n/locales/es/messages.po +++ b/packages/i18n/locales/es/messages.po @@ -1694,9 +1694,6 @@ msgstr "Se añadió 1 archivo a {where}" msgid "Added only when launching with a prompt — e.g. <0>--, <1>--prompt, <2>-i." msgstr "Se añaden solo al lanzar con un prompt, p. ej. <0>--, <1>--prompt, <2>-i." -msgid "Adding members will increase your subscription cost, prorated to your billing cycle." -msgstr "Añadir miembros aumentará el coste de tu suscripción, prorrateado según tu ciclo de facturación." - msgid "Address Comments with Agent" msgstr "Atender comentarios con el agente" @@ -8221,9 +8218,6 @@ msgstr "Invitar a un miembro" msgid "Invite Member" msgstr "Invitar a un miembro" -msgid "Invite people..." -msgstr "Invitar a personas..." - msgid "Invite teammate" msgstr "Invitar a un compañero" @@ -16171,9 +16165,6 @@ msgstr "Esta vista encontró un error" msgid "This week" msgstr "Esta semana" -msgid "This will affect your billing" -msgstr "Esto afectará a tu facturación" - msgid "This will change your organization's public URL. Make sure to update any bookmarks or shared links." msgstr "Esto cambiará la URL pública de tu organización. Asegúrate de actualizar los marcadores y los enlaces compartidos." diff --git a/packages/i18n/locales/fr/messages.po b/packages/i18n/locales/fr/messages.po index 7c4adec7a43..44409f07067 100644 --- a/packages/i18n/locales/fr/messages.po +++ b/packages/i18n/locales/fr/messages.po @@ -1694,9 +1694,6 @@ msgstr "1 fichier ajouté à {where}" msgid "Added only when launching with a prompt — e.g. <0>--, <1>--prompt, <2>-i." msgstr "Ajoutés uniquement lors d'un lancement avec un prompt — par ex. <0>--, <1>--prompt, <2>-i." -msgid "Adding members will increase your subscription cost, prorated to your billing cycle." -msgstr "Ajouter des membres augmentera le coût de votre abonnement, au prorata de votre cycle de facturation." - msgid "Address Comments with Agent" msgstr "Traiter les commentaires avec un agent" @@ -8221,9 +8218,6 @@ msgstr "Inviter un membre" msgid "Invite Member" msgstr "Inviter un membre" -msgid "Invite people..." -msgstr "Inviter des personnes..." - msgid "Invite teammate" msgstr "Inviter un coéquipier" @@ -16171,9 +16165,6 @@ msgstr "Cette vue a rencontré une erreur" msgid "This week" msgstr "Cette semaine" -msgid "This will affect your billing" -msgstr "Cela aura un impact sur votre facturation" - msgid "This will change your organization's public URL. Make sure to update any bookmarks or shared links." msgstr "Cela changera l'URL publique de votre organisation. Pensez à mettre à jour vos favoris et les liens partagés." diff --git a/packages/i18n/locales/id/messages.po b/packages/i18n/locales/id/messages.po index 47ec7f419f4..f533b97c3f8 100644 --- a/packages/i18n/locales/id/messages.po +++ b/packages/i18n/locales/id/messages.po @@ -1694,9 +1694,6 @@ msgstr "Menambahkan 1 file ke {where}" msgid "Added only when launching with a prompt — e.g. <0>--, <1>--prompt, <2>-i." msgstr "Ditambahkan hanya saat menjalankan dengan prompt — mis. <0>--, <1>--prompt, <2>-i." -msgid "Adding members will increase your subscription cost, prorated to your billing cycle." -msgstr "Menambah anggota akan menaikkan biaya langganan Anda, dihitung prorata terhadap siklus penagihan Anda." - msgid "Address Comments with Agent" msgstr "Tanggapi Komentar dengan Agen" @@ -8221,9 +8218,6 @@ msgstr "Undang anggota" msgid "Invite Member" msgstr "Undang Anggota" -msgid "Invite people..." -msgstr "Undang orang..." - msgid "Invite teammate" msgstr "Undang rekan tim" @@ -16171,9 +16165,6 @@ msgstr "Tampilan ini mengalami kesalahan" msgid "This week" msgstr "Minggu ini" -msgid "This will affect your billing" -msgstr "Ini akan memengaruhi penagihan Anda" - msgid "This will change your organization's public URL. Make sure to update any bookmarks or shared links." msgstr "Ini akan mengubah URL publik organisasi Anda. Pastikan memperbarui bookmark atau tautan yang sudah dibagikan." diff --git a/packages/i18n/locales/it/messages.po b/packages/i18n/locales/it/messages.po index 3769e3164a6..92e22f98aca 100644 --- a/packages/i18n/locales/it/messages.po +++ b/packages/i18n/locales/it/messages.po @@ -1694,9 +1694,6 @@ msgstr "Aggiunto 1 file a {where}" msgid "Added only when launching with a prompt — e.g. <0>--, <1>--prompt, <2>-i." msgstr "Aggiunti solo quando si avvia con un prompt — es. <0>--, <1>--prompt, <2>-i." -msgid "Adding members will increase your subscription cost, prorated to your billing cycle." -msgstr "Aggiungere membri aumenterà il costo del tuo abbonamento, in proporzione al ciclo di fatturazione." - msgid "Address Comments with Agent" msgstr "Rispondi ai commenti con un agente" @@ -8221,9 +8218,6 @@ msgstr "Invita un membro" msgid "Invite Member" msgstr "Invita un membro" -msgid "Invite people..." -msgstr "Invita persone..." - msgid "Invite teammate" msgstr "Invita un collega" @@ -16171,9 +16165,6 @@ msgstr "Questa vista ha riscontrato un errore" msgid "This week" msgstr "Questa settimana" -msgid "This will affect your billing" -msgstr "Questo influirà sulla tua fatturazione" - msgid "This will change your organization's public URL. Make sure to update any bookmarks or shared links." msgstr "Questo cambierà l'URL pubblico della tua organizzazione. Assicurati di aggiornare eventuali segnalibri o link condivisi." diff --git a/packages/i18n/locales/ja/messages.po b/packages/i18n/locales/ja/messages.po index 748a5846290..6c4ac65b603 100644 --- a/packages/i18n/locales/ja/messages.po +++ b/packages/i18n/locales/ja/messages.po @@ -1694,9 +1694,6 @@ msgstr "1件のファイルを{where}に追加しました" msgid "Added only when launching with a prompt — e.g. <0>--, <1>--prompt, <2>-i." msgstr "プロンプト付きで起動するときのみ追加されます — 例: <0>--、<1>--prompt、<2>-i。" -msgid "Adding members will increase your subscription cost, prorated to your billing cycle." -msgstr "メンバーを追加するとサブスクリプション費用が増え、請求サイクルに応じて日割り計算されます。" - msgid "Address Comments with Agent" msgstr "エージェントでコメントに対応" @@ -8221,9 +8218,6 @@ msgstr "メンバーを招待" msgid "Invite Member" msgstr "メンバーを招待" -msgid "Invite people..." -msgstr "メンバーを招待..." - msgid "Invite teammate" msgstr "メンバーを招待" @@ -16171,9 +16165,6 @@ msgstr "このビューでエラーが発生しました" msgid "This week" msgstr "今週" -msgid "This will affect your billing" -msgstr "請求に影響します" - msgid "This will change your organization's public URL. Make sure to update any bookmarks or shared links." msgstr "組織の公開URLが変わります。ブックマークや共有リンクを忘れずに更新してください。" diff --git a/packages/i18n/locales/ko/messages.po b/packages/i18n/locales/ko/messages.po index 3eb46438dcd..02cd91224da 100644 --- a/packages/i18n/locales/ko/messages.po +++ b/packages/i18n/locales/ko/messages.po @@ -1694,9 +1694,6 @@ msgstr "{where}에 파일 1개를 추가했습니다" msgid "Added only when launching with a prompt — e.g. <0>--, <1>--prompt, <2>-i." msgstr "프롬프트와 함께 실행할 때만 추가됩니다 — 예: <0>--, <1>--prompt, <2>-i." -msgid "Adding members will increase your subscription cost, prorated to your billing cycle." -msgstr "멤버를 추가하면 결제 주기에 비례해 구독 요금이 늘어납니다." - msgid "Address Comments with Agent" msgstr "에이전트로 코멘트 처리" @@ -8221,9 +8218,6 @@ msgstr "멤버 초대" msgid "Invite Member" msgstr "멤버 초대" -msgid "Invite people..." -msgstr "사람 초대..." - msgid "Invite teammate" msgstr "팀원 초대" @@ -16171,9 +16165,6 @@ msgstr "이 화면에서 오류가 발생했습니다" msgid "This week" msgstr "이번 주" -msgid "This will affect your billing" -msgstr "결제 금액이 달라집니다" - msgid "This will change your organization's public URL. Make sure to update any bookmarks or shared links." msgstr "조직의 공개 URL이 바뀝니다. 북마크나 공유한 링크도 함께 업데이트하세요." diff --git a/packages/i18n/locales/nl/messages.po b/packages/i18n/locales/nl/messages.po index bda9ef1788f..24a5882813f 100644 --- a/packages/i18n/locales/nl/messages.po +++ b/packages/i18n/locales/nl/messages.po @@ -1694,9 +1694,6 @@ msgstr "1 bestand toegevoegd aan {where}" msgid "Added only when launching with a prompt — e.g. <0>--, <1>--prompt, <2>-i." msgstr "Alleen toegevoegd bij starten met een prompt — bijv. <0>--, <1>--prompt, <2>-i." -msgid "Adding members will increase your subscription cost, prorated to your billing cycle." -msgstr "Leden toevoegen verhoogt de kosten van je abonnement, naar rato van je factuurcyclus." - msgid "Address Comments with Agent" msgstr "Opmerkingen afhandelen met agent" @@ -8221,9 +8218,6 @@ msgstr "Lid uitnodigen" msgid "Invite Member" msgstr "Lid uitnodigen" -msgid "Invite people..." -msgstr "Mensen uitnodigen..." - msgid "Invite teammate" msgstr "Teamgenoot uitnodigen" @@ -16171,9 +16165,6 @@ msgstr "Deze weergave liep tegen een fout aan" msgid "This week" msgstr "Deze week" -msgid "This will affect your billing" -msgstr "Dit heeft gevolgen voor je facturering" - msgid "This will change your organization's public URL. Make sure to update any bookmarks or shared links." msgstr "Hiermee verandert de publieke URL van je organisatie. Werk bladwijzers en gedeelde links bij." diff --git a/packages/i18n/locales/pl/messages.po b/packages/i18n/locales/pl/messages.po index d9584becb5a..efcd2019b28 100644 --- a/packages/i18n/locales/pl/messages.po +++ b/packages/i18n/locales/pl/messages.po @@ -1694,9 +1694,6 @@ msgstr "Dodano 1 plik do {where}" msgid "Added only when launching with a prompt — e.g. <0>--, <1>--prompt, <2>-i." msgstr "Dodawane tylko przy uruchamianiu z promptem — np. <0>--, <1>--prompt, <2>-i." -msgid "Adding members will increase your subscription cost, prorated to your billing cycle." -msgstr "Dodanie członków zwiększy koszt subskrypcji, proporcjonalnie do cyklu rozliczeniowego." - msgid "Address Comments with Agent" msgstr "Zajmij się komentarzami agentem" @@ -8221,9 +8218,6 @@ msgstr "Zaproś członka" msgid "Invite Member" msgstr "Zaproś członka" -msgid "Invite people..." -msgstr "Zaproś osoby..." - msgid "Invite teammate" msgstr "Zaproś współpracownika" @@ -16171,9 +16165,6 @@ msgstr "Ten widok napotkał błąd" msgid "This week" msgstr "W tym tygodniu" -msgid "This will affect your billing" -msgstr "Wpłynie to na Twoje rozliczenia" - msgid "This will change your organization's public URL. Make sure to update any bookmarks or shared links." msgstr "Zmieni to publiczny adres URL Twojej organizacji. Zaktualizuj zakładki i udostępnione linki." diff --git a/packages/i18n/locales/pt-BR/messages.po b/packages/i18n/locales/pt-BR/messages.po index 4cfa218da20..e483b2d8d4f 100644 --- a/packages/i18n/locales/pt-BR/messages.po +++ b/packages/i18n/locales/pt-BR/messages.po @@ -1694,9 +1694,6 @@ msgstr "1 arquivo adicionado a {where}" msgid "Added only when launching with a prompt — e.g. <0>--, <1>--prompt, <2>-i." msgstr "Adicionados só ao iniciar com um prompt — ex.: <0>--, <1>--prompt, <2>-i." -msgid "Adding members will increase your subscription cost, prorated to your billing cycle." -msgstr "Adicionar membros aumenta o custo da sua assinatura, proporcional ao ciclo de cobrança." - msgid "Address Comments with Agent" msgstr "Resolver comentários com um agente" @@ -8221,9 +8218,6 @@ msgstr "Convidar membro" msgid "Invite Member" msgstr "Convidar membro" -msgid "Invite people..." -msgstr "Convidar pessoas..." - msgid "Invite teammate" msgstr "Convidar colega" @@ -16171,9 +16165,6 @@ msgstr "Esta visualização deu erro" msgid "This week" msgstr "Esta semana" -msgid "This will affect your billing" -msgstr "Isso afeta o seu faturamento" - msgid "This will change your organization's public URL. Make sure to update any bookmarks or shared links." msgstr "Isso muda a URL pública da sua organização. Atualize seus favoritos ou links compartilhados." diff --git a/packages/i18n/locales/ru/messages.po b/packages/i18n/locales/ru/messages.po index e4f3daa96f6..2ec2a3eb77d 100644 --- a/packages/i18n/locales/ru/messages.po +++ b/packages/i18n/locales/ru/messages.po @@ -1694,9 +1694,6 @@ msgstr "В {where} добавлен 1 файл" msgid "Added only when launching with a prompt — e.g. <0>--, <1>--prompt, <2>-i." msgstr "Добавляются только при запуске с промптом — например, <0>--, <1>--prompt, <2>-i." -msgid "Adding members will increase your subscription cost, prorated to your billing cycle." -msgstr "Добавление участников увеличит стоимость подписки пропорционально расчётному периоду." - msgid "Address Comments with Agent" msgstr "Разобрать комментарии агентом" @@ -8221,9 +8218,6 @@ msgstr "Пригласить участника" msgid "Invite Member" msgstr "Пригласить участника" -msgid "Invite people..." -msgstr "Пригласить людей..." - msgid "Invite teammate" msgstr "Пригласить коллегу" @@ -16171,9 +16165,6 @@ msgstr "В этом представлении произошла ошибка" msgid "This week" msgstr "На этой неделе" -msgid "This will affect your billing" -msgstr "Это повлияет на оплату" - msgid "This will change your organization's public URL. Make sure to update any bookmarks or shared links." msgstr "Это изменит публичный URL вашей организации. Не забудьте обновить закладки и общие ссылки." diff --git a/packages/i18n/locales/tr/messages.po b/packages/i18n/locales/tr/messages.po index 1d7fbb34cdb..c77a29650a5 100644 --- a/packages/i18n/locales/tr/messages.po +++ b/packages/i18n/locales/tr/messages.po @@ -1694,9 +1694,6 @@ msgstr "{where} konumuna 1 dosya eklendi" msgid "Added only when launching with a prompt — e.g. <0>--, <1>--prompt, <2>-i." msgstr "Yalnızca istemle başlatılırken eklenir — örn. <0>--, <1>--prompt, <2>-i." -msgid "Adding members will increase your subscription cost, prorated to your billing cycle." -msgstr "Üye eklemek, faturalandırma döngünüze orantılanarak abonelik maliyetinizi artırır." - msgid "Address Comments with Agent" msgstr "Yorumları ajanla ele al" @@ -8221,9 +8218,6 @@ msgstr "Üye davet et" msgid "Invite Member" msgstr "Üye davet et" -msgid "Invite people..." -msgstr "Kişileri davet et..." - msgid "Invite teammate" msgstr "Takım arkadaşı davet et" @@ -16171,9 +16165,6 @@ msgstr "Bu görünüm bir hatayla karşılaştı" msgid "This week" msgstr "Bu hafta" -msgid "This will affect your billing" -msgstr "Bu, faturalandırmanızı etkiler" - msgid "This will change your organization's public URL. Make sure to update any bookmarks or shared links." msgstr "Bu, kuruluşunuzun herkese açık URL'sini değiştirir. Yer imlerinizi veya paylaşılan bağlantıları güncellemeyi unutmayın." diff --git a/packages/i18n/locales/vi/messages.po b/packages/i18n/locales/vi/messages.po index ae3893ba3e1..093f2478e8a 100644 --- a/packages/i18n/locales/vi/messages.po +++ b/packages/i18n/locales/vi/messages.po @@ -1694,9 +1694,6 @@ msgstr "Đã thêm 1 tệp vào {where}" msgid "Added only when launching with a prompt — e.g. <0>--, <1>--prompt, <2>-i." msgstr "Chỉ thêm vào khi khởi chạy kèm prompt — ví dụ <0>--, <1>--prompt, <2>-i." -msgid "Adding members will increase your subscription cost, prorated to your billing cycle." -msgstr "Thêm thành viên sẽ làm tăng chi phí đăng ký, tính theo tỷ lệ trong chu kỳ thanh toán của bạn." - msgid "Address Comments with Agent" msgstr "Xử lý bình luận bằng agent" @@ -8221,9 +8218,6 @@ msgstr "Mời thành viên" msgid "Invite Member" msgstr "Mời thành viên" -msgid "Invite people..." -msgstr "Mời người khác..." - msgid "Invite teammate" msgstr "Mời đồng đội" @@ -16171,9 +16165,6 @@ msgstr "Khung hiển thị này gặp lỗi" msgid "This week" msgstr "Tuần này" -msgid "This will affect your billing" -msgstr "Việc này ảnh hưởng tới hóa đơn của bạn" - msgid "This will change your organization's public URL. Make sure to update any bookmarks or shared links." msgstr "Thao tác này sẽ đổi URL công khai của tổ chức. Hãy nhớ cập nhật các dấu trang hoặc liên kết đã chia sẻ." diff --git a/packages/i18n/locales/zh-CN/messages.po b/packages/i18n/locales/zh-CN/messages.po index e300534172a..f986b018505 100644 --- a/packages/i18n/locales/zh-CN/messages.po +++ b/packages/i18n/locales/zh-CN/messages.po @@ -1694,9 +1694,6 @@ msgstr "已向{where}添加1个文件" msgid "Added only when launching with a prompt — e.g. <0>--, <1>--prompt, <2>-i." msgstr "仅在带提示词启动时添加,例如<0>--、<1>--prompt、<2>-i。" -msgid "Adding members will increase your subscription cost, prorated to your billing cycle." -msgstr "添加成员会增加订阅费用,并按账单周期按比例计算。" - msgid "Address Comments with Agent" msgstr "用智能体处理评论" @@ -8221,9 +8218,6 @@ msgstr "邀请成员" msgid "Invite Member" msgstr "邀请成员" -msgid "Invite people..." -msgstr "邀请他人..." - msgid "Invite teammate" msgstr "邀请团队成员" @@ -16171,9 +16165,6 @@ msgstr "此视图出错了" msgid "This week" msgstr "本周" -msgid "This will affect your billing" -msgstr "这会影响你的账单" - msgid "This will change your organization's public URL. Make sure to update any bookmarks or shared links." msgstr "这会更改组织的公开URL。请记得更新书签和已分享的链接。" diff --git a/packages/i18n/locales/zh-TW/messages.po b/packages/i18n/locales/zh-TW/messages.po index 5c3bea16cf5..6203d122761 100644 --- a/packages/i18n/locales/zh-TW/messages.po +++ b/packages/i18n/locales/zh-TW/messages.po @@ -1694,9 +1694,6 @@ msgstr "已向{where}新增1個檔案" msgid "Added only when launching with a prompt — e.g. <0>--, <1>--prompt, <2>-i." msgstr "僅在帶提示詞啟動時新增,例如<0>--、<1>--prompt、<2>-i。" -msgid "Adding members will increase your subscription cost, prorated to your billing cycle." -msgstr "新增成員會增加訂閱費用,並按帳單週期按比例計算。" - msgid "Address Comments with Agent" msgstr "用代理程式處理評論" @@ -8221,9 +8218,6 @@ msgstr "邀請成員" msgid "Invite Member" msgstr "邀請成員" -msgid "Invite people..." -msgstr "邀請他人..." - msgid "Invite teammate" msgstr "邀請團隊成員" @@ -16171,9 +16165,6 @@ msgstr "此檢視出錯了" msgid "This week" msgstr "本週" -msgid "This will affect your billing" -msgstr "這會影響你的帳單" - msgid "This will change your organization's public URL. Make sure to update any bookmarks or shared links." msgstr "這會更改組織的公開URL。請記得更新書籤和已分享的連結。" diff --git a/packages/ui/src/components/ui/dialog.tsx b/packages/ui/src/components/ui/dialog.tsx index 4f1b1f8054d..ac5790754c2 100644 --- a/packages/ui/src/components/ui/dialog.tsx +++ b/packages/ui/src/components/ui/dialog.tsx @@ -52,6 +52,7 @@ function DialogContent({ className, children, showCloseButton = true, + onInteractOutside, ...props }: React.ComponentProps & { showCloseButton?: boolean; @@ -65,6 +66,10 @@ function DialogContent({ "bg-background data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 fixed top-[50%] left-[50%] z-50 grid w-full max-w-[calc(100%-2rem)] translate-x-[-50%] translate-y-[-50%] gap-4 rounded-lg border p-6 shadow-lg duration-200 sm:max-w-lg", className, )} + onInteractOutside={(event) => { + onInteractOutside?.(event); + if (isInsideAnotherDialog(event.target)) event.preventDefault(); + }} {...props} > {children} @@ -84,6 +89,13 @@ function DialogContent({ ); } +function isInsideAnotherDialog(target: EventTarget | null): boolean { + return ( + target instanceof Element && + target.closest('[data-slot="dialog-content"]') !== null + ); +} + function DialogHeader({ className, ...props }: React.ComponentProps<"div">) { return (