Voice-to-text dictation app with local (Nvidia Parakeet/Whisper) and cloud models (BYOK). Privacy-first and available cross-platform.
JavaScript aianthropiccross-platformgeminigroqlinuxmacosnvidiaopen-sourceopenaiparakeetspeech-to-texttranscribewhisperwindows
feat: new space assignment access and small fixes
Chadpihaaee31a800fe8
diff --git a/src/components/CreateTeamDialog.tsx b/src/components/CreateTeamDialog.tsxnew file mode 100644index 000000000..57d062d3c--- /dev/null+++ b/src/components/CreateTeamDialog.tsx@@ -0,0 +1,197 @@+import { useEffect, useMemo, useState } from "react";+import { useShallow } from "zustand/react/shallow";+import { useTranslation } from "react-i18next";+import { Loader2 } from "lucide-react";+import { Dialog, DialogContent, DialogHeader, DialogTitle, DialogFooter } from "./ui/dialog";+import { Button } from "./ui/button";+import { Input } from "./ui/input";+import { Label } from "./ui/label";+import { useToast } from "./ui/useToast";+import MemberPickList from "./MemberPickList";+import { TeamsService } from "../services/TeamsService";+import { addTeamMembers } from "../services/spaceActions";+import { orderMemberCandidates } from "../lib/memberCandidates";+import { useWorkspaceStore } from "../stores/workspaceStore";+import { useAuth } from "../hooks/useAuth";+import { useDelayedFlag } from "../hooks/useDelayedFlag";+import type { Team, WorkspaceMember } from "../types/electron";++interface CreateTeamDialogProps {+ workspaceId: string;+ open: boolean;+ onOpenChange: (open: boolean) => void;+ /** Fires after the team (and any picked members) exist on the server. */+ onCreated?: (team: Team) => void | Promise<void>;+}++/** One-step team creation: name it and pick its members in the same modal. */+export default function CreateTeamDialog({+ workspaceId,+ open,+ onOpenChange,+ onCreated,+}: CreateTeamDialogProps) {+ const { t } = useTranslation();+ const { toast } = useToast();+ const { user } = useAuth();+ const { members: roster, refreshMembers } = useWorkspaceStore(+ useShallow((s) => ({ members: s.members, refreshMembers: s.refreshMembers }))+ );+ const [name, setName] = useState("");+ const [memberSearch, setMemberSearch] = useState("");+ const [selectedIds, setSelectedIds] = useState<Set<string>>(new Set());+ const [membersError, setMembersError] = useState(false);+ const [rosterLoaded, setRosterLoaded] = useState(false);+ const [isCreating, setIsCreating] = useState(false);+ const showSpinner = useDelayedFlag(isCreating);++ useEffect(() => {+ if (!open) return;+ setMembersError(false);+ setRosterLoaded(false);+ refreshMembers(workspaceId)+ .then(() => setRosterLoaded(true))+ .catch(() => setMembersError(true));+ }, [open, workspaceId, refreshMembers]);++ const candidates = useMemo(+ () => (rosterLoaded ? orderMemberCandidates(roster, user?.id) : []),+ [roster, rosterLoaded, user?.id]+ );+ const filteredCandidates = useMemo(() => {+ const query = memberSearch.trim().toLowerCase();+ if (!query) return candidates;+ return candidates.filter(+ (m) => (m.name ?? "").toLowerCase().includes(query) || m.email.toLowerCase().includes(query)+ );+ }, [candidates, memberSearch]);++ const handleOpenChange = (nextOpen: boolean) => {+ onOpenChange(nextOpen);+ if (!nextOpen) {+ setName("");+ setMemberSearch("");+ setSelectedIds(new Set());+ }+ };++ const toggleMember = (member: WorkspaceMember) => {+ setSelectedIds((prev) => {+ const next = new Set(prev);+ if (!next.delete(member.user_id)) next.add(member.user_id);+ return next;+ });+ };++ const handleCreate = async () => {+ const trimmed = name.trim();+ if (!trimmed || isCreating) return;+ setIsCreating(true);+ try {+ const team = await TeamsService.create(workspaceId, { name: trimmed });+ // The server adds the creator to a new team as admin; re-adding them+ // here would upsert that role back down to member.+ const memberIds = [...selectedIds].filter((id) => id !== user?.id);+ let added = 0;+ if (memberIds.length > 0) {+ const { failures } = await addTeamMembers(team.id, memberIds);+ added = memberIds.length - failures.length;+ if (failures.length > 0) {+ toast({+ title: t("notes.spaces.members.addFailed", {+ failed: failures.length,+ total: memberIds.length,+ }),+ variant: "destructive",+ });+ }+ }+ // +1: the creator's server-added admin row.+ await onCreated?.({ ...team, member_count: added + 1 });+ handleOpenChange(false);+ } catch (err) {+ toast({+ title: t("settingsPage.workspace.teams.couldNotCreate"),+ description: err instanceof Error ? err.message : t("common.unknownError"),+ variant: "destructive",+ });+ } finally {+ setIsCreating(false);+ }+ };++ return (+ <Dialog open={open} onOpenChange={handleOpenChange}>+ <DialogContent className="max-w-md">+ <DialogHeader>+ <DialogTitle>{t("settingsPage.workspace.teams.createTitle")}</DialogTitle>+ </DialogHeader>++ <div className="space-y-3">+ <div className="space-y-1.5">+ <Label htmlFor="create-team-name" className="text-xs font-medium">+ {t("settingsPage.workspace.teams.nameLabel")}+ </Label>+ <Input+ id="create-team-name"+ value={name}+ autoFocus+ maxLength={80}+ onChange={(e) => setName(e.target.value)}+ onKeyDown={(e) => {+ if (e.key === "Enter") void handleCreate();+ }}+ />+ </div>++ <div className="space-y-1.5">+ <label className="text-xs font-medium text-foreground/50">+ {t("settingsPage.workspace.teams.addMembersLabel")}+ </label>+ {membersError ? (+ <div className="rounded border border-border/70 dark:border-border-subtle/50 px-3 py-2.5 flex items-center justify-between gap-2">+ <p className="text-xs text-muted-foreground">+ {t("settingsPage.workspace.members.loadError")}+ </p>+ <Button+ variant="ghost"+ size="sm"+ onClick={() => {+ setMembersError(false);+ refreshMembers(workspaceId)+ .then(() => setRosterLoaded(true))+ .catch(() => setMembersError(true));+ }}+ className="h-6 px-2 text-xs shrink-0"+ >+ {t("settingsPage.workspace.loadError.retry")}+ </Button>+ </div>+ ) : !rosterLoaded ? (+ <div className="h-24 rounded bg-foreground/5 dark:bg-white/5 animate-pulse" />+ ) : (+ <MemberPickList+ members={filteredCandidates}+ search={memberSearch}+ onSearchChange={setMemberSearch}+ onSelect={toggleMember}+ selectedIds={selectedIds}+ currentUserId={user?.id}+ />+ )}+ </div>+ </div>++ <DialogFooter>+ <Button variant="ghost" onClick={() => handleOpenChange(false)} disabled={isCreating}>+ {t("common.cancel")}+ </Button>+ <Button onClick={() => void handleCreate()} disabled={!name.trim() || isCreating}>+ {showSpinner && <Loader2 className="mr-1.5 h-3.5 w-3.5 animate-spin" />}+ {t("common.create")}+ </Button>+ </DialogFooter>+ </DialogContent>+ </Dialog>+ );+}diff --git a/src/components/MemberAvatar.tsx b/src/components/MemberAvatar.tsxindex 0ad760039..97f89ac0d 100644--- a/src/components/MemberAvatar.tsx+++ b/src/components/MemberAvatar.tsx@@ -1,3 +1,4 @@+import { useState } from "react";import { cn } from "./lib/utils";const SIZES = {@@ -14,8 +15,20 @@ interface MemberAvatarProps {export default function MemberAvatar({ name, email, image, size = "md" }: MemberAvatarProps) {const { box, text } = SIZES[size];- if (image) {- return <img src={image} alt="" className={cn(box, "rounded-full object-cover shrink-0")} />;+ // Avatar URLs go stale (OAuth-hosted images expire/rotate); tracking the+ // failed src — rather than a boolean — retries automatically if it changes.+ const [failedSrc, setFailedSrc] = useState<string | null>(null);+ if (image && image !== failedSrc) {+ return (+ <img+ src={image}+ alt=""+ loading="lazy"+ referrerPolicy="no-referrer"+ onError={() => setFailedSrc(image)}+ className={cn(box, "rounded-full object-cover shrink-0")}+ />+ );}return (<spandiff --git a/src/components/MemberPickList.tsx b/src/components/MemberPickList.tsxindex 805e1adfb..35562e0c3 100644--- a/src/components/MemberPickList.tsx+++ b/src/components/MemberPickList.tsx@@ -11,6 +11,8 @@ interface MemberPickListProps {onSelect: (member: WorkspaceMember) => void;/** Toggle mode: selected rows show a check and expose aria-pressed. */selectedIds?: Set<string>;+ /** Marks this member's row with a "You" hint. */+ currentUserId?: string;/** Rows awaiting a server round-trip: disabled with a spinner. */busyIds?: Set<string>;/** Extra classes for the scroll list (defaults the max height). */@@ -25,6 +27,7 @@ export default function MemberPickList({onSearchChange,onSelect,selectedIds,+ currentUserId,busyIds,listClassName,footer,@@ -67,6 +70,11 @@ export default function MemberPickList({<span className="text-xs text-foreground truncate flex-1">{member.name || member.email}</span>+ {member.user_id === currentUserId && (+ <span className="text-[10px] text-foreground/40 shrink-0">+ {t("notes.spaces.members.you")}+ </span>+ )}{isSelected && <Check size={11} className="text-primary shrink-0" />}{isBusy && (<Loader2 className="w-3 h-3 animate-spin text-muted-foreground shrink-0" />diff --git a/src/components/SettingsPage.tsx b/src/components/SettingsPage.tsxindex 6d685d56d..821bf11e3 100644--- a/src/components/SettingsPage.tsx+++ b/src/components/SettingsPage.tsx@@ -524,6 +524,28 @@ function TabPanel({ active, children }: { active: boolean; children: React.Reactreturn <div className={active ? undefined : "hidden"}>{children}</div>;}+function AccountAvatar({ image, name }: { image?: string | null; name: string }) {+ // Same stale-URL fallback as MemberAvatar: OAuth-hosted images expire, and a+ // bare <img> would render the broken-image glyph instead of the icon.+ const [failedSrc, setFailedSrc] = useState<string | null>(null);+ return (+ <div className="w-10 h-10 rounded-full flex items-center justify-center shrink-0 overflow-hidden bg-primary/10 dark:bg-primary/15">+ {image && image !== failedSrc ? (+ <img+ src={image}+ alt={name}+ loading="lazy"+ referrerPolicy="no-referrer"+ onError={() => setFailedSrc(image)}+ className="w-10 h-10 rounded-full object-cover"+ />+ ) : (+ <UserCircle className="w-5 h-5 text-primary" />+ )}+ </div>+ );+}+function SpeechToTextTabs({initialTab,renderDictation,@@ -1613,17 +1635,10 @@ export default function SettingsPage({<SettingsPanel><SettingsPanelRow><div className="flex items-center gap-3">- <div className="w-10 h-10 rounded-full flex items-center justify-center shrink-0 overflow-hidden bg-primary/10 dark:bg-primary/15">- {user.image ? (- <img- src={user.image}- alt={user.name || t("settingsPage.account.user")}- className="w-10 h-10 rounded-full object-cover"- />- ) : (- <UserCircle className="w-5 h-5 text-primary" />- )}- </div>+ <AccountAvatar+ image={user.image}+ name={user.name || t("settingsPage.account.user")}+ /><div className="min-w-0 flex-1"><p className="text-xs font-medium text-foreground truncate">{user.name || t("settingsPage.account.user")}diff --git a/src/components/TeamRosterSection.tsx b/src/components/TeamRosterSection.tsxindex f3a6e4570..1d92a82ce 100644--- a/src/components/TeamRosterSection.tsx+++ b/src/components/TeamRosterSection.tsx@@ -8,12 +8,15 @@ import { cn } from "./lib/utils";import MemberAvatar from "./MemberAvatar";import MemberPickList from "./MemberPickList";import RoleBadge from "./RoleBadge";+import { orderMemberCandidates } from "../lib/memberCandidates";import { TeamsService } from "../services/TeamsService";import { addTeamMembers, removeTeamMember, setTeamMemberRole } from "../services/spaceActions";import type { TeamMember, TeamRole, WorkspaceMember } from "../types/electron";interface TeamRosterSectionProps {teamId: string;+ /** Names the team in the add-people label and confirmation toasts. */+ teamName: string;canManage: boolean;/** Workspace roster: the add-people candidate pool. */workspaceMembers: WorkspaceMember[];@@ -27,6 +30,7 @@ interface TeamRosterSectionProps {export default function TeamRosterSection({teamId,+ teamName,canManage,workspaceMembers,currentUserId,@@ -88,24 +92,30 @@ export default function TeamRosterSection({void withRowBusy(member.user_id, () => setTeamMemberRole(teamId, member.user_id, role));};- const handleAdd = (userId: string) => {- void withRowBusy(userId, async () => {- const { failures } = await addTeamMembers(teamId, [userId]);+ const handleAdd = (member: WorkspaceMember) => {+ void withRowBusy(member.user_id, async () => {+ const { failures } = await addTeamMembers(teamId, [member.user_id]);if (failures.length > 0) throw failures[0];+ toast({+ title: t("notes.spaces.members.addedToTeam", {+ name: member.name || member.email,+ team: teamName,+ }),+ });});};const memberIds = useMemo(() => new Set(members.map((m) => m.user_id)), [members]);const addCandidates = useMemo(() => {const query = addSearch.trim().toLowerCase();- return workspaceMembers.filter(+ const matches = workspaceMembers.filter((m) =>- m.user_id !== currentUserId &&!memberIds.has(m.user_id) &&(!query ||(m.name ?? "").toLowerCase().includes(query) ||m.email.toLowerCase().includes(query)));+ return orderMemberCandidates(matches, currentUserId);}, [workspaceMembers, memberIds, addSearch, currentUserId]);const searchEmail = addSearch.trim().toLowerCase();@@ -167,10 +177,12 @@ export default function TeamRosterSection({<buttontype="button"onClick={() =>- removeConfirm(member, () =>- void withRowBusy(member.user_id, () =>- removeTeamMember(teamId, member.user_id)- )+ removeConfirm(+ member,+ () =>+ void withRowBusy(member.user_id, () =>+ removeTeamMember(teamId, member.user_id)+ ))}disabled={isBusy}@@ -207,13 +219,14 @@ export default function TeamRosterSection({{canManage && (<div className="space-y-1.5"><label className="text-xs font-medium text-foreground/50">- {t("notes.spaces.members.addPeople")}+ {t("notes.spaces.members.addPeopleToTeam", { team: teamName })}</label><MemberPickListmembers={addCandidates}search={addSearch}onSearchChange={setAddSearch}- onSelect={(candidate) => handleAdd(candidate.user_id)}+ onSelect={handleAdd}+ currentUserId={currentUserId}busyIds={busyUserIds}listClassName="max-h-32"footer={diff --git a/src/components/notes/CreateSpaceDialog.tsx b/src/components/notes/CreateSpaceDialog.tsxindex 14707b72a..ea9406ed7 100644--- a/src/components/notes/CreateSpaceDialog.tsx+++ b/src/components/notes/CreateSpaceDialog.tsx@@ -25,6 +25,7 @@ import { useWorkspaceStore } from "../../stores/workspaceStore";import { useAuth } from "../../hooks/useAuth";import { useDelayedFlag } from "../../hooks/useDelayedFlag";import { clampEmojiInput } from "../../lib/emojiInput";+import { orderMemberCandidates } from "../../lib/memberCandidates";import {manageableWorkspaces as findManageableWorkspaces,selectWorkspaceForSpaceCreation,@@ -63,9 +64,15 @@ const EMOJI_CHOICES = [interface CreateSpaceDialogProps {open: boolean;onOpenChange: (open: boolean) => void;+ /** Workspace preselected by the opener (e.g. a sidebar workspace row's + button). */+ initialWorkspaceId?: string | null;}-export default function CreateSpaceDialog({ open, onOpenChange }: CreateSpaceDialogProps) {+export default function CreateSpaceDialog({+ open,+ onOpenChange,+ initialWorkspaceId = null,+}: CreateSpaceDialogProps) {const { t } = useTranslation();const { toast } = useToast();const { user } = useAuth();@@ -152,12 +159,15 @@ export default function CreateSpaceDialog({ open, onOpenChange }: CreateSpaceDiaif (!open) return;setSelectedWorkspaceId((current) => {if (current && manageableWorkspaces.some((w) => w.id === current)) return current;+ if (initialWorkspaceId && manageableWorkspaces.some((w) => w.id === initialWorkspaceId)) {+ return initialWorkspaceId;+ }return defaultWorkspace?.id ?? null;});- }, [open, manageableWorkspaces, defaultWorkspace?.id]);+ }, [open, manageableWorkspaces, defaultWorkspace?.id, initialWorkspaceId]);const candidates = useMemo(- () => (rosterWorkspaceId === workspace?.id ? roster.filter((m) => m.user_id !== user?.id) : []),+ () => (rosterWorkspaceId === workspace?.id ? orderMemberCandidates(roster, user?.id) : []),[roster, rosterWorkspaceId, user?.id, workspace?.id]);const filteredCandidates = useMemo(() => {@@ -233,20 +243,24 @@ export default function CreateSpaceDialog({ open, onOpenChange }: CreateSpaceDia// failed — then the server-side zero-team create still lets admins proceed.const hasTeamSelection = selectedTeamIds.size > 0 || newTeamOpen || teamsError;+ // Teams for the target workspace haven't arrived yet: skeleton the section+ // (a bare "New team" button next to the label reads as misplaced UI).+ const teamsLoading = !teamsError && teamsWorkspaceId !== workspace?.id;+const handleCreate = async () => {const trimmed = name.trim();if (!trimmed || isCreating || !workspace || !hasTeamSelection) return;setIsCreating(true);try {- const memberIds = [...selectedIds];+ // The server adds the creator to a new team as admin; re-adding them+ // here would upsert that role back down to member.+ const memberIds = [...selectedIds].filter((id) => id !== user?.id);const { space, failedMembers } = await createSpace(workspace.id,{ name: trimmed, emoji: emoji.trim() || null },{existingTeamIds: [...selectedTeamIds],- newTeam: newTeamOpen- ? { name: newTeamName.trim() || trimmed, memberIds }- : undefined,+ newTeam: newTeamOpen ? { name: newTeamName.trim() || trimmed, memberIds } : undefined,});if (failedMembers > 0) {@@ -313,23 +327,31 @@ export default function CreateSpaceDialog({ open, onOpenChange }: CreateSpaceDia</div>) : (<>- {manageableWorkspaces.length > 1 && workspace && (+ {/* Anyone in several workspaces sees the target workspace, even+ when only one of them is manageable (no picker to infer from).+ Opening from a workspace row's + already chose the target, so+ it renders as fixed context rather than a picker. */}+ {workspaces.length > 1 && workspace && (<div className="space-y-1.5"><label className="text-xs font-medium text-foreground/50">{t("settingsPage.workspace.title")}</label>- <Select value={workspace.id} onValueChange={handleWorkspaceChange}>- <SelectTrigger>- <SelectValue />- </SelectTrigger>- <SelectContent>- {manageableWorkspaces.map((item) => (- <SelectItem key={item.id} value={item.id}>- {item.name}- </SelectItem>- ))}- </SelectContent>- </Select>+ {manageableWorkspaces.length > 1 && !initialWorkspaceId ? (+ <Select value={workspace.id} onValueChange={handleWorkspaceChange}>+ <SelectTrigger>+ <SelectValue />+ </SelectTrigger>+ <SelectContent>+ {manageableWorkspaces.map((item) => (+ <SelectItem key={item.id} value={item.id}>+ {item.name}+ </SelectItem>+ ))}+ </SelectContent>+ </Select>+ ) : (+ <p className="text-sm text-foreground truncate">{workspace.name}</p>+ )}</div>)}@@ -415,6 +437,8 @@ export default function CreateSpaceDialog({ open, onOpenChange }: CreateSpaceDia{t("settingsPage.workspace.loadError.retry")}</Button></div>+ ) : teamsLoading ? (+ <div className="h-24 rounded bg-foreground/5 dark:bg-white/5 animate-pulse" />) : (<>{teams.length > 0 && (@@ -484,6 +508,7 @@ export default function CreateSpaceDialog({ open, onOpenChange }: CreateSpaceDiaonSearchChange={setMemberSearch}onSelect={toggleMember}selectedIds={selectedIds}+ currentUserId={user?.id}/>) : null}{teams.length > 0 && (diff --git a/src/components/notes/SpaceMembersDialog.tsx b/src/components/notes/SpaceMembersDialog.tsxindex cef1264a2..a2731d62c 100644--- a/src/components/notes/SpaceMembersDialog.tsx+++ b/src/components/notes/SpaceMembersDialog.tsx@@ -1,20 +1,28 @@import { useCallback, useEffect, useMemo, useState } from "react";import { useShallow } from "zustand/react/shallow";import { useTranslation } from "react-i18next";-import { Info, Plus, X } from "lucide-react";+import { ChevronRight, Info, Loader2, Plus, X } from "lucide-react";import { Dialog, DialogContent, DialogHeader, DialogTitle, ConfirmDialog } from "../ui/dialog";-import { Select, SelectTrigger, SelectContent, SelectItem } from "../ui/select";+import { Select, SelectTrigger, SelectContent, SelectItem, SelectValue } from "../ui/select";+import { Button } from "../ui/button";import { useDialogs } from "../../hooks/useDialogs";import { useAuth } from "../../hooks/useAuth";+import { useDelayedFlag } from "../../hooks/useDelayedFlag";+import { cn } from "../lib/utils";+import CreateTeamDialog from "../CreateTeamDialog";import InviteTeammateDialog from "../InviteTeammateDialog";import TeamRosterSection from "../TeamRosterSection";import { TeamsService } from "../../services/TeamsService";-import { assignTeamToSpace, unassignTeamFromSpace } from "../../services/spaceActions";+import {+ assignTeamToSpace,+ setSpaceTeamAccess,+ unassignTeamFromSpace,+} from "../../services/spaceActions";import { useToast } from "../ui/useToast";import { useWorkspaceStore } from "../../stores/workspaceStore";import { useSpaces } from "../../stores/noteStore";import { canManageSpace, canManageTeamRoster } from "../../lib/spacePermissions";-import type { SpaceItem, Team, TeamMember } from "../../types/electron";+import type { SpaceItem, SpaceTeamRef, Team, TeamMember } from "../../types/electron";interface SpaceMembersDialogProps {space: SpaceItem;@@ -43,25 +51,44 @@ export default function SpaceMembersDialog({ space, open, onOpenChange }: SpaceMconst [inviteOpen, setInviteOpen] = useState(false);const [inviteEmail, setInviteEmail] = useState<string | undefined>(undefined);const [inviteTeamId, setInviteTeamId] = useState<string | null>(null);+ const [pendingTeamId, setPendingTeamId] = useState<string | null>(null);+ const [isAssigning, setIsAssigning] = useState(false);+ const showAssignSpinner = useDelayedFlag(isAssigning);+ // Per-team expansion; absent = default (expanded only for single-team spaces).+ const [expandedOverrides, setExpandedOverrides] = useState<Map<string, boolean>>(new Map());+ const [newTeamOpen, setNewTeamOpen] = useState(false);+ const [accessBusyTeamId, setAccessBusyTeamId] = useState<string | null>(null);const canManage = canManageSpace(space, workspace?.role ?? null);- const canInviteToWorkspace = workspace?.role === "owner" || workspace?.role === "admin";+ const isWorkspaceAdmin = workspace?.role === "owner" || workspace?.role === "admin";+ // Team creation and workspace invites are 403'd below workspace admin.+ const canInviteToWorkspace = isWorkspaceAdmin;++ const isTeamExpanded = (teamId: string): boolean =>+ expandedOverrides.get(teamId) ?? space.teams.length === 1;++ const toggleTeamExpanded = (teamId: string): void => {+ setExpandedOverrides((prev) => new Map(prev).set(teamId, !isTeamExpanded(teamId)));+ };useEffect(() => {if (!open) {setInviteEmail(undefined);setInviteTeamId(null);+ setPendingTeamId(null);+ setExpandedOverrides(new Map());+ setNewTeamOpen(false);+ setAccessBusyTeamId(null);return;}if (space.workspace_id) {void refreshMembers(space.workspace_id).catch(() => {});- if (canManage) {- void TeamsService.list(space.workspace_id)- .then(setWorkspaceTeams)- .catch(() => setWorkspaceTeams([]));- }+ // Any workspace member may list teams; counts feed the collapsed rows.+ void TeamsService.list(space.workspace_id)+ .then(setWorkspaceTeams)+ .catch(() => setWorkspaceTeams([]));}- }, [open, space.workspace_id, refreshMembers, canManage]);+ }, [open, space.workspace_id, refreshMembers]);// How many OTHER spaces each assigned team backs — roster edits ripple there.const otherSpacesByTeam = useMemo(() => {@@ -80,6 +107,11 @@ export default function SpaceMembersDialog({ space, open, onOpenChange }: SpaceM[workspaceTeams, space.teams]);+ const memberCountByTeam = useMemo(+ () => new Map(workspaceTeams.map((team) => [team.id, team.member_count ?? 0])),+ [workspaceTeams]+ );+const confirmRemoveMember = useCallback((member: TeamMember, onConfirm: () => void) => {showConfirmDialog({@@ -122,9 +154,60 @@ export default function SpaceMembersDialog({ space, open, onOpenChange }: SpaceM});};- const handleAssignTeam = async (teamId: string) => {+ const handleAssignTeam = async () => {+ const team = unassignedTeams.find((candidate) => candidate.id === pendingTeamId);+ if (!team || isAssigning) return;+ setIsAssigning(true);+ try {+ await assignTeamToSpace(space, team.id);+ setPendingTeamId(null);+ toast({+ title: t("notes.spaces.teamsMembers.teamAdded", { team: team.name, space: space.name }),+ });+ } catch (err) {+ toast({+ title: t("common.error"),+ description: err instanceof Error ? err.message : t("common.unknownError"),+ variant: "destructive",+ });+ } finally {+ setIsAssigning(false);+ }+ };++ // Downgrading the caller's only admin-granting team is allowed (symmetric+ // with unassign): reversible by any workspace admin and never touches+ // content access. The mirror refresh flips canManage if it applies.+ const handleAccessChange = async (teamRef: SpaceTeamRef, access: "admin" | "member") => {+ if (access === (teamRef.access ?? "admin") || accessBusyTeamId) return;+ setAccessBusyTeamId(teamRef.id);try {- await assignTeamToSpace(space, teamId);+ await setSpaceTeamAccess(space, teamRef.id, access);+ toast({+ title: t("notes.spaces.teamsMembers.accessChanged", { team: teamRef.name }),+ });+ } catch (err) {+ toast({+ title: t("common.error"),+ description: err instanceof Error ? err.message : t("common.unknownError"),+ variant: "destructive",+ });+ } finally {+ setAccessBusyTeamId(null);+ }+ };++ // Registered in workspaceTeams before assignment: if assigning fails, the+ // new team still surfaces in the unassigned select for a retry. The new+ // row stays collapsed like the rest — members were already picked in the+ // create dialog.+ const handleTeamCreated = async (team: Team) => {+ setWorkspaceTeams((prev) => [...prev, team]);+ try {+ await assignTeamToSpace(space, team.id);+ toast({+ title: t("notes.spaces.teamsMembers.teamAdded", { team: team.name, space: space.name }),+ });} catch (err) {toast({title: t("common.error"),@@ -152,72 +235,177 @@ export default function SpaceMembersDialog({ space, open, onOpenChange }: SpaceM{space.teams.map((teamRef) => {const otherSpaces = otherSpacesByTeam.get(teamRef.id) ?? 0;+ const memberCount = memberCountByTeam.get(teamRef.id);+ const expanded = isTeamExpanded(teamRef.id);return (<div key={teamRef.id} className="space-y-2">- <div className="flex items-center gap-2">- <h3 className="text-xs font-semibold text-foreground flex-1 truncate">- {teamRef.name}- </h3>+ <div className="flex items-center gap-1 -mx-1">+ <button+ type="button"+ aria-expanded={expanded}+ onClick={() => toggleTeamExpanded(teamRef.id)}+ className={cn(+ "flex flex-1 min-w-0 items-center gap-1.5 h-8 px-1.5 rounded-md",+ "transition-colors duration-150 outline-none",+ "hover:bg-foreground/4 dark:hover:bg-white/4",+ "focus-visible:ring-1 focus-visible:ring-ring/30"+ )}+ >+ <ChevronRight+ size={12}+ aria-hidden="true"+ className={cn(+ "shrink-0 text-foreground/40 transition-transform duration-150",+ expanded && "rotate-90"+ )}+ />+ <span className="text-xs font-semibold text-foreground truncate">+ {teamRef.name}+ </span>+ {memberCount != null && (+ <span className="ml-auto text-[10px] text-foreground/40 shrink-0">+ {t("settingsPage.workspace.teams.memberCount", { count: memberCount })}+ </span>+ )}+ </button>+ {canManage ? (+ <Select+ value={teamRef.access ?? "admin"}+ disabled={accessBusyTeamId === teamRef.id}+ onValueChange={(access) =>+ void handleAccessChange(teamRef, access as "admin" | "member")+ }+ >+ <SelectTrigger+ className="h-7 w-25 px-2 text-xs rounded-md shrink-0"+ aria-label={t("notes.spaces.teamsMembers.accessLabel")}+ >+ <SelectValue />+ </SelectTrigger>+ <SelectContent>+ <SelectItem value="admin" className="text-xs">+ {t("notes.spaces.teamsMembers.accessAdmin")}+ </SelectItem>+ <SelectItem value="member" className="text-xs">+ {t("notes.spaces.teamsMembers.accessMember")}+ </SelectItem>+ </SelectContent>+ </Select>+ ) : (+ <span className="text-[10px] text-foreground/40 shrink-0 px-1">+ {t(+ (teamRef.access ?? "admin") === "admin"+ ? "notes.spaces.teamsMembers.accessAdmin"+ : "notes.spaces.teamsMembers.accessMember"+ )}+ </span>+ )}{canManage && (<buttontype="button"onClick={() => confirmUnassignTeam(teamRef.id, teamRef.name)}aria-label={t("notes.spaces.teamsMembers.removeTeamFromSpace")}- className="p-1 rounded-md text-muted-foreground hover:text-destructive hover:bg-destructive/8 transition-colors outline-none focus-visible:ring-1 focus-visible:ring-primary/30"+ className="p-1 rounded-md text-muted-foreground hover:text-destructive hover:bg-destructive/8 transition-colors outline-none focus-visible:ring-1 focus-visible:ring-primary/30 shrink-0"><X className="w-3.5 h-3.5" /></button>)}</div>- {otherSpaces > 0 && (- <p className="flex items-start gap-1.5 text-[11px] text-muted-foreground">- <Info size={12} className="shrink-0 mt-px" />- {t("notes.spaces.teamsMembers.affectsOtherSpaces", {- count: otherSpaces,- team: teamRef.name,- })}- </p>+ {expanded && (+ <>+ {otherSpaces > 0 && (+ <p className="flex items-start gap-1.5 text-[11px] text-muted-foreground">+ <Info size={12} className="shrink-0 mt-px" />+ {t("notes.spaces.teamsMembers.affectsOtherSpaces", {+ count: otherSpaces,+ team: teamRef.name,+ })}+ </p>+ )}+ {(teamRef.access ?? "admin") === "member" && (+ <p className="flex items-start gap-1.5 text-[11px] text-muted-foreground">+ <Info size={12} className="shrink-0 mt-px" />+ {t("notes.spaces.teamsMembers.accessHint", { team: teamRef.name })}+ </p>+ )}+ <TeamRosterSection+ teamId={teamRef.id}+ teamName={teamRef.name}+ canManage={canManageTeamRoster(teamRef.my_role, workspace?.role ?? null)}+ workspaceMembers={roster}+ currentUserId={user?.id}+ onInvite={+ canInviteToWorkspace+ ? (email) => {+ setInviteEmail(email);+ setInviteTeamId(teamRef.id);+ setInviteOpen(true);+ }+ : undefined+ }+ removeConfirm={confirmRemoveMember}+ />+ </>)}- <TeamRosterSection- teamId={teamRef.id}- canManage={canManageTeamRoster(teamRef.my_role, workspace?.role ?? null)}- workspaceMembers={roster}- currentUserId={user?.id}- onInvite={- canInviteToWorkspace- ? (email) => {- setInviteEmail(email);- setInviteTeamId(teamRef.id);- setInviteOpen(true);- }- : undefined- }- removeConfirm={confirmRemoveMember}- /></div>);})}- {canManage && unassignedTeams.length > 0 && (- <Select value="" onValueChange={(teamId) => void handleAssignTeam(teamId)}>- <SelectTrigger className="h-8 text-xs">- <span className="flex items-center gap-1.5 text-foreground/60">- <Plus size={12} />- {t("notes.spaces.teamsMembers.addTeam")}- </span>- </SelectTrigger>- <SelectContent>- {unassignedTeams.map((team) => (- <SelectItem key={team.id} value={team.id} className="text-xs">- {team.name}- </SelectItem>- ))}- </SelectContent>- </Select>+ {((canManage && unassignedTeams.length > 0) || isWorkspaceAdmin) && (+ <div className="space-y-1.5">+ <label className="text-xs font-medium text-foreground/50">+ {t("notes.spaces.teamsMembers.addTeamLabel")}+ </label>+ {canManage && unassignedTeams.length > 0 && (+ <div className="flex items-center gap-2">+ <Select value={pendingTeamId ?? ""} onValueChange={setPendingTeamId}>+ <SelectTrigger className="h-8 flex-1 text-xs">+ <SelectValue placeholder={t("notes.spaces.teamsMembers.chooseTeam")} />+ </SelectTrigger>+ <SelectContent>+ {unassignedTeams.map((team) => (+ <SelectItem key={team.id} value={team.id} className="text-xs">+ {team.name}+ </SelectItem>+ ))}+ </SelectContent>+ </Select>+ <Button+ size="sm"+ onClick={() => void handleAssignTeam()}+ disabled={!pendingTeamId || isAssigning}+ className="h-8 shrink-0"+ >+ {showAssignSpinner && <Loader2 className="mr-1.5 h-3 w-3 animate-spin" />}+ {t("common.add")}+ </Button>+ </div>+ )}+ {isWorkspaceAdmin && (+ <Button+ variant="ghost"+ size="sm"+ onClick={() => setNewTeamOpen(true)}+ className="h-7 px-2 text-xs text-foreground/60"+ >+ <Plus size={12} className="mr-1" />+ {t("notes.spaces.teams.newTeam")}+ </Button>+ )}+ </div>)}</DialogContent></Dialog>+ {space.workspace_id && (+ <CreateTeamDialog+ workspaceId={space.workspace_id}+ open={newTeamOpen}+ onOpenChange={setNewTeamOpen}+ onCreated={handleTeamCreated}+ />+ )}+{workspace && inviteTeamId && (<InviteTeammateDialogopen={inviteOpen}diff --git a/src/components/notes/SpacesTree.tsx b/src/components/notes/SpacesTree.tsxindex dadf9e0f6..3d9a4dc80 100644--- a/src/components/notes/SpacesTree.tsx+++ b/src/components/notes/SpacesTree.tsx@@ -44,6 +44,7 @@ import { useAuth } from "../../hooks/useAuth";import { useWorkspace } from "../../hooks/useWorkspace";import { clampEmojiInput } from "../../lib/emojiInput";import { canManageSpace } from "../../lib/spacePermissions";+import { groupTeamSpacesByWorkspace } from "../../lib/workspaceSelection";import { readIsSubscribed, subscribeIsSubscribed } from "../../lib/subscriptionFlag";import { deleteSpace, renameSpace } from "../../services/spaceActions";import { useSettingsStore } from "../../stores/settingsStore";@@ -1104,6 +1105,7 @@ export default function SpacesTree({const [renameSpaceEmoji, setRenameSpaceEmoji] = useState("");const [spaceRenameFocus, setSpaceRenameFocus] = useState<"name" | "emoji">("name");const [showCreateSpace, setShowCreateSpace] = useState(false);+ const [createSpaceWorkspaceId, setCreateSpaceWorkspaceId] = useState<string | null>(null);const [membersSpaceId, setMembersSpaceId] = useState<number | null>(null);const [membersOpen, setMembersOpen] = useState(false);const [deleteSpaceTarget, setDeleteSpaceTarget] = useState<SpaceItem | null>(null);@@ -1121,24 +1123,18 @@ export default function SpacesTree({: false;const teamSpaces = useMemo(() => spaces.filter((s) => s.kind === "team"), [spaces]);const showWorkspaceGroups = workspaces.length > 1;- const teamSpaceGroups = useMemo(- () =>- workspaces- .map((workspace) => ({- workspace,- spaces: teamSpaces.filter((space) => space.workspace_id === workspace.id),- }))- .filter((group) => group.spaces.length > 0),+ const { groups: teamSpaceGroups, ungrouped: ungroupedTeamSpaces } = useMemo(+ () => groupTeamSpacesByWorkspace(workspaces, teamSpaces),[teamSpaces, workspaces]);- const ungroupedTeamSpaces = useMemo(() => {- const workspaceIds = new Set(workspaces.map((workspace) => workspace.id));- return teamSpaces.filter(- (space) => space.workspace_id == null || !workspaceIds.has(space.workspace_id)- );- }, [teamSpaces, workspaces]);const visibleSpaces = teamCapability ? spaces : privateSpaces;+ // Until the workspace fetch settles, grouping is unknown — showing spaces+ // flat and regrouping on arrival reads as a glitch, so skeleton instead.+ // Signed-out users never load workspaces (mirrored team spaces render flat);+ // errors still flip `loaded`, so this can't skeleton forever.+ const workspacesPending = isSignedIn && !workspacesLoaded;+// The server 403s team creation for plain members; no-workspace users get the create funnel.const canCreateTeamSpace =isSignedIn &&@@ -1151,6 +1147,11 @@ export default function SpacesTree({!space.cloud_space_id ||canManageSpace(space, workspaces.find((w) => w.id === space.workspace_id)?.role ?? null);+ const openCreateSpace = (workspaceId: string | null = null): void => {+ setCreateSpaceWorkspaceId(workspaceId);+ setShowCreateSpace(true);+ };+const targetLabel = (target: NoteMoveTarget): string => {if (target.folderId != null) {return folders.find((f) => f.id === target.folderId)?.name ?? "";@@ -1932,12 +1933,14 @@ export default function SpacesTree({<Info size={11} /></Button>)}- {canCreateTeamSpace && (+ {/* With one workspace the header + is unambiguous; with several,+ each workspace row carries its own + instead. */}+ {canCreateTeamSpace && !showWorkspaceGroups && (<Buttonvariant="ghost"size="icon"aria-label={t("notes.spaces.newSpace")}- onClick={() => setShowCreateSpace(true)}+ onClick={() => openCreateSpace()}className={cn("h-5 w-5 rounded-sm opacity-0 group-hover/section:opacity-100 focus-visible:opacity-100","transition-opacity text-muted-foreground/60 dark:text-muted-foreground/40",@@ -1950,39 +1953,74 @@ export default function SpacesTree({</div>}/>- {showWorkspaceGroups- ? teamSpaceGroups.map(({ workspace, spaces: workspaceSpaces }) => (- <div key={workspace.id} role="group" aria-label={workspace.name} className="mt-1">- <div- role="none"- title={workspace.name}- className="h-5 px-4 text-[10px] font-medium text-foreground/40 truncate"- >- {workspace.name}- </div>- {workspaceSpaces.map(renderSpace)}- </div>- ))- : teamSpaces.map(renderSpace)}- {showWorkspaceGroups && ungroupedTeamSpaces.map(renderSpace)}- {teamSpaces.length === 0 &&- (canCreateTeamSpace ? (- <div className="pl-[18px] pr-2 py-1">- <Button- variant="ghost"- size="sm"- onClick={() => setShowCreateSpace(true)}- className="h-6 px-2 text-xs gap-1 text-primary/70 hover:text-primary hover:bg-primary/8"- >- <Plus size={11} />- {t("notes.spaces.newSpace")}- </Button>- </div>- ) : (- <p className="pl-[18px] pr-2 py-1 text-xs text-foreground/40 leading-relaxed">- {t("notes.spaces.emptyTeamHint")}- </p>- ))}+ {workspacesPending ? (+ <SkeletonRows />+ ) : (+ <>+ {showWorkspaceGroups+ ? teamSpaceGroups.map(({ workspace, spaces: workspaceSpaces }) => (+ <div+ key={workspace.id}+ role="group"+ aria-label={workspace.name}+ className="mt-1 group/workspace"+ >+ <div+ role="none"+ className="flex items-center justify-between h-5 pl-4 pr-2"+ >+ <span+ title={workspace.name}+ className="min-w-0 text-[10px] font-medium text-foreground/40 truncate"+ >+ {workspace.name}+ </span>+ {(workspace.role === "owner" || workspace.role === "admin") && (+ <Button+ variant="ghost"+ size="icon"+ aria-label={t("notes.spaces.newSpaceInWorkspace", {+ workspace: workspace.name,+ })}+ onClick={() => openCreateSpace(workspace.id)}+ className={cn(+ "h-5 w-5 rounded-sm opacity-0 group-hover/workspace:opacity-100 focus-visible:opacity-100",+ "transition-opacity text-muted-foreground/60 dark:text-muted-foreground/40",+ "hover:text-foreground/60 hover:bg-foreground/5 active:bg-foreground/8"+ )}+ >+ <Plus size={12} />+ </Button>+ )}+ </div>+ {workspaceSpaces.map(renderSpace)}+ </div>+ ))+ : teamSpaces.map(renderSpace)}+ {showWorkspaceGroups && ungroupedTeamSpaces.map(renderSpace)}+ {teamSpaces.length === 0 &&+ (canCreateTeamSpace ? (+ // Grouped view already offers a + on each manageable workspace row.+ !showWorkspaceGroups && (+ <div className="pl-[18px] pr-2 py-1">+ <Button+ variant="ghost"+ size="sm"+ onClick={() => openCreateSpace()}+ className="h-6 px-2 text-xs gap-1 text-primary/70 hover:text-primary hover:bg-primary/8"+ >+ <Plus size={11} />+ {t("notes.spaces.newSpace")}+ </Button>+ </div>+ )+ ) : (+ <p className="pl-[18px] pr-2 py-1 text-xs text-foreground/40 leading-relaxed">+ {t("notes.spaces.emptyTeamHint")}+ </p>+ ))}+ </>+ )}</div>)}{!teamCapability && isSignedIn && !isSubscribed && (@@ -2005,7 +2043,14 @@ export default function SpacesTree({)}</div>- <CreateSpaceDialog open={showCreateSpace} onOpenChange={setShowCreateSpace} />+ <CreateSpaceDialog+ open={showCreateSpace}+ onOpenChange={(open) => {+ setShowCreateSpace(open);+ if (!open) setCreateSpaceWorkspaceId(null);+ }}+ initialWorkspaceId={createSpaceWorkspaceId}+ />{membersSpace && (<SpaceMembersDialog space={membersSpace} open={membersOpen} onOpenChange={setMembersOpen} />diff --git a/src/components/settings/TeamMembersDialog.tsx b/src/components/settings/TeamMembersDialog.tsxindex 7643b5198..e5393bc8a 100644--- a/src/components/settings/TeamMembersDialog.tsx+++ b/src/components/settings/TeamMembersDialog.tsx@@ -44,8 +44,9 @@ export default function TeamMembersDialog({const isWorkspaceAdmin = workspace.role === "owner" || workspace.role === "admin";const myTeamRole = teamMembers.find((m) => m.user_id === user?.id)?.role ?? null;const canManage = canManageTeamRoster(myTeamRole, workspace.role);- // Explicit members can leave; implicit workspace admins have no row to drop.- const canLeave = myTeamRole !== null && !isWorkspaceAdmin;+ // Anyone with an explicit membership row can drop it — including workspace+ // admins who added themselves (their implicit admin access survives leaving).+ const canLeave = myTeamRole !== null;useEffect(() => {if (open) void refreshMembers(workspace.id).catch(() => {});@@ -105,6 +106,7 @@ export default function TeamMembersDialog({<TeamRosterSectionteamId={team.id}+ teamName={team.name}canManage={canManage}workspaceMembers={roster}currentUserId={user?.id}diff --git a/src/components/settings/WorkspaceTeamsTab.tsx b/src/components/settings/WorkspaceTeamsTab.tsxindex 1eddb4be6..26a4a17f0 100644--- a/src/components/settings/WorkspaceTeamsTab.tsx+++ b/src/components/settings/WorkspaceTeamsTab.tsx@@ -1,23 +1,14 @@-import React, { useCallback, useEffect, useMemo, useState } from "react";+import { useCallback, useEffect, useMemo, useState } from "react";import { useTranslation } from "react-i18next";import { Plus, Users, Trash2, Loader2 } from "lucide-react";import { deleteTeam } from "../../services/spaceActions";import { TeamsService } from "../../services/TeamsService";import { loadSpaces, useSpaces } from "../../stores/noteStore";-import { useDelayedFlag } from "../../hooks/useDelayedFlag";import { useDialogs } from "../../hooks/useDialogs";import { Button } from "../ui/button";-import { Input } from "../ui/input";-import { Label } from "../ui/label";import { useToast } from "../ui/useToast";-import {- Dialog,- DialogContent,- DialogHeader,- DialogTitle,- DialogFooter,- ConfirmDialog,-} from "../ui/dialog";+import { ConfirmDialog } from "../ui/dialog";+import CreateTeamDialog from "../CreateTeamDialog";import TeamMembersDialog from "./TeamMembersDialog";import type { Team, Workspace } from "../../types/electron";@@ -34,9 +25,6 @@ export default function WorkspaceTeamsTab({ workspace }: Props) {const [teamsLoaded, setTeamsLoaded] = useState(false);const [loadFailed, setLoadFailed] = useState(false);const [createOpen, setCreateOpen] = useState(false);- const [name, setName] = useState("");- const [submitting, setSubmitting] = useState(false);- const showCreateSpinner = useDelayedFlag(submitting);const [membersTeam, setMembersTeam] = useState<Team | null>(null);const [deletingId, setDeletingId] = useState<string | null>(null);const canManage = workspace.role === "owner" || workspace.role === "admin";@@ -70,27 +58,6 @@ export default function WorkspaceTeamsTab({ workspace }: Props) {return counts;}, [spaces]);- async function handleCreate(e: React.FormEvent) {- e.preventDefault();- const trimmed = name.trim();- if (!trimmed || submitting) return;- setSubmitting(true);- try {- await TeamsService.create(workspace.id, { name: trimmed });- await loadTeams();- setName("");- setCreateOpen(false);- } catch (error) {- toast({- title: t("settingsPage.workspace.teams.couldNotCreate"),- description: error instanceof Error ? error.message : t("common.unknownError"),- variant: "destructive",- });- } finally {- setSubmitting(false);- }- }-function confirmDelete(team: Team) {const backedSpaces = backedSpacesByTeam.get(team.id) ?? 0;showConfirmDialog({@@ -212,42 +179,12 @@ export default function WorkspaceTeamsTab({ workspace }: Props) {</div>)}- <Dialog open={createOpen} onOpenChange={setCreateOpen}>- <DialogContent className="max-w-md">- <DialogHeader>- <DialogTitle>{t("settingsPage.workspace.teams.createTitle")}</DialogTitle>- </DialogHeader>- <form onSubmit={handleCreate} className="space-y-3">- <div className="space-y-1.5">- <Label htmlFor="team-name" className="text-xs font-medium">- {t("settingsPage.workspace.teams.nameLabel")}- </Label>- <Input- id="team-name"- value={name}- onChange={(e) => setName(e.target.value)}- autoFocus- maxLength={80}- required- />- </div>- <DialogFooter className="pt-2">- <Button- type="button"- variant="ghost"- onClick={() => setCreateOpen(false)}- disabled={submitting}- >- {t("common.cancel")}- </Button>- <Button type="submit" disabled={!name.trim() || submitting}>- {showCreateSpinner && <Loader2 className="mr-1.5 h-3.5 w-3.5 animate-spin" />}- {submitting ? t("workspaces.create.submitting") : t("common.create")}- </Button>- </DialogFooter>- </form>- </DialogContent>- </Dialog>+ <CreateTeamDialog+ workspaceId={workspace.id}+ open={createOpen}+ onOpenChange={setCreateOpen}+ onCreated={() => loadTeams()}+ />{membersTeam && (<TeamMembersDialogdiff --git a/src/components/ui/dialog.tsx b/src/components/ui/dialog.tsxindex b1eaa4fb5..32e98a72b 100644--- a/src/components/ui/dialog.tsx+++ b/src/components/ui/dialog.tsx@@ -30,28 +30,54 @@ DialogOverlay.displayName = DialogPrimitive.Overlay.displayName;const DialogContent = React.forwardRef<React.ElementRef<typeof DialogPrimitive.Content>,React.ComponentPropsWithoutRef<typeof DialogPrimitive.Content>->(({ className, children, ...props }, ref) => (- <DialogPortal>- <DialogOverlay />- <DialogPrimitive.Content- ref={ref}- className={cn(- "fixed left-[50%] top-[50%] z-50 grid w-full max-w-lg translate-x-[-50%] translate-y-[-50%] gap-4 border p-6 shadow-2xl duration-200 rounded-2xl",- "bg-card border-border/60",- "dark:bg-surface-2 dark:border-border dark:shadow-modal",- "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 data-[state=closed]:slide-out-to-left-1/2 data-[state=closed]:slide-out-to-top-[48%] data-[state=open]:slide-in-from-left-1/2 data-[state=open]:slide-in-from-top-[48%]",- className- )}- {...props}- >- {children}- <DialogPrimitive.Close className="absolute right-4 top-4 rounded-full opacity-50 ring-offset-background transition-[opacity,background-color] hover:opacity-100 hover:bg-muted/50 dark:hover:bg-surface-raised focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2 disabled:pointer-events-none p-1.5">- <X className="h-4 w-4 text-muted-foreground" />- <span className="sr-only">Close</span>- </DialogPrimitive.Close>- </DialogPrimitive.Content>- </DialogPortal>-));+>(({ className, children, onInteractOutside, ...props }, ref) => {+ // With a popper layer (Select/Popover/DropdownMenu) open above this dialog,+ // an outside click dismisses that layer — never the dialog. The popper can+ // unmount before Radix's bubble-phase dismissal handlers run (it sometimes+ // defers to a one-time `click` listener), so the presence check must be+ // snapshotted at pointerdown capture time, ahead of every Radix handler.+ const popperWasOpenRef = React.useRef(false);+ React.useEffect(() => {+ const snapshotPopperPresence = () => {+ popperWasOpenRef.current = !!document.querySelector("[data-radix-popper-content-wrapper]");+ };+ document.addEventListener("pointerdown", snapshotPopperPresence, { capture: true });+ return () => {+ document.removeEventListener("pointerdown", snapshotPopperPresence, { capture: true });+ };+ }, []);++ return (+ <DialogPortal>+ <DialogOverlay />+ <DialogPrimitive.Content+ ref={ref}+ onInteractOutside={(event) => {+ onInteractOutside?.(event);+ if (event.defaultPrevented) return;+ // Focus-outside dismissals would read a snapshot left over from the+ // last pointerdown, however long ago — the guard is pointer-only.+ if (event.detail.originalEvent.type !== "pointerdown") return;+ if (popperWasOpenRef.current) event.preventDefault();+ }}+ className={cn(+ "fixed left-[50%] top-[50%] z-50 grid w-full max-w-lg translate-x-[-50%] translate-y-[-50%] gap-4 border p-6 shadow-2xl duration-200 rounded-2xl",+ "bg-card border-border/60",+ "dark:bg-surface-2 dark:border-border dark:shadow-modal",+ "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 data-[state=closed]:slide-out-to-left-1/2 data-[state=closed]:slide-out-to-top-[48%] data-[state=open]:slide-in-from-left-1/2 data-[state=open]:slide-in-from-top-[48%]",+ className+ )}+ {...props}+ >+ {children}+ <DialogPrimitive.Close className="absolute right-4 top-4 rounded-full opacity-50 ring-offset-background transition-[opacity,background-color] hover:opacity-100 hover:bg-muted/50 dark:hover:bg-surface-raised focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2 disabled:pointer-events-none p-1.5">+ <X className="h-4 w-4 text-muted-foreground" />+ <span className="sr-only">Close</span>+ </DialogPrimitive.Close>+ </DialogPrimitive.Content>+ </DialogPortal>+ );+});DialogContent.displayName = DialogPrimitive.Content.displayName;const DialogHeader = ({ className, ...props }: React.HTMLAttributes<HTMLDivElement>) => (diff --git a/src/lib/memberCandidates.ts b/src/lib/memberCandidates.tsnew file mode 100644index 000000000..fe2d10486--- /dev/null+++ b/src/lib/memberCandidates.ts@@ -0,0 +1,12 @@+// The current user is a valid pick-list candidate (e.g. a workspace admin+// adding themself to an existing team); pinning them first keeps the+// common case one click away.+export function orderMemberCandidates<M extends { user_id: string }>(+ members: M[],+ currentUserId: string | null | undefined+): M[] {+ if (!currentUserId) return members;+ const self = members.filter((m) => m.user_id === currentUserId);+ if (self.length === 0) return members;+ return [...self, ...members.filter((m) => m.user_id !== currentUserId)];+}diff --git a/src/lib/workspaceSelection.ts b/src/lib/workspaceSelection.tsindex 785ae90d4..588dfa3eb 100644--- a/src/lib/workspaceSelection.ts+++ b/src/lib/workspaceSelection.ts@@ -4,6 +4,35 @@ export function manageableWorkspaces(workspaces: Workspace[]): Workspace[] {return workspaces.filter((workspace) => workspace.role === "owner" || workspace.role === "admin");}+export interface TeamSpaceGroup<S> {+ workspace: Workspace;+ spaces: S[];+}++export function groupTeamSpacesByWorkspace<S extends { workspace_id?: string | null }>(+ workspaces: Workspace[],+ teamSpaces: S[]+): { groups: TeamSpaceGroup<S>[]; ungrouped: S[] } {+ const groups = workspaces+ .map((workspace) => ({+ workspace,+ spaces: teamSpaces.filter((space) => space.workspace_id === workspace.id),+ }))+ // Empty groups stay visible for owners/admins so the per-workspace+ // create button always has a row to live on.+ .filter(+ (group) =>+ group.spaces.length > 0 ||+ group.workspace.role === "owner" ||+ group.workspace.role === "admin"+ );+ const workspaceIds = new Set(workspaces.map((workspace) => workspace.id));+ const ungrouped = teamSpaces.filter(+ (space) => space.workspace_id == null || !workspaceIds.has(space.workspace_id)+ );+ return { groups, ungrouped };+}+export function selectWorkspaceForSpaceCreation(manageable: Workspace[],active: Workspace | null,diff --git a/src/locales/de/translation.json b/src/locales/de/translation.jsonindex 1f07f35ac..56e4d750d 100644--- a/src/locales/de/translation.json+++ b/src/locales/de/translation.json@@ -128,6 +128,7 @@"pttUnavailable": "Der native Push-to-Talk-Listener ist nicht verfügbar"},"common": {+ "add": "Hinzufügen","retry": "Erneut versuchen","back": "Zurück","next": "Weiter",@@ -1263,6 +1264,7 @@"new": "Neues Team","empty": "Noch keine Teams.","createFirst": "Erstelle dein erstes Team",+ "addMembersLabel": "Mitglieder hinzufügen","createTitle": "Team erstellen","nameLabel": "Teamname","memberCount_one": "{{count}} Mitglied",@@ -2406,6 +2408,7 @@"personal": "Persönlich","privateTooltip": "Nur du kannst deinen persönlichen Bereich sehen","newSpace": "Neuer Team-Bereich",+ "newSpaceInWorkspace": "Neuer Team-Bereich in {{workspace}}","createTitle": "Team-Bereich erstellen","createDescription": "Ein gemeinsamer Bereich in einem Workspace, getragen von einem oder mehreren Teams.","nameLabel": "Name",@@ -2452,7 +2455,9 @@"conflictKeep": "Weiter bearbeiten","editedBy": "Bearbeitet von {{name}} · {{time}}","members": {- "addPeople": "Personen hinzufügen",+ "addPeopleToTeam": "Personen zu {{team}} hinzufügen",+ "addedToTeam": "{{name}} wurde zu {{team}} hinzugefügt",+ "you": "Du","addFailed": "{{failed}} von {{total}} Personen konnten nicht hinzugefügt werden","searchPlaceholder": "Personen suchen…","roleAdmin": "Administrator",@@ -2469,13 +2474,20 @@"menu": "Teams & Mitglieder…","title": "Teams & Mitglieder von {{space}}","noTeams": "Diesem Space sind noch keine Teams zugewiesen. Nur Workspace-Admins können ihn sehen.",- "addTeam": "Team hinzufügen…",+ "addTeamLabel": "Team zu diesem Bereich hinzufügen",+ "chooseTeam": "Team auswählen…",+ "teamAdded": "{{team}} wurde zu {{space}} hinzugefügt","removeTeamFromSpace": "Aus dem Space entfernen","removeTeamConfirm": "{{team}} aus {{space}} entfernen?","removeTeamConfirmDescription": "Seine Mitglieder verlieren den Zugriff auf diesen Space, sofern kein anderes zugewiesenes Team sie einschließt.","lastTeamWarning": "Dies ist das einzige Team dieses Space. Danach behalten nur Workspace-Admins Zugriff.","affectsOtherSpaces_one": "Änderungen an {{team}} gelten auch für {{count}} weiteren Space.",- "affectsOtherSpaces_other": "Änderungen an {{team}} gelten auch für {{count}} weitere Spaces."+ "affectsOtherSpaces_other": "Änderungen an {{team}} gelten auch für {{count}} weitere Spaces.",+ "accessLabel": "Space-Zugriff",+ "accessAdmin": "Admin",+ "accessMember": "Mitglied",+ "accessChanged": "Zugriff für {{team}} aktualisiert",+ "accessHint": "Admins von {{team}} verwalten diesen Space nur, wenn sein Zugriff auf Admin gesetzt ist."},"teams": {"assignLabel": "Teams",diff --git a/src/locales/en/translation.json b/src/locales/en/translation.jsonindex b4a463252..bd906630f 100644--- a/src/locales/en/translation.json+++ b/src/locales/en/translation.json@@ -128,6 +128,7 @@"pttUnavailable": "Push-to-Talk native listener not available"},"common": {+ "add": "Add","retry": "Retry","back": "Back","next": "Next",@@ -1263,6 +1264,7 @@"new": "New team","empty": "No teams yet.","createFirst": "Create your first team",+ "addMembersLabel": "Add members","createTitle": "Create team","nameLabel": "Team name","memberCount_one": "{{count}} member",@@ -2406,6 +2408,7 @@"personal": "Personal","privateTooltip": "Only you can see your Personal space","newSpace": "New team space",+ "newSpaceInWorkspace": "New team space in {{workspace}}","createTitle": "Create team space","createDescription": "A shared area inside a workspace, backed by one or more teams.","nameLabel": "Name",@@ -2452,7 +2455,9 @@"conflictKeep": "Keep editing","editedBy": "Edited by {{name}} · {{time}}","members": {- "addPeople": "Add people",+ "addPeopleToTeam": "Add people to {{team}}",+ "addedToTeam": "{{name}} added to {{team}}",+ "you": "You","addFailed": "{{failed}} of {{total}} people couldn't be added","searchPlaceholder": "Search people…","roleAdmin": "Admin",@@ -2469,13 +2474,20 @@"menu": "Teams & members…","title": "Teams & members of {{space}}","noTeams": "No teams back this space yet. Only workspace admins can see it.",- "addTeam": "Add team…",+ "addTeamLabel": "Add a team to this space",+ "chooseTeam": "Choose team…",+ "teamAdded": "{{team}} added to {{space}}","removeTeamFromSpace": "Remove from space","removeTeamConfirm": "Remove {{team}} from {{space}}?","removeTeamConfirmDescription": "Its members will lose access to this space unless another assigned team includes them.","lastTeamWarning": "This is the only team backing this space. After removing it, only workspace admins keep access.","affectsOtherSpaces_one": "Changes to {{team}} also apply to {{count}} other space it backs.",- "affectsOtherSpaces_other": "Changes to {{team}} also apply to {{count}} other spaces it backs."+ "affectsOtherSpaces_other": "Changes to {{team}} also apply to {{count}} other spaces it backs.",+ "accessLabel": "Space access",+ "accessAdmin": "Admin",+ "accessMember": "Member",+ "accessChanged": "Access for {{team}} updated",+ "accessHint": "Admins of {{team}} manage this space only when its access is set to Admin."},"teams": {"assignLabel": "Teams",diff --git a/src/locales/es/translation.json b/src/locales/es/translation.jsonindex 0da903dac..132b2a7d6 100644--- a/src/locales/es/translation.json+++ b/src/locales/es/translation.json@@ -128,6 +128,7 @@"pttUnavailable": "El módulo nativo de Push-to-Talk no está disponible"},"common": {+ "add": "Añadir","retry": "Reintentar","back": "Atrás","next": "Siguiente",@@ -1925,6 +1926,7 @@"new": "Nuevo equipo","empty": "Aún no hay equipos.","createFirst": "Crea tu primer equipo",+ "addMembersLabel": "Añadir miembros","createTitle": "Crear equipo","nameLabel": "Nombre del equipo","memberCount_one": "{{count}} miembro",@@ -2246,6 +2248,7 @@"personal": "Personal","privateTooltip": "Solo tú puedes ver tu espacio personal","newSpace": "Nuevo espacio de equipo",+ "newSpaceInWorkspace": "Nuevo espacio de equipo en {{workspace}}","createTitle": "Crear espacio de equipo","createDescription": "Un área compartida dentro de un workspace, respaldada por uno o más equipos.","nameLabel": "Nombre",@@ -2292,7 +2295,9 @@"conflictKeep": "Seguir editando","editedBy": "Editado por {{name}} · {{time}}","members": {- "addPeople": "Añadir personas",+ "addPeopleToTeam": "Añadir personas a {{team}}",+ "addedToTeam": "{{name}} añadido a {{team}}",+ "you": "Tú","addFailed": "No se pudo añadir a {{failed}} de {{total}} personas","searchPlaceholder": "Buscar personas…","roleAdmin": "Administrador",@@ -2309,13 +2314,20 @@"menu": "Equipos y miembros…","title": "Equipos y miembros de {{space}}","noTeams": "Ningún equipo respalda este espacio todavía. Solo los administradores del workspace pueden verlo.",- "addTeam": "Añadir equipo…",+ "addTeamLabel": "Añadir un equipo a este espacio",+ "chooseTeam": "Elegir equipo…",+ "teamAdded": "{{team}} añadido a {{space}}","removeTeamFromSpace": "Quitar del espacio","removeTeamConfirm": "¿Quitar {{team}} de {{space}}?","removeTeamConfirmDescription": "Sus miembros perderán el acceso a este espacio salvo que otro equipo asignado los incluya.","lastTeamWarning": "Es el único equipo que respalda este espacio. Tras quitarlo, solo los administradores del workspace mantendrán el acceso.","affectsOtherSpaces_one": "Los cambios en {{team}} también se aplican a {{count}} otro espacio que respalda.",- "affectsOtherSpaces_other": "Los cambios en {{team}} también se aplican a {{count}} otros espacios que respalda."+ "affectsOtherSpaces_other": "Los cambios en {{team}} también se aplican a {{count}} otros espacios que respalda.",+ "accessLabel": "Acceso al espacio",+ "accessAdmin": "Administrador",+ "accessMember": "Miembro",+ "accessChanged": "Acceso de {{team}} actualizado",+ "accessHint": "Los administradores de {{team}} solo gestionan este espacio cuando su acceso está establecido en Administrador."},"teams": {"assignLabel": "Equipos",diff --git a/src/locales/fr/translation.json b/src/locales/fr/translation.jsonindex 624d1c87f..62528cc7d 100644--- a/src/locales/fr/translation.json+++ b/src/locales/fr/translation.json@@ -128,6 +128,7 @@"pttUnavailable": "L'écouteur natif Push-to-Talk n'est pas disponible"},"common": {+ "add": "Ajouter","retry": "Réessayer","back": "Retour","next": "Suivant",@@ -1263,6 +1264,7 @@"new": "Nouvelle équipe","empty": "Pas encore d'équipes.","createFirst": "Créez votre première équipe",+ "addMembersLabel": "Ajouter des membres","createTitle": "Créer une équipe","nameLabel": "Nom de l'équipe","memberCount_one": "{{count}} membre",@@ -2406,6 +2408,7 @@"personal": "Personnel","privateTooltip": "Vous seul pouvez voir votre espace personnel","newSpace": "Nouvel espace d'équipe",+ "newSpaceInWorkspace": "Nouvel espace d'équipe dans {{workspace}}","createTitle": "Créer un espace d'équipe","createDescription": "Un espace partagé au sein d'un workspace, porté par une ou plusieurs équipes.","nameLabel": "Nom",@@ -2452,7 +2455,9 @@"conflictKeep": "Continuer à modifier","editedBy": "Modifié par {{name}} · {{time}}","members": {- "addPeople": "Ajouter des personnes",+ "addPeopleToTeam": "Ajouter des personnes à {{team}}",+ "addedToTeam": "{{name}} ajouté à {{team}}",+ "you": "Vous","addFailed": "Impossible d'ajouter {{failed}} personnes sur {{total}}","searchPlaceholder": "Rechercher des personnes…","roleAdmin": "Administrateur",@@ -2469,13 +2474,20 @@"menu": "Équipes et membres…","title": "Équipes et membres de {{space}}","noTeams": "Aucune équipe n'est encore rattachée à cet espace. Seuls les administrateurs du workspace peuvent le voir.",- "addTeam": "Ajouter une équipe…",+ "addTeamLabel": "Ajouter une équipe à cet espace",+ "chooseTeam": "Choisir une équipe…",+ "teamAdded": "{{team}} ajoutée à {{space}}","removeTeamFromSpace": "Retirer de l'espace","removeTeamConfirm": "Retirer {{team}} de {{space}} ?","removeTeamConfirmDescription": "Ses membres perdront l'accès à cet espace, sauf si une autre équipe rattachée les inclut.","lastTeamWarning": "C'est la seule équipe rattachée à cet espace. Après son retrait, seuls les administrateurs du workspace garderont l'accès.","affectsOtherSpaces_one": "Les modifications de {{team}} s'appliquent aussi à {{count}} autre espace qu'elle porte.",- "affectsOtherSpaces_other": "Les modifications de {{team}} s'appliquent aussi à {{count}} autres espaces qu'elle porte."+ "affectsOtherSpaces_other": "Les modifications de {{team}} s'appliquent aussi à {{count}} autres espaces qu'elle porte.",+ "accessLabel": "Accès à l'espace",+ "accessAdmin": "Administrateur",+ "accessMember": "Membre",+ "accessChanged": "Accès de {{team}} mis à jour",+ "accessHint": "Les administrateurs de {{team}} ne gèrent cet espace que lorsque son accès est défini sur Administrateur."},"teams": {"assignLabel": "Équipes",diff --git a/src/locales/it/translation.json b/src/locales/it/translation.jsonindex 941bb7d08..ef36778c2 100644--- a/src/locales/it/translation.json+++ b/src/locales/it/translation.json@@ -128,6 +128,7 @@"pttUnavailable": "Il listener nativo Push-to-Talk non è disponibile"},"common": {+ "add": "Aggiungi","retry": "Riprova","back": "Indietro","next": "Avanti",@@ -1877,6 +1878,7 @@"new": "Nuovo team","empty": "Ancora nessun team.","createFirst": "Crea il tuo primo team",+ "addMembersLabel": "Aggiungi membri","createTitle": "Crea team","nameLabel": "Nome del team","memberCount_one": "{{count}} membro",@@ -2198,6 +2200,7 @@"personal": "Personale","privateTooltip": "Solo tu puoi vedere il tuo spazio personale","newSpace": "Nuovo spazio del team",+ "newSpaceInWorkspace": "Nuovo spazio del team in {{workspace}}","createTitle": "Crea spazio del team","createDescription": "Un'area condivisa all'interno di un workspace, supportata da uno o più team.","nameLabel": "Nome",@@ -2244,7 +2247,9 @@"conflictKeep": "Continua a modificare","editedBy": "Modificato da {{name}} · {{time}}","members": {- "addPeople": "Aggiungi persone",+ "addPeopleToTeam": "Aggiungi persone a {{team}}",+ "addedToTeam": "{{name}} aggiunto a {{team}}",+ "you": "Tu","addFailed": "Impossibile aggiungere {{failed}} persone su {{total}}","searchPlaceholder": "Cerca persone…","roleAdmin": "Amministratore",@@ -2261,13 +2266,20 @@"menu": "Team e membri…","title": "Team e membri di {{space}}","noTeams": "Nessun team supporta ancora questo spazio. Solo gli amministratori del workspace possono vederlo.",- "addTeam": "Aggiungi team…",+ "addTeamLabel": "Aggiungi un team a questo spazio",+ "chooseTeam": "Scegli team…",+ "teamAdded": "{{team}} aggiunto a {{space}}","removeTeamFromSpace": "Rimuovi dallo spazio","removeTeamConfirm": "Rimuovere {{team}} da {{space}}?","removeTeamConfirmDescription": "I suoi membri perderanno l'accesso a questo spazio, a meno che un altro team assegnato non li includa.","lastTeamWarning": "È l'unico team che supporta questo spazio. Dopo la rimozione, solo gli amministratori del workspace manterranno l'accesso.","affectsOtherSpaces_one": "Le modifiche a {{team}} si applicano anche a {{count}} altro spazio che supporta.",- "affectsOtherSpaces_other": "Le modifiche a {{team}} si applicano anche ad altri {{count}} spazi che supporta."+ "affectsOtherSpaces_other": "Le modifiche a {{team}} si applicano anche ad altri {{count}} spazi che supporta.",+ "accessLabel": "Accesso allo spazio",+ "accessAdmin": "Amministratore",+ "accessMember": "Membro",+ "accessChanged": "Accesso di {{team}} aggiornato",+ "accessHint": "Gli amministratori di {{team}} gestiscono questo spazio solo quando il suo accesso è impostato su Amministratore."},"teams": {"assignLabel": "Team",diff --git a/src/locales/ja/translation.json b/src/locales/ja/translation.jsonindex 8d7ac10b1..da9cf439e 100644--- a/src/locales/ja/translation.json+++ b/src/locales/ja/translation.json@@ -128,6 +128,7 @@"pttUnavailable": "プッシュトゥトークのネイティブリスナーが利用できません"},"common": {+ "add": "追加","retry": "再試行","back": "戻る","next": "次へ",@@ -1877,6 +1878,7 @@"new": "新しいチーム","empty": "チームはまだありません。","createFirst": "最初のチームを作成",+ "addMembersLabel": "メンバーを追加","createTitle": "チームを作成","nameLabel": "チーム名","memberCount_one": "{{count}}人のメンバー",@@ -2126,6 +2128,7 @@"personal": "個人","privateTooltip": "パーソナルスペースはあなただけが見られます","newSpace": "新しいチームスペース",+ "newSpaceInWorkspace": "{{workspace}} に新しいチームスペース","createTitle": "チームスペースを作成","createDescription": "ワークスペース内の共有エリアで、1つ以上のチームによって支えられます。","nameLabel": "名前",@@ -2172,7 +2175,9 @@"conflictKeep": "編集を続ける","editedBy": "{{name}} が編集 · {{time}}","members": {- "addPeople": "メンバーを追加",+ "addPeopleToTeam": "{{team}} にメンバーを追加",+ "addedToTeam": "{{name}} を {{team}} に追加しました",+ "you": "自分","addFailed": "{{total}}人中{{failed}}人を追加できませんでした","searchPlaceholder": "メンバーを検索…","roleAdmin": "管理者",@@ -2189,13 +2194,20 @@"menu": "チームとメンバー…","title": "{{space}} のチームとメンバー","noTeams": "このスペースを支えるチームはまだありません。ワークスペース管理者のみが閲覧できます。",- "addTeam": "チームを追加…",+ "addTeamLabel": "このスペースにチームを追加",+ "chooseTeam": "チームを選択…",+ "teamAdded": "{{team}} を {{space}} に追加しました","removeTeamFromSpace": "スペースから外す","removeTeamConfirm": "{{team}} を {{space}} から外しますか?","removeTeamConfirmDescription": "他の割り当て済みチームに含まれていない限り、そのメンバーはこのスペースへのアクセスを失います。","lastTeamWarning": "このスペースを支える唯一のチームです。外すと、ワークスペース管理者のみがアクセスを保持します。","affectsOtherSpaces_one": "{{team}} への変更は、このチームが支える他 {{count}} 件のスペースにも適用されます。",- "affectsOtherSpaces_other": "{{team}} への変更は、このチームが支える他 {{count}} 件のスペースにも適用されます。"+ "affectsOtherSpaces_other": "{{team}} への変更は、このチームが支える他 {{count}} 件のスペースにも適用されます。",+ "accessLabel": "スペースへのアクセス",+ "accessAdmin": "管理者",+ "accessMember": "メンバー",+ "accessChanged": "{{team}} のアクセスを更新しました",+ "accessHint": "{{team}} の管理者は、アクセスが「管理者」に設定されている場合のみこのスペースを管理できます。"},"teams": {"assignLabel": "チーム",diff --git a/src/locales/pt/translation.json b/src/locales/pt/translation.jsonindex 0db604a10..8d5e6cec2 100644--- a/src/locales/pt/translation.json+++ b/src/locales/pt/translation.json@@ -107,6 +107,7 @@"pttUnavailable": "O listener nativo de Push-to-Talk não está disponível"},"common": {+ "add": "Adicionar","retry": "Tentar novamente","back": "Voltar","next": "Avançar",@@ -1856,6 +1857,7 @@"new": "Nova equipe","empty": "Nenhuma equipe ainda.","createFirst": "Crie sua primeira equipe",+ "addMembersLabel": "Adicionar membros","createTitle": "Criar equipe","nameLabel": "Nome da equipe","memberCount_one": "{{count}} membro",@@ -2198,6 +2200,7 @@"personal": "Pessoal","privateTooltip": "Somente você pode ver seu espaço pessoal","newSpace": "Novo espaço de equipe",+ "newSpaceInWorkspace": "Novo espaço de equipe em {{workspace}}","createTitle": "Criar espaço de equipe","createDescription": "Uma área compartilhada dentro de um workspace, sustentada por uma ou mais equipes.","nameLabel": "Nome",@@ -2244,7 +2247,9 @@"conflictKeep": "Continuar editando","editedBy": "Editado por {{name}} · {{time}}","members": {- "addPeople": "Adicionar pessoas",+ "addPeopleToTeam": "Adicionar pessoas a {{team}}",+ "addedToTeam": "{{name}} adicionado a {{team}}",+ "you": "Você","addFailed": "Não foi possível adicionar {{failed}} de {{total}} pessoas","searchPlaceholder": "Pesquisar pessoas…","roleAdmin": "Administrador",@@ -2261,13 +2266,20 @@"menu": "Equipes e membros…","title": "Equipes e membros de {{space}}","noTeams": "Nenhuma equipe sustenta este espaço ainda. Apenas administradores do workspace podem vê-lo.",- "addTeam": "Adicionar equipe…",+ "addTeamLabel": "Adicionar uma equipe a este espaço",+ "chooseTeam": "Escolher equipe…",+ "teamAdded": "{{team}} adicionada a {{space}}","removeTeamFromSpace": "Remover do espaço","removeTeamConfirm": "Remover {{team}} de {{space}}?","removeTeamConfirmDescription": "Seus membros perderão o acesso a este espaço, a menos que outra equipe atribuída os inclua.","lastTeamWarning": "Esta é a única equipe que sustenta este espaço. Após removê-la, apenas administradores do workspace mantêm o acesso.","affectsOtherSpaces_one": "Alterações em {{team}} também se aplicam a {{count}} outro espaço que ela sustenta.",- "affectsOtherSpaces_other": "Alterações em {{team}} também se aplicam a {{count}} outros espaços que ela sustenta."+ "affectsOtherSpaces_other": "Alterações em {{team}} também se aplicam a {{count}} outros espaços que ela sustenta.",+ "accessLabel": "Acesso ao espaço",+ "accessAdmin": "Administrador",+ "accessMember": "Membro",+ "accessChanged": "Acesso de {{team}} atualizado",+ "accessHint": "Os administradores de {{team}} só gerenciam este espaço quando seu acesso está definido como Administrador."},"teams": {"assignLabel": "Equipes",diff --git a/src/locales/ru/translation.json b/src/locales/ru/translation.jsonindex ce1f239dd..5e2f780c5 100644--- a/src/locales/ru/translation.json+++ b/src/locales/ru/translation.json@@ -128,6 +128,7 @@"pttUnavailable": "Нативный слушатель Push-to-Talk недоступен"},"common": {+ "add": "Добавить","retry": "Повторить","back": "Назад","next": "Далее",@@ -1877,6 +1878,7 @@"new": "Новая команда","empty": "Команд пока нет.","createFirst": "Создайте первую команду",+ "addMembersLabel": "Добавить участников","createTitle": "Создать команду","nameLabel": "Название команды","memberCount_one": "{{count}} участник",@@ -2206,6 +2208,7 @@"personal": "Личное","privateTooltip": "Только вы видите своё личное пространство","newSpace": "Новое командное пространство",+ "newSpaceInWorkspace": "Новое командное пространство в {{workspace}}","createTitle": "Создать командное пространство","createDescription": "Общая область внутри рабочего пространства, поддерживаемая одной или несколькими командами.","nameLabel": "Название",@@ -2254,7 +2257,9 @@"conflictKeep": "Продолжить редактирование","editedBy": "Изменено: {{name}} · {{time}}","members": {- "addPeople": "Добавить людей",+ "addPeopleToTeam": "Добавить людей в {{team}}",+ "addedToTeam": "{{name}} добавлен(а) в {{team}}",+ "you": "Вы","addFailed": "Не удалось добавить {{failed}} из {{total}} участников","searchPlaceholder": "Поиск людей…","roleAdmin": "Администратор",@@ -2273,7 +2278,9 @@"menu": "Команды и участники…","title": "Команды и участники {{space}}","noTeams": "К этому пространству пока не привязана ни одна команда. Его видят только администраторы рабочего пространства.",- "addTeam": "Добавить команду…",+ "addTeamLabel": "Добавить команду в это пространство",+ "chooseTeam": "Выберите команду…",+ "teamAdded": "{{team}} добавлена в {{space}}","removeTeamFromSpace": "Убрать из пространства","removeTeamConfirm": "Убрать {{team}} из {{space}}?","removeTeamConfirmDescription": "Её участники потеряют доступ к этому пространству, если их не включает другая привязанная команда.",@@ -2281,7 +2288,12 @@"affectsOtherSpaces_one": "Изменения в {{team}} также применяются к {{count}} другому пространству, которое она поддерживает.","affectsOtherSpaces_few": "Изменения в {{team}} также применяются к {{count}} другим пространствам, которые она поддерживает.","affectsOtherSpaces_many": "Изменения в {{team}} также применяются к {{count}} другим пространствам, которые она поддерживает.",- "affectsOtherSpaces_other": "Изменения в {{team}} также применяются к {{count}} другим пространствам, которые она поддерживает."+ "affectsOtherSpaces_other": "Изменения в {{team}} также применяются к {{count}} другим пространствам, которые она поддерживает.",+ "accessLabel": "Доступ к пространству",+ "accessAdmin": "Администратор",+ "accessMember": "Участник",+ "accessChanged": "Доступ для {{team}} обновлён",+ "accessHint": "Администраторы {{team}} управляют этим пространством, только если его доступ установлен на «Администратор»."},"teams": {"assignLabel": "Команды",diff --git a/src/locales/zh-CN/translation.json b/src/locales/zh-CN/translation.jsonindex 297ab585a..703542537 100644--- a/src/locales/zh-CN/translation.json+++ b/src/locales/zh-CN/translation.json@@ -128,6 +128,7 @@"pttUnavailable": "按住说话原生监听器不可用"},"common": {+ "add": "添加","retry": "重试","back": "返回","next": "下一步",@@ -1877,6 +1878,7 @@"new": "新建团队","empty": "还没有团队。","createFirst": "创建你的第一个团队",+ "addMembersLabel": "添加成员","createTitle": "创建团队","nameLabel": "团队名称","memberCount_one": "{{count}} 名成员",@@ -2198,6 +2200,7 @@"personal": "个人","privateTooltip": "只有你可以看到你的个人空间","newSpace": "新建团队空间",+ "newSpaceInWorkspace": "在 {{workspace}} 中新建团队空间","createTitle": "创建团队空间","createDescription": "工作区内的共享区域,由一个或多个团队支持。","nameLabel": "名称",@@ -2244,7 +2247,9 @@"conflictKeep": "继续编辑","editedBy": "由 {{name}} 编辑 · {{time}}","members": {- "addPeople": "添加成员",+ "addPeopleToTeam": "向 {{team}} 添加成员",+ "addedToTeam": "已将 {{name}} 添加到 {{team}}",+ "you": "你","addFailed": "{{total}} 人中有 {{failed}} 人无法添加","searchPlaceholder": "搜索成员…","roleAdmin": "管理员",@@ -2261,13 +2266,20 @@"menu": "团队与成员…","title": "{{space}} 的团队与成员","noTeams": "此空间尚无团队支持。只有工作区管理员可以看到它。",- "addTeam": "添加团队…",+ "addTeamLabel": "向此空间添加团队",+ "chooseTeam": "选择团队…",+ "teamAdded": "已将 {{team}} 添加到 {{space}}","removeTeamFromSpace": "从空间移除","removeTeamConfirm": "将 {{team}} 从 {{space}} 移除?","removeTeamConfirmDescription": "除非其他已分配的团队包含这些成员,否则他们将失去对此空间的访问权限。","lastTeamWarning": "这是支持此空间的唯一团队。移除后,只有工作区管理员保留访问权限。","affectsOtherSpaces_one": "对 {{team}} 的更改也会应用到它支持的另外 {{count}} 个空间。",- "affectsOtherSpaces_other": "对 {{team}} 的更改也会应用到它支持的另外 {{count}} 个空间。"+ "affectsOtherSpaces_other": "对 {{team}} 的更改也会应用到它支持的另外 {{count}} 个空间。",+ "accessLabel": "空间访问权限",+ "accessAdmin": "管理员",+ "accessMember": "成员",+ "accessChanged": "已更新 {{team}} 的访问权限",+ "accessHint": "仅当访问权限设为“管理员”时,{{team}} 的管理员才能管理此空间。"},"teams": {"assignLabel": "团队",diff --git a/src/locales/zh-TW/translation.json b/src/locales/zh-TW/translation.jsonindex 52f0624bc..98612056f 100644--- a/src/locales/zh-TW/translation.json+++ b/src/locales/zh-TW/translation.json@@ -128,6 +128,7 @@"pttUnavailable": "按住說話原生監聽程式無法使用"},"common": {+ "add": "新增","retry": "重試","back": "返回","next": "下一步",@@ -1877,6 +1878,7 @@"new": "新增團隊","empty": "還沒有團隊。","createFirst": "建立你的第一個團隊",+ "addMembersLabel": "新增成員","createTitle": "建立團隊","nameLabel": "團隊名稱","memberCount_one": "{{count}} 位成員",@@ -2198,6 +2200,7 @@"personal": "個人","privateTooltip": "只有你可以看到你的個人空間","newSpace": "新增團隊空間",+ "newSpaceInWorkspace": "在 {{workspace}} 中新增團隊空間","createTitle": "建立團隊空間","createDescription": "工作區內的共享區域,由一個或多個團隊支持。","nameLabel": "名稱",@@ -2244,7 +2247,9 @@"conflictKeep": "繼續編輯","editedBy": "由 {{name}} 編輯 · {{time}}","members": {- "addPeople": "新增成員",+ "addPeopleToTeam": "將成員加入 {{team}}",+ "addedToTeam": "已將 {{name}} 加入 {{team}}",+ "you": "你","addFailed": "{{total}} 人中有 {{failed}} 人無法加入","searchPlaceholder": "搜尋成員…","roleAdmin": "管理員",@@ -2261,13 +2266,20 @@"menu": "團隊與成員…","title": "{{space}} 的團隊與成員","noTeams": "此空間尚無團隊支持。只有工作區管理員可以看到它。",- "addTeam": "新增團隊…",+ "addTeamLabel": "將團隊加入此空間",+ "chooseTeam": "選擇團隊…",+ "teamAdded": "已將 {{team}} 加入 {{space}}","removeTeamFromSpace": "從空間移除","removeTeamConfirm": "將 {{team}} 從 {{space}} 移除?","removeTeamConfirmDescription": "除非其他已指派的團隊包含這些成員,否則他們將失去此空間的存取權。","lastTeamWarning": "這是支持此空間的唯一團隊。移除後,只有工作區管理員保留存取權。","affectsOtherSpaces_one": "對 {{team}} 的變更也會套用到它支持的另外 {{count}} 個空間。",- "affectsOtherSpaces_other": "對 {{team}} 的變更也會套用到它支持的另外 {{count}} 個空間。"+ "affectsOtherSpaces_other": "對 {{team}} 的變更也會套用到它支持的另外 {{count}} 個空間。",+ "accessLabel": "空間存取權",+ "accessAdmin": "管理員",+ "accessMember": "成員",+ "accessChanged": "已更新 {{team}} 的存取權",+ "accessHint": "僅當存取權設為「管理員」時,{{team}} 的管理員才能管理此空間。"},"teams": {"assignLabel": "團隊",diff --git a/src/services/SpacesService.ts b/src/services/SpacesService.tsindex 6fb7623f1..5a36f7ba4 100644--- a/src/services/SpacesService.ts+++ b/src/services/SpacesService.ts@@ -22,7 +22,12 @@ export interface MySpace {// Union roster entry: one row per user across all assigned teams, with// attribution of which team(s) grant the access.export interface SpaceMemberEntry extends TeamMember {- via_teams: { team_id: string; name: string; role: "admin" | "member" }[];+ via_teams: {+ team_id: string;+ name: string;+ role: "admin" | "member";+ access?: "admin" | "member";+ }[];}// Every space the caller can access across all their workspaces (member of any@@ -53,8 +58,17 @@ async function remove(spaceId: string): Promise<void> {await cloudDelete(`/api/spaces/${spaceId}`);}-async function assignTeam(spaceId: string, teamId: string): Promise<void> {- await cloudPost(`/api/spaces/${spaceId}/teams`, { team_id: teamId });+// The teams POST upserts: with access it also updates an existing+// assignment's cap; without it the server keeps the current value.+async function assignTeam(+ spaceId: string,+ teamId: string,+ access?: "admin" | "member"+): Promise<void> {+ await cloudPost(`/api/spaces/${spaceId}/teams`, {+ team_id: teamId,+ ...(access ? { access } : {}),+ });}async function unassignTeam(spaceId: string, teamId: string): Promise<void> {diff --git a/src/services/spaceActions.ts b/src/services/spaceActions.tsindex 787224b2e..87f1b48bd 100644--- a/src/services/spaceActions.ts+++ b/src/services/spaceActions.ts@@ -104,11 +104,26 @@ export async function deleteSpace(return purgeSpace(space.id);}+// Fresh assignments get the server-side 'member' default; promotion to admin+// is a separate, explicit act via setSpaceTeamAccess.export async function assignTeamToSpace(space: SpaceItem, teamId: string): Promise<void> {await SpacesService.assignTeam(requireCloudSpaceId(space), teamId);await refreshSpaceMirror();}+// Changes an assignment's access cap via the upserting teams POST. May change+// the caller's own my_role — including dropping their admin on this space —+// which the mirror refresh picks up. Membership presence is untouched, so no+// content re-sync is needed.+export async function setSpaceTeamAccess(+ space: SpaceItem,+ teamId: string,+ access: "admin" | "member"+): Promise<void> {+ await SpacesService.assignTeam(requireCloudSpaceId(space), teamId, access);+ await refreshSpaceMirror();+}+// Unassigning may cost the caller their own access (last of their teams on the// space): the follow-up sync pass purges the space locally in that case.export async function unassignTeamFromSpace(space: SpaceItem, teamId: string): Promise<void> {diff --git a/src/types/electron.ts b/src/types/electron.tsindex 64590bd59..f94ad8c9d 100644--- a/src/types/electron.ts+++ b/src/types/electron.ts@@ -149,6 +149,10 @@ export interface SpaceTeamRef {name: string;// Explicit team membership role, if any (workspace admins may have none).my_role?: "admin" | "member" | null;+ // Per-assignment cap on what the team conveys (space_teams.access): its+ // team admins are space admins only when this is 'admin'. Absent on+ // mirrors written before the API shipped it; those rows are 'admin'.+ access?: "admin" | "member";}export interface SpaceItem {diff --git a/test/lib/memberCandidates.test.js b/test/lib/memberCandidates.test.jsnew file mode 100644index 000000000..c068e082a--- /dev/null+++ b/test/lib/memberCandidates.test.js@@ -0,0 +1,20 @@+const test = require("node:test");+const assert = require("node:assert/strict");+const { orderMemberCandidates } = require("../../src/lib/memberCandidates.ts");++const member = (userId) => ({ user_id: userId });++test("orderMemberCandidates: pins the current user first", () => {+ const members = [member("a"), member("b"), member("me"), member("c")];+ assert.deepEqual(+ orderMemberCandidates(members, "me").map((m) => m.user_id),+ ["me", "a", "b", "c"]+ );+});++test("orderMemberCandidates: keeps order when current user is absent or unknown", () => {+ const members = [member("a"), member("b")];+ assert.deepEqual(orderMemberCandidates(members, "me"), members);+ assert.deepEqual(orderMemberCandidates(members, undefined), members);+ assert.deepEqual(orderMemberCandidates([], "me"), []);+});diff --git a/test/lib/workspaceSelection.test.js b/test/lib/workspaceSelection.test.jsnew file mode 100644index 000000000..97f69b4cb--- /dev/null+++ b/test/lib/workspaceSelection.test.js@@ -0,0 +1,59 @@+const test = require("node:test");+const assert = require("node:assert/strict");+const {+ groupTeamSpacesByWorkspace,+ selectWorkspaceForSpaceCreation,+} = require("../../src/lib/workspaceSelection.ts");++const workspace = (id, role) => ({ id, name: `Workspace ${id}`, role });+const space = (id, workspaceId) => ({ id, workspace_id: workspaceId });++test("groupTeamSpacesByWorkspace: groups spaces under their workspace", () => {+ const workspaces = [workspace("a", "owner"), workspace("b", "member")];+ const spaces = [space(1, "a"), space(2, "b"), space(3, "a")];+ const { groups, ungrouped } = groupTeamSpacesByWorkspace(workspaces, spaces);+ assert.deepEqual(+ groups.map((g) => ({ id: g.workspace.id, spaceIds: g.spaces.map((s) => s.id) })),+ [+ { id: "a", spaceIds: [1, 3] },+ { id: "b", spaceIds: [2] },+ ]+ );+ assert.deepEqual(ungrouped, []);+});++test("groupTeamSpacesByWorkspace: keeps empty groups only for owners/admins", () => {+ const workspaces = [workspace("a", "owner"), workspace("b", "admin"), workspace("c", "member")];+ const { groups } = groupTeamSpacesByWorkspace(workspaces, []);+ assert.deepEqual(+ groups.map((g) => g.workspace.id),+ ["a", "b"]+ );+});++test("groupTeamSpacesByWorkspace: spaces without a known workspace are ungrouped", () => {+ const workspaces = [workspace("a", "member")];+ const spaces = [space(1, "a"), space(2, null), space(3, "gone")];+ const { groups, ungrouped } = groupTeamSpacesByWorkspace(workspaces, spaces);+ assert.deepEqual(+ groups.map((g) => g.workspace.id),+ ["a"]+ );+ assert.deepEqual(+ ungrouped.map((s) => s.id),+ [2, 3]+ );+});++test("selectWorkspaceForSpaceCreation: preselected id wins when manageable", () => {+ const manageable = [workspace("a", "owner"), workspace("b", "admin")];+ assert.equal(selectWorkspaceForSpaceCreation(manageable, null, "b")?.id, "b");+ assert.equal(selectWorkspaceForSpaceCreation(manageable, manageable[0], "b")?.id, "b");+});++test("selectWorkspaceForSpaceCreation: falls back to active, then first manageable", () => {+ const manageable = [workspace("a", "owner"), workspace("b", "admin")];+ assert.equal(selectWorkspaceForSpaceCreation(manageable, manageable[1], null)?.id, "b");+ assert.equal(selectWorkspaceForSpaceCreation(manageable, workspace("x", "member"), "x")?.id, "a");+ assert.equal(selectWorkspaceForSpaceCreation([], null, null), null);+});